Team-EnderIO/EnderIO
1
0
Fork 0
Code Issues 114 Pull requests 13 Projects Releases 79 Packages Wiki Activity Actions

Created all? sag mill recipes #81

Merged
albinaask merged 4 commits from dev/1.19.x into dev/1.19.x 2022-08-30 22:32:55 +00:00
Conversation 16 Commits 4 Files changed 69 +1649 -14
albinaask commented 2022-08-21 16:13:27 +00:00 (Migrated from github.com)
Copy link

Description

Registered what I think is all the Sag mill recipes added by enderIO in 1.12

Note that exporting tags as outputs seem broken, so the outputs generally points to items.

There also seem to be a bug where the first output item of an inputted stack disappears for some reason. Was that way when I cloned and is like that still since I didn't find the cause

This should not be a breaking change.

(Also) note that this is my first PR for this project so if all isn't as it should be then I'll correct it if I get pointed in the right direction

# Description Registered what I think is all the Sag mill recipes added by enderIO in 1.12 Note that exporting tags as outputs seem broken, so the outputs generally points to items. There also seem to be a bug where the first output item of an inputted stack disappears for some reason. Was that way when I cloned and is like that still since I didn't find the cause This should not be a breaking change. (Also) note that this is my first PR for this project so if all isn't as it should be then I'll correct it if I get pointed in the right direction <!-- Thanks to: https://embeddedartistry.com/blog/2017/08/04/a-github-pull-request-template-for-your-projects/ for the building blocks of this template -->
Rover656 commented 2022-08-21 18:19:12 +00:00 (Migrated from github.com)
Copy link

Note that exporting tags as outputs seem broken, so the outputs generally points to items.

Could you expand on what is broken please?

There also seem to be a bug where the first output item of an inputted stack disappears for some reason. Was that way when I cloned and is like that still since I didn't find the cause

Interesting, if you could file a bug report with a few reproduction steps that'd be fantastic.

Thanks for the PR, I'll check this over now and then I'll ask to to execute the runData target to generate the JSON files :)

> Note that exporting tags as outputs seem broken, so the outputs generally points to items. Could you expand on what is broken please? > There also seem to be a bug where the first output item of an inputted stack disappears for some reason. Was that way when I cloned and is like that still since I didn't find the cause Interesting, if you could file a bug report with a few reproduction steps that'd be fantastic. Thanks for the PR, I'll check this over now and then I'll ask to to execute the `runData` target to generate the JSON files :)
albinaask commented 2022-08-21 18:49:28 +00:00 (Migrated from github.com)
Copy link
build("sand", Ingredient.of(Items.SAND), List.of(
        		output(EIOTags.Items.SILICON, 0.5f)
        		),BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer);

yields error in runData task while:

build("sand", Ingredient.of(Items.SAND), List.of(
        		output(EIOItems.SILICON.get(), 0.5f)
        		),BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer);

Is fine, I talked to EpicSquid who says it's a vanilla feature.

Sure, I'll do that!

For some reason I thought that they should be left behind just like compile units are in C++ projects, but I'll supply those ;)

``` build("sand", Ingredient.of(Items.SAND), List.of( output(EIOTags.Items.SILICON, 0.5f) ),BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer); ``` yields error in runData task while: ``` build("sand", Ingredient.of(Items.SAND), List.of( output(EIOItems.SILICON.get(), 0.5f) ),BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer); ``` Is fine, I talked to EpicSquid who says it's a vanilla feature. Sure, I'll do that! For some reason I thought that they should be left behind just like compile units are in C++ projects, but I'll supply those ;)
albinaask commented 2022-08-21 19:12:21 +00:00 (Migrated from github.com)
Copy link

Regarding the bug it seems like it's been fixed when I test it now, so never mind. I committed the generated files in a second commit. However I haven't figured out how to merge them together to one to make it neater...

Regarding the bug it seems like it's been fixed when I test it now, so never mind. I committed the generated files in a second commit. However I haven't figured out how to merge them together to one to make it neater...
Rover656 commented 2022-08-21 21:16:37 +00:00 (Migrated from github.com)
Copy link
build("sand", Ingredient.of(Items.SAND), List.of(
        		output(EIOTags.Items.SILICON, 0.5f)
        		),BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer);

yields error in runData task while:

build("sand", Ingredient.of(Items.SAND), List.of(
        		output(EIOItems.SILICON.get(), 0.5f)
        		),BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer);

Is fine, I talked to EpicSquid who says it's a vanilla feature.

Sure, I'll do that!

For some reason I thought that they should be left behind just like compile units are in C++ projects, but I'll supply those ;)

I just tried the sand recipe builder with the silicon tag and it was working fine, what error was it giving you?

