diff --git a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java index 510b09e..a1ea822 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java @@ -4,7 +4,6 @@ import com.sosnitzka.ztic_addon.blocks.BlockLigniteOre; import com.sosnitzka.ztic_addon.blocks.BlockTiberiumOre; import com.sosnitzka.ztic_addon.generic.BasicBlockGround; import com.sosnitzka.ztic_addon.generic.BasicBlockOre; -import com.sosnitzka.ztic_addon.generic.BasicBlockOreGlow; import com.sosnitzka.ztic_addon.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -29,7 +28,7 @@ public class Blocks { public static Block mindoriteOre = new BasicBlockOre("mindorite_ore", Material.ROCK, 12.0f, 12.0f, 2, "oreMindorite"); public static Block mythrilOre = new BasicBlockOre("mythril_ore", Material.ROCK, 25.0f, 25.0f, 4, "oreMythril"); public static Block palladiumOre = new BasicBlockOre("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3, "orePalladium"); - public static Block prometheumOre = new BasicBlockOreGlow("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, 0.25f, null); + public static Block prometheumOre = new BasicBlockOre("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, "orePrometheum", 0.8F); public static Block slagironOre = new BasicBlockOre("slagiron_ore", Material.ROCK, 3.0f, 5.0f, 1, "orePrometheum"); public static Block slaggoldOre = new BasicBlockOre("slaggold_ore", Material.ROCK, 3.0f, 5.0f, 1, null); public static Block tiberiumOre = new BlockTiberiumOre(); diff --git a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java index db5ae65..f12d593 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java +++ b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java @@ -1,7 +1,7 @@ package com.sosnitzka.ztic_addon.blocks; import com.sosnitzka.ztic_addon.Items; -import com.sosnitzka.ztic_addon.generic.BasicBlockOreGlow; +import com.sosnitzka.ztic_addon.generic.BasicBlockOre; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; @@ -12,10 +12,10 @@ import net.minecraft.world.World; import java.util.Random; -public class BlockTiberiumOre extends BasicBlockOreGlow { +public class BlockTiberiumOre extends BasicBlockOre { public BlockTiberiumOre() { - super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3, 0.8f, "oreTiberium"); + super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3, "oreTiberium", 1.0F); } @Override diff --git a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java b/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java index 34a4c57..070e4ee 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java +++ b/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java @@ -6,6 +6,17 @@ import net.minecraft.block.material.Material; public class BasicBlockOre extends Block { public String oreDictName; + public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest, String oreDictName, float lightlevel) { + super(material); + setUnlocalizedName(name); + setRegistryName(name); + setHardness(hardness); + setResistance(resistance); + setHarvestLevel("pickaxe", harvest); + setLightLevel(lightlevel); + this.oreDictName = oreDictName; + } + public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest, String oreDictName) { super(material); setUnlocalizedName(name); @@ -16,6 +27,7 @@ public class BasicBlockOre extends Block { this.oreDictName = oreDictName; } + public boolean isOreDict() { return this.oreDictName != null; } diff --git a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOreGlow.java b/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOreGlow.java deleted file mode 100644 index 3a08210..0000000 --- a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOreGlow.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.sosnitzka.ztic_addon.generic; - -import net.minecraft.block.material.Material; - -public class BasicBlockOreGlow extends BasicBlockOre { - - public BasicBlockOreGlow(String name, Material material, float hardness, float resistance, int harvest, float glow, String oreDictName) { - super(name, material, hardness, resistance, harvest, oreDictName); - setLightLevel(glow); - } -} diff --git a/src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json index 35aa830..f4f92af 100644 --- a/src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/aardium_ingot" + "layer0": "ztic_addon:items/tic/aardium_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/adamantite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/adamantite_ingot.json index d0226db..f4a9e64 100644 --- a/src/main/resources/assets/ztic_addon/models/item/adamantite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/adamantite_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/adamantite_ingot" + "layer0": "ztic_addon:items/tic/adamantite_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/arcanite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/arcanite_ingot.json index 1e0b371..d4558b3 100644 --- a/src/main/resources/assets/ztic_addon/models/item/arcanite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/arcanite_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/arcanite_ingot" + "layer0": "ztic_addon:items/tic/arcanite_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/astrite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/astrite_ingot.json index cf69f81..974a76b 100644 --- a/src/main/resources/assets/ztic_addon/models/item/astrite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/astrite_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/astrium_ingot" + "layer0": "ztic_addon:items/tic/astrium_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json b/src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json index ec5b0b0..eaee705 100644 --- a/src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/axiidian_ingot" + "layer0": "ztic_addon:items/tic/axiidian_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/bismuth_ingot.json b/src/main/resources/assets/ztic_addon/models/item/bismuth_ingot.json index b141057..7373050 100644 --- a/src/main/resources/assets/ztic_addon/models/item/bismuth_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/bismuth_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/bismuth_ingot" + "layer0": "ztic_addon:items/tic/bismuth_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/eternite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/eternite_ingot.json index 43fdd9a..0a75e5c 100644 --- a/src/main/resources/assets/ztic_addon/models/item/eternite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/eternite_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/eternite_ingot" + "layer0": "ztic_addon:items/tic/eternite_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/ignitite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/ignitite_ingot.json index 439fd76..353251e 100644 --- a/src/main/resources/assets/ztic_addon/models/item/ignitite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/ignitite_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/ignitite_ingot" + "layer0": "ztic_addon:items/tic/ignitite_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/karmesine_ingot.json b/src/main/resources/assets/ztic_addon/models/item/karmesine_ingot.json index 86b4276..ba63bab 100644 --- a/src/main/resources/assets/ztic_addon/models/item/karmesine_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/karmesine_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/karmesine_ingot" + "layer0": "ztic_addon:items/tic/karmesine_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/meteorite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/meteorite_ingot.json index 31c3831..318b34e 100644 --- a/src/main/resources/assets/ztic_addon/models/item/meteorite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/meteorite_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/meteorite_ingot" + "layer0": "ztic_addon:items/tic/meteorite_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/mindorite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/mindorite_ingot.json index 69c54c3..27dac70 100644 --- a/src/main/resources/assets/ztic_addon/models/item/mindorite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/mindorite_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/mindorite_ingot" + "layer0": "ztic_addon:items/tic/mindorite_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/mythril_ingot.json b/src/main/resources/assets/ztic_addon/models/item/mythril_ingot.json index 002e8dd..7edd8ec 100644 --- a/src/main/resources/assets/ztic_addon/models/item/mythril_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/mythril_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/mythril_ingot" + "layer0": "ztic_addon:items/tic/mythril_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/palladium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/palladium_ingot.json index 911e3f0..161af8a 100644 --- a/src/main/resources/assets/ztic_addon/models/item/palladium_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/palladium_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/palladium_ingot" + "layer0": "ztic_addon:items/tic/palladium_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/prometheum_ingot.json b/src/main/resources/assets/ztic_addon/models/item/prometheum_ingot.json index 8b12ee3..70768a7 100644 --- a/src/main/resources/assets/ztic_addon/models/item/prometheum_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/prometheum_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/prometheum_ingot" + "layer0": "ztic_addon:items/tic/prometheum_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/tiberium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/tiberium_ingot.json index 87ad68e..1c252be 100644 --- a/src/main/resources/assets/ztic_addon/models/item/tiberium_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/tiberium_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/tiberium_ingot" + "layer0": "ztic_addon:items/tic/tiberium_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/vibranium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/vibranium_ingot.json index 57eea35..c5ac984 100644 --- a/src/main/resources/assets/ztic_addon/models/item/vibranium_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/vibranium_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/vibranium_ingot" + "layer0": "ztic_addon:items/tic/vibranium_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json b/src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json index 291e5bc..10591a3 100644 --- a/src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ztic_addon:items/ingots/yrdean_ingot" + "layer0": "ztic_addon:items/tic/yrdean_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/aardium_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/aardium_ingot.png similarity index 92% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/aardium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/blocks/tic/aardium_ingot.png index 47f8b3e..1079f79 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/aardium_ingot.png and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/aardium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/adamantite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/adamantite_ingot.png new file mode 100644 index 0000000..16b9e07 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/adamantite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/arcanite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/arcanite_ingot.png new file mode 100644 index 0000000..b61dbe2 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/arcanite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/astrium_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/astrium_ingot.png new file mode 100644 index 0000000..8e9d563 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/astrium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/axiidian_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/axiidian_ingot.png new file mode 100644 index 0000000..5baf38b Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/axiidian_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/aardium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/bismuth_ingot.png similarity index 89% rename from src/main/resources/assets/ztic_addon/textures/blocks/aardium_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/tic/bismuth_ingot.png index 0347076..5f5e499 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/aardium_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/bismuth_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/blazing_xylitite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/blazing_xylitite_ingot.png new file mode 100644 index 0000000..7bd443d Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/blazing_xylitite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/cryptogen_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/cryptogen_ingot.png new file mode 100644 index 0000000..907b3a3 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/cryptogen_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/dysprosanium_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/dysprosanium_ingot.png new file mode 100644 index 0000000..088f066 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/dysprosanium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/eternite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/eternite_ingot.png new file mode 100644 index 0000000..80a7254 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/eternite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/fractoryte_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/fractoryte_ingot.png new file mode 100644 index 0000000..2c27397 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/fractoryte_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/ignitite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/ignitite_ingot.png new file mode 100644 index 0000000..c34643a Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/ignitite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/imperomite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/imperomite_ingot.png new file mode 100644 index 0000000..d6b5edf Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/imperomite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_dyonite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_dyonite_ingot.png new file mode 100644 index 0000000..8100e9e Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_dyonite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/instable_nitronite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_nitronite_ingot.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/instable_nitronite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_nitronite_ingot.png index c468a30..a561ea8 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/instable_nitronite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_nitronite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/instable_polynium_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_polynium_ingot.png similarity index 92% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/instable_polynium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_polynium_ingot.png index d29bd46..92819b5 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/instable_polynium_ingot.png and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_polynium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_prysocite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_prysocite_ingot.png new file mode 100644 index 0000000..96401b3 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/instable_prysocite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/karmesine_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/karmesine_ingot.png new file mode 100644 index 0000000..64ec595 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/karmesine_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/meteorite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/meteorite_ingot.png new file mode 100644 index 0000000..761851e Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/meteorite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/mindorite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/mindorite_ingot.png similarity index 94% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/mindorite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/blocks/tic/mindorite_ingot.png index 11ae7ad..90e4d17 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/mindorite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/mindorite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/mythril_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/mythril_ingot.png new file mode 100644 index 0000000..f80337e Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/mythril_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/palladium_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/palladium_ingot.png new file mode 100644 index 0000000..faa2287 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/palladium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/palladium_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/prometheum_ingot.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/palladium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/blocks/tic/prometheum_ingot.png index 6179f3c..40d3bb6 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/palladium_ingot.png and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/prometheum_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/proxideum_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/proxideum_ingot.png new file mode 100644 index 0000000..346c348 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/proxideum_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/radiant_plinium_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/radiant_plinium_ingot.png new file mode 100644 index 0000000..7c17657 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/radiant_plinium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/refractive_bysmuid_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/refractive_bysmuid_ingot.png new file mode 100644 index 0000000..60c38c3 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/refractive_bysmuid_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/seismodium_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/seismodium_ingot.png new file mode 100644 index 0000000..375fc32 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/seismodium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/terramite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/terramite_ingot.png new file mode 100644 index 0000000..ca284fb Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/terramite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/tiberium_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/tiberium_ingot.png new file mode 100644 index 0000000..fd378e7 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/tiberium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/ultranite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/ultranite_ingot.png new file mode 100644 index 0000000..94789e8 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/ultranite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/tic/vibranium_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/vibranium_ingot.png new file mode 100644 index 0000000..130993c Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/vibranium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/instable_prysocite_ingot.png b/src/main/resources/assets/ztic_addon/textures/blocks/tic/yrdean_ingot.png similarity index 92% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/instable_prysocite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/blocks/tic/yrdean_ingot.png index b518e17..45e8e96 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/instable_prysocite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/blocks/tic/yrdean_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/eternite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/ingots/eternite_ingot.png deleted file mode 100644 index 132723c..0000000 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/eternite_ingot.png and /dev/null differ 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/aardium_ingot.png new file mode 100644 index 0000000..eccb5b3 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/items/tic/aardium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/adamantite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/adamantite_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/adamantite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/adamantite_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/arcanite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/arcanite_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/arcanite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/arcanite_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/astrium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/astrium_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/astrium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/astrium_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/axiidian_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/axiidian_ingot.png similarity index 94% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/axiidian_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/axiidian_ingot.png index c1df930..dee2fbe 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/axiidian_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/axiidian_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/bismuth_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/bismuth_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/bismuth_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/bismuth_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/blazing_xylitite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/blazing_xylitite_ingot.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/blazing_xylitite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/blazing_xylitite_ingot.png index 6003a24..a1593e3 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/blazing_xylitite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/blazing_xylitite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/cryptogen_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/cryptogen_ingot.png similarity index 94% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/cryptogen_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/cryptogen_ingot.png index 141fdbf..24999a9 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/cryptogen_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/cryptogen_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/dysprosanium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/dysprosanium_ingot.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/dysprosanium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/dysprosanium_ingot.png index 565eb9f..06992d1 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/dysprosanium_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/dysprosanium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/eternite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/eternite_ingot.png new file mode 100644 index 0000000..3966ca1 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/items/tic/eternite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/fractoryte_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/fractoryte_ingot.png similarity index 94% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/fractoryte_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/fractoryte_ingot.png index f1ca6be..78cfbff 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/fractoryte_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/fractoryte_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/ignitite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/ignitite_ingot.png new file mode 100644 index 0000000..59aa096 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/items/tic/ignitite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/imperomite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/imperomite_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/imperomite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/imperomite_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/instable_dyonite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/instable_dyonite_ingot.png similarity index 92% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/instable_dyonite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/instable_dyonite_ingot.png index 962c85e..e13556f 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/instable_dyonite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/instable_dyonite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/instable_nitronite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/instable_nitronite_ingot.png new file mode 100644 index 0000000..13b0132 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/items/tic/instable_nitronite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/instable_polynium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/instable_polynium_ingot.png new file mode 100644 index 0000000..139630f Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/items/tic/instable_polynium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/instable_prysocite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/instable_prysocite_ingot.png new file mode 100644 index 0000000..da2600d Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/items/tic/instable_prysocite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/karmesine_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/karmesine_ingot.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/karmesine_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/karmesine_ingot.png index 7bf6fb1..9021de1 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/karmesine_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/karmesine_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/meteorite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png similarity index 94% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/meteorite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png index e10d108..1905248 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/meteorite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/ignitite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/mindorite_ingot.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/ignitite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/mindorite_ingot.png index f11d7c7..6784b59 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/ignitite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/mindorite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/mythril_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/mythril_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/mythril_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/mythril_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 new file mode 100644 index 0000000..6fd4c2e Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/items/tic/palladium_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/prometheum_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/prometheum_ingot.png similarity index 94% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/prometheum_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/prometheum_ingot.png index 467c0e9..ec86456 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/prometheum_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/prometheum_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/proxideum_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/proxideum_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/proxideum_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/proxideum_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/radiant_plinium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/radiant_plinium_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/radiant_plinium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/radiant_plinium_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/refractive_bysmuid_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/refractive_bysmuid_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/refractive_bysmuid_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/refractive_bysmuid_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/seismodium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/seismodium_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/seismodium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/seismodium_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/terramite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/terramite_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/terramite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/terramite_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/tiberium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/tiberium_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/tiberium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/tiberium_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/ultranite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/ultranite_ingot.png similarity index 94% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/ultranite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/ultranite_ingot.png index d648c54..0517e7d 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/ultranite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/ultranite_ingot.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/vibranium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/vibranium_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/vibranium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/vibranium_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/ingots/yrdean_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/yrdean_ingot.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/ingots/yrdean_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/yrdean_ingot.png index 5a6512b..c4b183f 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/ingots/yrdean_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/yrdean_ingot.png differ