Merge branch 'master' into biovat

GTNewHorizons · Jan 8, 2025 · 53af461 · 53af461
2 parents 3daf840 + 8df3b12
commit 53af461
Show file tree

Hide file tree

Showing 20 changed files with 196 additions and 1,085 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,29 +1,29 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.40:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.58:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
     implementation("com.github.GTNewHorizons:GTNHLib:0.6.0:dev")
 
     compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:twilightforest:2.7.1:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.10:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.1-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.16:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
-    compileOnly("com.github.GTNewHorizons:Chisel:2.16.0-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Chisel:2.16.1-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:amunra:0.7.1:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.8-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.0:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:amunra:0.8.0:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.1-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev")
 
     runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")

diff --git a/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java b/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java
@@ -27,7 +27,7 @@
 public class AchievementHandler {
 
     private static final Map<UUID, Integer> LAST_DEATHCOUNT = new HashMap<>();
-    private static final HashMap<UUID, Float> LAST_DAMAGE = new HashMap<>();
+    private static final Map<UUID, Float> LAST_DAMAGE = new HashMap<>();
 
     private static StatBase infinityArmorAchievement;
     private static StatBase omegaArmorAchievement;

diff --git a/src/main/java/com/dreammaster/creativetab/ModTabList.java b/src/main/java/com/dreammaster/creativetab/ModTabList.java
@@ -1,13 +1,10 @@
 package com.dreammaster.creativetab;
 
-import static com.dreammaster.gthandler.casings.GT_Container_CasingsNH.sBlockCasingsNH;
-
 import java.util.List;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 
 import com.dreammaster.gthandler.CustomItemList;
 import com.dreammaster.item.ItemList;
@@ -59,13 +56,6 @@ public static void InitModTabs(CreativeTabsManager pTabManager, ModItemManager p
 
                     @Override
                     public void displayAllReleventItems(List stuffToShow) {
-                        // casing adder
-                        for (int i = 0; i < 16; ++i) {
-                            ItemStack aStack = new ItemStack(sBlockCasingsNH, 1, i);
-                            if (!aStack.getDisplayName().contains(".name")) {
-                                stuffToShow.add(aStack);
-                            }
-                        }
                         // te adder
                         for (CustomItemList item : CustomItemList.values()) {
                             if (item.hasBeenSet() && item.getBlock() == GregTechAPI.sBlockMachines) {

diff --git a/src/main/java/com/dreammaster/gthandler/CustomItemList.java b/src/main/java/com/dreammaster/gthandler/CustomItemList.java
@@ -13,27 +13,9 @@
 
 public enum CustomItemList implements IItemContainer {
 
-    Casing_Pyrolyse,
     Machine_Multi_AirFilterT1,
     Machine_Multi_AirFilterT2,
     Machine_Multi_AirFilterT3,
-    Casing_AirFilter_Vent_T1,
-    Casing_AirFilter_Turbine_T1,
-    Casing_AirFilter_Vent_T2,
-    Casing_AirFilter_Turbine_T2,
-    Casing_AirFilter_Vent_T3,
-    Casing_AirFilter_Turbine_T3,
-    // todo: remap them to GT5U namespace
-    @Deprecated
-    Casing_UEV,
-    @Deprecated
-    Casing_UIV,
-    @Deprecated
-    Casing_UMV,
-    @Deprecated
-    Casing_UXV,
-    @Deprecated
-    Casing_MAXV,
 
     // CoreModItems
     EtchedLowVoltageWiring,