Merge branch 'master' into matter-manipulator

GTNewHorizons · Sep 25, 2024 · 2826b0c · 2826b0c
2 parents 5dbaa25 + 683e097
commit 2826b0c
Show file tree

Hide file tree

Showing 65 changed files with 531 additions and 701 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -49,7 +49,7 @@ dependencies {
 
     compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev')
     compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")
-    compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.12:dev")
+    compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.13:dev")
     implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
     // Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}

diff --git a/src/main/java/bartworks/system/material/Werkstoff.java b/src/main/java/bartworks/system/material/Werkstoff.java
@@ -1089,8 +1089,29 @@ public Werkstoff.Stats setQualityOverride(byte qualityOverride) {
         private double ebfGasRecipeTimeMultiplier = -1.0;
         private double ebfGasRecipeConsumedAmountMultiplier = 1.0;
 
+        private boolean autoGenerateBlastFurnaceRecipes = true;
+        private boolean autoGenerateVacuumFreezerRecipes = true;
+
         float durMod = 1f;
 
+        public boolean autoGenerateBlastFurnaceRecipes() {
+            return autoGenerateBlastFurnaceRecipes;
+        }
+
+        public boolean autoGenerateVacuumFreezerRecipes() {
+            return autoGenerateVacuumFreezerRecipes;
+        }
+
+        public Werkstoff.Stats disableAutoGeneratedBlastFurnaceRecipes() {
+            autoGenerateBlastFurnaceRecipes = false;
+            return this;
+        }
+
+        public Werkstoff.Stats disableAutoGeneratedVacuumFreezerRecipes() {
+            autoGenerateVacuumFreezerRecipes = false;
+            return this;
+        }
+
         public float getDurMod() {
             return this.durMod;
         }

diff --git a/src/main/java/bartworks/system/material/WerkstoffLoader.java b/src/main/java/bartworks/system/material/WerkstoffLoader.java
@@ -1049,6 +1049,7 @@ public static void setUp() {
         new Werkstoff.GenerationFeatures().onlyDust()
             .addMolten()
             .addMetalItems()
+            .addCraftingMetalWorkingItems()
             .enforceUnification(),
         64,
         TextureSet.SET_METALLIC
@@ -1236,6 +1237,7 @@ public static void setUp() {
             .onlyDust()
             .addMetalItems()
             .addMolten()
+            .addCraftingMetalWorkingItems()
             .enforceUnification(),
         78,
         TextureSet.SET_METALLIC);

diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
diff --git a/src/main/java/goodgenerator/items/GGMaterial.java b/src/main/java/goodgenerator/items/GGMaterial.java
@@ -305,7 +305,9 @@ public class GGMaterial implements Runnable {
             .setRadioactive(true)
             .setDurOverride(180224)
             .setSpeedOverride(100f)
-            .setQualityOverride((byte) 11),
+            .setQualityOverride((byte) 11)
+            .disableAutoGeneratedBlastFurnaceRecipes()
+            .disableAutoGeneratedVacuumFreezerRecipes(),
         Werkstoff.Types.ELEMENT,
         new Werkstoff.GenerationFeatures().onlyDust()
             .addMolten()

diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -1271,16 +1271,6 @@ public static void InitLoadRecipe() {
             .metadata(COIL_HEAT, 4600)
             .addTo(blastFurnaceRecipes);
 
-        GTValues.RA.stdBuilder()
-            .itemInputs(
-                GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 1),
-                GTUtility.getIntegratedCircuit(1))
-            .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot))
-            .duration(6 * MINUTES + 40 * SECONDS)
-            .eut(TierEU.RECIPE_ZPM)
-            .metadata(COIL_HEAT, 7000)
-            .addTo(blastFurnaceRecipes);
-
         GTValues.RA.stdBuilder()
             .itemInputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot, 1))
             .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot, 1))

diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java
@@ -104,14 +104,12 @@ public static void RecipeLoad() {
             .eut(TierEU.RECIPE_UHV)
             .addTo(assemblerRecipes);
 
+        CrackRecipeAdder.reAddBlastRecipe(GGMaterial.extremelyUnstableNaquadah, 8000, 122880, 7000, false);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 500, 480, 2800, true);
-        CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 513, 480, 2800, false);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 500, 480, 2800, true);
-        CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 513, 480, 2800, false);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.incoloy903, 1200, 1920, 3700, true);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.adamantiumAlloy, 2500, 1920, 5500, true);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 200, 7680, 5000, true);
-        CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 220, 7680, 5000, false);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.signalium, 1600, 30720, 4000, true);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.lumiium, 1600, 30720, 4000, true);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.artheriumSn, 500, 122880, 6500, true);
@@ -1334,6 +1332,7 @@ public static void RecipeLoad() {
                     GTOreDictUnificator.get(OrePrefixes.cableGt02, Materials.Osmiridium, 2),
                     GGMaterial.marM200.get(OrePrefixes.plateDouble, 2),
                     GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1),
+
                     MaterialsElements.getInstance().RUTHENIUM.getBolt(32),
                     GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 8))
                 .fluidInputs(GGMaterial.zircaloy4.getMolten(576))

diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java
@@ -3,7 +3,6 @@
 import static gregtech.api.recipe.RecipeMaps.benderRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
-import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
@@ -317,12 +316,5 @@ public static void addRecipeForMultiItems() {
                     .addTo(benderRecipes);
             }
         }
