diff --git a/build.gradle b/build.gradle index aa413e0..e6b2633 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,3 @@ -// For those who want the bleeding edge buildscript { repositories { jcenter() @@ -61,9 +60,9 @@ task buildInfo { version = project.buildInfo.revision minecraft { - version = "1.10.2-12.18.2.2107" + version = "1.10.2-12.18.2.2147" runDir = "run" - mappings = "snapshot_20161015" + mappings = "snapshot_20161101" replace '@VERSION@', project.version } @@ -75,11 +74,12 @@ dependencies { //deobfCompile "codechicken:CodeChickenLib:1.9.4-2.0.2.39:deobf" //deobfCompile "codechicken:CodeChickenCore:1.9.4-2.0.3.65:deobf" //deobfCompile "codechicken:NotEnoughItems:1.9-${nei_version}:dev" - deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170:deobf" + deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.1.+:deobf" //Old: deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132:deobf" - deobfCompile "mezz.jei:jei_1.10.2:3.9.3.252" - deobfCompile "slimeknights:TConstruct:1.10.2-2.5.5.jenkins393:deobf" + deobfCompile "mezz.jei:jei_1.10.2:3.+" + deobfCompile "slimeknights:TConstruct:1.10.2-2.6.+:deobf" //compile files('libs/TConstruct-1.9-2.3.1.DEV.1d4c1de-deobf.jar') + //compile group: 'com.google.guava', name: 'guava', version: '20.0' } sourceSets { @@ -111,6 +111,7 @@ processResources { } task deobfJar(type: Jar) { + //noinspection GroovyAssignabilityCheck from sourceSets.main.output classifier = 'deobf' } diff --git a/src/main/java/com/sosnitzka/taiga/Alloys.java b/src/main/java/com/sosnitzka/taiga/Alloys.java index d728179..d08957e 100644 --- a/src/main/java/com/sosnitzka/taiga/Alloys.java +++ b/src/main/java/com/sosnitzka/taiga/Alloys.java @@ -1,35 +1,43 @@ package com.sosnitzka.taiga; -import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import slimeknights.tconstruct.shared.TinkerFluids; import static com.sosnitzka.taiga.Fluids.*; -import static com.sosnitzka.taiga.util.Utils.registerTinkerAlloys; +import static com.sosnitzka.taiga.util.Utils.registerTinkerAlloy; public class Alloys { /** * Registers alloying in the smeltery */ - static void register() { - registerTinkerAlloys(nitroniteFluid, 2, tiberiumFluid, 4, vibraniumFluid, 3, nitroFluid, 3); - registerTinkerAlloys(bysmuidFluid, 1, rubiumFluid, 3, bismuthFluid, 2, anthraciteFluid, 3); - registerTinkerAlloys(ultraniteFluid, 1, prometheumFluid, 3, adamantiteFluid, 2, radiant_enderium, 3); - registerTinkerAlloys(astriumFluid, 1, arcaniteFluid, 3, karmesineFluid, 2, energy_enderium, 3); + public static void register() { + registerTinkerAlloy(new FluidStack(triberiumFluid, 1), new FluidStack(tiberiumFluid, 5), new FluidStack(basaltFluid, 1)); + registerTinkerAlloy(new FluidStack(fractumFluid, 2), new FluidStack(triberiumFluid, 3), new FluidStack(TinkerFluids.obsidian, 3), new FluidStack(abyssumFluid, 1)); + registerTinkerAlloy(new FluidStack(violiumFluid, 2), new FluidStack(auroriumFluid, 3), new FluidStack(TinkerFluids.ardite, 2)); + registerTinkerAlloy(new FluidStack(proxiiFluid, 3), new FluidStack(prometheumFluid, 3), new FluidStack(palladiumFluid, 3), new FluidStack(eezoFluid, 1)); + registerTinkerAlloy(new FluidStack(tritoniteFluid, 2), new FluidStack(TinkerFluids.cobalt, 3), new FluidStack(karmesineFluid, 2)); + registerTinkerAlloy(new FluidStack(ignitzFluid, 2), new FluidStack(TinkerFluids.ardite, 2), new FluidStack(karmesineFluid, 2), new FluidStack(osramFluid, 1)); + registerTinkerAlloy(new FluidStack(imperomiteFluid, 2), new FluidStack(duraniteFluid, 3), new FluidStack(prometheumFluid, 1), new FluidStack(abyssumFluid, 1)); + registerTinkerAlloy(new FluidStack(solariumFluid, 2), new FluidStack(valyriumFluid, 2), new FluidStack(uruFluid, 2), new FluidStack(nucleumFluid, 1)); + registerTinkerAlloy(new FluidStack(adamantFluid, 3), new FluidStack(vibraniumFluid, 1), new FluidStack(solariumFluid, 1), new FluidStack(ioxFluid, 3)); + registerTinkerAlloy(new FluidStack(nihiliteFluid, 1), new FluidStack(vibraniumFluid, 1), new FluidStack(solariumFluid, 1)); + registerTinkerAlloy(new FluidStack(seismumFluid, 4), new FluidStack(TinkerFluids.obsidian, 4), new FluidStack(triberiumFluid, 2), new FluidStack(eezoFluid, 1)); + registerTinkerAlloy(new FluidStack(astriumFluid, 2), new FluidStack(karmesineFluid, 3), new FluidStack(auroriumFluid, 2)); + registerTinkerAlloy(new FluidStack(niobFluid, 3), new FluidStack(palladiumFluid, 3), new FluidStack(duraniteFluid, 1), new FluidStack(osramFluid, 1)); + registerTinkerAlloy(new FluidStack(yrdeenFluid, 3), new FluidStack(uruFluid, 3), new FluidStack(valyriumFluid, 3), new FluidStack(osramFluid, 1)); + registerTinkerAlloy(new FluidStack(yrdeenFluid, 3), new FluidStack(uruFluid, 3), new FluidStack(valyriumFluid, 3), new FluidStack(eezoFluid, 1)); + registerTinkerAlloy(new FluidStack(yrdeenFluid, 3), new FluidStack(uruFluid, 3), new FluidStack(valyriumFluid, 3), new FluidStack(abyssumFluid, 1)); + registerTinkerAlloy(new FluidStack(ioxFluid, 1), new FluidStack(eezoFluid, 2), new FluidStack(abyssumFluid, 2), new FluidStack(osramFluid, 2), new FluidStack(obsidioriteFluid, 9)); + registerTinkerAlloy(new FluidStack(ioxFluid, 1), new FluidStack(eezoFluid, 2), new FluidStack(abyssumFluid, 2), new FluidStack(osramFluid, 2), new FluidStack(meteoriteFluid, 9), new FluidStack(TinkerFluids.obsidian, 9)); + registerTinkerAlloy(new FluidStack(lumixFluid, 1), new FluidStack(palladiumFluid, 1), new FluidStack(karmesineFluid, 1)); + registerTinkerAlloy(new FluidStack(obsidioriteFluid, 1), new FluidStack(meteoriteFluid, 1), new FluidStack(TinkerFluids.obsidian, 1)); + registerTinkerAlloy(new FluidStack(nucleumFluid, 3), new FluidStack(proxiiFluid, 3), new FluidStack(abyssumFluid, 1), new FluidStack(osramFluid, 1)); + registerTinkerAlloy(new FluidStack(nucleumFluid, 3), new FluidStack(imperomiteFluid, 3), new FluidStack(osramFluid, 1), new FluidStack(eezoFluid, 1)); + registerTinkerAlloy(new FluidStack(nucleumFluid, 3), new FluidStack(niobFluid, 3), new FluidStack(eezoFluid, 1), new FluidStack(abyssumFluid, 1)); + registerTinkerAlloy(new FluidStack(dyoniteFluid, 3), new FluidStack(triberiumFluid, 3), new FluidStack(fractumFluid, 1), new FluidStack(seismumFluid, 1), new FluidStack(osramFluid, 1)); + registerTinkerAlloy(new FluidStack(dyoniteFluid, 3), new FluidStack(tiberiumFluid, 12), new FluidStack(fractumFluid, 1), new FluidStack(seismumFluid, 1), new FluidStack(osramFluid, 1)); - registerTinkerAlloys(imperomiteFluid, 2, titaniteFluid, 3, palladiumFluid, 3, FluidRegistry.LAVA, 3); - registerTinkerAlloys(dyoniteFluid, 1, meteoriteFluid, 3, tiberiumFluid, 2, spectrumFluid, 3); - registerTinkerAlloys(solariumFluid, 2, vibraniumFluid, 4, ignititeFluid, 4, nitroFluid, 3); - registerTinkerAlloys(fractoryteFluid, 2, adamantiteFluid, 4, rubiumFluid, 2, FluidRegistry.LAVA, 3); - - registerTinkerAlloys(aegisaltFluid, 1, eterniteFluid, 3, mindoriteFluid, 3, glimmercoalFluid, 3); - registerTinkerAlloys(noctunyxFluid, 1, mythrilFluid, 4, titaniteFluid, 2, spectrumFluid, 3); - registerTinkerAlloys(nucleumFluid, 1, palladiumFluid, 3, violiumFluid, 3, radiant_enderium, 3); - registerTinkerAlloys(seismodiumFluid, 2, ignititeFluid, 5, meteoriteFluid, 3, glimming_enderium, 3); - - registerTinkerAlloys(lumixylFluid, 1, bismuthFluid, 3, prometheumFluid, 2, glimming_enderium, 6); - registerTinkerAlloys(terramiteFluid, 2, violiumFluid, 4, eterniteFluid, 2, energy_enderium, 3); - registerTinkerAlloys(cryptogenFluid, 1, mindoriteFluid, 4, arcaniteFluid, 2, anthraciteFluid, 3); - registerTinkerAlloys(proxideumFluid, 1, karmesineFluid, 3, mythrilFluid, 2, glimmercoalFluid, 3); } } diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java index fd63131..582d5ce 100644 --- a/src/main/java/com/sosnitzka/taiga/Blocks.java +++ b/src/main/java/com/sosnitzka/taiga/Blocks.java @@ -1,10 +1,10 @@ package com.sosnitzka.taiga; import com.google.common.base.Joiner; -import com.sosnitzka.taiga.blocks.BlockLignite; +import com.sosnitzka.taiga.blocks.BlockCobble; +import com.sosnitzka.taiga.blocks.BlockMeteoriteRock; import com.sosnitzka.taiga.blocks.BlockTiberium; import com.sosnitzka.taiga.generic.BasicBlock; -import com.sosnitzka.taiga.generic.BasicBlockGround; import com.sosnitzka.taiga.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -22,75 +22,60 @@ import static slimeknights.tconstruct.library.utils.HarvestLevels.*; public class Blocks { - /// /regular Ores / Blocks without extra abilites - public static Block basalt = new BasicBlock("basalt", Material.ROCK, 45.0f, 35.0f, OBSIDIAN); - public static Block rottenGround = new BasicBlockGround("rotten_ground", Material.GROUND, 2.0f, 2.0f, STONE); - public static Block ligniteOre = new BlockLignite(); - // will be optional / config - public static Block slagironOre = new BasicBlock("slagiron_ore", Material.ROCK, 3.0f, 5.0f, IRON); - public static Block slaggoldOre = new BasicBlock("slaggold_ore", Material.ROCK, 3.0f, 5.0f, IRON); - - // Ores - // Group: Solide - public static Block titaniteOre = new BasicBlock("titanite_ore", Material.ROCK, 55.0f, 40f, TITANITE, PREFIX_ORE); - public static Block meteoriteOre = new BasicBlock("meteorite_ore", Material.ROCK, 60.0f, 50f, METEORITE, PREFIX_ORE); - public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 70.0f, 60f, VIBRANIUM, PREFIX_ORE); - public static Block adamantiteOre = new BasicBlock("adamantite_ore", Material.ROCK, 80.0f, 70f, ADAMANTITE, PREFIX_ORE); - // Group: Arcane - public static Block prometheumOre = new BasicBlock("prometheum_ore", Material.ROCK, 35.0f, 12f, COBALT, 0.4f, PREFIX_ORE); - public static Block rubiumOre = new BasicBlock("rubium_ore", Material.ROCK, 13.0f, 12f, TITANITE, PREFIX_ORE); + // blocks and ores spawned via worldgen + public static Block basaltBlock = new BasicBlock("basalt_block", Material.ROCK, 45.0f, 35.0f, DIAMOND, PREFIX_BLOCK); public static Block tiberiumOre = new BlockTiberium(); - public static Block arcaniteOre = new BasicBlock("arcanite_ore", Material.ROCK, 23.0f, 12f, METEORITE, PREFIX_ORE); - // Group: Etheri - public static Block eterniteOre = new BasicBlock("eternite_ore", Material.ROCK, 24.0f, 15f, COBALT, PREFIX_ORE); - public static Block mythrilOre = new BasicBlock("mythril_ore", Material.ROCK, 25.0f, 15f, TITANITE, PREFIX_ORE); - public static Block palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 15f, METEORITE, 0.4f, PREFIX_ORE); - public static Block ignititeOre = new BasicBlock("ignitite_ore", Material.ROCK, 23.0f, 15f, VIBRANIUM, PREFIX_ORE); - // Group: Ratio - public static Block violiumOre = new BasicBlock("violium_ore", Material.ROCK, 13.0f, 10f, COBALT, PREFIX_ORE); - public static Block bismuthOre = new BasicBlock("bismuth_ore", Material.ROCK, 8.0f, 5f, OBSIDIAN, PREFIX_ORE); - public static Block mindoriteOre = new BasicBlock("mindorite_ore", Material.ROCK, 12.0f, 10f, TITANITE, PREFIX_ORE); - public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 13.0f, 10f, METEORITE, PREFIX_ORE); + public static Block auroriumOre = new BasicBlock("aurorium_ore", Material.ROCK, 13.0f, 12f, COBALT, 0.2f, PREFIX_ORE); + public static Block prometheumOre = new BasicBlock("prometheum_ore", Material.ROCK, 35.0f, 12f, DURANITE, 0.4f, PREFIX_ORE); + public static Block duraniteOre = new BasicBlock("duranite_ore", Material.ROCK, 80.0f, 70f, DURANITE, PREFIX_ORE); + public static Block valyriumOre = new BasicBlock("valyrium_ore", Material.ROCK, 60.0f, 50f, VALYRIUM, PREFIX_ORE); + public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 70.0f, 60f, VIBRANIUM, PREFIX_ORE); + public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 13.0f, 10f, COBALT, PREFIX_ORE); + public static Block palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 15f, DURANITE, 0.4f, PREFIX_ORE); + public static Block uruOre = new BasicBlock("uru_ore", Material.ROCK, 25.0f, 15f, VALYRIUM, PREFIX_ORE); + public static Block osramOre = new BasicBlock("osram_ore", Material.ROCK, 45.0f, 35.0f, COBALT, PREFIX_ORE); + public static Block eezoOre = new BasicBlock("eezo_ore", Material.ROCK, 45.0f, 35.0f, COBALT, PREFIX_ORE); + public static Block abyssumOre = new BasicBlock("abyssum_ore", Material.ROCK, 45.0f, 35.0f, COBALT, PREFIX_ORE); - // Blocks - // Group: Solide - public static Block titaniteBlock = new BasicBlock("titanite_block", Material.ROCK, 55.0f, 50f, 5, PREFIX_BLOCK); - public static Block meteoriteBlock = new BasicBlock("meteorite_block", Material.ROCK, 60.0f, 60f, 6, PREFIX_BLOCK); - public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 70.0f, 70f, 7, PREFIX_BLOCK); - public static Block adamantiteBlock = new BasicBlock("adamantite_block", Material.ROCK, 80.0f, 80f, 8, PREFIX_BLOCK); - // Group: Arcane - public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 35.0f, 15f, 2, 0.5f, PREFIX_BLOCK); - public static Block rubiumBlock = new BasicBlock("rubium_block", Material.ROCK, 13.0f, 15f, 5, PREFIX_BLOCK); - public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 30.0f, 15f, 6, 1f, PREFIX_BLOCK); - public static Block arcaniteBlock = new BasicBlock("arcanite_block", Material.ROCK, 23.0f, 15f, 7, PREFIX_BLOCK); - // Group: Etheri - public static Block eterniteBlock = new BasicBlock("eternite_block", Material.ROCK, 24.0f, 20f, 4, PREFIX_BLOCK); - public static Block mythrilBlock = new BasicBlock("mythril_block", Material.ROCK, 25.0f, 20f, 5, PREFIX_BLOCK); - public static Block palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 20f, 6, 0.5f, PREFIX_BLOCK); - public static Block ignititeBlock = new BasicBlock("ignitite_block", Material.ROCK, 23.0f, 20f, 7, PREFIX_BLOCK); - // Group: Ratio - public static Block violiumBlock = new BasicBlock("violium_block", Material.ROCK, 13.0f, 12f, 4, PREFIX_BLOCK); - public static Block bismuthBlock = new BasicBlock("bismuth_block", Material.ROCK, 8.0f, 10f, 5, PREFIX_BLOCK); - public static Block mindoriteBlock = new BasicBlock("mindorite_block", Material.ROCK, 12.0f, 12f, 2, PREFIX_BLOCK); - public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 13.0f, 12f, 3, PREFIX_BLOCK); + // Ore Casts + public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 30.0f, 15f, STONE, 1f, PREFIX_BLOCK); + public static Block auroriumBlock = new BasicBlock("aurorium_block", Material.ROCK, 13.0f, 15f, COBALT, PREFIX_BLOCK); + public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 35.0f, 15f, DURANITE, 0.5f, PREFIX_BLOCK); + public static Block duraniteBlock = new BasicBlock("duranite_block", Material.ROCK, 60.0f, 60f, DURANITE, PREFIX_BLOCK); + public static Block valyriumBlock = new BasicBlock("valyrium_block", Material.ROCK, 70.0f, 70f, VALYRIUM, PREFIX_BLOCK); + public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 80.0f, 80f, VIBRANIUM, PREFIX_BLOCK); + public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); + public static Block palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 20f, DURANITE, 0.5f, PREFIX_BLOCK); + public static Block uruBlock = new BasicBlock("uru_block", Material.ROCK, 25.0f, 20f, VALYRIUM, PREFIX_BLOCK); + public static Block osramBlock = new BasicBlock("osram_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); + public static Block abyssumBlock = new BasicBlock("abyssum_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); + public static Block eezoBlock = new BasicBlock("eezo_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); + + public static Block triberiumBlock = new BasicBlock("triberium_block", Material.ROCK, 30.0f, 15f, OBSIDIAN, 1f, PREFIX_BLOCK); + public static Block fractumBlock = new BasicBlock("fractum_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK); + public static Block violiumBlock = new BasicBlock("violium_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK); + public static Block proxiiBlock = new BasicBlock("proxii_block", Material.ROCK, 25.0f, 25f, DURANITE, PREFIX_BLOCK); + public static Block tritoniteBlock = new BasicBlock("tritonite_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK); + public static Block ignitzBlock = new BasicBlock("ignitz_block", Material.ROCK, 23.0f, 20f, COBALT, PREFIX_BLOCK); + public static Block imperomiteBlock = new BasicBlock("imperomite_block", Material.ROCK, 25.0f, 25f, DURANITE, PREFIX_BLOCK); + public static Block solariumBlock = new BasicBlock("solarium_block", Material.ROCK, 25.0f, 25f, VIBRANIUM, PREFIX_BLOCK); + public static Block nihiliteBlock = new BasicBlock("nihilite_block", Material.ROCK, 25.0f, 25f, VALYRIUM, PREFIX_BLOCK); + public static Block adamantBlock = new BasicBlock("adamant_block", Material.ROCK, 25.0f, 25f, VIBRANIUM, PREFIX_BLOCK); + public static Block dyoniteBlock = new BasicBlock("dyonite_block", Material.ROCK, 25.0f, 25f, DURANITE, PREFIX_BLOCK); + public static Block nucleumBlock = new BasicBlock("nucleum_block", Material.ROCK, 25.0f, 25f, VALYRIUM, PREFIX_BLOCK); + public static Block lumixBlock = new BasicBlock("lumix_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK); + public static Block seismumBlock = new BasicBlock("seismum_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK); + public static Block astriumBlock = new BasicBlock("astrium_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK); + public static Block niobBlock = new BasicBlock("niob_block", Material.ROCK, 25.0f, 25f, DURANITE, PREFIX_BLOCK); + public static Block yrdeenBlock = new BasicBlock("yrdeen_block", Material.ROCK, 25.0f, 25f, VALYRIUM, PREFIX_BLOCK); + public static Block ioxBlock = new BasicBlock("iox_block", Material.ROCK, 25.0f, 25f, DURANITE, PREFIX_BLOCK); - public static Block imperomiteBlock = new BasicBlock("imperomite_block", Material.ROCK, 24.0f, 25f, 5, PREFIX_BLOCK); - public static Block fractoryteBlock = new BasicBlock("fractoryte_block", Material.ROCK, 8.0f, 15f, 8, PREFIX_BLOCK); - public static Block noctunyxBlock = new BasicBlock("noctunyx_block", Material.ROCK, 60.0f, 15f, 6, PREFIX_BLOCK); - public static Block nitroniteBlock = new BasicBlock("nitronite_block", Material.ROCK, 13.0f, 12f, 7, 0.8f, PREFIX_BLOCK); - public static Block cryptogenBlock = new BasicBlock("cryptogen_block", Material.ROCK, 23.0f, 15f, 6, PREFIX_BLOCK); - public static Block seismodiumBlock = new BasicBlock("seismodium_block", Material.ROCK, 30.0f, 25f, 7, PREFIX_BLOCK); - public static Block aegisaltBlock = new BasicBlock("aegisalt_block", Material.ROCK, 13.0f, 15f, 5, PREFIX_BLOCK); - public static Block ultraniteBlock = new BasicBlock("ultranite_block", Material.ROCK, 13.0f, 25f, 8, 0.6f, PREFIX_BLOCK); - public static Block bysmuidBlock = new BasicBlock("bysmuid_block", Material.ROCK, 35.0f, 15f, 5, PREFIX_BLOCK); - public static Block nucleumBlock = new BasicBlock("nucleum_block", Material.ROCK, 25.0f, 15f, 4, 0.85f, PREFIX_BLOCK); - public static Block terramiteBlock = new BasicBlock("terramite_block", Material.ROCK, 70.0f, 15f, 4, PREFIX_BLOCK); - public static Block solariumBlock = new BasicBlock("solarium_block", Material.ROCK, 80.0f, 25f, 5, PREFIX_BLOCK); - public static Block lumixylBlock = new BasicBlock("lumixyl_block", Material.ROCK, 12.0f, 15f, 5, 1f, PREFIX_BLOCK); - public static Block dyoniteBlock = new BasicBlock("dyonite_block", Material.ROCK, 23.0f, 15f, 4, 0.3f, PREFIX_BLOCK); - public static Block proxideumBlock = new BasicBlock("proxideum_block", Material.ROCK, 25.0f, 15f, 4, PREFIX_BLOCK); - public static Block astriumBlock = new BasicBlock("astrium_block", Material.ROCK, 55.0f, 15f, 7, PREFIX_BLOCK); + public static Block blockMeteoriteCobble = new BlockCobble("meteoritecobble_block", Material.ROCK, 35f, 10f, COBALT, 0.075f, PREFIX_BLOCK); + public static Block blockObsidioriteCobble = new BlockCobble("obsidioritecobble_block", Material.ROCK, 60f, 20f, DURANITE, 0.035f, PREFIX_BLOCK); + public static Block blockMeteorite = new BlockMeteoriteRock("meteorite_block", Material.ROCK, 70f, 2000f, COBALT, 0.15f, PREFIX_BLOCK, blockMeteoriteCobble.getDefaultState()); + public static Block blockObsidiorite = new BlockMeteoriteRock("obsidiorite_block", Material.ROCK, 120f, 4000f, DURANITE, 0.2f, PREFIX_BLOCK, blockObsidioriteCobble.getDefaultState()); + /** * Registers all materials' ingots and nuggets
diff --git a/src/main/java/com/sosnitzka/taiga/CreativeTab.java b/src/main/java/com/sosnitzka/taiga/CreativeTab.java index d421373..6cdb9a3 100644 --- a/src/main/java/com/sosnitzka/taiga/CreativeTab.java +++ b/src/main/java/com/sosnitzka/taiga/CreativeTab.java @@ -4,24 +4,23 @@ package com.sosnitzka.taiga; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import static com.sosnitzka.taiga.Blocks.adamantiteBlock; -import static com.sosnitzka.taiga.Items.noctunyxIngot; +import static com.sosnitzka.taiga.Blocks.adamantBlock; +import static com.sosnitzka.taiga.Items.solariumIngot; + public class CreativeTab { public static final CreativeTabs tabTaigaBlock = new CreativeTabs("taiga_block") { @Override public Item getTabIconItem() { - return Item.getItemFromBlock(adamantiteBlock); + return Item.getItemFromBlock(adamantBlock); } }; public static final CreativeTabs tabTaigaItem = new CreativeTabs("taiga_item") { @Override public Item getTabIconItem() { - return noctunyxIngot; + return solariumIngot; } }; - - } diff --git a/src/main/java/com/sosnitzka/taiga/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java index d618ccd..901b501 100644 --- a/src/main/java/com/sosnitzka/taiga/Fluids.java +++ b/src/main/java/com/sosnitzka/taiga/Fluids.java @@ -3,63 +3,48 @@ package com.sosnitzka.taiga; import com.sosnitzka.taiga.generic.BasicTinkerFluid; import com.sosnitzka.taiga.util.Utils; -import net.minecraft.init.Blocks; -import net.minecraftforge.fluids.FluidRegistry; -import slimeknights.tconstruct.shared.TinkerFluids; +import slimeknights.tconstruct.library.TinkerRegistry; import slimeknights.tconstruct.smeltery.block.BlockMolten; import java.lang.reflect.Field; -import static com.sosnitzka.taiga.Blocks.slaggoldOre; -import static com.sosnitzka.taiga.Blocks.slagironOre; -import static com.sosnitzka.taiga.Items.*; import static com.sosnitzka.taiga.util.Utils.registerFluid; -import static slimeknights.tconstruct.library.TinkerRegistry.registerMelting; public class Fluids { - public static BasicTinkerFluid arcaniteFluid = new BasicTinkerFluid("arcanite", 0xFF272354, true, 538, 8, 3768); - public static BasicTinkerFluid titaniteFluid = new BasicTinkerFluid("titanite", 0xFFe0ede7, true, 942, 7, 1858); - public static BasicTinkerFluid adamantiteFluid = new BasicTinkerFluid("adamantite", 0xFFc45c82, true, 1100, 10, 3597); - public static BasicTinkerFluid violiumFluid = new BasicTinkerFluid("violium", 0xFF264c4f, true, 875, 10, 3970); - public static BasicTinkerFluid bismuthFluid = new BasicTinkerFluid("bismuth", 0xFF555555, true, 612, 9, 2552); - public static BasicTinkerFluid eterniteFluid = new BasicTinkerFluid("eternite", 0xFFfafa98, true, 542, 10, 3980); - public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignitite", 0xFFff6642, true, 422, 9, 3787); - public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine", 0xFFc16d6d, true, 499, 7, 3978); - public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteorite", 0xFF6e6a62, true, 942, 10, 2588); - public static BasicTinkerFluid mindoriteFluid = new BasicTinkerFluid("mindorite", 0xFF6bbbff, true, 671, 8, 2956); - public static BasicTinkerFluid mythrilFluid = new BasicTinkerFluid("mythril", 0xFFa8c0ba, true, 841, 10, 1579); - public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium", 0xFFfe5c05, true, 786, 10, 3302); - public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum", 0xFF2b282f, true, 786, 2, 2256); - public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium", 0xFF5f9e2d, true, 352, 10, 1553); - public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium", 0xFFc4ddc8, true, 1050, 9, 3402); - public static BasicTinkerFluid rubiumFluid = new BasicTinkerFluid("rubium", 0xFFe371b0, true, 200, 600, 1653); - public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astrium", 0xFF7a3b74, true, 810, 10, 1525); - public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite", 0xFFdfe553, true, 680, 10, 2185); - public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideum", 0xFF2f7177, true, 700, 9, 3859); - public static BasicTinkerFluid noctunyxFluid = new BasicTinkerFluid("noctunyx", 0xFF5f5081, true, 712, 8, 3983); - public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite", 0xFF5cc96b, true, 510, 10, 2353); - public static BasicTinkerFluid cryptogenFluid = new BasicTinkerFluid("cryptogen", 0xFF9f8a4a, true, 560, 10, 3243); - public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryte", 0xFF983f11, true, 670, 8, 3805); - public static BasicTinkerFluid seismodiumFluid = new BasicTinkerFluid("seismodium", 0xFF46131D, true, 831, 10, 1837); - public static BasicTinkerFluid terramiteFluid = new BasicTinkerFluid("terramite", 0xFFa6b27a, true, 687, 10, 2121); - public static BasicTinkerFluid lumixylFluid = new BasicTinkerFluid("lumixyl", 0xFFfbe8cb, true, 548, 10, 2165); - public static BasicTinkerFluid solariumFluid = new BasicTinkerFluid("solarium", 0xFFffc81d, true, 482, 8, 3232); - public static BasicTinkerFluid dyoniteFluid = new BasicTinkerFluid("dyonite", 0xFFff6743, true, 486, 8, 3269); - public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultranite", 0xFFf5f294, true, 941, 9, 1784); - public static BasicTinkerFluid nucleumFluid = new BasicTinkerFluid("nucleum", 0xFFa8ea3b, true, 813, 10, 2355); - public static BasicTinkerFluid aegisaltFluid = new BasicTinkerFluid("aegisalt", 0xFFb6af74, true, 660, 7, 2089); - public static BasicTinkerFluid bysmuidFluid = new BasicTinkerFluid("bysmuid", 0xFF7b97b0, true, 560, 8, 2674); - - - // Additional fluids to cast alloys - public static BasicTinkerFluid radiant_enderium = new BasicTinkerFluid("radiant_enderium", 0xFFbcea5d, false, 529, 10, 768); - public static BasicTinkerFluid glimming_enderium = new BasicTinkerFluid("glimming_enderium", 0xFFfffc98, false, 633, 10, 821); - public static BasicTinkerFluid energy_enderium = new BasicTinkerFluid("energy_enderium", 0xFFffb498, false, 562, 10, 421); - public static BasicTinkerFluid glimmercoalFluid = new BasicTinkerFluid("glimmercoal_fluid", 0xFFee7c28, false, 531, 10, 312); - public static BasicTinkerFluid nitroFluid = new BasicTinkerFluid("nitro_fluid", 0xFF223512, false, 405, 5, 772); - public static BasicTinkerFluid anthraciteFluid = new BasicTinkerFluid("anthracite_fluid", 0xFF111111, false, 500, 0, 632); - public static BasicTinkerFluid spectrumFluid = new BasicTinkerFluid("spectrum_fluid", 0xFF64748f, false, 600, 0, 512); + public static BasicTinkerFluid basaltFluid = new BasicTinkerFluid("basalt_fluid", 0xFFe4ddc3, 550, 10, 6000); + public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFF66f136, 400, 10, 8000); + public static BasicTinkerFluid auroriumFluid = new BasicTinkerFluid("aurorium_fluid", 0xFFefae94, 750, 10, 10000); + public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF271c29, 850, 10, 10000); + public static BasicTinkerFluid duraniteFluid = new BasicTinkerFluid("duranite_fluid", 0xFFacddeb, 10000, 10, 10000); + public static BasicTinkerFluid valyriumFluid = new BasicTinkerFluid("valyrium_fluid", 0xFFe85c31, 1250, 10, 10000); + public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium_fluid", 0xFFbad2d9, 1400, 10, 10000); + public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine_fluid", 0xFFeb484a, 750, 10, 9000); + public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium_fluid", 0xFFee8736, 690, 10, 10000); + public static BasicTinkerFluid uruFluid = new BasicTinkerFluid("uru_fluid", 0xFFbfb9f0, 1200, 10, 10000); + public static BasicTinkerFluid osramFluid = new BasicTinkerFluid("osram_fluid", 0xFFffbc90, 800, 10, 4000); + public static BasicTinkerFluid abyssumFluid = new BasicTinkerFluid("abyssum_fluid", 0xFF21bcc2, 700, 10, 10000); + public static BasicTinkerFluid eezoFluid = new BasicTinkerFluid("eezo_fluid", 0xFF58798a, 450, 0, 1000); + public static BasicTinkerFluid triberiumFluid = new BasicTinkerFluid("triberium_fluid", 0xFFe4ff00, 550, 10, 9000); + public static BasicTinkerFluid fractumFluid = new BasicTinkerFluid("fractum_fluid", 0xFFd2c583, 750, 10, 10000); + public static BasicTinkerFluid violiumFluid = new BasicTinkerFluid("violium_fluid", 0xFFbfb0e2, 850, 10, 10000); + public static BasicTinkerFluid proxiiFluid = new BasicTinkerFluid("proxii_fluid", 0xFFcefde1, 750, 10, 10000); + public static BasicTinkerFluid tritoniteFluid = new BasicTinkerFluid("tritonite_fluid", 0xFF8edeff, 550, 10, 10000); + public static BasicTinkerFluid ignitzFluid = new BasicTinkerFluid("ignitz_fluid", 0xFFff284b, 950, 10, 6000); + public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite_fluid", 0xFF7fefa0, 900, 10, 10000); + public static BasicTinkerFluid solariumFluid = new BasicTinkerFluid("solarium_fluid", 0xFFfef864, 1500, 10, 2000); + public static BasicTinkerFluid nihiliteFluid = new BasicTinkerFluid("nihilite_fluid", 0xFF6645ba, 580, 10, 10000); + public static BasicTinkerFluid adamantFluid = new BasicTinkerFluid("adamant_fluid", 0xFFff8efe, 1650, 10, 10000); + public static BasicTinkerFluid dyoniteFluid = new BasicTinkerFluid("dyonite_fluid", 0xFFffbd3f, 660, 10, 7000); + public static BasicTinkerFluid nucleumFluid = new BasicTinkerFluid("nucleum_fluid", 0xFFe6ff40, 490, 10, 10000); + public static BasicTinkerFluid lumixFluid = new BasicTinkerFluid("lumix_fluid", 0xFFf9f3cc, 450, 10, 8000); + public static BasicTinkerFluid seismumFluid = new BasicTinkerFluid("seismum_fluid", 0xFFecbca8, 720, 10, 10000); + public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astrium_fluid", 0xFF8f385f, 680, 10, 10000); + public static BasicTinkerFluid niobFluid = new BasicTinkerFluid("niob_fluid", 0xFF7398b9, 550, 10, 10000); + public static BasicTinkerFluid yrdeenFluid = new BasicTinkerFluid("yrdeen_fluid", 0xFF8f385f, 710, 10, 10000); + public static BasicTinkerFluid ioxFluid = new BasicTinkerFluid("iox_fluid", 0xFF99323c, 900, 10, 10000); + public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteorite_fluid", 0xFF374f3d, 950, 10, 7000); + public static BasicTinkerFluid obsidioriteFluid = new BasicTinkerFluid("obsidiorite_fluid", 0xFF224853, 1050, 10, 7000); /** * Registers all materials' fluids
@@ -95,20 +80,7 @@ public class Fluids { * Registers special smeltery recipes (not alloying) */ static void registerfromItem() { - registerMelting(radiant_pearl, radiant_enderium, 72); - registerMelting(glimmer_pearl, glimming_enderium, 72); - registerMelting(energy_pearl, energy_enderium, 72); - registerMelting(glimmercoal, glimmercoalFluid, 72); - registerMelting(nitro_brick, nitroFluid, 72); - registerMelting(anthracite_dust, anthraciteFluid, 72); - registerMelting(spectrum_dust, spectrumFluid, 72); - registerMelting(Blocks.OBSIDIAN, FluidRegistry.LAVA, 432); - registerMelting(Blocks.NETHERRACK, FluidRegistry.LAVA, 48); - registerMelting(Blocks.STONE, FluidRegistry.LAVA, 144); - registerMelting(slagironOre, TinkerFluids.iron, 16); - registerMelting(slagironIngot, TinkerFluids.iron, 24); - registerMelting(slaggoldOre, TinkerFluids.gold, 16); - registerMelting(slaggoldIngot, TinkerFluids.gold, 24); - + TinkerRegistry.registerMelting(Blocks.blockMeteoriteCobble, meteoriteFluid, 144); } + } diff --git a/src/main/java/com/sosnitzka/taiga/Items.java b/src/main/java/com/sosnitzka/taiga/Items.java index 4e0e184..0df15a2 100644 --- a/src/main/java/com/sosnitzka/taiga/Items.java +++ b/src/main/java/com/sosnitzka/taiga/Items.java @@ -11,97 +11,143 @@ import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; import java.util.Arrays; -import static com.sosnitzka.taiga.util.Utils.PREFIX_INGOT; -import static com.sosnitzka.taiga.util.Utils.PREFIX_NUGGET; +import static com.sosnitzka.taiga.util.Utils.*; public class Items { - public static Item lignite = new BasicItem("lignite", null, "lignite"); - public static Item iron_nugget = new BasicItem("iron_nugget", PREFIX_NUGGET); - public static Item slaggoldIngot = new BasicItem("slaggold_ingot"); - public static Item slagironIngot = new BasicItem("slagiron_ingot"); - public static Item fuel_brick = new BasicItem("fuel_brick"); + public static Item ironNugget = new BasicItem("iron_nugget", PREFIX_NUGGET); - //Nuggets - public static Item titanite_nugget = new BasicItem("titanite_nugget", PREFIX_NUGGET); - public static Item adamantite_nugget = new BasicItem("adamantite_nugget", PREFIX_NUGGET); - public static Item arcanite_nugget = new BasicItem("arcanite_nugget", PREFIX_NUGGET); - public static Item violium_nugget = new BasicItem("violium_nugget", PREFIX_NUGGET); - public static Item bismuth_nugget = new BasicItem("bismuth_nugget", PREFIX_NUGGET); - public static Item eternite_nugget = new BasicItem("eternite_nugget", PREFIX_NUGGET); - public static Item ignitite_nugget = new BasicItem("ignitite_nugget", PREFIX_NUGGET); - public static Item karmesine_nugget = new BasicItem("karmesine_nugget", PREFIX_NUGGET); - public static Item meteorite_nugget = new BasicItem("meteorite_nugget", PREFIX_NUGGET); - public static Item mindorite_nugget = new BasicItem("mindorite_nugget", PREFIX_NUGGET); - public static Item mythril_nugget = new BasicItem("mythril_nugget", PREFIX_NUGGET); - public static Item palladium_nugget = new BasicItem("palladium_nugget", PREFIX_NUGGET); - public static Item prometheum_nugget = new BasicItem("prometheum_nugget", PREFIX_NUGGET); - // NAH! public static Item tiberium_nugget = new BasicItem("tiberium_nugget", PREFIX_NUGGET); - public static Item vibranium_nugget = new BasicItem("vibranium_nugget", PREFIX_NUGGET); - public static Item rubium_nugget = new BasicItem("rubium_nugget", PREFIX_NUGGET); - public static Item astrium_nugget = new BasicItem("astrium_nugget", PREFIX_NUGGET); - public static Item nitronite_nugget = new BasicItem("nitronite_nugget", PREFIX_NUGGET); - public static Item proxideum_nugget = new BasicItem("proxideum_nugget", PREFIX_NUGGET); - public static Item noctunyx_nugget = new BasicItem("noctunyx_nugget", PREFIX_NUGGET); - public static Item imperomite_nugget = new BasicItem("imperomite_nugget", PREFIX_NUGGET); - public static Item cryptogen_nugget = new BasicItem("cryptogen_nugget", PREFIX_NUGGET); - public static Item fractoryte_nugget = new BasicItem("fractoryte_nugget", PREFIX_NUGGET); - public static Item seismodium_nugget = new BasicItem("seismodium_nugget", PREFIX_NUGGET); - public static Item tiberium_nugget = new BasicItem("tiberium_nugget", PREFIX_NUGGET); - public static Item terramite_nugget = new BasicItem("terramite_nugget", PREFIX_NUGGET); - public static Item lumixyl_nugget = new BasicItem("lumixyl_nugget", PREFIX_NUGGET); - public static Item solarium_nugget = new BasicItem("solarium_nugget", PREFIX_NUGGET); - public static Item dyonite_nugget = new BasicItem("dyonite_nugget", PREFIX_NUGGET); - public static Item ultranite_nugget = new BasicItem("ultranite_nugget", PREFIX_NUGGET); - public static Item nucleum_nugget = new BasicItem("nucleum_nugget", PREFIX_NUGGET); - public static Item aegisalt_nugget = new BasicItem("aegisalt_nugget", PREFIX_NUGGET); - public static Item bysmuid_nugget = new BasicItem("bysmuid_nugget", PREFIX_NUGGET); - - public static Item glimmercoal = new BasicItem("glimmercoal"); - public static Item radiant_pearl = new BasicItem("radiant_pearl"); - public static Item glimmer_pearl = new BasicItem("glimmer_pearl"); - public static Item energy_pearl = new BasicItem("energy_pearl"); - public static Item glimmerstone_dust = new BasicItem("glimmerstone_dust"); - public static Item luminar_dust = new BasicItem("luminar_dust"); - public static Item spectrum_dust = new BasicItem("spectrum_dust"); - public static Item anthracite_dust = new BasicItem("anthracite_dust"); - public static Item nitro_brick = new BasicItem("nitro_brick"); - - 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 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); - public static Item karmesineIngot = new BasicItem("karmesine_ingot", PREFIX_INGOT); - public static Item meteoriteIngot = new BasicItem("meteorite_ingot", PREFIX_INGOT); - public static Item mindoriteIngot = new BasicItem("mindorite_ingot", PREFIX_INGOT); - public static Item mythrilIngot = new BasicItem("mythril_ingot", PREFIX_INGOT); - public static Item palladiumIngot = new BasicItem("palladium_ingot", PREFIX_INGOT); - public static Item prometheumIngot = new BasicItem("prometheum_ingot", PREFIX_INGOT); public static Item tiberiumIngot = new BasicItem("tiberium_ingot", PREFIX_INGOT); + public static Item tiberiumDust = new BasicItem("tiberium_dust", PREFIX_DUST); + public static Item tiberiumNugget = new BasicItem("tiberium_nugget", PREFIX_NUGGET); + + public static Item auroriumIngot = new BasicItem("aurorium_ingot", PREFIX_INGOT); + public static Item auroriumDust = new BasicItem("aurorium_dust", PREFIX_DUST); + public static Item auroriumNugget = new BasicItem("aurorium_nugget", PREFIX_NUGGET); + + public static Item prometheumIngot = new BasicItem("prometheum_ingot", PREFIX_INGOT); + public static Item prometheumDust = new BasicItem("prometheum_dust", PREFIX_DUST); + public static Item prometheumNugget = new BasicItem("prometheum_nugget", PREFIX_NUGGET); + + public static Item duraniteIngot = new BasicItem("duranite_ingot", PREFIX_INGOT); + public static Item duraniteDust = new BasicItem("duranite_dust", PREFIX_DUST); + public static Item duraniteNugget = new BasicItem("duranite_nugget", PREFIX_NUGGET); + + public static Item valyriumIngot = new BasicItem("valyrium_ingot", PREFIX_INGOT); + public static Item valyriumDust = new BasicItem("valyrium_dust", PREFIX_DUST); + public static Item valyriumNugget = new BasicItem("valyrium_nugget", PREFIX_NUGGET); + public static Item vibraniumIngot = new BasicItem("vibranium_ingot", PREFIX_INGOT); - public static Item rubiumIngot = new BasicItem("rubium_ingot", PREFIX_INGOT); + public static Item vibraniumDust = new BasicItem("vibranium_dust", PREFIX_DUST); + public static Item vibraniumNugget = new BasicItem("vibranium_nugget", PREFIX_NUGGET); + + public static Item karmesineIngot = new BasicItem("karmesine_ingot", PREFIX_INGOT); + public static Item karmesineDust = new BasicItem("karmesine_dust", PREFIX_DUST); + public static Item karmesineNugget = new BasicItem("karmesine_nugget", PREFIX_NUGGET); + + public static Item palladiumIngot = new BasicItem("palladium_ingot", PREFIX_INGOT); + public static Item palladiumDust = new BasicItem("palladium_dust", PREFIX_DUST); + public static Item palladiumNugget = new BasicItem("palladium_nugget", PREFIX_NUGGET); + + public static Item uruIngot = new BasicItem("uru_ingot", PREFIX_INGOT); + public static Item uruDust = new BasicItem("uru_dust", PREFIX_DUST); + public static Item uruNugget = new BasicItem("uru_nugget", PREFIX_NUGGET); + + public static Item osramIngot = new BasicItem("osram_ingot", PREFIX_INGOT); + public static Item osramDust = new BasicItem("osram_dust", PREFIX_DUST); + public static Item osramNugget = new BasicItem("osram_nugget", PREFIX_NUGGET); + + public static Item abyssumIngot = new BasicItem("abyssum_ingot", PREFIX_INGOT); + public static Item abyssumDust = new BasicItem("abyssum_dust", PREFIX_DUST); + public static Item abyssumNugget = new BasicItem("abyssum_nugget", PREFIX_NUGGET); + + public static Item eezoIngot = new BasicItem("eezo_ingot", PREFIX_INGOT); + public static Item eezoDust = new BasicItem("eezo_dust", PREFIX_DUST); + public static Item eezoNugget = new BasicItem("eezo_nugget", PREFIX_NUGGET); + + public static Item triberiumIngot = new BasicItem("triberium_ingot", PREFIX_INGOT); + public static Item triberiumDust = new BasicItem("triberium_dust", PREFIX_DUST); + public static Item triberiumNugget = new BasicItem("triberium_nugget", PREFIX_NUGGET); + + public static Item fractumIngot = new BasicItem("fractum_ingot", PREFIX_INGOT); + public static Item fractumDust = new BasicItem("fractum_dust", PREFIX_DUST); + public static Item fractumNugget = new BasicItem("fractum_nugget", PREFIX_NUGGET); + + public static Item violiumIngot = new BasicItem("violium_ingot", PREFIX_INGOT); + public static Item violiumDust = new BasicItem("violium_dust", PREFIX_DUST); + public static Item violiumNugget = new BasicItem("violium_nugget", PREFIX_NUGGET); + + public static Item proxiiIngot = new BasicItem("proxii_ingot", PREFIX_INGOT); + public static Item proxiiDust = new BasicItem("proxii_dust", PREFIX_DUST); + public static Item proxiiNugget = new BasicItem("proxii_nugget", PREFIX_NUGGET); + + public static Item tritoniteIngot = new BasicItem("tritonite_ingot", PREFIX_INGOT); + public static Item tritoniteDust = new BasicItem("tritonite_dust", PREFIX_DUST); + public static Item tritoniteNugget = new BasicItem("tritonite_nugget", PREFIX_NUGGET); + + public static Item ignitzIngot = new BasicItem("ignitz_ingot", PREFIX_INGOT); + public static Item ignitzDust = new BasicItem("ignitz_dust", PREFIX_DUST); + public static Item ignitzNugget = new BasicItem("ignitz_nugget", PREFIX_NUGGET); + + public static Item imperomiteIngot = new BasicItem("imperomite_ingot", PREFIX_INGOT); + public static Item imperomiteDust = new BasicItem("imperomite_dust", PREFIX_DUST); + public static Item imperomiteNugget = new BasicItem("imperomite_nugget", PREFIX_NUGGET); + + public static Item solariumIngot = new BasicItem("solarium_ingot", PREFIX_INGOT); + public static Item solariumDust = new BasicItem("solarium_dust", PREFIX_DUST); + public static Item solariumNugget = new BasicItem("solarium_nugget", PREFIX_NUGGET); + + public static Item nihiliteIngot = new BasicItem("nihilite_ingot", PREFIX_INGOT); + public static Item nihiliteDust = new BasicItem("nihilite_dust", PREFIX_DUST); + public static Item nihiliteNugget = new BasicItem("nihilite_nugget", PREFIX_NUGGET); + + public static Item adamantIngot = new BasicItem("adamant_ingot", PREFIX_INGOT); + public static Item adamantDust = new BasicItem("adamant_dust", PREFIX_DUST); + public static Item adamantNugget = new BasicItem("adamant_nugget", PREFIX_NUGGET); + + public static Item dyoniteIngot = new BasicItem("dyonite_ingot", PREFIX_INGOT); + public static Item dyoniteDust = new BasicItem("dyonite_dust", PREFIX_DUST); + public static Item dyoniteNugget = new BasicItem("dyonite_nugget", PREFIX_NUGGET); + + public static Item nucleumIngot = new BasicItem("nucleum_ingot", PREFIX_INGOT); + public static Item nucleumDust = new BasicItem("nucleum_dust", PREFIX_DUST); + public static Item nucleumNugget = new BasicItem("nucleum_nugget", PREFIX_NUGGET); + + public static Item lumixIngot = new BasicItem("lumix_ingot", PREFIX_INGOT); + public static Item lumixDust = new BasicItem("lumix_dust", PREFIX_DUST); + public static Item lumixNugget = new BasicItem("lumix_nugget", PREFIX_NUGGET); + + public static Item seismumIngot = new BasicItem("seismum_ingot", PREFIX_INGOT); + public static Item seismumDust = new BasicItem("seismum_dust", PREFIX_DUST); + public static Item seismumNugget = new BasicItem("seismum_nugget", PREFIX_NUGGET); 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 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 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 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 astriumDust = new BasicItem("astrium_dust", PREFIX_DUST); + public static Item astriumNugget = new BasicItem("astrium_nugget", PREFIX_NUGGET); - public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable"); + public static Item niobIngot = new BasicItem("niob_ingot", PREFIX_INGOT); + public static Item niobDust = new BasicItem("niob_dust", PREFIX_DUST); + public static Item niobNugget = new BasicItem("niob_nugget", PREFIX_NUGGET); + + public static Item yrdeenIngot = new BasicItem("yrdeen_ingot", PREFIX_INGOT); + public static Item yrdeenDust = new BasicItem("yrdeen_dust", PREFIX_DUST); + public static Item yrdeenNugget = new BasicItem("yrdeen_nugget", PREFIX_NUGGET); + + public static Item ioxIngot = new BasicItem("iox_ingot", PREFIX_INGOT); + public static Item ioxDust = new BasicItem("iox_dust", PREFIX_DUST); + public static Item ioxNugget = new BasicItem("iox_nugget", PREFIX_NUGGET); + + public static Item meteoriteIngot = new BasicItem("meteorite_ingot", PREFIX_INGOT); + public static Item meteoriteDust = new BasicItem("meteorite_dust", PREFIX_DUST); + public static Item meteoriteNugget = new BasicItem("meteorite_nugget", PREFIX_NUGGET); + + public static Item basaltIngot = new BasicItem("basalt_ingot", PREFIX_INGOT); + public static Item basaltDust = new BasicItem("basalt_dust", PREFIX_DUST); + public static Item basaltNugget = new BasicItem("basalt_nugget", PREFIX_NUGGET); + + public static Item obsidioriteIngot = new BasicItem("obsidiorite_ingot", PREFIX_INGOT); + public static Item obsidioriteDust = new BasicItem("obsidiorite_dust", PREFIX_DUST); + public static Item obsidioriteNugget = new BasicItem("obsidiorite_nugget", PREFIX_NUGGET); /** * Registers all materials' ingots and nuggets
@@ -109,6 +155,7 @@ public class Items { * Gets the ingots declared in the class (fields and reflection) and iterates through them:
* Checks that the field is static, registers the field (item), and adds an oreDict entry if needed */ + public static void register() { Field[] declaredFields = Items.class.getDeclaredFields(); // Gets the fields (ingots) declared above for (Field field : declaredFields) { // Iterates through the fields declared above @@ -116,7 +163,7 @@ public class Items { Class targetType = field.getType(); try { Item item = (Item) field.get(targetType); // Gets the field as a BasicItem which is then casted to an Item - if (item.equals(iron_nugget) && OreDictionary.doesOreNameExist("nuggetIron")) { + if (item.equals(ironNugget) && OreDictionary.doesOreNameExist("nuggetIron")) { System.out.println("TAIGA: Skipped registration of nuggetIron which already exists."); continue; } diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index c5ab2ba..f2ca5bf 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -7,15 +7,15 @@ import slimeknights.tconstruct.library.materials.Material; import slimeknights.tconstruct.library.materials.MaterialTypes; import slimeknights.tconstruct.library.traits.AbstractTrait; +import static com.sosnitzka.taiga.Fluids.obsidioriteFluid; import static slimeknights.tconstruct.tools.TinkerTraits.*; public class MaterialTraits { // new hardness levels - public static final int TITANITE = 5; - public static final int METEORITE = 6; + public static final int DURANITE = 5; + public static final int VALYRIUM = 6; public static final int VIBRANIUM = 7; - public static final int ADAMANTITE = 8; // Init of new traits public static final AbstractTrait instable = new TraitInstable(); @@ -34,50 +34,65 @@ public class MaterialTraits { public static final AbstractTrait dark = new TraitDark(); public static final AbstractTrait bright = new TraitBright(); public static final AbstractTrait slaughtering = new TraitSlaughtering(); - public static final AbstractTrait haunted = new TraitHaunted(); public static final AbstractTrait fragile = new TraitFragile(); public static final AbstractTrait dissolving = new TraitDissolving(); - public static final AbstractTrait organizing = new TraitOrganizing(); public static final AbstractTrait arcane = new TraitArcane(); public static final AbstractTrait heroic = new TraitHeroic(); public static final AbstractTrait hollow = new TraitHollow(); public static final AbstractTrait diffuse = new TraitDiffuse(); - public static final AbstractTrait randomize = new TraitRandomize(); public static final AbstractTrait reviving = new TraitReviving(); public static final AbstractTrait melting = new TraitMelting(); public static final AbstractTrait traditional = new TraitTraditional(); + public static final AbstractTrait tantrum = new TraitTantrum(); + public static final AbstractTrait catcher = new TraitCatcher(); + public static final AbstractTrait congenial = new TraitCongenial(); + public static final AbstractTrait souleater = new TraitSoulEater(); + public static final AbstractTrait cursed = new TraitCursed(); + public static final AbstractTrait ported = new TraitPorted(); + public static final AbstractTrait decay = new TraitDecay(); + public static final AbstractTrait whirl = new TraitWhirl(); + /** + * Assign traits to related materials.
+ *

+ *

Example: + * .addTrait(x, HandleMaterialStats.TYPE).addTrait(y, HeadMaterialStats.TYPE) + * .addTrait(z) + */ - public static Material arcanite = new Material("arcanite", TextFormatting.LIGHT_PURPLE).addTrait(arcane, MaterialTypes.HEAD).addTrait(blind, MaterialTypes.HANDLE); public static Material tiberium = new Material("tiberium", TextFormatting.GREEN).addTrait(instable); - public static Material prometheum = new Material("prometheum", TextFormatting.DARK_PURPLE).addTrait(haunted, MaterialTypes.HEAD).addTrait(blind); - public static Material rubium = new Material("rubium", TextFormatting.RED).addTrait(enderference, MaterialTypes.HEAD).addTrait(blind); - public static Material violium = new Material("violium", TextFormatting.DARK_GREEN).addTrait(stonebound, MaterialTypes.HANDLE).addTrait(poisonous, MaterialTypes.HEAD); - public static Material bismuth = new Material("bismuth", TextFormatting.GREEN).addTrait(splintering, MaterialTypes.HEAD).addTrait(splinters, MaterialTypes.HANDLE); - public static Material karmesine = new Material("karmesine", TextFormatting.DARK_RED).addTrait(aridiculous, MaterialTypes.HANDLE).addTrait(superheat, MaterialTypes.HEAD); - public static Material mindorite = new Material("mindorite", TextFormatting.AQUA).addTrait(cheap); - public static Material titanite = new Material("titanite", TextFormatting.GRAY).addTrait(shocking, MaterialTypes.HANDLE).addTrait(sharp, MaterialTypes.HEAD); - public static Material meteorite = new Material("meteorite", TextFormatting.GRAY).addTrait(established, MaterialTypes.HANDLE).addTrait(momentum, MaterialTypes.HEAD); - public static Material adamantite = new Material("adamantite", TextFormatting.GRAY).addTrait(coldblooded, MaterialTypes.HEAD).addTrait(magnetic, MaterialTypes.HANDLE); - public static Material vibranium = new Material("vibranium", TextFormatting.GRAY).addTrait(resonance); - public static Material ignitite = new Material("ignitite", TextFormatting.RED).addTrait(melting, MaterialTypes.HANDLE).addTrait(flammable, MaterialTypes.HEAD); - public static Material palladium = new Material("palladium", TextFormatting.DARK_GRAY).addTrait(dark); - public static Material eternite = new Material("eternite", TextFormatting.AQUA).addTrait(writable2); //.addTrait(traditional) - public static Material mythril = new Material("mythril", TextFormatting.GRAY).addTrait(holy, MaterialTypes.HEAD).addTrait(hellish, MaterialTypes.HANDLE); - public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(cascade); - public static Material fractoryte = new Material("fractoryte", TextFormatting.DARK_RED).addTrait(fracture); - public static Material noctunyx = new Material("noctunyx", TextFormatting.LIGHT_PURPLE).addTrait(hollow, MaterialTypes.HEAD).addTrait(reviving, MaterialTypes.HANDLE); - public static Material nitronite = new Material("nitronite", TextFormatting.YELLOW).addTrait(uncertain); - public static Material cryptogen = new Material("cryptogen", TextFormatting.DARK_GREEN).addTrait(randomize); - public static Material seismodium = new Material("seismodium", TextFormatting.WHITE).addTrait(heroic).addTrait(fragile); - public static Material aegisalt = new Material("aegisalt", TextFormatting.AQUA).addTrait(analysing); - public static Material ultranite = new Material("ultranite", TextFormatting.AQUA).addTrait(pulverizing); - public static Material bysmuid = new Material("bysmuid", TextFormatting.AQUA).addTrait(organizing, MaterialTypes.HANDLE).addTrait(melting, MaterialTypes.HEAD); - public static Material nucleum = new Material("nucleum", TextFormatting.AQUA).addTrait(diffuse).addTrait(bright, MaterialTypes.HEAD); - public static Material lumixyl = new Material("lumixyl", TextFormatting.YELLOW).addTrait(glimmer); - public static Material dyonite = new Material("dyonite", TextFormatting.GRAY).addTrait(slaughtering, MaterialTypes.HEAD).addTrait(dissolving, MaterialTypes.HANDLE); - public static Material terramite = new Material("terramite", TextFormatting.GRAY).addTrait(naturebound).addTrait(fragile); - public static Material solarium = new Material("solarium", TextFormatting.RED).addTrait(garishly); - public static Material astrium = new Material("astrium", TextFormatting.DARK_PURPLE).addTrait(curvature); - public static Material proxideum = new Material("proxideum", TextFormatting.LIGHT_PURPLE).addTrait(softy, MaterialTypes.HANDLE).addTrait(lightweight); + public static Material aurorium = new Material("aurorium", TextFormatting.RED).addTrait(arcane); + public static Material prometheum = new Material("prometheum", TextFormatting.DARK_PURPLE).addTrait(blind, MaterialTypes.HANDLE).addTrait(catcher); + public static Material duranite = new Material("duranite", TextFormatting.YELLOW).addTrait(analysing); + public static Material valyrium = new Material("valyrium", TextFormatting.DARK_GRAY).addTrait(congenial); + public static Material vibranium = new Material("vibranium", TextFormatting.GRAY).addTrait(resonance, MaterialTypes.HANDLE).addTrait(heroic, MaterialTypes.HEAD); + public static Material karmesine = new Material("karmesine", TextFormatting.RED).addTrait(slaughtering); + public static Material palladium = new Material("palladium", TextFormatting.GOLD).addTrait(dark).addTrait(cursed); + public static Material uru = new Material("uru", TextFormatting.DARK_RED).addTrait(diffuse); + public static Material basalt = new Material("basalt", TextFormatting.WHITE).addTrait(softy); + public static Material eezo = new Material("eezo", TextFormatting.GOLD).addTrait(dissolving); + public static Material triberium = new Material("triberium", TextFormatting.GREEN).addTrait(fragile); + public static Material fractum = new Material("fractum", TextFormatting.DARK_RED).addTrait(fracture); + public static Material violium = new Material("violium", TextFormatting.DARK_PURPLE).addTrait(arcane); + public static Material proxii = new Material("proxii", TextFormatting.LIGHT_PURPLE).addTrait(curvature); + public static Material tritonite = new Material("tritonite", TextFormatting.GOLD).addTrait(whirl); + public static Material ignitz = new Material("ignitz", TextFormatting.RED).addTrait(melting).addTrait(garishly, MaterialTypes.HANDLE); + public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(hollow); + public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(pulverizing); + public static Material nihilite = new Material("nihilite", TextFormatting.BLACK).addTrait(souleater); + public static Material adamant = new Material("adamant", TextFormatting.GOLD); + public static Material dyonite = new Material("dyonite", TextFormatting.GREEN).addTrait(tantrum); + public static Material nucleum = new Material("nucleum", TextFormatting.YELLOW).addTrait(decay); + public static Material lumix = new Material("lumix", TextFormatting.YELLOW).addTrait(bright, MaterialTypes.HANDLE).addTrait(glimmer, MaterialTypes.HEAD); + public static Material seismum = new Material("seismum", TextFormatting.GREEN).addTrait(cascade); + public static Material astrium = new Material("astrium", TextFormatting.DARK_PURPLE).addTrait(ported); + public static Material niob = new Material("niob", TextFormatting.RED).addTrait(reviving); + public static Material yrdeen = new Material("yrdeen", TextFormatting.RED).addTrait(naturebound); + public static Material meteorite = new Material("meteorite", TextFormatting.DARK_GREEN).addTrait(crumbling, MaterialTypes.HEAD).addTrait(cheap); + public static Material obsidiorite = new Material("obsidiorite", obsidioriteFluid.getColor()).addTrait(alien); + + public static Material osram = new Material("osram", TextFormatting.GOLD); + public static Material abyssum = new Material("abyssum", TextFormatting.GOLD); + public static Material iox = new Material("iox", TextFormatting.RED); + } diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index b7d0f00..3a29255 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGA.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -4,32 +4,25 @@ import com.google.common.collect.Lists; import com.sosnitzka.taiga.proxy.CommonProxy; import com.sosnitzka.taiga.recipes.CraftingRegistry; import com.sosnitzka.taiga.recipes.SmeltingRegistry; -import com.sosnitzka.taiga.util.FuelHandler; -import com.sosnitzka.taiga.world.ZWorldGen; -import net.minecraft.item.Item; -import net.minecraftforge.fluids.Fluid; +import com.sosnitzka.taiga.world.WorldGen; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import org.apache.commons.lang3.StringUtils; import slimeknights.tconstruct.library.MaterialIntegration; -import slimeknights.tconstruct.library.TinkerRegistry; -import slimeknights.tconstruct.library.materials.ExtraMaterialStats; -import slimeknights.tconstruct.library.materials.HandleMaterialStats; -import slimeknights.tconstruct.library.materials.HeadMaterialStats; -import slimeknights.tconstruct.library.materials.Material; +import slimeknights.tconstruct.library.materials.BowMaterialStats; import slimeknights.tconstruct.tools.TinkerMaterials; -import java.lang.reflect.Field; import java.util.List; import static com.sosnitzka.taiga.Fluids.*; import static com.sosnitzka.taiga.MaterialTraits.*; -import static com.sosnitzka.taiga.TAIGAConfiguration.*; +import static com.sosnitzka.taiga.util.Utils.integrateMaterial; +import static com.sosnitzka.taiga.util.Utils.integrateOre; import static slimeknights.tconstruct.library.utils.HarvestLevels.*; @Mod(modid = TAIGA.MODID, version = TAIGA.VERSION, guiFactory = TAIGA.GUIFACTORY, dependencies = "required-after:tconstruct@[1.10.2-2.5.0,);" + "required-after:mantle@[1.10.2-1.0.0,)") @@ -42,7 +35,7 @@ public class TAIGA { @SidedProxy(clientSide = "com.sosnitzka.taiga.proxy.ClientProxy", serverSide = "com.sosnitzka.taiga.proxy.CommonProxy") public static CommonProxy proxy; - private List integrateList = Lists.newArrayList(); // List of materials needed to be integrated + public static List integrateList = Lists.newArrayList(); // List of materials needed to be integrated @EventHandler public void preInit(FMLPreInitializationEvent e) { @@ -53,23 +46,22 @@ public class TAIGA { Fluids.register(); // Registers all fluids and its buckets Fluids.registerfromItem(); // Registers some special smeltery recipes (not alloying) Alloys.register(); // Registers alloying recipes - registerTinkerMaterials(); // Registers materials and associated fluids and stats into tconstruct } @EventHandler public void init(FMLInitializationEvent e) { proxy.registerModels(); // Registers models on the client side - GameRegistry.registerWorldGenerator(new ZWorldGen(), 100); // Generates ores - GameRegistry.registerFuelHandler(new FuelHandler()); // Registeres fuels' burn times + GameRegistry.registerWorldGenerator(new WorldGen(), 100); // Generates ores + // GameRegistry.registerFuelHandler(new FuelHandler()); Registeres fuels' burn times SmeltingRegistry.register(); // Registers smelting recipes CraftingRegistry.register(); // Registers crafting recipes // Adds new harvest levels' names - harvestLevelNames.put(METEORITE, TinkerMaterials.bone.getTextColor() + "Meteorite"); + harvestLevelNames.put(DURANITE, TinkerMaterials.bone.getTextColor() + "Duranite"); + harvestLevelNames.put(VALYRIUM, TinkerMaterials.bone.getTextColor() + "Valyrium"); harvestLevelNames.put(VIBRANIUM, TinkerMaterials.blueslime.getTextColor() + "Vibranium"); - harvestLevelNames.put(ADAMANTITE, TinkerMaterials.ardite.getTextColor() + "Adamantite"); - harvestLevelNames.put(TITANITE, TinkerMaterials.silver.getTextColor() + "Titanite"); + for (MaterialIntegration m : integrateList) { m.integrateRecipes(); @@ -78,49 +70,11 @@ public class TAIGA { @EventHandler public void postInit(FMLPostInitializationEvent e) { - } - /** - * @param oreSuffix Suffix in the oreDict, also the name. ex) the "Iron" in "ingotIron" - * @param material TConstruct material - * @param fluid material's fluid - * @param headDura Durability (head) - * @param headSpeed Mining speed (head) - * @param headAttack Attack speed (head) - * @param handleMod Durability multiplier (handle) - * @param handleDura Extra durability (handle) - * @param extra Extra durability (binding and more) - * @param headLevel Mining level (head) - * @param craft Can craft parts in part builder - * @param cast Can craft parts by casting with fluid (smeltery) - */ - private void registerTinkerMaterial(String oreSuffix, Material material, Fluid fluid, int headDura, float headSpeed, float headAttack, float handleMod, int handleDura, int extra, int headLevel, boolean craft, boolean cast) { - TinkerRegistry.addMaterialStats(material, new HeadMaterialStats(headDura, headSpeed, headAttack, headLevel)); - TinkerRegistry.addMaterialStats(material, new HandleMaterialStats(handleMod, handleDura)); - TinkerRegistry.addMaterialStats(material, new ExtraMaterialStats(extra)); - - Item item = null; - Field[] items = Items.class.getDeclaredFields(); - for (Field i : items) { - if (i.getName().equals(StringUtils.uncapitalize(oreSuffix) + "Ingot")) { - Item r = null; - try { - r = (Item) i.get(i.getType()); - } catch (Exception e) { - e.printStackTrace(); - } - item = r; - } - } - - material.setFluid(fluid).setCraftable(craft).setCastable(cast).addItem(item, 1, Material.VALUE_Ingot); - material.setRepresentativeItem(item); - - proxy.setRenderInfo(material); - MaterialIntegration integration = new MaterialIntegration(material, fluid, oreSuffix); - integration.integrate(); - integrateList.add(integration); + @EventHandler + public void serverLoad(FMLServerStartingEvent event) { + proxy.registerServerCommands(event); } @@ -128,50 +82,46 @@ public class TAIGA { * Registers materials and associated fluids and stats into tconstruct */ private void registerTinkerMaterials() { + BowMaterialStats shitty = new BowMaterialStats(0.2f, 0.4f, -1f); + + integrateMaterial("Tiberium", tiberium, tiberiumFluid, 80, 3.3f, 4f, 0.7f, -25, 50, DIAMOND, shitty, true, false); + integrateMaterial("Aurorium", aurorium, auroriumFluid, 750, 3.6f, 3.78f, 0.77f, 25, 130, COBALT, 0.45f, 1f, 1); + integrateMaterial("Prometheum", prometheum, prometheumFluid, 844, 4.75f, 6.6f, 1.2f, 25, 50, DURANITE, 0.2f, 0.6f, 3); + integrateMaterial("Duranite", duranite, duraniteFluid, 1550, 3.2f, 3.2f, 1.16f, 100, 100, DURANITE, 0.3f, 1.4f, 2); + integrateMaterial("Valyrium", valyrium, valyriumFluid, 1111, 5.37f, 4.8f, 1.30f, 100, 100, VALYRIUM, 1.1f, 1.2f, 4); + integrateMaterial("Vibranium", vibranium, vibraniumFluid, 1235, 7.62f, 8.1f, 1.3f, 100, 100, VIBRANIUM, 1.1f, 1.8f, 4); + integrateMaterial("Karmesine", karmesine, karmesineFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true); + integrateMaterial("Palladium", palladium, palladiumFluid, 797, 4.35f, 6.8f, 1.3f, 130, -50, DURANITE, .5f, .2f, 3); + integrateMaterial("Uru", uru, uruFluid, 877, 2f, 8.2f, 1.5f, -50, 175, VALYRIUM, 1.3f, 0.8f, 6); + integrateMaterial("Eezo", eezo, eezoFluid, 50, 14f, 3.5f, .1f, 10, 10, COBALT, shitty, true, false); + integrateMaterial("Basalt", basalt, basaltFluid, 200, 3, 2.5f, 0.5f, -25, 25, STONE, shitty, true, false); + integrateMaterial("Triberium", triberium, triberiumFluid, 223, 6.2f, 8.35f, 0.63f, 50, 50, DIAMOND, shitty, true, true); + integrateMaterial("Fractum", fractum, fractumFluid, 538, 5.71f, 6.93f, 0.88f, 58, 117, DIAMOND, shitty); + integrateMaterial("Violium", violium, violiumFluid, 925, 3.8f, 3.75f, .90f, 175, 50, COBALT, .45f, .95f, 1); + integrateMaterial("Proxii", proxii, proxiiFluid, 625, 6.8f, 4.21f, 1.25f, 80, 25, DURANITE, .35f, .5f, 3); + integrateMaterial("Tritonite", tritonite, tritoniteFluid, 780, 8f, 3.3f, 1.45f, -25, 150, COBALT, shitty); + integrateMaterial("Ignitz", ignitz, ignitzFluid, 350, 2f, 6.66f, .85f, 150, 250, COBALT, .8f, .8f, 3); + integrateMaterial("Imperomite", imperomite, imperomiteFluid, 1350, 4.65f, 5.9f, 1.15f, -100, 150, DURANITE, 1.2f, 1.8f, 2); + integrateMaterial("Solarium", solarium, solariumFluid, 1100, 13.78f, 7f, 1.25f, 150, 150, VIBRANIUM, .8f, 1.5f, 5); + integrateMaterial("Nihilite", nihilite, nihiliteFluid, 400, 2.8f, 4.50f, .77f, 350, 155, VALYRIUM, 1.5f, .8f, 3); + integrateMaterial("Adamant", adamant, adamantFluid, 1750, 6f, 6f, 2f, 0, 0, VIBRANIUM, .35f, 1.85f, 8); + integrateMaterial("Dyonite", dyonite, dyoniteFluid, 900, 6.45f, 5f, 0.66f, -50, 250, DURANITE, 2, .9f, -1); + integrateMaterial("Nucleum", nucleum, nucleumFluid, 505, 15.5f, 9.5f, 1.05f, 100, 125, VALYRIUM, shitty); + integrateMaterial("Lumix", lumix, lumixFluid, 666, 3.84f, 3.92f, 0.85f, 250, 200, COBALT, .8f, 1.3f, 1); + integrateMaterial("Seismum", seismum, seismumFluid, 780, 3.66f, 6.05f, .95f, 250, 50, COBALT, shitty); + integrateMaterial("Astrium", astrium, astriumFluid, 750, 8.35f, 5.4f, 0.95f, -100, 200, COBALT, .7f, .8f, 2); + integrateMaterial("Niob", niob, niobFluid, 700, 4.5f, 4.5f, 2f, 200, 50, COBALT, shitty); + integrateMaterial("Yrdeen", yrdeen, yrdeenFluid, 999, 9.1f, 3f, 1.35f, 150, 250, COBALT, shitty); + integrateMaterial("Meteorite", meteorite, meteoriteFluid, 1500, 1.5f, 1.5f, .5f, 0, 0, OBSIDIAN, shitty); + integrateMaterial("Obsidiorite", obsidiorite, obsidioriteFluid, 1500, .5f, .5f, 1, -100, 100, COBALT, shitty); + // when more traits / ideas are available + // integrateMaterial("Uru", uru, uruFluid, (552), 8.75f, 2.87f, 0.98f, -100, 200, DIAMOND); + // integrateMaterial("Osram", osram, osramFluid, 500, 5f, 3f, 0.8f, -50, 50, DIAMOND); + // integrateMaterial("Abyssum", abyssum, abyssumFluid, 100, 1f, 1f, 1f, 300, 300, DIAMOND); + integrateOre("Osram", osramFluid); + integrateOre("Abyssum", abyssumFluid); + integrateOre("Iox", ioxFluid); - double d = durabilityFactorGeneral; - System.out.println("Durability=" + d); - float s = (float) speedFactorGeneral; - System.out.println("Speed=" + s); - float a = (float) attackFactorGeneral; - System.out.println("Attack=" + a); - // ARCANE ORES - registerTinkerMaterial("Tiberium", tiberium, tiberiumFluid, (int) (223 * d), 6.2f * s, 8.35f * a, 0.63f, 50, 50, OBSIDIAN, false, true); - registerTinkerMaterial("Rubium", rubium, rubiumFluid, (int) (351 * d), 5.15f * s, 7.00f * a, 1.05f, -100, 250, COBALT, false, true); - registerTinkerMaterial("Prometheum", prometheum, prometheumFluid, (int) (539 * d), 3.6f * s, 6.60f, 0.90f, 0, 150, TITANITE, false, true); - registerTinkerMaterial("Arcanite", arcanite, arcaniteFluid, (int) (698 * d), 4.3f * s, 7.88f * a, 0.85f, -50, 150, METEORITE, false, true); - // SOLIDE ORES - registerTinkerMaterial("Titanite", titanite, titaniteFluid, (int) (811 * d), 4.8f * s, 6.40f * a, 1.00f, -50, 150, TITANITE, false, true); - registerTinkerMaterial("Meteorite", meteorite, meteoriteFluid, (int) (823 * d), 6.1f * s, 6.83f * a, 1.20f, -50, 200, METEORITE, false, true); - registerTinkerMaterial("Vibranium", vibranium, vibraniumFluid, (int) (917 * d), 7.45f * s, 7.17f * a, 1.15f, 50, 150, VIBRANIUM, false, true); - registerTinkerMaterial("Adamantite", adamantite, adamantiteFluid, (int) (981 * d), 8.9f * s, 9.11f * a, 1.20f, -200, 300, ADAMANTITE, false, true); - // ETHERE ORES - registerTinkerMaterial("Eternite", eternite, eterniteFluid, (int) (592 * d), 7.35f * s, 1.95f * a, 1.10f, 150, 150, COBALT, false, true); - registerTinkerMaterial("Mythril", mythril, mythrilFluid, (int) (552 * d), 8.75f * s, 2.87f * a, 0.98f, -100, 200, TITANITE, false, true); - registerTinkerMaterial("Palladium", palladium, palladiumFluid, (int) (578 * d), 10.4f * s, 3.13f * a, 1.09f, 0, 100, METEORITE, false, true); - registerTinkerMaterial("Ignitite", ignitite, ignititeFluid, (int) (673 * d), 12.1f * s, 4.10f * a, 1.15f, -50, 150, VIBRANIUM, false, true); - // RATIO ORES - registerTinkerMaterial("Bismuth", bismuth, bismuthFluid, (int) (235 * d), 5.33f * s, 3.80f * a, 1.15f, 17, 117, OBSIDIAN, false, true); - registerTinkerMaterial("Violium", violium, violiumFluid, (int) (427 * d), 4.2f * s, 3.30f * a, 1.00f, 133, 150, COBALT, false, true); - registerTinkerMaterial("Mindorite", mindorite, mindoriteFluid, (int) (458 * d), 6.41f * s, 4.40f * a, 0.90f, 83, 100, TITANITE, false, true); - registerTinkerMaterial("Karmesine", karmesine, karmesineFluid, (int) (627 * d), 6.75f * s, 5.10f * a, 0.99f, 0, 200, METEORITE, false, true); - // Material from alloys - registerTinkerMaterial("Nitronite", nitronite, nitroniteFluid, (int) (745 * d), 6.74f * s, 8.74f * a, 0.85f, 75, 93, TITANITE, false, true); - registerTinkerMaterial("Bysmuid", bysmuid, bysmuidFluid, (int) (305 * d), 5.22f * s, 6.47f * a, 1.09f, -80, 197, COBALT, false, true); - registerTinkerMaterial("Ultranite", ultranite, ultraniteFluid, (int) (1016 * d), 5.72f * s, 6.76f * a, 1.02f, -120, 210, VIBRANIUM, false, true); - registerTinkerMaterial("Astrium", astrium, astriumFluid, (int) (670 * d), 5.28f * s, 9.14f * a, 0.91f, -45, 170, VIBRANIUM, false, true); - registerTinkerMaterial("Imperomite", imperomite, imperomiteFluid, (int) (770 * d), 11.60f * s, 3.57f * a, 1.05f, -38, 125, METEORITE, false, true); - registerTinkerMaterial("Dyonite", dyonite, dyoniteFluid, (int) (733 * d), 6.14f * s, 7.69f * a, 0.97f, -15, 140, TITANITE, false, true); - registerTinkerMaterial("Solarium", solarium, solariumFluid, (int) (1020 * d), 13.78f * s, 4.64f * a, 1.15f, 0, 150, ADAMANTITE, false, true); - registerTinkerMaterial("Fractoryte", fractoryte, fractoryteFluid, (int) (1071 * d), 7.65f * s, 7.75f * a, 1.15f, -250, 283, METEORITE, false, true); - registerTinkerMaterial("Aegisalt", aegisalt, aegisaltFluid, (int) (355 * d), 8.88f * s, 3.18f * a, 1.00f, 175, 125, TITANITE, false, true); - registerTinkerMaterial("Noctunyx", noctunyx, noctunyxFluid, (int) (713 * d), 10.43f * s, 3.25f * a, 0.99f, -125, 183, METEORITE, false, true); - registerTinkerMaterial("Nucleum", nucleum, nucleumFluid, (int) (503 * d), 11.30f * s, 3.22f * a, 1.05f, 100, 125, TITANITE, false, true); - registerTinkerMaterial("Seismodium", seismodium, seismodiumFluid, (int) (879 * d), 13.85f * s, 4.19f * a, 1.17f, -75, 169, VIBRANIUM, false, true); - registerTinkerMaterial("Lumixyl", lumixyl, lumixylFluid, (int) (357 * d), 4.64f * s, 5.92f * a, 1.05f, 15, 130, COBALT, false, true); - registerTinkerMaterial("Terramite", terramite, terramiteFluid, (int) (482 * d), 7.25f * s, 2.85f * a, 1.03f, 208, 150, TITANITE, false, true); - registerTinkerMaterial("Cryptogen", cryptogen, cryptogenFluid, (int) (538 * d), 5.71f * s, 6.93f * a, 0.88f, 58, 117, METEORITE, false, true); - registerTinkerMaterial("Proxideum", proxideum, proxideumFluid, (int) (597 * d), 10.55f * s, 4.21f * a, 0.99f, -60, 200, METEORITE, false, true); } } \ No newline at end of file diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java index 4c1c630..b6e5990 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java @@ -17,14 +17,11 @@ public class TAIGAConfiguration { public static final String CATEGORY_NAME_ORE_GEN = "category_ore_gen"; public static final String CATEGORY_NAME_ORE_VAL = "category_ore_val"; - public static double oreFactorGeneral; public static double speedFactorGeneral; public static double attackFactorGeneral; public static double durabilityFactorGeneral; public static double ironFactor; - public static double slagironFactor; - public static double slaggoldFactor; public static double titaniteFactor; public static double adamantiteFactor; public static double arcaniteFactor; @@ -45,9 +42,6 @@ public class TAIGAConfiguration { public static double rottengroundFactor; public static double ligniteFactor; - - public static boolean slagIronGen; - public static boolean slagGoldGen; public static boolean ironGen; private static Configuration config = null; @@ -83,7 +77,7 @@ public class TAIGAConfiguration { config.load(); } - /** + /* * Declaration of general ore generation values:
* Activation of additional ores (iron/gold)
* Ore generation chance multiplier @@ -104,9 +98,6 @@ public class TAIGAConfiguration { ironSwitch.setComment("Switch ore on/off"); ironSwitch.setLanguageKey("gui.taiga_configuration.gen_iron"); - Property oreFactorGeneralProp = config.get(CATEGORY_NAME_GENERAL, "Ore factor", RESFAC_DEFAULT_VALUE, - "General multiplier for all TAIGA ores at once", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - oreFactorGeneralProp.setLanguageKey("gui.taiga_configuration.ore_multiplier"); Property durabilityFactorGeneralProp = config.get(CATEGORY_NAME_GENERAL, "Durability factor", RESFAC_DEFAULT_VALUE, "General multiplier for all TAIGA materials", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); durabilityFactorGeneralProp.setLanguageKey("gui.taiga_configuration.durability_multiplier"); @@ -124,25 +115,18 @@ public class TAIGAConfiguration { propOrderGeneral.add(ironSwitch.getName()); propOrderGeneral.add(slagIronSwitch.getName()); propOrderGeneral.add(slagGoldSwitch.getName()); - propOrderGeneral.add(oreFactorGeneralProp.getName()); propOrderGeneral.add(durabilityFactorGeneralProp.getName()); propOrderGeneral.add(speedFactorGeneralProp.getName()); propOrderGeneral.add(attackFactorGeneralProp.getName()); config.setCategoryPropertyOrder(CATEGORY_NAME_GENERAL, propOrderGeneral); - /** + /* * Declaration of specific ore generation values:
* Generation chance multiplier */ Property ironFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Iron factor", RESFAC_DEFAULT_VALUE, "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); ironFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier"); - Property slagironFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Slagiorn factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - slagironFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier"); - Property slaggoldFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Slaggold factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - slaggoldFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier"); Property titaniteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Titanite factor", RESFAC_DEFAULT_VALUE, "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); titaniteFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier"); @@ -204,8 +188,6 @@ public class TAIGAConfiguration { List propOrderOreGen = new ArrayList(); propOrderOreGen.add(ironFactorProp.getName()); - propOrderOreGen.add(slagironFactorProp.getName()); - propOrderOreGen.add(slaggoldFactorProp.getName()); propOrderOreGen.add(ligniteFactorProp.getName()); propOrderOreGen.add(basaltFactorProp.getName()); propOrderOreGen.add(rottengroundFactorProp.getName()); @@ -233,10 +215,6 @@ public class TAIGAConfiguration { if (readFieldsFromConfig) { - oreFactorGeneral = oreFactorGeneralProp.getDouble(RESFAC_DEFAULT_VALUE); - if (oreFactorGeneral > RESFAC_MAX_VALUE || oreFactorGeneral < RESFAC_MIN_VALUE) { - oreFactorGeneral = RESFAC_DEFAULT_VALUE; - } durabilityFactorGeneral = durabilityFactorGeneralProp.getDouble(RESFAC_DEFAULT_VALUE); if (durabilityFactorGeneral > RESFAC_MAX_VALUE || durabilityFactorGeneral < RESFAC_MIN_VALUE) { durabilityFactorGeneral = RESFAC_DEFAULT_VALUE; @@ -250,20 +228,10 @@ public class TAIGAConfiguration { attackFactorGeneral = RESFAC_DEFAULT_VALUE; } ironGen = ironSwitch.getBoolean(GENERATION_DEFAULT_VALUE); - slagIronGen = slagIronSwitch.getBoolean(GENERATION_DEFAULT_VALUE); - slagGoldGen = slagGoldSwitch.getBoolean(GENERATION_DEFAULT_VALUE); ironFactor = ironFactorProp.getDouble(RESFAC_DEFAULT_VALUE); if (ironFactor > RESFAC_MAX_VALUE || ironFactor < RESFAC_MIN_VALUE) { ironFactor = RESFAC_DEFAULT_VALUE; } - slagironFactor = slagironFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (slagironFactor > RESFAC_MAX_VALUE || slagironFactor < RESFAC_MIN_VALUE) { - slagironFactor = RESFAC_DEFAULT_VALUE; - } - slaggoldFactor = slaggoldFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (slaggoldFactor > RESFAC_MAX_VALUE || slaggoldFactor < RESFAC_MIN_VALUE) { - slaggoldFactor = RESFAC_DEFAULT_VALUE; - } titaniteFactor = titaniteFactorProp.getDouble(RESFAC_DEFAULT_VALUE); if (titaniteFactor > RESFAC_MAX_VALUE || titaniteFactor < RESFAC_MIN_VALUE) { titaniteFactor = RESFAC_DEFAULT_VALUE; @@ -343,9 +311,6 @@ public class TAIGAConfiguration { } ironSwitch.set(ironGen); - slagIronSwitch.set(slagIronGen); - slagGoldSwitch.set(slagGoldGen); - oreFactorGeneralProp.set(oreFactorGeneral); durabilityFactorGeneralProp.set(durabilityFactorGeneral); speedFactorGeneralProp.set(speedFactorGeneral); attackFactorGeneralProp.set(attackFactorGeneral); diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockCobble.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockCobble.java new file mode 100644 index 0000000..f525e99 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockCobble.java @@ -0,0 +1,33 @@ +package com.sosnitzka.taiga.blocks; + +import com.sosnitzka.taiga.generic.BasicBlock; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import static slimeknights.tconstruct.TConstruct.random; + +public class BlockCobble extends BasicBlock { + + public BlockCobble(String name, Material material, float hardness, float resistance, int harvestlevel, float light, String oreDictPrefix) { + super(name, material, hardness, resistance, harvestlevel, light, oreDictPrefix); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void breakMoonRock(BlockEvent.BreakEvent e) { + if (e.getWorld().getBlockState(e.getPos()).getBlock().equals(this)) { + if (!e.getWorld().isRemote && random.nextFloat() > .9) { + e.setCanceled(true); + if (random.nextBoolean()) { + e.getWorld().setBlockState(e.getPos(), Blocks.LAVA.getDefaultState()); + } else { + e.getWorld().newExplosion(null, e.getPos().getX(), e.getPos().getY() + 1 / 16f, e.getPos().getZ(), 0.5f + random.nextFloat() * 1.5f, false, true); + } + } + } + } + +} diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java index d399a9e..ebd4d75 100644 --- a/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java @@ -3,7 +3,6 @@ package com.sosnitzka.taiga.blocks; import com.sosnitzka.taiga.generic.BasicBlock; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.Item; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; @@ -12,8 +11,6 @@ import net.minecraft.world.World; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Random; -import static com.sosnitzka.taiga.Items.lignite; - public class BlockLignite extends BasicBlock { public BlockLignite() { @@ -34,9 +31,4 @@ public class BlockLignite extends BasicBlock { public int quantityDropped(IBlockState state, int fortune, Random random) { return random.nextInt(3) + 1 + fortune; } - - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return lignite; - } } diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockMetal.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockMetal.java new file mode 100644 index 0000000..1aa4017 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockMetal.java @@ -0,0 +1,70 @@ +package com.sosnitzka.taiga.blocks; + +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IStringSerializable; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import slimeknights.mantle.block.EnumBlock; + +import javax.annotation.Nonnull; +import java.util.List; +import java.util.Locale; + +public class BlockMetal extends EnumBlock { + + public static final PropertyEnum TYPE = PropertyEnum.create("type", MetalTypes.class); + + public BlockMetal() { + super(Material.IRON, TYPE, MetalTypes.class); + } + + @SideOnly(Side.CLIENT) + @Override + public void getSubBlocks(@Nonnull Item itemIn, CreativeTabs tab, List list) { + for (MetalTypes type : MetalTypes.values()) { + list.add(new ItemStack(this, 1, type.getMeta())); + } + } + + public enum MetalTypes implements IStringSerializable, EnumBlock.IEnumMeta { + TIBERIUM, + AURODIUM, + PROMETHEUM, + ARCANITE, + TITANITE, + MYTHRIL, + URU, + VIBRANIUM, + ETERNITE, + FRACTORYTE, + PALLADIUM, + IGNITITE, + BISMUTH, + JAUXITE, + VIOLIUM, + KARMESINE; + + public final int meta; + + MetalTypes() { + meta = ordinal(); + } + + @Override + public String getName() { + return this.toString().toLowerCase(Locale.US); + } + + @Override + public int getMeta() { + return meta; + } + + } + + +} diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockMeteoriteRock.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockMeteoriteRock.java new file mode 100644 index 0000000..d87794b --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockMeteoriteRock.java @@ -0,0 +1,33 @@ +package com.sosnitzka.taiga.blocks; + +import com.sosnitzka.taiga.generic.BasicBlock; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import static slimeknights.tconstruct.TConstruct.random; + +public class BlockMeteoriteRock extends BasicBlock { + + private IBlockState cobbblestate; + + public BlockMeteoriteRock(String name, Material material, float hardness, float resistance, int harvestlevel, float light, String oreDictPrefix, IBlockState cobble) { + super(name, material, hardness, resistance, harvestlevel, light, oreDictPrefix); + MinecraftForge.EVENT_BUS.register(this); + this.cobbblestate = cobble; + } + + @SubscribeEvent + public void breakMoonRock(BlockEvent.BreakEvent e) { + if (e.getWorld().getBlockState(e.getPos()).getBlock().equals(this)) { + if (!e.getWorld().isRemote && random.nextFloat() > .25) { + e.setCanceled(true); + e.getWorld().setBlockState(e.getPos(), cobbblestate); + } + } + + } + +} diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockOre.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockOre.java new file mode 100644 index 0000000..e0ad9f6 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockOre.java @@ -0,0 +1,68 @@ +package com.sosnitzka.taiga.blocks; + +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.IStringSerializable; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import slimeknights.mantle.block.EnumBlock; + +import javax.annotation.Nonnull; +import java.util.Locale; + +public class BlockOre extends EnumBlock { + + public static final PropertyEnum TYPE = PropertyEnum.create("type", OreTypes.class); + + public BlockOre() { + this(Material.ROCK); + } + + public BlockOre(Material material) { + super(material, TYPE, OreTypes.class); + } + + @Nonnull + @Override + @SideOnly(Side.CLIENT) + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT_MIPPED; + } + + public enum OreTypes implements IStringSerializable, EnumBlock.IEnumMeta { + TIBERIUM, + AURODIUM, + PROMETHEUM, + ARCANITE, + TITANITE, + MYTHRIL, + URU, + VIBRANIUM, + ETERNITE, + FRACTORYTE, + PALLADIUM, + IGNITITE, + BISMUTH, + JAUXITE, + VIOLIUM, + KARMESINE; + + public final int meta; + + OreTypes() { + meta = ordinal(); + } + + @Override + public String getName() { + return this.toString().toLowerCase(Locale.US); + } + + @Override + public int getMeta() { + return meta; + } + } + +} diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java index 977e65a..c3167a0 100644 --- a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java @@ -4,9 +4,9 @@ import com.sosnitzka.taiga.Items; import com.sosnitzka.taiga.generic.BasicBlock; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -16,12 +16,12 @@ import java.util.Random; import static com.sosnitzka.taiga.util.Utils.PREFIX_ORE; import static slimeknights.tconstruct.TConstruct.random; -import static slimeknights.tconstruct.library.utils.HarvestLevels.OBSIDIAN; +import static slimeknights.tconstruct.library.utils.HarvestLevels.STONE; public class BlockTiberium extends BasicBlock { public BlockTiberium() { - super("tiberium_ore", Material.ROCK, 15.0f, 2.0f, OBSIDIAN, 1.0F, PREFIX_ORE); + super("tiberium_ore", Material.ROCK, 15.0f, 2.0f, STONE, 1.0F, PREFIX_ORE); } @Override @@ -39,23 +39,23 @@ public class BlockTiberium extends BasicBlock { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Items.tiberiumShardInstable; + return Items.tiberiumDust; } @Override public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) { if (!worldIn.isRemote) { - if (MathHelper.getRandomIntegerInRange(random, 1, 15) > 10) { - worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1.6f, true, true); + if (random.nextFloat() < 0.5) { + worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), random.nextFloat() * 2f + 1.5f, true, true); } } } @Override - public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state) { - if (MathHelper.getRandomIntegerInRange(random, 1, 30) < 3) { + public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) { + if (random.nextFloat() < 0.1) { if (!worldIn.isRemote) { - worldIn.newExplosion(null, pos.getX(), pos.getY() + 1 / 16f, pos.getZ(), 1.1f, true, true); + worldIn.newExplosion(null, pos.getX(), pos.getY() + 1 / 16f, pos.getZ(), 1.5f, true, true); } } } diff --git a/src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java b/src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java index c32f54d..57c4924 100644 --- a/src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java +++ b/src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java @@ -11,7 +11,7 @@ public class BasicTinkerFluid extends FluidMolten { private boolean toolForge; - public BasicTinkerFluid(String fluidName, int color, boolean toolForge, int temp, int lumen, int visk) { + public BasicTinkerFluid(String fluidName, int color, int temp, int lumen, int visk) { // Constructs the FluidMolten with textures and color super(fluidName, color, new ResourceLocation("tconstruct:blocks/fluids/molten_metal"), new ResourceLocation("tconstruct:blocks/fluids/molten_metal_flow")); //Settings @@ -20,9 +20,10 @@ public class BasicTinkerFluid extends FluidMolten { this.setLuminosity(lumen); this.setViscosity(visk); this.setDensity(2000); - this.toolForge = toolForge; + this.toolForge = true; } + public boolean isToolForge() { return toolForge; } diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java index 5b512b8..8c024b5 100644 --- a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java +++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java @@ -23,8 +23,10 @@ import slimeknights.tconstruct.library.materials.Material; import javax.annotation.Nonnull; import java.lang.reflect.Field; +import static com.sosnitzka.taiga.Fluids.*; import static com.sosnitzka.taiga.MaterialTraits.*; +@SuppressWarnings("unused") public class ClientProxy extends CommonProxy { private static void registerBlockModel(Block block) { @@ -65,33 +67,34 @@ public class ClientProxy extends CommonProxy { } public void setRenderInfo(final Material material) { - - if (material.equals(adamantite)) specialRender(material, 0xd55cdf, 0.5f, 0.6f, 0.2f); - else if (material.equals(solarium)) specialRender(material, 0xFFDD11, 0.7f, 0.3f, 0.1f); - else if (material.equals(proxideum)) specialRender(material, 0x2d8f8b, 0.4f, 0.3f, 0.1f); - else if (material.equals(meteorite)) specialRender(material, 0xaaaaaa, 0.6f, 0.8f, 0.0f); - else if (material.equals(tiberium)) specialRender(material, 0x33ff33, 0.5f, 0.2f, 0.1f); - else if (material.equals(bismuth)) specialRender(material, 0xffffff, 0.3f, 0.0f, 0.0f); - else if (material.equals(bysmuid)) specialRender(material, 0xccccee, 0.6f, 0.2f, 0.0f); - else if (material.equals(imperomite)) specialRender(material, 0x8decaf, 0.8f, 0.5f, -0.0f); - else if (material.equals(noctunyx)) specialRender(material, 0xce70e8, 0.5f, 0.2f, 0.3f); - else if (material.equals(nucleum)) specialRender(material, 0xd9f446, 1.0f, 0.4f, 0.3f); - else if (material.equals(dyonite)) specialRender(material, 0xffe240, 0.6f, 1.0f, 0.2f); - else if (material.equals(arcanite)) specialRender(material, 0x5e5499, 0.6f, 0.8f, 0.2f); + if (material.equals(adamant)) metalRender(material, adamantFluid.getColor(), 1f, 0.8f, 0f); + else if (material.equals(duranite)) metalRender(material, duraniteFluid.getColor(), .4f, .4f, 0); + else if (material.equals(tiberium)) metalRender(material, tiberiumFluid.getColor(), 1f, .3f, 0f); + else if (material.equals(palladium)) metalRender(material, palladiumFluid.getColor(), .7f, .6f, 0f); + else if (material.equals(osram)) metalRender(material, osramFluid.getColor(), .7f, .6f, 0f); + else if (material.equals(tritonite)) metalRender(material, tritoniteFluid.getColor(), .3f, .3f, 0f); + else if (material.equals(nucleum)) metalRender(material, nucleumFluid.getColor(), .4f, .6f, .2f); + else if (material.equals(triberium)) metalRender(material, triberiumFluid.getColor(), 2f, 2f, 0.5f); + else if (material.equals(solarium)) metalRender(material, solariumFluid.getColor(), 1.5f, 1.5f, 0.5f); + else if (material.equals(uru)) metalRender(material, uruFluid.getColor(), 1.0f, 1.0f, 0.3f); + else if (material.equals(imperomite)) metalRender(material, imperomiteFluid.getColor(), 0.4f, 1.0f, 0.7f); + else if (material.equals(vibranium)) metalRender(material, vibraniumFluid.getColor(), 0.6f, .8f, 1f); + else if (material.equals(valyrium)) metalRender(material, valyriumFluid.getColor(), .8f, 1.5f, -0.1f); else { - material.setRenderInfo(new MaterialRenderInfo.BlockTexture("taiga:blocks/" + material.getIdentifier() + "_block")); + material.setRenderInfo(new MaterialRenderInfo.BlockTexture("taiga:blocks/block/" + material.getIdentifier())); } } - private void specialRender(final Material material, final int f, final float shine, final float brightness, final float hueshift) { + private void metalRender(final Material material, final int f, final float shine, final float brightness, final float hueshift) { material.setRenderInfo(new MaterialRenderInfo.AbstractMaterialRenderInfo() { @Override public TextureAtlasSprite getTexture(TextureAtlasSprite baseTexture, String location) { - return new MetalTextureTexture("taiga:blocks/materials/" + material.getIdentifier(), baseTexture, location, f, shine, brightness, hueshift); + return new MetalTextureTexture("taiga:materials/" + material.getIdentifier(), baseTexture, location, f, shine, brightness, hueshift); } }); } + @Override public void registerFluidModels(Fluid fluid) { if (fluid == null) { diff --git a/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java index c3b2e64..c340408 100644 --- a/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java +++ b/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java @@ -2,6 +2,7 @@ package com.sosnitzka.taiga.proxy; import com.sosnitzka.taiga.TAIGAConfiguration; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import slimeknights.tconstruct.library.materials.Material; public class CommonProxy { @@ -20,4 +21,7 @@ public class CommonProxy { public void initConfig() { TAIGAConfiguration.preInit(); } + + public void registerServerCommands(FMLServerStartingEvent e) { + } } diff --git a/src/main/java/com/sosnitzka/taiga/recipes/CraftingRegistry.java b/src/main/java/com/sosnitzka/taiga/recipes/CraftingRegistry.java index 72d4fe2..ed366d9 100644 --- a/src/main/java/com/sosnitzka/taiga/recipes/CraftingRegistry.java +++ b/src/main/java/com/sosnitzka/taiga/recipes/CraftingRegistry.java @@ -1,76 +1,7 @@ package com.sosnitzka.taiga.recipes; - -import net.minecraft.block.Block; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.ShapedOreRecipe; - -import static com.sosnitzka.taiga.Blocks.*; -import static com.sosnitzka.taiga.Items.*; -import static slimeknights.tconstruct.shared.TinkerCommons.matNecroticBone; - public class CraftingRegistry { public static void register() { - GameRegistry.addShapelessRecipe(new ItemStack(fuel_brick), Items.COAL, Items.COAL, Items.COAL, lignite, lignite, lignite); - GameRegistry.addShapelessRecipe(new ItemStack(luminar_dust), Items.REDSTONE, Items.GLOWSTONE_DUST); - GameRegistry.addShapelessRecipe(new ItemStack(glimmerstone_dust), luminar_dust, Items.BLAZE_POWDER); - GameRegistry.addShapelessRecipe(new ItemStack(glimmerstone_dust), Items.REDSTONE, Items.GLOWSTONE_DUST, Items.BLAZE_POWDER); - - GameRegistry.addShapelessRecipe(new ItemStack(glimmercoal), Items.COAL, glimmerstone_dust); - GameRegistry.addShapelessRecipe(new ItemStack(glimmercoal), lignite, glimmerstone_dust); - - GameRegistry.addShapelessRecipe(new ItemStack(radiant_pearl), Items.ENDER_PEARL, luminar_dust, new ItemStack(Items.DYE, 1, 4)); - GameRegistry.addShapelessRecipe(new ItemStack(glimmer_pearl), Items.ENDER_PEARL, glimmerstone_dust); - GameRegistry.addShapelessRecipe(new ItemStack(energy_pearl), Items.ENDER_PEARL, luminar_dust, Items.GUNPOWDER); - - GameRegistry.addShapelessRecipe(new ItemStack(nitro_brick), fuel_brick, Items.GUNPOWDER, Items.BLAZE_POWDER); - GameRegistry.addShapelessRecipe(new ItemStack(anthracite_dust), matNecroticBone, Items.COAL, Items.GUNPOWDER); - GameRegistry.addShapelessRecipe(new ItemStack(spectrum_dust), matNecroticBone, glimmerstone_dust); - - registerMetalRecipes(arcaniteIngot, arcanite_nugget, arcaniteBlock); - registerMetalRecipes(tiberiumIngot, tiberium_nugget, tiberiumBlock); - registerMetalRecipes(prometheumIngot, prometheum_nugget, prometheumBlock); - registerMetalRecipes(rubiumIngot, rubium_nugget, rubiumBlock); - registerMetalRecipes(violiumIngot, violium_nugget, violiumBlock); - registerMetalRecipes(bismuthIngot, bismuth_nugget, bismuthBlock); - registerMetalRecipes(karmesineIngot, karmesine_nugget, karmesineBlock); - registerMetalRecipes(mindoriteIngot, mindorite_nugget, mindoriteBlock); - registerMetalRecipes(titaniteIngot, titanite_nugget, titaniteBlock); - registerMetalRecipes(meteoriteIngot, meteorite_nugget, meteoriteBlock); - registerMetalRecipes(adamantiteIngot, adamantite_nugget, adamantiteBlock); - registerMetalRecipes(vibraniumIngot, vibranium_nugget, vibraniumBlock); - registerMetalRecipes(ignititeIngot, ignitite_nugget, ignititeBlock); - registerMetalRecipes(palladiumIngot, palladium_nugget, palladiumBlock); - registerMetalRecipes(eterniteIngot, eternite_nugget, eterniteBlock); - registerMetalRecipes(mythrilIngot, mythril_nugget, mythrilBlock); - registerMetalRecipes(imperomiteIngot, imperomite_nugget, imperomiteBlock); - registerMetalRecipes(fractoryteIngot, fractoryte_nugget, fractoryteBlock); - registerMetalRecipes(noctunyxIngot, noctunyx_nugget, noctunyxBlock); - registerMetalRecipes(nitroniteIngot, nitronite_nugget, nitroniteBlock); - registerMetalRecipes(cryptogenIngot, cryptogen_nugget, cryptogenBlock); - registerMetalRecipes(seismodiumIngot, seismodium_nugget, seismodiumBlock); - registerMetalRecipes(aegisaltIngot, aegisalt_nugget, aegisaltBlock); - registerMetalRecipes(ultraniteIngot, ultranite_nugget, ultraniteBlock); - registerMetalRecipes(bysmuidIngot, bysmuid_nugget, bysmuidBlock); - registerMetalRecipes(nucleumIngot, nucleum_nugget, nucleumBlock); - registerMetalRecipes(lumixylIngot, lumixyl_nugget, lumixylBlock); - registerMetalRecipes(dyoniteIngot, dyonite_nugget, dyoniteBlock); - registerMetalRecipes(terramiteIngot, terramite_nugget, terramiteBlock); - registerMetalRecipes(solariumIngot, solarium_nugget, solariumBlock); - registerMetalRecipes(astriumIngot, astrium_nugget, astriumBlock); - registerMetalRecipes(proxideumIngot, proxideum_nugget, proxideumBlock); - } - - private static void registerMetalRecipes(Item ingot, Item nugget, Block block) { - - GameRegistry.addShapelessRecipe(new ItemStack(nugget, 9), new ItemStack(ingot)); - GameRegistry.addShapelessRecipe(new ItemStack(ingot, 9), new ItemStack(block)); - - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(block), "###", "###", "###", '#', new ItemStack(ingot))); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ingot), "###", "###", "###", '#', new ItemStack(nugget))); } } diff --git a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java index f1a0ef0..70eb7cb 100644 --- a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java +++ b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java @@ -1,22 +1,13 @@ package com.sosnitzka.taiga.recipes; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import static com.sosnitzka.taiga.Blocks.*; -import static com.sosnitzka.taiga.Items.*; - public class SmeltingRegistry { public static void register() { - GameRegistry.addSmelting(slagironOre, new ItemStack(slagironIngot), 1.0F); ItemStack nugget_iron = OreDictionary.getOres("nuggetIron").get(OreDictionary.getOres("nuggetIron").size() - 1); - GameRegistry.addSmelting(slagironIngot, nugget_iron, 0); - GameRegistry.addSmelting(slaggoldIngot, new ItemStack(Items.GOLD_NUGGET), 0); - GameRegistry.addSmelting(slaggoldOre, new ItemStack(slaggoldIngot), 1.0F); - GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardInstable, 6), (2F)); - GameRegistry.addSmelting(tiberiumShardInstable, new ItemStack(tiberiumIngot), (.1F)); + //GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardInstable, 6), (1F)); + //GameRegistry.addSmelting(tiberiumShardInstable, new ItemStack(tiberiumIngot), (.1F)); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java index a9e6d77..283c431 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java @@ -43,7 +43,7 @@ public class TraitAnalysing extends AbstractTrait { @SubscribeEvent public void onMobDrops(LivingDropsEvent event) { World w = event.getEntity().getEntityWorld(); - if (event.getSource().getEntity() instanceof EntityPlayer) { + if (random.nextFloat() < .1f && event.getSource().getEntity() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); if (!w.isRemote && event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { event.getDrops().clear(); @@ -52,13 +52,13 @@ public class TraitAnalysing extends AbstractTrait { } private int getUpdateXP(int xp) { - float exp = random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + 18) * 50; + float exp = random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + random.nextInt(xp) * (1 + random.nextFloat())); return Math.round(exp); } @Override public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) { - if (random.nextFloat() < 0.85) { + if (random.nextFloat() < 0.1) { event.getDrops().clear(); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java b/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java index c61cc28..3009b67 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java @@ -1,12 +1,19 @@ package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; import static com.sosnitzka.taiga.util.Utils.isNight; @@ -15,21 +22,36 @@ public class TraitArcane extends AbstractTrait { public TraitArcane() { super("arcane", TextFormatting.DARK_PURPLE); + MinecraftForge.EVENT_BUS.register(this); } @Override public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { int time = (int) world.getWorldTime(); - if (random.nextFloat() <= 0.1 && isNight(time)) { - ToolHelper.healTool(tool, random.nextInt(15) + 1, null); + if (random.nextFloat() <= 0.05 && isNight(time)) { + ToolHelper.healTool(tool, random.nextInt(8) + 1, null); } } @Override public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { int time = (int) player.getEntityWorld().getWorldTime(); - if (random.nextFloat() <= 0.1 && isNight(time)) { - ToolHelper.healTool(tool, random.nextInt(15) + 1, null); + if (random.nextFloat() <= 0.05 && isNight(time)) { + ToolHelper.healTool(tool, random.nextInt(8) + 1, null); + } + } + + + @SubscribeEvent + public void onEntityKill(LivingDeathEvent e) { + World w = e.getEntity().getEntityWorld(); + if (!w.isRemote && e.getSource().getEntity() != null) { + if (e.getSource().getEntity() instanceof EntityPlayer && e.getEntity() instanceof EntityCreature) { + ItemStack tool = ((EntityPlayer) e.getSource().getEntity()).getHeldItemMainhand(); + if (isNight((int) w.getWorldTime()) && random.nextFloat() < 0.1 && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + ToolHelper.healTool(tool, random.nextInt(16), null); + } + } } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java index f061387..62a41bc 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java @@ -21,7 +21,7 @@ public class TraitBlind extends AbstractTrait { @Override public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { int time = (int) world.getWorldTime(); - if (random.nextFloat() <= 0.05 || (random.nextFloat() <= 0.1 && isNight(time))) { + if (random.nextFloat() <= 0.01 || (random.nextFloat() <= 0.03 && isNight(time))) { if (random.nextBoolean()) player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, random.nextInt(200) + 100)); else @@ -32,7 +32,7 @@ public class TraitBlind extends AbstractTrait { @Override public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { int time = (int) player.getEntityWorld().getWorldTime(); - if (random.nextFloat() <= 0.05 || (random.nextFloat() <= 0.1 && isNight(time))) { + if (random.nextFloat() <= 0.01 || (random.nextFloat() <= 0.03 && isNight(time))) { if (random.nextBoolean()) player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, random.nextInt(400) + 200)); else diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java index 1182c90..2db80a5 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java @@ -1,22 +1,22 @@ package com.sosnitzka.taiga.traits; -import net.minecraft.entity.Entity; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import slimeknights.tconstruct.library.traits.AbstractTrait; -import slimeknights.tconstruct.library.utils.TagUtil; -import slimeknights.tconstruct.library.utils.TinkerUtil; import static com.sosnitzka.taiga.util.Utils.isNight; +import static net.minecraft.init.MobEffects.GLOWING; public class TraitBright extends AbstractTrait { + private static final float chance = 0.90f; + public TraitBright() { super("bright", TextFormatting.DARK_GRAY); } @@ -25,19 +25,16 @@ public class TraitBright extends AbstractTrait { public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { int time = (int) target.getEntityWorld().getWorldTime(); if (!isNight(time)) { - newDamage += damage / 2f; - } + newDamage = damage * (1 + random.nextFloat() / 2f); + } else newDamage = damage / (1 + random.nextFloat() / 3f); return super.damage(tool, player, target, damage, newDamage, isCritical); - } + @Override - public void onUpdate(ItemStack item, World world, Entity entity, int i, boolean b) { - if (entity instanceof EntityPlayer) { - EntityPlayer e = (EntityPlayer) entity; - if (TinkerUtil.hasTrait(TagUtil.getTagSafe(e.getHeldItemMainhand()), identifier)) { - e.addPotionEffect(new PotionEffect(MobEffects.GLOWING, 100)); - } + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + if (random.nextFloat() >= chance) { + player.addPotionEffect(new PotionEffect(GLOWING, 200)); } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java index 72f2e0b..02403d7 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java @@ -36,7 +36,7 @@ public class TraitCascade extends AbstractTrait { sx = x = nextBlock.getX(); sy = y = nextBlock.getY(); sz = z = nextBlock.getZ(); - ToolHelper.damageTool(tool, random.nextInt(2), player); + ToolHelper.damageTool(tool, 1, player); } else { x = sx; y = sy; diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java new file mode 100644 index 0000000..ae64b52 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java @@ -0,0 +1,113 @@ +package com.sosnitzka.taiga.traits; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.init.SoundEvents; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; +import slimeknights.tconstruct.library.utils.ToolHelper; + + +public class TraitCatcher extends AbstractTrait { + + public static int chance = 1; + public static float costMulti = 0.25f; + + public TraitCatcher() { + super(TraitCatcher.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED); + MinecraftForge.EVENT_BUS.register(this); + } + + @Override + public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean isCritical) { + World w = player.worldObj; + if (!w.isRemote && random.nextInt((int) target.getMaxHealth()) <= chance && target instanceof EntityLiving) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Data data = Data.read(tag); + if (data.mobClass.isEmpty()) { + data.mobClass = target.getClass().getName(); + data.mobName = target.getName(); + data.write(tag); + TagUtil.setEnchantEffect(tool, true); + TagUtil.setExtraTag(tool, tag); + player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + target.setDropItemsWhenDead(false); + target.setDead(); + } + } + } + + @SubscribeEvent + public void onRightClickItem(PlayerInteractEvent.RightClickItem event) { + World w = event.getWorld(); + BlockPos pos = event.getEntityPlayer().getPosition(); + ItemStack tool = event.getEntityPlayer().getHeldItemMainhand(); + if (!w.isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Data data = Data.read(tag); + if (!data.mobClass.isEmpty()) { + Entity ent = null; + try { + ent = (Entity) Class.forName(data.mobClass).getConstructor(World.class).newInstance(w); + } catch (Exception e) { + System.out.println(e.toString()); + } + + if (ent != null) { + ent.setPosition(pos.getX(), pos.getY(), pos.getZ()); // TODO: set to player view target + w.spawnEntityInWorld(ent); + event.getEntityPlayer().playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + data.mobClass = ""; + data.mobName = ""; + data.write(tag); + TagUtil.setExtraTag(tool, tag); + TagUtil.setEnchantEffect(tool, false); + ToolHelper.damageTool(tool, random.nextInt((int) (ToolHelper.getCurrentDurability(tool) * costMulti)), event.getEntityPlayer()); + } + } + } + } + + + @SubscribeEvent + public void onItemTooltip(ItemTooltipEvent e) { + ItemStack tool = e.getItemStack(); + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Data data = Data.read(tag); + if (!data.mobClass.isEmpty()) + e.getToolTip().add(TextFormatting.DARK_PURPLE + "Captured: " + TextFormatting.LIGHT_PURPLE + data.mobName); + } + } + + public static class Data { + String mobClass; + String mobName; + + public static Data read(NBTTagCompound tag) { + Data data = new Data(); + data.mobName = tag.getString("mobName"); + data.mobClass = tag.getString("mobClass"); + return data; + } + + public void write(NBTTagCompound tag) { + tag.setString("mobClass", mobClass); + tag.setString("mobName", mobName); + } + } +} + + + diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java new file mode 100644 index 0000000..fed3c36 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java @@ -0,0 +1,78 @@ +package com.sosnitzka.taiga.traits; + +import com.sosnitzka.taiga.util.Utils; +import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; + + +public class TraitCongenial extends AbstractTrait { + + + public TraitCongenial() { + super(TraitCongenial.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onEntityKill(LivingDeathEvent e) { + if (e.getSource().getEntity() instanceof EntityPlayer && !e.getSource().getEntity().worldObj.isRemote && e.getEntity() instanceof EntityCreature) { + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getEntity()).getHeldItemMainhand()), identifier)) { + ItemStack tool = ((EntityPlayer) e.getSource().getEntity()).getHeldItemMainhand(); + String name = e.getEntity().getName(); + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + if (!data.name.isEmpty()) { + return; + } + data.name = name; + data.write(tag); + assert tool != null; + TagUtil.setExtraTag(tool, tag); + } + } + } + + @Override + public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { + World w = player.getEntityWorld(); + if (!w.isRemote) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + if (data.name.isEmpty()) { + return damage; + } + if (!data.name.equals(target.getName())) { + return damage / (random.nextInt(5) + 5); + } + float x = (1 + random.nextFloat() * 9); + return damage * x; + } + return damage; + } + + @SubscribeEvent + public void onItemTooltip(ItemTooltipEvent e) { + ItemStack tool = e.getItemStack(); + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + if (data.name.isEmpty()) e.getToolTip().add(TextFormatting.LIGHT_PURPLE + "Unbound"); + else { + e.getToolTip().add(TextFormatting.DARK_PURPLE + "Bound to: " + TextFormatting.LIGHT_PURPLE + data.name); + } + } + } + +} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java new file mode 100644 index 0000000..297eb9f --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java @@ -0,0 +1,58 @@ +package com.sosnitzka.taiga.traits; + +import com.sosnitzka.taiga.util.Utils; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; + + +public class TraitCursed extends AbstractTrait { + + private static int chance = 60 * 1000; + + public TraitCursed() { + super(TraitCursed.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED); + MinecraftForge.EVENT_BUS.register(this); + } + + @Override + public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) { + + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + if (random.nextInt((chance + data.curse) / (data.curse + 1)) == 1) { + if (isSelected) data.curse += 10; + else data.curse++; + entity.attackEntityFrom(new DamageSource("Curse"), random.nextFloat() * ((EntityPlayer) entity).getHealth() / 2); + } + + data.write(tag); + TagUtil.setExtraTag(tool, tag); + + + } + + @SubscribeEvent + public void onItemTooltip(ItemTooltipEvent e) { + ItemStack tool = e.getItemStack(); + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + if (data.curse != 0) { + e.getToolTip().add(TextFormatting.DARK_PURPLE + "Curse: " + TextFormatting.WHITE + data.curse); + } + } + } + + +} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java index 521eb0a..eebd275 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java @@ -1,5 +1,7 @@ package com.sosnitzka.taiga.traits; +import com.google.common.collect.Lists; +import com.sosnitzka.taiga.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -10,76 +12,74 @@ import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; +import java.util.List; + public class TraitCurvature extends AbstractTrait { + public static int chance = 5; + public static int distance = 10; + public TraitCurvature() { - super("curvature", TextFormatting.BLACK); + super("curvature", TextFormatting.DARK_PURPLE); MinecraftForge.EVENT_BUS.register(this); } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { - if (player.worldObj.isRemote) { - return; - } - if (random.nextFloat() <= 0.01 && world.provider.getDimension() != -1) { - teleport(player, world); - player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) { + if (!event.getWorld().isRemote && random.nextFloat() < 0.05) { + List blockstates = Lists.newArrayList(Blocks.STONE.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), Blocks.END_STONE.getDefaultState(), Blocks.AIR.getDefaultState(), Blocks.DIRT.getDefaultState()); + IBlockState mainstate = event.getState(); + if (blockstates.contains(mainstate)) return; + for (int i = 0; i < chance; i++) { + int x = event.getPos().getX() + Utils.nextInt(random, -distance, distance); + int y = event.getPos().getY() + Utils.nextInt(random, -distance, distance); + int z = event.getPos().getZ() + Utils.nextInt(random, -distance, distance); + BlockPos cPos = new BlockPos(x, y, z); + IBlockState state = event.getWorld().getBlockState(cPos); + if (blockstates.contains(state)) { + event.getDrops().clear(); + event.getWorld().setBlockState(cPos, mainstate); + event.getHarvester().playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + event.getHarvester().addChatComponentMessage(new TextComponentString("Teleported to: " + x + " " + y + " " + z)); + return; + } + + } + } } - @Override public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { - if (random.nextFloat() <= 0.3) { + if (random.nextFloat() <= 0.15) { target.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); changePos(player, target); } } - @SubscribeEvent public void onMobDrops(LivingDropsEvent event) { World w = event.getEntity().getEntityWorld(); if (!w.isRemote && event.getSource().getEntity() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { - ItemStack i = new ItemStack(Items.ENDER_PEARL, random.nextInt(3)); + ItemStack i = new ItemStack(Items.ENDER_PEARL, random.nextInt(2)); event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, i)); } } } - private void teleport(EntityLivingBase e, World w) { - int x = e.getPosition().getX() + random.nextInt(250) - 125; - int y = e.getPosition().getY(); - int z = e.getPosition().getZ() + random.nextInt(250) - 125; - - // TODO: Make this a proper search for top block (if there is one) - while (w.getBlockState(new BlockPos(x, y, z)).getBlock() != Blocks.AIR) { - y++; - } - while (w.getBlockState(new BlockPos(x, y - 1, z)).getBlock() == Blocks.AIR) { - if (y <= 0) { - y = 1; - break; - } - - y--; - } - - e.setPosition(x, y, z); - } - private void changePos(EntityLivingBase player, EntityLivingBase target) { BlockPos pp = new BlockPos(player.getPosition()); BlockPos tp = new BlockPos(target.getPosition()); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java index f665d49..87d0741 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java @@ -18,9 +18,8 @@ public class TraitDark extends AbstractTrait { public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { int time = (int) target.getEntityWorld().getWorldTime(); if (isNight(time)) { - newDamage += damage / 2f; - } + newDamage = damage * (1 + random.nextFloat() / 2f); + } else newDamage = damage / (1 + random.nextFloat() / 3f); return super.damage(tool, player, target, damage, newDamage, isCritical); - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java new file mode 100644 index 0000000..3109dca --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java @@ -0,0 +1,115 @@ +package com.sosnitzka.taiga.traits; + +import com.google.common.collect.ImmutableList; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.util.FakePlayer; +import slimeknights.tconstruct.library.materials.HeadMaterialStats; +import slimeknights.tconstruct.library.tools.ToolNBT; +import slimeknights.tconstruct.library.utils.TagUtil; + +import java.util.List; + +/** + * Gives the tool bonus stats on crafting. + * The bonus stats are distributed over time and are more or less random. + * The stats that will be rewarded are already designated on the first time the tool is crafted + */ +public class TraitDecay extends TraitProgressiveStats { + + protected static int TICK_PER_STAT = 24; + protected static int DURABILITY_STEP = 10; + protected static float SPEED_STEP = 0.05f; + protected static float ATTACK_STEP = 0.05f; + + public TraitDecay() { + super("decay", TextFormatting.GREEN); + } + + @Override + public void applyEffect(NBTTagCompound rootCompound, NBTTagCompound modifierTag) { + // check if we have stats already distributed, and if not add them + if (!hasPool(rootCompound)) { + // ok, we need new stats. Let the fun begin! + StatNBT data = new StatNBT(); + + int statPoints = 800; // we distribute a whopping X points worth of stats! + for (; statPoints > 0; statPoints--) { + switch (random.nextInt(3)) { + // durability + case 0: + data.durability += DURABILITY_STEP; + break; + // speed + case 1: + data.speed += SPEED_STEP; + break; + // attack + case 2: + data.attack += ATTACK_STEP; + break; + } + } + + setPool(rootCompound, data); + } + + super.applyEffect(rootCompound, modifierTag); + } + + @Override + public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) { + if (entity instanceof FakePlayer || entity.worldObj.isRemote) { + return; + } + // every 3.6 seconds we distribute one stat. This means 1h = 1000 applications + if (entity.ticksExisted % TICK_PER_STAT > 0) { + return; + } + + // we don't update if the player is currently breaking a block because that'd reset it + if (playerIsBreakingBlock(entity)) { + return; + } + + NBTTagCompound root = TagUtil.getTagSafe(tool); + StatNBT distributed = getBonus(root); + ToolNBT data = TagUtil.getToolStats(tool); + + // attack + if (entity.ticksExisted % (TICK_PER_STAT * 3) == 0) { + float A = ATTACK_STEP * random.nextFloat(); + data.attack -= A; + distributed.attack -= A; + } + // speed + else if (entity.ticksExisted % (TICK_PER_STAT * 2) == 0) { + float S = SPEED_STEP * random.nextFloat(); + data.speed -= S; + distributed.speed -= S; + } + // durability + else { + int D = random.nextInt(DURABILITY_STEP) + 1; + data.durability -= D; + distributed.durability -= D; + } + + // update tool stats + TagUtil.setToolTag(root, data.get()); + // update statistics on distributed stats + setBonus(root, distributed); + } + + @Override + public List getExtraInfo(ItemStack tool, NBTTagCompound modifierTag) { + StatNBT pool = getBonus(TagUtil.getTagSafe(tool)); + + return ImmutableList.of(HeadMaterialStats.formatDurability(pool.durability), + HeadMaterialStats.formatMiningSpeed(pool.speed), + HeadMaterialStats.formatAttack(pool.attack)); + } +} \ No newline at end of file diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java index bf5fd42..25fddc6 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java @@ -1,13 +1,12 @@ package com.sosnitzka.taiga.traits; -import net.minecraft.entity.monster.EntityMob; +import net.minecraft.entity.EntityCreature; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.event.entity.living.LivingExperienceDropEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import slimeknights.tconstruct.library.traits.AbstractTrait; @@ -21,20 +20,11 @@ public class TraitDiffuse extends AbstractTrait { MinecraftForge.EVENT_BUS.register(this); } - @SubscribeEvent - public void onXpDrop(LivingExperienceDropEvent event) { - EntityPlayer player = event.getAttackingPlayer(); - if (!event.getEntity().getEntityWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { - event.setDroppedExperience(0); - } - - } - @SubscribeEvent public void onBlockBreak(BlockEvent.BreakEvent event) { EntityPlayer player = event.getPlayer(); if (!player.getEntityWorld().isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { - event.setExpToDrop(this.getUpdateXP(event.getExpToDrop())); + event.setExpToDrop((int) this.getUpdateXP(event.getExpToDrop())); } } @@ -43,22 +33,22 @@ public class TraitDiffuse extends AbstractTrait { World w = event.getEntity().getEntityWorld(); if (!w.isRemote && event.getSource().getEntity() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); - if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { + if (event.getEntity() instanceof EntityCreature && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { event.getDrops().clear(); } } } - private int getUpdateXP(int xp) { - float exp = random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + random.nextInt(10)); - if (random.nextBoolean()) - return Math.round(exp); + private float getUpdateXP(int xp) { + float exp = random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + random.nextFloat() * xp); + if (random.nextFloat() <= 0.25) + return exp; else return 0; } @Override public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) { - if (random.nextFloat() < 0.75) { + if (random.nextFloat() < 0.35) { event.getDrops().clear(); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java index e6c9c8e..18ddd61 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java @@ -18,16 +18,18 @@ public class TraitDissolving extends AbstractTrait { } // high chance to remove XP, low chance to double,triple or quatruple dropped Experience + @SubscribeEvent public void onXpDrop(LivingExperienceDropEvent event) { if (!event.getEntity().getEntityWorld().isRemote) { EntityPlayer player = event.getAttackingPlayer(); float r = random.nextFloat(); - if (r <= 0.75 && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { - event.setDroppedExperience(0); - } - if (r > 0.95 && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { - event.setDroppedExperience(event.getDroppedExperience() * (random.nextInt(3) + 2)); + if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { + if (r <= 0.80) { + event.setDroppedExperience(0); + } else { + event.setDroppedExperience(event.getDroppedExperience() * (random.nextInt(3) + 2)); + } } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java b/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java index cb536f9..440e776 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java @@ -24,6 +24,7 @@ public class TraitFragile extends AbstractTrait { float b = 0.99F * calcBonus(tool); if (!world.isRemote && tool.canHarvestBlock(state) && f <= b) { if (random.nextBoolean()) ToolHelper.damageTool(tool, random.nextInt(3), player); + else ToolHelper.healTool(tool, random.nextInt(3), player); } } else { float f = random.nextFloat(); @@ -41,20 +42,18 @@ public class TraitFragile extends AbstractTrait { if (r == 2) z += d; BlockPos nextBlock = new BlockPos(x, y, z); if (world.getBlockState(nextBlock) == world.getBlockState(pos)) { - Block block = Blocks.STONE; - int ib = random.nextInt(3); + Block block = null; + int ib = random.nextInt(2); switch (ib) { case 0: block = Blocks.COBBLESTONE; break; case 1: - block = Blocks.MOSSY_COBBLESTONE; - break; - case 2: - block = Blocks.GRAVEL; - break; + if (random.nextFloat() <= 0.9) block = Blocks.GRAVEL; + else block = Blocks.MOSSY_COBBLESTONE; } f = random.nextFloat(); + assert block != null; if (f < 0.85) { world.setBlockState(nextBlock, block.getDefaultState()); } else if (f > 95) { diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java index dd327ce..26ea54f 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java @@ -18,8 +18,6 @@ import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import static com.sosnitzka.taiga.Items.*; - public class TraitGarishly extends AbstractTrait { public TraitGarishly() { @@ -34,7 +32,7 @@ public class TraitGarishly extends AbstractTrait { EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { - int r = random.nextInt(6); + int r = random.nextInt(2); ItemStack i = null; switch (r) { case 0: @@ -44,17 +42,8 @@ public class TraitGarishly extends AbstractTrait { i = new ItemStack(Items.BLAZE_ROD, random.nextInt(3)); break; case 2: - i = new ItemStack(glimmerstone_dust, random.nextInt(3)); - break; - case 3: - i = new ItemStack(luminar_dust, random.nextInt(3)); - break; - case 4: i = new ItemStack(Items.COAL, random.nextInt(3)); break; - case 5: - i = new ItemStack(lignite, random.nextInt(3)); - break; } assert i != null; event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, i)); @@ -65,8 +54,8 @@ public class TraitGarishly extends AbstractTrait { @Override public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) { float r = random.nextFloat(); - if (r > 0.5f) event.getDrops().clear(); - else if (r < 0.1 && event.getWorld().getBlockState(event.getPos()).getMaterial() == Material.ROCK) { + if (random.nextBoolean()) event.getDrops().clear(); + else if (r < 0.25 && event.getWorld().getBlockState(event.getPos()).getMaterial() == Material.ROCK) { @SuppressWarnings("ConstantConditions") ItemStack stack = new ItemStack(Item.getItemFromBlock(event.getWorld().getBlockState(event.getPos()).getBlock()), random.nextInt(3)); event.getDrops().add(0, stack); ToolHelper.damageTool(tool, random.nextInt(6) + 1, event.getHarvester()); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java index 2c10852..90f1e3b 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java @@ -34,14 +34,14 @@ public class TraitGlimmer extends AbstractTrait { @Override public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { - if (random.nextFloat() <= 0.08) { + if (random.nextFloat() <= 0.05) { player.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, random.nextInt(600) + 300)); } } @Override public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { - if (random.nextFloat() <= 0.08) { + if (random.nextFloat() <= 0.05) { player.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, random.nextInt(600) + 300)); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitHaunted.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHaunted.java deleted file mode 100644 index c43b054..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitHaunted.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import com.sosnitzka.taiga.util.EntityAIPermanentPanic; -import net.minecraft.entity.EntityCreature; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.*; -import net.minecraft.entity.passive.*; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.common.MinecraftForge; -import slimeknights.tconstruct.library.traits.AbstractTrait; - -import static com.sosnitzka.taiga.util.Utils.isNight; - -public class TraitHaunted extends AbstractTrait { - - public TraitHaunted() { - super("haunted", TextFormatting.DARK_GRAY); - MinecraftForge.EVENT_BUS.register(this); - } - - // Just several tested Vanilla-Mobs, e.g. no ghasts, bats or skeletons - @Override - public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean isCritical) { - int time = (int) player.getEntityWorld().getWorldTime(); - if (random.nextFloat() <= 0.1 || (random.nextFloat() <= 0.3 && isNight(time))) - if (target instanceof EntityCow || target instanceof EntityZombie || target instanceof EntityWolf || target instanceof EntityPig || target instanceof EntitySpider || - target instanceof EntityVillager || target instanceof EntitySheep || target instanceof EntityEnderman || target instanceof EntityEndermite || - target instanceof EntityBlaze || target instanceof EntityWitch || target instanceof EntityHorse) { - ((EntityLiving) target).tasks.taskEntries.clear(); - ((EntityLiving) target).targetTasks.taskEntries.clear(); - ((EntityLiving) target).tasks.addTask(0, new EntityAIPermanentPanic((EntityCreature) target, target.getAIMoveSpeed() + 3.5D)); - - } - } -} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java index 7654255..f72f7e9 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java @@ -19,6 +19,6 @@ public class TraitHeroic extends AbstractTrait { float calc = newDamage + (newDamage / 2) / (durability * durabilitymax / (durabilitymax - durability - 1)); if ((float) durability < (float) (0.10 * durabilitymax) || player.getHealth() < player.getMaxHealth() / 8 || (target.getHealth() == target.getMaxHealth() && random.nextFloat() > 0.8)) { return super.damage(tool, player, target, damage, calc, isCritical); - } else return super.damage(tool, player, target, damage, newDamage, isCritical); + } else return super.damage(tool, player, target, damage, newDamage * 0.9f, isCritical); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java index 9da8d22..1b43176 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java @@ -28,10 +28,10 @@ public class TraitHollow extends AbstractTrait { @Override public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean isCritical) { int time = (int) player.getEntityWorld().getWorldTime(); - if (random.nextFloat() <= 0.2 || (random.nextFloat() <= 0.2 && isNight(time))) { + if (random.nextFloat() <= 0.01 || (random.nextFloat() <= 0.03 && isNight(time))) { ((EntityLiving) target).setNoAI(true); target.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); - if (target.getMaxHealth() < 200) { + if (target.getMaxHealth() < 250) { target.setHealth(target.getMaxHealth() * (1.8f - random.nextFloat() * 0.4f)); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java index ad25bcd..f95f891 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java @@ -36,7 +36,7 @@ public class TraitInstable extends AbstractTrait { explode(world, player, pos.getX(), pos.getY(), pos.getZ()); } else explode(world, null, pos.getX(), pos.getY(), pos.getZ()); } - ToolHelper.damageTool(tool, 11 + random.nextInt(10), player); + ToolHelper.damageTool(tool, random.nextInt(10) + 2, player); } } @@ -49,17 +49,17 @@ public class TraitInstable extends AbstractTrait { explode(player.getEntityWorld(), player, pos.getX(), pos.getY(), pos.getZ()); } else explode(player.getEntityWorld(), target, pos.getX(), pos.getY(), pos.getZ()); } - ToolHelper.damageTool(tool, 3 + random.nextInt(18), player); + ToolHelper.damageTool(tool, 2 + random.nextInt(10), player); } } @SubscribeEvent public void onMobDrops(LivingDropsEvent event) { World w = event.getEntity().getEntityWorld(); - if (!w.isRemote && event.getSource().getEntity() instanceof EntityPlayer) { + if (random.nextFloat() < 0.05 && !w.isRemote && event.getSource().getEntity() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { - ItemStack i = new ItemStack(Items.GUNPOWDER, random.nextInt(4)); + ItemStack i = new ItemStack(Items.GUNPOWDER, random.nextInt(2)); event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, i)); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java b/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java index 13d1081..354d77f 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java @@ -2,24 +2,31 @@ package com.sosnitzka.taiga.traits; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; public class TraitMelting extends AbstractTrait { public TraitMelting() { super("melting", TextFormatting.YELLOW); + MinecraftForge.EVENT_BUS.register(this); } - @Override - public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) { - float r = random.nextFloat(); - Block b = event.getWorld().getBlockState(event.getPos()).getBlock(); - if (r <= 0.01 && (b == Blocks.STONE || b == Blocks.COBBLESTONE || b == Blocks.NETHERRACK)) { - event.getWorld().setBlockState(event.getPos(), Blocks.LAVA.getDefaultState()); + + @SubscribeEvent + public void blockbreak(BlockEvent.BreakEvent e) { + Block b = e.getWorld().getBlockState(e.getPos()).getBlock(); + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(e.getPlayer().getHeldItemMainhand()), identifier)) { + if (!e.getWorld().isRemote && random.nextFloat() <= 0.025 && (b == Blocks.STONE || b == Blocks.COBBLESTONE || b == Blocks.NETHERRACK || b == Blocks.OBSIDIAN)) { + e.setCanceled(true); + e.getWorld().setBlockState(e.getPos(), Blocks.LAVA.getDefaultState()); + } } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java b/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java index b18d361..53f4d86 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java @@ -1,19 +1,13 @@ package com.sosnitzka.taiga.traits; -import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import slimeknights.tconstruct.library.traits.AbstractTrait; -import slimeknights.tconstruct.library.utils.TagUtil; -import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; @@ -26,26 +20,19 @@ public class TraitNatureBound extends AbstractTrait { @Override public int onToolHeal(ItemStack tool, int amount, int newAmount, EntityLivingBase entity) { - // 5% less durability repaired! - return newAmount - amount * 5 / 100; + // 10% less durability repaired! + return newAmount - amount * 10 / 100; } @Override public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) { - // *20 because 20 ticks in a second - int chance = 20; - if (!world.isRemote && entity instanceof EntityLivingBase && random.nextInt(30 * chance) == 0) { - ToolHelper.healTool(tool, random.nextInt(9) + 1, (EntityLivingBase) entity); - } - - } - - @SubscribeEvent - public void onBlockBreak(BlockEvent.BreakEvent e) { - Block b = e.getWorld().getBlockState(e.getPos()).getBlock(); - if (!e.getWorld().isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(e.getPlayer().getHeldItemMainhand()), identifier) && random.nextFloat() <= .07 && (b == Blocks.DIRT || b == Blocks.GRASS || b == Blocks.LOG || b == Blocks.LOG2 || b == Blocks.STONE)) { - e.setCanceled(true); - e.getPlayer().playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + // * 20 because 20 ticks in a second + int chance = 20 * 20; + Material m = world.getBlockState(entity.getPosition().down()).getMaterial(); + if (!world.isRemote && entity instanceof EntityLivingBase && random.nextInt(chance) == 0) { + if (m.equals(Material.GRASS) || m.equals(Material.LEAVES)) { + ToolHelper.healTool(tool, random.nextInt(2) + 1, (EntityLivingBase) entity); + } else ToolHelper.damageTool(tool, 1, (EntityLivingBase) entity); } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java deleted file mode 100644 index f3a279b..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -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; -import slimeknights.tconstruct.library.utils.ToolHelper; - -public class TraitOrganizing extends AbstractTrait { - - private static final float chance = 0.02f; - - public TraitOrganizing() { - super("organizing", TextFormatting.GREEN); - } - - @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { - if (!world.isRemote && (state.getMaterial() == Material.ROCK) && random.nextFloat() < chance) { - world.setBlockState(pos, Blocks.LOG.getDefaultState()); - ToolHelper.healTool(tool, random.nextInt(5), player); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java b/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java new file mode 100644 index 0000000..6760383 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java @@ -0,0 +1,67 @@ +package com.sosnitzka.taiga.traits; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; +import slimeknights.tconstruct.library.utils.ToolHelper; + + +public class TraitPorted extends AbstractTrait { + public static int distance = 10; + + public TraitPorted() { + super("ported", TextFormatting.DARK_PURPLE); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onItemRightClick(PlayerInteractEvent.RightClickItem e) { + ItemStack tool = e.getEntityPlayer().getHeldItemMainhand(); + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) + teleport(e.getEntityPlayer(), e.getWorld()); + } + + @Override + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + if (random.nextFloat() <= 0.005) { + player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + teleport(player, world); + } + } + + + @Override + public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { + if (random.nextFloat() <= 0.005) { + target.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + teleport(player, player.getEntityWorld()); + } + } + + private void teleport(EntityLivingBase e, World w) { + BlockPos tPos = new BlockPos(e.getPosition().up(distance)); + if (e.getPosition().getY() >= 128) { + return; + } + + while (!w.getBlockState(tPos).equals(Blocks.AIR.getDefaultState()) && tPos.getY() <= 128) { + tPos = tPos.up(); + } + if (!w.getBlockState(tPos).equals(Blocks.AIR.getDefaultState())) { + return; + } + e.setPosition(tPos.getX(), tPos.getY(), tPos.getZ()); + ToolHelper.damageTool(e.getHeldItemMainhand(), ToolHelper.getCurrentDurability(e.getHeldItemMainhand()) / 2 + 1, e); + } +} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitProgressiveStats.java b/src/main/java/com/sosnitzka/taiga/traits/TraitProgressiveStats.java new file mode 100644 index 0000000..d9af33d --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitProgressiveStats.java @@ -0,0 +1,115 @@ +package com.sosnitzka.taiga.traits; + +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.TextFormatting; +import slimeknights.tconstruct.library.modifiers.ModifierNBT; +import slimeknights.tconstruct.library.tools.ToolNBT; +import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; + +/** + * Base class for tools that progressively gain/award stats. + * The modifier persists 2 different stat-data on the tool: + * - A 'pool' of stats to award + * - A 'bonus' of already awarded stats + *

+ * The modifier reapplies the 'bonus' stats on application. + * The pool is not touched inheritly but only provided for the logic of the deriving trait. + */ +public abstract class TraitProgressiveStats extends AbstractTrait { + + protected final String pool_key; // Key to the tag that contains the free unassigned + protected final String applied_key; // Key to the tag that contains the already applied bonus stats + + public TraitProgressiveStats(String identifier, TextFormatting color) { + super(identifier, color); + + pool_key = identifier + "StatPool"; + applied_key = identifier + "StatBonus"; + } + + public TraitProgressiveStats(String identifier, int color) { + super(identifier, color); + + pool_key = identifier + "StatPool"; + applied_key = identifier + "StatBonus"; + } + + /* Modifier management */ + + protected static StatNBT getStats(NBTTagCompound root, String key) { + return ModifierNBT.readTag(TagUtil.getTagSafe(TagUtil.getExtraTag(root), key), StatNBT.class); + } + + protected static void setStats(NBTTagCompound root, StatNBT data, String key) { + NBTTagCompound extra = TagUtil.getExtraTag(root); + NBTTagCompound tag = new NBTTagCompound(); + data.write(tag); + extra.setTag(key, tag); + TagUtil.setExtraTag(root, extra); + } + + @Override + public void applyEffect(NBTTagCompound rootCompound, NBTTagCompound modifierTag) { + super.applyEffect(rootCompound, modifierTag); + // called on tool loading only + // we just apply the saved bonus stats + ToolNBT data = TagUtil.getToolStats(rootCompound); + StatNBT bonus = getBonus(rootCompound); + + data.durability += bonus.durability; + data.speed += bonus.speed; + data.attack += bonus.attack; + + TagUtil.setToolTag(rootCompound, data.get()); + } + + protected boolean hasPool(NBTTagCompound root) { + return TagUtil.getExtraTag(root).hasKey(pool_key); + } + + protected StatNBT getPool(NBTTagCompound root) { + return getStats(root, pool_key); + } + + protected void setPool(NBTTagCompound root, StatNBT data) { + setStats(root, data, pool_key); + } + + protected StatNBT getBonus(NBTTagCompound root) { + return getStats(root, applied_key); + } + + protected void setBonus(NBTTagCompound root, StatNBT data) { + setStats(root, data, applied_key); + } + + protected boolean playerIsBreakingBlock(Entity entity) { + return false; + } + + public static class StatNBT extends ModifierNBT { + + // statpool + public int durability; + public float attack; + public float speed; + + @Override + public void read(NBTTagCompound tag) { + super.read(tag); + durability = tag.getInteger("durability"); + attack = tag.getFloat("attack"); + speed = tag.getFloat("speed"); + } + + @Override + public void write(NBTTagCompound tag) { + super.write(tag); + tag.setInteger("durability", durability); + tag.setFloat("attack", attack); + tag.setFloat("speed", speed); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java index ea81437..466c715 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java @@ -16,16 +16,15 @@ public class TraitPulverizing extends AbstractTrait { @Override public void miningSpeed(ItemStack tool, PlayerEvent.BreakSpeed event) { if (ToolHelper.isToolEffective2(tool, event.getState())) { - event.setNewSpeed((float) (event.getNewSpeed() + calcBonus(tool))); + event.setNewSpeed((float) (event.getNewSpeed() * calcBonus(tool))); } } private double calcBonus(ItemStack tool) { int durability = ToolHelper.getCurrentDurability(tool); int maxDurability = ToolHelper.getMaxDurability(tool); - float speed = ToolHelper.getMiningSpeedStat(tool); - tool.setItemDamage(tool.getItemDamage() + 1); - return speed * (maxDurability - maxDurability / 10) / (durability); + return (1 + .9f * (maxDurability - durability) / maxDurability); + // Min 1.0; Max 1.9 } @Override diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitRandomize.java b/src/main/java/com/sosnitzka/taiga/traits/TraitRandomize.java deleted file mode 100644 index 423e6ef..0000000 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitRandomize.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.sosnitzka.taiga.traits; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityTNTPrimed; -import net.minecraft.entity.monster.*; -import net.minecraft.entity.passive.*; -import net.minecraft.init.Blocks; -import net.minecraft.init.SoundEvents; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.event.world.BlockEvent; -import slimeknights.tconstruct.library.traits.AbstractTrait; -import slimeknights.tconstruct.library.utils.ToolHelper; -import slimeknights.tconstruct.world.entity.EntityBlueSlime; - -import static com.sosnitzka.taiga.Blocks.*; -import static slimeknights.tconstruct.shared.TinkerCommons.oreArdite; -import static slimeknights.tconstruct.shared.TinkerCommons.oreCobalt; - -public class TraitRandomize extends AbstractTrait { - - public TraitRandomize() { - super("randomize", TextFormatting.DARK_RED); - } - - @Override - public void miningSpeed(ItemStack tool, PlayerEvent.BreakSpeed event) { - if (ToolHelper.isToolEffective2(tool, event.getState())) { - event.setNewSpeed(event.getNewSpeed() + random.nextFloat() * 2); - } - } - - @Override - public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean isCritical) { - if (random.nextFloat() <= .15 && target instanceof EntityLiving) { - World w = player.getEntityWorld(); - Entity e = new EntityCow(w); - target.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); - if (!w.isRemote) { - int i = random.nextInt(22); - switch (i) { - case 0: - e = new EntityCow(w); - break; - case 1: - e = new EntityPig(w); - break; - case 2: - e = new EntityHorse(w); - break; - case 3: - e = new EntityChicken(w); - break; - case 4: - e = new EntityVillager(w); - break; - case 5: - e = new EntityEnderman(w); - break; - case 6: - e = new EntityPolarBear(w); - break; - case 7: - e = new EntityIronGolem(w); - break; - case 8: - e = new EntitySilverfish(w); - break; - case 9: - e = new EntityCaveSpider(w); - break; - case 10: - e = new EntityWolf(w); - break; - case 11: - e = new EntityWitch(w); - break; - case 12: - e = new EntityTNTPrimed(w); - break; - case 13: - e = new EntityGhast(w); - break; - case 14: - e = new EntitySpider(w); - break; - case 15: - e = new EntitySkeleton(w); - break; - case 16: - e = new EntityMagmaCube(w); - break; - case 17: - e = new EntitySlime(w); - break; - case 18: - e = new EntityBlueSlime(w); - break; - case 19: - e = new EntityBat(w); - break; - case 20: - e = new EntityPigZombie(w); - break; - case 21: - e = new EntityBlaze(w); - break; - } - e.setPosition(target.getPosition().getX(), target.getPosition().getY() + 0.1f, target.getPosition().getZ()); - e.setCustomNameTag("Missingno"); - if (e instanceof EntityLiving) - ((EntityLiving) e).setHealth(((EntityLiving) e).getHealth() * (random.nextInt(5) + 1)); - w.spawnEntityInWorld(e); - target.setDead(); - } - } - } - - @SuppressWarnings("ConstantConditions") - @Override - public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) { - float r = random.nextFloat(); - if (r > 0.95f) event.getDrops().clear(); - if (event.getDrops() != null) { - if (r < 0.4f && (event.getDrops().get(0).getItem() == Item.getItemFromBlock(Blocks.IRON_ORE) || event.getDrops().get(0).getItem() == Item.getItemFromBlock(Blocks.GOLD_ORE))) { - ItemStack change = new ItemStack(Item.getItemFromBlock(Blocks.IRON_ORE)); - int i = random.nextInt(12); - switch (i) { - case 0: - change = new ItemStack(Item.getItemFromBlock(Blocks.GOLD_ORE)); - break; - case 1: - change = new ItemStack(Item.getItemFromBlock(Blocks.REDSTONE_ORE)); - break; - case 2: - change = new ItemStack(Item.getItemFromBlock(Blocks.LAPIS_ORE)); - break; - case 3: - change = new ItemStack(Item.getItemFromBlock(Blocks.DIAMOND_ORE)); - break; - case 4: - change = new ItemStack(Item.getItemFromBlock(Blocks.QUARTZ_ORE)); - break; - case 5: - change = new ItemStack(oreCobalt.getItem()); - break; - case 6: - change = new ItemStack(oreArdite.getItem()); - break; - case 7: - change = new ItemStack(titaniteOre); - break; - case 8: - change = new ItemStack(bismuthOre); - break; - case 9: - change = new ItemStack(tiberiumOre); - break; - case 10: - change = new ItemStack(eterniteOre); - break; - case 11: - change = new ItemStack(Item.getItemFromBlock(Blocks.IRON_ORE)); - break; - } - event.getDrops().set(0, change); - - - } - } - } -} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java b/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java index 52e0712..6e87d26 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java @@ -8,14 +8,16 @@ import slimeknights.tconstruct.library.traits.AbstractTrait; public class TraitResonance extends AbstractTrait { + public static float chance = 0.33f; + public TraitResonance() { super("resonance", TextFormatting.AQUA); } @Override public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { - if (random.nextFloat() <= .33) { - target.knockBack(target, random.nextFloat() * random.nextFloat() * 12, player.posX - target.posX, player.posZ - target.posZ); + if (random.nextFloat() <= chance) { + target.knockBack(target, random.nextFloat() * random.nextFloat() * 10, player.posX - target.posX, player.posZ - target.posZ); } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java b/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java index 55a6578..de47dee 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java @@ -1,13 +1,11 @@ package com.sosnitzka.taiga.traits; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; +import net.minecraft.init.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -17,13 +15,13 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; -import slimeknights.tconstruct.library.utils.ToolHelper; - -import static com.sosnitzka.taiga.util.Utils.isNight; public class TraitReviving extends AbstractTrait { + + public final float chance = 0.15f; + public TraitReviving() { super("reviving", TextFormatting.DARK_PURPLE); MinecraftForge.EVENT_BUS.register(this); @@ -35,36 +33,19 @@ public class TraitReviving extends AbstractTrait { World w = e.getEntity().getEntityWorld(); if (!w.isRemote && e.getSource().getEntity() != null) { if (e.getSource().getEntity() instanceof EntityPlayer && e.getEntity() instanceof EntityCreature) { - if (isNight((int) w.getWorldTime()) && random.nextFloat() > 0.85 && TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getEntity()).getHeldItemMainhand()), identifier)) { + if (random.nextFloat() <= chance && TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getEntity()).getHeldItemMainhand()), identifier)) { String name = EntityList.getEntityString(e.getEntity()); - Entity ent = EntityList.createEntityByName(name, w); if (ent != null) { if (ent instanceof EntitySkeleton && e.getEntity() instanceof EntitySkeleton) { ((EntitySkeleton) ent).setSkeletonType(((EntitySkeleton) e.getEntity()).getSkeletonType()); } - ent.setPosition(pos.getX(), pos.getY(), pos.getZ()); w.spawnEntityInWorld(ent); + e.getSource().getEntity().playSound(SoundEvents.AMBIENT_CAVE, 1.0F, 1.0F); } } } } } - - @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { - int time = (int) world.getWorldTime(); - if (random.nextFloat() <= 0.1 && isNight(time)) { - ToolHelper.healTool(tool, random.nextInt(15) + 1, null); - } - } - - @Override - public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { - int time = (int) player.getEntityWorld().getWorldTime(); - if (random.nextFloat() <= 0.1 && isNight(time)) { - ToolHelper.healTool(tool, random.nextInt(15) + 1, null); - } - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java index d4db53a..e78410c 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java @@ -1,28 +1,49 @@ package com.sosnitzka.taiga.traits; -import net.minecraft.block.material.Material; 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 net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; public class TraitSofty extends AbstractTrait { - private static final float chance = 0.2f; + + private static final float chance = 0.1f; + private static final float speedmulti = 1.3f; public TraitSofty() { - super("softy", TextFormatting.AQUA); + super("softy", TextFormatting.GRAY); MinecraftForge.EVENT_BUS.register(this); } + @SubscribeEvent + public void blockbreak(BlockEvent.BreakEvent e) { + float r = random.nextFloat(); + float hardness = e.getWorld().getBlockState(e.getPos()).getBlockHardness(e.getWorld(), e.getPos()); + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(e.getPlayer().getHeldItemMainhand()), identifier)) { + if (!e.getWorld().isRemote && r <= chance && hardness >= 1.0f) { + e.setCanceled(true); + ToolHelper.damageTool(e.getPlayer().getHeldItemMainhand(), random.nextInt(3) + 1, e.getPlayer()); + } + } + } + @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { - if (!world.isRemote && state.getMaterial().equals(Material.GROUND) && random.nextFloat() < chance) { - ToolHelper.healTool(tool, random.nextInt(10), player); + public void miningSpeed(ItemStack tool, PlayerEvent.BreakSpeed event) { + World w = event.getEntity().getEntityWorld(); + IBlockState state = w.getBlockState(event.getPos()); + float speed = event.getOriginalSpeed(); + if (!w.isRemote) { + if (state.getBlockHardness(w, event.getPos()) <= 1.0f) { + event.setNewSpeed(speed * speedmulti); + } } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java new file mode 100644 index 0000000..57653a7 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java @@ -0,0 +1,70 @@ +package com.sosnitzka.taiga.traits; + +import com.sosnitzka.taiga.util.Utils; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; + + +public class TraitSoulEater extends AbstractTrait { + + private static float divisor = 20000f; + + public TraitSoulEater() { + super(TraitSoulEater.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onTargetKilled(LivingDeathEvent event) { + if (event.getSource().getEntity() instanceof EntityPlayer && event.getEntity() instanceof EntityLiving) { + World w = event.getSource().getEntity().worldObj; + ItemStack tool = ((EntityPlayer) event.getSource().getEntity()).getHeldItemMainhand(); + if (!w.isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + float health = ((EntityLiving) event.getEntity()).getMaxHealth(); + data.killcount += 1; + data.health = health; + float bonus = Math.round(random.nextFloat() * health * 100) / divisor; + data.bonus += bonus; + data.bonus = (float) Math.round(data.bonus * 100f) / 100f; + data.write(tag); + TagUtil.setExtraTag(tool, tag); + } + } + } + + @Override + public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + float bonus = data.bonus; + return newDamage + bonus; + } + + @SubscribeEvent + public void onItemTooltip(ItemTooltipEvent e) { + ItemStack tool = e.getItemStack(); + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + if (data.killcount != 0) { + e.getToolTip().add(TextFormatting.WHITE + "Killed: " + TextFormatting.WHITE + data.killcount); + e.getToolTip().add(TextFormatting.WHITE + "Bonus: " + TextFormatting.WHITE + data.bonus); + } + } + } + +} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java b/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java new file mode 100644 index 0000000..a0bb62f --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java @@ -0,0 +1,105 @@ +package com.sosnitzka.taiga.traits; + +import com.sosnitzka.taiga.util.Utils; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import slimeknights.tconstruct.common.Sounds; +import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; + +import static com.sosnitzka.taiga.Blocks.tiberiumOre; + +public class TraitTantrum extends AbstractTrait { + + /* + * Collects tiberium, to release it for an explosion + */ + + public static float max_charges = 12f; + public static float max_power = 5; + + public TraitTantrum() { + super("tantrum", TextFormatting.RED); + MinecraftForge.EVENT_BUS.register(this); + } + + @Override + public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) { + World w = event.getWorld(); + if (!w.isRemote) { + if (event.getState().getBlock().equals(tiberiumOre)) { + event.getDrops().clear(); + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Data data = Data.read(tag); + if (data.amount >= max_charges) { + return; + } + data.amount += (0.25f + Utils.round2(random.nextDouble() / 4)); + if (data.amount >= max_charges) { + TagUtil.setEnchantEffect(tool, true); + if (event.getHarvester() instanceof EntityPlayerMP) { + Sounds.PlaySoundForPlayer(event.getHarvester(), Sounds.shocking_discharge, 1f, 0.8f + .2f * random.nextFloat()); + } + } + data.write(tag); + TagUtil.setExtraTag(tool, tag); + } + } + } + + @SubscribeEvent + public void RightClickItem(PlayerInteractEvent.RightClickItem event) { + World w = event.getWorld(); + BlockPos pos = event.getPos(); + ItemStack tool = event.getEntityPlayer().getHeldItemMainhand(); + if (!w.isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Data data = Data.read(tag); + if (data.amount > 1f) { + double d = Math.min(Utils.round2(random.nextDouble() * data.amount), max_power); + w.newExplosion(event.getEntityPlayer(), pos.getX(), pos.getY(), pos.getZ(), (float) Math.pow((double) 1.2f, d), false, true); + data.amount -= d; + data.write(tag); + TagUtil.setExtraTag(tool, tag); + TagUtil.setEnchantEffect(tool, false); + } + } + } + + @SubscribeEvent + public void onItemTooltip(ItemTooltipEvent e) { + ItemStack tool = e.getItemStack(); + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Data data = Data.read(tag); + e.getToolTip().add(TextFormatting.RED + "Charge: " + data.amount); + } + } + + public static class Data { + + float amount; + + public static Data read(NBTTagCompound tag) { + Data data = new Data(); + data.amount = tag.getFloat("amount"); + return data; + } + + public void write(NBTTagCompound tag) { + tag.setFloat("amount", amount); + } + } + + +} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitTemplate.java b/src/main/java/com/sosnitzka/taiga/traits/TraitTemplate.java new file mode 100644 index 0000000..281c4f2 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitTemplate.java @@ -0,0 +1,17 @@ +package com.sosnitzka.taiga.traits; + +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.common.MinecraftForge; +import slimeknights.tconstruct.library.traits.AbstractTrait; + + +public class TraitTemplate extends AbstractTrait { + + + public TraitTemplate() { + super(TraitTemplate.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED); + MinecraftForge.EVENT_BUS.register(this); + } + + +} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java b/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java index e8626e5..c422524 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java @@ -1,14 +1,49 @@ package com.sosnitzka.taiga.traits; -import net.minecraft.util.text.TextFormatting; +import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; public class TraitTraditional extends AbstractTrait { + public TraitTraditional() { - super("traditional", TextFormatting.GREEN); + super("traditional", 0xff33ff); MinecraftForge.EVENT_BUS.register(this); } + + @SubscribeEvent + public void onEntityKill(LivingDeathEvent e) { + World w = e.getEntity().getEntityWorld(); + if (!w.isRemote && e.getSource().getEntity() instanceof EntityPlayer && e.getEntity() instanceof EntityCreature) { + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getEntity()).getHeldItemMainhand()), identifier)) { + String name = EntityList.getEntityString(e.getEntity()); + } + } + } + + public static class Data { + + String mobname; + + public static Data read(NBTTagCompound tag) { + Data data = new Data(); + data.mobname = tag.getString("mob"); + return data; + } + + public void write(NBTTagCompound tag) { + tag.setString("amount", mobname); + } + } + } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java index f91031f..f7ca5ab 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java @@ -1,79 +1,15 @@ package com.sosnitzka.taiga.traits; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import slimeknights.tconstruct.library.traits.AbstractTrait; -import slimeknights.tconstruct.library.utils.TagUtil; -import slimeknights.tconstruct.library.utils.TinkerUtil; -import slimeknights.tconstruct.library.utils.ToolHelper; - -import static com.sosnitzka.taiga.Items.glimmerstone_dust; -import static com.sosnitzka.taiga.Items.tiberiumShardInstable; -import static com.sosnitzka.taiga.Items.tiberium_nugget; public class TraitUncertain extends AbstractTrait { public TraitUncertain() { - super("uncertain", TextFormatting.RED); + super(TraitUncertain.class.getName().toLowerCase().substring(4), TextFormatting.RED); MinecraftForge.EVENT_BUS.register(this); } - - @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { - if (random.nextFloat() <= 0.05) { - if (!world.isRemote) { - if (random.nextFloat() > 0.1f) { - explode(world, player, pos.getX(), pos.getY(), pos.getZ()); - } else explode(world, null, pos.getX(), pos.getY(), pos.getZ()); - } - ToolHelper.damageTool(tool, random.nextInt(5) + 1, null); - } - } - - @SubscribeEvent - public void onMobDrops(LivingDropsEvent event) { - World w = event.getEntity().getEntityWorld(); - if (!w.isRemote && event.getSource().getEntity() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); - if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { - ItemStack i = new ItemStack(Items.COAL, random.nextInt(4)); - if (random.nextBoolean()) { - int r = random.nextInt(4); - switch (r) { - case 0: - i = new ItemStack(Items.GUNPOWDER, random.nextInt(4)); - break; - case 1: - i = new ItemStack(tiberiumShardInstable, random.nextInt(4)); - break; - case 2: - i = new ItemStack(tiberium_nugget, random.nextInt(12)); - break; - case 3: - i = new ItemStack(glimmerstone_dust, random.nextInt(4)); - break; - } - } - event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, i)); - } - } - } - - private void explode(World w, Entity e, double x, double y, double z) { - w.newExplosion(e, x, y, z, 1.2f + random.nextFloat() * 4, random.nextBoolean(), true); - } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitVortex.java b/src/main/java/com/sosnitzka/taiga/traits/TraitVortex.java new file mode 100644 index 0000000..54880ff --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitVortex.java @@ -0,0 +1,17 @@ +package com.sosnitzka.taiga.traits; + +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.common.MinecraftForge; +import slimeknights.tconstruct.library.traits.AbstractTrait; + + +public class TraitVortex extends AbstractTrait { + + + public TraitVortex() { + super(TraitVortex.class.getSimpleName().toLowerCase().substring(5), TextFormatting.DARK_PURPLE); + MinecraftForge.EVENT_BUS.register(this); + } + + +} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java new file mode 100644 index 0000000..829c73f --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java @@ -0,0 +1,98 @@ +package com.sosnitzka.taiga.traits; + +import com.sosnitzka.taiga.util.Utils; +import net.minecraft.entity.Entity; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.TagUtil; +import slimeknights.tconstruct.library.utils.TinkerUtil; +import slimeknights.tconstruct.library.utils.ToolHelper; + + +public class TraitWhirl extends AbstractTrait { + + protected static int TICK_PER_STAT = 36; + + public TraitWhirl() { + super(TraitWhirl.class.getSimpleName().toLowerCase().substring(5), TextFormatting.DARK_BLUE); + MinecraftForge.EVENT_BUS.register(this); + } + + @Override + public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) { + + if (entity instanceof FakePlayer || entity.worldObj.isRemote) { + return; + } + + if (entity.ticksExisted % TICK_PER_STAT > 0) { + return; + } + + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + data.radius += random.nextFloat() * 0.5f; + if (data.radius >= 1) { + TagUtil.setEnchantEffect(tool, true); + } + data.write(tag); + TagUtil.setExtraTag(tool, tag); + } + + @SubscribeEvent + public void onRightClickItem(PlayerInteractEvent.RightClickItem event) { + World w = event.getWorld(); + ItemStack tool = event.getEntityPlayer().getHeldItemMainhand(); + if (!w.isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + if ((int) data.radius >= 1) { + int r = Math.min((int) data.radius, 8); + for (int x = -r; x <= r; x++) { + for (int y = -r; y <= r; y++) { + for (int z = -r; z <= r; z++) { + if (MathHelper.sqrt_double(x * x + y * y + z * z) > r) { + continue; + } + BlockPos nPos = new BlockPos(event.getPos().getX() + x, event.getPos().getY() + y, event.getPos().getZ() + z); + if (!(event.getWorld().getBlockState(nPos).equals(Blocks.WATER.getDefaultState()) || event.getWorld().getBlockState(nPos).equals(Blocks.FLOWING_WATER.getDefaultState()))) + continue; + event.getWorld().destroyBlock(nPos, false); + } + } + } + data.radius -= r; + data.write(tag); + TagUtil.setExtraTag(tool, tag); + TagUtil.setEnchantEffect(tool, false); + ToolHelper.damageTool(tool, 2 * r, event.getEntityPlayer()); + } + + } + } + + + @SubscribeEvent + public void onItemTooltip(ItemTooltipEvent e) { + ItemStack tool = e.getItemStack(); + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + NBTTagCompound tag = TagUtil.getExtraTag(tool); + Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); + if (data.radius > 0) { + e.getToolTip().add(TextFormatting.BLUE + "Actual Radius: " + TextFormatting.WHITE + Math.round(data.radius * 100) / 100); + } + } + } + +} diff --git a/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java b/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java deleted file mode 100644 index 1db610f..0000000 --- a/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.sosnitzka.taiga.util; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.IFuelHandler; - -import static com.sosnitzka.taiga.Items.*; -import static slimeknights.tconstruct.TConstruct.random; - -public class FuelHandler implements IFuelHandler { - - @Override - public int getBurnTime(ItemStack fuel) { - if (fuel.getItem().equals(lignite)) { - return 200 * 6; - } - if (fuel.getItem().equals(fuel_brick)) { - return 200 * 50; - } - if (fuel.getItem().equals(glimmercoal)) { - return (random.nextInt(20) + 40) * 200; - } - return 0; - } -} diff --git a/src/main/java/com/sosnitzka/taiga/util/Generator.java b/src/main/java/com/sosnitzka/taiga/util/Generator.java index e7aed53..3e6a694 100644 --- a/src/main/java/com/sosnitzka/taiga/util/Generator.java +++ b/src/main/java/com/sosnitzka/taiga/util/Generator.java @@ -1,41 +1,214 @@ package com.sosnitzka.taiga.util; -import com.sosnitzka.taiga.world.ZWorldGenMinable; +import com.google.common.collect.Lists; +import com.sosnitzka.taiga.world.MeteorWorldSaveData; +import com.sosnitzka.taiga.world.WorldGenMinable; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraftforge.oredict.OreDictionary; +import java.util.HashSet; +import java.util.List; import java.util.Random; +import java.util.Set; + +import static com.sosnitzka.taiga.util.Utils.nextInt; public class Generator { - public static void generateOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) { - generateOre(state, Blocks.STONE.getDefaultState(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize); + public static void generateOre(boolean center, IBlockState state, IBlockState replace, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) { + if (center) { + generateOreDense(state, replace, random, x, z, world, chance, minY, maxY, minSize, maxSize, null); + } else { + generateOre(state, replace, null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize, null); + } } - public static void generateNetherOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) { - generateOre(state, Blocks.NETHERRACK.getDefaultState(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize); - } - public static void generateEndOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) { - generateOre(state, Blocks.END_STONE.getDefaultState(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize); - } - - public static void generateOre(IBlockState state, IBlockState replace, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize) { - generateOre(state, replace, null, null, random, chunkX, chunkZ, world, chance, minY, maxY, minSize, maxSize); - } - - public static void generateOre(IBlockState state, IBlockState replace, IProperty property, Comparable comparable, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize) { + public static void generateOre(IBlockState state, IBlockState replace, IProperty property, Comparable comparable, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize, List biome) { int size = minSize + random.nextInt(maxSize - minSize); int height = maxY - minY; - for (int i = 0; i < chance; i++) { int posX = chunkX + random.nextInt(16); int posY = random.nextInt(height) + minY; int posZ = chunkZ + random.nextInt(16); - new ZWorldGenMinable(state, size, StateMatcher.forState(replace, property, comparable)).generate(world, random, new BlockPos(posX, posY, posZ)); + BlockPos cPos = new BlockPos(posX, posY, posZ); + if (biome == null || biome.contains(world.getBiome(cPos))) { + new WorldGenMinable(state, size, StateMatcher.forState(replace, property, comparable)).generate(world, random, new BlockPos(posX, posY, posZ)); + } + } + } + + public static void generateOreDescending(List replaceBlockList, IBlockState replacementBlock, Random random, int chunkX, int chunkZ, World world, int count, int minY, int maxY, int chance) { + if (random.nextFloat() < (float) (0.01 * chance)) + generateOreDescending(replaceBlockList, replacementBlock, random, chunkX, chunkZ, world, count, minY, maxY); + } + + + public static void generateOreDescending(List replaceBlockList, IBlockState replacementBlock, Random random, int chunkX, int chunkZ, World world, int count, int minY, int maxY) { + for (int i = 0; i < count; i++) { + int posX = chunkX + random.nextInt(16); + int posZ = chunkZ + random.nextInt(16); + BlockPos cPos = new BlockPos(posX, maxY, posZ); + if (replaceBlockList.contains(world.getBlockState(cPos)) && replaceBlockList.contains(world.getBlockState(cPos.up()))) { + continue; + } + if (replaceBlockList.contains(world.getBlockState(cPos)) && !replaceBlockList.contains(world.getBlockState(cPos.up()))) + world.setBlockState(cPos, replacementBlock); + while (!replaceBlockList.contains(world.getBlockState(cPos.down())) && cPos.getY() > minY) { + cPos = cPos.down(); + } + if (replaceBlockList.contains(world.getBlockState(cPos.down()))) + world.setBlockState(cPos.down(), replacementBlock); + } + } + + public static void generateOreBottom(IBlockState replacedBlock, IBlockState replacementBlock, Random random, int chunkX, int chunkZ, World world, int chance, int spread, int maxY) { + for (int i = 0; i < chance; i++) { + int posX = chunkX + random.nextInt(16); + int posY = 0; + int posZ = chunkZ + random.nextInt(16); + BlockPos cPos = new BlockPos(posX, posY, posZ); + if (Blocks.AIR.getDefaultState().equals(world.getBlockState(cPos))) { + while (world.getBlockState(cPos).equals(Blocks.AIR.getDefaultState()) && cPos.getY() < maxY) { + cPos = cPos.up(); + } + if (world.getBlockState(cPos).equals(replacedBlock)) { + world.setBlockState(cPos.up(random.nextInt(spread)), replacementBlock); + } + } + } + } + + public static void generateCube(boolean fly, IBlockState centerBlock, IBlockState hullBlock, Random random, int chunkX, int chunkZ, World world, int count, int chance, int minY, int maxY, int maxS) { + for (int i = 0; i < count; i++) { + if (random.nextFloat() < 0.01 * chance) { + int outer = nextInt(random, 1, maxS); + int inner = random.nextInt(2); + int posX = chunkX + random.nextInt(16); + int posY = nextInt(random, minY, maxY); + int posZ = chunkZ + random.nextInt(16); + BlockPos cPos = new BlockPos(posX, posY, posZ); + if (!fly) { + if (world.getBlockState(cPos).equals(Blocks.AIR.getDefaultState()) && world.getBlockState(cPos.down()).equals(Blocks.AIR.getDefaultState())) { + // we are in mid air, go down + while (world.getBlockState(cPos.down()).equals(Blocks.AIR.getDefaultState())) { + cPos = cPos.down(); + } + } + } + cPos.down((random.nextInt(4) + 2) * outer); + for (int x = -inner; x <= inner; x++) { + for (int y = -inner; y <= inner; y++) { + for (int z = -inner; z <= inner; z++) { + if (!world.getBlockState(cPos).equals(Blocks.AIR.getDefaultState())) + continue; + world.setBlockState(new BlockPos(cPos.getX() + x, cPos.getY() + y, cPos.getZ() + z), centerBlock); + } + } + } + for (int x = -outer; x <= outer; x++) { + for (int y = -outer; y <= outer; y++) { + for (int z = -outer; z <= outer; z++) { + BlockPos nPos = new BlockPos(cPos.getX() + x, cPos.getY() + y, cPos.getZ() + z); + if (world.getBlockState(nPos).equals(centerBlock) || !world.getBlockState(nPos).equals(Blocks.AIR.getDefaultState())) + continue; + world.setBlockState(nPos, hullBlock); + } + } + } + + } + } + } + + + public static void generateMeteor(IBlockState centerBlock, IBlockState hullBlock, Random random, int chunkX, int chunkZ, World world, int count, int chance, int minY, int maxY) { + Set validSurface = new HashSet(); + List oredictentries = Lists.newArrayList("dirt", "grass", "stone", "sand", "gravel", "cobblestone", "sandstone"); + for (String e : oredictentries) { + for (ItemStack stack : OreDictionary.getOres(e)) { + validSurface.add(stack.getItem()); + } + } + + for (int i = 0; i < count; i++) { + if (random.nextFloat() < 0.01 * chance) { + int r = nextInt(random, 1, 5); + int posX = chunkX + random.nextInt(16); + int posY = nextInt(random, minY, maxY); + int posZ = chunkZ + random.nextInt(16); + BlockPos cPos = new BlockPos(posX, posY, posZ); + if (world.getBlockState(cPos).equals(Blocks.AIR.getDefaultState()) && world.getBlockState(cPos.down()).equals(Blocks.AIR.getDefaultState())) { + // we are in mid air, go down + while (world.getBlockState(cPos.down()).equals(Blocks.AIR.getDefaultState())) { + cPos = cPos.down(); + } + } + if (!validSurface.contains(Item.getItemFromBlock(world.getBlockState(cPos.down()).getBlock()))) + continue; + cPos.down((random.nextInt(3) + 1) * r); + + MeteorWorldSaveData saveData = MeteorWorldSaveData.getForWorld(world); + saveData.addPos(cPos); + saveData.markDirty(); + + int t = 1; + if (r > 3) t = random.nextInt(r - 1); + for (int x = -t; x <= t; x++) { + for (int y = -t; y <= t; y++) { + for (int z = -t; z <= t; z++) { + if (MathHelper.sqrt_double(x * x + y * y + z * z) > t) { + continue; + } + world.setBlockState(new BlockPos(cPos.getX() + x, cPos.getY() + y, cPos.getZ() + z), centerBlock); + } + } + } + for (int x = -r; x <= r; x++) { + for (int y = -r; y <= r; y++) { + for (int z = -r; z <= r; z++) { + if (MathHelper.sqrt_double(x * x + y * y + z * z) > r) { + continue; + } + BlockPos nPos = new BlockPos(cPos.getX() + x, cPos.getY() + y, cPos.getZ() + z); + if (world.getBlockState(nPos).equals(centerBlock)) + continue; + world.setBlockState(nPos, hullBlock); + } + } + } + } + } + } + + + public static void generateOreDense(IBlockState state, IBlockState replace, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize, List biome) { + int size = minSize + random.nextInt(maxSize - minSize); + int height = maxY - minY; + BlockPos cPos; + for (int i = 0; i < chance; i += 5) { + for (int j = 0; j <= 2; j++) { + cPos = new BlockPos(chunkX + random.nextInt(16), minY + height * j / 5 + random.nextInt(height * 3 / 5), chunkZ + random.nextInt(16)); + if (biome == null || biome.contains(world.getBiome(cPos))) { + new WorldGenMinable(state, size, StateMatcher.forState(replace, null, null)).generate(world, random, cPos); + } + } + for (int j = 0; j <= 1; j++) { + int x = chunkX + random.nextInt(16); + int y = chunkZ + random.nextInt(16); + cPos = new BlockPos(x, minY + height * 4 / 9 + random.nextInt(height / 9), y); + if (biome == null || biome.contains(world.getBiome(cPos))) { + new WorldGenMinable(state, size, StateMatcher.forState(replace, null, null)).generate(world, random, cPos); + } + } } } } diff --git a/src/main/java/com/sosnitzka/taiga/util/StateMatcher.java b/src/main/java/com/sosnitzka/taiga/util/StateMatcher.java index b473be5..87a4949 100644 --- a/src/main/java/com/sosnitzka/taiga/util/StateMatcher.java +++ b/src/main/java/com/sosnitzka/taiga/util/StateMatcher.java @@ -64,8 +64,6 @@ public class StateMatcher implements Predicate { IBlockState bState = world.getBlockState(blockPos); if (bState.getBlock() == this.state.getBlock() && bState.getValue(property) == value) { - // Check if a replacable block is near origin block - show pos in console - // System.out.println(String.format("Found block with desired state! (%s), Block: %s, try #%s, y=%s", i, Y)); return true; } } diff --git a/src/main/java/com/sosnitzka/taiga/util/Utils.java b/src/main/java/com/sosnitzka/taiga/util/Utils.java index 57c74cf..a2872e4 100644 --- a/src/main/java/com/sosnitzka/taiga/util/Utils.java +++ b/src/main/java/com/sosnitzka/taiga/util/Utils.java @@ -1,20 +1,33 @@ package com.sosnitzka.taiga.util; +import com.sosnitzka.taiga.Items; +import com.sosnitzka.taiga.TAIGA; +import com.sun.istack.internal.Nullable; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.registry.GameRegistry; +import org.apache.commons.lang3.StringUtils; +import slimeknights.tconstruct.library.MaterialIntegration; +import slimeknights.tconstruct.library.TinkerRegistry; +import slimeknights.tconstruct.library.materials.*; + +import java.lang.reflect.Field; +import java.util.Random; + +import static com.sosnitzka.taiga.TAIGA.proxy; public class Utils { public static String PREFIX_INGOT = "ingot"; public static String PREFIX_NUGGET = "nugget"; public static String PREFIX_ORE = "ore"; public static String PREFIX_BLOCK = "block"; + public static String PREFIX_DUST = "dust"; /** * Registers the block and its corresponding item (block as item in inventory) @@ -28,6 +41,7 @@ public class Utils { /** * Registers the fluid and its bucket item + * * @param fluid the fluid */ public static void registerFluid(Fluid fluid) { @@ -35,51 +49,101 @@ public class Utils { FluidRegistry.addBucketForFluid(fluid); } - public static void registerTinkerAlloys(Fluid alloy, int out, Fluid first, int inOne, Fluid second, int inTwo) { - NBTTagList tagList = new NBTTagList(); - NBTTagCompound fluid = new NBTTagCompound(); - fluid.setString("FluidName", alloy.getName()); - fluid.setInteger("Amount", out); - tagList.appendTag(fluid); - fluid = new NBTTagCompound(); - fluid.setString("FluidName", first.getName()); - fluid.setInteger("Amount", inOne); - tagList.appendTag(fluid); - fluid = new NBTTagCompound(); - fluid.setString("FluidName", second.getName()); - fluid.setInteger("Amount", inTwo); - tagList.appendTag(fluid); - NBTTagCompound message = new NBTTagCompound(); - message.setTag("alloy", tagList); - FMLInterModComms.sendMessage("tconstruct", "alloy", message); - } - - public static void registerTinkerAlloys(Fluid alloy, int out, Fluid first, int inOne, Fluid second, int inTwo, Fluid third, int inThree) { - NBTTagList tagList = new NBTTagList(); - NBTTagCompound fluid = new NBTTagCompound(); - fluid.setString("FluidName", alloy.getName()); - fluid.setInteger("Amount", out); - tagList.appendTag(fluid); - fluid = new NBTTagCompound(); - fluid.setString("FluidName", first.getName()); - fluid.setInteger("Amount", inOne); - tagList.appendTag(fluid); - fluid = new NBTTagCompound(); - fluid.setString("FluidName", second.getName()); - fluid.setInteger("Amount", inTwo); - tagList.appendTag(fluid); - fluid = new NBTTagCompound(); - fluid.setString("FluidName", third.getName()); - fluid.setInteger("Amount", inThree); - tagList.appendTag(fluid); - - NBTTagCompound message = new NBTTagCompound(); - message.setTag("alloy", tagList); - FMLInterModComms.sendMessage("tconstruct", "alloy", message); + public static void registerTinkerAlloy(FluidStack output, FluidStack... inputs) { + if (inputs.length >= 2 && output != null) { + TinkerRegistry.registerAlloy(output, inputs); + } } public static boolean isNight(int time) { return time > 12500; } + + public static double round2(double d) { + return (Math.round(d * 100.0) / 100.0); + } + + public static void integrateMaterial(String oreSuffix, @Nullable Material material, Fluid fluid, int headDura, float headSpeed, float headAttack, float handleMod, int handleDura, int extra, int headLevel, float draw, float range, int bdamage) { + integrateMaterial(oreSuffix, material, fluid, headDura, headSpeed, headAttack, handleMod, handleDura, extra, headLevel, new BowMaterialStats(draw, range, bdamage), false, true); + } + + public static void integrateMaterial(String oreSuffix, @Nullable Material material, Fluid fluid, int headDura, float headSpeed, float headAttack, float handleMod, int handleDura, int extra, int headLevel, BowMaterialStats bowstats) { + integrateMaterial(oreSuffix, material, fluid, headDura, headSpeed, headAttack, handleMod, handleDura, extra, headLevel, bowstats, false, true); + } + + public static void integrateMaterial(String oreSuffix, @Nullable Material material, Fluid fluid, int headDura, float headSpeed, float headAttack, float handleMod, int handleDura, int extra, int headLevel, BowMaterialStats bowstats, boolean craft, boolean cast) { + if (material != null) { + if (TinkerRegistry.getMaterial(material.identifier) != Material.UNKNOWN) + return; + + TinkerRegistry.addMaterialStats(material, new HeadMaterialStats(headDura, headSpeed, headAttack, headLevel)); + TinkerRegistry.addMaterialStats(material, new HandleMaterialStats(handleMod, handleDura)); + TinkerRegistry.addMaterialStats(material, new ExtraMaterialStats(extra)); + TinkerRegistry.addMaterialStats(material, bowstats); + + Item item = null; + Field[] items = Items.class.getDeclaredFields(); + for (Field i : items) { + if (i.getName().equals(StringUtils.uncapitalize(oreSuffix) + "Ingot")) { + Item r = null; + try { + r = (Item) i.get(i.getType()); + } catch (Exception e) { + e.printStackTrace(); + } + item = r; + } + } + + material.setFluid(fluid).setCraftable(craft).setCastable(cast).addItem(item, 1, Material.VALUE_Ingot); + material.setRepresentativeItem(item); + proxy.setRenderInfo(material); + } + + MaterialIntegration integration = new MaterialIntegration(material, fluid, oreSuffix); + integration.integrate(); + TAIGA.integrateList.add(integration); + } + + public static void integrateOre(String oreSuffix, Fluid fluid) { + integrateMaterial(oreSuffix, null, fluid, -1, -1, -1, -1, -1, -1, -1, new BowMaterialStats(0.1f, 0.1f, -1f), true, true); + } + + public static int nextInt(Random random, int min, int max) { + return random.nextInt((max - min) + 1) + min; + } + + public static class GeneralNBTData { + + public int killcount; + public float health; + public int brokenblocks; + public float bonus; + public int curse; + public String name; + public float radius; + + public static GeneralNBTData read(NBTTagCompound tag) { + GeneralNBTData data = new GeneralNBTData(); + data.killcount = tag.getInteger("killcount"); + data.brokenblocks = tag.getInteger("brokenblocks"); + data.health = tag.getFloat("health"); + data.bonus = tag.getFloat("bonus"); + data.curse = tag.getInteger("curse"); + data.name = tag.getString("name"); + data.radius = tag.getFloat("radius"); + return data; + } + + public void write(NBTTagCompound tag) { + tag.setInteger("killcount", killcount); + tag.setInteger("brokenblocks", brokenblocks); + tag.setFloat("health", health); + tag.setFloat("bonus", bonus); + tag.setInteger("curse", curse); + tag.setString("name", name); + tag.setFloat("radius", radius); + } + } } diff --git a/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java b/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java new file mode 100644 index 0000000..6cfdb84 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java @@ -0,0 +1,64 @@ +package com.sosnitzka.taiga.world; + +import com.google.gson.Gson; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.WorldSavedData; +import net.minecraft.world.storage.MapStorage; + +import java.util.ArrayList; +import java.util.List; + +import static com.sosnitzka.taiga.TAIGA.MODID; + +public class MeteorWorldSaveData extends WorldSavedData { + private static final String DATA_NAME = MODID + "_meteors"; + private List posList; + + public MeteorWorldSaveData() { + super(DATA_NAME); + } + + public static MeteorWorldSaveData getForWorld(World world) { + MapStorage storage = world.getPerWorldStorage(); + MeteorWorldSaveData instance = (MeteorWorldSaveData) storage.getOrLoadData(MeteorWorldSaveData.class, DATA_NAME); + + if (instance == null) { + instance = new MeteorWorldSaveData(); + storage.setData(DATA_NAME, instance); + } + return instance; + } + + public List getPosList() { + return posList; + } + + public void addPos(BlockPos pos) { + if (posList == null) + posList = new ArrayList(); + + posList.add(pos); + } + + public boolean removePos(BlockPos pos) { + return posList != null && posList.remove(pos); + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + if (nbt.hasKey("posData")) { + posList = new Gson().fromJson(nbt.getString("posData"), posList.getClass()); + } + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound compound) { + if (posList == null) + return null; + + compound.setString("posData", new Gson().toJson(posList)); + return compound; + } +} diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java new file mode 100644 index 0000000..8e022fb --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java @@ -0,0 +1,71 @@ +package com.sosnitzka.taiga.world; + + +import com.sosnitzka.taiga.util.Generator; +import net.minecraft.block.BlockStone; +import net.minecraft.init.Biomes; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkGenerator; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraftforge.fml.common.IWorldGenerator; + +import java.util.Random; + +import static com.google.common.collect.Lists.newArrayList; +import static com.sosnitzka.taiga.Blocks.*; +import static com.sosnitzka.taiga.TAIGAConfiguration.ironGen; + +@SuppressWarnings("unchecked") +public class WorldGen implements IWorldGenerator { + private void nether(Random random, int x, int z, World world) { + + Generator.generateOre(false, Blocks.NETHERRACK.getDefaultState(), tiberiumOre.getDefaultState(), random, x, z, world, 15, 0, 128, 10, 35); + Generator.generateOre(true, Blocks.NETHERRACK.getDefaultState(), prometheumOre.getDefaultState(), random, x, z, world, 25, 0, 128, 2, 4); + Generator.generateOre(true, Blocks.NETHERRACK.getDefaultState(), valyriumOre.getDefaultState(), random, x, z, world, 10, 0, 32, 2, 4); + Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, 1, 0, 64, 5); + + } + + private void world(Random random, int x, int z, World world) { + // Optional + if (!ironGen) { + Generator.generateOre(false, Blocks.STONE.getDefaultState(), Blocks.IRON_ORE.getDefaultState(), random, x, z, world, 20, 0, 128, 1, 8); + } + Generator.generateMeteor(duraniteOre.getDefaultState(), blockMeteorite.getDefaultState(), random, x, z, world, 1, 4, 16, 112); + Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), basaltBlock.getDefaultState(), random, x, z, world, 10, 0, 64); + Generator.generateOreDescending(newArrayList(Blocks.BEDROCK.getDefaultState()), eezoOre.getDefaultState(), random, x, z, world, 3, 0, 10); + Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 15, 0, 96, 3, 4, null); + Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 15, 0, 96, 3, 4, null); + Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 15, 0, 96, 3, 4, null); + Generator.generateOreDense(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 10, 0, 64, 2, 12, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT)); + } + + private void end(Random random, int x, int z, World world) { + Generator.generateCube(true, uruOre.getDefaultState(), blockObsidiorite.getDefaultState(), random, x, z, world, 1, 2, 0, 96, 3); + Generator.generateOre(Blocks.END_STONE.getDefaultState(), Blocks.AIR.getDefaultState(), null, null, random, x, z, world, 1, 3, 64, 3, 8, null); + Generator.generateOre(false, Blocks.END_STONE.getDefaultState(), auroriumOre.getDefaultState(), random, x, z, world, 10, 32, 48, 2, 4); + Generator.generateOre(true, Blocks.END_STONE.getDefaultState(), palladiumOre.getDefaultState(), random, x, z, world, 10, 48, 64, 2, 4); + Generator.generateOreBottom(Blocks.END_STONE.getDefaultState(), abyssumOre.getDefaultState(), random, x, z, world, 12, 4, 64); + } + + @Override + public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) { + int x = chunkX * 16; + int z = chunkZ * 16; + switch (world.provider.getDimension()) { + case -1: + nether(random, x, z, world); + break; + case 0: + world(random, x, z, world); + break; + case 1: + end(random, x, z, world); + break; + default: + world(random, x, z, world); + break; + } + } +} diff --git a/src/main/java/com/sosnitzka/taiga/world/ZWorldGenMinable.java b/src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java similarity index 93% rename from src/main/java/com/sosnitzka/taiga/world/ZWorldGenMinable.java rename to src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java index dd293bd..06f5a7f 100644 --- a/src/main/java/com/sosnitzka/taiga/world/ZWorldGenMinable.java +++ b/src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java @@ -8,12 +8,11 @@ import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenMinable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Random; -public class ZWorldGenMinable extends WorldGenMinable { +public class WorldGenMinable extends net.minecraft.world.gen.feature.WorldGenMinable { private final IBlockState oreBlock; /** * The number of com.sosnitzka.taiga.blocks to generate. @@ -21,11 +20,11 @@ public class ZWorldGenMinable extends WorldGenMinable { private final int numberOfBlocks; private final Predicate predicate; - public ZWorldGenMinable(IBlockState state, int blockCount) { + public WorldGenMinable(IBlockState state, int blockCount) { this(state, blockCount, BlockMatcher.forBlock(Blocks.STONE)); } - public ZWorldGenMinable(IBlockState state, int blockCount, Predicate predicate) { + public WorldGenMinable(IBlockState state, int blockCount, Predicate predicate) { super(state, blockCount, predicate); this.oreBlock = state; this.numberOfBlocks = blockCount; diff --git a/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java b/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java deleted file mode 100644 index 3902d4c..0000000 --- a/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.sosnitzka.taiga.world; - -import com.sosnitzka.taiga.util.Generator; -import net.minecraft.block.BlockStone; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraftforge.fml.common.IWorldGenerator; - -import java.util.Random; - -import static com.sosnitzka.taiga.Blocks.*; -import static com.sosnitzka.taiga.TAIGAConfiguration.*; - -public class ZWorldGen implements IWorldGenerator { - private void nether(Random random, int x, int z, World world) { - - Generator.generateNetherOre(titaniteOre.getDefaultState(), random, x, z, world, (int) (35 * titaniteFactor * oreFactorGeneral), 1, 64, 2, 12); - Generator.generateNetherOre(tiberiumOre.getDefaultState(), random, x, z, world, (int) (30 * tiberiumFactor * oreFactorGeneral), 0, 128, 2, 15); - Generator.generateNetherOre(palladiumOre.getDefaultState(), random, x, z, world, (int) (35 * palladiumFactor * oreFactorGeneral), 32, 64, 2, 6); - Generator.generateNetherOre(prometheumOre.getDefaultState(), random, x, z, world, (int) (35 * prometheumFactor * oreFactorGeneral), 64, 128, 2, 6); - } - - private void world(Random random, int x, int z, World world) { - - // Optional - if (slagIronGen) { - Generator.generateOre(slagironOre.getDefaultState(), random, x, z, world, (int) (45 * slagironFactor * oreFactorGeneral), 0, 128, 2, 12); - } - if (slagGoldGen) { - Generator.generateOre(slaggoldOre.getDefaultState(), random, x, z, world, (int) (20 * slaggoldFactor * oreFactorGeneral), 0, 32, 2, 12); - } - if (ironGen) { - Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), random, x, z, world, (int) (30 * ironFactor * oreFactorGeneral), 0, 128, 1, 9); - } - - // to be integrated mod specific - Generator.generateOre(basalt.getDefaultState(), Blocks.LAVA.getDefaultState(), random, x, z, world, (int) (125 * basaltFactor * oreFactorGeneral), 0, 28, 2, 4); - Generator.generateOre(rottenGround.getDefaultState(), Blocks.DIRT.getDefaultState(), random, x, z, world, (int) (25 * rottengroundFactor * oreFactorGeneral), 50, 70, 2, 15); - - Generator.generateOre(ligniteOre.getDefaultState(), random, x, z, world, (int) (30 * ligniteFactor * oreFactorGeneral), 8, 96, 2, 12); - Generator.generateOre(vibraniumOre.getDefaultState(), random, x, z, world, (int) (30 * vibraniumFactor * oreFactorGeneral), 48, 64, 2, 8); - Generator.generateOre(karmesineOre.getDefaultState(), random, x, z, world, (int) (35 * karmesineFactor * oreFactorGeneral), 16, 48, 2, 8); - Generator.generateOre(bismuthOre.getDefaultState(), random, x, z, world, (int) (40 * bismuthFactor * oreFactorGeneral), 50, 130, 2, 4); - Generator.generateOre(mythrilOre.getDefaultState(), random, x, z, world, (int) (34 * mythrilFactor * oreFactorGeneral), 16, 32, 2, 8); - Generator.generateOre(meteoriteOre.getDefaultState(), random, x, z, world, (int) (10 * meteoriteFactor * oreFactorGeneral), 0, 32, 2, 25); - Generator.generateOre(mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, (int) (120 * mindoriteFactor * oreFactorGeneral), 16, 96, 2, 8); - Generator.generateOre(arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, (int) (120 * arcaniteFactor * oreFactorGeneral), 16, 96, 2, 8); - Generator.generateOre(eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, (int) (120 * eterniteFactor * oreFactorGeneral), 16, 96, 2, 8); - } - - private void end(Random random, int x, int z, World world) { - Generator.generateEndOre(adamantiteOre.getDefaultState(), random, x, z, world, (int) (15 * adamantiteFactor * oreFactorGeneral), 10, 35, 2, 8); - Generator.generateEndOre(rubiumOre.getDefaultState(), random, x, z, world, (int) (15 * rubiumFactor * oreFactorGeneral), 10, 65, 2, 8); - Generator.generateEndOre(ignititeOre.getDefaultState(), random, x, z, world, (int) (15 * ignititeFactor * oreFactorGeneral), 10, 45, 2, 8); - Generator.generateEndOre(violiumOre.getDefaultState(), random, x, z, world, (int) (15 * violiumFactor * oreFactorGeneral), 10, 55, 2, 8); - - } - - @Override - public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) { - int x = chunkX * 16; - int z = chunkZ * 16; - switch (world.provider.getDimension()) { - case -1: - nether(random, x, z, world); - break; - case 0: - world(random, x, z, world); - break; - case 1: - end(random, x, z, world); - break; - default: - world(random, x, z, world); - break; - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/abyssum_block.json b/src/main/resources/assets/taiga/blockstates/abyssum_block.json new file mode 100644 index 0000000..71f6fb3 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/abyssum_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/abyssum" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/abyssum_ore.json b/src/main/resources/assets/taiga/blockstates/abyssum_ore.json new file mode 100644 index 0000000..2adad92 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/abyssum_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/abyssum" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/adamant_block.json b/src/main/resources/assets/taiga/blockstates/adamant_block.json new file mode 100644 index 0000000..870d312 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/adamant_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/adamant" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/adamantite_block.json b/src/main/resources/assets/taiga/blockstates/adamantite_block.json deleted file mode 100644 index c15ef35..0000000 --- a/src/main/resources/assets/taiga/blockstates/adamantite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:adamantite_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/adamantite_ore.json b/src/main/resources/assets/taiga/blockstates/adamantite_ore.json deleted file mode 100644 index aeed854..0000000 --- a/src/main/resources/assets/taiga/blockstates/adamantite_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:adamantite_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/aegisalt_block.json b/src/main/resources/assets/taiga/blockstates/aegisalt_block.json deleted file mode 100644 index 5bda85d..0000000 --- a/src/main/resources/assets/taiga/blockstates/aegisalt_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:aegisalt_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/arcanite_block.json b/src/main/resources/assets/taiga/blockstates/arcanite_block.json deleted file mode 100644 index 11b765a..0000000 --- a/src/main/resources/assets/taiga/blockstates/arcanite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:arcanite_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/arcanite_ore.json b/src/main/resources/assets/taiga/blockstates/arcanite_ore.json deleted file mode 100644 index ed63a02..0000000 --- a/src/main/resources/assets/taiga/blockstates/arcanite_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:arcanite_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/astrium_block.json b/src/main/resources/assets/taiga/blockstates/astrium_block.json index 09049d8..c0783c1 100644 --- a/src/main/resources/assets/taiga/blockstates/astrium_block.json +++ b/src/main/resources/assets/taiga/blockstates/astrium_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/astrium" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:astrium_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/aurorium_block.json b/src/main/resources/assets/taiga/blockstates/aurorium_block.json new file mode 100644 index 0000000..576858c --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/aurorium_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/aurorium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/aurorium_ore.json b/src/main/resources/assets/taiga/blockstates/aurorium_ore.json new file mode 100644 index 0000000..02c9113 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/aurorium_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/aurorium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/basalt.json b/src/main/resources/assets/taiga/blockstates/basalt.json deleted file mode 100644 index 4aa78ef..0000000 --- a/src/main/resources/assets/taiga/blockstates/basalt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:basalt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/basalt_block.json b/src/main/resources/assets/taiga/blockstates/basalt_block.json new file mode 100644 index 0000000..c4e762f --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/basalt_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/basalt" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/bismuth_block.json b/src/main/resources/assets/taiga/blockstates/bismuth_block.json deleted file mode 100644 index a55f859..0000000 --- a/src/main/resources/assets/taiga/blockstates/bismuth_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:bismuth_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/bismuth_ore.json b/src/main/resources/assets/taiga/blockstates/bismuth_ore.json deleted file mode 100644 index 40e3b5e..0000000 --- a/src/main/resources/assets/taiga/blockstates/bismuth_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:bismuth_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/bysmuid_block.json b/src/main/resources/assets/taiga/blockstates/bysmuid_block.json deleted file mode 100644 index a542d20..0000000 --- a/src/main/resources/assets/taiga/blockstates/bysmuid_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:bysmuid_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/cryptogen_block.json b/src/main/resources/assets/taiga/blockstates/cryptogen_block.json deleted file mode 100644 index ddc3c2d..0000000 --- a/src/main/resources/assets/taiga/blockstates/cryptogen_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:cryptogen_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/duranite_block.json b/src/main/resources/assets/taiga/blockstates/duranite_block.json new file mode 100644 index 0000000..7759fdf --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/duranite_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/duranite" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/duranite_ore.json b/src/main/resources/assets/taiga/blockstates/duranite_ore.json new file mode 100644 index 0000000..a004354 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/duranite_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/duranite" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/dyonite_block.json b/src/main/resources/assets/taiga/blockstates/dyonite_block.json index e2e94ac..0039b6a 100644 --- a/src/main/resources/assets/taiga/blockstates/dyonite_block.json +++ b/src/main/resources/assets/taiga/blockstates/dyonite_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/dyonite" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:dyonite_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/eezo_block.json b/src/main/resources/assets/taiga/blockstates/eezo_block.json new file mode 100644 index 0000000..126074d --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/eezo_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/eezo" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/eezo_ore.json b/src/main/resources/assets/taiga/blockstates/eezo_ore.json new file mode 100644 index 0000000..75b7aed --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/eezo_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/eezo" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/eternite_block.json b/src/main/resources/assets/taiga/blockstates/eternite_block.json deleted file mode 100644 index a175f8f..0000000 --- a/src/main/resources/assets/taiga/blockstates/eternite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:eternite_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/eternite_ore.json b/src/main/resources/assets/taiga/blockstates/eternite_ore.json deleted file mode 100644 index 0a44944..0000000 --- a/src/main/resources/assets/taiga/blockstates/eternite_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:eternite_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json index fb06fc9..b135075 100644 --- a/src/main/resources/assets/taiga/blockstates/fluid_block.json +++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json @@ -4,276 +4,241 @@ "model": "forge:fluid" }, "variants": { - "arcanite": [ + "triberium_fluid": [ { "custom": { - "fluid": "arcanite" + "fluid": "triberium_fluid" } } ], - "tiberium": [ + "meteorite_fluid": [ { "custom": { - "fluid": "tiberium" + "fluid": "meteorite_fluid" } } ], - "prometheum": [ + "basalt_fluid": [ { "custom": { - "fluid": "prometheum" + "fluid": "basalt_fluid" } } ], - "rubium": [ + "tiberium_fluid": [ { "custom": { - "fluid": "rubium" + "fluid": "tiberium_fluid" } } ], - "violium": [ + "aurorium_fluid": [ { "custom": { - "fluid": "violium" + "fluid": "aurorium_fluid" } } ], - "bismuth": [ + "prometheum_fluid": [ { "custom": { - "fluid": "bismuth" + "fluid": "prometheum_fluid" } } ], - "karmesine": [ + "duranite_fluid": [ { "custom": { - "fluid": "karmesine" + "fluid": "duranite_fluid" } } ], - "mindorite": [ + "valyrium_fluid": [ { "custom": { - "fluid": "mindorite" + "fluid": "valyrium_fluid" } } ], - "titanite": [ + "vibranium_fluid": [ { "custom": { - "fluid": "titanite" + "fluid": "vibranium_fluid" } } ], - "meteorite": [ + "karmesine_fluid": [ { "custom": { - "fluid": "meteorite" + "fluid": "karmesine_fluid" } } ], - "adamantite": [ + "palladium_fluid": [ { "custom": { - "fluid": "adamantite" + "fluid": "palladium_fluid" } } ], - "vibranium": [ + "uru_fluid": [ { "custom": { - "fluid": "vibranium" + "fluid": "uru_fluid" } } ], - "ignitite": [ + "osram_fluid": [ { "custom": { - "fluid": "ignitite" + "fluid": "osram_fluid" } } ], - "palladium": [ + "abyssum_fluid": [ { "custom": { - "fluid": "palladium" + "fluid": "abyssum_fluid" } } ], - "eternite": [ + "eezo_fluid": [ { "custom": { - "fluid": "eternite" + "fluid": "eezo_fluid" } } ], - "mythril": [ + "tiberiumX_fluid": [ { "custom": { - "fluid": "mythril" + "fluid": "tiberiumX_fluid" } } ], - "astrium": [ + "fractum_fluid": [ { "custom": { - "fluid": "astrium" + "fluid": "fractum_fluid" } } ], - "nitronite": [ + "violium_fluid": [ { "custom": { - "fluid": "nitronite" + "fluid": "violium_fluid" } } ], - "proxideum": [ + "proxii_fluid": [ { "custom": { - "fluid": "proxideum" + "fluid": "proxii_fluid" } } ], - "noctunyx": [ + "tritonite_fluid": [ { "custom": { - "fluid": "noctunyx" + "fluid": "tritonite_fluid" } } ], - "imperomite": [ + "ignitz_fluid": [ { "custom": { - "fluid": "imperomite" + "fluid": "ignitz_fluid" } } ], - "cryptogen": [ + "imperomite_fluid": [ { "custom": { - "fluid": "cryptogen" + "fluid": "imperomite_fluid" } } ], - "fractoryte": [ + "solarium_fluid": [ { "custom": { - "fluid": "fractoryte" + "fluid": "solarium_fluid" } } ], - "seismodium": [ + "nihilite_fluid": [ { "custom": { - "fluid": "seismodium" + "fluid": "nihilite_fluid" } } ], - "terramite": [ + "adamant_fluid": [ { "custom": { - "fluid": "terramite" + "fluid": "adamant_fluid" } } ], - "lumixyl": [ + "dyonite_fluid": [ { "custom": { - "fluid": "lumixyl" + "fluid": "dyonite_fluid" } } ], - "solarium": [ + "nucleum_fluid": [ { "custom": { - "fluid": "solarium" + "fluid": "nucleum_fluid" } } ], - "dyonite": [ + "lumix_fluid": [ { "custom": { - "fluid": "dyonite" + "fluid": "lumix_fluid" } } ], - "ultranite": [ + "seismum_fluid": [ { "custom": { - "fluid": "ultranite" + "fluid": "seismum_fluid" } } ], - "nucleum": [ + "astrium_fluid": [ { "custom": { - "fluid": "nucleum" + "fluid": "astrium_fluid" } } ], - "aegisalt": [ + "niob_fluid": [ { "custom": { - "fluid": "aegisalt" + "fluid": "niob_fluid" } } ], - "bysmuid": [ + "yrdeen_fluid": [ { "custom": { - "fluid": "bysmuid" + "fluid": "yrdeen_fluid" } } ], - "radiant_enderium": [ + "iox_fluid": [ { "custom": { - "fluid": "radiant_enderium" + "fluid": "iox_fluid" } } ], - "glimming_enderium": [ + "obsidiorite_fluid": [ { "custom": { - "fluid": "glimming_enderium" - } - } - ], - "energy_enderium": [ - { - "custom": { - "fluid": "energy_enderium" - } - } - ], - "glimmercoal_fluid": [ - { - "custom": { - "fluid": "glimmercoal_fluid" - } - } - ], - "nitro_fluid": [ - { - "custom": { - "fluid": "nitro_fluid" - } - } - ], - "anthracite_fluid": [ - { - "custom": { - "fluid": "anthracite_fluid" - } - } - ], - "spectrum_fluid": [ - { - "custom": { - "fluid": "spectrum_fluid" + "fluid": "obsidiorite_fluid" } } ] diff --git a/src/main/resources/assets/taiga/blockstates/fractoryte_block.json b/src/main/resources/assets/taiga/blockstates/fractoryte_block.json deleted file mode 100644 index 2c8cd91..0000000 --- a/src/main/resources/assets/taiga/blockstates/fractoryte_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:fractoryte_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/fractum_block.json b/src/main/resources/assets/taiga/blockstates/fractum_block.json new file mode 100644 index 0000000..1bc30d4 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/fractum_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/fractum" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/ignitite_block.json b/src/main/resources/assets/taiga/blockstates/ignitite_block.json deleted file mode 100644 index 05f3557..0000000 --- a/src/main/resources/assets/taiga/blockstates/ignitite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:ignitite_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/ignitite_ore.json b/src/main/resources/assets/taiga/blockstates/ignitite_ore.json deleted file mode 100644 index 8368a87..0000000 --- a/src/main/resources/assets/taiga/blockstates/ignitite_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:ignitite_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/ignitz_block.json b/src/main/resources/assets/taiga/blockstates/ignitz_block.json new file mode 100644 index 0000000..d23cb65 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/ignitz_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/ignitz" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/imperomite_block.json b/src/main/resources/assets/taiga/blockstates/imperomite_block.json index 8aa54df..2bf4f14 100644 --- a/src/main/resources/assets/taiga/blockstates/imperomite_block.json +++ b/src/main/resources/assets/taiga/blockstates/imperomite_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/imperomite" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:imperomite_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/iox_block.json b/src/main/resources/assets/taiga/blockstates/iox_block.json new file mode 100644 index 0000000..d5ca26a --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/iox_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/iox" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/karmesine_block.json b/src/main/resources/assets/taiga/blockstates/karmesine_block.json index 97b3302..c82dba9 100644 --- a/src/main/resources/assets/taiga/blockstates/karmesine_block.json +++ b/src/main/resources/assets/taiga/blockstates/karmesine_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/karmesine" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:karmesine_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/karmesine_ore.json b/src/main/resources/assets/taiga/blockstates/karmesine_ore.json index 31184ff..c38813c 100644 --- a/src/main/resources/assets/taiga/blockstates/karmesine_ore.json +++ b/src/main/resources/assets/taiga/blockstates/karmesine_ore.json @@ -1,7 +1,18 @@ { - "variants": { - "normal": { - "model": "taiga:karmesine_ore" - } - } + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/karmesine" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json new file mode 100644 index 0000000..bd66801 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/karmesineandensite" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json new file mode 100644 index 0000000..07ba243 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/karmesinediorite" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json new file mode 100644 index 0000000..534c33e --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/karmesinegranite" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/lignite_ore.json b/src/main/resources/assets/taiga/blockstates/lignite_ore.json deleted file mode 100644 index 0eb941e..0000000 --- a/src/main/resources/assets/taiga/blockstates/lignite_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:lignite_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/lumix_block.json b/src/main/resources/assets/taiga/blockstates/lumix_block.json new file mode 100644 index 0000000..d806b54 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/lumix_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/lumix" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/lumixyl_block.json b/src/main/resources/assets/taiga/blockstates/lumixyl_block.json deleted file mode 100644 index 7a12aac..0000000 --- a/src/main/resources/assets/taiga/blockstates/lumixyl_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:lumixyl_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/meteorite_block.json b/src/main/resources/assets/taiga/blockstates/meteorite_block.json index b6166b7..786bb60 100644 --- a/src/main/resources/assets/taiga/blockstates/meteorite_block.json +++ b/src/main/resources/assets/taiga/blockstates/meteorite_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/meteorite" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:meteorite_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/meteorite_ore.json b/src/main/resources/assets/taiga/blockstates/meteorite_ore.json deleted file mode 100644 index d84f51b..0000000 --- a/src/main/resources/assets/taiga/blockstates/meteorite_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:meteorite_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/meteoritecobble_block.json b/src/main/resources/assets/taiga/blockstates/meteoritecobble_block.json new file mode 100644 index 0000000..eff3144 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/meteoritecobble_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/meteoritecobble" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/mindorite_block.json b/src/main/resources/assets/taiga/blockstates/mindorite_block.json deleted file mode 100644 index 52a9a32..0000000 --- a/src/main/resources/assets/taiga/blockstates/mindorite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:mindorite_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/mindorite_ore.json b/src/main/resources/assets/taiga/blockstates/mindorite_ore.json deleted file mode 100644 index 7780d42..0000000 --- a/src/main/resources/assets/taiga/blockstates/mindorite_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:mindorite_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/mythril_block.json b/src/main/resources/assets/taiga/blockstates/mythril_block.json deleted file mode 100644 index 53dde45..0000000 --- a/src/main/resources/assets/taiga/blockstates/mythril_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:mythril_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/mythril_ore.json b/src/main/resources/assets/taiga/blockstates/mythril_ore.json deleted file mode 100644 index 2a2d020..0000000 --- a/src/main/resources/assets/taiga/blockstates/mythril_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:mythril_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/nihilite_block.json b/src/main/resources/assets/taiga/blockstates/nihilite_block.json new file mode 100644 index 0000000..7a8a386 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/nihilite_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/nihilite" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/niob_block.json b/src/main/resources/assets/taiga/blockstates/niob_block.json new file mode 100644 index 0000000..b28fa4f --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/niob_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/niob" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/nitronite_block.json b/src/main/resources/assets/taiga/blockstates/nitronite_block.json deleted file mode 100644 index 74113cd..0000000 --- a/src/main/resources/assets/taiga/blockstates/nitronite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:nitronite_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/noctunyx_block.json b/src/main/resources/assets/taiga/blockstates/noctunyx_block.json deleted file mode 100644 index 4a8f4b7..0000000 --- a/src/main/resources/assets/taiga/blockstates/noctunyx_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:noctunyx_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/nucleum_block.json b/src/main/resources/assets/taiga/blockstates/nucleum_block.json index 2082110..b7c6bed 100644 --- a/src/main/resources/assets/taiga/blockstates/nucleum_block.json +++ b/src/main/resources/assets/taiga/blockstates/nucleum_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/nucleum" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:nucleum_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/obsidiorite_block.json b/src/main/resources/assets/taiga/blockstates/obsidiorite_block.json new file mode 100644 index 0000000..2dffc7d --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/obsidiorite_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/obsidiorite" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/obsidioritecobble_block.json b/src/main/resources/assets/taiga/blockstates/obsidioritecobble_block.json new file mode 100644 index 0000000..53e133f --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/obsidioritecobble_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/obsidioritecobble" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/osram_block.json b/src/main/resources/assets/taiga/blockstates/osram_block.json new file mode 100644 index 0000000..e5c69e6 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/osram_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/osram" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/osram_ore.json b/src/main/resources/assets/taiga/blockstates/osram_ore.json new file mode 100644 index 0000000..b2ad55d --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/osram_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/osram" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/palladium_block.json b/src/main/resources/assets/taiga/blockstates/palladium_block.json index 601d4ab..ad302fe 100644 --- a/src/main/resources/assets/taiga/blockstates/palladium_block.json +++ b/src/main/resources/assets/taiga/blockstates/palladium_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/palladium" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:palladium_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/palladium_ore.json b/src/main/resources/assets/taiga/blockstates/palladium_ore.json index 78e862b..c35b9e4 100644 --- a/src/main/resources/assets/taiga/blockstates/palladium_ore.json +++ b/src/main/resources/assets/taiga/blockstates/palladium_ore.json @@ -1,7 +1,18 @@ { - "variants": { - "normal": { - "model": "taiga:palladium_ore" - } - } + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/palladium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/prometheum_block.json b/src/main/resources/assets/taiga/blockstates/prometheum_block.json index af31aa8..3ce7fbb 100644 --- a/src/main/resources/assets/taiga/blockstates/prometheum_block.json +++ b/src/main/resources/assets/taiga/blockstates/prometheum_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/prometheum" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:prometheum_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/prometheum_ore.json b/src/main/resources/assets/taiga/blockstates/prometheum_ore.json index ff3de0d..4f13232 100644 --- a/src/main/resources/assets/taiga/blockstates/prometheum_ore.json +++ b/src/main/resources/assets/taiga/blockstates/prometheum_ore.json @@ -1,7 +1,18 @@ { - "variants": { - "normal": { - "model": "taiga:prometheum_ore" - } - } + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/prometheum" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/proxideum_block.json b/src/main/resources/assets/taiga/blockstates/proxideum_block.json deleted file mode 100644 index 9e0c38b..0000000 --- a/src/main/resources/assets/taiga/blockstates/proxideum_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:proxideum_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/proxii_block.json b/src/main/resources/assets/taiga/blockstates/proxii_block.json new file mode 100644 index 0000000..f0f94bc --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/proxii_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/proxii" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/rotten_ground.json b/src/main/resources/assets/taiga/blockstates/rotten_ground.json deleted file mode 100644 index 39e72bf..0000000 --- a/src/main/resources/assets/taiga/blockstates/rotten_ground.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:rotten_ground" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/rubium_block.json b/src/main/resources/assets/taiga/blockstates/rubium_block.json deleted file mode 100644 index 2e491ef..0000000 --- a/src/main/resources/assets/taiga/blockstates/rubium_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:rubium_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/rubium_ore.json b/src/main/resources/assets/taiga/blockstates/rubium_ore.json deleted file mode 100644 index 82b330e..0000000 --- a/src/main/resources/assets/taiga/blockstates/rubium_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:rubium_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/seismodium_block.json b/src/main/resources/assets/taiga/blockstates/seismodium_block.json deleted file mode 100644 index 19fa838..0000000 --- a/src/main/resources/assets/taiga/blockstates/seismodium_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:seismodium_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/seismum_block.json b/src/main/resources/assets/taiga/blockstates/seismum_block.json new file mode 100644 index 0000000..ab10664 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/seismum_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/seismum" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/slaggold_ore.json b/src/main/resources/assets/taiga/blockstates/slaggold_ore.json deleted file mode 100644 index 5e5c317..0000000 --- a/src/main/resources/assets/taiga/blockstates/slaggold_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:slaggold_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/slagiron_ore.json b/src/main/resources/assets/taiga/blockstates/slagiron_ore.json deleted file mode 100644 index a45629e..0000000 --- a/src/main/resources/assets/taiga/blockstates/slagiron_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:slagiron_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/solarium_block.json b/src/main/resources/assets/taiga/blockstates/solarium_block.json index 9d52d5a..730c52b 100644 --- a/src/main/resources/assets/taiga/blockstates/solarium_block.json +++ b/src/main/resources/assets/taiga/blockstates/solarium_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/solarium" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:solarium_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/terramite_block.json b/src/main/resources/assets/taiga/blockstates/terramite_block.json deleted file mode 100644 index 55bac8a..0000000 --- a/src/main/resources/assets/taiga/blockstates/terramite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:terramite_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/tiberium_block.json b/src/main/resources/assets/taiga/blockstates/tiberium_block.json index 95f8be5..8de7043 100644 --- a/src/main/resources/assets/taiga/blockstates/tiberium_block.json +++ b/src/main/resources/assets/taiga/blockstates/tiberium_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/tiberium" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:tiberium_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/tiberium_ore.json b/src/main/resources/assets/taiga/blockstates/tiberium_ore.json index fba6296..618929b 100644 --- a/src/main/resources/assets/taiga/blockstates/tiberium_ore.json +++ b/src/main/resources/assets/taiga/blockstates/tiberium_ore.json @@ -1,7 +1,18 @@ { - "variants": { - "normal": { - "model": "taiga:tiberium_ore" - } - } + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/tiberium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/titanite_block.json b/src/main/resources/assets/taiga/blockstates/titanite_block.json deleted file mode 100644 index 5bde804..0000000 --- a/src/main/resources/assets/taiga/blockstates/titanite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:titanite_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/titanite_ore.json b/src/main/resources/assets/taiga/blockstates/titanite_ore.json deleted file mode 100644 index ab7f988..0000000 --- a/src/main/resources/assets/taiga/blockstates/titanite_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:titanite_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/triberium_block.json b/src/main/resources/assets/taiga/blockstates/triberium_block.json new file mode 100644 index 0000000..a4fbb33 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/triberium_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/triberium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/tritonite_block.json b/src/main/resources/assets/taiga/blockstates/tritonite_block.json new file mode 100644 index 0000000..a10ab3c --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/tritonite_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/tritonite" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/ultranite_block.json b/src/main/resources/assets/taiga/blockstates/ultranite_block.json deleted file mode 100644 index b3368d9..0000000 --- a/src/main/resources/assets/taiga/blockstates/ultranite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:ultranite_block" - } - } -} diff --git a/src/main/resources/assets/taiga/blockstates/uru_block.json b/src/main/resources/assets/taiga/blockstates/uru_block.json new file mode 100644 index 0000000..31363cf --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/uru_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/uru" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/uru_ore.json b/src/main/resources/assets/taiga/blockstates/uru_ore.json new file mode 100644 index 0000000..089fd9a --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/uru_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/uru" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/valyrium_block.json b/src/main/resources/assets/taiga/blockstates/valyrium_block.json new file mode 100644 index 0000000..f7e5fda --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/valyrium_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/valyrium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/valyrium_ore.json b/src/main/resources/assets/taiga/blockstates/valyrium_ore.json new file mode 100644 index 0000000..bcc0804 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/valyrium_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/valyrium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/vibranium_block.json b/src/main/resources/assets/taiga/blockstates/vibranium_block.json index 75cf810..c35e154 100644 --- a/src/main/resources/assets/taiga/blockstates/vibranium_block.json +++ b/src/main/resources/assets/taiga/blockstates/vibranium_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/vibranium" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:vibranium_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/vibranium_ore.json b/src/main/resources/assets/taiga/blockstates/vibranium_ore.json index aa1be1a..2852ccf 100644 --- a/src/main/resources/assets/taiga/blockstates/vibranium_ore.json +++ b/src/main/resources/assets/taiga/blockstates/vibranium_ore.json @@ -1,7 +1,18 @@ { - "variants": { - "normal": { - "model": "taiga:vibranium_ore" - } - } + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/vibranium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/violium_block.json b/src/main/resources/assets/taiga/blockstates/violium_block.json index d5c1232..2eb5a1e 100644 --- a/src/main/resources/assets/taiga/blockstates/violium_block.json +++ b/src/main/resources/assets/taiga/blockstates/violium_block.json @@ -1,7 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/violium" + }, + "transform": "forge:default-block" + }, "variants": { - "normal": { - "model": "taiga:violium_block" - } + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/violium_ore.json b/src/main/resources/assets/taiga/blockstates/violium_ore.json deleted file mode 100644 index afd18f6..0000000 --- a/src/main/resources/assets/taiga/blockstates/violium_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "taiga:violium_ore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/yrdeen_block.json b/src/main/resources/assets/taiga/blockstates/yrdeen_block.json new file mode 100644 index 0000000..70cf16c --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/yrdeen_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/yrdeen" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/lang/de_DE.lang b/src/main/resources/assets/taiga/lang/de_DE.lang index 8592d85..cd5a982 100644 --- a/src/main/resources/assets/taiga/lang/de_DE.lang +++ b/src/main/resources/assets/taiga/lang/de_DE.lang @@ -13,7 +13,6 @@ tile.mindorite_ore.name=Mindoriterz tile.mythril_ore.name=Mythrilerz tile.palladium_ore.name=Palladiumerz tile.prometheum_ore.name=Prometheumerz -tile.rotten_ground.name=Verrottete Erde tile.slagiron_ore.name=Unreines Eisenerz tile.slaggold_ore.name=Unreines Golderz tile.tiberium_ore.name=Tiberiumerz diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang index 68f57d9..669205d 100644 --- a/src/main/resources/assets/taiga/lang/en_US.lang +++ b/src/main/resources/assets/taiga/lang/en_US.lang @@ -13,7 +13,6 @@ tile.mindorite_ore.name=Mindorite Ore tile.mythril_ore.name=Mythril Ore tile.palladium_ore.name=Palladium Ore tile.prometheum_ore.name=Prometheum Ore -tile.rotten_ground.name=Rotten Ground tile.slagiron_ore.name=Slagiron Ore tile.slaggold_ore.name=Slaggold Ore tile.tiberium_ore.name=Tiberium Ore @@ -229,13 +228,13 @@ modifier.garishly.desc=§oIt's so hot.§r\Thei actually drop fiery stuff. modifier.glimmer.name=Glimmer modifier.glimmer.desc=§oDarkness? Not for me!§r\Sometimes you get night vision. modifier.haunted.name=Haunted -modifier.haunted.desc=§oHit 'em to get 'em crazy!'§r\Fucking mad cow desease. +modifier.haunted.desc=§oHit 'em to get 'em crazy!'§r\This is mad cow desease. modifier.heroic.name=Heroic modifier.heroic.desc=§oUntil you'll die.§r\At the end, you grow stronger. modifier.hollow.name=Hollow modifier.hollow.desc=§oBraindead!§r\Brain smash! modifier.instable.name=Unstable -modifier.instable.desc=§oWhat the fuck?§r\Seriously, this is unstable! +modifier.instable.desc=§oWhat the heck?§r\Seriously, this is unstable! modifier.naturebound.name=Naturebound modifier.naturebound.desc=§oYou are one with your surrounding!§r\Repairs in name of the nature. modifier.pulverizing.name=Pulverizing @@ -253,7 +252,7 @@ modifier.uncertain.desc=§oSome kind of risky to use.§r\At least it's not unsta modifier.reviving.name=Reviving modifier.reviving.desc=§oPlease kill it already!§r\Zombies!? modifier.melting.name=Melting -modifier.melting.desc=§oSo fucking hot!§r\Burrrrrrn! +modifier.melting.desc=§oSo damn hot!§r\Burrrrrrn! item.glimmercoal.name=Glimmercoal diff --git a/src/main/resources/assets/taiga/lang/zh_CN.lang b/src/main/resources/assets/taiga/lang/zh_CN.lang index caafa17..ac01580 100644 --- a/src/main/resources/assets/taiga/lang/zh_CN.lang +++ b/src/main/resources/assets/taiga/lang/zh_CN.lang @@ -13,7 +13,6 @@ tile.mindorite_ore.name=曼德瑞特矿石 tile.mythril_ore.name=秘银矿石 tile.palladium_ore.name=钯矿石 tile.prometheum_ore.name=幻金矿石 -tile.rotten_ground.name=腐烂泥土 tile.slagiron_ore.name=富渣铁矿石 tile.slaggold_ore.name=富渣金矿石 tile.tiberium_ore.name=泰伯利亚矿石 diff --git a/src/main/resources/assets/taiga/models/block/adamantite_block.json b/src/main/resources/assets/taiga/models/block/adamantite_block.json deleted file mode 100644 index 6b5c73a..0000000 --- a/src/main/resources/assets/taiga/models/block/adamantite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/adamantite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/adamantite_ore.json b/src/main/resources/assets/taiga/models/block/adamantite_ore.json deleted file mode 100644 index 4f02568..0000000 --- a/src/main/resources/assets/taiga/models/block/adamantite_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/adamantite_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/aegisalt_block.json b/src/main/resources/assets/taiga/models/block/aegisalt_block.json deleted file mode 100644 index 3ac607c..0000000 --- a/src/main/resources/assets/taiga/models/block/aegisalt_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/aegisalt_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/arcanite_block.json b/src/main/resources/assets/taiga/models/block/arcanite_block.json deleted file mode 100644 index 106061f..0000000 --- a/src/main/resources/assets/taiga/models/block/arcanite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/arcanite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/arcanite_ore.json b/src/main/resources/assets/taiga/models/block/arcanite_ore.json deleted file mode 100644 index 286d1be..0000000 --- a/src/main/resources/assets/taiga/models/block/arcanite_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/arcanite_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/astrite_ore.json b/src/main/resources/assets/taiga/models/block/astrite_ore.json deleted file mode 100644 index 89b1556..0000000 --- a/src/main/resources/assets/taiga/models/block/astrite_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/astrium_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/astrium_block.json b/src/main/resources/assets/taiga/models/block/astrium_block.json deleted file mode 100644 index 4917949..0000000 --- a/src/main/resources/assets/taiga/models/block/astrium_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/astrium_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/basalt.json b/src/main/resources/assets/taiga/models/block/basalt.json deleted file mode 100644 index 128f047..0000000 --- a/src/main/resources/assets/taiga/models/block/basalt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/basalt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/bismuth_block.json b/src/main/resources/assets/taiga/models/block/bismuth_block.json deleted file mode 100644 index 011c27d..0000000 --- a/src/main/resources/assets/taiga/models/block/bismuth_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/bismuth_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/bismuth_ore.json b/src/main/resources/assets/taiga/models/block/bismuth_ore.json deleted file mode 100644 index d5af860..0000000 --- a/src/main/resources/assets/taiga/models/block/bismuth_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/bismuth_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/bysmuid_block.json b/src/main/resources/assets/taiga/models/block/bysmuid_block.json deleted file mode 100644 index e85f044..0000000 --- a/src/main/resources/assets/taiga/models/block/bysmuid_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/bysmuid_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/cryptogen_block.json b/src/main/resources/assets/taiga/models/block/cryptogen_block.json deleted file mode 100644 index fdf7771..0000000 --- a/src/main/resources/assets/taiga/models/block/cryptogen_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/cryptogen_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/dyonite_block.json b/src/main/resources/assets/taiga/models/block/dyonite_block.json deleted file mode 100644 index b1729c7..0000000 --- a/src/main/resources/assets/taiga/models/block/dyonite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/dyonite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/eternite_block.json b/src/main/resources/assets/taiga/models/block/eternite_block.json deleted file mode 100644 index f67c965..0000000 --- a/src/main/resources/assets/taiga/models/block/eternite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/eternite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/eternite_ore.json b/src/main/resources/assets/taiga/models/block/eternite_ore.json deleted file mode 100644 index cb3b272..0000000 --- a/src/main/resources/assets/taiga/models/block/eternite_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/eternite_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/fractoryte_block.json b/src/main/resources/assets/taiga/models/block/fractoryte_block.json deleted file mode 100644 index fa58562..0000000 --- a/src/main/resources/assets/taiga/models/block/fractoryte_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/fractoryte_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/ignitite_block.json b/src/main/resources/assets/taiga/models/block/ignitite_block.json deleted file mode 100644 index c77b427..0000000 --- a/src/main/resources/assets/taiga/models/block/ignitite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/ignitite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/ignitite_ore.json b/src/main/resources/assets/taiga/models/block/ignitite_ore.json deleted file mode 100644 index 5eed757..0000000 --- a/src/main/resources/assets/taiga/models/block/ignitite_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/ignitite_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/imperomite_block.json b/src/main/resources/assets/taiga/models/block/imperomite_block.json deleted file mode 100644 index 65e7b3d..0000000 --- a/src/main/resources/assets/taiga/models/block/imperomite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/imperomite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/karmesine_block.json b/src/main/resources/assets/taiga/models/block/karmesine_block.json deleted file mode 100644 index a00d7cc..0000000 --- a/src/main/resources/assets/taiga/models/block/karmesine_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/karmesine_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/karmesine_ore.json b/src/main/resources/assets/taiga/models/block/karmesine_ore.json deleted file mode 100644 index dec99e9..0000000 --- a/src/main/resources/assets/taiga/models/block/karmesine_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/karmesine_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/lignite_ore.json b/src/main/resources/assets/taiga/models/block/lignite_ore.json deleted file mode 100644 index 1b2164f..0000000 --- a/src/main/resources/assets/taiga/models/block/lignite_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/lignite_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/lumixyl_block.json b/src/main/resources/assets/taiga/models/block/lumixyl_block.json deleted file mode 100644 index 34996ad..0000000 --- a/src/main/resources/assets/taiga/models/block/lumixyl_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/lumixyl_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/meteorite_block.json b/src/main/resources/assets/taiga/models/block/meteorite_block.json deleted file mode 100644 index 5407364..0000000 --- a/src/main/resources/assets/taiga/models/block/meteorite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/meteorite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/meteorite_ore.json b/src/main/resources/assets/taiga/models/block/meteorite_ore.json deleted file mode 100644 index b6581f5..0000000 --- a/src/main/resources/assets/taiga/models/block/meteorite_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/meteorite_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/mindorite_block.json b/src/main/resources/assets/taiga/models/block/mindorite_block.json deleted file mode 100644 index ee99479..0000000 --- a/src/main/resources/assets/taiga/models/block/mindorite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/mindorite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/mindorite_ore.json b/src/main/resources/assets/taiga/models/block/mindorite_ore.json deleted file mode 100644 index 20445ee..0000000 --- a/src/main/resources/assets/taiga/models/block/mindorite_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/mindorite_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/mythril_block.json b/src/main/resources/assets/taiga/models/block/mythril_block.json deleted file mode 100644 index 014cb8f..0000000 --- a/src/main/resources/assets/taiga/models/block/mythril_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/mythril_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/mythril_ore.json b/src/main/resources/assets/taiga/models/block/mythril_ore.json deleted file mode 100644 index 9fe182e..0000000 --- a/src/main/resources/assets/taiga/models/block/mythril_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/mythril_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/nitronite_block.json b/src/main/resources/assets/taiga/models/block/nitronite_block.json deleted file mode 100644 index 9661f68..0000000 --- a/src/main/resources/assets/taiga/models/block/nitronite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/nitronite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/noctunyx_block.json b/src/main/resources/assets/taiga/models/block/noctunyx_block.json deleted file mode 100644 index ee87b81..0000000 --- a/src/main/resources/assets/taiga/models/block/noctunyx_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/noctunyx_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/nucleum_block.json b/src/main/resources/assets/taiga/models/block/nucleum_block.json deleted file mode 100644 index 7029719..0000000 --- a/src/main/resources/assets/taiga/models/block/nucleum_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/nucleum_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/palladium_block.json b/src/main/resources/assets/taiga/models/block/palladium_block.json deleted file mode 100644 index 5bdd65a..0000000 --- a/src/main/resources/assets/taiga/models/block/palladium_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/palladium_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/palladium_ore.json b/src/main/resources/assets/taiga/models/block/palladium_ore.json deleted file mode 100644 index 1d7b5f0..0000000 --- a/src/main/resources/assets/taiga/models/block/palladium_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/palladium_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/prometheum_block.json b/src/main/resources/assets/taiga/models/block/prometheum_block.json deleted file mode 100644 index af720f0..0000000 --- a/src/main/resources/assets/taiga/models/block/prometheum_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/prometheum_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/prometheum_ore.json b/src/main/resources/assets/taiga/models/block/prometheum_ore.json deleted file mode 100644 index 4733fc6..0000000 --- a/src/main/resources/assets/taiga/models/block/prometheum_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/prometheum_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/proxideum_block.json b/src/main/resources/assets/taiga/models/block/proxideum_block.json deleted file mode 100644 index 1bda055..0000000 --- a/src/main/resources/assets/taiga/models/block/proxideum_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/proxideum_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/rotten_ground.json b/src/main/resources/assets/taiga/models/block/rotten_ground.json deleted file mode 100644 index c4a03e0..0000000 --- a/src/main/resources/assets/taiga/models/block/rotten_ground.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/rotten_ground" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/rubium_block.json b/src/main/resources/assets/taiga/models/block/rubium_block.json deleted file mode 100644 index 7c09795..0000000 --- a/src/main/resources/assets/taiga/models/block/rubium_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/rubium_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/rubium_ore.json b/src/main/resources/assets/taiga/models/block/rubium_ore.json deleted file mode 100644 index ca6893c..0000000 --- a/src/main/resources/assets/taiga/models/block/rubium_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/rubium_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/seismodium_block.json b/src/main/resources/assets/taiga/models/block/seismodium_block.json deleted file mode 100644 index 21eba8c..0000000 --- a/src/main/resources/assets/taiga/models/block/seismodium_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/seismodium_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/slaggold_ore.json b/src/main/resources/assets/taiga/models/block/slaggold_ore.json deleted file mode 100644 index 96a53ad..0000000 --- a/src/main/resources/assets/taiga/models/block/slaggold_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/slaggold_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/slagiron_ore.json b/src/main/resources/assets/taiga/models/block/slagiron_ore.json deleted file mode 100644 index d7d31c0..0000000 --- a/src/main/resources/assets/taiga/models/block/slagiron_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/slagiron_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/solarium_block.json b/src/main/resources/assets/taiga/models/block/solarium_block.json deleted file mode 100644 index 324858f..0000000 --- a/src/main/resources/assets/taiga/models/block/solarium_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/solarium_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/terramite_block.json b/src/main/resources/assets/taiga/models/block/terramite_block.json deleted file mode 100644 index baca263..0000000 --- a/src/main/resources/assets/taiga/models/block/terramite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/terramite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/tiberium_block.json b/src/main/resources/assets/taiga/models/block/tiberium_block.json deleted file mode 100644 index 91f83fa..0000000 --- a/src/main/resources/assets/taiga/models/block/tiberium_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/tiberium_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/tiberium_ore.json b/src/main/resources/assets/taiga/models/block/tiberium_ore.json deleted file mode 100644 index 2d9e06a..0000000 --- a/src/main/resources/assets/taiga/models/block/tiberium_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/tiberium_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/titanite_block.json b/src/main/resources/assets/taiga/models/block/titanite_block.json deleted file mode 100644 index 98ac398..0000000 --- a/src/main/resources/assets/taiga/models/block/titanite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/titanite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/titanite_ore.json b/src/main/resources/assets/taiga/models/block/titanite_ore.json deleted file mode 100644 index 16acda7..0000000 --- a/src/main/resources/assets/taiga/models/block/titanite_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/titanite_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/ultranite_block.json b/src/main/resources/assets/taiga/models/block/ultranite_block.json deleted file mode 100644 index afafb91..0000000 --- a/src/main/resources/assets/taiga/models/block/ultranite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/ultranite_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/vibranium_block.json b/src/main/resources/assets/taiga/models/block/vibranium_block.json deleted file mode 100644 index 14267d7..0000000 --- a/src/main/resources/assets/taiga/models/block/vibranium_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/vibranium_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/vibranium_ore.json b/src/main/resources/assets/taiga/models/block/vibranium_ore.json deleted file mode 100644 index c7c0e92..0000000 --- a/src/main/resources/assets/taiga/models/block/vibranium_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/vibranium_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/block/violium_block.json b/src/main/resources/assets/taiga/models/block/violium_block.json deleted file mode 100644 index 337d815..0000000 --- a/src/main/resources/assets/taiga/models/block/violium_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/violium_block" - } -} diff --git a/src/main/resources/assets/taiga/models/block/violium_ore.json b/src/main/resources/assets/taiga/models/block/violium_ore.json deleted file mode 100644 index 789a090..0000000 --- a/src/main/resources/assets/taiga/models/block/violium_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "taiga:blocks/violium_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/glimmercoal.json b/src/main/resources/assets/taiga/models/item/abyssum_dust.json similarity index 55% rename from src/main/resources/assets/taiga/models/item/glimmercoal.json rename to src/main/resources/assets/taiga/models/item/abyssum_dust.json index a59ef2f..abfb2f8 100644 --- a/src/main/resources/assets/taiga/models/item/glimmercoal.json +++ b/src/main/resources/assets/taiga/models/item/abyssum_dust.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/glimmercoal" + "layer0": "taiga:items/dust/abyssum" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/glimmer_pearl.json b/src/main/resources/assets/taiga/models/item/abyssum_ingot.json similarity index 54% rename from src/main/resources/assets/taiga/models/item/glimmer_pearl.json rename to src/main/resources/assets/taiga/models/item/abyssum_ingot.json index af88a36..46fcd7e 100644 --- a/src/main/resources/assets/taiga/models/item/glimmer_pearl.json +++ b/src/main/resources/assets/taiga/models/item/abyssum_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/glimmer_pearl" + "layer0": "taiga:items/ingot/abyssum" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/abyssum_nugget.json b/src/main/resources/assets/taiga/models/item/abyssum_nugget.json new file mode 100644 index 0000000..f89b7d3 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/abyssum_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/abyssum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/nitro_brick.json b/src/main/resources/assets/taiga/models/item/adamant_dust.json similarity index 55% rename from src/main/resources/assets/taiga/models/item/nitro_brick.json rename to src/main/resources/assets/taiga/models/item/adamant_dust.json index 1c40cca..734ec51 100644 --- a/src/main/resources/assets/taiga/models/item/nitro_brick.json +++ b/src/main/resources/assets/taiga/models/item/adamant_dust.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/nitro_brick" + "layer0": "taiga:items/dust/adamant" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/energy_pearl.json b/src/main/resources/assets/taiga/models/item/adamant_ingot.json similarity index 54% rename from src/main/resources/assets/taiga/models/item/energy_pearl.json rename to src/main/resources/assets/taiga/models/item/adamant_ingot.json index b058ac0..8799d26 100644 --- a/src/main/resources/assets/taiga/models/item/energy_pearl.json +++ b/src/main/resources/assets/taiga/models/item/adamant_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/energy_pearl" + "layer0": "taiga:items/ingot/adamant" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/adamant_nugget.json b/src/main/resources/assets/taiga/models/item/adamant_nugget.json new file mode 100644 index 0000000..e00ce56 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/adamant_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/adamant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/adamantite_block.json b/src/main/resources/assets/taiga/models/item/adamantite_block.json deleted file mode 100644 index e9179c6..0000000 --- a/src/main/resources/assets/taiga/models/item/adamantite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/adamantite_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/taiga/models/item/adamantite_ingot.json b/src/main/resources/assets/taiga/models/item/adamantite_ingot.json deleted file mode 100644 index 9d51e98..0000000 --- a/src/main/resources/assets/taiga/models/item/adamantite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/adamantite_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/adamantite_nugget.json b/src/main/resources/assets/taiga/models/item/adamantite_nugget.json deleted file mode 100644 index 2f54707..0000000 --- a/src/main/resources/assets/taiga/models/item/adamantite_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/adamantite_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/adamantite_ore.json b/src/main/resources/assets/taiga/models/item/adamantite_ore.json deleted file mode 100644 index 4a76672..0000000 --- a/src/main/resources/assets/taiga/models/item/adamantite_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/adamantite_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/aegisalt_block.json b/src/main/resources/assets/taiga/models/item/aegisalt_block.json deleted file mode 100644 index 5480b19..0000000 --- a/src/main/resources/assets/taiga/models/item/aegisalt_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/aegisalt_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/taiga/models/item/aegisalt_ingot.json b/src/main/resources/assets/taiga/models/item/aegisalt_ingot.json deleted file mode 100644 index 508be6b..0000000 --- a/src/main/resources/assets/taiga/models/item/aegisalt_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/aegisalt_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/arcanite_block.json b/src/main/resources/assets/taiga/models/item/arcanite_block.json deleted file mode 100644 index 2a0f81a..0000000 --- a/src/main/resources/assets/taiga/models/item/arcanite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/arcanite_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/taiga/models/item/arcanite_ingot.json b/src/main/resources/assets/taiga/models/item/arcanite_ingot.json deleted file mode 100644 index 84961de..0000000 --- a/src/main/resources/assets/taiga/models/item/arcanite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/arcanite_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/arcanite_nugget.json b/src/main/resources/assets/taiga/models/item/arcanite_nugget.json deleted file mode 100644 index 45e1bcd..0000000 --- a/src/main/resources/assets/taiga/models/item/arcanite_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/arcanite_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/arcanite_ore.json b/src/main/resources/assets/taiga/models/item/arcanite_ore.json deleted file mode 100644 index b01b08a..0000000 --- a/src/main/resources/assets/taiga/models/item/arcanite_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/arcanite_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/astrium_block.json b/src/main/resources/assets/taiga/models/item/astrium_block.json deleted file mode 100644 index d89d10d..0000000 --- a/src/main/resources/assets/taiga/models/item/astrium_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/astrium_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/taiga/models/item/astrium_dust.json b/src/main/resources/assets/taiga/models/item/astrium_dust.json new file mode 100644 index 0000000..80405b4 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/astrium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/astrium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/astrium_ingot.json b/src/main/resources/assets/taiga/models/item/astrium_ingot.json index 7f0d113..ec80257 100644 --- a/src/main/resources/assets/taiga/models/item/astrium_ingot.json +++ b/src/main/resources/assets/taiga/models/item/astrium_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/tic/astrium_ingot" + "layer0": "taiga:items/ingot/astrium" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/astrium_nugget.json b/src/main/resources/assets/taiga/models/item/astrium_nugget.json index 63a0130..6f79201 100644 --- a/src/main/resources/assets/taiga/models/item/astrium_nugget.json +++ b/src/main/resources/assets/taiga/models/item/astrium_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/astrium_nugget" + "layer0": "taiga:items/nugget/astrium" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/aurorium_dust.json b/src/main/resources/assets/taiga/models/item/aurorium_dust.json new file mode 100644 index 0000000..eaae4a3 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/aurorium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/aurorium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/aurorium_ingot.json b/src/main/resources/assets/taiga/models/item/aurorium_ingot.json new file mode 100644 index 0000000..cb4b63e --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/aurorium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/aurorium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/aurorium_nugget.json b/src/main/resources/assets/taiga/models/item/aurorium_nugget.json new file mode 100644 index 0000000..2945f14 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/aurorium_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/aurorium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/basalt.json b/src/main/resources/assets/taiga/models/item/basalt.json deleted file mode 100644 index 664d2e9..0000000 --- a/src/main/resources/assets/taiga/models/item/basalt.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/basalt", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/basalt_dust.json b/src/main/resources/assets/taiga/models/item/basalt_dust.json new file mode 100644 index 0000000..d87141c --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/basalt_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/basalt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/basalt_ingot.json b/src/main/resources/assets/taiga/models/item/basalt_ingot.json new file mode 100644 index 0000000..74e9ed6 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/basalt_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/basalt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/basalt_nugget.json b/src/main/resources/assets/taiga/models/item/basalt_nugget.json new file mode 100644 index 0000000..a8034c4 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/basalt_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/basalt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/bismuth_block.json b/src/main/resources/assets/taiga/models/item/bismuth_block.json deleted file mode 100644 index dc94827..0000000 --- a/src/main/resources/assets/taiga/models/item/bismuth_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/bismuth_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/taiga/models/item/bismuth_ingot.json b/src/main/resources/assets/taiga/models/item/bismuth_ingot.json deleted file mode 100644 index 6aaf99e..0000000 --- a/src/main/resources/assets/taiga/models/item/bismuth_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/bismuth_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/bismuth_nugget.json b/src/main/resources/assets/taiga/models/item/bismuth_nugget.json deleted file mode 100644 index c3f4fdc..0000000 --- a/src/main/resources/assets/taiga/models/item/bismuth_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/bismuth_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/bismuth_ore.json b/src/main/resources/assets/taiga/models/item/bismuth_ore.json deleted file mode 100644 index e0df8ef..0000000 --- a/src/main/resources/assets/taiga/models/item/bismuth_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/bismuth_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/bysmuid_block.json b/src/main/resources/assets/taiga/models/item/bysmuid_block.json deleted file mode 100644 index 99088d3..0000000 --- a/src/main/resources/assets/taiga/models/item/bysmuid_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/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/taiga/models/item/bysmuid_ingot.json b/src/main/resources/assets/taiga/models/item/bysmuid_ingot.json deleted file mode 100644 index 1ddab02..0000000 --- a/src/main/resources/assets/taiga/models/item/bysmuid_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/bysmuid_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/bysmuid_nugget.json b/src/main/resources/assets/taiga/models/item/bysmuid_nugget.json deleted file mode 100644 index 9b6c96c..0000000 --- a/src/main/resources/assets/taiga/models/item/bysmuid_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/bysmuid_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/cryptogen_block.json b/src/main/resources/assets/taiga/models/item/cryptogen_block.json deleted file mode 100644 index 944e57e..0000000 --- a/src/main/resources/assets/taiga/models/item/cryptogen_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/cryptogen_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/taiga/models/item/cryptogen_ingot.json b/src/main/resources/assets/taiga/models/item/cryptogen_ingot.json deleted file mode 100644 index 61228bf..0000000 --- a/src/main/resources/assets/taiga/models/item/cryptogen_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/cryptogen_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/cryptogen_nugget.json b/src/main/resources/assets/taiga/models/item/cryptogen_nugget.json deleted file mode 100644 index 3809976..0000000 --- a/src/main/resources/assets/taiga/models/item/cryptogen_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/cryptogen_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/duranite_dust.json b/src/main/resources/assets/taiga/models/item/duranite_dust.json new file mode 100644 index 0000000..231d8b6 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/duranite_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/duranite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/duranite_ingot.json b/src/main/resources/assets/taiga/models/item/duranite_ingot.json new file mode 100644 index 0000000..1ea1dc8 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/duranite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/duranite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/duranite_nugget.json b/src/main/resources/assets/taiga/models/item/duranite_nugget.json new file mode 100644 index 0000000..fcc66cb --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/duranite_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/duranite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/dyonite_block.json b/src/main/resources/assets/taiga/models/item/dyonite_block.json deleted file mode 100644 index 0e265a1..0000000 --- a/src/main/resources/assets/taiga/models/item/dyonite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/dyonite_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/taiga/models/item/dyonite_dust.json b/src/main/resources/assets/taiga/models/item/dyonite_dust.json new file mode 100644 index 0000000..83fe62c --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/dyonite_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/dyonite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/dyonite_ingot.json b/src/main/resources/assets/taiga/models/item/dyonite_ingot.json index 9477420..360070d 100644 --- a/src/main/resources/assets/taiga/models/item/dyonite_ingot.json +++ b/src/main/resources/assets/taiga/models/item/dyonite_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/tic/dyonite_ingot" + "layer0": "taiga:items/ingot/dyonite" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/dyonite_nugget.json b/src/main/resources/assets/taiga/models/item/dyonite_nugget.json index 1ca813f..d39df64 100644 --- a/src/main/resources/assets/taiga/models/item/dyonite_nugget.json +++ b/src/main/resources/assets/taiga/models/item/dyonite_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/dyonite_nugget" + "layer0": "taiga:items/nugget/dyonite" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/eezo_dust.json b/src/main/resources/assets/taiga/models/item/eezo_dust.json new file mode 100644 index 0000000..a455eb0 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/eezo_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/eezo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/eezo_ingot.json b/src/main/resources/assets/taiga/models/item/eezo_ingot.json new file mode 100644 index 0000000..69c2eaa --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/eezo_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/eezo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/eezo_nugget.json b/src/main/resources/assets/taiga/models/item/eezo_nugget.json new file mode 100644 index 0000000..5e1f1a5 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/eezo_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/eezo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/eternite_block.json b/src/main/resources/assets/taiga/models/item/eternite_block.json deleted file mode 100644 index dfcc402..0000000 --- a/src/main/resources/assets/taiga/models/item/eternite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/eternite_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/taiga/models/item/eternite_ingot.json b/src/main/resources/assets/taiga/models/item/eternite_ingot.json deleted file mode 100644 index a825ab8..0000000 --- a/src/main/resources/assets/taiga/models/item/eternite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/eternite_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/eternite_nugget.json b/src/main/resources/assets/taiga/models/item/eternite_nugget.json deleted file mode 100644 index 4f94d69..0000000 --- a/src/main/resources/assets/taiga/models/item/eternite_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/eternite_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/eternite_ore.json b/src/main/resources/assets/taiga/models/item/eternite_ore.json deleted file mode 100644 index a5459df..0000000 --- a/src/main/resources/assets/taiga/models/item/eternite_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/eternite_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/fractoryte_block.json b/src/main/resources/assets/taiga/models/item/fractoryte_block.json deleted file mode 100644 index 4e7f7dd..0000000 --- a/src/main/resources/assets/taiga/models/item/fractoryte_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/fractoryte_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/taiga/models/item/fractoryte_ingot.json b/src/main/resources/assets/taiga/models/item/fractoryte_ingot.json deleted file mode 100644 index 434b54c..0000000 --- a/src/main/resources/assets/taiga/models/item/fractoryte_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/fractoryte_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/fractoryte_nugget.json b/src/main/resources/assets/taiga/models/item/fractoryte_nugget.json deleted file mode 100644 index 40f5a6a..0000000 --- a/src/main/resources/assets/taiga/models/item/fractoryte_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/fractoryte_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/fractum_dust.json b/src/main/resources/assets/taiga/models/item/fractum_dust.json new file mode 100644 index 0000000..5cf75be --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/fractum_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/fractum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/fractum_ingot.json b/src/main/resources/assets/taiga/models/item/fractum_ingot.json new file mode 100644 index 0000000..83acabd --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/fractum_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/fractum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/fractum_nugget.json b/src/main/resources/assets/taiga/models/item/fractum_nugget.json new file mode 100644 index 0000000..40ad420 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/fractum_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/fractum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/fuel_brick.json b/src/main/resources/assets/taiga/models/item/fuel_brick.json deleted file mode 100644 index 59f0a97..0000000 --- a/src/main/resources/assets/taiga/models/item/fuel_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/fuel_brick" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/glimmerstone_dust.json b/src/main/resources/assets/taiga/models/item/glimmerstone_dust.json deleted file mode 100644 index ed00c38..0000000 --- a/src/main/resources/assets/taiga/models/item/glimmerstone_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/glimmerstone_dust" - } -} diff --git a/src/main/resources/assets/taiga/models/item/ignitite_block.json b/src/main/resources/assets/taiga/models/item/ignitite_block.json deleted file mode 100644 index 8a95e4b..0000000 --- a/src/main/resources/assets/taiga/models/item/ignitite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/ignitite_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/taiga/models/item/ignitite_ingot.json b/src/main/resources/assets/taiga/models/item/ignitite_ingot.json deleted file mode 100644 index 012f4fa..0000000 --- a/src/main/resources/assets/taiga/models/item/ignitite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/ignitite_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/ignitite_nugget.json b/src/main/resources/assets/taiga/models/item/ignitite_nugget.json deleted file mode 100644 index 114115a..0000000 --- a/src/main/resources/assets/taiga/models/item/ignitite_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/ignitite_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/ignitite_ore.json b/src/main/resources/assets/taiga/models/item/ignitite_ore.json deleted file mode 100644 index 3ebe3d6..0000000 --- a/src/main/resources/assets/taiga/models/item/ignitite_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/ignitite_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/ignitz_dust.json b/src/main/resources/assets/taiga/models/item/ignitz_dust.json new file mode 100644 index 0000000..f5e0782 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/ignitz_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/ignitz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/ignitz_ingot.json b/src/main/resources/assets/taiga/models/item/ignitz_ingot.json new file mode 100644 index 0000000..73303cb --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/ignitz_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/ignitz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/ignitz_nugget.json b/src/main/resources/assets/taiga/models/item/ignitz_nugget.json new file mode 100644 index 0000000..b8de1da --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/ignitz_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/ignitz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/imperomite_block.json b/src/main/resources/assets/taiga/models/item/imperomite_block.json deleted file mode 100644 index aae9a25..0000000 --- a/src/main/resources/assets/taiga/models/item/imperomite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/imperomite_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/taiga/models/item/imperomite_dust.json b/src/main/resources/assets/taiga/models/item/imperomite_dust.json new file mode 100644 index 0000000..bc46805 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/imperomite_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/imperomite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/imperomite_ingot.json b/src/main/resources/assets/taiga/models/item/imperomite_ingot.json index ac1b3ec..fbbc620 100644 --- a/src/main/resources/assets/taiga/models/item/imperomite_ingot.json +++ b/src/main/resources/assets/taiga/models/item/imperomite_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/tic/imperomite_ingot" + "layer0": "taiga:items/ingot/imperomite" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/imperomite_nugget.json b/src/main/resources/assets/taiga/models/item/imperomite_nugget.json index e2694cd..c953496 100644 --- a/src/main/resources/assets/taiga/models/item/imperomite_nugget.json +++ b/src/main/resources/assets/taiga/models/item/imperomite_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/imperomite_nugget" + "layer0": "taiga:items/nugget/imperomite" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/lignite2.json b/src/main/resources/assets/taiga/models/item/iox_dust.json similarity index 58% rename from src/main/resources/assets/taiga/models/item/lignite2.json rename to src/main/resources/assets/taiga/models/item/iox_dust.json index 5a2d713..042089b 100644 --- a/src/main/resources/assets/taiga/models/item/lignite2.json +++ b/src/main/resources/assets/taiga/models/item/iox_dust.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/lignite" + "layer0": "taiga:items/dust/iox" } } \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/iox_ingot.json b/src/main/resources/assets/taiga/models/item/iox_ingot.json new file mode 100644 index 0000000..7c3b031 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/iox_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/iox" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/iox_nugget.json b/src/main/resources/assets/taiga/models/item/iox_nugget.json new file mode 100644 index 0000000..cbe1f62 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/iox_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/iox" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/iron_nugget.json b/src/main/resources/assets/taiga/models/item/iron_nugget.json index 1e57190..2722100 100644 --- a/src/main/resources/assets/taiga/models/item/iron_nugget.json +++ b/src/main/resources/assets/taiga/models/item/iron_nugget.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/iron_nugget" - } + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/iron" + } } \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/karmesine_block.json b/src/main/resources/assets/taiga/models/item/karmesine_block.json deleted file mode 100644 index b26ef09..0000000 --- a/src/main/resources/assets/taiga/models/item/karmesine_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/karmesine_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/taiga/models/item/karmesine_dust.json b/src/main/resources/assets/taiga/models/item/karmesine_dust.json new file mode 100644 index 0000000..dae2a47 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/karmesine_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/karmesine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/karmesine_ingot.json b/src/main/resources/assets/taiga/models/item/karmesine_ingot.json index 140f91c..e824e5f 100644 --- a/src/main/resources/assets/taiga/models/item/karmesine_ingot.json +++ b/src/main/resources/assets/taiga/models/item/karmesine_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/karmesine_ingot" - } -} + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/karmesine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/karmesine_nugget.json b/src/main/resources/assets/taiga/models/item/karmesine_nugget.json index 7777013..e3f6569 100644 --- a/src/main/resources/assets/taiga/models/item/karmesine_nugget.json +++ b/src/main/resources/assets/taiga/models/item/karmesine_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/karmesine_nugget" + "layer0": "taiga:items/nugget/karmesine" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/karmesine_ore.json b/src/main/resources/assets/taiga/models/item/karmesine_ore.json deleted file mode 100644 index dd7fb2a..0000000 --- a/src/main/resources/assets/taiga/models/item/karmesine_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/karmesine_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/lignite.json b/src/main/resources/assets/taiga/models/item/lignite.json deleted file mode 100644 index 209272f..0000000 --- a/src/main/resources/assets/taiga/models/item/lignite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/lignite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/lignite_ore.json b/src/main/resources/assets/taiga/models/item/lignite_ore.json deleted file mode 100644 index 27ad4cc..0000000 --- a/src/main/resources/assets/taiga/models/item/lignite_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/lignite_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/luminar_dust.json b/src/main/resources/assets/taiga/models/item/luminar_dust.json deleted file mode 100644 index c34c3aa..0000000 --- a/src/main/resources/assets/taiga/models/item/luminar_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/luminar_dust" - } -} diff --git a/src/main/resources/assets/taiga/models/item/lumix_dust.json b/src/main/resources/assets/taiga/models/item/lumix_dust.json new file mode 100644 index 0000000..d1ad3ab --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/lumix_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/lumix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/lumix_ingot.json b/src/main/resources/assets/taiga/models/item/lumix_ingot.json new file mode 100644 index 0000000..142665e --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/lumix_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/lumix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/lumix_nugget.json b/src/main/resources/assets/taiga/models/item/lumix_nugget.json new file mode 100644 index 0000000..475b1b3 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/lumix_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/lumix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/lumixyl_block.json b/src/main/resources/assets/taiga/models/item/lumixyl_block.json deleted file mode 100644 index 844be06..0000000 --- a/src/main/resources/assets/taiga/models/item/lumixyl_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/lumixyl_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/taiga/models/item/lumixyl_ingot.json b/src/main/resources/assets/taiga/models/item/lumixyl_ingot.json deleted file mode 100644 index 4f1860d..0000000 --- a/src/main/resources/assets/taiga/models/item/lumixyl_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/lumixyl_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/lumixyl_nugget.json b/src/main/resources/assets/taiga/models/item/lumixyl_nugget.json deleted file mode 100644 index f4bf1cf..0000000 --- a/src/main/resources/assets/taiga/models/item/lumixyl_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/lumixyl_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/meteorite_block.json b/src/main/resources/assets/taiga/models/item/meteorite_block.json deleted file mode 100644 index 8c679ec..0000000 --- a/src/main/resources/assets/taiga/models/item/meteorite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/meteorite_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/taiga/models/item/meteorite_dust.json b/src/main/resources/assets/taiga/models/item/meteorite_dust.json new file mode 100644 index 0000000..b75203b --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/meteorite_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/meteorite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/meteorite_ingot.json b/src/main/resources/assets/taiga/models/item/meteorite_ingot.json index f5d2c65..5cb7e80 100644 --- a/src/main/resources/assets/taiga/models/item/meteorite_ingot.json +++ b/src/main/resources/assets/taiga/models/item/meteorite_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/meteorite_ingot" - } -} + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/meteorite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/meteorite_nugget.json b/src/main/resources/assets/taiga/models/item/meteorite_nugget.json index 2216ae2..9266051 100644 --- a/src/main/resources/assets/taiga/models/item/meteorite_nugget.json +++ b/src/main/resources/assets/taiga/models/item/meteorite_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/meteorite_nugget" + "layer0": "taiga:items/nugget/meteorite" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/meteorite_ore.json b/src/main/resources/assets/taiga/models/item/meteorite_ore.json deleted file mode 100644 index 17ad724..0000000 --- a/src/main/resources/assets/taiga/models/item/meteorite_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/meteorite_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/mindorite_block.json b/src/main/resources/assets/taiga/models/item/mindorite_block.json deleted file mode 100644 index 94a9dea..0000000 --- a/src/main/resources/assets/taiga/models/item/mindorite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/mindorite_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/taiga/models/item/mindorite_ingot.json b/src/main/resources/assets/taiga/models/item/mindorite_ingot.json deleted file mode 100644 index c23d6cd..0000000 --- a/src/main/resources/assets/taiga/models/item/mindorite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/mindorite_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/mindorite_nugget.json b/src/main/resources/assets/taiga/models/item/mindorite_nugget.json deleted file mode 100644 index 9d3ff77..0000000 --- a/src/main/resources/assets/taiga/models/item/mindorite_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/mindorite_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/mindorite_ore.json b/src/main/resources/assets/taiga/models/item/mindorite_ore.json deleted file mode 100644 index 69e15e8..0000000 --- a/src/main/resources/assets/taiga/models/item/mindorite_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/mindorite_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/mythril_block.json b/src/main/resources/assets/taiga/models/item/mythril_block.json deleted file mode 100644 index 174bfa3..0000000 --- a/src/main/resources/assets/taiga/models/item/mythril_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/mythril_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/taiga/models/item/mythril_ingot.json b/src/main/resources/assets/taiga/models/item/mythril_ingot.json deleted file mode 100644 index 8b2d9f8..0000000 --- a/src/main/resources/assets/taiga/models/item/mythril_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/mythril_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/mythril_nugget.json b/src/main/resources/assets/taiga/models/item/mythril_nugget.json deleted file mode 100644 index f2a449b..0000000 --- a/src/main/resources/assets/taiga/models/item/mythril_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/mythril_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/mythril_ore.json b/src/main/resources/assets/taiga/models/item/mythril_ore.json deleted file mode 100644 index 28b1cd4..0000000 --- a/src/main/resources/assets/taiga/models/item/mythril_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/mythril_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/nihilite_dust.json b/src/main/resources/assets/taiga/models/item/nihilite_dust.json new file mode 100644 index 0000000..9a69b25 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/nihilite_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/nihilite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/nihilite_ingot.json b/src/main/resources/assets/taiga/models/item/nihilite_ingot.json new file mode 100644 index 0000000..d207db6 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/nihilite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/nihilite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/nihilite_nugget.json b/src/main/resources/assets/taiga/models/item/nihilite_nugget.json new file mode 100644 index 0000000..a6a123c --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/nihilite_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/nihilite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/niob_dust.json b/src/main/resources/assets/taiga/models/item/niob_dust.json new file mode 100644 index 0000000..5e6be07 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/niob_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/niob" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/niob_ingot.json b/src/main/resources/assets/taiga/models/item/niob_ingot.json new file mode 100644 index 0000000..f2f41d1 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/niob_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/niob" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/niob_nugget.json b/src/main/resources/assets/taiga/models/item/niob_nugget.json new file mode 100644 index 0000000..b9e4670 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/niob_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/niob" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/nitronite_block.json b/src/main/resources/assets/taiga/models/item/nitronite_block.json deleted file mode 100644 index 8ffdf79..0000000 --- a/src/main/resources/assets/taiga/models/item/nitronite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/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/taiga/models/item/nitronite_ingot.json b/src/main/resources/assets/taiga/models/item/nitronite_ingot.json deleted file mode 100644 index faa44e2..0000000 --- a/src/main/resources/assets/taiga/models/item/nitronite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/nitronite_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/nitronite_nugget.json b/src/main/resources/assets/taiga/models/item/nitronite_nugget.json deleted file mode 100644 index 07b2965..0000000 --- a/src/main/resources/assets/taiga/models/item/nitronite_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/nitronite_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/noctunyx_block.json b/src/main/resources/assets/taiga/models/item/noctunyx_block.json deleted file mode 100644 index fb4f3fd..0000000 --- a/src/main/resources/assets/taiga/models/item/noctunyx_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/noctunyx_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/taiga/models/item/noctunyx_ingot.json b/src/main/resources/assets/taiga/models/item/noctunyx_ingot.json deleted file mode 100644 index 80db035..0000000 --- a/src/main/resources/assets/taiga/models/item/noctunyx_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/noctunyx_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/noctunyx_nugget.json b/src/main/resources/assets/taiga/models/item/noctunyx_nugget.json deleted file mode 100644 index 48e7092..0000000 --- a/src/main/resources/assets/taiga/models/item/noctunyx_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/noctunyx_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/nucleum_block.json b/src/main/resources/assets/taiga/models/item/nucleum_block.json deleted file mode 100644 index e626f98..0000000 --- a/src/main/resources/assets/taiga/models/item/nucleum_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/nucleum_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/taiga/models/item/nucleum_dust.json b/src/main/resources/assets/taiga/models/item/nucleum_dust.json new file mode 100644 index 0000000..e22c116 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/nucleum_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/nucleum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/nucleum_ingot.json b/src/main/resources/assets/taiga/models/item/nucleum_ingot.json index c885daa..469b9c7 100644 --- a/src/main/resources/assets/taiga/models/item/nucleum_ingot.json +++ b/src/main/resources/assets/taiga/models/item/nucleum_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/tic/nucleum_ingot" + "layer0": "taiga:items/ingot/nucleum" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/nucleum_nugget.json b/src/main/resources/assets/taiga/models/item/nucleum_nugget.json index b92f0b0..3a5a192 100644 --- a/src/main/resources/assets/taiga/models/item/nucleum_nugget.json +++ b/src/main/resources/assets/taiga/models/item/nucleum_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/nucleum_nugget" + "layer0": "taiga:items/nugget/nucleum" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/aegisalt_nugget.json b/src/main/resources/assets/taiga/models/item/obsidiorite_dust.json similarity index 53% rename from src/main/resources/assets/taiga/models/item/aegisalt_nugget.json rename to src/main/resources/assets/taiga/models/item/obsidiorite_dust.json index c749a51..80bfcf3 100644 --- a/src/main/resources/assets/taiga/models/item/aegisalt_nugget.json +++ b/src/main/resources/assets/taiga/models/item/obsidiorite_dust.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/aegisalt_nugget" + "layer0": "taiga:items/dust/obsidiorite" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/obsidiorite_ingot.json b/src/main/resources/assets/taiga/models/item/obsidiorite_ingot.json new file mode 100644 index 0000000..678aff1 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/obsidiorite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/obsidiorite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/obsidiorite_nugget.json b/src/main/resources/assets/taiga/models/item/obsidiorite_nugget.json new file mode 100644 index 0000000..4e2769f --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/obsidiorite_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/obsidiorite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/osram_dust.json b/src/main/resources/assets/taiga/models/item/osram_dust.json new file mode 100644 index 0000000..8564a98 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/osram_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/osram" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/osram_ingot.json b/src/main/resources/assets/taiga/models/item/osram_ingot.json new file mode 100644 index 0000000..5a56e2c --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/osram_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/osram" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/osram_nugget.json b/src/main/resources/assets/taiga/models/item/osram_nugget.json new file mode 100644 index 0000000..77cc104 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/osram_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/osram" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/palladium_block.json b/src/main/resources/assets/taiga/models/item/palladium_block.json deleted file mode 100644 index 3615103..0000000 --- a/src/main/resources/assets/taiga/models/item/palladium_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/palladium_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/taiga/models/item/palladium_dust.json b/src/main/resources/assets/taiga/models/item/palladium_dust.json new file mode 100644 index 0000000..d5f21eb --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/palladium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/palladium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/palladium_ingot.json b/src/main/resources/assets/taiga/models/item/palladium_ingot.json index c671234..f922329 100644 --- a/src/main/resources/assets/taiga/models/item/palladium_ingot.json +++ b/src/main/resources/assets/taiga/models/item/palladium_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/palladium_ingot" - } -} + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/palladium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/palladium_nugget.json b/src/main/resources/assets/taiga/models/item/palladium_nugget.json index 215f4a5..305211f 100644 --- a/src/main/resources/assets/taiga/models/item/palladium_nugget.json +++ b/src/main/resources/assets/taiga/models/item/palladium_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/palladium_nugget" + "layer0": "taiga:items/nugget/palladium" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/palladium_ore.json b/src/main/resources/assets/taiga/models/item/palladium_ore.json deleted file mode 100644 index ae04cb2..0000000 --- a/src/main/resources/assets/taiga/models/item/palladium_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/palladium_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/prometheum_block.json b/src/main/resources/assets/taiga/models/item/prometheum_block.json deleted file mode 100644 index 4ee46a8..0000000 --- a/src/main/resources/assets/taiga/models/item/prometheum_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/prometheum_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/taiga/models/item/prometheum_dust.json b/src/main/resources/assets/taiga/models/item/prometheum_dust.json new file mode 100644 index 0000000..8094a39 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/prometheum_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/prometheum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/prometheum_ingot.json b/src/main/resources/assets/taiga/models/item/prometheum_ingot.json index 8471608..5a0b9d4 100644 --- a/src/main/resources/assets/taiga/models/item/prometheum_ingot.json +++ b/src/main/resources/assets/taiga/models/item/prometheum_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/prometheum_ingot" - } -} + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/prometheum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/prometheum_nugget.json b/src/main/resources/assets/taiga/models/item/prometheum_nugget.json index babd346..581db2f 100644 --- a/src/main/resources/assets/taiga/models/item/prometheum_nugget.json +++ b/src/main/resources/assets/taiga/models/item/prometheum_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/prometheum_nugget" + "layer0": "taiga:items/nugget/prometheum" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/prometheum_ore.json b/src/main/resources/assets/taiga/models/item/prometheum_ore.json deleted file mode 100644 index 7987d25..0000000 --- a/src/main/resources/assets/taiga/models/item/prometheum_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/prometheum_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/proxideum_block.json b/src/main/resources/assets/taiga/models/item/proxideum_block.json deleted file mode 100644 index 5ceab96..0000000 --- a/src/main/resources/assets/taiga/models/item/proxideum_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/proxideum_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/taiga/models/item/proxideum_ingot.json b/src/main/resources/assets/taiga/models/item/proxideum_ingot.json deleted file mode 100644 index b55dcfa..0000000 --- a/src/main/resources/assets/taiga/models/item/proxideum_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/proxideum_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/proxideum_nugget.json b/src/main/resources/assets/taiga/models/item/proxideum_nugget.json deleted file mode 100644 index 87d9ece..0000000 --- a/src/main/resources/assets/taiga/models/item/proxideum_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/proxideum_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/proxii_dust.json b/src/main/resources/assets/taiga/models/item/proxii_dust.json new file mode 100644 index 0000000..cbbf8aa --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/proxii_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/proxii" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/proxii_ingot.json b/src/main/resources/assets/taiga/models/item/proxii_ingot.json new file mode 100644 index 0000000..3c3faa7 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/proxii_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/proxii" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/proxii_nugget.json b/src/main/resources/assets/taiga/models/item/proxii_nugget.json new file mode 100644 index 0000000..e23c880 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/proxii_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/proxii" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/radiant_pearl.json b/src/main/resources/assets/taiga/models/item/radiant_pearl.json deleted file mode 100644 index 6051361..0000000 --- a/src/main/resources/assets/taiga/models/item/radiant_pearl.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/radiant_pearl" - } -} diff --git a/src/main/resources/assets/taiga/models/item/rotten_ground.json b/src/main/resources/assets/taiga/models/item/rotten_ground.json deleted file mode 100644 index caba235..0000000 --- a/src/main/resources/assets/taiga/models/item/rotten_ground.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/rotten_ground", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/rubium_block.json b/src/main/resources/assets/taiga/models/item/rubium_block.json deleted file mode 100644 index 29b897d..0000000 --- a/src/main/resources/assets/taiga/models/item/rubium_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/rubium_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/taiga/models/item/rubium_ingot.json b/src/main/resources/assets/taiga/models/item/rubium_ingot.json deleted file mode 100644 index 6a15be0..0000000 --- a/src/main/resources/assets/taiga/models/item/rubium_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/rubium_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/rubium_nugget.json b/src/main/resources/assets/taiga/models/item/rubium_nugget.json deleted file mode 100644 index cad9445..0000000 --- a/src/main/resources/assets/taiga/models/item/rubium_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/rubium_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/rubium_ore.json b/src/main/resources/assets/taiga/models/item/rubium_ore.json deleted file mode 100644 index 41d040e..0000000 --- a/src/main/resources/assets/taiga/models/item/rubium_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/rubium_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/seismodium_block.json b/src/main/resources/assets/taiga/models/item/seismodium_block.json deleted file mode 100644 index a4a5e5c..0000000 --- a/src/main/resources/assets/taiga/models/item/seismodium_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/seismodium_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/taiga/models/item/seismodium_ingot.json b/src/main/resources/assets/taiga/models/item/seismodium_ingot.json deleted file mode 100644 index dc2fd45..0000000 --- a/src/main/resources/assets/taiga/models/item/seismodium_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/seismodium_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/seismodium_nugget.json b/src/main/resources/assets/taiga/models/item/seismodium_nugget.json deleted file mode 100644 index 5762b21..0000000 --- a/src/main/resources/assets/taiga/models/item/seismodium_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/seismodium_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/seismum_dust.json b/src/main/resources/assets/taiga/models/item/seismum_dust.json new file mode 100644 index 0000000..755435e --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/seismum_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/seismum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/seismum_ingot.json b/src/main/resources/assets/taiga/models/item/seismum_ingot.json new file mode 100644 index 0000000..87c40ee --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/seismum_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/seismum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/seismum_nugget.json b/src/main/resources/assets/taiga/models/item/seismum_nugget.json new file mode 100644 index 0000000..a78ec32 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/seismum_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/seismum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/slaggold_ingot.json b/src/main/resources/assets/taiga/models/item/slaggold_ingot.json deleted file mode 100644 index 84098e1..0000000 --- a/src/main/resources/assets/taiga/models/item/slaggold_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/slaggold_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/slaggold_ore.json b/src/main/resources/assets/taiga/models/item/slaggold_ore.json deleted file mode 100644 index 8ccd6d5..0000000 --- a/src/main/resources/assets/taiga/models/item/slaggold_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/slaggold_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/slagiron_ingot.json b/src/main/resources/assets/taiga/models/item/slagiron_ingot.json deleted file mode 100644 index 7d8c90c..0000000 --- a/src/main/resources/assets/taiga/models/item/slagiron_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/slagiron_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/slagiron_ore.json b/src/main/resources/assets/taiga/models/item/slagiron_ore.json deleted file mode 100644 index f6b8d18..0000000 --- a/src/main/resources/assets/taiga/models/item/slagiron_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/slagiron_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/solarium_block.json b/src/main/resources/assets/taiga/models/item/solarium_block.json deleted file mode 100644 index bb7cbb2..0000000 --- a/src/main/resources/assets/taiga/models/item/solarium_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga: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/taiga/models/item/solarium_dust.json b/src/main/resources/assets/taiga/models/item/solarium_dust.json new file mode 100644 index 0000000..7ec4254 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/solarium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/solarium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/solarium_ingot.json b/src/main/resources/assets/taiga/models/item/solarium_ingot.json index 0bfae24..40369b9 100644 --- a/src/main/resources/assets/taiga/models/item/solarium_ingot.json +++ b/src/main/resources/assets/taiga/models/item/solarium_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/tic/solarium_ingot" + "layer0": "taiga:items/ingot/solarium" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/solarium_nugget.json b/src/main/resources/assets/taiga/models/item/solarium_nugget.json index 5d41019..dc1578f 100644 --- a/src/main/resources/assets/taiga/models/item/solarium_nugget.json +++ b/src/main/resources/assets/taiga/models/item/solarium_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/solarium_nugget" + "layer0": "taiga:items/nugget/solarium" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/spectrum_dust.json b/src/main/resources/assets/taiga/models/item/spectrum_dust.json deleted file mode 100644 index 772fb80..0000000 --- a/src/main/resources/assets/taiga/models/item/spectrum_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/spectrum_dust" - } -} diff --git a/src/main/resources/assets/taiga/models/item/terramite_block.json b/src/main/resources/assets/taiga/models/item/terramite_block.json deleted file mode 100644 index ed5335f..0000000 --- a/src/main/resources/assets/taiga/models/item/terramite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/terramite_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/taiga/models/item/terramite_ingot.json b/src/main/resources/assets/taiga/models/item/terramite_ingot.json deleted file mode 100644 index eb61789..0000000 --- a/src/main/resources/assets/taiga/models/item/terramite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/terramite_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/terramite_nugget.json b/src/main/resources/assets/taiga/models/item/terramite_nugget.json deleted file mode 100644 index 34f165d..0000000 --- a/src/main/resources/assets/taiga/models/item/terramite_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/terramite_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/tiberium_block.json b/src/main/resources/assets/taiga/models/item/tiberium_block.json deleted file mode 100644 index 8b8f049..0000000 --- a/src/main/resources/assets/taiga/models/item/tiberium_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/tiberium_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/taiga/models/item/tiberium_dust.json b/src/main/resources/assets/taiga/models/item/tiberium_dust.json new file mode 100644 index 0000000..e92eedb --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/tiberium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/tiberium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/tiberium_ingot.json b/src/main/resources/assets/taiga/models/item/tiberium_ingot.json index 9c8c804..6c080d6 100644 --- a/src/main/resources/assets/taiga/models/item/tiberium_ingot.json +++ b/src/main/resources/assets/taiga/models/item/tiberium_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/tiberium_ingot" - } -} + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/tiberium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/tiberium_nugget.json b/src/main/resources/assets/taiga/models/item/tiberium_nugget.json index cfc4ef2..0389288 100644 --- a/src/main/resources/assets/taiga/models/item/tiberium_nugget.json +++ b/src/main/resources/assets/taiga/models/item/tiberium_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/tiberium_nugget" + "layer0": "taiga:items/nugget/tiberium" } } \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/tiberium_ore.json b/src/main/resources/assets/taiga/models/item/tiberium_ore.json deleted file mode 100644 index bf90e8e..0000000 --- a/src/main/resources/assets/taiga/models/item/tiberium_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/tiberium_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/tiberium_shard_instable.json b/src/main/resources/assets/taiga/models/item/tiberium_shard_instable.json deleted file mode 100644 index f884ae4..0000000 --- a/src/main/resources/assets/taiga/models/item/tiberium_shard_instable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tiberium_shard_instable" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/titanite_block.json b/src/main/resources/assets/taiga/models/item/titanite_block.json deleted file mode 100644 index 766c218..0000000 --- a/src/main/resources/assets/taiga/models/item/titanite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga: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/taiga/models/item/titanite_ingot.json b/src/main/resources/assets/taiga/models/item/titanite_ingot.json deleted file mode 100644 index 4328198..0000000 --- a/src/main/resources/assets/taiga/models/item/titanite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/titanite_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/titanite_nugget.json b/src/main/resources/assets/taiga/models/item/titanite_nugget.json deleted file mode 100644 index cad6a9f..0000000 --- a/src/main/resources/assets/taiga/models/item/titanite_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/titanite_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/titanite_ore.json b/src/main/resources/assets/taiga/models/item/titanite_ore.json deleted file mode 100644 index 54f0903..0000000 --- a/src/main/resources/assets/taiga/models/item/titanite_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/titanite_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/triberium_dust.json b/src/main/resources/assets/taiga/models/item/triberium_dust.json new file mode 100644 index 0000000..de4783f --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/triberium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/triberium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/triberium_ingot.json b/src/main/resources/assets/taiga/models/item/triberium_ingot.json new file mode 100644 index 0000000..19840ae --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/triberium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/triberium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/anthracite_dust.json b/src/main/resources/assets/taiga/models/item/triberium_nugget.json similarity index 53% rename from src/main/resources/assets/taiga/models/item/anthracite_dust.json rename to src/main/resources/assets/taiga/models/item/triberium_nugget.json index afac53d..3a27a36 100644 --- a/src/main/resources/assets/taiga/models/item/anthracite_dust.json +++ b/src/main/resources/assets/taiga/models/item/triberium_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/anthracite_dust" + "layer0": "taiga:items/nugget/triberium" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/tritonite_dust.json b/src/main/resources/assets/taiga/models/item/tritonite_dust.json new file mode 100644 index 0000000..2c9b771 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/tritonite_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/tritonite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/tritonite_ingot.json b/src/main/resources/assets/taiga/models/item/tritonite_ingot.json new file mode 100644 index 0000000..faf13c7 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/tritonite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/tritonite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/tritonite_nugget.json b/src/main/resources/assets/taiga/models/item/tritonite_nugget.json new file mode 100644 index 0000000..9bac344 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/tritonite_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/tritonite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/ultranite_block.json b/src/main/resources/assets/taiga/models/item/ultranite_block.json deleted file mode 100644 index f7a19ee..0000000 --- a/src/main/resources/assets/taiga/models/item/ultranite_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/ultranite_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/taiga/models/item/ultranite_ingot.json b/src/main/resources/assets/taiga/models/item/ultranite_ingot.json deleted file mode 100644 index 66881f2..0000000 --- a/src/main/resources/assets/taiga/models/item/ultranite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/ultranite_ingot" - } -} diff --git a/src/main/resources/assets/taiga/models/item/ultranite_nugget.json b/src/main/resources/assets/taiga/models/item/ultranite_nugget.json deleted file mode 100644 index 4c6fe0c..0000000 --- a/src/main/resources/assets/taiga/models/item/ultranite_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/ultranite_nugget" - } -} diff --git a/src/main/resources/assets/taiga/models/item/lignite3.json b/src/main/resources/assets/taiga/models/item/uru_dust.json similarity index 58% rename from src/main/resources/assets/taiga/models/item/lignite3.json rename to src/main/resources/assets/taiga/models/item/uru_dust.json index 5a2d713..b96271b 100644 --- a/src/main/resources/assets/taiga/models/item/lignite3.json +++ b/src/main/resources/assets/taiga/models/item/uru_dust.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/lignite" + "layer0": "taiga:items/dust/uru" } } \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/uru_ingot.json b/src/main/resources/assets/taiga/models/item/uru_ingot.json new file mode 100644 index 0000000..237c329 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/uru_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/uru" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/uru_nugget.json b/src/main/resources/assets/taiga/models/item/uru_nugget.json new file mode 100644 index 0000000..114d4c1 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/uru_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/uru" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/valyrium_dust.json b/src/main/resources/assets/taiga/models/item/valyrium_dust.json new file mode 100644 index 0000000..c059535 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/valyrium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/valyrium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/valyrium_ingot.json b/src/main/resources/assets/taiga/models/item/valyrium_ingot.json new file mode 100644 index 0000000..c68e188 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/valyrium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/valyrium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/valyrium_nugget.json b/src/main/resources/assets/taiga/models/item/valyrium_nugget.json new file mode 100644 index 0000000..68b9762 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/valyrium_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/valyrium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/vibranium_block.json b/src/main/resources/assets/taiga/models/item/vibranium_block.json deleted file mode 100644 index ae004f6..0000000 --- a/src/main/resources/assets/taiga/models/item/vibranium_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga:block/vibranium_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/taiga/models/item/vibranium_dust.json b/src/main/resources/assets/taiga/models/item/vibranium_dust.json new file mode 100644 index 0000000..60588e7 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/vibranium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/vibranium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/vibranium_ingot.json b/src/main/resources/assets/taiga/models/item/vibranium_ingot.json index 0120e95..7705d25 100644 --- a/src/main/resources/assets/taiga/models/item/vibranium_ingot.json +++ b/src/main/resources/assets/taiga/models/item/vibranium_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/vibranium_ingot" - } -} + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/vibranium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/vibranium_nugget.json b/src/main/resources/assets/taiga/models/item/vibranium_nugget.json index 2487e58..06b7505 100644 --- a/src/main/resources/assets/taiga/models/item/vibranium_nugget.json +++ b/src/main/resources/assets/taiga/models/item/vibranium_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/vibranium_nugget" + "layer0": "taiga:items/nugget/vibranium" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/vibranium_ore.json b/src/main/resources/assets/taiga/models/item/vibranium_ore.json deleted file mode 100644 index 93befcb..0000000 --- a/src/main/resources/assets/taiga/models/item/vibranium_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/vibranium_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/violium_block.json b/src/main/resources/assets/taiga/models/item/violium_block.json deleted file mode 100644 index ad6cde8..0000000 --- a/src/main/resources/assets/taiga/models/item/violium_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "taiga: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/taiga/models/item/violium_dust.json b/src/main/resources/assets/taiga/models/item/violium_dust.json new file mode 100644 index 0000000..cd86552 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/violium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/violium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/violium_ingot.json b/src/main/resources/assets/taiga/models/item/violium_ingot.json index bd7d129..da3ea31 100644 --- a/src/main/resources/assets/taiga/models/item/violium_ingot.json +++ b/src/main/resources/assets/taiga/models/item/violium_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "taiga:items/tic/violium_ingot" - } -} + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/violium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/violium_nugget.json b/src/main/resources/assets/taiga/models/item/violium_nugget.json index 462c71d..dbff815 100644 --- a/src/main/resources/assets/taiga/models/item/violium_nugget.json +++ b/src/main/resources/assets/taiga/models/item/violium_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "taiga:items/violium_nugget" + "layer0": "taiga:items/nugget/violium" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/violium_ore.json b/src/main/resources/assets/taiga/models/item/violium_ore.json deleted file mode 100644 index 627b3e2..0000000 --- a/src/main/resources/assets/taiga/models/item/violium_ore.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "taiga:block/violium_ore", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/yrdeen_dust.json b/src/main/resources/assets/taiga/models/item/yrdeen_dust.json new file mode 100644 index 0000000..4af2f8a --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/yrdeen_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/yrdeen" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/yrdeen_ingot.json b/src/main/resources/assets/taiga/models/item/yrdeen_ingot.json new file mode 100644 index 0000000..6ee0ae1 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/yrdeen_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/yrdeen" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/yrdeen_nugget.json b/src/main/resources/assets/taiga/models/item/yrdeen_nugget.json new file mode 100644 index 0000000..926e9dd --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/yrdeen_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/yrdeen" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/textures/a1.json b/src/main/resources/assets/taiga/textures/a1.json new file mode 100644 index 0000000..3110aa1 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/a1.json @@ -0,0 +1,4 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ \ No newline at end of file diff --git a/src/main/resources/assets/taiga/textures/a2.json b/src/main/resources/assets/taiga/textures/a2.json new file mode 100644 index 0000000..5e3963c --- /dev/null +++ b/src/main/resources/assets/taiga/textures/a2.json @@ -0,0 +1,2 @@ +} +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png b/src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png deleted file mode 100644 index c0ccaa8..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png b/src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png deleted file mode 100644 index f25e468..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/abyssum.png b/src/main/resources/assets/taiga/textures/blocks/block/abyssum.png new file mode 100644 index 0000000..61af1b0 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/abyssum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/adamantite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/adamant.png similarity index 93% rename from src/main/resources/assets/taiga/textures/blocks/adamantite_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/adamant.png index f67fec9..02a1600 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/adamantite_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/adamant.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/astrium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/astrium.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/astrium_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/astrium.png index 9081516..41fc303 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/astrium_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/astrium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/bismuth_block.png b/src/main/resources/assets/taiga/textures/blocks/block/aurorium.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/bismuth_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/aurorium.png index 52bed7a..c01a0a6 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/bismuth_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/aurorium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/basalt.png b/src/main/resources/assets/taiga/textures/blocks/block/basalt.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/basalt.png rename to src/main/resources/assets/taiga/textures/blocks/block/basalt.png index 9c99a1d..89b1bc0 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/basalt.png and b/src/main/resources/assets/taiga/textures/blocks/block/basalt.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/vibranium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/duranite.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/vibranium_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/duranite.png index 71e61c1..33ebb6f 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/vibranium_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/duranite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/dyonite.png b/src/main/resources/assets/taiga/textures/blocks/block/dyonite.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/materials/dyonite.png rename to src/main/resources/assets/taiga/textures/blocks/block/dyonite.png index 1f0d20a..8c62c2c 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/dyonite.png and b/src/main/resources/assets/taiga/textures/blocks/block/dyonite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/meteorite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/eezo.png similarity index 93% rename from src/main/resources/assets/taiga/textures/blocks/meteorite_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/eezo.png index 291df0d..31f6995 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/meteorite_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/eezo.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/fractoryte_block.png b/src/main/resources/assets/taiga/textures/blocks/block/fractum.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/fractoryte_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/fractum.png index 72a39cb..1385cb2 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/fractoryte_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/fractum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ignitite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/ignitz.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/ignitite_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/ignitz.png index 367e093..6b6b469 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/ignitite_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/ignitz.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/imperomite.png b/src/main/resources/assets/taiga/textures/blocks/block/imperomite.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/materials/imperomite.png rename to src/main/resources/assets/taiga/textures/blocks/block/imperomite.png index 9bd120b..eec6810 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/imperomite.png and b/src/main/resources/assets/taiga/textures/blocks/block/imperomite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/seismodium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/iox.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/seismodium_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/iox.png index 32f7eba..b83e533 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/seismodium_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/iox.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/karmesine_block.png b/src/main/resources/assets/taiga/textures/blocks/block/karmesine.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/karmesine_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/karmesine.png index aba4464..aa4fbaf 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/karmesine_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/karmesine.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/lumixyl_block.png b/src/main/resources/assets/taiga/textures/blocks/block/lumix.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/lumixyl_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/lumix.png index a3f39a2..9fabbf5 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/lumixyl_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/lumix.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/meteorite.png b/src/main/resources/assets/taiga/textures/blocks/block/meteorite.png new file mode 100644 index 0000000..9fa9f7c Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/meteorite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png b/src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png new file mode 100644 index 0000000..52bd818 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/nihilite.png b/src/main/resources/assets/taiga/textures/blocks/block/nihilite.png new file mode 100644 index 0000000..7ac79e9 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/nihilite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/violium_nugget.png b/src/main/resources/assets/taiga/textures/blocks/block/niob.png similarity index 92% rename from src/main/resources/assets/taiga/textures/items/violium_nugget.png rename to src/main/resources/assets/taiga/textures/blocks/block/niob.png index 94b9b32..237de66 100644 Binary files a/src/main/resources/assets/taiga/textures/items/violium_nugget.png and b/src/main/resources/assets/taiga/textures/blocks/block/niob.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/aegisalt_block.png b/src/main/resources/assets/taiga/textures/blocks/block/nucleum.png similarity index 93% rename from src/main/resources/assets/taiga/textures/blocks/aegisalt_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/nucleum.png index 2a06673..e1e7a94 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/aegisalt_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/nucleum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/eternite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/obsidiorite.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/eternite_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/obsidiorite.png index 816cb59..e7cbd1f 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/eternite_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/obsidiorite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png b/src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png new file mode 100644 index 0000000..30bc10d Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/osram.png b/src/main/resources/assets/taiga/textures/blocks/block/osram.png new file mode 100644 index 0000000..f5b694e Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/osram.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/palladium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/palladium.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/palladium_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/palladium.png index 7ea420d..7c133ac 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/palladium_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/palladium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/prometheum_block.png b/src/main/resources/assets/taiga/textures/blocks/block/prometheum.png similarity index 93% rename from src/main/resources/assets/taiga/textures/blocks/prometheum_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/prometheum.png index aad5be2..6927ed4 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/prometheum_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/prometheum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/proxii.png b/src/main/resources/assets/taiga/textures/blocks/block/proxii.png new file mode 100644 index 0000000..97bb2bb Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/proxii.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/mindorite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/seismum.png similarity index 90% rename from src/main/resources/assets/taiga/textures/blocks/mindorite_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/seismum.png index 55f2dcd..3230362 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/mindorite_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/seismum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/solarium.png b/src/main/resources/assets/taiga/textures/blocks/block/solarium.png new file mode 100644 index 0000000..c817270 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/solarium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/tiberium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/tiberium.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/tiberium_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/tiberium.png index 1869eaf..694f605 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/tiberium_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/tiberium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/triberium.png b/src/main/resources/assets/taiga/textures/blocks/block/triberium.png new file mode 100644 index 0000000..e72e2ad Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/triberium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/imperomite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/tritonite.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/imperomite_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/tritonite.png index 8117b3e..20a8aca 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/imperomite_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/tritonite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/ardite_rust.png b/src/main/resources/assets/taiga/textures/blocks/block/uru.png similarity index 88% rename from src/main/resources/assets/taiga/textures/blocks/materials/ardite_rust.png rename to src/main/resources/assets/taiga/textures/blocks/block/uru.png index bb0c6ea..1c5539c 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/ardite_rust.png and b/src/main/resources/assets/taiga/textures/blocks/block/uru.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/nucleum_block.png b/src/main/resources/assets/taiga/textures/blocks/block/valyrium.png similarity index 91% rename from src/main/resources/assets/taiga/textures/blocks/nucleum_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/valyrium.png index 83b9373..c77036e 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/nucleum_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/valyrium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/cryptogen_block.png b/src/main/resources/assets/taiga/textures/blocks/block/vibranium.png similarity index 91% rename from src/main/resources/assets/taiga/textures/blocks/cryptogen_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/vibranium.png index 8cbab02..a4c81f1 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/cryptogen_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/vibranium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/violium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/violium.png similarity index 93% rename from src/main/resources/assets/taiga/textures/blocks/violium_block.png rename to src/main/resources/assets/taiga/textures/blocks/block/violium.png index ef5d02c..e47d8bd 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/violium_block.png and b/src/main/resources/assets/taiga/textures/blocks/block/violium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ignitite_ore.png b/src/main/resources/assets/taiga/textures/blocks/block/yrdeen.png similarity index 88% rename from src/main/resources/assets/taiga/textures/blocks/ignitite_ore.png rename to src/main/resources/assets/taiga/textures/blocks/block/yrdeen.png index 52340ce..ebc8e17 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/ignitite_ore.png and b/src/main/resources/assets/taiga/textures/blocks/block/yrdeen.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png b/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png deleted file mode 100644 index 97f51ac..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/dyonite_block.png b/src/main/resources/assets/taiga/textures/blocks/dyonite_block.png deleted file mode 100644 index f2da30d..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/dyonite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/eternite_ore.png b/src/main/resources/assets/taiga/textures/blocks/eternite_ore.png deleted file mode 100644 index e670b09..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/eternite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png b/src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png deleted file mode 100644 index 2130671..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png b/src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png deleted file mode 100644 index a2231d3..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/lignite_ore.png b/src/main/resources/assets/taiga/textures/blocks/lignite_ore.png deleted file mode 100644 index b29c12c..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/lignite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/luminar_block.png b/src/main/resources/assets/taiga/textures/blocks/luminar_block.png deleted file mode 100644 index 4de3538..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/luminar_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png b/src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png deleted file mode 100644 index 819d422..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png b/src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png deleted file mode 100644 index 38be3fb..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png b/src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png deleted file mode 100644 index d924fc4..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png b/src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png deleted file mode 100644 index c34d608..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png b/src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png deleted file mode 100644 index 1ee5646..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png b/src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png deleted file mode 100644 index 329228b..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png b/src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png deleted file mode 100644 index c7ea152..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png b/src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png deleted file mode 100644 index 83257cc..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/mythril_ore.png b/src/main/resources/assets/taiga/textures/blocks/mythril_ore.png deleted file mode 100644 index 4e5d8ac..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/mythril_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/nitronite_block.png b/src/main/resources/assets/taiga/textures/blocks/nitronite_block.png deleted file mode 100644 index bb1f7b6..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/nitronite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png b/src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png deleted file mode 100644 index cbd7271..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/proxideum_block.png b/src/main/resources/assets/taiga/textures/blocks/ore/abyssum.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/proxideum_block.png rename to src/main/resources/assets/taiga/textures/blocks/ore/abyssum.png index a305bae..ca66cd5 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/proxideum_block.png and b/src/main/resources/assets/taiga/textures/blocks/ore/abyssum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/bismuth_nugget.png b/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png similarity index 92% rename from src/main/resources/assets/taiga/textures/items/bismuth_nugget.png rename to src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png index 5b88594..317e11b 100644 Binary files a/src/main/resources/assets/taiga/textures/items/bismuth_nugget.png and b/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/vibranium_nugget.png b/src/main/resources/assets/taiga/textures/blocks/ore/duranite.png similarity index 88% rename from src/main/resources/assets/taiga/textures/items/vibranium_nugget.png rename to src/main/resources/assets/taiga/textures/blocks/ore/duranite.png index dacf662..1a42364 100644 Binary files a/src/main/resources/assets/taiga/textures/items/vibranium_nugget.png and b/src/main/resources/assets/taiga/textures/blocks/ore/duranite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/eezo.png b/src/main/resources/assets/taiga/textures/blocks/ore/eezo.png new file mode 100644 index 0000000..6de223a Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/eezo.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png new file mode 100644 index 0000000..7e4d7c2 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png new file mode 100644 index 0000000..7e4d7c2 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png new file mode 100644 index 0000000..4f14e7a Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/solarium_block.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/solarium_block.png rename to src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png index 34466a9..9b42d38 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/solarium_block.png and b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/osram.png b/src/main/resources/assets/taiga/textures/blocks/ore/osram.png new file mode 100644 index 0000000..904c9a5 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/osram.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png b/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png new file mode 100644 index 0000000..b389832 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/prometheum.png b/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/materials/prometheum.png rename to src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png index affe950..7e18f41 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/prometheum.png and b/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/lumixyl_nugget.png b/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png similarity index 91% rename from src/main/resources/assets/taiga/textures/items/lumixyl_nugget.png rename to src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png index d28101d..54fde77 100644 Binary files a/src/main/resources/assets/taiga/textures/items/lumixyl_nugget.png and b/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/uru.png b/src/main/resources/assets/taiga/textures/blocks/ore/uru.png new file mode 100644 index 0000000..bc108a4 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/uru.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/nucleum.png b/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png similarity index 91% rename from src/main/resources/assets/taiga/textures/blocks/materials/nucleum.png rename to src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png index 7a0eb1c..a2ef123 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/nucleum.png and b/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png b/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png new file mode 100644 index 0000000..7f57ab8 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/palladium_ore.png b/src/main/resources/assets/taiga/textures/blocks/palladium_ore.png deleted file mode 100644 index f40aafc..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/palladium_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png b/src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png deleted file mode 100644 index 7d4b3c7..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/rotten_ground.png b/src/main/resources/assets/taiga/textures/blocks/rotten_ground.png deleted file mode 100644 index 10be0ab..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/rotten_ground.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/rubium_block.png b/src/main/resources/assets/taiga/textures/blocks/rubium_block.png deleted file mode 100644 index 2caaf9c..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/rubium_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/rubium_ore.png b/src/main/resources/assets/taiga/textures/blocks/rubium_ore.png deleted file mode 100644 index a2c1cb9..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/rubium_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png b/src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png deleted file mode 100644 index a2cbd94..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png b/src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png deleted file mode 100644 index c3f9d53..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/terramite_block.png b/src/main/resources/assets/taiga/textures/blocks/terramite_block.png deleted file mode 100644 index f3307b4..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/terramite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png b/src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png deleted file mode 100644 index ca7d295..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/titanite_block.png b/src/main/resources/assets/taiga/textures/blocks/titanite_block.png deleted file mode 100644 index 4b05462..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/titanite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/titanite_ore.png b/src/main/resources/assets/taiga/textures/blocks/titanite_ore.png deleted file mode 100644 index 9348e24..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/titanite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png b/src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png deleted file mode 100644 index 166649a..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items.bat b/src/main/resources/assets/taiga/textures/items.bat new file mode 100644 index 0000000..db7999e --- /dev/null +++ b/src/main/resources/assets/taiga/textures/items.bat @@ -0,0 +1,11 @@ +@echo off +Setlocal EnableDelayedExpansion +for %%f in (.) do ( +set WERT=%%~nf +) +for %%A in (*.png) do ( +type a1.json > %%~nA_!WERT!.json +echo !WERT!/%%~nA^" >> %%~nA_!WERT!.json +type a2.json >> %%~nA_!WERT!.json +) +pause \ No newline at end of file diff --git a/src/main/resources/assets/taiga/textures/items/anthracite_dust.png b/src/main/resources/assets/taiga/textures/items/anthracite_dust.png deleted file mode 100644 index c8530cf..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/anthracite_dust.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/bysmuid_nugget.png b/src/main/resources/assets/taiga/textures/items/bysmuid_nugget.png deleted file mode 100644 index 3155328..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/bysmuid_nugget.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/cryptogen_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/abyssum.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/cryptogen_nugget.png rename to src/main/resources/assets/taiga/textures/items/dust/abyssum.png index 4a80b4e..392f230 100644 Binary files a/src/main/resources/assets/taiga/textures/items/cryptogen_nugget.png and b/src/main/resources/assets/taiga/textures/items/dust/abyssum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/adamant.png b/src/main/resources/assets/taiga/textures/items/dust/adamant.png new file mode 100644 index 0000000..904cc17 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/adamant.png differ diff --git a/src/main/resources/assets/taiga/textures/items/astrium_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/astrium.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/astrium_nugget.png rename to src/main/resources/assets/taiga/textures/items/dust/astrium.png index 7530a16..e81f6be 100644 Binary files a/src/main/resources/assets/taiga/textures/items/astrium_nugget.png and b/src/main/resources/assets/taiga/textures/items/dust/astrium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/aurorium.png b/src/main/resources/assets/taiga/textures/items/dust/aurorium.png new file mode 100644 index 0000000..d83edc1 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/aurorium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/basalt.png b/src/main/resources/assets/taiga/textures/items/dust/basalt.png new file mode 100644 index 0000000..cd8f8da Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/basalt.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/duranite.png b/src/main/resources/assets/taiga/textures/items/dust/duranite.png new file mode 100644 index 0000000..2b7ebd2 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/duranite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/dyonite.png b/src/main/resources/assets/taiga/textures/items/dust/dyonite.png new file mode 100644 index 0000000..53c28a4 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/dyonite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/aegisalt_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/eezo.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/aegisalt_nugget.png rename to src/main/resources/assets/taiga/textures/items/dust/eezo.png index 843a699..4087a5a 100644 Binary files a/src/main/resources/assets/taiga/textures/items/aegisalt_nugget.png and b/src/main/resources/assets/taiga/textures/items/dust/eezo.png differ diff --git a/src/main/resources/assets/taiga/textures/items/terramite_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/fractum.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/terramite_nugget.png rename to src/main/resources/assets/taiga/textures/items/dust/fractum.png index 5f104d5..03ba9bf 100644 Binary files a/src/main/resources/assets/taiga/textures/items/terramite_nugget.png and b/src/main/resources/assets/taiga/textures/items/dust/fractum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/ignitz.png b/src/main/resources/assets/taiga/textures/items/dust/ignitz.png new file mode 100644 index 0000000..ae09fc4 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/ignitz.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/imperomite.png b/src/main/resources/assets/taiga/textures/items/dust/imperomite.png new file mode 100644 index 0000000..cea52ca Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/imperomite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/iox.png b/src/main/resources/assets/taiga/textures/items/dust/iox.png new file mode 100644 index 0000000..ae6f496 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/iox.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/karmesine.png b/src/main/resources/assets/taiga/textures/items/dust/karmesine.png new file mode 100644 index 0000000..6a1b958 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/karmesine.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/lumix.png b/src/main/resources/assets/taiga/textures/items/dust/lumix.png new file mode 100644 index 0000000..fa9f300 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/lumix.png differ diff --git a/src/main/resources/assets/taiga/textures/items/imperomite_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/meteorite.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/imperomite_nugget.png rename to src/main/resources/assets/taiga/textures/items/dust/meteorite.png index c3ab768..a11fb4e 100644 Binary files a/src/main/resources/assets/taiga/textures/items/imperomite_nugget.png and b/src/main/resources/assets/taiga/textures/items/dust/meteorite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/noctunyx.png b/src/main/resources/assets/taiga/textures/items/dust/nihilite.png similarity index 93% rename from src/main/resources/assets/taiga/textures/blocks/materials/noctunyx.png rename to src/main/resources/assets/taiga/textures/items/dust/nihilite.png index 76a8cda..3577059 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/noctunyx.png and b/src/main/resources/assets/taiga/textures/items/dust/nihilite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ultranite_block.png b/src/main/resources/assets/taiga/textures/items/dust/niob.png similarity index 93% rename from src/main/resources/assets/taiga/textures/blocks/ultranite_block.png rename to src/main/resources/assets/taiga/textures/items/dust/niob.png index 6ae2fbb..d84b6b9 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/ultranite_block.png and b/src/main/resources/assets/taiga/textures/items/dust/niob.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/eternite_ingot.png b/src/main/resources/assets/taiga/textures/items/dust/nucleum.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/eternite_ingot.png rename to src/main/resources/assets/taiga/textures/items/dust/nucleum.png index f7f091a..4d64390 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/eternite_ingot.png and b/src/main/resources/assets/taiga/textures/items/dust/nucleum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/obsidiorite.png b/src/main/resources/assets/taiga/textures/items/dust/obsidiorite.png new file mode 100644 index 0000000..e23f882 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/obsidiorite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/osram.png b/src/main/resources/assets/taiga/textures/items/dust/osram.png new file mode 100644 index 0000000..7f1a8c8 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/osram.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/palladium.png b/src/main/resources/assets/taiga/textures/items/dust/palladium.png new file mode 100644 index 0000000..ed999d7 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/palladium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/prometheum_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/prometheum.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/prometheum_nugget.png rename to src/main/resources/assets/taiga/textures/items/dust/prometheum.png index 9e1616a..b3784ff 100644 Binary files a/src/main/resources/assets/taiga/textures/items/prometheum_nugget.png and b/src/main/resources/assets/taiga/textures/items/dust/prometheum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/proxii.png b/src/main/resources/assets/taiga/textures/items/dust/proxii.png new file mode 100644 index 0000000..fd71c0c Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/proxii.png differ diff --git a/src/main/resources/assets/taiga/textures/items/arcanite_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/seismum.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/arcanite_nugget.png rename to src/main/resources/assets/taiga/textures/items/dust/seismum.png index 4d9e89c..26ece65 100644 Binary files a/src/main/resources/assets/taiga/textures/items/arcanite_nugget.png and b/src/main/resources/assets/taiga/textures/items/dust/seismum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/solarium.png b/src/main/resources/assets/taiga/textures/items/dust/solarium.png new file mode 100644 index 0000000..caa1904 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/solarium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/titanite_ingot.png b/src/main/resources/assets/taiga/textures/items/dust/tiberium.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/titanite_ingot.png rename to src/main/resources/assets/taiga/textures/items/dust/tiberium.png index d85c02c..e5ba3d8 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/titanite_ingot.png and b/src/main/resources/assets/taiga/textures/items/dust/tiberium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/proxideum_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/tritonite.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/proxideum_nugget.png rename to src/main/resources/assets/taiga/textures/items/dust/tritonite.png index db9febc..16f6c77 100644 Binary files a/src/main/resources/assets/taiga/textures/items/proxideum_nugget.png and b/src/main/resources/assets/taiga/textures/items/dust/tritonite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tiberium_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/uru.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tiberium_nugget.png rename to src/main/resources/assets/taiga/textures/items/dust/uru.png index 92d3cbf..de3f26b 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tiberium_nugget.png and b/src/main/resources/assets/taiga/textures/items/dust/uru.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/valyrium.png b/src/main/resources/assets/taiga/textures/items/dust/valyrium.png new file mode 100644 index 0000000..06a8a79 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/valyrium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/mythril_block.png b/src/main/resources/assets/taiga/textures/items/dust/vibranium.png similarity index 92% rename from src/main/resources/assets/taiga/textures/blocks/mythril_block.png rename to src/main/resources/assets/taiga/textures/items/dust/vibranium.png index fc7f9dd..192550f 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/mythril_block.png and b/src/main/resources/assets/taiga/textures/items/dust/vibranium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/violium.png b/src/main/resources/assets/taiga/textures/items/dust/violium.png new file mode 100644 index 0000000..6eaee38 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/violium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dust/yrdeen.png b/src/main/resources/assets/taiga/textures/items/dust/yrdeen.png new file mode 100644 index 0000000..79cf0fb Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/dust/yrdeen.png differ diff --git a/src/main/resources/assets/taiga/textures/items/energy_pearl.png b/src/main/resources/assets/taiga/textures/items/energy_pearl.png deleted file mode 100644 index 770521f..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/energy_pearl.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/glimmer_pearl.png b/src/main/resources/assets/taiga/textures/items/glimmer_pearl.png deleted file mode 100644 index 58e0bb9..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/glimmer_pearl.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/glimmercoal.png b/src/main/resources/assets/taiga/textures/items/glimmercoal.png deleted file mode 100644 index 9c5d844..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/glimmercoal.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/glimmerstone_dust.png b/src/main/resources/assets/taiga/textures/items/glimmerstone_dust.png deleted file mode 100644 index 19d2135..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/glimmerstone_dust.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/mindorite_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/abyssum.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/mindorite_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/abyssum.png index d7a59f6..bc38832 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/mindorite_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/abyssum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/adamantite_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/adamant.png similarity index 100% rename from src/main/resources/assets/taiga/textures/items/tic/adamantite_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/adamant.png diff --git a/src/main/resources/assets/taiga/textures/items/ingot/astrium.png b/src/main/resources/assets/taiga/textures/items/ingot/astrium.png new file mode 100644 index 0000000..0117982 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/astrium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/rubium_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/aurorium.png similarity index 100% rename from src/main/resources/assets/taiga/textures/items/tic/rubium_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/aurorium.png diff --git a/src/main/resources/assets/taiga/textures/items/tic/nucleum_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/basalt.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/nucleum_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/basalt.png index 9c1da98..29f6648 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/nucleum_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/basalt.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/aegisalt_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/duranite.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/aegisalt_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/duranite.png index e2e6976..0541848 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/aegisalt_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/duranite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/nitronite_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/dyonite.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/nitronite_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/dyonite.png index dd3561a..969dd47 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/nitronite_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/dyonite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/eezo.png b/src/main/resources/assets/taiga/textures/items/ingot/eezo.png new file mode 100644 index 0000000..66c19af Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/eezo.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/fractoryte_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/fractum.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/fractoryte_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/fractum.png index 7eb6f2b..9249927 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/fractoryte_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/fractum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/ignitz.png b/src/main/resources/assets/taiga/textures/items/ingot/ignitz.png new file mode 100644 index 0000000..0aba031 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/ignitz.png differ diff --git a/src/main/resources/assets/taiga/textures/items/meteorite_nugget.png b/src/main/resources/assets/taiga/textures/items/ingot/imperomite.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/meteorite_nugget.png rename to src/main/resources/assets/taiga/textures/items/ingot/imperomite.png index 7c93ca3..d15b636 100644 Binary files a/src/main/resources/assets/taiga/textures/items/meteorite_nugget.png and b/src/main/resources/assets/taiga/textures/items/ingot/imperomite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/ignitite_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/iox.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/ignitite_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/iox.png index 7fbbcad..30c66b7 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/ignitite_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/iox.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/karmesine_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/karmesine.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/karmesine_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/karmesine.png index e5ca86c..94f0dd2 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/karmesine_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/karmesine.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/lumix.png b/src/main/resources/assets/taiga/textures/items/ingot/lumix.png new file mode 100644 index 0000000..84b90c0 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/lumix.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/meteorite.png b/src/main/resources/assets/taiga/textures/items/ingot/meteorite.png new file mode 100644 index 0000000..f0b5f92 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/meteorite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/noctunyx_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/nihilite.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/noctunyx_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/nihilite.png index 10eadb3..0d2b7cf 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/noctunyx_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/nihilite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/niob.png b/src/main/resources/assets/taiga/textures/items/ingot/niob.png new file mode 100644 index 0000000..071feef Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/niob.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/nucleum.png b/src/main/resources/assets/taiga/textures/items/ingot/nucleum.png new file mode 100644 index 0000000..c248342 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/nucleum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/obsidiorite.png b/src/main/resources/assets/taiga/textures/items/ingot/obsidiorite.png new file mode 100644 index 0000000..cb11557 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/obsidiorite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/osram.png b/src/main/resources/assets/taiga/textures/items/ingot/osram.png new file mode 100644 index 0000000..1ed548d Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/osram.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/palladium_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/palladium.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/palladium_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/palladium.png index b1b399e..6814b9c 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/palladium_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/palladium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/prometheum.png b/src/main/resources/assets/taiga/textures/items/ingot/prometheum.png new file mode 100644 index 0000000..381a23c Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/prometheum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/proxii.png b/src/main/resources/assets/taiga/textures/items/ingot/proxii.png new file mode 100644 index 0000000..16668ce Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/proxii.png differ diff --git a/src/main/resources/assets/taiga/textures/items/seismodium_nugget.png b/src/main/resources/assets/taiga/textures/items/ingot/seismum.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/seismodium_nugget.png rename to src/main/resources/assets/taiga/textures/items/ingot/seismum.png index 47c5928..63f5ea3 100644 Binary files a/src/main/resources/assets/taiga/textures/items/seismodium_nugget.png and b/src/main/resources/assets/taiga/textures/items/ingot/seismum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/dyonite_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/solarium.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/dyonite_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/solarium.png index e13556f..1a02d3a 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/dyonite_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/solarium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/tiberium_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/tiberium.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/tiberium_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/tiberium.png index 817d28e..fb6395d 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/tiberium_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/tiberium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/tritonite.png b/src/main/resources/assets/taiga/textures/items/ingot/tritonite.png new file mode 100644 index 0000000..6fdc676 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/tritonite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/uru.png b/src/main/resources/assets/taiga/textures/items/ingot/uru.png new file mode 100644 index 0000000..25b6c2c Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/uru.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png b/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png new file mode 100644 index 0000000..ad2bc73 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/vibranium.png b/src/main/resources/assets/taiga/textures/items/ingot/vibranium.png new file mode 100644 index 0000000..b83419a Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/ingot/vibranium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/mythril_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/violium.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/mythril_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/violium.png index 3351cda..13b6fec 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/mythril_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/violium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/cryptogen_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/yrdeen.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/cryptogen_ingot.png rename to src/main/resources/assets/taiga/textures/items/ingot/yrdeen.png index 69177ba..8e29a70 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/cryptogen_ingot.png and b/src/main/resources/assets/taiga/textures/items/ingot/yrdeen.png differ diff --git a/src/main/resources/assets/taiga/textures/items/iron_nugget.png b/src/main/resources/assets/taiga/textures/items/iron_nugget.png deleted file mode 100644 index 4bd25a3..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/iron_nugget.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/lignite.png b/src/main/resources/assets/taiga/textures/items/lignite.png deleted file mode 100644 index c352803..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/lignite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/luminar_dust.png b/src/main/resources/assets/taiga/textures/items/luminar_dust.png deleted file mode 100644 index 572fbe3..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/luminar_dust.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/terramite_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/abyssum.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/terramite_ingot.png rename to src/main/resources/assets/taiga/textures/items/nugget/abyssum.png index 42e83dd..133553f 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/terramite_ingot.png and b/src/main/resources/assets/taiga/textures/items/nugget/abyssum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/fuel_brick.png b/src/main/resources/assets/taiga/textures/items/nugget/adamant.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/fuel_brick.png rename to src/main/resources/assets/taiga/textures/items/nugget/adamant.png index f53955a..d080603 100644 Binary files a/src/main/resources/assets/taiga/textures/items/fuel_brick.png and b/src/main/resources/assets/taiga/textures/items/nugget/adamant.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/astrium_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/astrium.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/astrium_ingot.png rename to src/main/resources/assets/taiga/textures/items/nugget/astrium.png index 302ab18..8d1b139 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/astrium_ingot.png and b/src/main/resources/assets/taiga/textures/items/nugget/astrium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/rubium_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/aurorium.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/rubium_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/aurorium.png index 581a8c9..f25db9f 100644 Binary files a/src/main/resources/assets/taiga/textures/items/rubium_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/aurorium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/adamantite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/basalt.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/adamantite_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/basalt.png index f2026fb..b968cc0 100644 Binary files a/src/main/resources/assets/taiga/textures/items/adamantite_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/basalt.png differ diff --git a/src/main/resources/assets/taiga/textures/items/nitro_brick.png b/src/main/resources/assets/taiga/textures/items/nugget/duranite.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/nitro_brick.png rename to src/main/resources/assets/taiga/textures/items/nugget/duranite.png index 3607cf8..1bb1f18 100644 Binary files a/src/main/resources/assets/taiga/textures/items/nitro_brick.png and b/src/main/resources/assets/taiga/textures/items/nugget/duranite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/nitronite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/dyonite.png similarity index 95% rename from src/main/resources/assets/taiga/textures/items/nitronite_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/dyonite.png index fd49fd6..4427277 100644 Binary files a/src/main/resources/assets/taiga/textures/items/nitronite_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/dyonite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/nucleum_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/eezo.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/nucleum_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/eezo.png index ca0a9f2..6a29abb 100644 Binary files a/src/main/resources/assets/taiga/textures/items/nucleum_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/eezo.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/seismodium_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/fractum.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/seismodium_ingot.png rename to src/main/resources/assets/taiga/textures/items/nugget/fractum.png index de629c5..e0ef678 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/seismodium_ingot.png and b/src/main/resources/assets/taiga/textures/items/nugget/fractum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ignitite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/ignitz.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/ignitite_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/ignitz.png index 02342fa..9fdda1d 100644 Binary files a/src/main/resources/assets/taiga/textures/items/ignitite_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/ignitz.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/meteorite_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/imperomite.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/meteorite_ingot.png rename to src/main/resources/assets/taiga/textures/items/nugget/imperomite.png index 32c3080..3193727 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/meteorite_ingot.png and b/src/main/resources/assets/taiga/textures/items/nugget/imperomite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/eternite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/iox.png similarity index 95% rename from src/main/resources/assets/taiga/textures/items/eternite_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/iox.png index f2bf4c8..891ea07 100644 Binary files a/src/main/resources/assets/taiga/textures/items/eternite_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/iox.png differ diff --git a/src/main/resources/assets/taiga/textures/items/nugget/iron.png b/src/main/resources/assets/taiga/textures/items/nugget/iron.png new file mode 100644 index 0000000..25fe20f Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/nugget/iron.png differ diff --git a/src/main/resources/assets/taiga/textures/items/karmesine_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/karmesine.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/karmesine_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/karmesine.png index 8e03a40..7f8cb49 100644 Binary files a/src/main/resources/assets/taiga/textures/items/karmesine_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/karmesine.png differ diff --git a/src/main/resources/assets/taiga/textures/items/dyonite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/lumix.png similarity index 95% rename from src/main/resources/assets/taiga/textures/items/dyonite_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/lumix.png index e52886b..310311b 100644 Binary files a/src/main/resources/assets/taiga/textures/items/dyonite_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/lumix.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/imperomite_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/meteorite.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/imperomite_ingot.png rename to src/main/resources/assets/taiga/textures/items/nugget/meteorite.png index 83ddca3..123a5b1 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/imperomite_ingot.png and b/src/main/resources/assets/taiga/textures/items/nugget/meteorite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/noctunyx_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/nihilite.png similarity index 95% rename from src/main/resources/assets/taiga/textures/items/noctunyx_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/nihilite.png index ee18c7c..cabac86 100644 Binary files a/src/main/resources/assets/taiga/textures/items/noctunyx_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/nihilite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/ultranite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/niob.png similarity index 95% rename from src/main/resources/assets/taiga/textures/items/ultranite_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/niob.png index ea8d744..3699e38 100644 Binary files a/src/main/resources/assets/taiga/textures/items/ultranite_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/niob.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/ultranite_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/nucleum.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/ultranite_ingot.png rename to src/main/resources/assets/taiga/textures/items/nugget/nucleum.png index 1d0393d..33d3c80 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/ultranite_ingot.png and b/src/main/resources/assets/taiga/textures/items/nugget/nucleum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/nugget/obsidiorite.png b/src/main/resources/assets/taiga/textures/items/nugget/obsidiorite.png new file mode 100644 index 0000000..51d6819 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/nugget/obsidiorite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/nugget/osram.png b/src/main/resources/assets/taiga/textures/items/nugget/osram.png new file mode 100644 index 0000000..526714c Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/nugget/osram.png differ diff --git a/src/main/resources/assets/taiga/textures/items/palladium_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/palladium.png similarity index 95% rename from src/main/resources/assets/taiga/textures/items/palladium_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/palladium.png index 2a52d02..b6e25e5 100644 Binary files a/src/main/resources/assets/taiga/textures/items/palladium_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/palladium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/prometheum_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/prometheum.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/prometheum_ingot.png rename to src/main/resources/assets/taiga/textures/items/nugget/prometheum.png index 6fbc057..dd33f3f 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/prometheum_ingot.png and b/src/main/resources/assets/taiga/textures/items/nugget/prometheum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/proxideum_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/proxii.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/proxideum_ingot.png rename to src/main/resources/assets/taiga/textures/items/nugget/proxii.png index b2797b5..f596d0f 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/proxideum_ingot.png and b/src/main/resources/assets/taiga/textures/items/nugget/proxii.png differ diff --git a/src/main/resources/assets/taiga/textures/items/nugget/seismum.png b/src/main/resources/assets/taiga/textures/items/nugget/seismum.png new file mode 100644 index 0000000..cda5085 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/nugget/seismum.png differ diff --git a/src/main/resources/assets/taiga/textures/items/solarium_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/solarium.png similarity index 95% rename from src/main/resources/assets/taiga/textures/items/solarium_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/solarium.png index 3e5a1e2..02c5695 100644 Binary files a/src/main/resources/assets/taiga/textures/items/solarium_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/solarium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/titanite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/tiberium.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/titanite_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/tiberium.png index c64de88..8f64822 100644 Binary files a/src/main/resources/assets/taiga/textures/items/titanite_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/tiberium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/fractoryte_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/tritonite.png similarity index 95% rename from src/main/resources/assets/taiga/textures/items/fractoryte_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/tritonite.png index 6a86606..54afb45 100644 Binary files a/src/main/resources/assets/taiga/textures/items/fractoryte_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/tritonite.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/vibranium_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/uru.png similarity index 93% rename from src/main/resources/assets/taiga/textures/items/tic/vibranium_ingot.png rename to src/main/resources/assets/taiga/textures/items/nugget/uru.png index 63c9c05..e75924b 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/vibranium_ingot.png and b/src/main/resources/assets/taiga/textures/items/nugget/uru.png differ diff --git a/src/main/resources/assets/taiga/textures/items/nugget/valyrium.png b/src/main/resources/assets/taiga/textures/items/nugget/valyrium.png new file mode 100644 index 0000000..da0fe74 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/items/nugget/valyrium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/mythril_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/vibranium.png similarity index 95% rename from src/main/resources/assets/taiga/textures/items/mythril_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/vibranium.png index 7e0fa53..e460a1e 100644 Binary files a/src/main/resources/assets/taiga/textures/items/mythril_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/vibranium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/violium_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/violium.png similarity index 94% rename from src/main/resources/assets/taiga/textures/items/tic/violium_ingot.png rename to src/main/resources/assets/taiga/textures/items/nugget/violium.png index b1dab28..bc42bd6 100644 Binary files a/src/main/resources/assets/taiga/textures/items/tic/violium_ingot.png and b/src/main/resources/assets/taiga/textures/items/nugget/violium.png differ diff --git a/src/main/resources/assets/taiga/textures/items/mindorite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/yrdeen.png similarity index 95% rename from src/main/resources/assets/taiga/textures/items/mindorite_nugget.png rename to src/main/resources/assets/taiga/textures/items/nugget/yrdeen.png index 9bd7930..5a1a1ff 100644 Binary files a/src/main/resources/assets/taiga/textures/items/mindorite_nugget.png and b/src/main/resources/assets/taiga/textures/items/nugget/yrdeen.png differ diff --git a/src/main/resources/assets/taiga/textures/items/radiant_pearl.png b/src/main/resources/assets/taiga/textures/items/radiant_pearl.png deleted file mode 100644 index c2bbd34..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/radiant_pearl.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/slaggold_ingot.png b/src/main/resources/assets/taiga/textures/items/slaggold_ingot.png deleted file mode 100644 index f1dfcf4..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/slaggold_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/slagiron_ingot.png b/src/main/resources/assets/taiga/textures/items/slagiron_ingot.png deleted file mode 100644 index 2b70a7e..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/slagiron_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/spectrum_dust.png b/src/main/resources/assets/taiga/textures/items/spectrum_dust.png deleted file mode 100644 index 4097fbc..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/spectrum_dust.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/tiberium_shard_instable.png b/src/main/resources/assets/taiga/textures/items/tiberium_shard_instable.png deleted file mode 100644 index 7bb8d12..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/tiberium_shard_instable.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/arcanite_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/arcanite_ingot.png deleted file mode 100644 index 3125946..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/tic/arcanite_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/bismuth_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/bismuth_ingot.png deleted file mode 100644 index d885294..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/tic/bismuth_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/bysmuid_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/bysmuid_ingot.png deleted file mode 100644 index f884b0c..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/tic/bysmuid_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/lumixyl_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/lumixyl_ingot.png deleted file mode 100644 index 9f7e64d..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/tic/lumixyl_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/items/tic/solarium_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/solarium_ingot.png deleted file mode 100644 index a1593e3..0000000 Binary files a/src/main/resources/assets/taiga/textures/items/tic/solarium_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/violium_ore.png b/src/main/resources/assets/taiga/textures/materials/adamant.png similarity index 75% rename from src/main/resources/assets/taiga/textures/blocks/violium_ore.png rename to src/main/resources/assets/taiga/textures/materials/adamant.png index cb0b06d..84927ea 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/violium_ore.png and b/src/main/resources/assets/taiga/textures/materials/adamant.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png b/src/main/resources/assets/taiga/textures/materials/duranite.png similarity index 75% rename from src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png rename to src/main/resources/assets/taiga/textures/materials/duranite.png index eef2f58..c6f1d32 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png and b/src/main/resources/assets/taiga/textures/materials/duranite.png differ diff --git a/src/main/resources/assets/taiga/textures/materials/imperomite.png b/src/main/resources/assets/taiga/textures/materials/imperomite.png new file mode 100644 index 0000000..0666b40 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/materials/imperomite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/arcanite_block.png b/src/main/resources/assets/taiga/textures/materials/nucleum.png similarity index 75% rename from src/main/resources/assets/taiga/textures/blocks/arcanite_block.png rename to src/main/resources/assets/taiga/textures/materials/nucleum.png index 922eff5..c6f1d32 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/arcanite_block.png and b/src/main/resources/assets/taiga/textures/materials/nucleum.png differ diff --git a/src/main/resources/assets/taiga/textures/materials/osram.png b/src/main/resources/assets/taiga/textures/materials/osram.png new file mode 100644 index 0000000..ff53232 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/materials/osram.png differ diff --git a/src/main/resources/assets/taiga/textures/materials/palladium.png b/src/main/resources/assets/taiga/textures/materials/palladium.png new file mode 100644 index 0000000..c6f1d32 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/materials/palladium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/solarium.png b/src/main/resources/assets/taiga/textures/materials/solarium.png similarity index 74% rename from src/main/resources/assets/taiga/textures/blocks/materials/solarium.png rename to src/main/resources/assets/taiga/textures/materials/solarium.png index 0927f8c..f25c67c 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/solarium.png and b/src/main/resources/assets/taiga/textures/materials/solarium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/tiberium.png b/src/main/resources/assets/taiga/textures/materials/tiberium.png similarity index 74% rename from src/main/resources/assets/taiga/textures/blocks/materials/tiberium.png rename to src/main/resources/assets/taiga/textures/materials/tiberium.png index 83c08e7..2fc50e7 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/tiberium.png and b/src/main/resources/assets/taiga/textures/materials/tiberium.png differ diff --git a/src/main/resources/assets/taiga/textures/materials/tiberiumx.png b/src/main/resources/assets/taiga/textures/materials/tiberiumx.png new file mode 100644 index 0000000..c984ab5 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/materials/tiberiumx.png differ diff --git a/src/main/resources/assets/taiga/textures/materials/tritonite.png b/src/main/resources/assets/taiga/textures/materials/tritonite.png new file mode 100644 index 0000000..225b826 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/materials/tritonite.png differ diff --git a/src/main/resources/assets/taiga/textures/materials/uru.png b/src/main/resources/assets/taiga/textures/materials/uru.png new file mode 100644 index 0000000..4501a35 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/materials/uru.png differ diff --git a/src/main/resources/assets/taiga/textures/materials/valyrium.png b/src/main/resources/assets/taiga/textures/materials/valyrium.png new file mode 100644 index 0000000..0c9fa17 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/materials/valyrium.png differ diff --git a/src/main/resources/assets/taiga/textures/materials/vibranium.png b/src/main/resources/assets/taiga/textures/materials/vibranium.png new file mode 100644 index 0000000..225b826 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/materials/vibranium.png differ diff --git a/src/main/resources/materials.txt b/src/main/resources/materials.txt deleted file mode 100644 index 4ad7361..0000000 --- a/src/main/resources/materials.txt +++ /dev/null @@ -1,32 +0,0 @@ -arcanite -tiberium -prometheum -rubium -violium -bismuth -karmesine -mindorite -titanite -meteorite -adamantite -vibranium -ignitite -palladium -eternite -mythril -imperomite -fractoryte -noctunyx -nitronite -cryptogen -seismodium -aegisalt -ultranite -bysmuid -nucleum -lumixyl -dyonite -terramite -solarium -astrium -proxideum \ No newline at end of file