> ``` > build("sand", Ingredient.of(Items.SAND), List.of( > output(EIOTags.Items.SILICON, 0.5f) > ),BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer); > ``` > > yields error in runData task while: > > ``` > build("sand", Ingredient.of(Items.SAND), List.of( > output(EIOItems.SILICON.get(), 0.5f) > ),BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer); > ``` > > Is fine, I talked to EpicSquid who says it's a vanilla feature. > > Sure, I'll do that! > > For some reason I thought that they should be left behind just like compile units are in C++ projects, but I'll supply those ;) I just tried the sand recipe builder with the silicon tag and it was working fine, what error was it giving you?
Rover656 (Migrated from github.com) requested changes 2022-08-21 21:18:49 +00:00
Rover656 (Migrated from github.com) left a comment
Copy link

Some review comments for you. I'd have to pop open a 1.12.2 environment to check these and I dont have the time right now

Some review comments for you. I'd have to pop open a 1.12.2 environment to check these and I dont have the time right now
.vscode/launch.json
Rover656 (Migrated from github.com) commented 2022-08-21 21:06:23 +00:00
Copy link

Please add .vscode/ to the gitignore file.

Please add `.vscode/` to the gitignore file.
src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java
@ -14,33 +15,303 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.ItemTags;
Rover656 (Migrated from github.com) commented 2022-08-21 21:17:19 +00:00
Copy link

Change this for the silicon tag, it compiled and generated fine for me.

Change this for the silicon tag, it compiled and generated fine for me.
Rover656 (Migrated from github.com) commented 2022-08-21 21:17:55 +00:00
Copy link

I'm not sure there is a sugarcane tag?

I'm not sure there is a sugarcane tag?
Rover656 (Migrated from github.com) commented 2022-08-21 21:18:02 +00:00
Copy link

Erroneous how?