-        Materials tUHV = Materials.Longasssuperconductornameforuhvwire;
-        GTValues.RA.stdBuilder()
-            .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, tUHV, 2))
-            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1))
-            .duration(Math.max(tUHV.getMass(), 1L) * TICKS)
-            .eut(TierEU.RECIPE_LV / 2)
-            .addTo(hammerRecipes);
     }
 }
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
@@ -382,8 +382,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
 
     public static Materials Nano                    = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Nano"                    ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 11)));
     public static Materials Piko                    = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Piko"                    ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 12)));
-    public static Materials Quantum                 = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Quantum"                 ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 13)));
-
 
     /**
      * Aliases for the old style of tiered circuits

diff --git a/src/main/java/gregtech/api/enums/MaterialsGTNH.java b/src/main/java/gregtech/api/enums/MaterialsGTNH.java
@@ -199,29 +199,6 @@ public MaterialsGTNH() {
         1,
         1,
         Dyes.dyeYellow);
-    public static Materials Quantum = new Materials(
-        -1,
-        TextureSet.SET_NONE,
-        1.0F,
-        0,
-        0,
-        0,
-        255,
-        255,
-        255,
-        0,
-        "Quantum",
-        "Quantum",
-        0,
-        0,
-        -1,
-        0,
-        false,
-        false,
-        1,
-        1,
-        1,
-        Dyes.dyeWhite);
     public static Materials Turquoise = new Materials(
         -1,
         TextureSet.SET_NONE,

diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java
@@ -26,6 +26,7 @@
 import java.util.Optional;
 
 import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -85,6 +86,7 @@
 import gregtech.nei.formatter.FusionSpecialValueFormatter;
 import gregtech.nei.formatter.HeatingCoilSpecialValueFormatter;
 import gregtech.nei.formatter.SimpleSpecialValueFormatter;
+import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import mods.railcraft.common.blocks.aesthetics.cube.EnumCube;
 import mods.railcraft.common.items.RailcraftToolItems;
@@ -674,17 +676,29 @@ else if (Materials.PhasedIron.getMolten(1)
                         .setInputs(aInput1, aInput2, coal.getBlocks(aCoalAmount))
                         .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDust(aCoalAmount))
                         .setDuration(aDuration * 10);
-                    coll.derive()
-                        .setInputs(aInput1, aInput2, coal.getBlocks(aCoalAmount))
-                        .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDust(aCoalAmount))
-                        .setDuration(aDuration * 10);
                 }
                 if (Railcraft.isModLoaded()) {
                     coll.derive()
                         .setInputs(aInput1, aInput2, EnumCube.COKE_BLOCK.getItem(aCoalAmount / 2))
                         .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount / 2))
                         .setDuration(aDuration * 20 / 3);
                 }
+                ItemStack cactusCokeBlock = new ItemStack(
+                    Item.getItemFromBlock(ModBlocks.blockCactusCoke),
+                    aCoalAmount * 2,
+                    0);
+                ItemStack sugarCokeBlock = new ItemStack(
+                    Item.getItemFromBlock(ModBlocks.blockSugarCoke),
+                    aCoalAmount * 2,
+                    0);
+                coll.derive()
+                    .setInputs(aInput1, aInput2, cactusCokeBlock)
+                    .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount * 2))
+                    .setDuration(aDuration * 20 / 3);
+                coll.derive()
+                    .setInputs(aInput1, aInput2, sugarCokeBlock)
+                    .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount * 2))
+                    .setDuration(aDuration * 20 / 3);
             }
             return coll.getAll();
         })
@@ -776,7 +790,6 @@ && isArrayEmptyOrNull(b.getFluidOutputs())
     public static final RecipeMap<RecipeMapBackend> chemicalReactorRecipes = RecipeMapBuilder
         .of("gt.recipe.chemicalreactor")
         .maxIO(2, 2, 1, 1)
-        .minInputs(1, 0)
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isFluid) {
                 if (isOutput) {

diff --git a/src/main/java/gregtech/api/util/GTForestryCompat.java b/src/main/java/gregtech/api/util/GTForestryCompat.java
@@ -1,6 +1,5 @@
 package gregtech.api.util;
 
-import static gregtech.api.recipe.RecipeMaps.centrifugeNonCellRecipes;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.scannerFakeRecipes;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
@@ -16,6 +15,7 @@
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.recipe.RecipeMaps;
 
 public class GTForestryCompat {
@@ -132,8 +132,16 @@ public static void populateFakeNeiRecipes() {
     }
 
     public static void transferCentrifugeRecipes() {
+        ItemStack irradiatedComb = GTModHandler.getModItem(Mods.Forestry.ID, "beeCombs", 1, 9);
+
         try {
             for (ICentrifugeRecipe tRecipe : RecipeManagers.centrifugeManager.recipes()) {
+                ItemStack input = tRecipe.getInput();
+
+                // Don't transfer GT recipes to centrifuge, those recipes are made already by ItemComb
+                if (input.getUnlocalizedName()
+                    .contains("gt.comb")) continue;
+                if (irradiatedComb != null && input.isItemEqual(irradiatedComb)) continue;
                 Map<ItemStack, Float> outputs = tRecipe.getAllProducts();
                 ItemStack[] tOutputs = new ItemStack[outputs.size()];
                 int[] tChances = new int[outputs.size()];
@@ -151,14 +159,6 @@ public static void transferCentrifugeRecipes() {
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(5)
                     .addTo(centrifugeRecipes);
-
-                GTValues.RA.stdBuilder()
-                    .itemInputs(tRecipe.getInput())
-                    .itemOutputs(tOutputs)
-                    .outputChances(tChances)
-                    .duration(6 * SECONDS + 8 * TICKS)
-                    .eut(5)
-                    .addTo(centrifugeNonCellRecipes);
             }
         } catch (Throwable e) {
             if (GTValues.D1) {