diff --git a/CHANGELOG.md b/CHANGELOG.md index 8832e876..3a1cb883 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.4.7 +- Fix Draconium Casing Recycle [#324](https://github.com/GTModpackTeam/GTExpert-Core/pull/324) + +* * * + # 2.4.6 - Add Large Rock Breaker [#321](https://github.com/GTModpackTeam/GTExpert-Core/pull/321) - Fix Electric Spawner [#323](https://github.com/GTModpackTeam/GTExpert-Core/pull/322) diff --git a/gradle.properties b/gradle.properties index 3bd04e32..0d51ed39 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ modGroup = com.github.gtexpert.core # Version of your mod. # This field can be left empty if you want your mod's version to be determined by the latest git tag instead. -modVersion = 2.4.6-beta +modVersion = 2.4.6-beta # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version) includeMCVersionJar = true diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java index 508e96b2..b4411591 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java @@ -64,7 +64,7 @@ protected BlockPattern createStructurePattern() { .aisle("X X", "SXXXX", "X X", "XXXXX", "X X") .where('S', selfPredicate()) .where('X', casing.or(abilities)) - .where('T', tieredCasing().or(states(getCasingState()))) + .where('T', tieredCasing().or(casing)) .where('P', states(getPipeCasingState())) .where('C', heatingCoils().setMinGlobalLimited(12).setMaxGlobalLimited(12)) .where(' ', any()) diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java index f9aca7fc..9ba9e272 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java @@ -86,7 +86,7 @@ protected BlockPattern createStructurePattern() { .aisle("XCCXCCX", "XCCSCCX", "XCCXCCX") .where('S', selfPredicate()) .where('X', casing.or(abilities)) - .where('T', tieredCasing().or(states(getCasingState()))) + .where('T', casing.or(tieredCasing())) .where('C', heatingCoils().setMinGlobalLimited(32).setMaxGlobalLimited(32)) .where('#', air()) .build(); diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java index d3d293e9..d5c2cab5 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java @@ -62,7 +62,7 @@ protected BlockPattern createStructurePattern() { .aisle("XXX", "XSX", "XXX") .where('S', selfPredicate()) .where('X', casing.or(abilities)) - .where('T', tieredCasing().or(states(getCasingState()))) + .where('T', tieredCasing().or(casing)) .where('H', abilities(MultiblockAbility.MUFFLER_HATCH)) .where('#', air()) .build(); diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeRockBreaker.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeRockBreaker.java index e9b1e5be..bdc8abb5 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeRockBreaker.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeRockBreaker.java @@ -60,7 +60,7 @@ protected BlockPattern createStructurePattern() { .where('C', casing) .where('X', casing.or(abilities)) .where('P', states(getPipeCasingState())) - .where('T', tieredCasing().or(states(getCasingState()))) + .where('T', tieredCasing().or(casing)) .where('H', abilities(MultiblockAbility.MUFFLER_HATCH)) .where('#', air()) .where(' ', any()) diff --git a/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java b/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java index 5a095a5f..549ce7d7 100644 --- a/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java +++ b/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java @@ -78,9 +78,7 @@ public void preInit(FMLPreInitializationEvent event) { public void init(FMLInitializationEvent event) {} @Override - public void postInit(FMLPostInitializationEvent event) { - RecyclingRecipes.init(); - } + public void postInit(FMLPostInitializationEvent event) {} @Override public void registerBlocks(RegistryEvent.Register event) { @@ -112,5 +110,6 @@ public void registerRecipesLowest(RegistryEvent.Register event) { GTERecipe.init(); CEUOverrideRecipe.init(); GTEVanillaOverrideRecipes.init(); + RecyclingRecipes.init(); } } diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java index 737df53c..e9cd55a0 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java @@ -4,9 +4,6 @@ import net.minecraft.item.ItemStack; import gregtech.api.GTValues; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.ItemMaterialInfo; -import gregtech.api.unification.stack.MaterialStack; import gregtech.common.ConfigHolder; import com.github.gtexpert.core.api.unification.material.GTEMaterials; @@ -30,10 +27,5 @@ public static void init() { .getItemVariant(GTEBlockMetalCasing.MetalCasingType.AWAKENED_DRACONIUM_CASING), GTEMaterials.AwakenedDraconium, (GTValues.M * 8) / ConfigHolder.recipes.casingsPerCraft); - GTEUtility.registerOre( - GTEMetaBlocks.GTE_METAL_CASING.getItemVariant(GTEBlockMetalCasing.MetalCasingType.DRACONIUM_CASING), - new ItemMaterialInfo( - new MaterialStack(GTEMaterials.Draconium, GTValues.M * 9), - new MaterialStack(Materials.Tritanium, GTValues.M * 2))); } }