Erroneous how?
src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java
@ -42,0 +152,4 @@
output(STRING, 0.1f)),
BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer);
build("quartz_block", Ingredient.of(Tags.Items.STORAGE_BLOCKS_QUARTZ), List.of(
Rover656 (Migrated from github.com) commented 2022-08-21 21:17:43 +00:00
Copy link

What do you mean any:glowstone, you mean a tag for any glowstone block?

What do you mean any:glowstone, you mean a tag for any glowstone block?
albinaask (Migrated from github.com) reviewed 2022-08-25 10:19:19 +00:00
src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java
@ -42,0 +152,4 @@
output(STRING, 0.1f)),
BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer);
build("quartz_block", Ingredient.of(Tags.Items.STORAGE_BLOCKS_QUARTZ), List.of(
albinaask (Migrated from github.com) commented 2022-08-25 10:19:19 +00:00
Copy link

Yes, It'd be for like the chisel variants of glowstone blocks

Yes, It'd be for like the chisel variants of glowstone blocks
albinaask (Migrated from github.com) reviewed 2022-08-25 10:19:49 +00:00
src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java
@ -14,33 +15,303 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.ItemTags;
albinaask (Migrated from github.com) commented 2022-08-25 10:19:49 +00:00
Copy link

Well then, I'll remove the todo then

Well then, I'll remove the todo then
albinaask (Migrated from github.com) reviewed 2022-08-25 10:20:31 +00:00
src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java
@ -14,33 +15,303 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.ItemTags;
albinaask (Migrated from github.com) commented 2022-08-25 10:20:30 +00:00
Copy link

Sorry, left some test code, removing!

Sorry, left some test code, removing!
albinaask (Migrated from github.com) reviewed 2022-08-25 10:24:01 +00:00
src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java
@ -14,33 +15,303 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.ItemTags;
albinaask (Migrated from github.com) commented 2022-08-25 10:24:00 +00:00
Copy link

Weird, could have sworn that it crashed for me just a couple of days ago, but now it seems fine like you say... I donno... swapped to the tag like you said

Weird, could have sworn that it crashed for me just a couple of days ago, but now it seems fine like you say... I donno... swapped to the tag like you said
albinaask (Migrated from github.com) reviewed 2022-08-25 10:24:12 +00:00
.vscode/launch.json
albinaask (Migrated from github.com) commented 2022-08-25 10:24:12 +00:00
Copy link

Done

Done
justliliandev (Migrated from github.com) reviewed 2022-08-25 10:24:45 +00:00
src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java
@ -42,0 +152,4 @@
output(STRING, 0.1f)),
BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer);
build("quartz_block", Ingredient.of(Tags.Items.STORAGE_BLOCKS_QUARTZ), List.of(
justliliandev (Migrated from github.com) commented 2022-08-25 10:24:45 +00:00
Copy link

that is chisel:glowstone, but I'm not sure if we should have such a tag. Maybe we should create a tag like forge:glowstone and put chisel:glowstone into it

that is chisel:glowstone, but I'm not sure if we should have such a tag. Maybe we should create a tag like forge:glowstone and put chisel:glowstone into it
albinaask (Migrated from github.com) reviewed 2022-08-25 10:26:02 +00:00
src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java
@ -42,0 +152,4 @@
output(STRING, 0.1f)),
BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer);
build("quartz_block", Ingredient.of(Tags.Items.STORAGE_BLOCKS_QUARTZ), List.of(
albinaask (Migrated from github.com) commented 2022-08-25 10:26:02 +00:00
Copy link

But I didn't find any tag, so leaving it as it is for now...

But I didn't find any tag, so leaving it as it is for now...
albinaask (Migrated from github.com) reviewed 2022-08-25 10:32:04 +00:00
src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java
@ -42,0 +152,4 @@
output(STRING, 0.1f)),
BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer);
build("quartz_block", Ingredient.of(Tags.Items.STORAGE_BLOCKS_QUARTZ), List.of(
albinaask (Migrated from github.com) commented 2022-08-25 10:32:04 +00:00
Copy link

Creating tags are far above my knowledge, so I'm afraid that has to be left out of this PR

Creating tags are far above my knowledge, so I'm afraid that has to be left out of this PR
justliliandev (Migrated from github.com) approved these changes 2022-08-30 20:23:20 +00:00
justliliandev (Migrated from github.com) left a comment
Copy link

Energy cost is a bit off, but otherwise fine. Some recipes have changed compared to 1.12, but I don't think it's a problem. Also we might need to change energy cost, but that can be done later

Energy cost is a bit off, but otherwise fine. Some recipes have changed compared to 1.12, but I don't think it's a problem. Also we might need to change energy cost, but that can be done later
justliliandev commented 2022-08-30 20:25:22 +00:00 (Migrated from github.com)
Copy link

If no one has anything against merging this (except the merge conflict, but I can fix that myself) I'm going to do that tomorrow

If no one has anything against merging this (except the merge conflict, but I can fix that myself) I'm going to do that tomorrow
Rover656 commented 2022-08-30 22:08:05 +00:00 (Migrated from github.com)
Copy link

Happy for you to fix and merge 👍

Happy for you to fix and merge 👍
Sign in to join this conversation.
Reviewers
No reviewers
Rover656
justliliandev
Labels
Clear labels   
Area-Assets

   
Area-Backend

Backend work not usually visible to players.

  
Area-Conduits

Everything involving conduits

  
Area-Datapacks

   
Area-Lang

   
Area-Mod Compat

   
Area-Parity

1.12.2 missing features

  
Area-Rendering

Rendering code, might be shaders specific or general.

  
Good first issue

   
MC-1.19.2

   
MC-1.20.1

   
MC-1.20.4

   
MC-1.20.6

   
MC-1.21

   
MC-1.21.1

   
Modtoberfest

   
P-0-High

High priority, crash/breaking.

  
P-1-Medium

Medium priority. Potentially deleting items or breaking functionality.

  
P-2-Low

Low priority. Not hurting anyone, just annoying.

  
Status-Awaiting Response

Waiting for OP to respond

  
Status-Behind-Flag

This change is available but is placed behind a feature flag.

  
Status-Blocked

Blocked by a specific issue or protocol.

  
Status-Cannot Reproduce

   
Status-Duplicate

This issue or pull request already exists

  
Status-Help Wanted

We need some help to try and track this thing down..

  
Status-Incomplete Report

   
Status-Invalid

This doesn't seem right

  
Status-Needs LTS Backport

Fixed in latest but requires LTS backport.

  
Status-Needs Updating

Needs updating to a newer Minecraft version.

  
Status-Stale

This may not be updated by the OP any further.

  
Status-To Implement

   
Status-Triage

A Triage Member should take a look at this

  
Status-Wontfix

This will not be worked on

  
Status-Wontmerge

This PR won't be merged, but is left now for reference of ongoing or future works.

  
Type-Backport

   
Type-Bug

There is a problem.

  
Type-Documentation

Improvements or additions to documentation

  
Type-Enhancement

New feature or enhancement to existing feature.

  
Type-Question

Further information is requested

  
Type-RFC

Request for comments.

  
Type-Suggestion
No labels
Area-Assets
Area-Backend
Area-Conduits
Area-Datapacks
Area-Lang
Area-Mod Compat
Area-Parity
Area-Rendering
Good first issue
MC-1.19.2
MC-1.20.1
MC-1.20.4
MC-1.20.6
MC-1.21
MC-1.21.1
Modtoberfest
P-0-High
P-1-Medium
P-2-Low
Status-Awaiting Response
Status-Behind-Flag
Status-Blocked
Status-Cannot Reproduce
Status-Duplicate
Status-Help Wanted
Status-Incomplete Report
Status-Invalid
Status-Needs LTS Backport
Status-Needs Updating
Status-Stale
Status-To Implement
Status-Triage
Status-Wontfix
Status-Wontmerge
Type-Backport
Type-Bug
Type-Documentation
Type-Enhancement
Type-Question
Type-RFC
Type-Suggestion
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Team-EnderIO/EnderIO#81
No description provided.
Delete branch "dev/1.19.x"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?