Remove GT Arrows + Update gt metaid references (#35)

* update bs * update deps (and remove gt mods) * remove gt arrows + fix meta id references
GTNewHorizons · Jul 3, 2024 · 0e7df55 · 0e7df55
1 parent 45f49c6
commit 0e7df55
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 50 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -4,12 +4,10 @@ dependencies {
     compileOnly('com.google.auto.value:auto-value-annotations:1.8.2')
     annotationProcessor('com.google.auto.value:auto-value:1.8.2')
 
-    api('com.github.GTNewHorizons:NotEnoughItems:2.6.0-GTNH:dev')
+    api('com.github.GTNewHorizons:NotEnoughItems:2.6.11-GTNH:dev')
 
-    api('com.github.GTNewHorizons:DetravScannerMod:1.8.0:dev') {transitive=false}
+    api('com.github.GTNewHorizons:DetravScannerMod:1.8.1:dev') {transitive=false}
     api('com.github.GTNewHorizons:EnderStorage:1.6.0:dev') {transitive=false}
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.23:dev')
-    api('com.github.GTNewHorizons:GTplusplus:1.12.10:dev')
-    api('com.github.GTNewHorizons:NewHorizonsCoreMod:2.4.9:dev')
-    api('com.github.GTNewHorizons:bartworks:0.10.11:dev')
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.62:dev')
+    api('com.github.GTNewHorizons:NewHorizonsCoreMod:2.5.19:dev')
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
 }
 
 
diff --git a/.../github/dcysteine/neicustomdiagram/generators/gregtech5/materialtools/DiagramFactory.java b/.../github/dcysteine/neicustomdiagram/generators/gregtech5/materialtools/DiagramFactory.java
@@ -28,10 +28,7 @@ private enum MaterialPart {
                 OrePrefixes.toolHeadSense, OrePrefixes.toolHeadPlow, OrePrefixes.toolHeadDrill,
                 OrePrefixes.toolHeadChainsaw, OrePrefixes.toolHeadWrench, OrePrefixes.toolHeadBuzzSaw),
 
-        TURBINE_BLADE(LayoutHandler.SlotKeys.TURBINE_BLADE, OrePrefixes.turbineBlade),
-
-        ARROWHEAD(LayoutHandler.SlotKeys.ARROWHEAD, OrePrefixes.toolHeadArrow),
-        ARROWS(LayoutHandler.SlotGroupKeys.ARROWS, OrePrefixes.arrowGtWood, OrePrefixes.arrowGtPlastic);
+        TURBINE_BLADE(LayoutHandler.SlotKeys.TURBINE_BLADE, OrePrefixes.turbineBlade);
 
         private final Layout.Key slotKey;
         private final ImmutableList<OrePrefixes> prefixes;

diff --git a/.../dcysteine/neicustomdiagram/generators/gregtech5/materialtools/GregTechMaterialTools.java b/.../dcysteine/neicustomdiagram/generators/gregtech5/materialtools/GregTechMaterialTools.java
@@ -26,16 +26,13 @@
 import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.api.objects.ItemData;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.common.items.ID_MetaTool_01;
 
 public final class GregTechMaterialTools implements DiagramGenerator {
 
     public static final ItemComponent ICON = ItemComponent.createWithNbt(
-            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                    GT_MetaGenerated_Tool_01.HARDHAMMER,
-                    1,
-                    Materials.Aluminium,
-                    Materials.Wood,
-                    null));
+            GT_MetaGenerated_Tool_01.INSTANCE
+                    .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, Materials.Aluminium, Materials.Wood, null));
 
     private final DiagramGroupInfo info;
 

