More unique ids for Galacticraft's Titanium

build.gradle

@@ -111,8 +111,6 @@ dependencies {
     implementation rfg.deobf('curse.maven:galacticraft-legacy-564236:4671122')
     // IC2 Classic
     implementation rfg.deobf('curse.maven:ic2-classic-242942:5800761')
-    // IC2 Experimental
-    implementation rfg.deobf('curse.maven:industrial-craft-242638:3838713')
     // Mo' Creatures Extended
     implementation rfg.deobf('curse.maven:mo-creatures-extended-867351:5654788')
     // Project Red

src/main/java/mod/emt/balkonsexpansion/BEConfig.java

@@ -79,8 +79,8 @@ public static class GalacticraftSettings {
         @Config.RequiresWorldRestart
         public boolean GC_HEAVY_DUTY_MATERIAL = true;
 
-        @Config.Name("Material: Titanium")
-        @Config.Comment("Enables support for the Titanium material [default: true]")
+        @Config.Name("Material: Titanium (Galacticraft Legacy)")
+        @Config.Comment("Enables support for the Titanium material from Galacticraft Legacy [default: true]")
         @Config.RequiresWorldRestart
         public boolean GC_TITANIUM_MATERIAL = true;
     }

src/main/java/mod/emt/balkonsexpansion/compat/galacticraft/GalacticraftRegistration.java

@@ -76,15 +76,15 @@ public static void registerItems(RegistryEvent.Register<Item> event) {
         }
 
         if (BEConfig.galacticraft_settings.GC_TITANIUM_MATERIAL) {
-            registry.register(spearTitanium = BEItemBuilder.createCustomSpear("spear.titanium", AsteroidsItems.TOOL_TITANIUM, -0.1F, 2.0F));
-            registry.register(halberdTitanium = BEItemBuilder.createCustomHalberd("halberd.titanium", AsteroidsItems.TOOL_TITANIUM, 0.6F, 2.0F));
-            registry.register(battleaxeTitanium = BEItemBuilder.createCustomBattleaxe("battleaxe.titanium", AsteroidsItems.TOOL_TITANIUM, 0.45F, 1.0F));
-            registry.register(knifeTitanium = BEItemBuilder.createCustomKnife("knife.titanium", AsteroidsItems.TOOL_TITANIUM, -0.1F));
-            registry.register(warhammerTitanium = BEItemBuilder.createCustomWarhammer("warhammer.titanium", AsteroidsItems.TOOL_TITANIUM, 0.7F));
-            registry.register(flailTitanium = BEItemBuilder.createCustomFlail("flail.titanium", AsteroidsItems.TOOL_TITANIUM));
-            registry.register(katanaTitanium = BEItemBuilder.createCustomKatana("katana.titanium", AsteroidsItems.TOOL_TITANIUM, -0.5F));
-            registry.register(boomerangTitanium = BEItemBuilder.createCustomBoomerang("boomerang.titanium", AsteroidsItems.TOOL_TITANIUM, 0.3F));
-            registry.register(bayonetTitanium = BEItemBuilder.createCustomMusketBayonet("musketbayonet.titanium", AsteroidsItems.TOOL_TITANIUM, knifeTitanium, -0.1F));
+            registry.register(spearTitanium = BEItemBuilder.createCustomSpear("spear.titanium.gc", AsteroidsItems.TOOL_TITANIUM, -0.1F, 2.0F));
+            registry.register(halberdTitanium = BEItemBuilder.createCustomHalberd("halberd.titanium.gc", AsteroidsItems.TOOL_TITANIUM, 0.6F, 2.0F));
+            registry.register(battleaxeTitanium = BEItemBuilder.createCustomBattleaxe("battleaxe.titanium.gc", AsteroidsItems.TOOL_TITANIUM, 0.45F, 1.0F));
+            registry.register(knifeTitanium = BEItemBuilder.createCustomKnife("knife.titanium.gc", AsteroidsItems.TOOL_TITANIUM, -0.1F));
+            registry.register(warhammerTitanium = BEItemBuilder.createCustomWarhammer("warhammer.titanium.gc", AsteroidsItems.TOOL_TITANIUM, 0.7F));
+            registry.register(flailTitanium = BEItemBuilder.createCustomFlail("flail.titanium.gc", AsteroidsItems.TOOL_TITANIUM));
+            registry.register(katanaTitanium = BEItemBuilder.createCustomKatana("katana.titanium.gc", AsteroidsItems.TOOL_TITANIUM, -0.5F));
+            registry.register(boomerangTitanium = BEItemBuilder.createCustomBoomerang("boomerang.titanium.gc", AsteroidsItems.TOOL_TITANIUM, 0.3F));
+            registry.register(bayonetTitanium = BEItemBuilder.createCustomMusketBayonet("musketbayonet.titanium.gc", AsteroidsItems.TOOL_TITANIUM, knifeTitanium, -0.1F));
         }
     }
 

src/main/resources/assets/balkonsexpansion/lang/en_us.lang

@@ -1,31 +1,31 @@
 # Galacticraft Legacy
 item.battleaxe.desh.name=Desh Battleaxe
 item.battleaxe.heavy_duty.name=Heavy Duty Battleaxe
-item.battleaxe.titanium.name=Titanium Battleaxe
+item.battleaxe.titanium.gc.name=Titanium Battleaxe
 item.boomerang.desh.name=Desh Boomerang
 item.boomerang.heavy_duty.name=Heavy Duty Boomerang
