Merge pull request #213 from Sefiraat/fix/dynatech-changes

Fix DynaTech renaming
Sefiraat · Sep 3, 2024 · 30cf8f0 · 30cf8f0
2 parents f026baa + ab75974
commit 30cf8f0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -244,7 +244,7 @@
         <dependency>
             <groupId>com.github.Slimefun</groupId>
             <artifactId>Slimefun4</artifactId>
-            <version>03e5b9a</version>
+            <version>d25f22439e</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/.../io/github/sefiraat/slimetinker/items/tinkermaterials/setup/TinkersMaterialsDynatech.java b/.../io/github/sefiraat/slimetinker/items/tinkermaterials/setup/TinkersMaterialsDynatech.java
@@ -18,53 +18,52 @@ private TinkersMaterialsDynatech() {
 
     private static final Map<String, TinkerMaterial> CM_MAP = new HashMap<>();
 
-    private static final TinkerMaterial STAINLESS_STEEL = new TinkerMaterial(Ids.STAINLESS_STEEL, SlimefunItem.getById("DT_STAINLESS_STEEL_INGOT").getItem(), "#d1d1d1")
+    private static final TinkerMaterial STAINLESS_STEEL = new TinkerMaterial(Ids.STAINLESS_STEEL, SlimefunItem.getById("DYNATECH_STAINLESS_STEEL_INGOT").getItem(), "#d1d1d1")
         .setLiquidTexture(SkullTextures.ALLOY_SILVER)
         .setTraitToolHead(Traits.DYN_STAINLESS_STEEL_HEAD)
         .setTraitToolRod(Traits.DYN_STAINLESS_STEEL_ROD)
         .setTraitArmorPlates(Traits.DYN_STAINLESS_STEEL_PLATES)
         .setTraitArmorLinks(Traits.DYN_STAINLESS_STEEL_LINKS)
         .setFormNugget(Materials.NUGGET_CAST_STAINLESSSTEEL.getItemId())
-        .setFormIngot("DT_STAINLESS_STEEL_INGOT")
+        .setFormIngot("DYNATECH_STAINLESS_STEEL_INGOT")
         .setFormBlock(Materials.BLOCK_CAST_STAINLESSSTEEL.getItemId())
         .addAlloyRecipe(
             TinkersMaterialsCore.getCmMap().get(Ids.IRON).getLiquidItemStack(2),
             TinkersMaterialsCore.getCmMap().get(Ids.ZINC).getLiquidItemStack(1)
         )
         .build();
 
-    private static final TinkerMaterial VEX_GEM = new TinkerMaterial(Ids.VEX_GEM, SlimefunItem.getById("VEX_GEM").getItem(), "#38c0c2")
+    private static final TinkerMaterial VEX_GEM = new TinkerMaterial(Ids.VEX_GEM, SlimefunItem.getById("DYNATECH_VEX_GEM").getItem(), "#38c0c2")
         .setLiquidTexture(SkullTextures.ALLOY_BLUE_PALE)
         .setTraitToolBinder(Traits.DYN_VEX_GEM_BINDING)
         .setTraitArmorGambeson(Traits.DYN_VEX_GEM_GAMBESON)
-        .setFormGem("VEX_GEM")
+        .setFormGem("DYNATECH_VEX_GEM")
         .build();
 
-    private static final TinkerMaterial STARDUST = new TinkerMaterial(Ids.STARDUST, SlimefunItem.getById("STAR_DUST").getItem(), "#fdff96")
+    private static final TinkerMaterial STARDUST = new TinkerMaterial(Ids.STARDUST, SlimefunItem.getById("DYNATECH_STAR_DUST").getItem(), "#fdff96")
         .setLiquidTexture(SkullTextures.ALLOY_SILVER)
         .setTraitToolHead(Traits.DYN_STAR_DUST_HEAD)
         .setTraitToolRod(Traits.DYN_STAR_DUST_ROD)
         .setTraitArmorPlates(Traits.DYN_STAR_DUST_PLATES)
         .setTraitArmorLinks(Traits.DYN_STAR_DUST_LINKS)
-        .setFormOre("STARDUST_METEOR")
-        .setFormGem("STAR_DUST")
+        .setFormGem("DYNATECH_STAR_DUST")
         .build();
 
-    private static final TinkerMaterial GHOSTLY_ESSENCE = new TinkerMaterial(Ids.GHOSTLY_ESSENCE, SlimefunItem.getById("GHOSTLY_ESSENCE").getItem(), "#d4ffef")
+    private static final TinkerMaterial GHOSTLY_ESSENCE = new TinkerMaterial(Ids.GHOSTLY_ESSENCE, SlimefunItem.getById("DYNATECH_GHOSTLY_ESSENCE").getItem(), "#d4ffef")
         .setLiquidTexture(SkullTextures.ALLOY_BROWN)
         .setTraitToolBinder(Traits.DYN_GHOSTLY_ESSENCE_BINDING)
         .setTraitToolRod(Traits.DYN_GHOSTLY_ESSENCE_ROD)
         .setTraitArmorGambeson(Traits.DYN_GHOSTLY_ESSENCE_GAMBESON)
         .setTraitArmorLinks(Traits.DYN_GHOSTLY_ESSENCE_LINKS)
-        .setFormDust("GHOSTLY_ESSENCE")
+        .setFormDust("DYNATECH_GHOSTLY_ESSENCE")
         .build();
 
-    private static final TinkerMaterial TESSERACT = new TinkerMaterial(Ids.TESSERACT, SlimefunItem.getById("TESSERACTING_OBJ").getItem(), "#c7ba9f")
+    private static final TinkerMaterial TESSERACT = new TinkerMaterial(Ids.TESSERACT, SlimefunItem.getById("DYNATECH_TESSERACTING_OBJECT").getItem(), "#c7ba9f")
         .setLiquidTexture(SkullTextures.ALLOY_TAN)
         .setTraitToolHead(Traits.DYN_TESSERACT_HEAD)
         .setTraitArmorPlates(Traits.DYN_TESSERACT_PLATES)
         .setTraitArmorLinks(Traits.DYN_TESSERACT_LINKS)
-        .setFormBlock("TESSERACTING_OBJ")
+        .setFormBlock("DYNATECH_TESSERACTING_OBJECT")
         .build();
 
     static {