From 53762a3c7aa6c05174a753b57390c2fbd16e2a29 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Sun, 15 May 2016 01:38:41 +0200 Subject: [PATCH] Most names changed to those that are more legible. Changed assicuated textures. Planned 8 special Traits for Alloys. --- .../java/com/sosnitzka/ztic_addon/Blocks.java | 65 +++++++++--------- .../java/com/sosnitzka/ztic_addon/Fluids.java | 16 ++--- .../java/com/sosnitzka/ztic_addon/Items.java | 16 ++--- .../com/sosnitzka/ztic_addon/Materials.java | 16 ++--- .../java/com/sosnitzka/ztic_addon/ZTiC.java | 32 ++++----- .../ztic_addon/blocks/BlockTiberium.java | 2 +- .../ztic_addon/recipes/Smelting.java | 6 +- .../ztic_addon/util/traits/TraitInstable.java | 13 +++- .../sosnitzka/ztic_addon/world/ZWorldGen.java | 6 +- ...xiidian_block.json => aegisalt_block.json} | 2 +- .../blockstates/dysprosanium_block.json | 7 -- ...{aardium_block.json => lumixyl_block.json} | 2 +- ...olynium_block.json => noctunyx_block.json} | 2 +- ...{plinium_block.json => nucleum_block.json} | 2 +- .../blockstates/prysocite_block.json | 7 -- .../{yrdean_block.json => rubium_block.json} | 2 +- .../{yrdean_ore.json => rubium_ore.json} | 2 +- .../blockstates/solarium_block.json | 7 ++ .../blockstates/titanite_block.json | 7 ++ .../{axiidian_ore.json => titanite_ore.json} | 2 +- .../ztic_addon/blockstates/violium_block.json | 7 ++ .../{aardium_ore.json => violium_ore.json} | 2 +- .../blockstates/xylitite_block.json | 7 -- .../assets/ztic_addon/lang/de_DE.lang | 12 ++-- .../assets/ztic_addon/lang/en_US.lang | 12 ++-- ...xiidian_block.json => aegisalt_block.json} | 2 +- .../models/block/dysprosanium_block.json | 6 -- ...{aardium_block.json => lumixyl_block.json} | 2 +- ...olynium_block.json => noxtunyx_block.json} | 2 +- ...{plinium_block.json => nucleum_block.json} | 2 +- .../models/block/prysocite_block.json | 6 -- .../{yrdean_block.json => rubium_block.json} | 2 +- .../{yrdean_ore.json => rubium_ore.json} | 2 +- .../models/block/solarium_block.json | 6 ++ .../models/block/titanite_block.json | 6 ++ .../{axiidian_ore.json => titanite_ore.json} | 2 +- .../models/block/violium_block.json | 6 ++ .../{aardium_ore.json => violium_ore.json} | 2 +- .../models/block/xylitite_block.json | 6 -- ...olynium_block.json => aegisalt_block.json} | 2 +- ...ylitite_ingot.json => aegisalt_ingot.json} | 2 +- .../models/item/dysprosanium_block.json | 22 ------ .../models/item/dysprosanium_ingot.json | 6 -- ...{aardium_block.json => lumixyl_block.json} | 2 +- ...{plinium_ingot.json => lumixyl_ingot.json} | 2 +- ...xiidian_block.json => noctunyx_block.json} | 2 +- ...olynium_ingot.json => noctunyx_ingot.json} | 2 +- ...{plinium_block.json => nucleum_block.json} | 2 +- ...rysocite_ingot.json => nucleum_ingot.json} | 2 +- .../models/item/prysocite_block.json | 22 ------ .../{yrdean_block.json => rubium_block.json} | 2 +- .../{yrdean_ingot.json => rubium_ingot.json} | 2 +- .../item/{yrdean_ore.json => rubium_ore.json} | 2 +- .../models/item/solarium_block.json | 22 ++++++ .../models/item/solarium_ingot.json | 6 ++ .../models/item/titanite_block.json | 22 ++++++ ...xiidian_ingot.json => titanite_ingot.json} | 2 +- .../{axiidian_ore.json => titanite_ore.json} | 2 +- .../ztic_addon/models/item/violium_block.json | 22 ++++++ ...{aardium_ingot.json => violium_ingot.json} | 2 +- .../{aardium_ore.json => violium_ore.json} | 2 +- .../models/item/xylitite_block.json | 22 ------ ...prosanium_block.png => aegisalt_block.png} | Bin ...{prysocite_block.png => lumixyl_block.png} | Bin ...{polynium_block.png => noctunyx_block.png} | Bin .../{plinium_block.png => nucleum_block.png} | Bin .../{yrdean_block.png => rubium_block.png} | Bin .../blocks/{yrdean_ore.png => rubium_ore.png} | Bin ...{xylitite_block.png => solarium_block.png} | Bin .../{aardium_block.png => titanite_block.png} | Bin .../{aardium_ore.png => titanite_ore.png} | Bin .../{axiidian_block.png => violium_block.png} | Bin .../{axiidian_ore.png => violium_ore.png} | Bin .../textures/items/tic/adamantite_ingot.png | Bin 15463 -> 15909 bytes ...prosanium_ingot.png => aegisalt_ingot.png} | Bin 15903 -> 15962 bytes .../textures/items/tic/eternite_ingot.png | Bin 16073 -> 16074 bytes .../textures/items/tic/ignitite_ingot.png | Bin 16195 -> 16267 bytes .../textures/items/tic/karmesine_ingot.png | Bin 15996 -> 15982 bytes ...{prysocite_ingot.png => lumixyl_ingot.png} | Bin .../textures/items/tic/meteorite_ingot.png | Bin 15776 -> 15799 bytes .../textures/items/tic/mindorite_ingot.png | Bin 15917 -> 15934 bytes .../textures/items/tic/mythril_ingot.png | Bin 15784 -> 15794 bytes ...{polynium_ingot.png => noxtunyx_ingot.png} | Bin .../{plinium_ingot.png => nucleum_ingot.png} | Bin .../textures/items/tic/palladium_ingot.png | Bin 16099 -> 16117 bytes .../{yrdean_ingot.png => rubium_ingot.png} | Bin 15947 -> 15943 bytes ...{xylitite_ingot.png => solarium_ingot.png} | Bin .../textures/items/tic/tiberium_ingot.png | Bin 15955 -> 15960 bytes .../{aardium_ingot.png => titanite_ingot.png} | Bin 16148 -> 16121 bytes .../textures/items/tic/vibranium_ingot.png | Bin 15897 -> 15871 bytes .../{axiidian_ingot.png => violium_ingot.png} | Bin 15817 -> 15828 bytes 91 files changed, 245 insertions(+), 235 deletions(-) rename src/main/resources/assets/ztic_addon/blockstates/{axiidian_block.json => aegisalt_block.json} (51%) delete mode 100644 src/main/resources/assets/ztic_addon/blockstates/dysprosanium_block.json rename src/main/resources/assets/ztic_addon/blockstates/{aardium_block.json => lumixyl_block.json} (52%) rename src/main/resources/assets/ztic_addon/blockstates/{polynium_block.json => noctunyx_block.json} (51%) rename src/main/resources/assets/ztic_addon/blockstates/{plinium_block.json => nucleum_block.json} (52%) delete mode 100644 src/main/resources/assets/ztic_addon/blockstates/prysocite_block.json rename src/main/resources/assets/ztic_addon/blockstates/{yrdean_block.json => rubium_block.json} (52%) rename src/main/resources/assets/ztic_addon/blockstates/{yrdean_ore.json => rubium_ore.json} (55%) create mode 100644 src/main/resources/assets/ztic_addon/blockstates/solarium_block.json create mode 100644 src/main/resources/assets/ztic_addon/blockstates/titanite_block.json rename src/main/resources/assets/ztic_addon/blockstates/{axiidian_ore.json => titanite_ore.json} (54%) create mode 100644 src/main/resources/assets/ztic_addon/blockstates/violium_block.json rename src/main/resources/assets/ztic_addon/blockstates/{aardium_ore.json => violium_ore.json} (55%) delete mode 100644 src/main/resources/assets/ztic_addon/blockstates/xylitite_block.json rename src/main/resources/assets/ztic_addon/models/block/{axiidian_block.json => aegisalt_block.json} (54%) delete mode 100644 src/main/resources/assets/ztic_addon/models/block/dysprosanium_block.json rename src/main/resources/assets/ztic_addon/models/block/{aardium_block.json => lumixyl_block.json} (54%) rename src/main/resources/assets/ztic_addon/models/block/{polynium_block.json => noxtunyx_block.json} (54%) rename src/main/resources/assets/ztic_addon/models/block/{plinium_block.json => nucleum_block.json} (54%) delete mode 100644 src/main/resources/assets/ztic_addon/models/block/prysocite_block.json rename src/main/resources/assets/ztic_addon/models/block/{yrdean_block.json => rubium_block.json} (55%) rename src/main/resources/assets/ztic_addon/models/block/{yrdean_ore.json => rubium_ore.json} (56%) create mode 100644 src/main/resources/assets/ztic_addon/models/block/solarium_block.json create mode 100644 src/main/resources/assets/ztic_addon/models/block/titanite_block.json rename src/main/resources/assets/ztic_addon/models/block/{axiidian_ore.json => titanite_ore.json} (55%) create mode 100644 src/main/resources/assets/ztic_addon/models/block/violium_block.json rename src/main/resources/assets/ztic_addon/models/block/{aardium_ore.json => violium_ore.json} (55%) delete mode 100644 src/main/resources/assets/ztic_addon/models/block/xylitite_block.json rename src/main/resources/assets/ztic_addon/models/item/{polynium_block.json => aegisalt_block.json} (84%) rename src/main/resources/assets/ztic_addon/models/item/{xylitite_ingot.json => aegisalt_ingot.json} (50%) delete mode 100644 src/main/resources/assets/ztic_addon/models/item/dysprosanium_block.json delete mode 100644 src/main/resources/assets/ztic_addon/models/item/dysprosanium_ingot.json rename src/main/resources/assets/ztic_addon/models/item/{aardium_block.json => lumixyl_block.json} (84%) rename src/main/resources/assets/ztic_addon/models/item/{plinium_ingot.json => lumixyl_ingot.json} (51%) rename src/main/resources/assets/ztic_addon/models/item/{axiidian_block.json => noctunyx_block.json} (84%) rename src/main/resources/assets/ztic_addon/models/item/{polynium_ingot.json => noctunyx_ingot.json} (50%) rename src/main/resources/assets/ztic_addon/models/item/{plinium_block.json => nucleum_block.json} (84%) rename src/main/resources/assets/ztic_addon/models/item/{prysocite_ingot.json => nucleum_ingot.json} (50%) delete mode 100644 src/main/resources/assets/ztic_addon/models/item/prysocite_block.json rename src/main/resources/assets/ztic_addon/models/item/{yrdean_block.json => rubium_block.json} (85%) rename src/main/resources/assets/ztic_addon/models/item/{yrdean_ingot.json => rubium_ingot.json} (51%) rename src/main/resources/assets/ztic_addon/models/item/{yrdean_ore.json => rubium_ore.json} (81%) create mode 100644 src/main/resources/assets/ztic_addon/models/item/solarium_block.json create mode 100644 src/main/resources/assets/ztic_addon/models/item/solarium_ingot.json create mode 100644 src/main/resources/assets/ztic_addon/models/item/titanite_block.json rename src/main/resources/assets/ztic_addon/models/item/{axiidian_ingot.json => titanite_ingot.json} (50%) rename src/main/resources/assets/ztic_addon/models/item/{axiidian_ore.json => titanite_ore.json} (80%) create mode 100644 src/main/resources/assets/ztic_addon/models/item/violium_block.json rename src/main/resources/assets/ztic_addon/models/item/{aardium_ingot.json => violium_ingot.json} (51%) rename src/main/resources/assets/ztic_addon/models/item/{aardium_ore.json => violium_ore.json} (80%) delete mode 100644 src/main/resources/assets/ztic_addon/models/item/xylitite_block.json rename src/main/resources/assets/ztic_addon/textures/blocks/{dysprosanium_block.png => aegisalt_block.png} (100%) rename src/main/resources/assets/ztic_addon/textures/blocks/{prysocite_block.png => lumixyl_block.png} (100%) rename src/main/resources/assets/ztic_addon/textures/blocks/{polynium_block.png => noctunyx_block.png} (100%) rename src/main/resources/assets/ztic_addon/textures/blocks/{plinium_block.png => nucleum_block.png} (100%) rename src/main/resources/assets/ztic_addon/textures/blocks/{yrdean_block.png => rubium_block.png} (100%) rename src/main/resources/assets/ztic_addon/textures/blocks/{yrdean_ore.png => rubium_ore.png} (100%) rename src/main/resources/assets/ztic_addon/textures/blocks/{xylitite_block.png => solarium_block.png} (100%) rename src/main/resources/assets/ztic_addon/textures/blocks/{aardium_block.png => titanite_block.png} (100%) rename src/main/resources/assets/ztic_addon/textures/blocks/{aardium_ore.png => titanite_ore.png} (100%) rename src/main/resources/assets/ztic_addon/textures/blocks/{axiidian_block.png => violium_block.png} (100%) rename src/main/resources/assets/ztic_addon/textures/blocks/{axiidian_ore.png => violium_ore.png} (100%) rename src/main/resources/assets/ztic_addon/textures/items/tic/{dysprosanium_ingot.png => aegisalt_ingot.png} (93%) rename src/main/resources/assets/ztic_addon/textures/items/tic/{prysocite_ingot.png => lumixyl_ingot.png} (100%) rename src/main/resources/assets/ztic_addon/textures/items/tic/{polynium_ingot.png => noxtunyx_ingot.png} (100%) rename src/main/resources/assets/ztic_addon/textures/items/tic/{plinium_ingot.png => nucleum_ingot.png} (100%) rename src/main/resources/assets/ztic_addon/textures/items/tic/{yrdean_ingot.png => rubium_ingot.png} (93%) rename src/main/resources/assets/ztic_addon/textures/items/tic/{xylitite_ingot.png => solarium_ingot.png} (100%) rename src/main/resources/assets/ztic_addon/textures/items/tic/{aardium_ingot.png => titanite_ingot.png} (93%) rename src/main/resources/assets/ztic_addon/textures/items/tic/{axiidian_ingot.png => violium_ingot.png} (94%) diff --git a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java index 0bc94fc..6f58496 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java +++ b/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 adamantiteOre = new BasicBlock("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, 6, 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, 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 bismuthOre = new BasicBlock("bismuth_ore", Material.ROCK, 8.0f, 8.0f, 1, PREFIX_ORE); - public static Block eterniteOre = new BasicBlock("eternite_ore", Material.ROCK, 24.0f, 25.0f, 3, PREFIX_ORE); - public static Block ignititeOre = new BasicBlock("ignitite_ore", Material.ROCK, 23.0f, 25.0f, 3, PREFIX_ORE); - public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 13.0f, 15.0f, 1, PREFIX_ORE); - public static Block meteoriteOre = new BasicBlock("meteorite_ore", Material.ROCK, 60.0f, 500.0f, 4, 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, 5, 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, 7, 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, 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 palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3, 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, 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 slaggoldOre = new BasicBlock("slaggold_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, 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 yrdeanOre = new BasicBlock("yrdean_ore", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_ORE); + public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 70.0f, 800.0f, 7, 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 adamantiteBlock = new BasicBlock("adamantite_block", Material.ROCK, 80.0f, 1000.0f, 4, PREFIX_BLOCK); - public static Block arcaniteBlock = new BasicBlock("arcanite_block", Material.ROCK, 23.0f, 25.0f, 2, PREFIX_BLOCK); - public static Block axiidianBlock = new BasicBlock("axiidian_block", Material.ROCK, 13.0f, 13.0f, 3, PREFIX_BLOCK); - public static Block bismuthBlock = new BasicBlock("bismuth_block", Material.ROCK, 8.0f, 8.0f, 1, PREFIX_BLOCK); - public static Block eterniteBlock = new BasicBlock("eternite_block", Material.ROCK, 24.0f, 25.0f, 3, PREFIX_BLOCK); - public static Block ignititeBlock = new BasicBlock("ignitite_block", Material.ROCK, 23.0f, 25.0f, 3, PREFIX_BLOCK); - public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 13.0f, 15.0f, 1, PREFIX_BLOCK); - public static Block meteoriteBlock = new BasicBlock("meteorite_block", Material.ROCK, 60.0f, 500.0f, 4, 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, 8, PREFIX_BLOCK); + public static Block arcaniteBlock = new BasicBlock("arcanite_block", Material.ROCK, 23.0f, 25.0f, 7, 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, 5, 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, 7, 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, 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 palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 25.0f, 3, 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, 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 yrdeanBlock = new BasicBlock("yrdean_block", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_BLOCK); + public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 70.0f, 800.0f, 7, 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 prysociteBlock = new BasicBlock("prysocite_block", Material.ROCK, 12.0f, 12.0f, 2, PREFIX_BLOCK); + public static Block noctunyxBlock = new BasicBlock("noctunyx_block", Material.ROCK, 60.0f, 500.0f, 4, 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); diff --git a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java index b702d32..01242d5 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java +++ b/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 xylititeFluid = new BasicTinkerFluid("xylitite", 0xFFffc81d, true, 200, 10, 4000); + public static BasicTinkerFluid lumixylFluid = new BasicTinkerFluid("lumixyl", 0xFFbde398, 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 dysprosaniumFluid = new BasicTinkerFluid("dysprosanium", 0xFFb7a2bd, true, 200, 10, 4000); + public static BasicTinkerFluid nucleumFluid = new BasicTinkerFluid("nucleum", 0xFFc1ff68, 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); diff --git a/src/main/java/com/sosnitzka/ztic_addon/Items.java b/src/main/java/com/sosnitzka/ztic_addon/Items.java index dcc9929..787cbe3 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Items.java +++ b/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 xylititeIngot = new BasicItem("xylitite_ingot", PREFIX_INGOT); + public static Item lumixylIngot = new BasicItem("lumixyl_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 dysprosaniumIngot = new BasicItem("dysprosanium_ingot", PREFIX_INGOT); + public static Item nucleumIngot = new BasicItem("nucleum_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); diff --git a/src/main/java/com/sosnitzka/ztic_addon/Materials.java b/src/main/java/com/sosnitzka/ztic_addon/Materials.java index 01e38d5..cbc51f6 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Materials.java +++ b/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 axiidian = new Material("axiidian", TextFormatting.DARK_GREEN); + public static Material rubium = new Material("rubium", TextFormatting.LIGHT_PURPLE); + 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 xylitite = new Material("xylitite", TextFormatting.GRAY); + public static Material lumixyl = new Material("lumixyl", 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 dysprosanium = new Material("dysprosanium", TextFormatting.AQUA); + public static Material nucleum = new Material("nucleum", TextFormatting.AQUA); + public static Material aegisalt = new Material("aegisalt", TextFormatting.AQUA); public static Material bysmuid = new Material("bysmuid", TextFormatting.AQUA); } diff --git a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java b/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java index 9453dcd..324eaff 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java +++ b/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(polyniumFluid, 1, yrdeanFluid, 3, meteoriteFluid, 2); - registerTinkerAlloys(imperomiteFluid, 2, aardiumFluid, 3, prometheumFluid, 3); + registerTinkerAlloys(proxideumFluid, 1, prometheumFluid, 3, violiumFluid, 2); + registerTinkerAlloys(noctunyxFluid, 1, rubiumFluid, 3, meteoriteFluid, 2); + 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(prysociteFluid, 1, bismuthFluid, 3, yrdeanFluid, 2); - registerTinkerAlloys(xylititeFluid, 1, karmesineFluid, 3, ignititeFluid, 2); + registerTinkerAlloys(terramiteFluid, 2, violiumFluid, 4, eterniteFluid, 2); + registerTinkerAlloys(lumixylFluid, 1, bismuthFluid, 3, rubiumFluid, 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(dysprosaniumFluid, 1, eterniteFluid, 3, aardiumFluid, 3); + registerTinkerAlloys(nucleumFluid, 1, palladiumFluid, 3, mindoriteFluid, 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("Axiidian", axiidian, axiidianFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true); + registerTinkerMaterial("Rubium", rubium, rubiumFluid, 1, 5, 6, 4, 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("BlazingXylitite", xylitite, xylititeFluid, 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("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("Dysprosanium", dysprosanium, dysprosaniumFluid, 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("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); diff --git a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java index 1786b64..c596a3c 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java +++ b/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 diff --git a/src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java b/src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java index ed2b5b6..305187e 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java +++ b/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)); } } diff --git a/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitInstable.java b/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitInstable.java index c727fda..a09bff8 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitInstable.java +++ b/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) { - world.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 3, true, true); + if (MathHelper.getRandomIntegerInRange(random, 0, 100) < 2) { + 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); } } diff --git a/src/main/java/com/sosnitzka/ztic_addon/world/ZWorldGen.java b/src/main/java/com/sosnitzka/ztic_addon/world/ZWorldGen.java index fa7fcfd..b2d94d0 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/world/ZWorldGen.java +++ b/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(aardiumOre.getDefaultState(), random, x, z, world, 16, 40, 65, 2, 6); + Generator.generateEndOre(violiumOre.getDefaultState(), random, x, z, world, 16, 30, 55, 2, 6); + Generator.generateEndOre(titaniteOre.getDefaultState(), random, x, z, world, 16, 40, 65, 2, 6); } diff --git a/src/main/resources/assets/ztic_addon/blockstates/axiidian_block.json b/src/main/resources/assets/ztic_addon/blockstates/aegisalt_block.json similarity index 51% rename from src/main/resources/assets/ztic_addon/blockstates/axiidian_block.json rename to src/main/resources/assets/ztic_addon/blockstates/aegisalt_block.json index 155ff3f..26742d8 100644 --- a/src/main/resources/assets/ztic_addon/blockstates/axiidian_block.json +++ b/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" } } } diff --git a/src/main/resources/assets/ztic_addon/blockstates/dysprosanium_block.json b/src/main/resources/assets/ztic_addon/blockstates/dysprosanium_block.json deleted file mode 100644 index e311713..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/dysprosanium_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:dysprosanium_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/blockstates/aardium_block.json b/src/main/resources/assets/ztic_addon/blockstates/lumixyl_block.json similarity index 52% rename from src/main/resources/assets/ztic_addon/blockstates/aardium_block.json rename to src/main/resources/assets/ztic_addon/blockstates/lumixyl_block.json index 8197ece..b83d8e7 100644 --- a/src/main/resources/assets/ztic_addon/blockstates/aardium_block.json +++ b/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" } } } diff --git a/src/main/resources/assets/ztic_addon/blockstates/polynium_block.json b/src/main/resources/assets/ztic_addon/blockstates/noctunyx_block.json similarity index 51% rename from src/main/resources/assets/ztic_addon/blockstates/polynium_block.json rename to src/main/resources/assets/ztic_addon/blockstates/noctunyx_block.json index 7333cd2..63d0db1 100644 --- a/src/main/resources/assets/ztic_addon/blockstates/polynium_block.json +++ b/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" } } } diff --git a/src/main/resources/assets/ztic_addon/blockstates/plinium_block.json b/src/main/resources/assets/ztic_addon/blockstates/nucleum_block.json similarity index 52% rename from src/main/resources/assets/ztic_addon/blockstates/plinium_block.json rename to src/main/resources/assets/ztic_addon/blockstates/nucleum_block.json index 9bd0d49..2ddb310 100644 --- a/src/main/resources/assets/ztic_addon/blockstates/plinium_block.json +++ b/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" } } } diff --git a/src/main/resources/assets/ztic_addon/blockstates/prysocite_block.json b/src/main/resources/assets/ztic_addon/blockstates/prysocite_block.json deleted file mode 100644 index 4baac8c..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/prysocite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:prysocite_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/blockstates/yrdean_block.json b/src/main/resources/assets/ztic_addon/blockstates/rubium_block.json similarity index 52% rename from src/main/resources/assets/ztic_addon/blockstates/yrdean_block.json rename to src/main/resources/assets/ztic_addon/blockstates/rubium_block.json index 9b9e717..14a1a50 100644 --- a/src/main/resources/assets/ztic_addon/blockstates/yrdean_block.json +++ b/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" } } } diff --git a/src/main/resources/assets/ztic_addon/blockstates/yrdean_ore.json b/src/main/resources/assets/ztic_addon/blockstates/rubium_ore.json similarity index 55% rename from src/main/resources/assets/ztic_addon/blockstates/yrdean_ore.json rename to src/main/resources/assets/ztic_addon/blockstates/rubium_ore.json index 36ef7c0..4204eec 100644 --- a/src/main/resources/assets/ztic_addon/blockstates/yrdean_ore.json +++ b/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" } } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/blockstates/solarium_block.json b/src/main/resources/assets/ztic_addon/blockstates/solarium_block.json new file mode 100644 index 0000000..770b998 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/solarium_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:solarium_block" + } + } +} diff --git a/src/main/resources/assets/ztic_addon/blockstates/titanite_block.json b/src/main/resources/assets/ztic_addon/blockstates/titanite_block.json new file mode 100644 index 0000000..76f2608 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/titanite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:titanite_block" + } + } +} diff --git a/src/main/resources/assets/ztic_addon/blockstates/axiidian_ore.json b/src/main/resources/assets/ztic_addon/blockstates/titanite_ore.json similarity index 54% rename from src/main/resources/assets/ztic_addon/blockstates/axiidian_ore.json rename to src/main/resources/assets/ztic_addon/blockstates/titanite_ore.json index b74bf57..0a35485 100644 --- a/src/main/resources/assets/ztic_addon/blockstates/axiidian_ore.json +++ b/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" } } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/blockstates/violium_block.json b/src/main/resources/assets/ztic_addon/blockstates/violium_block.json new file mode 100644 index 0000000..1929919 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/violium_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:violium_block" + } + } +} diff --git a/src/main/resources/assets/ztic_addon/blockstates/aardium_ore.json b/src/main/resources/assets/ztic_addon/blockstates/violium_ore.json similarity index 55% rename from src/main/resources/assets/ztic_addon/blockstates/aardium_ore.json rename to src/main/resources/assets/ztic_addon/blockstates/violium_ore.json index 0183358..5f75b0c 100644 --- a/src/main/resources/assets/ztic_addon/blockstates/aardium_ore.json +++ b/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" } } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/blockstates/xylitite_block.json b/src/main/resources/assets/ztic_addon/blockstates/xylitite_block.json deleted file mode 100644 index 9a0a7ed..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/xylitite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:xylitite_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/lang/de_DE.lang b/src/main/resources/assets/ztic_addon/lang/de_DE.lang index ca82882..09a31db 100644 --- a/src/main/resources/assets/ztic_addon/lang/de_DE.lang +++ b/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.aardium_ore.name=Aardiumerz +tile.rubium_ore.name=Rubiumerz +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.aardium_ingot.name=Aardiumbarren +item.rubium_ingot.name=Rubiumbarren +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 diff --git a/src/main/resources/assets/ztic_addon/lang/en_US.lang b/src/main/resources/assets/ztic_addon/lang/en_US.lang index e471ba1..e73cf30 100644 --- a/src/main/resources/assets/ztic_addon/lang/en_US.lang +++ b/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.aardium_ore.name=Aardium Ore +tile.rubium_ore.name=Rubium 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.aardium_ingot.name=Aardium Ingot +item.rubium_ingot.name=Rubium 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 \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/block/axiidian_block.json b/src/main/resources/assets/ztic_addon/models/block/aegisalt_block.json similarity index 54% rename from src/main/resources/assets/ztic_addon/models/block/axiidian_block.json rename to src/main/resources/assets/ztic_addon/models/block/aegisalt_block.json index 199ee31..8594832 100644 --- a/src/main/resources/assets/ztic_addon/models/block/axiidian_block.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/block/dysprosanium_block.json b/src/main/resources/assets/ztic_addon/models/block/dysprosanium_block.json deleted file mode 100644 index 8c41d1e..0000000 --- a/src/main/resources/assets/ztic_addon/models/block/dysprosanium_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "ztic_addon:blocks/dysprosanium_block" - } -} diff --git a/src/main/resources/assets/ztic_addon/models/block/aardium_block.json b/src/main/resources/assets/ztic_addon/models/block/lumixyl_block.json similarity index 54% rename from src/main/resources/assets/ztic_addon/models/block/aardium_block.json rename to src/main/resources/assets/ztic_addon/models/block/lumixyl_block.json index a7fc413..91ff7ce 100644 --- a/src/main/resources/assets/ztic_addon/models/block/aardium_block.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/block/polynium_block.json b/src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json similarity index 54% rename from src/main/resources/assets/ztic_addon/models/block/polynium_block.json rename to src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json index 43e375b..28e5715 100644 --- a/src/main/resources/assets/ztic_addon/models/block/polynium_block.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/block/plinium_block.json b/src/main/resources/assets/ztic_addon/models/block/nucleum_block.json similarity index 54% rename from src/main/resources/assets/ztic_addon/models/block/plinium_block.json rename to src/main/resources/assets/ztic_addon/models/block/nucleum_block.json index 44fc07f..e8cd5f7 100644 --- a/src/main/resources/assets/ztic_addon/models/block/plinium_block.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/block/prysocite_block.json b/src/main/resources/assets/ztic_addon/models/block/prysocite_block.json deleted file mode 100644 index 5df2313..0000000 --- a/src/main/resources/assets/ztic_addon/models/block/prysocite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "ztic_addon:blocks/prysocite_block" - } -} diff --git a/src/main/resources/assets/ztic_addon/models/block/yrdean_block.json b/src/main/resources/assets/ztic_addon/models/block/rubium_block.json similarity index 55% rename from src/main/resources/assets/ztic_addon/models/block/yrdean_block.json rename to src/main/resources/assets/ztic_addon/models/block/rubium_block.json index ca9f1f2..2a0165e 100644 --- a/src/main/resources/assets/ztic_addon/models/block/yrdean_block.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/block/yrdean_ore.json b/src/main/resources/assets/ztic_addon/models/block/rubium_ore.json similarity index 56% rename from src/main/resources/assets/ztic_addon/models/block/yrdean_ore.json rename to src/main/resources/assets/ztic_addon/models/block/rubium_ore.json index 16749cb..d2b0fe3 100644 --- a/src/main/resources/assets/ztic_addon/models/block/yrdean_ore.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/block/solarium_block.json b/src/main/resources/assets/ztic_addon/models/block/solarium_block.json new file mode 100644 index 0000000..b031965 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/block/titanite_block.json b/src/main/resources/assets/ztic_addon/models/block/titanite_block.json new file mode 100644 index 0000000..791cb40 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/block/axiidian_ore.json b/src/main/resources/assets/ztic_addon/models/block/titanite_ore.json similarity index 55% rename from src/main/resources/assets/ztic_addon/models/block/axiidian_ore.json rename to src/main/resources/assets/ztic_addon/models/block/titanite_ore.json index aa16dbd..f08f303 100644 --- a/src/main/resources/assets/ztic_addon/models/block/axiidian_ore.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/block/violium_block.json b/src/main/resources/assets/ztic_addon/models/block/violium_block.json new file mode 100644 index 0000000..6c82084 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/block/aardium_ore.json b/src/main/resources/assets/ztic_addon/models/block/violium_ore.json similarity index 55% rename from src/main/resources/assets/ztic_addon/models/block/aardium_ore.json rename to src/main/resources/assets/ztic_addon/models/block/violium_ore.json index 875be13..0860ca3 100644 --- a/src/main/resources/assets/ztic_addon/models/block/aardium_ore.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/block/xylitite_block.json b/src/main/resources/assets/ztic_addon/models/block/xylitite_block.json deleted file mode 100644 index c2482a5..0000000 --- a/src/main/resources/assets/ztic_addon/models/block/xylitite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "ztic_addon:blocks/xylitite_block" - } -} diff --git a/src/main/resources/assets/ztic_addon/models/item/polynium_block.json b/src/main/resources/assets/ztic_addon/models/item/aegisalt_block.json similarity index 84% rename from src/main/resources/assets/ztic_addon/models/item/polynium_block.json rename to src/main/resources/assets/ztic_addon/models/item/aegisalt_block.json index a240bd2..f06e537 100644 --- a/src/main/resources/assets/ztic_addon/models/item/polynium_block.json +++ b/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": [ diff --git a/src/main/resources/assets/ztic_addon/models/item/xylitite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/aegisalt_ingot.json similarity index 50% rename from src/main/resources/assets/ztic_addon/models/item/xylitite_ingot.json rename to src/main/resources/assets/ztic_addon/models/item/aegisalt_ingot.json index 4fc775f..363e2da 100644 --- a/src/main/resources/assets/ztic_addon/models/item/xylitite_ingot.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/item/dysprosanium_block.json b/src/main/resources/assets/ztic_addon/models/item/dysprosanium_block.json deleted file mode 100644 index 2fa0922..0000000 --- a/src/main/resources/assets/ztic_addon/models/item/dysprosanium_block.json +++ /dev/null @@ -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 - ] - } - } -} diff --git a/src/main/resources/assets/ztic_addon/models/item/dysprosanium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/dysprosanium_ingot.json deleted file mode 100644 index fad842d..0000000 --- a/src/main/resources/assets/ztic_addon/models/item/dysprosanium_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/dysprosanium_ingot" - } -} diff --git a/src/main/resources/assets/ztic_addon/models/item/aardium_block.json b/src/main/resources/assets/ztic_addon/models/item/lumixyl_block.json similarity index 84% rename from src/main/resources/assets/ztic_addon/models/item/aardium_block.json rename to src/main/resources/assets/ztic_addon/models/item/lumixyl_block.json index 7c881ce..2735a4d 100644 --- a/src/main/resources/assets/ztic_addon/models/item/aardium_block.json +++ b/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": [ diff --git a/src/main/resources/assets/ztic_addon/models/item/plinium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/lumixyl_ingot.json similarity index 51% rename from src/main/resources/assets/ztic_addon/models/item/plinium_ingot.json rename to src/main/resources/assets/ztic_addon/models/item/lumixyl_ingot.json index 60d3c30..1926e7d 100644 --- a/src/main/resources/assets/ztic_addon/models/item/plinium_ingot.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/item/axiidian_block.json b/src/main/resources/assets/ztic_addon/models/item/noctunyx_block.json similarity index 84% rename from src/main/resources/assets/ztic_addon/models/item/axiidian_block.json rename to src/main/resources/assets/ztic_addon/models/item/noctunyx_block.json index 6760d2a..62833e2 100644 --- a/src/main/resources/assets/ztic_addon/models/item/axiidian_block.json +++ b/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": [ diff --git a/src/main/resources/assets/ztic_addon/models/item/polynium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/noctunyx_ingot.json similarity index 50% rename from src/main/resources/assets/ztic_addon/models/item/polynium_ingot.json rename to src/main/resources/assets/ztic_addon/models/item/noctunyx_ingot.json index 745629b..c6a0b46 100644 --- a/src/main/resources/assets/ztic_addon/models/item/polynium_ingot.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/item/plinium_block.json b/src/main/resources/assets/ztic_addon/models/item/nucleum_block.json similarity index 84% rename from src/main/resources/assets/ztic_addon/models/item/plinium_block.json rename to src/main/resources/assets/ztic_addon/models/item/nucleum_block.json index 2addcd9..97e93cc 100644 --- a/src/main/resources/assets/ztic_addon/models/item/plinium_block.json +++ b/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": [ diff --git a/src/main/resources/assets/ztic_addon/models/item/prysocite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/nucleum_ingot.json similarity index 50% rename from src/main/resources/assets/ztic_addon/models/item/prysocite_ingot.json rename to src/main/resources/assets/ztic_addon/models/item/nucleum_ingot.json index ce11cbd..20a47cb 100644 --- a/src/main/resources/assets/ztic_addon/models/item/prysocite_ingot.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/item/prysocite_block.json b/src/main/resources/assets/ztic_addon/models/item/prysocite_block.json deleted file mode 100644 index c6a3955..0000000 --- a/src/main/resources/assets/ztic_addon/models/item/prysocite_block.json +++ /dev/null @@ -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 - ] - } - } -} diff --git a/src/main/resources/assets/ztic_addon/models/item/yrdean_block.json b/src/main/resources/assets/ztic_addon/models/item/rubium_block.json similarity index 85% rename from src/main/resources/assets/ztic_addon/models/item/yrdean_block.json rename to src/main/resources/assets/ztic_addon/models/item/rubium_block.json index 958fda5..a1c78bf 100644 --- a/src/main/resources/assets/ztic_addon/models/item/yrdean_block.json +++ b/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": [ diff --git a/src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json b/src/main/resources/assets/ztic_addon/models/item/rubium_ingot.json similarity index 51% rename from src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json rename to src/main/resources/assets/ztic_addon/models/item/rubium_ingot.json index b607473..6cdb7e9 100644 --- a/src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/item/yrdean_ore.json b/src/main/resources/assets/ztic_addon/models/item/rubium_ore.json similarity index 81% rename from src/main/resources/assets/ztic_addon/models/item/yrdean_ore.json rename to src/main/resources/assets/ztic_addon/models/item/rubium_ore.json index 1afd410..52af8a7 100644 --- a/src/main/resources/assets/ztic_addon/models/item/yrdean_ore.json +++ b/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 ], diff --git a/src/main/resources/assets/ztic_addon/models/item/solarium_block.json b/src/main/resources/assets/ztic_addon/models/item/solarium_block.json new file mode 100644 index 0000000..19809e4 --- /dev/null +++ b/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 + ] + } + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/solarium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/solarium_ingot.json new file mode 100644 index 0000000..50635c3 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/titanite_block.json b/src/main/resources/assets/ztic_addon/models/item/titanite_block.json new file mode 100644 index 0000000..f90cab8 --- /dev/null +++ b/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 + ] + } + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json b/src/main/resources/assets/ztic_addon/models/item/titanite_ingot.json similarity index 50% rename from src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json rename to src/main/resources/assets/ztic_addon/models/item/titanite_ingot.json index 9a7ad18..dac6b74 100644 --- a/src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/item/axiidian_ore.json b/src/main/resources/assets/ztic_addon/models/item/titanite_ore.json similarity index 80% rename from src/main/resources/assets/ztic_addon/models/item/axiidian_ore.json rename to src/main/resources/assets/ztic_addon/models/item/titanite_ore.json index 6376d33..a56f4ab 100644 --- a/src/main/resources/assets/ztic_addon/models/item/axiidian_ore.json +++ b/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 ], diff --git a/src/main/resources/assets/ztic_addon/models/item/violium_block.json b/src/main/resources/assets/ztic_addon/models/item/violium_block.json new file mode 100644 index 0000000..2f0951f --- /dev/null +++ b/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 + ] + } + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/violium_ingot.json similarity index 51% rename from src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json rename to src/main/resources/assets/ztic_addon/models/item/violium_ingot.json index 4d9bc33..c667fd8 100644 --- a/src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json +++ b/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" } } diff --git a/src/main/resources/assets/ztic_addon/models/item/aardium_ore.json b/src/main/resources/assets/ztic_addon/models/item/violium_ore.json similarity index 80% rename from src/main/resources/assets/ztic_addon/models/item/aardium_ore.json rename to src/main/resources/assets/ztic_addon/models/item/violium_ore.json index 6503b44..4fde870 100644 --- a/src/main/resources/assets/ztic_addon/models/item/aardium_ore.json +++ b/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 ], diff --git a/src/main/resources/assets/ztic_addon/models/item/xylitite_block.json b/src/main/resources/assets/ztic_addon/models/item/xylitite_block.json deleted file mode 100644 index b976c7d..0000000 --- a/src/main/resources/assets/ztic_addon/models/item/xylitite_block.json +++ /dev/null @@ -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 - ] - } - } -} diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/dysprosanium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/aegisalt_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/dysprosanium_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/aegisalt_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/prysocite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/prysocite_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/polynium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/noctunyx_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/polynium_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/noctunyx_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/plinium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/nucleum_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/plinium_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/nucleum_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/yrdean_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/yrdean_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/yrdean_ore.png b/src/main/resources/assets/ztic_addon/textures/blocks/rubium_ore.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/yrdean_ore.png rename to src/main/resources/assets/ztic_addon/textures/blocks/rubium_ore.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/xylitite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/solarium_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/xylitite_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/solarium_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/aardium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/titanite_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/aardium_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/titanite_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/aardium_ore.png b/src/main/resources/assets/ztic_addon/textures/blocks/titanite_ore.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/aardium_ore.png rename to src/main/resources/assets/ztic_addon/textures/blocks/titanite_ore.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/axiidian_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/violium_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/axiidian_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/violium_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/axiidian_ore.png b/src/main/resources/assets/ztic_addon/textures/blocks/violium_ore.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/axiidian_ore.png rename to src/main/resources/assets/ztic_addon/textures/blocks/violium_ore.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/adamantite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/adamantite_ingot.png index 306be7338d659b1fce92a0b1f497fb145214baab..c69b1c1e8c4cf02505424051812913331b9807e0 100644 GIT binary patch delta 715 zcmaD}v9xA_1(WrRjaD_x+=iwh28LEfmR5#_lMgamqwv{T=BlJ7Cnl#FrkUv`rluw7 z8kw1x>n53{8t59Em>3xvS|p~K8YFH$!4knT`7W#L-U* zHb3OBHe`{$=zo2(f|Y(fyQhm|NX4xqll?s=7fKwr-(SA|w)OQzmlUV1eY>fKS5RtE zvw-G{3%bhB9LqE~*6>};R95WpER$!|y!-0HukI^~R#OzXCpAtwJ1a*!MMvfECG)%U zzh6)E=+j{0w_VOY@BR1FpFjMybMiVF=9Sp3S`zzTJt05ZVb|6)rSi6Hi~3jhJrwu) zE3IDf!9#>+K}XM#`p!RU0#+B)&D9=i2WBvCW6W+~d$>+x-?6gFM``;nl8bU%3vHhNT@c8+mT@MR z1!L#|{)9k-|3%Z*zf=u6)4){8wPH&B!QwOLpLh0~Y~6KGZGofHV%B>hC-%)&&Q1yJ zF8%Vtec|aP#>E_E({=<(xVp0LbC{eh-#z(#q3#Y(vE>!B=eZf?@~}8p%(eTGc4%Et zsq*v#C0s%L%L60X_o$umjQRH0M`YgR%at>l-I)T?5A|>!<;vi?ADQ;5Y|=GZ*&D@v z8|s_A_A*Wu`o{Ei(%pNu4_Lz**%<43mwr(fdhB^hSId9eV~emy3!L8En<4P2`OUsk z%~=+Yt&evdfAFz8orh%NCcz^%L=L~+|H%eRh T9tme)U|{fc^>bP0l+XkKQY0|v delta 593 zcmZ2l^Sok$1(W5yjaD_xlf5{EC!b_C2Gjg3QzyS+SKEAwC5&bBEv`QXET;^%TTH%X ztzXaV>EaktaqGzBz1hKuBFF0ApY@$QJA2Zx*%NLo6HJa3*&@o~xaPrvM+;aNDp~C4 zD7pCR$$SM5hj8|z7oApX@Ljs}NI^-oYr)I*2^Y5Ts$?eZOHRs*Yrl~sx|yTu81w$; zHU;zCJv4vL4*U^byy*P~8BX5+Y2j~K{_?nVg-?*vu5X#}xHCPeSl`O=JNq$%Caax0 zRo*RdyvhIdrp)#%{+l9!=5K$xay(pLyu4!OybVWeE;UOAYrN#$QpYa3v~6R6Thwfq zD;IUulT=J}+P@g2N2_mqf9=B;s}rY1dT)iB>=r(|t=q}uSf6XN$Mxc-v=08*&kQ*o zNw*J%-j-a(uTxxq=Z^nB@0m^8{T%MQCnrrTpQbhW7kA6D!o#(K-n-7dJmBc{EkCBK zcN?pY(dmn4;?%k?^XTz>IAGfRMD@_p!p|2h^QzY`oMODCNKJLQ)7H$?vq49eOXN0g zGVV~H`6wc}qk7%)JE4ApvO0-(Pdqf*lM*B<<;z~IbgIhAH-F{)g!;|=B>@+;)*1($SFy7j^*1SHZpSvTU|I+01#)mk*pW=S`c|mjb*4f9; zy8jSq_Rso#Y5pO#y57~F7R$|DAd}1Ve{b)7c7{pLC*N*;vUWcM0|SGntDnm{r-UW| DCe9oY diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/dysprosanium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/aegisalt_ingot.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/tic/dysprosanium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/aegisalt_ingot.png index 06992d19777e62eb9133e2fcbbf2205c5efa3343..e2e697639fc619b9e26590f6b332a9decdbc9207 100644 GIT binary patch delta 744 zcmbPVbE{^lB}(qju8TH4mzhTd$#M{t8;JG?KZaF{QI?nsF3S}h0p)g+AV*sy<|!bTdS{< z&*eYM4{vtkuC=@7&y;qQb-ITkznDTvOX2r?k!h6|dD7TVJ33@UHdjgG^05et(4}Q||03ijz9X z(00)!|G!_BZ|I@era#kpczxZur*W9>;#d)V!CCZ;zgWJS?zi~bn~HLGcWW%3d)sr% zmIv4BjRnG2{$RaUz)h}7R`^1%O=6Frv`*WA5PI8$c z*IB?GmdNXR<;3)yH%^j~>n_dHcx1U?5pxme92;fx*+&&t;ucLK6T` CO+u~! delta 685 zcmcarGrwlTc4jW)5JO`tBMU1N%gG0sZIHR_EOS+ojf{+wQVdgcEzQ!BbyJK?EOZl1 zEKPLN43jNQjSLM8%#4jUpJ2JiLX^tM0vuM{h6o!s^K%_HWD(TPT|W7iwSGOLr;B4q z#jPWgqrF86C63kqFZ6r;?oD6!@{LAbf=4<}Ea=G6?+Vz!|1dO2ysmfGyG`enf|dn_ zH;Uh6^h*A0a_-Ezb=K$3$^DD<=oV^x;ClY+=RXw>YU31_KCub1Sl;q_SGtkiK4bM# z-NS2iI@R;V&$G?YJbO|{lHuLV?F$!ds^7J}jO&y5gOnE+zwjItl+Hh`Jpa5R&xieN zYo>(n7I?TTZ~MHN7k5||bRTq-eqGdfDvwurxuSNimB*ANt&dD^gh%iB_p>cBQs~jo z&ElVu<~v_3+fZd3aa1O=rbTY`i^}Fct&Ufro8}!W`XLwmdg&~d6Vp^O)mJbCw{m`S zX~^ZTznEbX*dyn%-t))Jlw&Po(6u9?H98)mO3%RD7a_;--K^!@z{ zma+vZD|jg{5%AeZ}v58lw=PdWfcQ1`jznV2iW=G!@)yxVHt2Kgda&a$$LwcHEltdH zEfdX>b&CzJC|`Ry6DDY&F#8j!xm8%d4VfQE`ljt4jqPEW@7)?6~&Yq zPl`AycL@X(6fF8^C}AA9bFyP|7h92has2Z;JI~EIuat3sU2RFhL9P8q@4eZ|I^k=? zHQ5bOH^W(XD`YFU9MR+0YIsnu>{6e*p=Z5ddKUBlmN}aq*ogJaI`AU0XVx-VvCQM< z8Ex%9V_rSj{xK`L$zD}p&aoBk5}}7)2)XTDF!j#DmFt9Cum5=TRKaf3roLE#pmKA! z`%CBA9bDn*Q_~+-(`_Pike|)-u;RUy+$qL)j}-3>c-K@U{Z}{Nou>IsQr-S>ubtSW z&pKz{Db(CLyZw|{$&AC_e;3{ft|`)g>?WS+rhekt_O&b*Y8<5Qr(cwG*ng)dPsZsd zd*L0M#K$u8tUbh@a%A0pIF&VDcZ2mbW-&L`#oZb2HD=zAZ@1q*^~7$MyVj>4U1I!l zJT_o!!m*~8sV~~=;~xI?Z9Hbjly4uHs=T&}|4O;jR`Iz1tiM7(3p4fZebLpr>iZhL kU%|20dH#OS|6|ACvfuU16R*Up3=9kmp00i_>zopr01f;Ng#Z8m delta 627 zcmX?Ad$M-Jc4jW)5JO`tBO@yli^&I>ZIHN|*;z^$m6Hy%R-F8$?Ld~EtqV@d3y7H?mq@BF{_?xP2O*#Uw_Qg z#WAGf){)7!*&>M|t@@l{lEEw&GnAX=wkkzLbhh>?xU?p)gbOIHQJj&oSo=rljAQW& zGDMknNBI1N zy^Q&qcD2_A?@f$OE^j7X(BLjxI@@QiGIzauLE82Y{wG#)ofA$}l~VGRpU|p&g@|`@QfM^HsS|i<|bWExBxTx#WuB zq!)TtI`xabS`-?%rTJa{SJCj~r`Z>7ZuJ>U-o-tgy~|OpJnH|wr89F?{`;mCcP)4HGSrbPX-iEOm{{Ow4pG zQw%M2Q_>79Et8YXOcRZaH~(UN%R-F8$pM^J+=d7XH~VuRH)Po#wxM^jl&xMpldh+W zV@SoVJ(q8LPiB-k_VN4r7mJ#V3|3ybKKDxQvYSUDb@(%O@s!TmDzcSn^Q9L_VouXo zJzF*8f)>VhOo>c;bBvX>ap}41p|^`>w+Bj|PFX5`U(adL3IQhhioCiHHSg+}6#n?P zmNGB7A)^w?)ugaScEYB9MOoY9Av-!&U#vfHe7D%Vmrwr)Pq>n4;hSnv++AQU#bNtO zDP^~F!H&sCyT_PtUH9>PHHr>zx?j^!d0Nv( z*0kqo{pyeDCuUArUC^1h<UrH|1cIDJq#rnPQ(u`-n#rbW!zzTE0jB|$~XPp0{ zC|hi4WRrV!Po{nI=Pavyed!mx*OhGUinwlAK9hg$);-?g3Ym*$_Jk^AJ}R90#PITr z&i`(j_u7)~Jnw(7O8Zds)P}=zT)K<+4?Wfu)VZ6V`qHtU{oU=UJ4(1}zOpf0@BUbR z{lR9D2kXxsj-A@^I6-HU-lW20nZ<09cQxHuc1s*iy3HzfZrNkYb*XB~T|e8n($-IX zsB!Uu$*O{-@1CRvnFN2lE!pF>v_9O3dG=I})f>Bw_V~8;ymsAl@%D$%w8yJG4krc} z?DB65o$R{a>--0{pXc2#W<5Bb>!SL|P;+L$s*2DBX#wj~4fG~8-mRDT%eO{}zg*>l q@V<%L)*7x!-MsJom+f`(4Cl8rIj`TUTh741z~JfX=d#Wzp$PzZy+i{5 delta 656 zcmeCKKU}wAJ2RJYh@r8Sk)@Tf<>Z6RHb~sf>?{`;m5q%IEsYF}b(1U%O?6ETOiXkW zjZDpT4b06`j15v#jgw81HveLM%R-F8$pM^J+=d7XH~VuRH)NT)!0+f}DO6G534!(;% zb_*oG2UI^)Fs^u$@98yhiO9+0mxXGt9Xz)@wd`~DpNP3G-7yPx7R`6d;YmK}t@^}e ze(9UFlY>;YE|@#_E647g-~asDb?Dn}&o3uLrB)li@Rr;5$nI5Vw8(LvDeq@#_N@?c z57~1!wxgbZmD6i)p|?*Z>(<#WojBt_N2P&S{)VYC3yg9XKCyQFx67;c=JB+gIj^$C zqfVTh`%cfrYvL9o?ko3WoZ~ILZR;k#4-VtX6Mot$_hkdOu91)FmHv4g0scP>5B;6O z{LJ>?w`l&aGvt-6PMO#9Z(T4q>q4K{&K@)Sj*Tyl&L|I@SGOrZDpa#Fq$qsqHihJ= zA@b2TYu-83Uv)Q3NYk#Ho%KWJX?mGin$DCvT1x|`-dSq)Mcs)*v8`WDP_lc;uM>xk z2}`q{=k$84eo^k$iaW-WrC%|W?x~NDo>abCq-NP)$GP{u9=K4S|M)#4!{JThB{_Gj SG#D5d7(8A5T-G@yGywq0;vk3s diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/karmesine_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/karmesine_ingot.png index 9021de1f370f76233ec0e49e473b6c052927df7d..58875a74c75de80b430ee2891cc39019e10ffc25 100644 GIT binary patch delta 750 zcmexU^R8yYc4jWq5CcOiV-qU_^T`L9ZIHR_EOS+oQVk4@l1)-|%?wkLbxjjZ%yp9t zEkT5tX=1X4xrv#1(&iH^Z&-*@Ia!XwirWxj<7Qc|Kh#$d^5))C0HcTaT?d3|4K~_~X_x`38%9*>z8!ubb^(Ijk}lR}+ld>ULsTR+^7m z%I40!j_k{|?LN(Co}+hm(tinc-O3-^^d?T+qw<$|iJPp8R_O{6FU3P?!k+!j@w>BY z>g(m7zPYS)T-*51ow%pjH{8=qo%}vc>aME1nWvn#U3q&{=hf?vGQMq{o+L`^NX%W_g)*Co>?5OKmA05Ozfw{uXPxTH zDzCcAwk_v9ucWD}|MpupYwFEy`?CHK0|Nttr>mdK II;Vst05ZE%>;M1& delta 764 zcmaD?^QUIRc4jW)5JO`tBLgcFmEs)_u=k!hn%0huWija%&j?7W`4_4 zO4;jp#`~ntJVU`Lej9EDxYZmw+`s;N2k*88=e`TPE8l2()$Ph_wJVX0m)@vk__%1B zIQ>YiSH7sGe*3iDqvE+adS4dxnQZ>McK+FYR$<4j0`}&avE8ZBIina*A@{#EXWE*V zd;F}MW^9eT!DXj@t7h(t2yU<3=O6gD^ z&!Ik^YnvxY7^y1!*~IxZPcYiKKOib!s30OR{_5s`Yuc{1r?#x(E(`d_H|xX|!VE(*&yQnF3*XmF;(j*Tq;kLHNIHOhJ`dMLGWO}gqwr}-Y&HH~XGNv^%n@%Lu5 zPpX{zM-hP&rXRmentRYk`LOy|p6E&co!Gfl<~}U%^gO=eqsHT)U-lROrR)9so&U#@ Z!ChJ7gNh-WB?AKkgQu&X%Q~loCIA3iS>*r# diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/prysocite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/lumixyl_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/prysocite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/lumixyl_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png index 190524849f209ceeda6f600697edd0dd20380ee1..973cf013082728f267ae9c60762e54f59e8db680 100644 GIT binary patch delta 565 zcmZ2by}f$Fc4jWq5CcOiBNHnF)5!;!ZIHR_EOS*76D<=h5=~8Xlg*8cb&V5E40SD2 zEev%H3@we)j7$uZ%o0sEpI~{zqD+L!$+8^Q+=d7XH_LJzH)L^TI~+gxg|&Wtx2KC^ zNX4xqlTYVec93v;&ijdn_vQ_zX0M4w+aIeup1E=E5xL_#MVx{;JI!KTLL)wWYIkjM z?r_mAJ^1K$&$Br{m;RS#>{#w%6B)4js+{Qcj|H;*`_Id>?(Az1oR(r?J<*1v_V=&J zPyfs+-Lp_W{mEt1xy#N^eBi(0#Jx{XKl9g@nSWm+cKyV|mJsojmtCJeF{f@ksuAt0 zbnb5PvfRT}n;w39Y`gokY}uw|Q&d-Od9t`ksop;_r}Fcz+9|&xnIBro&Hlr6bJCfw zlZw9ex$aStj(qlQ)vh~vY$*#}-7P!yIu5^d{P6ObHTPz>GUa2oXMZTIaagR=IbYz{ ztQGkebY1K3OyP-A-jn_=E6qPdfAWmJ#0T2H z?p{o6GPvN9*cCW!#o`NreipF{p7bnGm*h)wiZ|pFewE&<<%X-Qhu-UV7|z0)P8WnS*q z$~$fS?tNTj-?SI^1m^agoHT2pOyCpYRY}J_UW|19UCk~rE%Wo13TGD0RJ(<@(-VW-Y>=|Uiq+$YSEMn*#{0kVh=S`p2ixhpS46|q35D3Qx{c}SpSD5O{NR9 z(t7G2b9!aegbSTyQZ+F;Ga=DU#q@13|8n64x46y=&Z&RBj&Yy%$JkDxSqo+>9G-LK zw4h_xZO$DZlxo}yULJq*UUtou8;7h_dbKC{^?&|$G=Hp+bm7EU54S%nmW8QUFu5Lf($UED@+_P5tc^RiILQ5b z(X`7ipM9CLSLXSrRLi^1Ds~z42IQaWK7aRn<%8d93?J8`#J()wWC!KAGYuQqhV-B$~~|FGKhe2D7V&1)-vZF^p^Z=b__ zIr~g^leQR(!*-v(+HQN5`sJ|fwCvd#SDBn|dv6g@+qvD+x7^Nm^0URk*LN)2`_%17 zZ|SYp`VB3y5?kkQS=%GLa>f~%6iMB+m*z(w&ve_M*L!i%&y7FaXBc#Snc+C+rsS`$ zKPDcS_#xp+*~h6R^OpRrxp(_PR!vXa0Rvy-_bgb}~8E zTF9g=X2w>di(ZX=P4mOva{Gs;y^M`ds9D=^_{)Wj4-*x3*PnQhHEmr=+q#st+p7~( z9BiYmCha_OJ!sy!maw9mpwd@x1e6vE8NJr+R2?Q-Q7qenZ#=N;n23s4C{_omWBCzopr081x8!~g&Q delta 685 zcmdm2v$kf#c4jW)5JO`tV*@K=lgS5}ZIHR_EOS+ojVz1|Qj9EgjS>x$byE#Y(sV6T zElqUI(~Q$n(ozkR%oB|_pI~{zLX^tMavWCNh6o!s%W@qzWZ7@i@o4f3YyEmgPZ!6K zid#n}=XwV-iX4Cc{ie75iMX$e9As8^o)nSNdz)mpX4AwZ9}yLwYK2>FX`jvJ@Nt*V z-n?gP<@(&Mw`z9Wo?HI?mEEEB;>WxsBz`OsueXr-@t2SNoFKzPB|$wM0oRZ79|fw| zbhRiyvAJw7{^~?q;Zvm_YgEznD(@aI3pyuFK2q zVLQUlKD-&1=fx5z(z;KcYx(7*9!af#ZgcJ(Q+nstqE{{Xexu6*z03J~pI=OzC%N}R zjQfidZ97%H_iW*vH#el>hQ?#ti2`SH)z-?`WzW4`)^*{c-P~K&O}mbnz7@SUm*riE z#KEcD^}-u@*VW8X&zLT;!Ok!v*Erfb<(jkGmQ5c?oT&}TV+%qx2mXEzkNoSfKAsCr;{mB z=Y`j#eptBPjX)0yp^zI z*GUIm$NaKZ=~r6iXLt^t(p&7hm-A0s%l^wcRol#F=wB~9d0z5n_)9;p9l;N$1$Z|q uKM{#}9e8VLYw<$k@0ItQj$$mOj3=Ebq!KeEp*KiO_FpI z4Nc8-Q%sF4%#4x@4N{FvH=kg6!=g-t%E_`EC^l@C;wPRm zU;M@ zT%MwEvf^sa^-Y_1x2Hv@t*NY;8|FNoH`sh}%Xs$meMWVa3)=petDYKq6K8^cUWv4Fd**yMeuN=*+Uirg{XCKbE z=JDXpksXUObS(rW6Rm#VEf5V`pf1AxTyeQmLB+Mhy-8(d-&bAP_Q1u^Po((L{-eD~ z_sZ5;TJRSxn(_R%e)ff9iZ6G?dESd{so6C%$HaD8ud>`NwpE<}e&_!&WhlL|SV_-w S{vHMf1_n=8KbLh*2~7Z10`jc@ delta 547 zcmdl~y`p-@0ItQjH9f4U&x0bj?f+QgqXdO;U6% zEX-4MlhV@C(h|*$%*_qVH=kg6!$OqG$#NVHtYFJF%W@qzWGPh-Hl6&!TED)=)5S5Q z;?|MLj#;-IB-~0>?jE0zDt_-N%iSq2_;jNey2s=$W7MkO^ZOy5Ln@o)*qc?>{ zhQ3<1FuWpmibkOCfeEhS_tR#4w`=<^&ukDU^!R9#-}24jI>(O{<@~d~&%H@TI$nRq zbkV(=gMBX7#C;H%^(@S=eL;EQxkalq-@l9e`{(Gh zf99{>$}T*|nQye{s=3-vuJEpBmTgaO#H6!+tUA19MaO3$e{q%9lRl_D{=D#v+-N@i$7l7X z^F^LfQ+5OuNV@S_1kH-O|J;k?-gjoEg%&U5%rbosdaK51{WO^?$Z_=e>V~-c$GuhW zUeAxZa87CFvYQ@#?a6GP?=E}3X|v032i=49|9k7%7(^CjEZDDbkTH&dfq}u()z4*} HQ$iB}VF>4I diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/polynium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/noxtunyx_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/polynium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/noxtunyx_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/plinium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/nucleum_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/plinium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/nucleum_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/palladium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/palladium_ingot.png index 6fd4c2ea443e9f6ac326c13c3ce27512244d8a40..b1b399eb3257ef270b8c1e3eaef1ae67df131b45 100644 GIT binary patch delta 674 zcmaD{`?Yq%c4jWq5CcOiV1}uDWJ=Z4hx6!Zv zZDBEcS4VPWOVR8X28JW!kJ!|Kr7@1p;SOTx5R#^mp|< z@p<7)OOEzz$vCio)j3_^z^AM^9+O1MPP&9h*9(TW?GP54$}@j`!o8)xH>%Bx>ruSq z=<>{>CdYLTpW>xzMad_5N6yMWy7}ULpVB6Cft!;%4CRwvNhR&!o)>cXv7f{ZrtfDi zjn9m!lA1z-kM&1y~RL$+Rs~oXP)~pPu2}PCF(6V zA+I^4W1?Q`%?Dgt!mR)P*3HN*d#1Nzrsd)f>+X823OYYy{RE!{9f9|){>+=tInO=u z#L4Y1shRx@g?#V|T^2k*TU&H37DK;fn`a^ZfpLg+Af~$2?cU?SH z@z`xkbE?XesW#bh$L6lB%A59d(Y5Lv%j5f3Zr|0?sihpXqD7of`Ki~vlgY`BrE{;p iEdTpG|BoR$zW{;ZLv%sTV08*J(2jhoXj$*pz|bF`r1_U@~a zbGN$NPOxvD92PmdC!mMlV7dIG+I(y6MqA$lM_$U!xw-j6#epN9@07)ZANUHW*@o!J zEi-zt*hEOd{KC=FNEf>*2It8JSK_TE%Dj2D`{m-SvLtP#r-`jUBlNdBDfK)5HZ)ZOlb)q}m)sbv_@K7`>{;9N!s7J|M?#g>>8x0>;>U8G z2vxP5<~hyJ|9UUnx!dkpv|Fb|O-?&ky-1U*nQft-sLLCDj+<1rF+7c{n>S9`W?geokF`evl?Ae z>&$C)c`jA-HMm8VWJ_=q?7h;(z$ofl3^qE*WlRc^ChByv@WeI@gzeLVTgigPM_d)PN;tToEkbv%>E ze0Z``@oJS_k1AHrbnpRZ%-f1 z-g}D`uj?CxJ$K6}{rlwj=QsMIp8QKZBmb_kt!cefzjDHx>mJ`;N;qdu%Iob=_FCYk z7NGoi{j8Kt3*|T7Gi$mzT}}P{0z1D2w~yVNaP8t9t=0WWE^kincUUZDo_zNF%uUsG zdV)90ZKKQ^Um8W^#yf89F)CI+Q?%P@MWSH+Rh6Jz{eRJW&zM$rgzj3`X&?IK9*f~| zu2;VLm#+zY{{GwKL)4s>*-Q63@AuTPO9~U;ciT^Ic6aD5J-v_n>mT}4hbI3q+yCUZnEG=LhZyxox0pO9{nND7WqdQY zJElSWZ@l78;}aJqr_L$r=!iRJJo(_&dU3a{k@aFbo(P(1V>*)GDbL>pcv=KP=3Hglm%sFI4O5OXc#uiJl1u2z5aPdy<&fAiMAja#=G*~Rx2>~Kli>rwJ_ zMu+|BP2W4#vB!nXR&Dtd;V$bJZ1MBh?#=I0`u1&D@H8Uee$q@;p1lr6VQQ%%1z(TM z4A7~c!zaA_@RDuEdL^|Id1+p@2xTTUems@QN^#_(I`wQ zRiu-xc+I|ZLFKo5H{8E`LcUHdFXV&WUFFm%m8M&}SF4}fvB}kB#_Ez|opoKcz< zsU&p5_?g$mpBYSv``1tG3AMQM+ry@+YqxD@yzPk&uD!qY4JR6MT+<#AoC$ewjAia)$@^~$(M_5Y8_Gc%l) XNSRSoQW(I%z`)??>gTe~DWM4f7|=G) diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/xylitite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/solarium_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/xylitite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/solarium_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/tiberium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/tiberium_ingot.png index a175e7937c0a7cbf92d2e2856733152b7302483a..cd0fd751ea327d81d04fe1fadd4f06717c849174 100644 GIT binary patch delta 729 zcmcaybE9U%HfC-^(+~qgD@0It%q-H<($bPFbkj`C40H|6O$>As zQ_NF!%~H$_Esc}RQj$y!H=kg6!$OqG$#NW4$X0BYF! zM<(C)zFa8LzF+m(x7%BE`88+7e*MhwthFh9&g|^VIdgf;OHXXe$*h=>J4-XuRVr?Y z>cKm`f|2u{J+oS{Y;7LbF3lG~uk`*H&(mXBti-wJ1@rvV&nq83tz}jC7PK+FQRnpk zkmBhrHy1x~nHZyU#6K^5#kJ*2&MjY5zb-zhX7L;c6Xw$nOuMvf-7c<#ZZIh!ploZL^^uXf{5Y&kjA>1=}5d$Z#|_I#aj;dfb@-HD!cDMp(v zcIek9r924boy%y;*3XqZpDlTM%T;;z&d|;kh08Yn`^zc&PvwuiZHfNWhn(S$V%I%7 zciT;;`Q(hfQap3DqW(_36SelZZTXyT?weC?P2s35=6aYvxyNq(vQ@g$&!;e6-!tu1 zqUo}IF0a)49(GFPZ4XHUk= z@Ht+j-#c$Z-?yVqZ1M9RoeHu$x3f8dnQILr>vOpyK@YDe_4KjKYKqEp*;LTJNhAN7 z!Iq?jx%(J?Z{~?P7{8DyS|*jxbn0}W?bA6p=IU}*do$aWtLASLN`7>8+kbCr{!)0Qzyz1KDh80um+w1%zSG%mUn|G+~ mt>^AW>*+u4@Bet5p~>)bz@$|>o-!~nFnGH9xvX@0It64T6*QiG%`DB0&CQZ5Q!I^4HlJX5!$OqG$#NXlTnHOC%W|DCWPZFiX7USb{d#pz7srr_ zTSq3}_MTiQalHP$*>=Pv`eVzxHwa5KiQ9hITlwJg&WehCOajrJH#Rv; zd+NJ%gY%=D>3yXIwg3G+KEBlW_EPh0z2Sx3MNJDMghan@Q*5~rksxhQv@Y7c^L~T% zp85UR!aV!#oqimlxOsK0#TJoOO}Fd4T69h?TH@}XxLo19azR^g3kFKYjxDf9x$JNerkYNZa3Gul`dNB zzAGMwNo`@SSj4(w@yj2{d{)zQOxpM!$!rcPINWq1zkcctv9pQKip9;-{U6Kp9$%>X zc!u9n)k)5m&jj9z(}>}bb(?#qvGzny?FpaCdYP{4T^jGN1};{;B1jw_oyd9FbNAnd9t4_R~leW3% f$NStrb_{kpUjn!H@6BOgU|{fc^>bP0l+XkK!IwdE diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/aardium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/titanite_ingot.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/tic/aardium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/titanite_ingot.png index eccb5b312b2ff880e21a444045e89d68d0199379..283430ed742f16e8cd7b45f2ac35790151b65c0d 100644 GIT binary patch delta 679 zcmbPI_p^4xc4jWq5CcOiBO@zQi^&I>ZIHN|*;z^$Rm_Zy%`MH7({#-ZlT&q*(@YF> zEmIB6bxjP6O^s3w%+kzKO*hYHeZxYO%E{}wtdXpkY{hwc^M39>1}t;+oBvMUZ=+Yw z_|4PBF{I+wk;&fP(upE%`{PaauN3hTzgvFMccJ!5*QE(!VH)fq_ za?>9?{TKDZSM8*m-r+LC_UHXKGUX>s@a9nbSFh`_T1t8+&&HUxthL88YWx=c?Y+F& zaGw2=B_$`Wow+Zh=sD>}kk*E2ej7iSw$ECy1&3Yrw*QdW=RpyHh-B<2!FpJSmdBH`VjdSgOPCFa6_ROj|$2K|Zs4vO;A(Jgv zzHFJm`tnC5dll!|yO=ZUEcd^e_wk*E_oju5UfS(?xp+nFEWeJ__KaQU*F`=(c}VF| zYK`=1Nr5ltH_VyPvM?aTddgJ3H01?(ED?Skd2LU0yQg~1n(8&H-oxzNqhnS|g&}I` zJ4~V#uSWGR2|S!Tf5A&zuBl?I*Z(p{-S~56^;%!MrQhpi1346*1sQ(Y<{g(SIMw*b z7NM(U)AufOQ;|+D(>--~sd$ae4yM1h(1}s_&?jD=G-$t*V zNzl{9F{I+wk;$jMLlPz0_wRoevO`0O<4)_lRlcj6G{mC>C%#;^Oog>u%y;24i$zlx zPIOu5VZLmF;1BCaJhSx2o4dQaVZ-11eW=|D-K^wPljEmu1TR*IYRjKkR_wAxZ<>tfl}j@>@}%WXcDeQ}_7!XY^SlcZ zYaOPFtumQuV5;QSc6VMZ$NAI7Yn~OWe4eD~?SA$a%jD)QNAxc3zH(^BQsdlLJsFvg zwl!+$9@CvW&sDxXU(PY+oo)9k52HN3&{;O|83_Tim6xm)*jmq{rYn2ZY{n+ud+S&} z96kN<=;@Vnb(XGrZS&~l4d=M!Z5=nWduB<_J9|I<+(t=rBc7$xIaTieVT^rYcXaCV z&^z2!^)i7RimMJE-Q&f|v21x}$GpXli+Sa@aMYg8z2Y~mXwzGX_IGj%R{sB{|Kh!- zhg7=uhvWKzAhm9eXJqi7S34;`!rp*^ Pfq}u()z4*}Q$iB}L?SVL diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/vibranium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/vibranium_ingot.png index 9b33f53bcc5c0cc891e902f8c0055a12aeed46ed..293ddf583a5d6cdc9ce76f8e7d2ce659e15cb179 100644 GIT binary patch delta 640 zcmbPP^S^q-HfC-^(+~qgD@0It%#st+l1$T*buAMO6Lr(fOpZQ&TMsH=kg6!$OqG$#NW4$X0BYY+_Kg*G2E ze%Y4Y=5?AZ7$2`>pSf$gxQm-$_^c(TWND?KXaXH|4vN_ zHHuuiWfe#0^dqfmk)bPgEfM|2BOd%F;lRDh`Ra%HInv(*Fw%-B$`>=7oKR(#Yo_R?(cC4QWxUNI8ST6eyTlJJ{s>HG5H z6uI5+1oN$RUHtnbml{rt6q>2}x6-rZaNKGc74{)gs9=IMtoJa@hSZ0Uc&=U4Vh|N6T~ u=d@7!%_++peXXU6@0ItQc?^Jjm#5Mby=c2~Fr_b0##i=R?yIca)ux%P%kJmSGO0{ndsXFK zb7#-S_@cK7J9ai2eMsQHqs||5{ovtZZU-BcM+cdFFaOhg88qw7zH_`4oA--XMc-A5 zpDg0j{PC#7W%~mgcv=L?xwXn9BTp-4*G~$&aAMmskBb{Fo>^!wdx3Me%{m(=4#gwCf9dI7 zefBB)%<}j0976NUt{kzLy29ef+-jCiCsoCpZqu^%H|3??*b=`nBEsc_vS(4P=T*(* z^Eqkt^UoJNmz#V--N(;BcJf}oi9J&lJ479qNX+ZA;PRc9XX}{rBu*&yXiI03O?jZF zM{SJy?Gr)o-Wt#8EqE@sce0)1l7PY!1!hSGZ#O6CD43O*aR?p#IlWkI;`zGmF5X)+ zSM%Nb$?`nMM?ljpoo`z5!t149cAfhb*LB@`cE_W_iS=#OKJ~X2o4*ZyH;r?$aNBa_ zoc*mYXVg1n|B}j7?zNd>->=akaQ^f875&mCwbFanP0oL|@vqud$EjcUik!}$=6N;f z$*P_AFWfIyJ{cjot$%x@=9&#rQLb_)b}zgwzch2!gmoz=W1Mb%cit}f@&4@}$qe@c Y(%g&R>|M>kz`)??%I4>?&MBb@0M`{KDgXcg diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/axiidian_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/violium_ingot.png similarity index 94% rename from src/main/resources/assets/ztic_addon/textures/items/tic/axiidian_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/violium_ingot.png index dee2fbe58dadd3af90a1c37bc28dee89936b22d1..e918452e73e77f9571816bde51370bbb2295620a 100644 GIT binary patch delta 594 zcmX?EeWiNCc4jWq5CcOiV^b>wi^&I>ZIHR_EOV8UjZBTwOwx>XjZzF#bW;pXEOjjn z4NY{DQ!UJl6H`;oO%pdCXL-w_LWDxI$#NW4+=d7XH_LJzH)L_PX7HE{7?;Y;Q9bdQ3QF6nM!eqE#^`>CUuC zzItU3*UBF_|KrWNHO2Kldu|+^JZH|F`=9q&KDQN8xXb?XUQ>ilnR<$^LUvR9_xB=` zOdH=_yLk7P?#X!Pm2vHE1%7!}YX4Ku{HlMTyYet!|EJq7EcWf&^y~um?>e&Y*QxIF z=_zftM$YrUPPS{k$eDS+yF}^atc15`?T-Frz4l%5nvH_F+-B3c6Rc$?&F}H}+UN0G z?(|KcmZk059-Guw)XY|%#drIlrI*>*0kmQ$C@&~x=(ypjc(T5PhNaq z)!ahuX6EDq={4^}0(z#~)P=gOouRRGZmYxAQ)^_m+;~wg*ysD{$At8IjEi0_n8N#L zE7z*Xhn>NxnW>g4pSU=;J1%;;U>fhEt5Ub(gpV2ouI1t{anKd|^;YJ@EC<8xHPgCY zRKHv6Rj(8i@!4ULsbJeG^XoxhpZ%JztoQf({U6B;%F)MH>^g2~&A`CG;OXk;vd$@? F2>@Y&3>E+Y delta 583 zcmcaoeX@GPc4jW)5JO`tBMU1dqsa%EZIHR_EOV99(o9S(Qq7EYlguqmbq&)@Omr=c zOcHesQj#naQ<76n5{)(=XL-w_LWDxI$#NW4+=d7XH_LJzH)P2U>8zRj!dkz6uBVG* zNX4xqlh5Yeau9L*%eKd{Y~78L$t#(2g(t6YQ2e28#wKX3H-)Wf!vV&aTMOJct}tbZ zRW{~)TC&_a*!*wj6jyO~sorPS-?N_ev3U49R&7$4>SfCn$&sS?qx65EVkAe%eb=vd z*(dF9>pI9fcRlx+)#oEVOFli#*!r1ocYS`B3X6UF8+~J|?dDtZ_Xp3950-2VaZ^5( z*dgny!Q1SjK1qkA{eASDb$CWN`ps@O7XSK2thTGi~yk z$11DpMRv(o+u+bp#anAsB0DUu q?AQvw461B0ilpUXO@geCw8tMtYI