diff --git a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java index bae3645..0bc94fc 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java @@ -22,8 +22,8 @@ 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, 3, PREFIX_ORE); - public static Block adamantiteOre = new BasicBlock("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, 4, PREFIX_ORE); + 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 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); @@ -59,18 +59,18 @@ public class Blocks { public static Block yrdeanBlock = new BasicBlock("yrdean_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 blazingXylititeBlock = new BasicBlock("blazing_xylitite_block", Material.ROCK, 80.0f, 1000.0f, 4, PREFIX_BLOCK); + public static Block xylititeBlock = new BasicBlock("xylitite_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 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 instableDyoniteBlock = new BasicBlock("instable_dyonite_block", Material.ROCK, 23.0f, 25.0f, 3, PREFIX_BLOCK); - public static Block instableNitroniteBlock = new BasicBlock("instable_nitronite_block", Material.ROCK, 13.0f, 15.0f, 1, PREFIX_BLOCK); - public static Block instablePolyniumBlock = new BasicBlock("instablePolynium_block", Material.ROCK, 60.0f, 500.0f, 4, PREFIX_BLOCK); - public static Block instablePrysociteBlock = new BasicBlock("instable_prysocite_block", Material.ROCK, 12.0f, 12.0f, 2, 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 proxideumBlock = new BasicBlock("proxideum_block", Material.ROCK, 25.0f, 25.0f, 4, PREFIX_BLOCK); - public static Block radiantPliniumBlock = new BasicBlock("radiant_plinium_block", Material.ROCK, 25.0f, 25.0f, 3, PREFIX_BLOCK); - public static Block refractiveBysmuidBlock = new BasicBlock("refractive_bysmuid_block", Material.ROCK, 35.0f, 35.0f, 4, 0.25f, PREFIX_BLOCK); + public static Block pliniumBlock = new BasicBlock("plinium_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); public static Block ultraniteBlock = new BasicBlock("ultranite_block", Material.ROCK, 13.0f, 15.0f, 3, 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 5868a67..b702d32 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java @@ -27,21 +27,21 @@ public class Fluids { public static BasicTinkerFluid yrdeanFluid = new BasicTinkerFluid("yrdean", 0xFF3e3c6f, true, 200, 10, 4000); public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astrium", 0xFF7a3b74, true, 200, 10, 4000); - public static BasicTinkerFluid instableNitroniteFluid = new BasicTinkerFluid("instable_nitronite", 0xFF659933, 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 instablePolyniumFluid = new BasicTinkerFluid("instablePolynium", 0xFF6c6aa3, true, 200, 10, 4000); + public static BasicTinkerFluid polyniumFluid = new BasicTinkerFluid("polynium", 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 instablePrysociteFluid = new BasicTinkerFluid("instable_prysocite", 0xFFbde398, true, 200, 10, 4000); - public static BasicTinkerFluid blazingXylititeFluid = new BasicTinkerFluid("blazing_xylitite", 0xFFffc81d, true, 200, 10, 4000); - public static BasicTinkerFluid instableDyoniteFluid = new BasicTinkerFluid("instable_dyonite", 0xFFff6743, 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 dyoniteFluid = new BasicTinkerFluid("dyonite", 0xFFff6743, true, 200, 10, 4000); public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultranite", 0xFFfff69b, true, 200, 10, 4000); - public static BasicTinkerFluid radiantPliniumFluid = new BasicTinkerFluid("radiant_plinium", 0xFFc1ff68, 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 refractiveBysmuidFluid = new BasicTinkerFluid("refractive_bysmuid", 0xFF7b97b0, true, 200, 10, 4000); + public static BasicTinkerFluid bysmuidFluid = new BasicTinkerFluid("bysmuid", 0xFF7b97b0, true, 200, 10, 4000); static void register() { diff --git a/src/main/java/com/sosnitzka/ztic_addon/Items.java b/src/main/java/com/sosnitzka/ztic_addon/Items.java index 806debe..dcc9929 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Items.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Items.java @@ -43,21 +43,21 @@ public class Items { public static Item yrdeanIngot = new BasicItem("yrdean_ingot", PREFIX_INGOT); public static Item astriumIngot = new BasicItem("astrium_ingot", PREFIX_INGOT); - public static Item instableNitroniteIngot = new BasicItem("instableNitronite_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 instablePolyniumIngot = new BasicItem("instablePolynium_ingot", PREFIX_INGOT); + public static Item polyniumIngot = new BasicItem("polynium_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 instablePrysociteIngot = new BasicItem("instablePrysocite_ingot", PREFIX_INGOT); - public static Item blazingXylititeIngot = new BasicItem("blazingXylitite_ingot", PREFIX_INGOT); - public static Item instableDyoniteIngot = new BasicItem("instableDyonite_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 dyoniteIngot = new BasicItem("dyonite_ingot", PREFIX_INGOT); public static Item ultraniteIngot = new BasicItem("ultranite_ingot", PREFIX_INGOT); - public static Item radiantPliniumIngot = new BasicItem("radiantPlinium_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 refractiveBysumIngot = new BasicItem("refractive_bysum_ingot", PREFIX_INGOT); + public static Item bysmuidIngot = new BasicItem("bysmuid_ingot", PREFIX_INGOT); public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable", PREFIX_NUGGET); public static Item tiberiumShardStable = new BasicItem("tiberium_shard_stable", 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 c53cc65..01e38d5 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Materials.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Materials.java @@ -2,8 +2,11 @@ package com.sosnitzka.ztic_addon; import net.minecraft.util.text.TextFormatting; +import slimeknights.tconstruct.library.materials.HeadMaterialStats; import slimeknights.tconstruct.library.materials.Material; +import static com.sosnitzka.ztic_addon.ZTiC.instable; + public class Materials { public static Material arcanite = new Material("arcanite", TextFormatting.LIGHT_PURPLE); public static Material tiberium = new Material("tiberium", TextFormatting.LIGHT_PURPLE); @@ -22,20 +25,20 @@ public class Materials { public static Material eternite = new Material("eternite", TextFormatting.AQUA); public static Material mythril = new Material("mythril", TextFormatting.AQUA); - public static Material astrium = new Material("astrium", TextFormatting.LIGHT_PURPLE); - public static Material instableNitronite = new Material("instableNitronite", TextFormatting.LIGHT_PURPLE); + 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 instablePolynium = new Material("instablePolynium", TextFormatting.LIGHT_PURPLE); + public static Material polynium = new Material("polynium", 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 instablePrysocite = new Material("instablePrysocite", TextFormatting.GRAY); - public static Material blazingXylitite = new Material("blazingXylitite", TextFormatting.GRAY); - public static Material instableDyonite = new Material("instableDyonite", TextFormatting.GRAY); + public static Material prysocite = new Material("prysocite", TextFormatting.GRAY); + public static Material xylitite = new Material("xylitite", TextFormatting.GRAY); + public static Material dyonite = new Material("dyonite", TextFormatting.GRAY); public static Material ultranite = new Material("ultranite", TextFormatting.AQUA); - public static Material radiantPlinium = new Material("radiantPlinium", TextFormatting.AQUA); + public static Material plinium = new Material("plinium", TextFormatting.AQUA); public static Material dysprosanium = new Material("dysprosanium", TextFormatting.AQUA); - public static Material refractiveBysmuid = new Material("refractiveBysmuid", 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 bd7c0cc..9453dcd 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java +++ b/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java @@ -5,6 +5,8 @@ import com.sosnitzka.ztic_addon.proxy.ClientProxy; import com.sosnitzka.ztic_addon.recipes.Crafting; import com.sosnitzka.ztic_addon.recipes.Smelting; import com.sosnitzka.ztic_addon.util.FuelHandler; +import com.sosnitzka.ztic_addon.util.traits.TraitInstable; +import com.sosnitzka.ztic_addon.util.traits.TraitResonance; import com.sosnitzka.ztic_addon.world.ZWorldGen; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.Mod; @@ -18,12 +20,15 @@ import slimeknights.tconstruct.library.MaterialIntegration; import slimeknights.tconstruct.library.materials.ExtraMaterialStats; import slimeknights.tconstruct.library.materials.HandleMaterialStats; import slimeknights.tconstruct.library.materials.HeadMaterialStats; +import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.tools.TinkerMaterials; import java.util.List; import static com.sosnitzka.ztic_addon.Fluids.*; import static com.sosnitzka.ztic_addon.Materials.*; import static com.sosnitzka.ztic_addon.util.Utils.registerTinkerAlloys; +import static slimeknights.tconstruct.library.utils.HarvestLevels.harvestLevelNames; @Mod(modid = ZTiC.MODID, version = ZTiC.VERSION) public class ZTiC { @@ -31,6 +36,13 @@ public class ZTiC { static final String MODID = "ztic_addon"; static final String VERSION = "@VERSION@"; + public static final int METEORITE = 5; + public static final int VIBRANIUM = 6; + public static final int ADAMANTITE = 7; + + public static final AbstractTrait instable = new TraitInstable(); + public static final AbstractTrait resonance = new TraitResonance(); + @SidedProxy(clientSide = "com.sosnitzka.ztic_addon.proxy.ClientProxy", serverSide = "com.sosnitzka.ztic_addon.proxy.ServerProxy") private static ClientProxy proxy; private List integrateList = Lists.newArrayList(); @@ -43,21 +55,21 @@ public class ZTiC { // TConstruct Alloys registerTinkerAlloys(astriumFluid, 1, arcaniteFluid, 3, karmesineFluid, 2); - registerTinkerAlloys(instableNitroniteFluid, 1, tiberiumFluid, 5, vibraniumFluid, 3); + registerTinkerAlloys(nitroniteFluid, 1, tiberiumFluid, 5, vibraniumFluid, 3); registerTinkerAlloys(proxideumFluid, 1, prometheumFluid, 3, axiidianFluid, 2); - registerTinkerAlloys(instablePolyniumFluid, 1, yrdeanFluid, 3, meteoriteFluid, 2); + registerTinkerAlloys(polyniumFluid, 1, yrdeanFluid, 3, meteoriteFluid, 2); registerTinkerAlloys(imperomiteFluid, 2, aardiumFluid, 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(instablePrysociteFluid, 1, bismuthFluid, 3, yrdeanFluid, 2); - registerTinkerAlloys(blazingXylititeFluid, 1, karmesineFluid, 3, ignititeFluid, 2); - registerTinkerAlloys(instableDyoniteFluid, 1, mindoriteFluid, 4, tiberiumFluid, 2); + registerTinkerAlloys(prysociteFluid, 1, bismuthFluid, 3, yrdeanFluid, 2); + registerTinkerAlloys(xylititeFluid, 1, karmesineFluid, 3, ignititeFluid, 2); + registerTinkerAlloys(dyoniteFluid, 1, mindoriteFluid, 4, tiberiumFluid, 2); registerTinkerAlloys(ultraniteFluid, 1, ignititeFluid, 5, adamantiteFluid, 3); - registerTinkerAlloys(radiantPliniumFluid, 1, palladiumFluid, 3, mindoriteFluid, 3); + registerTinkerAlloys(pliniumFluid, 1, palladiumFluid, 3, mindoriteFluid, 3); registerTinkerAlloys(dysprosaniumFluid, 1, eterniteFluid, 3, aardiumFluid, 3); - registerTinkerAlloys(refractiveBysmuidFluid, 1, mythrilFluid, 4, bismuthFluid, 2); + registerTinkerAlloys(bysmuidFluid, 1, mythrilFluid, 4, bismuthFluid, 2); // Material from ores @@ -80,21 +92,24 @@ public class ZTiC { // Material from alloys registerTinkerMaterial("Astrium", astrium, astriumFluid, 1, 5, 6, 7, 0.8f, 0, 100, false, true); - registerTinkerMaterial("InstableNitronite", instableNitronite, instableNitroniteFluid, 1, 5, 6, 6, 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", instablePolynium, instablePolyniumFluid, 1, 5, 6, 4, 0.8f, 0, 100, false, true); + registerTinkerMaterial("InstablePolynium", polynium, polyniumFluid, 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", instablePrysocite, instablePrysociteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true); - registerTinkerMaterial("BlazingXylitite", blazingXylitite, blazingXylititeFluid, 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("Ultranite", ultranite, ultraniteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true); - registerTinkerMaterial("RadiantPlinium", radiantPlinium, radiantPliniumFluid, 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("RefractiveBysmuid", refractiveBysmuid, refractiveBysmuidFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true); - registerTinkerMaterial("InstableDyonite", instableDyonite, instableDyoniteFluid, 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); + + + } @EventHandler @@ -105,9 +120,11 @@ public class ZTiC { Smelting.register(); Crafting.register(); - for (MaterialIntegration m : integrateList) { - m.integrateRecipes(); - } + + harvestLevelNames.put(METEORITE, TinkerMaterials.bone.getTextColor() + "Meteorite"); + harvestLevelNames.put(VIBRANIUM, TinkerMaterials.silver.getTextColor() + "Vibranium"); + harvestLevelNames.put(ADAMANTITE, TinkerMaterials.ardite.getTextColor() + "Adamantite"); + } 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 new file mode 100644 index 0000000..c727fda --- /dev/null +++ b/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitInstable.java @@ -0,0 +1,29 @@ +package com.sosnitzka.ztic_addon.util.traits; + +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.text.TextFormatting; +import net.minecraft.world.World; +import slimeknights.tconstruct.library.traits.AbstractTrait; + +/** + * Created by Robert on 14.05.2016. + */ +public class TraitInstable extends AbstractTrait { + + + public TraitInstable() { + super("instable", TextFormatting.DARK_RED); + } + + @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); + } + } + + +} diff --git a/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitResonance.java b/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitResonance.java new file mode 100644 index 0000000..a282829 --- /dev/null +++ b/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitResonance.java @@ -0,0 +1,30 @@ +package com.sosnitzka.ztic_addon.util.traits; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.event.entity.living.LivingHurtEvent; +import slimeknights.tconstruct.library.traits.AbstractTrait; + +/** + * Created by Robert on 14.05.2016. + */ +public class TraitResonance extends AbstractTrait { + + + public TraitResonance() { + super("resonance", TextFormatting.AQUA); + } + + @Override + public void onBlock(ItemStack tool, EntityPlayer player, LivingHurtEvent event) { + player.addChatComponentMessage(new TextComponentString(event.getEntity() + " " + event.getEntityLiving())); + + // event.getEntityLiving().knockBack(event.getEntityLiving(), 20f, 20f, 20f); + // event.getSource().getEntity() + } +} + + + diff --git a/src/main/resources/assets/ztic_addon/blockstates/blazing_xylitite_block.json b/src/main/resources/assets/ztic_addon/blockstates/blazing_xylitite_block.json deleted file mode 100644 index 697ff85..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/blazing_xylitite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:blazing_xylitite_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/blockstates/bysmuid_block.json b/src/main/resources/assets/ztic_addon/blockstates/bysmuid_block.json new file mode 100644 index 0000000..24b64c4 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/bysmuid_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:bysmuid_block" + } + } +} diff --git a/src/main/resources/assets/ztic_addon/blockstates/dyonite_block.json b/src/main/resources/assets/ztic_addon/blockstates/dyonite_block.json new file mode 100644 index 0000000..31f127c --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/dyonite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:dyonite_block" + } + } +} diff --git a/src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json b/src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json deleted file mode 100644 index 9370d6b..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:instablePolynium_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/blockstates/instable_dyonite_block.json b/src/main/resources/assets/ztic_addon/blockstates/instable_dyonite_block.json deleted file mode 100644 index fbd8013..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/instable_dyonite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:instable_dyonite_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/blockstates/instable_nitronite_block.json b/src/main/resources/assets/ztic_addon/blockstates/instable_nitronite_block.json deleted file mode 100644 index e8da144..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/instable_nitronite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:instable_nitronite_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/blockstates/instable_prysocite_block.json b/src/main/resources/assets/ztic_addon/blockstates/instable_prysocite_block.json deleted file mode 100644 index 39b0848..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/instable_prysocite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:instable_prysocite_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/blockstates/nitronite_block.json b/src/main/resources/assets/ztic_addon/blockstates/nitronite_block.json new file mode 100644 index 0000000..c576498 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/nitronite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:nitronite_block" + } + } +} diff --git a/src/main/resources/assets/ztic_addon/blockstates/plinium_block.json b/src/main/resources/assets/ztic_addon/blockstates/plinium_block.json new file mode 100644 index 0000000..9bd0d49 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/plinium_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:plinium_block" + } + } +} diff --git a/src/main/resources/assets/ztic_addon/blockstates/polynium_block.json b/src/main/resources/assets/ztic_addon/blockstates/polynium_block.json new file mode 100644 index 0000000..7333cd2 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/polynium_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:polynium_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 new file mode 100644 index 0000000..4baac8c --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/prysocite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:prysocite_block" + } + } +} diff --git a/src/main/resources/assets/ztic_addon/blockstates/radiant_plinium_block.json b/src/main/resources/assets/ztic_addon/blockstates/radiant_plinium_block.json deleted file mode 100644 index 7df18a3..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/radiant_plinium_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:radiant_plinium_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/blockstates/refractive_bysmuid_block.json b/src/main/resources/assets/ztic_addon/blockstates/refractive_bysmuid_block.json deleted file mode 100644 index 3a85292..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/refractive_bysmuid_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:refractive_bysmuid_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/blockstates/xylitite_block.json b/src/main/resources/assets/ztic_addon/blockstates/xylitite_block.json new file mode 100644 index 0000000..9a0a7ed --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/xylitite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:xylitite_block" + } + } +} diff --git a/src/main/resources/assets/ztic_addon/models/block/radiant_plinium_block.json b/src/main/resources/assets/ztic_addon/models/block/bysmuid_block.json similarity index 50% rename from src/main/resources/assets/ztic_addon/models/block/radiant_plinium_block.json rename to src/main/resources/assets/ztic_addon/models/block/bysmuid_block.json index 578cc60..bb88afd 100644 --- a/src/main/resources/assets/ztic_addon/models/block/radiant_plinium_block.json +++ b/src/main/resources/assets/ztic_addon/models/block/bysmuid_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "ztic_addon:blocks/radiant_plinium_block" + "all": "ztic_addon:blocks/bysmuid_block" } } diff --git a/src/main/resources/assets/ztic_addon/models/block/blazing_xylitite_block.json b/src/main/resources/assets/ztic_addon/models/block/dyonite_block.json similarity index 50% rename from src/main/resources/assets/ztic_addon/models/block/blazing_xylitite_block.json rename to src/main/resources/assets/ztic_addon/models/block/dyonite_block.json index 00408c0..8dd2913 100644 --- a/src/main/resources/assets/ztic_addon/models/block/blazing_xylitite_block.json +++ b/src/main/resources/assets/ztic_addon/models/block/dyonite_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "ztic_addon:blocks/blazing_xylitite_block" + "all": "ztic_addon:blocks/dyonite_block" } } diff --git a/src/main/resources/assets/ztic_addon/models/block/instable_nitronite_block.json b/src/main/resources/assets/ztic_addon/models/block/instable_nitronite_block.json deleted file mode 100644 index 5c59c96..0000000 --- a/src/main/resources/assets/ztic_addon/models/block/instable_nitronite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "ztic_addon:blocks/instable_nitronite_block" - } -} diff --git a/src/main/resources/assets/ztic_addon/models/block/instable_prysocite_block.json b/src/main/resources/assets/ztic_addon/models/block/instable_prysocite_block.json deleted file mode 100644 index 8675a2e..0000000 --- a/src/main/resources/assets/ztic_addon/models/block/instable_prysocite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "ztic_addon:blocks/instable_prysocite_block" - } -} diff --git a/src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json b/src/main/resources/assets/ztic_addon/models/block/nitronite_block.json similarity index 50% rename from src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json rename to src/main/resources/assets/ztic_addon/models/block/nitronite_block.json index b5b01e5..92ae98f 100644 --- a/src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json +++ b/src/main/resources/assets/ztic_addon/models/block/nitronite_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "ztic_addon:blocks/instablePolynium_block" + "all": "ztic_addon:blocks/nitronite_block" } } diff --git a/src/main/resources/assets/ztic_addon/models/block/instable_dyonite_block.json b/src/main/resources/assets/ztic_addon/models/block/plinium_block.json similarity index 50% rename from src/main/resources/assets/ztic_addon/models/block/instable_dyonite_block.json rename to src/main/resources/assets/ztic_addon/models/block/plinium_block.json index c1de9fe..44fc07f 100644 --- a/src/main/resources/assets/ztic_addon/models/block/instable_dyonite_block.json +++ b/src/main/resources/assets/ztic_addon/models/block/plinium_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "ztic_addon:blocks/instable_dyonite_block" + "all": "ztic_addon:blocks/plinium_block" } } diff --git a/src/main/resources/assets/ztic_addon/models/block/polynium_block.json b/src/main/resources/assets/ztic_addon/models/block/polynium_block.json new file mode 100644 index 0000000..43e375b --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/block/polynium_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "ztic_addon:blocks/polynium_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 new file mode 100644 index 0000000..5df2313 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/block/prysocite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "ztic_addon:blocks/prysocite_block" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/block/refractive_bysmuid_block.json b/src/main/resources/assets/ztic_addon/models/block/refractive_bysmuid_block.json deleted file mode 100644 index 9bffb10..0000000 --- a/src/main/resources/assets/ztic_addon/models/block/refractive_bysmuid_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "ztic_addon:blocks/refractive_bysmuid_block" - } -} 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 new file mode 100644 index 0000000..c2482a5 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/block/xylitite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "ztic_addon:blocks/xylitite_block" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/astrium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/astrium_ingot.json new file mode 100644 index 0000000..979f5d6 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/astrium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/astrium_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/radiant_plinium_block.json b/src/main/resources/assets/ztic_addon/models/item/bysmuid_block.json similarity index 82% rename from src/main/resources/assets/ztic_addon/models/item/radiant_plinium_block.json rename to src/main/resources/assets/ztic_addon/models/item/bysmuid_block.json index ec57d07..3728bd4 100644 --- a/src/main/resources/assets/ztic_addon/models/item/radiant_plinium_block.json +++ b/src/main/resources/assets/ztic_addon/models/item/bysmuid_block.json @@ -1,5 +1,5 @@ { - "parent": "ztic_addon:block/radiant_plinium_block", + "parent": "ztic_addon:block/bysmuid_block", "display": { "thirdperson": { "rotation": [ diff --git a/src/main/resources/assets/ztic_addon/models/item/bysmuid_ingot.json b/src/main/resources/assets/ztic_addon/models/item/bysmuid_ingot.json new file mode 100644 index 0000000..8a334ff --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/bysmuid_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/bysmuid_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/cryptogen_ingot.json b/src/main/resources/assets/ztic_addon/models/item/cryptogen_ingot.json new file mode 100644 index 0000000..7bf0618 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/cryptogen_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/cryptogen_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/blazing_xylitite_block.json b/src/main/resources/assets/ztic_addon/models/item/dyonite_block.json similarity index 82% rename from src/main/resources/assets/ztic_addon/models/item/blazing_xylitite_block.json rename to src/main/resources/assets/ztic_addon/models/item/dyonite_block.json index a151284..625e885 100644 --- a/src/main/resources/assets/ztic_addon/models/item/blazing_xylitite_block.json +++ b/src/main/resources/assets/ztic_addon/models/item/dyonite_block.json @@ -1,5 +1,5 @@ { - "parent": "ztic_addon:block/blazing_xylitite_block", + "parent": "ztic_addon:block/dyonite_block", "display": { "thirdperson": { "rotation": [ diff --git a/src/main/resources/assets/ztic_addon/models/item/dyonite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/dyonite_ingot.json new file mode 100644 index 0000000..654bd82 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/dyonite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/dyonite_ingot" + } +} 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 new file mode 100644 index 0000000..fad842d --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/dysprosanium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/dysprosanium_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/fractoryte_ingot.json b/src/main/resources/assets/ztic_addon/models/item/fractoryte_ingot.json new file mode 100644 index 0000000..479ccc9 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/fractoryte_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/fractoryte_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/imperomite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/imperomite_ingot.json new file mode 100644 index 0000000..dfc161a --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/imperomite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/imperomite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/instable_nitronite_block.json b/src/main/resources/assets/ztic_addon/models/item/instable_nitronite_block.json deleted file mode 100644 index 66713e2..0000000 --- a/src/main/resources/assets/ztic_addon/models/item/instable_nitronite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "ztic_addon:block/instable_nitronite_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/instable_prysocite_block.json b/src/main/resources/assets/ztic_addon/models/item/instable_prysocite_block.json deleted file mode 100644 index 0a35bf6..0000000 --- a/src/main/resources/assets/ztic_addon/models/item/instable_prysocite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "ztic_addon:block/instable_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/instablePolynium_block.json b/src/main/resources/assets/ztic_addon/models/item/nitronite_block.json similarity index 82% rename from src/main/resources/assets/ztic_addon/models/item/instablePolynium_block.json rename to src/main/resources/assets/ztic_addon/models/item/nitronite_block.json index c6d8532..bf4a520 100644 --- a/src/main/resources/assets/ztic_addon/models/item/instablePolynium_block.json +++ b/src/main/resources/assets/ztic_addon/models/item/nitronite_block.json @@ -1,5 +1,5 @@ { - "parent": "ztic_addon:block/instablePolynium_block", + "parent": "ztic_addon:block/nitronite_block", "display": { "thirdperson": { "rotation": [ diff --git a/src/main/resources/assets/ztic_addon/models/item/nitronite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/nitronite_ingot.json new file mode 100644 index 0000000..96126e8 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/nitronite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/nitronite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/instable_dyonite_block.json b/src/main/resources/assets/ztic_addon/models/item/plinium_block.json similarity index 82% rename from src/main/resources/assets/ztic_addon/models/item/instable_dyonite_block.json rename to src/main/resources/assets/ztic_addon/models/item/plinium_block.json index 73ea355..2addcd9 100644 --- a/src/main/resources/assets/ztic_addon/models/item/instable_dyonite_block.json +++ b/src/main/resources/assets/ztic_addon/models/item/plinium_block.json @@ -1,5 +1,5 @@ { - "parent": "ztic_addon:block/instable_dyonite_block", + "parent": "ztic_addon:block/plinium_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/plinium_ingot.json new file mode 100644 index 0000000..60d3c30 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/plinium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/plinium_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/polynium_block.json b/src/main/resources/assets/ztic_addon/models/item/polynium_block.json new file mode 100644 index 0000000..a240bd2 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/polynium_block.json @@ -0,0 +1,22 @@ +{ + "parent": "ztic_addon:block/polynium_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/polynium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/polynium_ingot.json new file mode 100644 index 0000000..745629b --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/polynium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/polynium_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/proxideum_ingot.json b/src/main/resources/assets/ztic_addon/models/item/proxideum_ingot.json new file mode 100644 index 0000000..9fabd51 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/proxideum_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/proxideum_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 new file mode 100644 index 0000000..c6a3955 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/prysocite_block.json @@ -0,0 +1,22 @@ +{ + "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/prysocite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/prysocite_ingot.json new file mode 100644 index 0000000..ce11cbd --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/prysocite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/prysocite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/refractive_bysmuid_block.json b/src/main/resources/assets/ztic_addon/models/item/refractive_bysmuid_block.json deleted file mode 100644 index d95ccdc..0000000 --- a/src/main/resources/assets/ztic_addon/models/item/refractive_bysmuid_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "ztic_addon:block/refractive_bysmuid_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/seismodium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/seismodium_ingot.json new file mode 100644 index 0000000..e8d2254 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/seismodium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/seismodium_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/terramite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/terramite_ingot.json new file mode 100644 index 0000000..ce47484 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/terramite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/terramite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/ultranite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/ultranite_ingot.json new file mode 100644 index 0000000..250d55a --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/ultranite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/ultranite_ingot" + } +} 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 new file mode 100644 index 0000000..b976c7d --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/xylitite_block.json @@ -0,0 +1,22 @@ +{ + "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/models/item/xylitite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/xylitite_ingot.json new file mode 100644 index 0000000..4fc775f --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/xylitite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/xylitite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/refractive_bysmuid_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/bysmuid_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/refractive_bysmuid_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/bysmuid_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/instable_dyonite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/instable_dyonite_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/instable_nitronite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/nitronite_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/instable_nitronite_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/nitronite_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/radiant_plinium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/plinium_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/radiant_plinium_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/plinium_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/instablePolynium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/polynium_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/instablePolynium_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/polynium_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/instable_prysocite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/prysocite_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/instable_prysocite_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/prysocite_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/blazing_xylitite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/xylitite_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/blazing_xylitite_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/xylitite_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/refractive_bysmuid_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/bysmuid_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/refractive_bysmuid_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/bysmuid_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/instable_dyonite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/dyonite_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/instable_dyonite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/dyonite_ingot.png 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/nitronite_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/instable_nitronite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/nitronite_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/radiant_plinium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/plinium_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/radiant_plinium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/plinium_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/instablePolynium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/polynium_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/instablePolynium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/polynium_ingot.png 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/prysocite_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/instable_prysocite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/prysocite_ingot.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/blazing_xylitite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/xylitite_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/blazing_xylitite_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/xylitite_ingot.png