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

Internal Machine and Material Class Refactor #2562

Merged
merged 12 commits into from
Dec 20, 2024

Conversation

YoungOnionMC
Copy link
Member

@YoungOnionMC YoungOnionMC commented Dec 16, 2024

What

Refactors around various parts of GTMachines, GTItems and GTBlocks into more classes for easier management, notably GTMultiMachines, GTMachineUtils, GTMaterialBlocks and GTMaterialItems
Fixes #2528

Implementation Details

Lots of refactoring

Outcome

Hopefully cleaner navigation for machine registration.

Potential Compatibility Issues

will break all addons, they just need to update paths.

YoungOnionMC and others added 8 commits December 6, 2024 02:22
… into yo/machine-refactor

# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/common/data/GTFluids.java
#	src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
#	src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java
#	src/main/java/com/gregtechceu/gtceu/common/data/machines/GTCreateMachines.java
#	src/main/java/com/gregtechceu/gtceu/integration/emi/GTEMIPlugin.java
#	src/main/java/com/gregtechceu/gtceu/integration/jei/GTJEIPlugin.java
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KineticMachineBuilder.java
#	src/main/java/com/gregtechceu/gtceu/integration/rei/GTREIPlugin.java
@YoungOnionMC YoungOnionMC marked this pull request as ready for review December 16, 2024 22:15
@YoungOnionMC YoungOnionMC requested a review from a team as a code owner December 16, 2024 22:15
YoungOnionMC and others added 4 commits December 19, 2024 12:10
… into yo/machine-refactor

# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java
#	src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/GeneratorBuilder.java
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/MachineFunctionPresets.java
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/SimpleMachineBuilder.java
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java
@Spicierspace153 Spicierspace153 enabled auto-merge (squash) December 20, 2024 20:50
@screret screret added the type: refactor Suggestion to refactor a section of code label Dec 20, 2024
@Spicierspace153 Spicierspace153 merged commit bf03b90 into 1.20.1 Dec 20, 2024
3 checks passed
@Spicierspace153 Spicierspace153 deleted the yo/machine-refactor branch December 20, 2024 20:51
omergunr100 pushed a commit to omergunr100/GregTech-Modern that referenced this pull request Dec 25, 2024
screret added a commit that referenced this pull request Dec 28, 2024
Co-authored-by: Stanley Goodwin <[email protected]>
Co-authored-by: screret <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: refactor Suggestion to refactor a section of code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Separate auto-generated material initialization from generic block and item initializations
4 participants