Merge branch 'master' into master

GTNewHorizons · Dec 21, 2023 · 1159016 · 1159016
2 parents efb545d + 860de4f
commit 1159016
Show file tree

Hide file tree

Showing 12 changed files with 177 additions and 130 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1701530445
+//version: 1702141377
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -54,7 +54,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26'
 }
 
 print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -613,7 +613,7 @@ repositories {
         }
         maven {
             name = "ic2"
-            url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/")
+            url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/")
             content {
                 includeGroup "net.industrial-craft"
             }
@@ -672,6 +672,8 @@ configurations.all {
         substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
         substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
         substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
+
+        substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets')
     }
 }
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,22 +1,22 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.98:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.108:dev")
     api("com.github.GTNewHorizons:Yamcl:0.5.86:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.3:dev")
 
     compileOnly("com.github.GTNewHorizons:Avaritia:1.46:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.7:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TecTech:5.3.20:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:bartworks:0.8.20:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.9:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TecTech:5.3.23:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:bartworks:0.8.22:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly("curse.maven:witchery-69673:2234410") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.39:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.54:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false }

diff --git a/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java b/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java
@@ -16,10 +16,12 @@
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent;
 import cpw.mods.fml.relauncher.Side;
 import fox.spiteful.avaritia.items.LudicrousItems;
+import tconstruct.library.tools.ToolCore;
 
 public class AchievementHandler {
 
@@ -32,6 +34,7 @@ public class AchievementHandler {
     public static StatBase eternityBeaconAchievement;
     private static StatBase allEffects;
     private static StatBase hearts;
+    private static StatBase unbreakableTool;
     private static int numberPotions = 0;
 
     public static void init() {
@@ -41,6 +44,7 @@ public static void init() {
         eternityBeaconAchievement = StatList.func_151177_a("eternity_beacon");
         allEffects = StatList.func_151177_a("all_effects");
         hearts = StatList.func_151177_a("100_hearts");
+        unbreakableTool = StatList.func_151177_a("unbreakable_tconstruct_tool");
 
         for (Potion potion : Potion.potionTypes) {
             if (potion != null && !potion.isInstant()) {
@@ -124,6 +128,15 @@ public void onLivingHurt(LivingAttackEvent event) {
 
     }
 
+    @SubscribeEvent
+    public void onItemPickup(ItemPickupEvent event) {
+        ItemStack stack = event.pickedUp.getEntityItem();
+        if (stack.getItem() instanceof ToolCore && stack.hasTagCompound()
+                && stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Unbreaking") >= 10) {
+            event.player.triggerAchievement(unbreakableTool);
+        }
+    }
+
     private static boolean hasArmor(ItemStack[] armor, Item helmet, Item chestplate, Item leggins, Item boots) {
         ItemStack equippedHelmet = armor[3];
         ItemStack equippedChestplate = armor[2];

diff --git a/src/main/java/com/dreammaster/forestry/ForestryHelper.java b/src/main/java/com/dreammaster/forestry/ForestryHelper.java
@@ -1,5 +1,7 @@
 package com.dreammaster.forestry;
 
+import java.util.stream.Collectors;
+
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -9,31 +11,29 @@
 public class ForestryHelper {
 
     public static void removeCarpenterRecipe(ItemStack output) {
-        RecipeManagers.carpenterManager.removeRecipe(
-                RecipeManagers.carpenterManager.recipes().stream().filter(
-                        r -> GT_Utility.areStacksEqual(r.getCraftingGridRecipe().getRecipeOutput(), output, true))
-                        .findFirst().orElse(null));
+        RecipeManagers.carpenterManager.recipes().stream()
+                .filter(r -> GT_Utility.areStacksEqual(r.getCraftingGridRecipe().getRecipeOutput(), output, true))
+                .collect(Collectors.toList()).forEach(r -> RecipeManagers.carpenterManager.removeRecipe(r));
     }
 
     public static void removeCentrifugeRecipe(ItemStack input) {
-        RecipeManagers.centrifugeManager.removeRecipe(
-                RecipeManagers.centrifugeManager.recipes().stream()
-                        .filter(r -> GT_Utility.areStacksEqual(r.getInput(), input, true)).findFirst().orElse(null));
+        RecipeManagers.centrifugeManager.recipes().stream()
+                .filter(r -> GT_Utility.areStacksEqual(r.getInput(), input, true)).collect(Collectors.toList())
+                .forEach(r -> RecipeManagers.centrifugeManager.removeRecipe(r));
     }
 
     public static void removeSqueezerRecipe(FluidStack output, ItemStack... inputs) {
-        RecipeManagers.squeezerManager.removeRecipe(RecipeManagers.squeezerManager.recipes().stream().filter(r -> {
+        RecipeManagers.squeezerManager.recipes().stream().filter(r -> {
             if (!GT_Utility.areFluidsEqual(r.getFluidOutput(), output, true)) return false;
             for (int i = 0, inputsLength = inputs.length; i < inputsLength; i++)
                 if (!GT_Utility.areStacksEqual(r.getResources()[i], inputs[i], true)) return false;
             return true;
-        }).findFirst().orElse(null));
+        }).collect(Collectors.toList()).forEach(r -> RecipeManagers.squeezerManager.removeRecipe(r));
     }
 
     public static void removeFabricatorRecipe(ItemStack output) {
-        RecipeManagers.fabricatorManager.removeRecipe(
-                RecipeManagers.fabricatorManager.recipes().stream()
-                        .filter(r -> GT_Utility.areStacksEqual(r.getRecipeOutput(), output, true)).findFirst()
-                        .orElse(null));
+        RecipeManagers.fabricatorManager.recipes().stream()
+                .filter(r -> GT_Utility.areStacksEqual(r.getRecipeOutput(), output, true)).collect(Collectors.toList())
+                .forEach(r -> RecipeManagers.fabricatorManager.removeRecipe(r));
     }
 }
diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalBathRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalBathRecipes.java
@@ -63,8 +63,8 @@ public void run() {
         // Cooling Hot Netherrack Bricks
         GT_Values.RA.stdBuilder().itemInputs(CustomItemList.HotNetherrackBrick.get(1L))
                 .itemOutputs(CustomItemList.InfernalBrick.get(1L))
-                .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 1000)).duration(10 * SECONDS)
+                .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2coolant"), 250))
+                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 250)).duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV).addTo(chemicalBathRecipes);
         // Cooling Hot Kanthal MV
         GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Kanthal, 1L))

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java
@@ -149,6 +149,26 @@ public void run() {
                         null);
             }
 
+            if (GoodGenerator.isModLoaded()) {
+                // Advanced Radiation Proof Plate
+                IG_RecipeAdder.addSpaceAssemblerRecipe(
+                        new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lanthanum, 32L),
+                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 16L),
+                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 16L),
+                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 64L),
+                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 16L),
+                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16L),
+                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 16L) },
+                        new FluidStack[] { new FluidStack(solderIndalloy, (32 * 144)),
+                                Materials.Lead.getMolten(64 * 144L) },
+                        GT_ModHandler.getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 4L, 0),
+                        1,
+                        50 * 20,
+                        (int) TierEU.ZPM,
+                        null,
+                        null);
+            }
+
             // Alternate Energy Cluster Recipe
             IG_RecipeAdder.addSpaceAssemblerRecipe(
                     new ItemStack[] { ItemList.Circuit_Board_Bio_Ultra.get(1),

diff --git a/src/main/java/com/dreammaster/lib/Refstrings.java b/src/main/java/com/dreammaster/lib/Refstrings.java
@@ -7,7 +7,7 @@ public final class Refstrings {
     public static final String MODID = Mods.Names.NEW_HORIZONS_CORE_MOD;
     public static final String NAME = "GT: New Horizons";
     public static final String VERSION = BuildVersion.VERSION;
-    public static final String MODPACKPACK_VERSION = "2.4.2";
+    public static final String MODPACKPACK_VERSION = "2.5.0";
     public static final String CLIENTSIDE = "com.dreammaster.main.ClientProxy";
     public static final String SERVERSIDE = "com.dreammaster.main.CommonProxy";
     public static final String COLLECTIONID = "GTNewHorizons";

diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java
@@ -486,7 +486,10 @@ public void CompleteLoad(FMLLoadCompleteEvent event) {
             BW_RadHatchMaterial.runRadHatchAdder();
         }
         if (Thaumcraft.isModLoaded()) TCLoader.checkRecipeProblems();
-        if (Loader.isModLoaded("amazingtrophies") && BloodMagic.isModLoaded() && Avaritia.isModLoaded()) {
+        if (Loader.isModLoaded("amazingtrophies") && BloodMagic.isModLoaded()
+                && Avaritia.isModLoaded()
+                && SGCraft.isModLoaded()
+                && TinkerConstruct.isModLoaded()) {
             AchievementHandler.init();
             AchievementHandler handler = new AchievementHandler();
             MinecraftForge.EVENT_BUS.register(handler);

diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java
@@ -53,7 +53,16 @@ private static void stopBuffering() {
         int i = tList.size();
         tList.removeIf(r -> {
             ItemStack rCopy = r.getRecipeOutput();
-            if (rCopy == null) return false; // ????????????????????
+            if (rCopy == null) {
+                return false;
+            }
+            if (rCopy.getItem() == null) {
+                MainRegistry.Logger.warn("Someone is adding recipes with null items!");
+                for (StackTraceElement element : Thread.currentThread().getStackTrace()) {
+                    MainRegistry.Logger.warn(element.toString());
+                }
+                return true;
+            }
             if (rCopy.stackTagCompound != null) {
                 rCopy = rCopy.copy();
                 rCopy.stackTagCompound = null;

diff --git a/src/main/java/com/dreammaster/scripts/ScriptBiblioCraft.java b/src/main/java/com/dreammaster/scripts/ScriptBiblioCraft.java
@@ -756,7 +756,7 @@ public void loadRecipes() {
             addShapedRecipe(
                     TypeWriterB[i],
                     "plateRubber",
-                    getModItem(OpenComputers.ID, "item", 1, 20),
+                    getModItem(OpenComputers.ID, "keyboard", 1),
                     "plateRubber",
                     "ringIron",
                     color16[i],