Merge branch 'master' into type-filter-tico-ores

GTNewHorizons · Dec 26, 2024 · 3e47790 · 3e47790
2 parents 96829df + 57e7398
commit 3e47790
Show file tree

Hide file tree

Showing 349 changed files with 1,242 additions and 12,021 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -43,7 +43,7 @@ dependencies {
     api("com.github.GTNewHorizons:ModularUI2:2.1.16-1.7.10:dev")
     api("com.github.GTNewHorizons:waila:1.8.2:dev")
     api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-507-GTNH:dev")
-    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.0-gtnh:dev")
+    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.2-gtnh:dev")
     api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
     api("com.github.GTNewHorizons:Postea:1.0.13:dev")
 

diff --git a/src/functionalTest/java/kubatech/test/kubatechTestMod.java b/src/functionalTest/java/kubatech/test/kubatechTestMod.java
@@ -38,7 +38,7 @@ public class kubatechTestMod {
     public void preInit(FMLPreInitializationEvent ev) {
         // Disable GT5u messing with vanilla recipes for unit tests
         GTMod.gregtechproxy.mNerfedWoodPlank = false;
-        GTMod.gregtechproxy.mNerfedVanillaTools = false;
+        GTMod.gregtechproxy.mChangeWoodenVanillaTools = false;
     }
 
     @EventHandler

diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java
@@ -28,26 +28,31 @@
 import static gregtech.api.enums.OrePrefixes.plate;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
+import static gregtech.api.recipe.RecipeMaps.implosionRecipes;
 import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
 import static gregtech.api.recipe.RecipeMaps.sifterRecipes;
 import static gregtech.api.util.GTRecipeBuilder.MINUTES;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import bartworks.system.material.Werkstoff;
+import bartworks.system.material.WerkstoffLoader;
 import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable;
 import bartworks.util.BWColorUtil;
 import gregtech.api.GregTechAPI;
 import gregtech.api.enums.GTValues;
+import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.TierEU;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
 import gregtech.common.covers.CoverLens;
 
 public class GemLoader implements IWerkstoffRunnable {
@@ -133,6 +138,48 @@ public void run(Werkstoff werkstoff) {
                 .eut(16)
                 .addTo(hammerRecipes);
 
+            if (!werkstoff.contains(WerkstoffLoader.NO_BLAST)) {
+                GTValues.RA.stdBuilder()
+                    .itemInputs(werkstoff.get(gemFlawless, 3))
+                    .itemOutputs(werkstoff.get(gemExquisite), GTOreDictUnificator.get(dustTiny, Materials.DarkAsh, 2))
+                    .duration(20 * TICKS)
+                    .eut(TierEU.RECIPE_LV)
+                    .metadata(ADDITIVE_AMOUNT, 8)
+                    .addTo(implosionRecipes);
+
+                GTValues.RA.stdBuilder()
+                    .itemInputs(werkstoff.get(gem, 3))
+                    .itemOutputs(werkstoff.get(gemFlawless), GTOreDictUnificator.get(dustTiny, Materials.DarkAsh, 2))
+                    .duration(20 * TICKS)
+                    .eut(TierEU.RECIPE_LV)
+                    .metadata(ADDITIVE_AMOUNT, 8)
+                    .addTo(implosionRecipes);
+
+                GTValues.RA.stdBuilder()
+                    .itemInputs(werkstoff.get(gemFlawed, 3))
+                    .itemOutputs(werkstoff.get(gem), GTOreDictUnificator.get(dustTiny, Materials.DarkAsh, 2))
+                    .duration(20 * TICKS)
+                    .eut(TierEU.RECIPE_LV)
+                    .metadata(ADDITIVE_AMOUNT, 8)
+                    .addTo(implosionRecipes);
+
+                GTValues.RA.stdBuilder()
+                    .itemInputs(werkstoff.get(gemChipped, 3))
+                    .itemOutputs(werkstoff.get(gemFlawed), GTOreDictUnificator.get(dustTiny, Materials.DarkAsh, 2))
+                    .duration(20 * TICKS)
+                    .eut(TierEU.RECIPE_LV)
+                    .metadata(ADDITIVE_AMOUNT, 8)
+                    .addTo(implosionRecipes);
+
+                GTValues.RA.stdBuilder()
+                    .itemInputs(werkstoff.get(dust, 4))
+                    .itemOutputs(werkstoff.get(gem, 3), GTOreDictUnificator.get(dustTiny, Materials.DarkAsh, 8))
+                    .duration(20 * TICKS)
+                    .eut(TierEU.RECIPE_LV)
+                    .metadata(ADDITIVE_AMOUNT, 24)
+                    .addTo(implosionRecipes);
+            }
+
             if (werkstoff.hasItemType(plate)) {
 
                 GTValues.RA.stdBuilder()

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java
@@ -4,6 +4,7 @@
 import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.*;
 import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.chainAllGlasses;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -40,7 +41,6 @@
 import gregtech.api.metatileentity.implementations.MTEHatch;
 import gregtech.api.metatileentity.implementations.MTEHatchInput;
 import gregtech.api.metatileentity.implementations.MTEHatchOutput;
-import gregtech.api.multitileentity.multiblock.casing.Glasses;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
@@ -124,7 +124,7 @@ public IStructureDefinition<MTEExtremeHeatExchanger> getStructure_EM() {
                             .dot(5)
                             .build(),
                         onElementPass(x -> x.casingAmount++, ofBlock(GregTechAPI.sBlockCasings4, 0))))
-                .addElement('G', Glasses.chainAllGlasses())
+                .addElement('G', chainAllGlasses())
                 .addElement('P', ofBlock(GregTechAPI.sBlockCasings2, 15))
                 .addElement('W', ofBlock(Loaders.pressureResistantWalls, 0))
                 .build();

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java
@@ -2,6 +2,7 @@
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
 import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.chainAllGlasses;
 import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.ArrayList;
@@ -47,7 +48,6 @@
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.implementations.MTEHatch;
-import gregtech.api.multitileentity.multiblock.casing.Glasses;
 import gregtech.api.objects.XSTR;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
@@ -229,7 +229,7 @@ public IStructureDefinition<MTENeutronActivator> getStructure_EM() {
                         onElementPass(MTENeutronActivator::onCasingFound, ofBlock(GregTechAPI.sBlockCasings4, 1))))
                 .addElement('D', ofBlock(GregTechAPI.sBlockCasings2, 6))
                 .addElement('F', ofFrame(Materials.Steel))
-                .addElement('G', Glasses.chainAllGlasses())
+                .addElement('G', chainAllGlasses())
                 .addElement('P', ofBlock(Loaders.speedingPipe, 0))
                 .addElement(
                     'X',

diff --git a/src/main/java/gregtech/GTMod.java b/src/main/java/gregtech/GTMod.java
@@ -88,7 +88,6 @@
 import gregtech.common.config.Other;
 import gregtech.common.config.Worldgen;
 import gregtech.common.covers.CoverFacadeAE;
-import gregtech.common.items.flinttools.FlintTools;
 import gregtech.common.misc.GTCommand;
 import gregtech.common.misc.spaceprojects.commands.SPCommand;
 import gregtech.common.misc.spaceprojects.commands.SPMCommand;
@@ -120,7 +119,6 @@
 import gregtech.loaders.postload.RecyclerBlacklistLoader;
 import gregtech.loaders.postload.ScrapboxDropLoader;
 import gregtech.loaders.preload.GTPreLoad;
-import gregtech.loaders.preload.GT_Loader_MultiTileEntities;
 import gregtech.loaders.preload.LoaderCircuitBehaviors;
 import gregtech.loaders.preload.LoaderGTBlockFluid;
 import gregtech.loaders.preload.LoaderGTItemData;
@@ -299,9 +297,6 @@ public void onPreLoad(FMLPreInitializationEvent aEvent) {
         new LoaderGTItemData().run();
         new LoaderGTBlockFluid().run();
         new LoaderMetaTileEntities().run();
-        if (GTValues.enableMultiTileEntities) {
-            new GT_Loader_MultiTileEntities().run();
-        }
 
         new LoaderCircuitBehaviors().run();
         new CoverBehaviorLoader().run();
@@ -329,11 +324,6 @@ public void onPreLoad(FMLPreInitializationEvent aEvent) {
         if (FMLCommonHandler.instance()
             .getEffectiveSide()
             .isServer()) AssemblyLineServer.fillMap(aEvent);
-
-        // Flint tool setup.
-        FlintTools.registerTools();
-        FlintTools.registerPosteaTransformations();
-        FlintTools.registerRecipes();
     }
 
     @Mod.EventHandler
@@ -541,7 +531,7 @@ public void onPostLoad(FMLPostInitializationEvent aEvent) {
             .map(tName -> GTModHandler.getIC2Item(tName, 1L))
             .forEach(GTModHandler::removeRecipeByOutputDelayed);
 
-        GTPostLoad.nerfVanillaTools();
+        GTPostLoad.changeWoodenVanillaTools();
 
         // Register postea transformers
         new PosteaTransformers().run();