diff --git a/...m/github/dcysteine/neicustomdiagram/generators/gregtech5/materialtools/LayoutHandler.java b/...m/github/dcysteine/neicustomdiagram/generators/gregtech5/materialtools/LayoutHandler.java
@@ -19,7 +19,6 @@ class LayoutHandler {
     static final class SlotKeys {
 
         static final Layout.SlotKey TURBINE_BLADE = Layout.SlotKey.create("turbine-blade");
-        static final Layout.SlotKey ARROWHEAD = Layout.SlotKey.create("arrowhead");
     }
 
     static final class SlotGroupKeys {
@@ -28,8 +27,6 @@ static final class SlotGroupKeys {
         static final Layout.SlotGroupKey TOOL_PARTS = Layout.SlotGroupKey.create("tool-parts");
 
         static final Layout.SlotGroupKey TURBINES = Layout.SlotGroupKey.create("turbines");
-        static final Layout.SlotGroupKey ARROWS = Layout.SlotGroupKey.create("arrows");
-
         static final Layout.SlotGroupKey SCANNERS = Layout.SlotGroupKey.create("scanners");
         static final Layout.SlotGroupKey ELECTRIC_SCANNERS = Layout.SlotGroupKey.create("electric-scanners");
     }
@@ -54,8 +51,6 @@ void initialize() {
         optionalLayoutsBuilder.add(buildToolsLayout());
         optionalLayoutsBuilder.add(buildTurbineBladeLayout());
         optionalLayoutsBuilder.add(buildTurbinesLayout());
-        optionalLayoutsBuilder.add(buildArrowheadLayout());
-        optionalLayoutsBuilder.add(buildArrowsLayout());
         optionalLayoutsBuilder.add(buildScannersLayout());
         optionalLayouts = optionalLayoutsBuilder.build();
     }
@@ -122,29 +117,6 @@ private Layout buildTurbinesLayout() {
                 .build();
     }
 
-    private Layout buildArrowheadLayout() {
-        return Layout.builder().putSlot(
-                SlotKeys.ARROWHEAD,
-                Slot.builder(Grid.GRID.grid(0, 6)).setTooltip(
-                        Tooltip.create(Lang.GREGTECH_5_MATERIAL_TOOLS.trans("arrowheadslot"), Tooltip.SLOT_FORMATTING))
-                        .build())
-                .build();
-    }
-
-    private Layout buildArrowsLayout() {
-        return Layout.builder()
-                .addLines(Lines.builder(Grid.GRID.grid(0, 6)).addArrow(Grid.GRID.edge(2, 6, Grid.Direction.W)).build())
-                .putSlotGroup(
-                        SlotGroupKeys.ARROWS,
-                        SlotGroup.builder(2, 1, Grid.GRID.grid(2, 6), Grid.Direction.E)
-                                .setDefaultTooltip(
-                                        Tooltip.create(
-                                                Lang.GREGTECH_5_MATERIAL_TOOLS.trans("arrowsslot"),
-                                                Tooltip.SLOT_FORMATTING))
-                                .build())
-                .build();
-    }
-
     private Layout buildScannersLayout() {
         return Layout.builder()
                 .addLines(Lines.builder(Grid.GRID.grid(4, 19)).addSegment(Grid.GRID.grid(10, 19)).build())

diff --git a/...m/github/dcysteine/neicustomdiagram/generators/gregtech5/materialtools/RecipeHandler.java b/...m/github/dcysteine/neicustomdiagram/generators/gregtech5/materialtools/RecipeHandler.java
@@ -30,6 +30,7 @@
 import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.common.items.ID_MetaTool_01;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 
 /**
@@ -71,10 +72,10 @@ public int compareTo(BaseTool other) {
             .thenComparing(Comparator.naturalOrder());
 
     private static final ImmutableList<Integer> TURBINE_TOOL_IDS = ImmutableList.of(
-            (int) GT_MetaGenerated_Tool_01.TURBINE_SMALL,
-            (int) GT_MetaGenerated_Tool_01.TURBINE,
-            (int) GT_MetaGenerated_Tool_01.TURBINE_LARGE,
-            (int) GT_MetaGenerated_Tool_01.TURBINE_HUGE);
+            ID_MetaTool_01.TURBINE_SMALL.ID,
+            ID_MetaTool_01.TURBINE.ID,
+            ID_MetaTool_01.TURBINE_LARGE.ID,
+            ID_MetaTool_01.TURBINE_HUGE.ID);
 
     private static final int ELECTRIC_SCANNER_ID_START = 100;