-item.boomerang.titanium.name=Titanium Boomerang
+item.boomerang.titanium.gc.name=Titanium Boomerang
 item.flail.desh.name=Desh Flail
 item.flail.heavy_duty.name=Heavy Duty Flail
-item.flail.titanium.name=Titanium Flail
+item.flail.titanium.gc.name=Titanium Flail
 item.halberd.desh.name=Desh Halberd
 item.halberd.heavy_duty.name=Heavy Duty Halberd
-item.halberd.titanium.name=Titanium Halberd
+item.halberd.titanium.gc.name=Titanium Halberd
 item.katana.desh.name=Desh Katana
 item.katana.heavy_duty.name=Heavy Duty Katana
-item.katana.titanium.name=Titanium Katana
+item.katana.titanium.gc.name=Titanium Katana
 item.knife.desh.name=Desh Knife
 item.knife.heavy_duty.name=Heavy Duty Knife
-item.knife.titanium.name=Titanium Knife
+item.knife.titanium.gc.name=Titanium Knife
 item.musketbayonet.desh.name=Musket with Desh Bayonet
 item.musketbayonet.heavy_duty.name=Musket with Heavy Duty Bayonet
-item.musketbayonet.titanium.name=Musket with Titanium Bayonet
+item.musketbayonet.titanium.gc.name=Musket with Titanium Bayonet
 item.spear.desh.name=Desh Spear
 item.spear.heavy_duty.name=Heavy Duty Spear
-item.spear.titanium.name=Titanium Spear
+item.spear.titanium.gc.name=Titanium Spear
 item.warhammer.desh.name=Desh Warhammer
 item.warhammer.heavy_duty.name=Heavy Duty Warhammer
-item.warhammer.titanium.name=Titanium Warhammer
+item.warhammer.titanium.gc.name=Titanium Warhammer
 
 # IndustrialCraft 2 Classic
 item.battleaxe.bronze.ic2c.name=Bronze Battleaxe

src/main/resources/assets/balkonsexpansion/models/item/battleaxe.titanium.json → src/main/resources/assets/balkonsexpansion/models/item/battleaxe.titanium.gc.json

@@ -8,7 +8,7 @@
       "predicate": {
         "weaponmod:block": 1
       },
-      "model": "balkonsexpansion:item/battleaxe.titanium.block"
+      "model": "balkonsexpansion:item/battleaxe.titanium.gc.block"
     }
   ]
 }

src/main/resources/assets/balkonsexpansion/models/item/boomerang.titanium.json → src/main/resources/assets/balkonsexpansion/models/item/boomerang.titanium.gc.json

@@ -8,7 +8,7 @@
       "predicate": {
         "weaponmod:ready-to-throw": 1
       },
-      "model": "balkonsexpansion:item/boomerang.titanium_ready"
+      "model": "balkonsexpansion:item/boomerang.titanium.gc_ready"
     }
   ]
 }

src/main/resources/assets/balkonsexpansion/models/item/flail.titanium-thrown.json → src/main/resources/assets/balkonsexpansion/models/item/flail.titanium.gc-thrown.json

@@ -1,5 +1,5 @@
 {
-  "parent": "balkonsexpansion:item/flail.titanium",
+  "parent": "balkonsexpansion:item/flail.titanium.gc",
   "textures": {
     "layer0": "balkonsexpansion:galacticraft/items/flail-thrown.titanium"
   }

src/main/resources/assets/balkonsexpansion/models/item/flail.titanium.json → src/main/resources/assets/balkonsexpansion/models/item/flail.titanium.gc.json

@@ -8,7 +8,7 @@
       "predicate": {
         "weaponmod:thrown": 1
       },
-      "model": "balkonsexpansion:item/flail.titanium-thrown"
+      "model": "balkonsexpansion:item/flail.titanium.gc-thrown"
     }
   ]
 }

src/main/resources/assets/balkonsexpansion/models/item/halberd.titanium.json → src/main/resources/assets/balkonsexpansion/models/item/halberd.titanium.gc.json

@@ -44,7 +44,7 @@
       "predicate": {
         "weaponmod:state": 1
       },
-      "model": "balkonsexpansion:item/halberd.titanium_state"
+      "model": "balkonsexpansion:item/halberd.titanium.gc_state"
     }
   ]
 }

src/main/resources/assets/balkonsexpansion/models/item/halberd.titanium_state.json → src/main/resources/assets/balkonsexpansion/models/item/halberd.titanium.gc_state.json

@@ -1,5 +1,5 @@
 {
-  "parent": "balkonsexpansion:item/halberd.titanium",
+  "parent": "balkonsexpansion:item/halberd.titanium.gc",
   "textures": {
     "layer0": "balkonsexpansion:galacticraft/items/halberd.titanium"
   },

src/main/resources/assets/balkonsexpansion/models/item/katana.titanium.json → src/main/resources/assets/balkonsexpansion/models/item/katana.titanium.gc.json

@@ -8,7 +8,7 @@
       "predicate": {
         "weaponmod:block": 1
       },
-      "model": "balkonsexpansion:item/katana.titanium.block"
+      "model": "balkonsexpansion:item/katana.titanium.gc.block"
     }
   ]
 }

src/main/resources/assets/balkonsexpansion/models/item/musketbayonet.titanium.json → src/main/resources/assets/balkonsexpansion/models/item/musketbayonet.titanium.gc.json

@@ -44,7 +44,7 @@
       "predicate": {
         "weaponmod:reload": 1
       },
-      "model": "balkonsexpansion:item/musketbayonet.titanium_reload"
+      "model": "balkonsexpansion:item/musketbayonet.titanium.gc_reload"
     }
   ]
 }