Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add RawOre to the OreProccessing Page #30

Merged
merged 16 commits into from
May 22, 2024
Merged

Add RawOre to the OreProccessing Page #30

merged 16 commits into from
May 22, 2024

Conversation

Ethryan
Copy link

@Ethryan Ethryan commented Mar 9, 2024

This depends on #2502 and adds the Raw Ores to the ore processing page.

Changed the layout to show the raw ore item, and its chances
image
image

@Caedis
Copy link
Member

Caedis commented Mar 10, 2024

confirmed compiled and working in game with the raw ores pr

@boubou19 boubou19 added the ongoing freeze - don't merge Not just a bug fix and thus affected by a current freeze for a upcoming version label Mar 10, 2024
D-Cysteine
D-Cysteine previously approved these changes Apr 18, 2024
Copy link
Collaborator

@D-Cysteine D-Cysteine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not too familiar with the raw ore changes, but I think I saw that the new raw ore macerator recipe is slightly different from the standard ore block macerator recipe? If that is true, and if players would normally be processing raw ore items rather than the standard ore blocks, then we may want to show the raw ore macerator outputs rather than the standard ore block macerator outputs.

If we wanted to do this, the line responsible for finding the macerator recipe is here:


and I think we would want to modify this block to prefer to select the raw ore item, if it exists:
if (!gregTechOres.isEmpty()) {
this.rawOre = gregTechOres.get(0);
} else if (!filteredRawOres.isEmpty()) {
this.rawOre = filteredRawOres.get(0);
} else {
this.rawOre = rawOres.get(0);
}

@GTNewHorizons GTNewHorizons deleted a comment from github-actions bot Apr 23, 2024
@GTNewHorizons GTNewHorizons deleted a comment from github-actions bot Apr 23, 2024
Ethryan and others added 3 commits April 23, 2024 17:34
Co-authored-by: GitHub GTNH Actions <>
@GTNewHorizons GTNewHorizons deleted a comment from github-actions bot Apr 23, 2024
@Ethryan
Copy link
Author

Ethryan commented Apr 23, 2024

Now it should be done @Dream-Master .

@GTNewHorizons GTNewHorizons deleted a comment from github-actions bot Apr 23, 2024
@Ethryan Ethryan self-assigned this Apr 23, 2024
Copy link
Collaborator

@D-Cysteine D-Cysteine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Just wanted to check: all the lines line up okay when generating a diagram for an ore that doesn't have a raw ore item?

Also, I think the new layout is fine, but as a potential alternative to it, we could also keep the original layout, and just add the new raw ore item and different output chance to the existing slots. This would turn the slots into cycle slots, cycling between the ore block and raw ore much like how NEI usually shows crafting recipes that take multiple possible input items in a single spot.

If you want to try using cycle slots, and would like some code pointers, just let me know!

@Ethryan
Copy link
Author

Ethryan commented Apr 24, 2024

Looks good! Just wanted to check: all the lines line up okay when generating a diagram for an ore that doesn't have a raw ore item?

Also, I think the new layout is fine, but as a potential alternative to it, we could also keep the original layout, and just add the new raw ore item and different output chance to the existing slots. This would turn the slots into cycle slots, cycling between the ore block and raw ore much like how NEI usually shows crafting recipes that take multiple possible input items in a single spot.

If you want to try using cycle slots, and would like some code pointers, just let me know!

image

Copy link
Collaborator

@D-Cysteine D-Cysteine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great; thanks for adding this to the diagram!

@Dream-Master Dream-Master removed the ongoing freeze - don't merge Not just a bug fix and thus affected by a current freeze for a upcoming version label Apr 28, 2024
@Dream-Master Dream-Master merged commit ccbca32 into master May 22, 2024
1 check passed
@Dream-Master Dream-Master deleted the raw-ores-patch branch May 22, 2024 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants