Most names changed to those that are more legible. Changed assicuated textures. Planned 8 special Traits for Alloys.

src/main/java/com/sosnitzka/ztic_addon/Blocks.java

@@ -15,6 +15,7 @@ import java.lang.reflect.Field;
 import java.util.Arrays;
 
 import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_BLOCK;
+import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_NUGGET;
 import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_ORE;
 
 public class Blocks {
@@ -22,54 +23,54 @@ public class Blocks {
     public static Block rottenGround = new BasicBlockGround("rotten_ground", Material.GROUND, 2.0f, 2.0f, 0);
     public static Block ligniteOre = new BlockLignite();
 
-    public static Block aardiumOre = new BasicBlock("aardium_ore", Material.ROCK, 55.0f, 400.0f, 5, PREFIX_ORE);
+    public static Block titaniteOre = new BasicBlock("titanite_ore", Material.ROCK, 55.0f, 400.0f, 5, PREFIX_ORE);
-    public static Block adamantiteOre = new BasicBlock("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, 6, PREFIX_ORE);
+    public static Block adamantiteOre = new BasicBlock("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, 8, PREFIX_ORE);
     public static Block arcaniteOre = new BasicBlock("arcanite_ore", Material.ROCK, 23.0f, 25.0f, 2, PREFIX_ORE);
-    public static Block axiidianOre = new BasicBlock("axiidian_ore", Material.ROCK, 13.0f, 13.0f, 3, PREFIX_ORE);
+    public static Block violiumOre = new BasicBlock("violium_ore", Material.ROCK, 13.0f, 13.0f, 4, PREFIX_ORE);
-    public static Block bismuthOre = new BasicBlock("bismuth_ore", Material.ROCK, 8.0f, 8.0f, 1, PREFIX_ORE);
+    public static Block bismuthOre = new BasicBlock("bismuth_ore", Material.ROCK, 8.0f, 8.0f, 5, PREFIX_ORE);
-    public static Block eterniteOre = new BasicBlock("eternite_ore", Material.ROCK, 24.0f, 25.0f, 3, PREFIX_ORE);
+    public static Block eterniteOre = new BasicBlock("eternite_ore", Material.ROCK, 24.0f, 25.0f, 4, PREFIX_ORE);
-    public static Block ignititeOre = new BasicBlock("ignitite_ore", Material.ROCK, 23.0f, 25.0f, 3, PREFIX_ORE);
+    public static Block ignititeOre = new BasicBlock("ignitite_ore", Material.ROCK, 23.0f, 25.0f, 7, PREFIX_ORE);
-    public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 13.0f, 15.0f, 1, PREFIX_ORE);
+    public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_ORE);
-    public static Block meteoriteOre = new BasicBlock("meteorite_ore", Material.ROCK, 60.0f, 500.0f, 4, PREFIX_ORE);
+    public static Block meteoriteOre = new BasicBlock("meteorite_ore", Material.ROCK, 60.0f, 500.0f, 6, PREFIX_ORE);
     public static Block mindoriteOre = new BasicBlock("mindorite_ore", Material.ROCK, 12.0f, 12.0f, 2, PREFIX_ORE);
-    public static Block mythrilOre = new BasicBlock("mythril_ore", Material.ROCK, 25.0f, 25.0f, 4, PREFIX_ORE);
+    public static Block mythrilOre = new BasicBlock("mythril_ore", Material.ROCK, 25.0f, 25.0f, 5, PREFIX_ORE);
-    public static Block palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3, PREFIX_ORE);
+    public static Block palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 25.0f, 6, PREFIX_ORE);
     public static Block prometheumOre = new BasicBlock("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, 0.25f, PREFIX_ORE);
-    public static Block slagironOre = new BasicBlock("slagiron_ore", Material.ROCK, 3.0f, 5.0f, 1);
+    public static Block slagironOre = new BasicBlock("slagiron_ore", Material.ROCK, 3.0f, 5.0f, 1, PREFIX_NUGGET);
-    public static Block slaggoldOre = new BasicBlock("slaggold_ore", Material.ROCK, 3.0f, 5.0f, 1);
+    public static Block slaggoldOre = new BasicBlock("slaggold_ore", Material.ROCK, 3.0f, 5.0f, 1, PREFIX_NUGGET);
     public static Block tiberiumOre = new BlockTiberium();
-    public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 70.0f, 800.0f, 4, PREFIX_ORE);
+    public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 70.0f, 800.0f, 7, PREFIX_ORE);
-    public static Block yrdeanOre = new BasicBlock("yrdean_ore", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_ORE);
+    public static Block rubiumOre = new BasicBlock("rubium_ore", Material.ROCK, 13.0f, 15.0f, 5, PREFIX_ORE);
 
-    public static Block aardiumBlock = new BasicBlock("aardium_block", Material.ROCK, 55.0f, 400.0f, 3, PREFIX_BLOCK);
+    public static Block titaniteBlock = new BasicBlock("titanite_block", Material.ROCK, 55.0f, 400.0f, 5, PREFIX_BLOCK);
-    public static Block adamantiteBlock = new BasicBlock("adamantite_block", Material.ROCK, 80.0f, 1000.0f, 4, PREFIX_BLOCK);
+    public static Block adamantiteBlock = new BasicBlock("adamantite_block", Material.ROCK, 80.0f, 1000.0f, 8, PREFIX_BLOCK);
-    public static Block arcaniteBlock = new BasicBlock("arcanite_block", Material.ROCK, 23.0f, 25.0f, 2, PREFIX_BLOCK);
+    public static Block arcaniteBlock = new BasicBlock("arcanite_block", Material.ROCK, 23.0f, 25.0f, 7, PREFIX_BLOCK);
-    public static Block axiidianBlock = new BasicBlock("axiidian_block", Material.ROCK, 13.0f, 13.0f, 3, PREFIX_BLOCK);
+    public static Block violiumBlock = new BasicBlock("violium_block", Material.ROCK, 13.0f, 13.0f, 4, PREFIX_BLOCK);
-    public static Block bismuthBlock = new BasicBlock("bismuth_block", Material.ROCK, 8.0f, 8.0f, 1, PREFIX_BLOCK);
+    public static Block bismuthBlock = new BasicBlock("bismuth_block", Material.ROCK, 8.0f, 8.0f, 5, PREFIX_BLOCK);
-    public static Block eterniteBlock = new BasicBlock("eternite_block", Material.ROCK, 24.0f, 25.0f, 3, PREFIX_BLOCK);
+    public static Block eterniteBlock = new BasicBlock("eternite_block", Material.ROCK, 24.0f, 25.0f, 4, PREFIX_BLOCK);
-    public static Block ignititeBlock = new BasicBlock("ignitite_block", Material.ROCK, 23.0f, 25.0f, 3, PREFIX_BLOCK);
+    public static Block ignititeBlock = new BasicBlock("ignitite_block", Material.ROCK, 23.0f, 25.0f, 7, PREFIX_BLOCK);
-    public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 13.0f, 15.0f, 1, PREFIX_BLOCK);
+    public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_BLOCK);
-    public static Block meteoriteBlock = new BasicBlock("meteorite_block", Material.ROCK, 60.0f, 500.0f, 4, PREFIX_BLOCK);
+    public static Block meteoriteBlock = new BasicBlock("meteorite_block", Material.ROCK, 60.0f, 500.0f, 6, PREFIX_BLOCK);
     public static Block mindoriteBlock = new BasicBlock("mindorite_block", Material.ROCK, 12.0f, 12.0f, 2, PREFIX_BLOCK);
-    public static Block mythrilBlock = new BasicBlock("mythril_block", Material.ROCK, 25.0f, 25.0f, 4, PREFIX_BLOCK);
+    public static Block mythrilBlock = new BasicBlock("mythril_block", Material.ROCK, 25.0f, 25.0f, 5, PREFIX_BLOCK);
-    public static Block palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 25.0f, 3, PREFIX_BLOCK);
+    public static Block palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 25.0f, 6, PREFIX_BLOCK);
     public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 35.0f, 35.0f, 4, 0.25f, PREFIX_BLOCK);
     public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 30.0f, 30.0f, 3, 1f, PREFIX_BLOCK);
-    public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 70.0f, 800.0f, 4, PREFIX_BLOCK);
+    public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 70.0f, 800.0f, 7, PREFIX_BLOCK);
-    public static Block yrdeanBlock = new BasicBlock("yrdean_block", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_BLOCK);
+    public static Block rubiumBlock = new BasicBlock("rubium_block", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_BLOCK);
 
     public static Block astriumBlock = new BasicBlock("astrium_block", Material.ROCK, 55.0f, 400.0f, 3, PREFIX_BLOCK);
-    public static Block xylititeBlock = new BasicBlock("xylitite_block", Material.ROCK, 80.0f, 1000.0f, 4, PREFIX_BLOCK);
+    public static Block solariumBlock = new BasicBlock("solarium_block", Material.ROCK, 80.0f, 1000.0f, 4, PREFIX_BLOCK);
     public static Block cryptogenBlock = new BasicBlock("cryptogen_block", Material.ROCK, 23.0f, 25.0f, 2, PREFIX_BLOCK);
-    public static Block dysprosaniumBlock = new BasicBlock("dysprosanium_block", Material.ROCK, 13.0f, 13.0f, 3, PREFIX_BLOCK);
+    public static Block aegisaltBlock = new BasicBlock("aegisalt_block", Material.ROCK, 13.0f, 13.0f, 3, PREFIX_BLOCK);
     public static Block fractoryteBlock = new BasicBlock("fractoryte_block", Material.ROCK, 8.0f, 8.0f, 1, PREFIX_BLOCK);
     public static Block imperomiteBlock = new BasicBlock("imperomite_block", Material.ROCK, 24.0f, 25.0f, 3, PREFIX_BLOCK);
     public static Block dyoniteBlock = new BasicBlock("dyonite_block", Material.ROCK, 23.0f, 25.0f, 3, PREFIX_BLOCK);
     public static Block nitroniteBlock = new BasicBlock("nitronite_block", Material.ROCK, 13.0f, 15.0f, 1, PREFIX_BLOCK);
-    public static Block polyniumBlock = new BasicBlock("polynium_block", Material.ROCK, 60.0f, 500.0f, 4, PREFIX_BLOCK);
+    public static Block noctunyxBlock = new BasicBlock("noctunyx_block", Material.ROCK, 60.0f, 500.0f, 4, PREFIX_BLOCK);
-    public static Block prysociteBlock = new BasicBlock("prysocite_block", Material.ROCK, 12.0f, 12.0f, 2, PREFIX_BLOCK);
+    public static Block lumixylBlock = new BasicBlock("lumixyl_block", Material.ROCK, 12.0f, 12.0f, 2, PREFIX_BLOCK);
     public static Block proxideumBlock = new BasicBlock("proxideum_block", Material.ROCK, 25.0f, 25.0f, 4, PREFIX_BLOCK);
-    public static Block pliniumBlock = new BasicBlock("plinium_block", Material.ROCK, 25.0f, 25.0f, 3, PREFIX_BLOCK);
+    public static Block nucleumBlock = new BasicBlock("nucleum_block", Material.ROCK, 25.0f, 25.0f, 3, PREFIX_BLOCK);
     public static Block bysmuidBlock = new BasicBlock("bysmuid_block", Material.ROCK, 35.0f, 35.0f, 4, 0.25f, PREFIX_BLOCK);
     public static Block seismodiumBlock = new BasicBlock("seismodium_block", Material.ROCK, 30.0f, 30.0f, 3, 1f, PREFIX_BLOCK);
     public static Block terramiteBlock = new BasicBlock("terramite_block", Material.ROCK, 70.0f, 800.0f, 4, PREFIX_BLOCK);

src/main/java/com/sosnitzka/ztic_addon/Fluids.java

@@ -10,9 +10,9 @@ import java.lang.reflect.Field;
 public class Fluids {
 
     public static BasicTinkerFluid arcaniteFluid = new BasicTinkerFluid("arcanite", 0xFF272354, true, 200, 10, 4000);
-    public static BasicTinkerFluid aardiumFluid = new BasicTinkerFluid("aardium", 0xFFC3F93D, true, 200, 10, 4000);
+    public static BasicTinkerFluid titaniteFluid = new BasicTinkerFluid("titanite", 0xFFC3F93D, true, 200, 10, 4000);
     public static BasicTinkerFluid adamantiteFluid = new BasicTinkerFluid("adamantite", 0xFFc45c82, true, 200, 10, 4000);
-    public static BasicTinkerFluid axiidianFluid = new BasicTinkerFluid("axiidian", 0xFF77a19a, true, 200, 10, 4000);
+    public static BasicTinkerFluid violiumFluid = new BasicTinkerFluid("violium", 0xFF77a19a, true, 200, 10, 4000);
     public static BasicTinkerFluid bismuthFluid = new BasicTinkerFluid("bismuth", 0xFF555555, true, 200, 10, 4000);
     public static BasicTinkerFluid eterniteFluid = new BasicTinkerFluid("eternite", 0xFFfafa98, true, 200, 10, 4000);
     public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignitite", 0xFFd29453, true, 200, 10, 4000);
@@ -24,23 +24,23 @@ public class Fluids {
     public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum", 0xFF2b282f, true, 200, 10, 4000);
     public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium", 0xFF86bd5a, true, 200, 10, 4000);
     public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium", 0xFFb6bba8, true, 200, 10, 4000);
-    public static BasicTinkerFluid yrdeanFluid = new BasicTinkerFluid("yrdean", 0xFF3e3c6f, true, 200, 10, 4000);
+    public static BasicTinkerFluid rubiumFluid = new BasicTinkerFluid("rubium", 0xFF3e3c6f, true, 200, 10, 4000);
 
     public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astrium", 0xFF7a3b74, true, 200, 10, 4000);
     public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite", 0xFF659933, true, 200, 10, 4000);
     public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideum", 0xFF416565, true, 200, 10, 4000);
-    public static BasicTinkerFluid polyniumFluid = new BasicTinkerFluid("polynium", 0xFF6c6aa3, true, 200, 10, 4000);
+    public static BasicTinkerFluid noctunyxFluid = new BasicTinkerFluid("noctunyx", 0xFF6c6aa3, true, 200, 10, 4000);
     public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite", 0xFF339966, true, 200, 10, 4000);
     public static BasicTinkerFluid cryptogenFluid = new BasicTinkerFluid("cryptogen", 0xFF9f8a4a, true, 200, 10, 4000);
     public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryte", 0xFFb44a14, true, 200, 10, 4000);
     public static BasicTinkerFluid seismodiumFluid = new BasicTinkerFluid("seismodium", 0xFF46131D, true, 200, 10, 4000);
     public static BasicTinkerFluid terramiteFluid = new BasicTinkerFluid("terramite", 0xFFa6b27a, true, 200, 10, 4000);
-    public static BasicTinkerFluid prysociteFluid = new BasicTinkerFluid("prysocite", 0xFFbde398, true, 200, 10, 4000);
+    public static BasicTinkerFluid lumixylFluid = new BasicTinkerFluid("lumixyl", 0xFFbde398, true, 200, 10, 4000);
-    public static BasicTinkerFluid xylititeFluid = new BasicTinkerFluid("xylitite", 0xFFffc81d, true, 200, 10, 4000);
+    public static BasicTinkerFluid solariumFluid = new BasicTinkerFluid("solarium", 0xFFffc81d, true, 200, 10, 4000);
     public static BasicTinkerFluid dyoniteFluid = new BasicTinkerFluid("dyonite", 0xFFff6743, true, 200, 10, 4000);
     public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultranite", 0xFFfff69b, true, 200, 10, 4000);
-    public static BasicTinkerFluid pliniumFluid = new BasicTinkerFluid("plinium", 0xFFc1ff68, true, 200, 10, 4000);
+    public static BasicTinkerFluid nucleumFluid = new BasicTinkerFluid("nucleum", 0xFFc1ff68, true, 200, 10, 4000);
-    public static BasicTinkerFluid dysprosaniumFluid = new BasicTinkerFluid("dysprosanium", 0xFFb7a2bd, true, 200, 10, 4000);
+    public static BasicTinkerFluid aegisaltFluid = new BasicTinkerFluid("aegisalt", 0xFFb7a2bd, true, 200, 10, 4000);
     public static BasicTinkerFluid bysmuidFluid = new BasicTinkerFluid("bysmuid", 0xFF7b97b0, true, 200, 10, 4000);
 
 

src/main/java/com/sosnitzka/ztic_addon/Items.java

@@ -25,10 +25,10 @@ public class Items {
     public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot();
     public static Item fuel_brick = new BasicItem("fuel_brick");
 
-    public static Item aardiumIngot = new BasicItem("aardium_ingot", PREFIX_INGOT);
+    public static Item titaniteIngot = new BasicItem("titanite_ingot", PREFIX_INGOT);
     public static Item adamantiteIngot = new BasicItem("adamantite_ingot", PREFIX_INGOT);
     public static Item arcaniteIngot = new BasicItem("arcanite_ingot", PREFIX_INGOT);
-    public static Item axiidianIngot = new BasicItem("axiidian_ingot", PREFIX_INGOT);
+    public static Item violiumIngot = new BasicItem("violium_ingot", PREFIX_INGOT);
     public static Item bismuthIngot = new BasicItem("bismuth_ingot", PREFIX_INGOT);
     public static Item eterniteIngot = new BasicItem("eternite_ingot", PREFIX_INGOT);
     public static Item ignititeIngot = new BasicItem("ignitite_ingot", PREFIX_INGOT);
@@ -40,23 +40,23 @@ public class Items {
     public static Item prometheumIngot = new BasicItem("prometheum_ingot", PREFIX_INGOT);
     public static Item tiberiumIngot = new BasicItem("tiberium_ingot", PREFIX_INGOT);
     public static Item vibraniumIngot = new BasicItem("vibranium_ingot", PREFIX_INGOT);
-    public static Item yrdeanIngot = new BasicItem("yrdean_ingot", PREFIX_INGOT);
+    public static Item rubiumIngot = new BasicItem("rubium_ingot", PREFIX_INGOT);
 
     public static Item astriumIngot = new BasicItem("astrium_ingot", PREFIX_INGOT);
     public static Item nitroniteIngot = new BasicItem("nitronite_ingot", PREFIX_INGOT);
     public static Item proxideumIngot = new BasicItem("proxideum_ingot", PREFIX_INGOT);
-    public static Item polyniumIngot = new BasicItem("polynium_ingot", PREFIX_INGOT);
+    public static Item noctunyxIngot = new BasicItem("noctunyx_ingot", PREFIX_INGOT);
     public static Item imperomiteIngot = new BasicItem("imperomite_ingot", PREFIX_INGOT);
     public static Item cryptogenIngot = new BasicItem("cryptogen_ingot", PREFIX_INGOT);
     public static Item fractoryteIngot = new BasicItem("fractoryte_ingot", PREFIX_INGOT);
     public static Item seismodiumIngot = new BasicItem("seismodium_ingot", PREFIX_INGOT);
     public static Item terramiteIngot = new BasicItem("terramite_ingot", PREFIX_INGOT);
-    public static Item prysociteIngot = new BasicItem("prysocite_ingot", PREFIX_INGOT);
+    public static Item lumixylIngot = new BasicItem("lumixyl_ingot", PREFIX_INGOT);
-    public static Item xylititeIngot = new BasicItem("xylitite_ingot", PREFIX_INGOT);
+    public static Item solariumIngot = new BasicItem("solarium_ingot", PREFIX_INGOT);
     public static Item dyoniteIngot = new BasicItem("dyonite_ingot", PREFIX_INGOT);
     public static Item ultraniteIngot = new BasicItem("ultranite_ingot", PREFIX_INGOT);
-    public static Item pliniumIngot = new BasicItem("plinium_ingot", PREFIX_INGOT);
+    public static Item nucleumIngot = new BasicItem("nucleum_ingot", PREFIX_INGOT);
-    public static Item dysprosaniumIngot = new BasicItem("dysprosanium_ingot", PREFIX_INGOT);
+    public static Item aegisaltIngot = new BasicItem("aegisalt_ingot", PREFIX_INGOT);
     public static Item bysmuidIngot = new BasicItem("bysmuid_ingot", PREFIX_INGOT);
 
     public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable", PREFIX_NUGGET);

src/main/java/com/sosnitzka/ztic_addon/Materials.java

@@ -11,12 +11,12 @@ public class Materials {
     public static Material arcanite = new Material("arcanite", TextFormatting.LIGHT_PURPLE);
     public static Material tiberium = new Material("tiberium", TextFormatting.LIGHT_PURPLE);
     public static Material prometheum = new Material("prometheum", TextFormatting.LIGHT_PURPLE);
-    public static Material yrdean = new Material("yrdean", TextFormatting.LIGHT_PURPLE);
+    public static Material rubium = new Material("rubium", TextFormatting.LIGHT_PURPLE);
-    public static Material axiidian = new Material("axiidian", TextFormatting.DARK_GREEN);
+    public static Material violium = new Material("violium", TextFormatting.DARK_GREEN);
     public static Material bismuth = new Material("bismuth", TextFormatting.DARK_GREEN);
     public static Material karmesine = new Material("karmesine", TextFormatting.DARK_GREEN);
     public static Material mindorite = new Material("mindorite", TextFormatting.DARK_GREEN);
-    public static Material aardium = new Material("aardium", TextFormatting.GRAY);
+    public static Material titanite = new Material("titanite", TextFormatting.GRAY);
     public static Material meteorite = new Material("meteorite", TextFormatting.GRAY);
     public static Material adamantite = new Material("adamantite", TextFormatting.GRAY);
     public static Material vibranium = new Material("vibranium", TextFormatting.GRAY);
@@ -28,17 +28,17 @@ public class Materials {
     public static Material astrium = new Material("astrium", TextFormatting.LIGHT_PURPLE).addTrait(instable, HeadMaterialStats.TYPE);
     public static Material nitronite = new Material("nitronite", TextFormatting.LIGHT_PURPLE);
     public static Material proxideum = new Material("proxideum", TextFormatting.LIGHT_PURPLE);
-    public static Material polynium = new Material("polynium", TextFormatting.LIGHT_PURPLE);
+    public static Material noctunyx = new Material("noctunyx", TextFormatting.LIGHT_PURPLE);
     public static Material imperomite = new Material("imperomite", TextFormatting.DARK_GREEN);
     public static Material cryptogen = new Material("cryptogen", TextFormatting.DARK_GREEN);
     public static Material fractoryte = new Material("fractoryte", TextFormatting.DARK_GREEN);
     public static Material seismodium = new Material("seismodium", TextFormatting.DARK_GREEN);
     public static Material terramite = new Material("terramite", TextFormatting.GRAY);
-    public static Material prysocite = new Material("prysocite", TextFormatting.GRAY);
+    public static Material lumixyl = new Material("lumixyl", TextFormatting.GRAY);
-    public static Material xylitite = new Material("xylitite", TextFormatting.GRAY);
+    public static Material solarium = new Material("solarium", TextFormatting.GRAY);
     public static Material dyonite = new Material("dyonite", TextFormatting.GRAY);
     public static Material ultranite = new Material("ultranite", TextFormatting.AQUA);
-    public static Material plinium = new Material("plinium", TextFormatting.AQUA);
+    public static Material nucleum = new Material("nucleum", TextFormatting.AQUA);
-    public static Material dysprosanium = new Material("dysprosanium", TextFormatting.AQUA);
+    public static Material aegisalt = new Material("aegisalt", TextFormatting.AQUA);
     public static Material bysmuid = new Material("bysmuid", TextFormatting.AQUA);
 }

src/main/java/com/sosnitzka/ztic_addon/ZTiC.java

@@ -56,19 +56,19 @@ public class ZTiC {
         // TConstruct Alloys
         registerTinkerAlloys(astriumFluid, 1, arcaniteFluid, 3, karmesineFluid, 2);
         registerTinkerAlloys(nitroniteFluid, 1, tiberiumFluid, 5, vibraniumFluid, 3);
-        registerTinkerAlloys(proxideumFluid, 1, prometheumFluid, 3, axiidianFluid, 2);
+        registerTinkerAlloys(proxideumFluid, 1, prometheumFluid, 3, violiumFluid, 2);
-        registerTinkerAlloys(polyniumFluid, 1, yrdeanFluid, 3, meteoriteFluid, 2);
+        registerTinkerAlloys(noctunyxFluid, 1, rubiumFluid, 3, meteoriteFluid, 2);
-        registerTinkerAlloys(imperomiteFluid, 2, aardiumFluid, 3, prometheumFluid, 3);
+        registerTinkerAlloys(imperomiteFluid, 2, titaniteFluid, 3, prometheumFluid, 3);
         registerTinkerAlloys(cryptogenFluid, 1, meteoriteFluid, 3, mythrilFluid, 2);
         registerTinkerAlloys(fractoryteFluid, 1, adamantiteFluid, 4, arcaniteFluid, 2);
         registerTinkerAlloys(seismodiumFluid, 1, vibraniumFluid, 4, palladiumFluid, 4);
-        registerTinkerAlloys(terramiteFluid, 2, axiidianFluid, 4, eterniteFluid, 2);
+        registerTinkerAlloys(terramiteFluid, 2, violiumFluid, 4, eterniteFluid, 2);
-        registerTinkerAlloys(prysociteFluid, 1, bismuthFluid, 3, yrdeanFluid, 2);
+        registerTinkerAlloys(lumixylFluid, 1, bismuthFluid, 3, rubiumFluid, 2);
-        registerTinkerAlloys(xylititeFluid, 1, karmesineFluid, 3, ignititeFluid, 2);
+        registerTinkerAlloys(solariumFluid, 1, karmesineFluid, 3, ignititeFluid, 2);
         registerTinkerAlloys(dyoniteFluid, 1, mindoriteFluid, 4, tiberiumFluid, 2);
         registerTinkerAlloys(ultraniteFluid, 1, ignititeFluid, 5, adamantiteFluid, 3);
-        registerTinkerAlloys(pliniumFluid, 1, palladiumFluid, 3, mindoriteFluid, 3);
+        registerTinkerAlloys(nucleumFluid, 1, palladiumFluid, 3, mindoriteFluid, 3);
-        registerTinkerAlloys(dysprosaniumFluid, 1, eterniteFluid, 3, aardiumFluid, 3);
+        registerTinkerAlloys(aegisaltFluid, 1, eterniteFluid, 3, titaniteFluid, 3);
         registerTinkerAlloys(bysmuidFluid, 1, mythrilFluid, 4, bismuthFluid, 2);
 
 
@@ -76,12 +76,12 @@ public class ZTiC {
         registerTinkerMaterial("Arcanite", arcanite, arcaniteFluid, 1, 5, 6, 7, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Tiberium", tiberium, tiberiumFluid, 1, 5, 6, 6, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Prometheum", prometheum, prometheumFluid, 1, 5, 6, 5, 0.8f, 0, 100, false, true);
-        registerTinkerMaterial("Yrdean", yrdean, yrdeanFluid, 1, 5, 6, 4, 0.8f, 0, 100, false, true);
+        registerTinkerMaterial("Rubium", rubium, rubiumFluid, 1, 5, 6, 4, 0.8f, 0, 100, false, true);
-        registerTinkerMaterial("Axiidian", axiidian, axiidianFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
+        registerTinkerMaterial("Violium", violium, violiumFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Bismuth", bismuth, bismuthFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Karmesine", karmesine, karmesineFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Mindorite", mindorite, mindoriteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
-        registerTinkerMaterial("Aardium", aardium, aardiumFluid, 1, 5, 6, 3, 0.8f, 0, 100, true, true);
+        registerTinkerMaterial("Titanite", titanite, titaniteFluid, 1, 5, 6, 3, 0.8f, 0, 100, true, true);
         registerTinkerMaterial("Meteorite", meteorite, meteoriteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Adamantite", adamantite, adamantiteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Vibranium", vibranium, vibraniumFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
@@ -94,17 +94,17 @@ public class ZTiC {
         registerTinkerMaterial("Astrium", astrium, astriumFluid, 1, 5, 6, 7, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("InstableNitronite", nitronite, nitroniteFluid, 1, 5, 6, 6, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Proxideum", proxideum, proxideumFluid, 1, 5, 6, 5, 0.8f, 0, 100, false, true);
-        registerTinkerMaterial("InstablePolynium", polynium, polyniumFluid, 1, 5, 6, 4, 0.8f, 0, 100, false, true);
+        registerTinkerMaterial("InstableNoctunyx", noctunyx, noctunyxFluid, 1, 5, 6, 4, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Imperomite", imperomite, imperomiteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Cryptogen", cryptogen, cryptogenFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Fractoryte", fractoryte, fractoryteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Seismodium", seismodium, seismodiumFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Terramite", terramite, terramiteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
-        registerTinkerMaterial("InstablePrysocite", prysocite, prysociteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
+        registerTinkerMaterial("InstableLumixyl", lumixyl, lumixylFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
-        registerTinkerMaterial("BlazingXylitite", xylitite, xylititeFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
+        registerTinkerMaterial("BlazingSolarium", solarium, solariumFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("Ultranite", ultranite, ultraniteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
-        registerTinkerMaterial("RadiantPlinium", plinium, pliniumFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
+        registerTinkerMaterial("RadiantNucleum", nucleum, nucleumFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
-        registerTinkerMaterial("Dysprosanium", dysprosanium, dysprosaniumFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
+        registerTinkerMaterial("Aegisalt", aegisalt, aegisaltFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("RefractiveBysmuid", bysmuid, bysmuidFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
         registerTinkerMaterial("InstableDyonite", dyonite, dyoniteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
 

src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java

@@ -17,7 +17,7 @@ import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_ORE;
 public class BlockTiberium extends BasicBlock {
 
     public BlockTiberium() {
-        super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3, 1.0F, PREFIX_ORE);
+        super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 6, 1.0F, PREFIX_ORE);
     }
 
     @Override

src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java

@@ -16,10 +16,10 @@ public class Smelting {
         GameRegistry.addSmelting(new ItemStack(slaggoldIngot, 3), new ItemStack(Items.GOLD_NUGGET), 0);
         GameRegistry.addSmelting(new ItemStack(tiberiumShardInstable), new ItemStack(tiberiumShardStable), 0.2F);
 
-        GameRegistry.addSmelting(aardiumOre, new ItemStack(aardiumIngot), RandomUtils.nextFloat(0F, 2F));
+        GameRegistry.addSmelting(titaniteOre, new ItemStack(titaniteIngot), RandomUtils.nextFloat(0F, 2F));
         GameRegistry.addSmelting(arcaniteOre, new ItemStack(arcaniteIngot), RandomUtils.nextFloat(0F, 2F));
         GameRegistry.addSmelting(adamantiteOre, new ItemStack(adamantiteIngot), RandomUtils.nextFloat(0F, 2F));
-        GameRegistry.addSmelting(axiidianOre, new ItemStack(axiidianIngot), RandomUtils.nextFloat(0F, 2F));
+        GameRegistry.addSmelting(violiumOre, new ItemStack(violiumIngot), RandomUtils.nextFloat(0F, 2F));
         GameRegistry.addSmelting(bismuthOre, new ItemStack(bismuthIngot), RandomUtils.nextFloat(0F, 2F));
         GameRegistry.addSmelting(eterniteOre, new ItemStack(eterniteIngot), RandomUtils.nextFloat(0F, 2F));
         GameRegistry.addSmelting(ignititeOre, new ItemStack(ignititeIngot), RandomUtils.nextFloat(0F, 2F));
@@ -31,7 +31,7 @@ public class Smelting {
         GameRegistry.addSmelting(prometheumOre, new ItemStack(prometheumIngot), RandomUtils.nextFloat(0F, 2F));
         GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardStable, 2), RandomUtils.nextFloat(0F, 2F));
         GameRegistry.addSmelting(vibraniumOre, new ItemStack(vibraniumIngot), RandomUtils.nextFloat(0F, 2F));
-        GameRegistry.addSmelting(yrdeanOre, new ItemStack(yrdeanIngot), RandomUtils.nextFloat(0F, 2F));
+        GameRegistry.addSmelting(rubiumOre, new ItemStack(rubiumIngot), RandomUtils.nextFloat(0F, 2F));
 
     }
 }

src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitInstable.java

@@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import slimeknights.tconstruct.library.traits.AbstractTrait;
@@ -20,8 +21,16 @@ public class TraitInstable extends AbstractTrait {
 
     @Override
     public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
-        if (player.getHealth() > 2) {
+        if (MathHelper.getRandomIntegerInRange(random, 0, 100) < 2) {
-            world.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 3, true, true);
+            world.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 2, true, true);
+        }
+    }
+
+    @Override
+    public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) {
+        BlockPos pos = target.getPosition();
+        if (MathHelper.getRandomIntegerInRange(random, 0, 100) < 2) {
+            target.getEntityWorld().newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 2, true, true);
         }
     }
 

src/main/java/com/sosnitzka/ztic_addon/world/ZWorldGen.java

@@ -40,10 +40,10 @@ public class ZWorldGen implements IWorldGenerator {
 
     private void end(Random random, int x, int z, World world) {
 
-        Generator.generateEndOre(yrdeanOre.getDefaultState(), random, x, z, world, 16, 10, 35, 2, 6);
+        Generator.generateEndOre(rubiumOre.getDefaultState(), random, x, z, world, 16, 10, 35, 2, 6);
         Generator.generateEndOre(ignititeOre.getDefaultState(), random, x, z, world, 16, 20, 45, 2, 6);
-        Generator.generateEndOre(axiidianOre.getDefaultState(), random, x, z, world, 16, 30, 55, 2, 6);
+        Generator.generateEndOre(violiumOre.getDefaultState(), random, x, z, world, 16, 30, 55, 2, 6);
-        Generator.generateEndOre(aardiumOre.getDefaultState(), random, x, z, world, 16, 40, 65, 2, 6);
+        Generator.generateEndOre(titaniteOre.getDefaultState(), random, x, z, world, 16, 40, 65, 2, 6);
     }
 
 

src/main/resources/assets/ztic_addon/blockstates/aegisalt_block.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "normal": {
-      "model": "ztic_addon:axiidian_block"
+      "model": "ztic_addon:aegisalt_block"
     }
   }
 }

src/main/resources/assets/ztic_addon/blockstates/dysprosanium_block.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "ztic_addon:dysprosanium_block"
-    }
-  }
-}

src/main/resources/assets/ztic_addon/blockstates/lumixyl_block.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "normal": {
-      "model": "ztic_addon:aardium_block"
+      "model": "ztic_addon:lumixyl_block"
     }
   }
 }

src/main/resources/assets/ztic_addon/blockstates/noctunyx_block.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "normal": {
-      "model": "ztic_addon:polynium_block"
+      "model": "ztic_addon:noctunyx_block"
     }
   }
 }

src/main/resources/assets/ztic_addon/blockstates/nucleum_block.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "normal": {
-      "model": "ztic_addon:plinium_block"
+      "model": "ztic_addon:nucleum_block"
     }
   }
 }

src/main/resources/assets/ztic_addon/blockstates/prysocite_block.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "ztic_addon:prysocite_block"
-    }
-  }
-}

src/main/resources/assets/ztic_addon/blockstates/rubium_block.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "normal": {
-      "model": "ztic_addon:yrdean_block"
+      "model": "ztic_addon:rubium_block"
     }
   }
 }

src/main/resources/assets/ztic_addon/blockstates/rubium_ore.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "normal": {
-            "model": "ztic_addon:yrdean_ore"
+            "model": "ztic_addon:rubium_ore"
         }
     }
 }

src/main/resources/assets/ztic_addon/blockstates/solarium_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "normal": {
+      "model": "ztic_addon:solarium_block"
+    }
+  }
+}

src/main/resources/assets/ztic_addon/blockstates/titanite_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "normal": {
+      "model": "ztic_addon:titanite_block"
+    }
+  }
+}

src/main/resources/assets/ztic_addon/blockstates/titanite_ore.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "normal": {
-            "model": "ztic_addon:axiidian_ore"
+            "model": "ztic_addon:titanite_ore"
         }
     }
 }

src/main/resources/assets/ztic_addon/blockstates/violium_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "normal": {
+      "model": "ztic_addon:violium_block"
+    }
+  }
+}

src/main/resources/assets/ztic_addon/blockstates/violium_ore.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "normal": {
-            "model": "ztic_addon:aardium_ore"
+            "model": "ztic_addon:violium_ore"
         }
     }
 }

src/main/resources/assets/ztic_addon/blockstates/xylitite_block.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "ztic_addon:xylitite_block"
-    }
-  }
-}

src/main/resources/assets/ztic_addon/lang/de_DE.lang

@@ -18,10 +18,10 @@ tile.slagiron_ore.name=Unreines Eisenerz
 tile.slaggold_ore.name=Unreines Golderz
 tile.tiberium_ore.name=Tiberiumerz
 tile.vibranium_ore.name=Vibraniumerz
-tile.yrdean_ore.name=Yrdeanerz
+tile.rubium_ore.name=Rubiumerz
-tile.aardium_ore.name=Aardiumerz
+tile.titanite_ore.name=Titaniteerz
 tile.ignitite_ore.name=Ignititerz
-tile.axiidian_ore.name=Axiidianerz
+tile.violium_ore.name=Violiumerz
 item.adamantite_ingot.name=Adamantitbarren
 item.arcanite_ingot.name=Arcanitbarren
 item.bismuth_ingot.name=Bismuthbarren
@@ -36,9 +36,9 @@ item.slagiron_ingot.name=Unreiner Eisenbarren
 item.slaggold_ingot.name=Unreiner Goldbarren
 item.tiberium_ingot.name=Tiberiumbarren
 item.vibranium_ingot.name=Vibraniumbarren
-item.yrdean_ingot.name=Yrdeanbarren
+item.rubium_ingot.name=Rubiumbarren
-item.aardium_ingot.name=Aardiumbarren
+item.titanite_ingot.name=Titanitebarren
 item.ignitite_ingot.name=Ignititbarren
-item.axiidian_ingot.name=Axiidianbarren
+item.violium_ingot.name=Violiumbarren
 item.fuel_brick.name=Brennstoffziegel
 item.iron_nugget.name=Eisennugget

src/main/resources/assets/ztic_addon/lang/en_US.lang

@@ -18,10 +18,10 @@ tile.slagiron_ore.name=Slagiron Ore
 tile.slaggold_ore.name=Slaggold Ore
 tile.tiberium_ore.name=Tiberium Ore
 tile.vibranium_ore.name=Vibranium Ore
-tile.yrdean_ore.name=Yrdean Ore
+tile.rubium_ore.name=Rubium Ore
-tile.aardium_ore.name=Aardium Ore
+tile.titanite_ore.name=Titanite Ore
 tile.ignitite_ore.name=Ignitite Ore
-tile.axiidian_ore.name=Axiidian Ore
+tile.violium_ore.name=Violium Ore
 
 item.adamantite_ingot.name=Adamantite Ingot
 item.arcanite_ingot.name=Arcanite Ingot
@@ -37,9 +37,9 @@ item.slagiron_ingot.name=Slagiron Ingot
 item.slaggold_ingot.name=Slaggold Ingot
 item.tiberium_ingot.name=Tiberium Ingot
 item.vibranium_ingot.name=Vibranium Ingot
-item.yrdean_ingot.name=Yrdean Ingot
+item.rubium_ingot.name=Rubium Ingot
-item.aardium_ingot.name=Aardium Ingot
+item.titanite_ingot.name=Titanite Ingot
 item.ignitite_ingot.name=Ignitite Ingot
-item.axiidian_ingot.name=Axiidian Ingot
+item.violium_ingot.name=Violium Ingot
 item.fuel_brick.name=Fuelbrick
 item.iron_nugget.name=Iron Nugget

src/main/resources/assets/ztic_addon/models/block/aegisalt_block.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "ztic_addon:blocks/axiidian_block"
+    "all": "ztic_addon:blocks/aegisalt_block"
   }
 }

src/main/resources/assets/ztic_addon/models/block/dysprosanium_block.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "ztic_addon:blocks/dysprosanium_block"
-  }
-}

src/main/resources/assets/ztic_addon/models/block/lumixyl_block.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "ztic_addon:blocks/aardium_block"
+    "all": "ztic_addon:blocks/lumixyl_block"
   }
 }

src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "ztic_addon:blocks/polynium_block"
+    "all": "ztic_addon:blocks/noctunyx_block"
   }
 }

src/main/resources/assets/ztic_addon/models/block/nucleum_block.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "ztic_addon:blocks/plinium_block"
+    "all": "ztic_addon:blocks/nucleum_block"
   }
 }

src/main/resources/assets/ztic_addon/models/block/prysocite_block.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "ztic_addon:blocks/prysocite_block"
-  }
-}

src/main/resources/assets/ztic_addon/models/block/rubium_block.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "ztic_addon:blocks/yrdean_block"
+    "all": "ztic_addon:blocks/rubium_block"
   }
 }

src/main/resources/assets/ztic_addon/models/block/rubium_ore.json

@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "ztic_addon:blocks/yrdean_ore"
+        "all": "ztic_addon:blocks/rubium_ore"
     }
 }

src/main/resources/assets/ztic_addon/models/block/solarium_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "ztic_addon:blocks/solarium_block"
+  }
+}

src/main/resources/assets/ztic_addon/models/block/titanite_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "ztic_addon:blocks/titanite_block"
+  }
+}

src/main/resources/assets/ztic_addon/models/block/titanite_ore.json

@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "ztic_addon:blocks/axiidian_ore"
+        "all": "ztic_addon:blocks/titanite_ore"
     }
 }

src/main/resources/assets/ztic_addon/models/block/violium_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "ztic_addon:blocks/violium_block"
+  }
+}

src/main/resources/assets/ztic_addon/models/block/violium_ore.json

@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "ztic_addon:blocks/aardium_ore"
+        "all": "ztic_addon:blocks/violium_ore"
     }
 }

src/main/resources/assets/ztic_addon/models/block/xylitite_block.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "ztic_addon:blocks/xylitite_block"
-  }
-}

src/main/resources/assets/ztic_addon/models/item/aegisalt_block.json

@@ -1,5 +1,5 @@
 {
-  "parent": "ztic_addon:block/polynium_block",
+  "parent": "ztic_addon:block/aegisalt_block",
   "display": {
     "thirdperson": {
       "rotation": [

src/main/resources/assets/ztic_addon/models/item/aegisalt_ingot.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "ztic_addon:items/tic/xylitite_ingot"
+    "layer0": "ztic_addon:items/tic/aegisalt_ingot"
   }
 }

src/main/resources/assets/ztic_addon/models/item/dysprosanium_block.json

@@ -1,22 +0,0 @@
-{
-  "parent": "ztic_addon:block/dysprosanium_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}

src/main/resources/assets/ztic_addon/models/item/dysprosanium_ingot.json

@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "ztic_addon:items/tic/dysprosanium_ingot"
-  }
-}

src/main/resources/assets/ztic_addon/models/item/lumixyl_block.json

@@ -1,5 +1,5 @@
 {
-  "parent": "ztic_addon:block/aardium_block",
+  "parent": "ztic_addon:block/lumixyl_block",
   "display": {
     "thirdperson": {
       "rotation": [

src/main/resources/assets/ztic_addon/models/item/lumixyl_ingot.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "ztic_addon:items/tic/plinium_ingot"
+    "layer0": "ztic_addon:items/tic/lumixyl_ingot"
   }
 }

src/main/resources/assets/ztic_addon/models/item/noctunyx_block.json

@@ -1,5 +1,5 @@
 {
-  "parent": "ztic_addon:block/axiidian_block",
+  "parent": "ztic_addon:block/noctunyx_block",
   "display": {
     "thirdperson": {
       "rotation": [

src/main/resources/assets/ztic_addon/models/item/noctunyx_ingot.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "ztic_addon:items/tic/polynium_ingot"
+    "layer0": "ztic_addon:items/tic/noctunyx_ingot"
   }
 }

src/main/resources/assets/ztic_addon/models/item/nucleum_block.json

@@ -1,5 +1,5 @@
 {
-  "parent": "ztic_addon:block/plinium_block",
+  "parent": "ztic_addon:block/nucleum_block",
   "display": {
     "thirdperson": {
       "rotation": [

src/main/resources/assets/ztic_addon/models/item/nucleum_ingot.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "ztic_addon:items/tic/prysocite_ingot"
+    "layer0": "ztic_addon:items/tic/nucleum_ingot"
   }
 }

src/main/resources/assets/ztic_addon/models/item/prysocite_block.json

@@ -1,22 +0,0 @@
-{
-  "parent": "ztic_addon:block/prysocite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}

src/main/resources/assets/ztic_addon/models/item/rubium_block.json

@@ -1,5 +1,5 @@
 {
-  "parent": "ztic_addon:block/yrdean_block",
+  "parent": "ztic_addon:block/rubium_block",
   "display": {
     "thirdperson": {
       "rotation": [

src/main/resources/assets/ztic_addon/models/item/rubium_ingot.json

@@ -1,6 +1,6 @@
 {
 	"parent": "item/generated",
 	"textures": {
-		"layer0": "ztic_addon:items/tic/yrdean_ingot"
+		"layer0": "ztic_addon:items/tic/rubium_ingot"
 	}
 }

src/main/resources/assets/ztic_addon/models/item/rubium_ore.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ztic_addon:block/yrdean_ore",
+    "parent": "ztic_addon:block/rubium_ore",
     "display": {
         "thirdperson": {
             "rotation": [ 10, -45, 170 ],

src/main/resources/assets/ztic_addon/models/item/solarium_block.json

@@ -0,0 +1,22 @@
+{
+  "parent": "ztic_addon:block/solarium_block",
+  "display": {
+    "thirdperson": {
+      "rotation": [
+        10,
+        -45,
+        170
+      ],
+      "translation": [
+        0,
+        1.5,
+        -2.75
+      ],
+      "scale": [
+        0.375,
+        0.375,
+        0.375
+      ]
+    }
+  }
+}

src/main/resources/assets/ztic_addon/models/item/solarium_ingot.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "ztic_addon:items/tic/solarium_ingot"
+  }
+}

src/main/resources/assets/ztic_addon/models/item/titanite_block.json

@@ -0,0 +1,22 @@
+{
+  "parent": "ztic_addon:block/titanite_block",
+  "display": {
+    "thirdperson": {
+      "rotation": [
+        10,
+        -45,
+        170
+      ],
+      "translation": [
+        0,
+        1.5,
+        -2.75
+      ],
+      "scale": [
+        0.375,
+        0.375,
+        0.375
+      ]
+    }
+  }
+}

src/main/resources/assets/ztic_addon/models/item/titanite_ingot.json

@@ -1,6 +1,6 @@
 {
 	"parent": "item/generated",
 	"textures": {
-		"layer0": "ztic_addon:items/tic/axiidian_ingot"
+		"layer0": "ztic_addon:items/tic/titanite_ingot"
 	}
 }

src/main/resources/assets/ztic_addon/models/item/titanite_ore.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ztic_addon:block/axiidian_ore",
+    "parent": "ztic_addon:block/titanite_ore",
     "display": {
         "thirdperson": {
             "rotation": [ 10, -45, 170 ],

src/main/resources/assets/ztic_addon/models/item/violium_block.json

@@ -0,0 +1,22 @@
+{
+  "parent": "ztic_addon:block/violium_block",
+  "display": {
+    "thirdperson": {
+      "rotation": [
+        10,
+        -45,
+        170
+      ],
+      "translation": [
+        0,
+        1.5,
+        -2.75
+      ],
+      "scale": [
+        0.375,
+        0.375,
+        0.375
+      ]
+    }
+  }
+}

src/main/resources/assets/ztic_addon/models/item/violium_ingot.json

@@ -1,6 +1,6 @@
 {
 	"parent": "item/generated",
 	"textures": {
-		"layer0": "ztic_addon:items/tic/aardium_ingot"
+		"layer0": "ztic_addon:items/tic/violium_ingot"
 	}
 }

src/main/resources/assets/ztic_addon/models/item/violium_ore.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ztic_addon:block/aardium_ore",
+    "parent": "ztic_addon:block/violium_ore",
     "display": {
         "thirdperson": {
             "rotation": [ 10, -45, 170 ],

src/main/resources/assets/ztic_addon/models/item/xylitite_block.json

@@ -1,22 +0,0 @@
-{
-  "parent": "ztic_addon:block/xylitite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}