From 826ab1cf3a01dadae2a5d5a204fa557f7134eac6 Mon Sep 17 00:00:00 2001 From: Giovanni Harting Date: Mon, 5 Dec 2016 20:34:02 +0100 Subject: [PATCH] [1.2] Material rework (#60) * Developement tests for nbt data in traits * Lot of trait changes and better balancing * Traits reworked a bit, new traits added. * First correction of NBT Data in Trait (Soulbound). Is shown twice. Still needs corrections. * Few fixes in traits and new trait "catcher" * Small fix, needs workaround * fixed some catch issues * Fixed Catcher and Reviving Traits, new Trait: Souleater. Updated build.gradle for new TiC Version. * Splitted SoulEater to get the bad touch to an extra trait "Cursed". Added method for using nbt more easily. Changed declaration names of fluids * Some minor changes in Traits, Registry and Utils. * Iron_nugget is replaced with oreDict Item when not loaded via TAIGA. * Beginning of new material integration. Lot of names changed, lot more work to do here. Many null pointer exceptions and no changes of values up to now. * Some Small changes in names, registry and recipes * Some weird stuff I don't remember :D * fixed some things I missed while merging * Rollback to something * More Stuff * fixed some merging stuff * Fixed some misspelled names. Actually working with lots of restrictions. * Rearranged alloys, tried to add blocks / ingots for non-tinker-materials, but they won't work. * Again tried to fix the melting issue, but non-tinker materials still are not able to be casted as a block, ingot or nugget... * Fixed integration of materials without tools. * changed IMC to direct lib calls * removed more IMC, removed redundant code * some reformatting * Alloy integration reworked, needs to be balanced. * updated deps, renamed some func's, added duplicate material check * some more renaming * some reformatting, fixed wrong import, fixed string cmp's * Added images for blocks, ingots, nuggets and dust. Json changes do not work yet. * some reformatting * Removed old json files. Placeholder needed. * Fixed block json, items not working yet. * Fixed my own derp (missing json files) * Reduced materials to ensure unique traits for most of them. Still 30 though, but reduced by 20 more :'( RIP * Changed some generator stuff, not working properly right now! * rewrote offset generation, added some debug command, fixed some stuff * fixed on-surface-generation, made dependencies more flexible * reverted gen-weight back to its normal value * Meteor generator implemented. * fixed generating on ground * optimized a thing * Replaced Uru with Osram, replaced Meteorite with Uru, added Meteorite again for Hull-Material and late game alloy. * Some changes in generation of ores, not ready yet. * Added Cobble Meteorite. Added debug command. Implemented rest of ore generation. Some minor fixes left for generation including balancing. * Some changes for ore generation. Added 2 separate Generic Blocks for meteorite and their cobble variant. * some cleanup in Generator class, added meteor world save handler * Added Textures. Added blockstates and item models. Fixed fluid rendering. * renamed world save data file to be little more specific, removed a unused method * some preps for the upcoming release * First attempt of well balancing material stats. Renamed TiberiumX to Triberium. * Final changes... ready for beta testing * Added missing alloys. * Corrected balancing of ore generation. Still WIP * removed some last debug out * one last reformat --- build.gradle | 13 +- src/main/java/com/sosnitzka/taiga/Alloys.java | 50 ++-- src/main/java/com/sosnitzka/taiga/Blocks.java | 119 +++++----- .../java/com/sosnitzka/taiga/CreativeTab.java | 11 +- src/main/java/com/sosnitzka/taiga/Fluids.java | 100 +++----- src/main/java/com/sosnitzka/taiga/Items.java | 213 +++++++++++------- .../com/sosnitzka/taiga/MaterialTraits.java | 89 +++++--- src/main/java/com/sosnitzka/taiga/TAIGA.java | 156 +++++-------- .../sosnitzka/taiga/TAIGAConfiguration.java | 39 +--- .../sosnitzka/taiga/blocks/BlockCobble.java | 33 +++ .../sosnitzka/taiga/blocks/BlockLignite.java | 8 - .../sosnitzka/taiga/blocks/BlockMetal.java | 70 ++++++ .../taiga/blocks/BlockMeteoriteRock.java | 33 +++ .../com/sosnitzka/taiga/blocks/BlockOre.java | 68 ++++++ .../sosnitzka/taiga/blocks/BlockTiberium.java | 18 +- .../taiga/generic/BasicTinkerFluid.java | 5 +- .../sosnitzka/taiga/proxy/ClientProxy.java | 35 +-- .../sosnitzka/taiga/proxy/CommonProxy.java | 4 + .../taiga/recipes/CraftingRegistry.java | 69 ------ .../taiga/recipes/SmeltingRegistry.java | 13 +- .../taiga/traits/TraitAnalysing.java | 6 +- .../sosnitzka/taiga/traits/TraitArcane.java | 30 ++- .../sosnitzka/taiga/traits/TraitBlind.java | 4 +- .../sosnitzka/taiga/traits/TraitBright.java | 25 +- .../sosnitzka/taiga/traits/TraitCascade.java | 2 +- .../sosnitzka/taiga/traits/TraitCatcher.java | 113 ++++++++++ .../taiga/traits/TraitCongenial.java | 78 +++++++ .../sosnitzka/taiga/traits/TraitCursed.java | 58 +++++ .../taiga/traits/TraitCurvature.java | 66 +++--- .../com/sosnitzka/taiga/traits/TraitDark.java | 5 +- .../sosnitzka/taiga/traits/TraitDecay.java | 115 ++++++++++ .../sosnitzka/taiga/traits/TraitDiffuse.java | 26 +-- .../taiga/traits/TraitDissolving.java | 12 +- .../sosnitzka/taiga/traits/TraitFragile.java | 13 +- .../sosnitzka/taiga/traits/TraitGarishly.java | 17 +- .../sosnitzka/taiga/traits/TraitGlimmer.java | 4 +- .../sosnitzka/taiga/traits/TraitHaunted.java | 37 --- .../sosnitzka/taiga/traits/TraitHeroic.java | 2 +- .../sosnitzka/taiga/traits/TraitHollow.java | 4 +- .../sosnitzka/taiga/traits/TraitInstable.java | 8 +- .../sosnitzka/taiga/traits/TraitMelting.java | 21 +- .../taiga/traits/TraitNatureBound.java | 33 +-- .../taiga/traits/TraitOrganizing.java | 29 --- .../sosnitzka/taiga/traits/TraitPorted.java | 67 ++++++ .../taiga/traits/TraitProgressiveStats.java | 115 ++++++++++ .../taiga/traits/TraitPulverizing.java | 7 +- .../taiga/traits/TraitRandomize.java | 177 --------------- .../taiga/traits/TraitResonance.java | 6 +- .../sosnitzka/taiga/traits/TraitReviving.java | 31 +-- .../sosnitzka/taiga/traits/TraitSofty.java | 37 ++- .../taiga/traits/TraitSoulEater.java | 70 ++++++ .../sosnitzka/taiga/traits/TraitTantrum.java | 105 +++++++++ .../sosnitzka/taiga/traits/TraitTemplate.java | 17 ++ .../taiga/traits/TraitTraditional.java | 39 +++- .../taiga/traits/TraitUncertain.java | 66 +----- .../sosnitzka/taiga/traits/TraitVortex.java | 17 ++ .../sosnitzka/taiga/traits/TraitWhirl.java | 98 ++++++++ .../com/sosnitzka/taiga/util/FuelHandler.java | 24 -- .../com/sosnitzka/taiga/util/Generator.java | 207 +++++++++++++++-- .../sosnitzka/taiga/util/StateMatcher.java | 2 - .../java/com/sosnitzka/taiga/util/Utils.java | 150 ++++++++---- .../taiga/world/MeteorWorldSaveData.java | 64 ++++++ .../com/sosnitzka/taiga/world/WorldGen.java | 71 ++++++ ...ldGenMinable.java => WorldGenMinable.java} | 7 +- .../com/sosnitzka/taiga/world/ZWorldGen.java | 80 ------- .../taiga/blockstates/abyssum_block.json | 18 ++ .../assets/taiga/blockstates/abyssum_ore.json | 18 ++ .../taiga/blockstates/adamant_block.json | 18 ++ .../taiga/blockstates/adamantite_block.json | 7 - .../taiga/blockstates/adamantite_ore.json | 7 - .../taiga/blockstates/aegisalt_block.json | 7 - .../taiga/blockstates/arcanite_block.json | 7 - .../taiga/blockstates/arcanite_ore.json | 7 - .../taiga/blockstates/astrium_block.json | 19 +- .../taiga/blockstates/aurorium_block.json | 18 ++ .../taiga/blockstates/aurorium_ore.json | 18 ++ .../assets/taiga/blockstates/basalt.json | 7 - .../taiga/blockstates/basalt_block.json | 18 ++ .../taiga/blockstates/bismuth_block.json | 7 - .../assets/taiga/blockstates/bismuth_ore.json | 7 - .../taiga/blockstates/bysmuid_block.json | 7 - .../taiga/blockstates/cryptogen_block.json | 7 - .../taiga/blockstates/duranite_block.json | 18 ++ .../taiga/blockstates/duranite_ore.json | 18 ++ .../taiga/blockstates/dyonite_block.json | 19 +- .../assets/taiga/blockstates/eezo_block.json | 18 ++ .../assets/taiga/blockstates/eezo_ore.json | 18 ++ .../taiga/blockstates/eternite_block.json | 7 - .../taiga/blockstates/eternite_ore.json | 7 - .../assets/taiga/blockstates/fluid_block.json | 171 ++++++-------- .../taiga/blockstates/fractoryte_block.json | 7 - .../taiga/blockstates/fractum_block.json | 18 ++ .../taiga/blockstates/ignitite_block.json | 7 - .../taiga/blockstates/ignitite_ore.json | 7 - .../taiga/blockstates/ignitz_block.json | 18 ++ .../taiga/blockstates/imperomite_block.json | 19 +- .../assets/taiga/blockstates/iox_block.json | 18 ++ .../taiga/blockstates/karmesine_block.json | 19 +- .../taiga/blockstates/karmesine_ore.json | 21 +- .../blockstates/karmesineandensite_ore.json | 18 ++ .../blockstates/karmesinediorite_ore.json | 18 ++ .../blockstates/karmesinegranite_ore.json | 18 ++ .../assets/taiga/blockstates/lignite_ore.json | 7 - .../assets/taiga/blockstates/lumix_block.json | 18 ++ .../taiga/blockstates/lumixyl_block.json | 7 - .../taiga/blockstates/meteorite_block.json | 19 +- .../taiga/blockstates/meteorite_ore.json | 7 - .../blockstates/meteoritecobble_block.json | 18 ++ .../taiga/blockstates/mindorite_block.json | 7 - .../taiga/blockstates/mindorite_ore.json | 7 - .../taiga/blockstates/mythril_block.json | 7 - .../assets/taiga/blockstates/mythril_ore.json | 7 - .../taiga/blockstates/nihilite_block.json | 18 ++ .../assets/taiga/blockstates/niob_block.json | 18 ++ .../taiga/blockstates/nitronite_block.json | 7 - .../taiga/blockstates/noctunyx_block.json | 7 - .../taiga/blockstates/nucleum_block.json | 19 +- .../taiga/blockstates/obsidiorite_block.json | 18 ++ .../blockstates/obsidioritecobble_block.json | 18 ++ .../assets/taiga/blockstates/osram_block.json | 18 ++ .../assets/taiga/blockstates/osram_ore.json | 18 ++ .../taiga/blockstates/palladium_block.json | 19 +- .../taiga/blockstates/palladium_ore.json | 21 +- .../taiga/blockstates/prometheum_block.json | 19 +- .../taiga/blockstates/prometheum_ore.json | 21 +- .../taiga/blockstates/proxideum_block.json | 7 - .../taiga/blockstates/proxii_block.json | 18 ++ .../taiga/blockstates/rotten_ground.json | 7 - .../taiga/blockstates/rubium_block.json | 7 - .../assets/taiga/blockstates/rubium_ore.json | 7 - .../taiga/blockstates/seismodium_block.json | 7 - .../taiga/blockstates/seismum_block.json | 18 ++ .../taiga/blockstates/slaggold_ore.json | 7 - .../taiga/blockstates/slagiron_ore.json | 7 - .../taiga/blockstates/solarium_block.json | 19 +- .../taiga/blockstates/terramite_block.json | 7 - .../taiga/blockstates/tiberium_block.json | 19 +- .../taiga/blockstates/tiberium_ore.json | 21 +- .../taiga/blockstates/titanite_block.json | 7 - .../taiga/blockstates/titanite_ore.json | 7 - .../taiga/blockstates/triberium_block.json | 18 ++ .../taiga/blockstates/tritonite_block.json | 18 ++ .../taiga/blockstates/ultranite_block.json | 7 - .../assets/taiga/blockstates/uru_block.json | 18 ++ .../assets/taiga/blockstates/uru_ore.json | 18 ++ .../taiga/blockstates/valyrium_block.json | 18 ++ .../taiga/blockstates/valyrium_ore.json | 18 ++ .../taiga/blockstates/vibranium_block.json | 19 +- .../taiga/blockstates/vibranium_ore.json | 21 +- .../taiga/blockstates/violium_block.json | 19 +- .../assets/taiga/blockstates/violium_ore.json | 7 - .../taiga/blockstates/yrdeen_block.json | 18 ++ .../resources/assets/taiga/lang/de_DE.lang | 1 - .../resources/assets/taiga/lang/en_US.lang | 7 +- .../resources/assets/taiga/lang/zh_CN.lang | 1 - .../taiga/models/block/adamantite_block.json | 6 - .../taiga/models/block/adamantite_ore.json | 6 - .../taiga/models/block/aegisalt_block.json | 6 - .../taiga/models/block/arcanite_block.json | 6 - .../taiga/models/block/arcanite_ore.json | 6 - .../taiga/models/block/astrite_ore.json | 6 - .../taiga/models/block/astrium_block.json | 6 - .../assets/taiga/models/block/basalt.json | 6 - .../taiga/models/block/bismuth_block.json | 6 - .../taiga/models/block/bismuth_ore.json | 6 - .../taiga/models/block/bysmuid_block.json | 6 - .../taiga/models/block/cryptogen_block.json | 6 - .../taiga/models/block/dyonite_block.json | 6 - .../taiga/models/block/eternite_block.json | 6 - .../taiga/models/block/eternite_ore.json | 6 - .../taiga/models/block/fractoryte_block.json | 6 - .../taiga/models/block/ignitite_block.json | 6 - .../taiga/models/block/ignitite_ore.json | 6 - .../taiga/models/block/imperomite_block.json | 6 - .../taiga/models/block/karmesine_block.json | 6 - .../taiga/models/block/karmesine_ore.json | 6 - .../taiga/models/block/lignite_ore.json | 6 - .../taiga/models/block/lumixyl_block.json | 6 - .../taiga/models/block/meteorite_block.json | 6 - .../taiga/models/block/meteorite_ore.json | 6 - .../taiga/models/block/mindorite_block.json | 6 - .../taiga/models/block/mindorite_ore.json | 6 - .../taiga/models/block/mythril_block.json | 6 - .../taiga/models/block/mythril_ore.json | 6 - .../taiga/models/block/nitronite_block.json | 6 - .../taiga/models/block/noctunyx_block.json | 6 - .../taiga/models/block/nucleum_block.json | 6 - .../taiga/models/block/palladium_block.json | 6 - .../taiga/models/block/palladium_ore.json | 6 - .../taiga/models/block/prometheum_block.json | 6 - .../taiga/models/block/prometheum_ore.json | 6 - .../taiga/models/block/proxideum_block.json | 6 - .../taiga/models/block/rotten_ground.json | 6 - .../taiga/models/block/rubium_block.json | 6 - .../assets/taiga/models/block/rubium_ore.json | 6 - .../taiga/models/block/seismodium_block.json | 6 - .../taiga/models/block/slaggold_ore.json | 6 - .../taiga/models/block/slagiron_ore.json | 6 - .../taiga/models/block/solarium_block.json | 6 - .../taiga/models/block/terramite_block.json | 6 - .../taiga/models/block/tiberium_block.json | 6 - .../taiga/models/block/tiberium_ore.json | 6 - .../taiga/models/block/titanite_block.json | 6 - .../taiga/models/block/titanite_ore.json | 6 - .../taiga/models/block/ultranite_block.json | 6 - .../taiga/models/block/vibranium_block.json | 6 - .../taiga/models/block/vibranium_ore.json | 6 - .../taiga/models/block/violium_block.json | 6 - .../taiga/models/block/violium_ore.json | 6 - .../{glimmercoal.json => abyssum_dust.json} | 4 +- ...{glimmer_pearl.json => abyssum_ingot.json} | 4 +- .../taiga/models/item/abyssum_nugget.json | 6 + .../{nitro_brick.json => adamant_dust.json} | 4 +- .../{energy_pearl.json => adamant_ingot.json} | 4 +- .../taiga/models/item/adamant_nugget.json | 6 + .../taiga/models/item/adamantite_block.json | 22 -- .../taiga/models/item/adamantite_ingot.json | 6 - .../taiga/models/item/adamantite_nugget.json | 6 - .../taiga/models/item/adamantite_ore.json | 10 - .../taiga/models/item/aegisalt_block.json | 22 -- .../taiga/models/item/aegisalt_ingot.json | 6 - .../taiga/models/item/arcanite_block.json | 22 -- .../taiga/models/item/arcanite_ingot.json | 6 - .../taiga/models/item/arcanite_nugget.json | 6 - .../taiga/models/item/arcanite_ore.json | 10 - .../taiga/models/item/astrium_block.json | 22 -- .../taiga/models/item/astrium_dust.json | 6 + .../taiga/models/item/astrium_ingot.json | 4 +- .../taiga/models/item/astrium_nugget.json | 4 +- .../taiga/models/item/aurorium_dust.json | 6 + .../taiga/models/item/aurorium_ingot.json | 6 + .../taiga/models/item/aurorium_nugget.json | 6 + .../assets/taiga/models/item/basalt.json | 10 - .../assets/taiga/models/item/basalt_dust.json | 6 + .../taiga/models/item/basalt_ingot.json | 6 + .../taiga/models/item/basalt_nugget.json | 6 + .../taiga/models/item/bismuth_block.json | 22 -- .../taiga/models/item/bismuth_ingot.json | 6 - .../taiga/models/item/bismuth_nugget.json | 6 - .../assets/taiga/models/item/bismuth_ore.json | 10 - .../taiga/models/item/bysmuid_block.json | 22 -- .../taiga/models/item/bysmuid_ingot.json | 6 - .../taiga/models/item/bysmuid_nugget.json | 6 - .../taiga/models/item/cryptogen_block.json | 22 -- .../taiga/models/item/cryptogen_ingot.json | 6 - .../taiga/models/item/cryptogen_nugget.json | 6 - .../taiga/models/item/duranite_dust.json | 6 + .../taiga/models/item/duranite_ingot.json | 6 + .../taiga/models/item/duranite_nugget.json | 6 + .../taiga/models/item/dyonite_block.json | 22 -- .../taiga/models/item/dyonite_dust.json | 6 + .../taiga/models/item/dyonite_ingot.json | 4 +- .../taiga/models/item/dyonite_nugget.json | 4 +- .../assets/taiga/models/item/eezo_dust.json | 6 + .../assets/taiga/models/item/eezo_ingot.json | 6 + .../assets/taiga/models/item/eezo_nugget.json | 6 + .../taiga/models/item/eternite_block.json | 22 -- .../taiga/models/item/eternite_ingot.json | 6 - .../taiga/models/item/eternite_nugget.json | 6 - .../taiga/models/item/eternite_ore.json | 10 - .../taiga/models/item/fractoryte_block.json | 22 -- .../taiga/models/item/fractoryte_ingot.json | 6 - .../taiga/models/item/fractoryte_nugget.json | 6 - .../taiga/models/item/fractum_dust.json | 6 + .../taiga/models/item/fractum_ingot.json | 6 + .../taiga/models/item/fractum_nugget.json | 6 + .../assets/taiga/models/item/fuel_brick.json | 6 - .../taiga/models/item/glimmerstone_dust.json | 6 - .../taiga/models/item/ignitite_block.json | 22 -- .../taiga/models/item/ignitite_ingot.json | 6 - .../taiga/models/item/ignitite_nugget.json | 6 - .../taiga/models/item/ignitite_ore.json | 10 - .../assets/taiga/models/item/ignitz_dust.json | 6 + .../taiga/models/item/ignitz_ingot.json | 6 + .../taiga/models/item/ignitz_nugget.json | 6 + .../taiga/models/item/imperomite_block.json | 22 -- .../taiga/models/item/imperomite_dust.json | 6 + .../taiga/models/item/imperomite_ingot.json | 4 +- .../taiga/models/item/imperomite_nugget.json | 4 +- .../item/{lignite2.json => iox_dust.json} | 2 +- .../assets/taiga/models/item/iox_ingot.json | 6 + .../assets/taiga/models/item/iox_nugget.json | 6 + .../assets/taiga/models/item/iron_nugget.json | 8 +- .../taiga/models/item/karmesine_block.json | 22 -- .../taiga/models/item/karmesine_dust.json | 6 + .../taiga/models/item/karmesine_ingot.json | 10 +- .../taiga/models/item/karmesine_nugget.json | 4 +- .../taiga/models/item/karmesine_ore.json | 10 - .../assets/taiga/models/item/lignite.json | 6 - .../assets/taiga/models/item/lignite_ore.json | 10 - .../taiga/models/item/luminar_dust.json | 6 - .../assets/taiga/models/item/lumix_dust.json | 6 + .../assets/taiga/models/item/lumix_ingot.json | 6 + .../taiga/models/item/lumix_nugget.json | 6 + .../taiga/models/item/lumixyl_block.json | 22 -- .../taiga/models/item/lumixyl_ingot.json | 6 - .../taiga/models/item/lumixyl_nugget.json | 6 - .../taiga/models/item/meteorite_block.json | 22 -- .../taiga/models/item/meteorite_dust.json | 6 + .../taiga/models/item/meteorite_ingot.json | 10 +- .../taiga/models/item/meteorite_nugget.json | 4 +- .../taiga/models/item/meteorite_ore.json | 10 - .../taiga/models/item/mindorite_block.json | 22 -- .../taiga/models/item/mindorite_ingot.json | 6 - .../taiga/models/item/mindorite_nugget.json | 6 - .../taiga/models/item/mindorite_ore.json | 10 - .../taiga/models/item/mythril_block.json | 22 -- .../taiga/models/item/mythril_ingot.json | 6 - .../taiga/models/item/mythril_nugget.json | 6 - .../assets/taiga/models/item/mythril_ore.json | 10 - .../taiga/models/item/nihilite_dust.json | 6 + .../taiga/models/item/nihilite_ingot.json | 6 + .../taiga/models/item/nihilite_nugget.json | 6 + .../assets/taiga/models/item/niob_dust.json | 6 + .../assets/taiga/models/item/niob_ingot.json | 6 + .../assets/taiga/models/item/niob_nugget.json | 6 + .../taiga/models/item/nitronite_block.json | 22 -- .../taiga/models/item/nitronite_ingot.json | 6 - .../taiga/models/item/nitronite_nugget.json | 6 - .../taiga/models/item/noctunyx_block.json | 22 -- .../taiga/models/item/noctunyx_ingot.json | 6 - .../taiga/models/item/noctunyx_nugget.json | 6 - .../taiga/models/item/nucleum_block.json | 22 -- .../taiga/models/item/nucleum_dust.json | 6 + .../taiga/models/item/nucleum_ingot.json | 4 +- .../taiga/models/item/nucleum_nugget.json | 4 +- ...salt_nugget.json => obsidiorite_dust.json} | 4 +- .../taiga/models/item/obsidiorite_ingot.json | 6 + .../taiga/models/item/obsidiorite_nugget.json | 6 + .../assets/taiga/models/item/osram_dust.json | 6 + .../assets/taiga/models/item/osram_ingot.json | 6 + .../taiga/models/item/osram_nugget.json | 6 + .../taiga/models/item/palladium_block.json | 22 -- .../taiga/models/item/palladium_dust.json | 6 + .../taiga/models/item/palladium_ingot.json | 10 +- .../taiga/models/item/palladium_nugget.json | 4 +- .../taiga/models/item/palladium_ore.json | 10 - .../taiga/models/item/prometheum_block.json | 22 -- .../taiga/models/item/prometheum_dust.json | 6 + .../taiga/models/item/prometheum_ingot.json | 10 +- .../taiga/models/item/prometheum_nugget.json | 4 +- .../taiga/models/item/prometheum_ore.json | 10 - .../taiga/models/item/proxideum_block.json | 22 -- .../taiga/models/item/proxideum_ingot.json | 6 - .../taiga/models/item/proxideum_nugget.json | 6 - .../assets/taiga/models/item/proxii_dust.json | 6 + .../taiga/models/item/proxii_ingot.json | 6 + .../taiga/models/item/proxii_nugget.json | 6 + .../taiga/models/item/radiant_pearl.json | 6 - .../taiga/models/item/rotten_ground.json | 10 - .../taiga/models/item/rubium_block.json | 22 -- .../taiga/models/item/rubium_ingot.json | 6 - .../taiga/models/item/rubium_nugget.json | 6 - .../assets/taiga/models/item/rubium_ore.json | 10 - .../taiga/models/item/seismodium_block.json | 22 -- .../taiga/models/item/seismodium_ingot.json | 6 - .../taiga/models/item/seismodium_nugget.json | 6 - .../taiga/models/item/seismum_dust.json | 6 + .../taiga/models/item/seismum_ingot.json | 6 + .../taiga/models/item/seismum_nugget.json | 6 + .../taiga/models/item/slaggold_ingot.json | 6 - .../taiga/models/item/slaggold_ore.json | 10 - .../taiga/models/item/slagiron_ingot.json | 6 - .../taiga/models/item/slagiron_ore.json | 10 - .../taiga/models/item/solarium_block.json | 22 -- .../taiga/models/item/solarium_dust.json | 6 + .../taiga/models/item/solarium_ingot.json | 4 +- .../taiga/models/item/solarium_nugget.json | 4 +- .../taiga/models/item/spectrum_dust.json | 6 - .../taiga/models/item/terramite_block.json | 22 -- .../taiga/models/item/terramite_ingot.json | 6 - .../taiga/models/item/terramite_nugget.json | 6 - .../taiga/models/item/tiberium_block.json | 22 -- .../taiga/models/item/tiberium_dust.json | 6 + .../taiga/models/item/tiberium_ingot.json | 10 +- .../taiga/models/item/tiberium_nugget.json | 2 +- .../taiga/models/item/tiberium_ore.json | 10 - .../models/item/tiberium_shard_instable.json | 6 - .../taiga/models/item/titanite_block.json | 22 -- .../taiga/models/item/titanite_ingot.json | 6 - .../taiga/models/item/titanite_nugget.json | 6 - .../taiga/models/item/titanite_ore.json | 10 - .../taiga/models/item/triberium_dust.json | 6 + .../taiga/models/item/triberium_ingot.json | 6 + ...racite_dust.json => triberium_nugget.json} | 4 +- .../taiga/models/item/tritonite_dust.json | 6 + .../taiga/models/item/tritonite_ingot.json | 6 + .../taiga/models/item/tritonite_nugget.json | 6 + .../taiga/models/item/ultranite_block.json | 22 -- .../taiga/models/item/ultranite_ingot.json | 6 - .../taiga/models/item/ultranite_nugget.json | 6 - .../item/{lignite3.json => uru_dust.json} | 2 +- .../assets/taiga/models/item/uru_ingot.json | 6 + .../assets/taiga/models/item/uru_nugget.json | 6 + .../taiga/models/item/valyrium_dust.json | 6 + .../taiga/models/item/valyrium_ingot.json | 6 + .../taiga/models/item/valyrium_nugget.json | 6 + .../taiga/models/item/vibranium_block.json | 22 -- .../taiga/models/item/vibranium_dust.json | 6 + .../taiga/models/item/vibranium_ingot.json | 10 +- .../taiga/models/item/vibranium_nugget.json | 4 +- .../taiga/models/item/vibranium_ore.json | 10 - .../taiga/models/item/violium_block.json | 22 -- .../taiga/models/item/violium_dust.json | 6 + .../taiga/models/item/violium_ingot.json | 10 +- .../taiga/models/item/violium_nugget.json | 4 +- .../assets/taiga/models/item/violium_ore.json | 10 - .../assets/taiga/models/item/yrdeen_dust.json | 6 + .../taiga/models/item/yrdeen_ingot.json | 6 + .../taiga/models/item/yrdeen_nugget.json | 6 + .../resources/assets/taiga/textures/a1.json | 4 + .../resources/assets/taiga/textures/a2.json | 2 + .../taiga/textures/blocks/arcanite_ore.png | Bin 15564 -> 0 bytes .../taiga/textures/blocks/bismuth_ore.png | Bin 15813 -> 0 bytes .../taiga/textures/blocks/block/abyssum.png | Bin 0 -> 16485 bytes .../adamant.png} | Bin 16040 -> 16154 bytes .../{astrium_block.png => block/astrium.png} | Bin 16352 -> 16375 bytes .../{bismuth_block.png => block/aurorium.png} | Bin 16263 -> 16231 bytes .../textures/blocks/{ => block}/basalt.png | Bin 16146 -> 16022 bytes .../duranite.png} | Bin 16410 -> 16512 bytes .../blocks/{materials => block}/dyonite.png | Bin 16261 -> 16347 bytes .../{meteorite_block.png => block/eezo.png} | Bin 16149 -> 16147 bytes .../fractum.png} | Bin 16330 -> 16416 bytes .../{ignitite_block.png => block/ignitz.png} | Bin 16566 -> 16598 bytes .../{materials => block}/imperomite.png | Bin 16387 -> 16410 bytes .../{seismodium_block.png => block/iox.png} | Bin 16351 -> 16378 bytes .../karmesine.png} | Bin 16416 -> 16416 bytes .../{lumixyl_block.png => block/lumix.png} | Bin 16495 -> 16478 bytes .../taiga/textures/blocks/block/meteorite.png | Bin 0 -> 16523 bytes .../textures/blocks/block/meteoritecobble.png | Bin 0 -> 16838 bytes .../taiga/textures/blocks/block/nihilite.png | Bin 0 -> 18955 bytes .../block/niob.png} | Bin 18076 -> 18656 bytes .../{aegisalt_block.png => block/nucleum.png} | Bin 16159 -> 16205 bytes .../obsidiorite.png} | Bin 16338 -> 16322 bytes .../blocks/block/obsidioritecobble.png | Bin 0 -> 16624 bytes .../taiga/textures/blocks/block/osram.png | Bin 0 -> 16416 bytes .../palladium.png} | Bin 16416 -> 16416 bytes .../prometheum.png} | Bin 15949 -> 16133 bytes .../taiga/textures/blocks/block/proxii.png | Bin 0 -> 18908 bytes .../seismum.png} | Bin 16393 -> 16507 bytes .../taiga/textures/blocks/block/solarium.png | Bin 0 -> 16327 bytes .../tiberium.png} | Bin 16507 -> 16507 bytes .../taiga/textures/blocks/block/triberium.png | Bin 0 -> 16507 bytes .../tritonite.png} | Bin 16410 -> 16412 bytes .../ardite_rust.png => block/uru.png} | Bin 15782 -> 15818 bytes .../{nucleum_block.png => block/valyrium.png} | Bin 16244 -> 16402 bytes .../vibranium.png} | Bin 16372 -> 16313 bytes .../{violium_block.png => block/violium.png} | Bin 18654 -> 18676 bytes .../{ignitite_ore.png => block/yrdeen.png} | Bin 16033 -> 16245 bytes .../taiga/textures/blocks/bysmuid_block.png | Bin 16309 -> 0 bytes .../taiga/textures/blocks/dyonite_block.png | Bin 16355 -> 0 bytes .../taiga/textures/blocks/eternite_ore.png | Bin 15787 -> 0 bytes .../textures/blocks/glimmerstone_block.png | Bin 16169 -> 0 bytes .../taiga/textures/blocks/karmesine_ore.png | Bin 15940 -> 0 bytes .../taiga/textures/blocks/lignite_ore.png | Bin 15210 -> 0 bytes .../taiga/textures/blocks/luminar_block.png | Bin 16201 -> 0 bytes .../textures/blocks/materials/adamantite.png | Bin 16136 -> 0 bytes .../textures/blocks/materials/arcanite.png | Bin 16356 -> 0 bytes .../textures/blocks/materials/bismuth.png | Bin 16187 -> 0 bytes .../textures/blocks/materials/bysmuid.png | Bin 16382 -> 0 bytes .../textures/blocks/materials/meteorite.png | Bin 16282 -> 0 bytes .../textures/blocks/materials/proxideum.png | Bin 16389 -> 0 bytes .../taiga/textures/blocks/meteorite_ore.png | Bin 16081 -> 0 bytes .../taiga/textures/blocks/mindorite_ore.png | Bin 15722 -> 0 bytes .../taiga/textures/blocks/mythril_ore.png | Bin 15668 -> 0 bytes .../taiga/textures/blocks/nitronite_block.png | Bin 16409 -> 0 bytes .../taiga/textures/blocks/noctunyx_block.png | Bin 16507 -> 0 bytes .../{proxideum_block.png => ore/abyssum.png} | Bin 16482 -> 16458 bytes .../ore/aurorium.png} | Bin 15808 -> 16317 bytes .../ore/duranite.png} | Bin 15950 -> 17091 bytes .../assets/taiga/textures/blocks/ore/eezo.png | Bin 0 -> 16153 bytes .../taiga/textures/blocks/ore/karmesine.png | Bin 0 -> 16346 bytes .../blocks/ore/karmesineandensite.png | Bin 0 -> 16346 bytes .../textures/blocks/ore/karmesinediorite.png | Bin 0 -> 16328 bytes .../karmesinegranite.png} | Bin 16314 -> 16278 bytes .../taiga/textures/blocks/ore/osram.png | Bin 0 -> 16576 bytes .../taiga/textures/blocks/ore/palladium.png | Bin 0 -> 16268 bytes .../blocks/{materials => ore}/prometheum.png | Bin 16272 -> 16359 bytes .../ore/tiberium.png} | Bin 15979 -> 16507 bytes .../assets/taiga/textures/blocks/ore/uru.png | Bin 0 -> 17057 bytes .../nucleum.png => ore/valyrium.png} | Bin 16269 -> 16402 bytes .../taiga/textures/blocks/ore/vibranium.png | Bin 0 -> 16291 bytes .../taiga/textures/blocks/palladium_ore.png | Bin 16380 -> 0 bytes .../taiga/textures/blocks/prometheum_ore.png | Bin 16364 -> 0 bytes .../taiga/textures/blocks/rotten_ground.png | Bin 15816 -> 0 bytes .../taiga/textures/blocks/rubium_block.png | Bin 16416 -> 0 bytes .../taiga/textures/blocks/rubium_ore.png | Bin 16026 -> 0 bytes .../taiga/textures/blocks/slaggold_ore.png | Bin 15548 -> 0 bytes .../taiga/textures/blocks/slagiron_ore.png | Bin 15473 -> 0 bytes .../taiga/textures/blocks/terramite_block.png | Bin 16378 -> 0 bytes .../taiga/textures/blocks/tiberium_ore.png | Bin 16454 -> 0 bytes .../taiga/textures/blocks/titanite_block.png | Bin 16273 -> 0 bytes .../taiga/textures/blocks/titanite_ore.png | Bin 16401 -> 0 bytes .../taiga/textures/blocks/vibranium_ore.png | Bin 15832 -> 0 bytes .../resources/assets/taiga/textures/items.bat | 11 + .../taiga/textures/items/anthracite_dust.png | Bin 15280 -> 0 bytes .../taiga/textures/items/bysmuid_nugget.png | Bin 15895 -> 0 bytes .../abyssum.png} | Bin 15806 -> 15938 bytes .../taiga/textures/items/dust/adamant.png | Bin 0 -> 16066 bytes .../{astrium_nugget.png => dust/astrium.png} | Bin 15803 -> 15988 bytes .../taiga/textures/items/dust/aurorium.png | Bin 0 -> 16043 bytes .../taiga/textures/items/dust/basalt.png | Bin 0 -> 16036 bytes .../taiga/textures/items/dust/duranite.png | Bin 0 -> 16067 bytes .../taiga/textures/items/dust/dyonite.png | Bin 0 -> 16140 bytes .../{aegisalt_nugget.png => dust/eezo.png} | Bin 15807 -> 15956 bytes .../fractum.png} | Bin 15805 -> 16004 bytes .../taiga/textures/items/dust/ignitz.png | Bin 0 -> 16254 bytes .../taiga/textures/items/dust/imperomite.png | Bin 0 -> 16050 bytes .../assets/taiga/textures/items/dust/iox.png | Bin 0 -> 16212 bytes .../taiga/textures/items/dust/karmesine.png | Bin 0 -> 16064 bytes .../taiga/textures/items/dust/lumix.png | Bin 0 -> 16093 bytes .../meteorite.png} | Bin 15806 -> 15894 bytes .../noctunyx.png => items/dust/nihilite.png} | Bin 16304 -> 16182 bytes .../dust/niob.png} | Bin 16096 -> 16111 bytes .../eternite_ingot.png => dust/nucleum.png} | Bin 16074 -> 16028 bytes .../taiga/textures/items/dust/obsidiorite.png | Bin 0 -> 15982 bytes .../taiga/textures/items/dust/osram.png | Bin 0 -> 16396 bytes .../taiga/textures/items/dust/palladium.png | Bin 0 -> 16150 bytes .../prometheum.png} | Bin 15757 -> 15855 bytes .../taiga/textures/items/dust/proxii.png | Bin 0 -> 16015 bytes .../{arcanite_nugget.png => dust/seismum.png} | Bin 15796 -> 15995 bytes .../taiga/textures/items/dust/solarium.png | Bin 0 -> 16128 bytes .../titanite_ingot.png => dust/tiberium.png} | Bin 16110 -> 16047 bytes .../tritonite.png} | Bin 15898 -> 16138 bytes .../{tiberium_nugget.png => dust/uru.png} | Bin 15898 -> 16012 bytes .../taiga/textures/items/dust/valyrium.png | Bin 0 -> 16070 bytes .../dust/vibranium.png} | Bin 16287 -> 16102 bytes .../taiga/textures/items/dust/violium.png | Bin 0 -> 16019 bytes .../taiga/textures/items/dust/yrdeen.png | Bin 0 -> 16009 bytes .../taiga/textures/items/energy_pearl.png | Bin 15859 -> 0 bytes .../taiga/textures/items/glimmer_pearl.png | Bin 15602 -> 0 bytes .../taiga/textures/items/glimmercoal.png | Bin 15269 -> 0 bytes .../textures/items/glimmerstone_dust.png | Bin 15619 -> 0 bytes .../mindorite_ingot.png => ingot/abyssum.png} | Bin 15934 -> 15937 bytes .../adamant.png} | Bin .../taiga/textures/items/ingot/astrium.png | Bin 0 -> 15855 bytes .../rubium_ingot.png => ingot/aurorium.png} | Bin .../nucleum_ingot.png => ingot/basalt.png} | Bin 15944 -> 15904 bytes .../aegisalt_ingot.png => ingot/duranite.png} | Bin 15962 -> 15966 bytes .../nitronite_ingot.png => ingot/dyonite.png} | Bin 16254 -> 16300 bytes .../taiga/textures/items/ingot/eezo.png | Bin 0 -> 15870 bytes .../fractum.png} | Bin 15885 -> 15919 bytes .../taiga/textures/items/ingot/ignitz.png | Bin 0 -> 16361 bytes .../imperomite.png} | Bin 15774 -> 15882 bytes .../{tic/ignitite_ingot.png => ingot/iox.png} | Bin 16288 -> 16272 bytes .../karmesine.png} | Bin 15985 -> 16019 bytes .../taiga/textures/items/ingot/lumix.png | Bin 0 -> 16046 bytes .../taiga/textures/items/ingot/meteorite.png | Bin 0 -> 15816 bytes .../noctunyx_ingot.png => ingot/nihilite.png} | Bin 16261 -> 16294 bytes .../taiga/textures/items/ingot/niob.png | Bin 0 -> 16214 bytes .../taiga/textures/items/ingot/nucleum.png | Bin 0 -> 15880 bytes .../textures/items/ingot/obsidiorite.png | Bin 0 -> 16291 bytes .../taiga/textures/items/ingot/osram.png | Bin 0 -> 16419 bytes .../palladium.png} | Bin 16117 -> 16135 bytes .../taiga/textures/items/ingot/prometheum.png | Bin 0 -> 15817 bytes .../taiga/textures/items/ingot/proxii.png | Bin 0 -> 16246 bytes .../seismum.png} | Bin 15803 -> 15829 bytes .../dyonite_ingot.png => ingot/solarium.png} | Bin 15990 -> 15985 bytes .../tiberium_ingot.png => ingot/tiberium.png} | Bin 15960 -> 15958 bytes .../taiga/textures/items/ingot/tritonite.png | Bin 0 -> 16149 bytes .../assets/taiga/textures/items/ingot/uru.png | Bin 0 -> 15992 bytes .../taiga/textures/items/ingot/valyrium.png | Bin 0 -> 15971 bytes .../taiga/textures/items/ingot/vibranium.png | Bin 0 -> 16095 bytes .../mythril_ingot.png => ingot/violium.png} | Bin 15807 -> 15918 bytes .../cryptogen_ingot.png => ingot/yrdeen.png} | Bin 15861 -> 15869 bytes .../taiga/textures/items/iron_nugget.png | Bin 15055 -> 0 bytes .../assets/taiga/textures/items/lignite.png | Bin 15239 -> 0 bytes .../taiga/textures/items/luminar_dust.png | Bin 15337 -> 0 bytes .../abyssum.png} | Bin 15811 -> 15589 bytes .../{fuel_brick.png => nugget/adamant.png} | Bin 15774 -> 15595 bytes .../astrium_ingot.png => nugget/astrium.png} | Bin 15777 -> 15577 bytes .../aurorium.png} | Bin 15807 -> 15588 bytes .../basalt.png} | Bin 15778 -> 15609 bytes .../{nitro_brick.png => nugget/duranite.png} | Bin 15861 -> 15631 bytes .../dyonite.png} | Bin 15902 -> 15922 bytes .../{nucleum_nugget.png => nugget/eezo.png} | Bin 15806 -> 15610 bytes .../fractum.png} | Bin 15788 -> 15613 bytes .../ignitz.png} | Bin 15989 -> 15924 bytes .../imperomite.png} | Bin 15747 -> 15582 bytes .../{eternite_nugget.png => nugget/iox.png} | Bin 15876 -> 15899 bytes .../taiga/textures/items/nugget/iron.png | Bin 0 -> 15597 bytes .../karmesine.png} | Bin 15807 -> 15614 bytes .../{dyonite_nugget.png => nugget/lumix.png} | Bin 15792 -> 15786 bytes .../meteorite.png} | Bin 15813 -> 15568 bytes .../nihilite.png} | Bin 15900 -> 15899 bytes .../{ultranite_nugget.png => nugget/niob.png} | Bin 15778 -> 15825 bytes .../nucleum.png} | Bin 15853 -> 15579 bytes .../textures/items/nugget/obsidiorite.png | Bin 0 -> 15799 bytes .../taiga/textures/items/nugget/osram.png | Bin 0 -> 16067 bytes .../palladium.png} | Bin 15806 -> 15810 bytes .../prometheum.png} | Bin 15756 -> 15559 bytes .../proxideum_ingot.png => nugget/proxii.png} | Bin 15818 -> 15597 bytes .../taiga/textures/items/nugget/seismum.png | Bin 0 -> 15581 bytes .../solarium.png} | Bin 15798 -> 15768 bytes .../tiberium.png} | Bin 15788 -> 15595 bytes .../tritonite.png} | Bin 15788 -> 15808 bytes .../vibranium_ingot.png => nugget/uru.png} | Bin 15891 -> 15582 bytes .../taiga/textures/items/nugget/valyrium.png | Bin 0 -> 15650 bytes .../vibranium.png} | Bin 15790 -> 15807 bytes .../violium_ingot.png => nugget/violium.png} | Bin 15861 -> 15597 bytes .../yrdeen.png} | Bin 15810 -> 15811 bytes .../taiga/textures/items/radiant_pearl.png | Bin 16262 -> 0 bytes .../taiga/textures/items/slaggold_ingot.png | Bin 15920 -> 0 bytes .../taiga/textures/items/slagiron_ingot.png | Bin 15409 -> 0 bytes .../taiga/textures/items/spectrum_dust.png | Bin 15362 -> 0 bytes .../items/tiberium_shard_instable.png | Bin 15827 -> 0 bytes .../textures/items/tic/arcanite_ingot.png | Bin 15333 -> 0 bytes .../textures/items/tic/bismuth_ingot.png | Bin 15071 -> 0 bytes .../textures/items/tic/bysmuid_ingot.png | Bin 15999 -> 0 bytes .../textures/items/tic/lumixyl_ingot.png | Bin 16286 -> 0 bytes .../textures/items/tic/solarium_ingot.png | Bin 15960 -> 0 bytes .../violium_ore.png => materials/adamant.png} | Bin 15997 -> 18786 bytes .../duranite.png} | Bin 16325 -> 18742 bytes .../taiga/textures/materials/imperomite.png | Bin 0 -> 18759 bytes .../nucleum.png} | Bin 16377 -> 18742 bytes .../assets/taiga/textures/materials/osram.png | Bin 0 -> 18961 bytes .../taiga/textures/materials/palladium.png | Bin 0 -> 18742 bytes .../{blocks => }/materials/solarium.png | Bin 16381 -> 18869 bytes .../{blocks => }/materials/tiberium.png | Bin 16303 -> 19041 bytes .../taiga/textures/materials/tiberiumx.png | Bin 0 -> 18991 bytes .../taiga/textures/materials/tritonite.png | Bin 0 -> 18956 bytes .../assets/taiga/textures/materials/uru.png | Bin 0 -> 18749 bytes .../taiga/textures/materials/valyrium.png | Bin 0 -> 18977 bytes .../taiga/textures/materials/vibranium.png | Bin 0 -> 18956 bytes src/main/resources/materials.txt | 32 --- 625 files changed, 3540 insertions(+), 3279 deletions(-) create mode 100644 src/main/java/com/sosnitzka/taiga/blocks/BlockCobble.java create mode 100644 src/main/java/com/sosnitzka/taiga/blocks/BlockMetal.java create mode 100644 src/main/java/com/sosnitzka/taiga/blocks/BlockMeteoriteRock.java create mode 100644 src/main/java/com/sosnitzka/taiga/blocks/BlockOre.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java delete mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitHaunted.java delete mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitProgressiveStats.java delete mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitRandomize.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitTemplate.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitVortex.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java delete mode 100644 src/main/java/com/sosnitzka/taiga/util/FuelHandler.java create mode 100644 src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java create mode 100644 src/main/java/com/sosnitzka/taiga/world/WorldGen.java rename src/main/java/com/sosnitzka/taiga/world/{ZWorldGenMinable.java => WorldGenMinable.java} (93%) delete mode 100644 src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java create mode 100644 src/main/resources/assets/taiga/blockstates/abyssum_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/abyssum_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/adamant_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/adamantite_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/adamantite_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/aegisalt_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/arcanite_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/arcanite_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/aurorium_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/aurorium_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/basalt.json create mode 100644 src/main/resources/assets/taiga/blockstates/basalt_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/bismuth_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/bismuth_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/bysmuid_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/cryptogen_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/duranite_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/duranite_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/eezo_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/eezo_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/eternite_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/eternite_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/fractoryte_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/fractum_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/ignitite_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/ignitite_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/ignitz_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/iox_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/lignite_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/lumix_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/lumixyl_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/meteorite_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/meteoritecobble_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/mindorite_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/mindorite_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/mythril_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/mythril_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/nihilite_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/niob_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/nitronite_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/noctunyx_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/obsidiorite_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/obsidioritecobble_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/osram_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/osram_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/proxideum_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/proxii_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/rotten_ground.json delete mode 100644 src/main/resources/assets/taiga/blockstates/rubium_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/rubium_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/seismodium_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/seismum_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/slaggold_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/slagiron_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/terramite_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/titanite_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/titanite_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/triberium_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/tritonite_block.json delete mode 100644 src/main/resources/assets/taiga/blockstates/ultranite_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/uru_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/uru_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/valyrium_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/valyrium_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/violium_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/yrdeen_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/adamantite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/adamantite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/aegisalt_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/arcanite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/arcanite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/astrite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/astrium_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/basalt.json delete mode 100644 src/main/resources/assets/taiga/models/block/bismuth_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/bismuth_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/bysmuid_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/cryptogen_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/dyonite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/eternite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/eternite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/fractoryte_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/ignitite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/ignitite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/imperomite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/karmesine_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/karmesine_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/lignite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/lumixyl_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/meteorite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/meteorite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/mindorite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/mindorite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/mythril_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/mythril_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/nitronite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/noctunyx_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/nucleum_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/palladium_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/palladium_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/prometheum_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/prometheum_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/proxideum_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/rotten_ground.json delete mode 100644 src/main/resources/assets/taiga/models/block/rubium_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/rubium_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/seismodium_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/slaggold_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/slagiron_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/solarium_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/terramite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/tiberium_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/tiberium_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/titanite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/titanite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/ultranite_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/vibranium_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/vibranium_ore.json delete mode 100644 src/main/resources/assets/taiga/models/block/violium_block.json delete mode 100644 src/main/resources/assets/taiga/models/block/violium_ore.json rename src/main/resources/assets/taiga/models/item/{glimmercoal.json => abyssum_dust.json} (55%) rename src/main/resources/assets/taiga/models/item/{glimmer_pearl.json => abyssum_ingot.json} (54%) create mode 100644 src/main/resources/assets/taiga/models/item/abyssum_nugget.json rename src/main/resources/assets/taiga/models/item/{nitro_brick.json => adamant_dust.json} (55%) rename src/main/resources/assets/taiga/models/item/{energy_pearl.json => adamant_ingot.json} (54%) create mode 100644 src/main/resources/assets/taiga/models/item/adamant_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/adamantite_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/adamantite_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/adamantite_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/adamantite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/aegisalt_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/aegisalt_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/arcanite_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/arcanite_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/arcanite_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/arcanite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/astrium_block.json create mode 100644 src/main/resources/assets/taiga/models/item/astrium_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/aurorium_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/aurorium_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/aurorium_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/basalt.json create mode 100644 src/main/resources/assets/taiga/models/item/basalt_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/basalt_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/basalt_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/bismuth_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/bismuth_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/bismuth_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/bismuth_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/bysmuid_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/bysmuid_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/bysmuid_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/cryptogen_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/cryptogen_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/cryptogen_nugget.json create mode 100644 src/main/resources/assets/taiga/models/item/duranite_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/duranite_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/duranite_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/dyonite_block.json create mode 100644 src/main/resources/assets/taiga/models/item/dyonite_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/eezo_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/eezo_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/eezo_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/eternite_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/eternite_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/eternite_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/eternite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/fractoryte_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/fractoryte_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/fractoryte_nugget.json create mode 100644 src/main/resources/assets/taiga/models/item/fractum_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/fractum_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/fractum_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/fuel_brick.json delete mode 100644 src/main/resources/assets/taiga/models/item/glimmerstone_dust.json delete mode 100644 src/main/resources/assets/taiga/models/item/ignitite_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/ignitite_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/ignitite_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/ignitite_ore.json create mode 100644 src/main/resources/assets/taiga/models/item/ignitz_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/ignitz_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/ignitz_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/imperomite_block.json create mode 100644 src/main/resources/assets/taiga/models/item/imperomite_dust.json rename src/main/resources/assets/taiga/models/item/{lignite2.json => iox_dust.json} (58%) create mode 100644 src/main/resources/assets/taiga/models/item/iox_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/iox_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/karmesine_block.json create mode 100644 src/main/resources/assets/taiga/models/item/karmesine_dust.json delete mode 100644 src/main/resources/assets/taiga/models/item/karmesine_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/lignite.json delete mode 100644 src/main/resources/assets/taiga/models/item/lignite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/luminar_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/lumix_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/lumix_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/lumix_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/lumixyl_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/lumixyl_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/lumixyl_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/meteorite_block.json create mode 100644 src/main/resources/assets/taiga/models/item/meteorite_dust.json delete mode 100644 src/main/resources/assets/taiga/models/item/meteorite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/mindorite_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/mindorite_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/mindorite_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/mindorite_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/mythril_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/mythril_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/mythril_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/mythril_ore.json create mode 100644 src/main/resources/assets/taiga/models/item/nihilite_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/nihilite_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/nihilite_nugget.json create mode 100644 src/main/resources/assets/taiga/models/item/niob_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/niob_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/niob_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/nitronite_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/nitronite_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/nitronite_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/noctunyx_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/noctunyx_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/noctunyx_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/nucleum_block.json create mode 100644 src/main/resources/assets/taiga/models/item/nucleum_dust.json rename src/main/resources/assets/taiga/models/item/{aegisalt_nugget.json => obsidiorite_dust.json} (53%) create mode 100644 src/main/resources/assets/taiga/models/item/obsidiorite_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/obsidiorite_nugget.json create mode 100644 src/main/resources/assets/taiga/models/item/osram_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/osram_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/osram_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/palladium_block.json create mode 100644 src/main/resources/assets/taiga/models/item/palladium_dust.json delete mode 100644 src/main/resources/assets/taiga/models/item/palladium_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/prometheum_block.json create mode 100644 src/main/resources/assets/taiga/models/item/prometheum_dust.json delete mode 100644 src/main/resources/assets/taiga/models/item/prometheum_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/proxideum_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/proxideum_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/proxideum_nugget.json create mode 100644 src/main/resources/assets/taiga/models/item/proxii_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/proxii_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/proxii_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/radiant_pearl.json delete mode 100644 src/main/resources/assets/taiga/models/item/rotten_ground.json delete mode 100644 src/main/resources/assets/taiga/models/item/rubium_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/rubium_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/rubium_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/rubium_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/seismodium_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/seismodium_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/seismodium_nugget.json create mode 100644 src/main/resources/assets/taiga/models/item/seismum_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/seismum_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/seismum_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/slaggold_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/slaggold_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/slagiron_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/slagiron_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/solarium_block.json create mode 100644 src/main/resources/assets/taiga/models/item/solarium_dust.json delete mode 100644 src/main/resources/assets/taiga/models/item/spectrum_dust.json delete mode 100644 src/main/resources/assets/taiga/models/item/terramite_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/terramite_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/terramite_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/tiberium_block.json create mode 100644 src/main/resources/assets/taiga/models/item/tiberium_dust.json delete mode 100644 src/main/resources/assets/taiga/models/item/tiberium_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/tiberium_shard_instable.json delete mode 100644 src/main/resources/assets/taiga/models/item/titanite_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/titanite_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/titanite_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/titanite_ore.json create mode 100644 src/main/resources/assets/taiga/models/item/triberium_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/triberium_ingot.json rename src/main/resources/assets/taiga/models/item/{anthracite_dust.json => triberium_nugget.json} (53%) create mode 100644 src/main/resources/assets/taiga/models/item/tritonite_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/tritonite_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/tritonite_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/ultranite_block.json delete mode 100644 src/main/resources/assets/taiga/models/item/ultranite_ingot.json delete mode 100644 src/main/resources/assets/taiga/models/item/ultranite_nugget.json rename src/main/resources/assets/taiga/models/item/{lignite3.json => uru_dust.json} (58%) create mode 100644 src/main/resources/assets/taiga/models/item/uru_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/uru_nugget.json create mode 100644 src/main/resources/assets/taiga/models/item/valyrium_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/valyrium_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/valyrium_nugget.json delete mode 100644 src/main/resources/assets/taiga/models/item/vibranium_block.json create mode 100644 src/main/resources/assets/taiga/models/item/vibranium_dust.json delete mode 100644 src/main/resources/assets/taiga/models/item/vibranium_ore.json delete mode 100644 src/main/resources/assets/taiga/models/item/violium_block.json create mode 100644 src/main/resources/assets/taiga/models/item/violium_dust.json delete mode 100644 src/main/resources/assets/taiga/models/item/violium_ore.json create mode 100644 src/main/resources/assets/taiga/models/item/yrdeen_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/yrdeen_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/yrdeen_nugget.json create mode 100644 src/main/resources/assets/taiga/textures/a1.json create mode 100644 src/main/resources/assets/taiga/textures/a2.json delete mode 100644 src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/abyssum.png rename src/main/resources/assets/taiga/textures/blocks/{adamantite_block.png => block/adamant.png} (93%) rename src/main/resources/assets/taiga/textures/blocks/{astrium_block.png => block/astrium.png} (92%) rename src/main/resources/assets/taiga/textures/blocks/{bismuth_block.png => block/aurorium.png} (92%) rename src/main/resources/assets/taiga/textures/blocks/{ => block}/basalt.png (92%) rename src/main/resources/assets/taiga/textures/blocks/{vibranium_block.png => block/duranite.png} (92%) rename src/main/resources/assets/taiga/textures/blocks/{materials => block}/dyonite.png (92%) rename src/main/resources/assets/taiga/textures/blocks/{meteorite_block.png => block/eezo.png} (93%) rename src/main/resources/assets/taiga/textures/blocks/{fractoryte_block.png => block/fractum.png} (92%) rename src/main/resources/assets/taiga/textures/blocks/{ignitite_block.png => block/ignitz.png} (92%) rename src/main/resources/assets/taiga/textures/blocks/{materials => block}/imperomite.png (92%) rename src/main/resources/assets/taiga/textures/blocks/{seismodium_block.png => block/iox.png} (92%) rename src/main/resources/assets/taiga/textures/blocks/{karmesine_block.png => block/karmesine.png} (92%) rename src/main/resources/assets/taiga/textures/blocks/{lumixyl_block.png => block/lumix.png} (92%) create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/meteorite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/nihilite.png rename src/main/resources/assets/taiga/textures/{items/violium_nugget.png => blocks/block/niob.png} (92%) rename src/main/resources/assets/taiga/textures/blocks/{aegisalt_block.png => block/nucleum.png} (93%) rename src/main/resources/assets/taiga/textures/blocks/{eternite_block.png => block/obsidiorite.png} (92%) create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/osram.png rename src/main/resources/assets/taiga/textures/blocks/{palladium_block.png => block/palladium.png} (92%) rename src/main/resources/assets/taiga/textures/blocks/{prometheum_block.png => block/prometheum.png} (93%) create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/proxii.png rename src/main/resources/assets/taiga/textures/blocks/{mindorite_block.png => block/seismum.png} (90%) create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/solarium.png rename src/main/resources/assets/taiga/textures/blocks/{tiberium_block.png => block/tiberium.png} (92%) create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/triberium.png rename src/main/resources/assets/taiga/textures/blocks/{imperomite_block.png => block/tritonite.png} (92%) rename src/main/resources/assets/taiga/textures/blocks/{materials/ardite_rust.png => block/uru.png} (88%) rename src/main/resources/assets/taiga/textures/blocks/{nucleum_block.png => block/valyrium.png} (91%) rename src/main/resources/assets/taiga/textures/blocks/{cryptogen_block.png => block/vibranium.png} (91%) rename src/main/resources/assets/taiga/textures/blocks/{violium_block.png => block/violium.png} (93%) rename src/main/resources/assets/taiga/textures/blocks/{ignitite_ore.png => block/yrdeen.png} (88%) delete mode 100644 src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/dyonite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/eternite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/lignite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/luminar_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/mythril_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/nitronite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png rename src/main/resources/assets/taiga/textures/blocks/{proxideum_block.png => ore/abyssum.png} (92%) rename src/main/resources/assets/taiga/textures/{items/bismuth_nugget.png => blocks/ore/aurorium.png} (92%) rename src/main/resources/assets/taiga/textures/{items/vibranium_nugget.png => blocks/ore/duranite.png} (88%) create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/eezo.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png rename src/main/resources/assets/taiga/textures/blocks/{solarium_block.png => ore/karmesinegranite.png} (92%) create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/osram.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/palladium.png rename src/main/resources/assets/taiga/textures/blocks/{materials => ore}/prometheum.png (92%) rename src/main/resources/assets/taiga/textures/{items/lumixyl_nugget.png => blocks/ore/tiberium.png} (91%) create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/uru.png rename src/main/resources/assets/taiga/textures/blocks/{materials/nucleum.png => ore/valyrium.png} (91%) create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/palladium_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/rotten_ground.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/rubium_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/rubium_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/terramite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/titanite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/titanite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png create mode 100644 src/main/resources/assets/taiga/textures/items.bat delete mode 100644 src/main/resources/assets/taiga/textures/items/anthracite_dust.png delete mode 100644 src/main/resources/assets/taiga/textures/items/bysmuid_nugget.png rename src/main/resources/assets/taiga/textures/items/{cryptogen_nugget.png => dust/abyssum.png} (94%) create mode 100644 src/main/resources/assets/taiga/textures/items/dust/adamant.png rename src/main/resources/assets/taiga/textures/items/{astrium_nugget.png => dust/astrium.png} (94%) create mode 100644 src/main/resources/assets/taiga/textures/items/dust/aurorium.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/basalt.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/duranite.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/dyonite.png rename src/main/resources/assets/taiga/textures/items/{aegisalt_nugget.png => dust/eezo.png} (93%) rename src/main/resources/assets/taiga/textures/items/{terramite_nugget.png => dust/fractum.png} (94%) create mode 100644 src/main/resources/assets/taiga/textures/items/dust/ignitz.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/imperomite.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/iox.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/karmesine.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/lumix.png rename src/main/resources/assets/taiga/textures/items/{imperomite_nugget.png => dust/meteorite.png} (94%) rename src/main/resources/assets/taiga/textures/{blocks/materials/noctunyx.png => items/dust/nihilite.png} (93%) rename src/main/resources/assets/taiga/textures/{blocks/ultranite_block.png => items/dust/niob.png} (93%) rename src/main/resources/assets/taiga/textures/items/{tic/eternite_ingot.png => dust/nucleum.png} (93%) create mode 100644 src/main/resources/assets/taiga/textures/items/dust/obsidiorite.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/osram.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/palladium.png rename src/main/resources/assets/taiga/textures/items/{prometheum_nugget.png => dust/prometheum.png} (94%) create mode 100644 src/main/resources/assets/taiga/textures/items/dust/proxii.png rename src/main/resources/assets/taiga/textures/items/{arcanite_nugget.png => dust/seismum.png} (94%) create mode 100644 src/main/resources/assets/taiga/textures/items/dust/solarium.png rename src/main/resources/assets/taiga/textures/items/{tic/titanite_ingot.png => dust/tiberium.png} (93%) rename src/main/resources/assets/taiga/textures/items/{proxideum_nugget.png => dust/tritonite.png} (93%) rename src/main/resources/assets/taiga/textures/items/{tiberium_nugget.png => dust/uru.png} (93%) create mode 100644 src/main/resources/assets/taiga/textures/items/dust/valyrium.png rename src/main/resources/assets/taiga/textures/{blocks/mythril_block.png => items/dust/vibranium.png} (92%) create mode 100644 src/main/resources/assets/taiga/textures/items/dust/violium.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/yrdeen.png delete mode 100644 src/main/resources/assets/taiga/textures/items/energy_pearl.png delete mode 100644 src/main/resources/assets/taiga/textures/items/glimmer_pearl.png delete mode 100644 src/main/resources/assets/taiga/textures/items/glimmercoal.png delete mode 100644 src/main/resources/assets/taiga/textures/items/glimmerstone_dust.png rename src/main/resources/assets/taiga/textures/items/{tic/mindorite_ingot.png => ingot/abyssum.png} (93%) rename src/main/resources/assets/taiga/textures/items/{tic/adamantite_ingot.png => ingot/adamant.png} (100%) create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/astrium.png rename src/main/resources/assets/taiga/textures/items/{tic/rubium_ingot.png => ingot/aurorium.png} (100%) rename src/main/resources/assets/taiga/textures/items/{tic/nucleum_ingot.png => ingot/basalt.png} (93%) rename src/main/resources/assets/taiga/textures/items/{tic/aegisalt_ingot.png => ingot/duranite.png} (93%) rename src/main/resources/assets/taiga/textures/items/{tic/nitronite_ingot.png => ingot/dyonite.png} (93%) create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/eezo.png rename src/main/resources/assets/taiga/textures/items/{tic/fractoryte_ingot.png => ingot/fractum.png} (93%) create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/ignitz.png rename src/main/resources/assets/taiga/textures/items/{meteorite_nugget.png => ingot/imperomite.png} (94%) rename src/main/resources/assets/taiga/textures/items/{tic/ignitite_ingot.png => ingot/iox.png} (93%) rename src/main/resources/assets/taiga/textures/items/{tic/karmesine_ingot.png => ingot/karmesine.png} (93%) create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/lumix.png create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/meteorite.png rename src/main/resources/assets/taiga/textures/items/{tic/noctunyx_ingot.png => ingot/nihilite.png} (93%) create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/niob.png create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/nucleum.png create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/obsidiorite.png create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/osram.png rename src/main/resources/assets/taiga/textures/items/{tic/palladium_ingot.png => ingot/palladium.png} (93%) create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/prometheum.png create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/proxii.png rename src/main/resources/assets/taiga/textures/items/{seismodium_nugget.png => ingot/seismum.png} (93%) rename src/main/resources/assets/taiga/textures/items/{tic/dyonite_ingot.png => ingot/solarium.png} (94%) rename src/main/resources/assets/taiga/textures/items/{tic/tiberium_ingot.png => ingot/tiberium.png} (93%) create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/tritonite.png create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/uru.png create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/valyrium.png create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/vibranium.png rename src/main/resources/assets/taiga/textures/items/{tic/mythril_ingot.png => ingot/violium.png} (93%) rename src/main/resources/assets/taiga/textures/items/{tic/cryptogen_ingot.png => ingot/yrdeen.png} (94%) delete mode 100644 src/main/resources/assets/taiga/textures/items/iron_nugget.png delete mode 100644 src/main/resources/assets/taiga/textures/items/lignite.png delete mode 100644 src/main/resources/assets/taiga/textures/items/luminar_dust.png rename src/main/resources/assets/taiga/textures/items/{tic/terramite_ingot.png => nugget/abyssum.png} (94%) rename src/main/resources/assets/taiga/textures/items/{fuel_brick.png => nugget/adamant.png} (94%) rename src/main/resources/assets/taiga/textures/items/{tic/astrium_ingot.png => nugget/astrium.png} (94%) rename src/main/resources/assets/taiga/textures/items/{rubium_nugget.png => nugget/aurorium.png} (94%) rename src/main/resources/assets/taiga/textures/items/{adamantite_nugget.png => nugget/basalt.png} (94%) rename src/main/resources/assets/taiga/textures/items/{nitro_brick.png => nugget/duranite.png} (94%) rename src/main/resources/assets/taiga/textures/items/{nitronite_nugget.png => nugget/dyonite.png} (95%) rename src/main/resources/assets/taiga/textures/items/{nucleum_nugget.png => nugget/eezo.png} (93%) rename src/main/resources/assets/taiga/textures/items/{tic/seismodium_ingot.png => nugget/fractum.png} (94%) rename src/main/resources/assets/taiga/textures/items/{ignitite_nugget.png => nugget/ignitz.png} (94%) rename src/main/resources/assets/taiga/textures/items/{tic/meteorite_ingot.png => nugget/imperomite.png} (94%) rename src/main/resources/assets/taiga/textures/items/{eternite_nugget.png => nugget/iox.png} (95%) create mode 100644 src/main/resources/assets/taiga/textures/items/nugget/iron.png rename src/main/resources/assets/taiga/textures/items/{karmesine_nugget.png => nugget/karmesine.png} (94%) rename src/main/resources/assets/taiga/textures/items/{dyonite_nugget.png => nugget/lumix.png} (95%) rename src/main/resources/assets/taiga/textures/items/{tic/imperomite_ingot.png => nugget/meteorite.png} (94%) rename src/main/resources/assets/taiga/textures/items/{noctunyx_nugget.png => nugget/nihilite.png} (95%) rename src/main/resources/assets/taiga/textures/items/{ultranite_nugget.png => nugget/niob.png} (95%) rename src/main/resources/assets/taiga/textures/items/{tic/ultranite_ingot.png => nugget/nucleum.png} (94%) create mode 100644 src/main/resources/assets/taiga/textures/items/nugget/obsidiorite.png create mode 100644 src/main/resources/assets/taiga/textures/items/nugget/osram.png rename src/main/resources/assets/taiga/textures/items/{palladium_nugget.png => nugget/palladium.png} (95%) rename src/main/resources/assets/taiga/textures/items/{tic/prometheum_ingot.png => nugget/prometheum.png} (94%) rename src/main/resources/assets/taiga/textures/items/{tic/proxideum_ingot.png => nugget/proxii.png} (94%) create mode 100644 src/main/resources/assets/taiga/textures/items/nugget/seismum.png rename src/main/resources/assets/taiga/textures/items/{solarium_nugget.png => nugget/solarium.png} (95%) rename src/main/resources/assets/taiga/textures/items/{titanite_nugget.png => nugget/tiberium.png} (94%) rename src/main/resources/assets/taiga/textures/items/{fractoryte_nugget.png => nugget/tritonite.png} (95%) rename src/main/resources/assets/taiga/textures/items/{tic/vibranium_ingot.png => nugget/uru.png} (93%) create mode 100644 src/main/resources/assets/taiga/textures/items/nugget/valyrium.png rename src/main/resources/assets/taiga/textures/items/{mythril_nugget.png => nugget/vibranium.png} (95%) rename src/main/resources/assets/taiga/textures/items/{tic/violium_ingot.png => nugget/violium.png} (94%) rename src/main/resources/assets/taiga/textures/items/{mindorite_nugget.png => nugget/yrdeen.png} (95%) delete mode 100644 src/main/resources/assets/taiga/textures/items/radiant_pearl.png delete mode 100644 src/main/resources/assets/taiga/textures/items/slaggold_ingot.png delete mode 100644 src/main/resources/assets/taiga/textures/items/slagiron_ingot.png delete mode 100644 src/main/resources/assets/taiga/textures/items/spectrum_dust.png delete mode 100644 src/main/resources/assets/taiga/textures/items/tiberium_shard_instable.png delete mode 100644 src/main/resources/assets/taiga/textures/items/tic/arcanite_ingot.png delete mode 100644 src/main/resources/assets/taiga/textures/items/tic/bismuth_ingot.png delete mode 100644 src/main/resources/assets/taiga/textures/items/tic/bysmuid_ingot.png delete mode 100644 src/main/resources/assets/taiga/textures/items/tic/lumixyl_ingot.png delete mode 100644 src/main/resources/assets/taiga/textures/items/tic/solarium_ingot.png rename src/main/resources/assets/taiga/textures/{blocks/violium_ore.png => materials/adamant.png} (75%) rename src/main/resources/assets/taiga/textures/{blocks/adamantite_ore.png => materials/duranite.png} (75%) create mode 100644 src/main/resources/assets/taiga/textures/materials/imperomite.png rename src/main/resources/assets/taiga/textures/{blocks/arcanite_block.png => materials/nucleum.png} (75%) create mode 100644 src/main/resources/assets/taiga/textures/materials/osram.png create mode 100644 src/main/resources/assets/taiga/textures/materials/palladium.png rename src/main/resources/assets/taiga/textures/{blocks => }/materials/solarium.png (74%) rename src/main/resources/assets/taiga/textures/{blocks => }/materials/tiberium.png (74%) create mode 100644 src/main/resources/assets/taiga/textures/materials/tiberiumx.png create mode 100644 src/main/resources/assets/taiga/textures/materials/tritonite.png create mode 100644 src/main/resources/assets/taiga/textures/materials/uru.png create mode 100644 src/main/resources/assets/taiga/textures/materials/valyrium.png create mode 100644 src/main/resources/assets/taiga/textures/materials/vibranium.png delete mode 100644 src/main/resources/materials.txt 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 c0ccaa81f19fb8ad0ef38c655348396819374453..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15564 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_sM}nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcR zlqtw+k<3X+wo1z{%1tb>%gjwoPt`BTOSjQS2qLM3rz$Jw{G9wE-~5zRJ7XJtY{E#o zz$wkjGq1QLF)umQ)5WeLw?Hp5GsP;+*x1b2IL$~m$;8Y|H!01;NH@{IJWbay#Vpy# z(#X`v!aNBah`zqa+A)lF$xki?>q)f&i!m5hd1MxsP6+}TMW&{!!${5;l+fkm8nujk#L5u>c!fi-#ep*R+Vo|DNdTL$?F?k(gDylYg z<8AaorGHK)4I-jAv5c~4ATA$4e2El`=w3ubH8_Bg$~E*d31Spj6>dXN!;^?27h)=^ zHr&Q1XC&sOr>5BH!xAt|09_0An1hI-<}6rQgP9X;K-H0ze^F*?UP&T2_ZZsfV~8Pa zhNzDK<;I*+uzGVN0|NsCeM1ll)ru^Qt~CP$$1 z9$b)^oN8xgYHDn1qmM3(t|K6`A~h$%B{MfQuQ)S5&(6>css~*HtHwxN8j&QR8X-}I z)DQ#bL5OIOi<=#njXt>j2x?1$rQjtOtr$>;(aLy;xucdq!huL~G`NTiD2TGr;DUq$ zk>qG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+ z4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz z3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWL6Vl5mfRPUxXQ$wx@C`?Jyn*o ze70FwmPAO@ZtZIq*Ct$h^=h4|L_o*%7`HtdZ?=Zt?0!?IU)O!ydDhEUiqlV?KJ)(P zXQ@@;-#7IaWRK-!DzghKrdiL}_BUy`$?8ijdn_F!#(%rI968i>vp~!<*VyULTLx`&rhDi{*%$#J=NUf0g%4 zYE80R!gBSeri9|>0F{HX!gmZezTAKG?p>ZaddU;E6s-Ovb?>ckkGtKOUC#~M&NzE; z{`>QeF zZdwwvrW#EVsi^zG%iZn&SuBX@-HeDGbuHDm^Na4Dxm;(e{WQkuVcONN0s_+Js|DL4 z#SgFPX3chAENtEZo=z{W3rF`X z@|T)_vF@W$yj*3&jpYyeIE`!@9WPx{QT%N1D*gHCDQ-e{3^#_{YfqJT{Hj!N{K(Z# zZjD!Q9-5DQS(_hD)#=^6y^8nktkvB?6@hQu4G+r(PyQpzaCc#r$G74mcA)*np00i_ I>zopr05t(XBme*a 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 f25e4680d7fe34ef8c7acb8a23d7c42def92288e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15813 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 literal 0 HcmV?d00001 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 f67fec97a60e37299695d4293d74b9d0457091be..02a16006d37fd5de6c04326ceef3ffcce61d7ee3 100644 GIT binary patch delta 761 zcmZ2cJF9NPW@bS{BV7Z-5JO`tLjx-VQ*8so$w!z?F-13Xu_QC9SSFhrn_C#0>86?` zChI0znk4HcnkAX(S{kQV8d#X7m?fr~Z=T3{kA*0elW%gEW7;%Xk@Ljn#oT`kSU%5L z@o4g58@+laV^0^ykcwL>$36Q(+(lR~RL39bzn_w-#%Xc7AvcoEFpV>A=JhAJ28kJo zCj*?Gu5!AXGJk*PGh6NS zfn~YU>!{>IbIxo@vil)(WqL5rmt70C@Wt(Ly=uX@`PkpT&M#(tD~i-v9vt)P=*w?! zm@bgg#{&4%8yBr`5m zMGMARNbtF)oxAt5w)V?g#WVJM-u$<{cembG{t%1%edDPib7yKToq17DzkbQ7qJ0rp zw3pe-ZM#t?o$tCtuGTHi{Jf#05@SZ=1S|2bh%MJl|MN0PRru9d-hI}|z`(%Z>FVdQ I&MBb@0CW^sW&i*H delta 642 zcmbPLx1x5#W@bSHb6q3T5JMv?BSR}ABW(kt$w!z?F-13Xu_QC97$m2drlh2%=^C0^ z8tEFQni%UQr6if_nwuJ?nHgKA8K$HeZl1_`kA*0elW%fZ@S<2hS&sAc=EdB93|OwK z9xs}_*ha6O@t~)RV@SmIRl=htdQL z7pfj$;ouZnbMeOIck|}0TlL*;lH&f87klT&|0((Wb-7yQshSsj6DRKUy&iau?RjKW zXIjj%*{}WM{{77U`=)uee*F(Ey{?HfW37TLmj^LxEv~u#_;~$_k2+CrO}nO^3axNU zW#v9TrNwOfq^zH58GEm8opt%pnG-GsE%Va8t#peo{*k;w)$8{9b>?|HeWmp*_=TNk zSsE03dC$7~V%D<>QHSQSo4st(EV;I2)2ZZX^^2xmSABoes8w_R1&NzW4oPTju2`MD z^^e%!+gJDBop_9S_m<~Vw1Vp;E?b_Qv*PLdoc-(dF2}#z{V3Jku<(5BtjnU$AI``U z+Nx3O!@a-c_mv+?H8OV3Ma14+?hBnJcO}t!o&4Hu4}ZU!aqmxkvUky=$_k(IiTzG1 z{~peh&O6j;d1pEEV)b{Dv%je6+&mU{^_E_=?&K#;-w#*s@%t__GdTI#j4m7JYo$>y zrk{QxD?Iy(=ECL7GcKPxv?Qfu@3&a_zC@4d3omlGiCrr>t;ze)tJiAw>t9(n_utxE vdVR~cDU11EE#O-u#qC;YQvP>8Bf})-kBjTqZT-{ zndllAm>B9NCM8ZW7;&?mh;5s{oH>HScEgS z{g}MpM!)`xr;B4q#VwYDe}jc8Wf&g(b(i?4m7VhacVwBk*z^OeeoWpqo~xHuM7qR1 z3U#>0`Gg~l(U5Z|v#jRnW3v{DpVhRkfAQz^yUGpz&o5;Nqy8^w-1FnDlJ?-)N)AnahH118=CA9UwX2rkS*Y)=|K7Vxh(RIQ98xL%` z6p+2*ckH{f4%J4pZ2vz0=h>FOeuChdb0z-Q_rVLlbS8?CwmND;a?!6qLJV85k zz81~Cn|oHa367RW4) zJF;`Xi`C|3JxRW0|7TZxto{4^_s);mp97QEMVoF3Zd=6v$nHjugB|DX%vEwJ+Im*W zA#0MXWA&?>X@^Bj%p&NdD8LbY3zI=&+?=;Y}qt(p;hLK zyuiElHgCjF)FnUj{rm3ru5Sy{q(pevXMHc5b#3paxTs)@6`Z_fE9B4n@0_0ZBP@?y z-j_8jzw+(nlga;lc03kSe79h6Syr;7?Z%7mRxI;8q0uufJL6~1D}H6;mEkA1YFQrl zIWxg1OfxyO$j|iT#iHJzb#B61PHqp4p8jWM*r=)`A;v#_@)-sO1_n=8KbLh*2~7ZR C->^Rb delta 928 zcmexf|Db-uW@bSHQ(Z%g5JO8V0~0GFGi?K-$w!z?F-13Xu@o|@B&M1rrKBb&>RK9F zTId?3ni%OOStgn48kv|Ur=^;wrlp!CZl2HjhJ`4Vlh<>Z^P$>5*^2Y@=Kb7%3|MX| zsfbM8Z=+v-*VDx@q~eyz$>?CAM45(&}Y{qOsScX~{(q}m=WSYT+J?*FnptM_!tqvD;LRPxWCY)y5~T>tcf>sO)GJ7OM``wP{J+t2&+)2!y_(eknd zGS5GxiG^KTa(B|6|6czhrhQvpXm`M8$4Y~ZZKvHEFP}d0e)Y`Rt9R}f|8Tkyvnl&}@9S2L_qiTV=WLnx zL|o|49i9DFXP>zzs}{}|9n!}ZNL>Q zSuw34QZ%T4#>X-%r#%zO{r{w=|DE1`?y>L6Nr$B)?d-YSM0zxqOg6A*J#*y( znc~%Lg3*1axHHqetM)3svpF0+`A@K{*r5p_iegPS1XSD=k{#|PgeTou`_KgwE=R8=34_y^j zc<^8N7^ij5`Do3R8?kj-uQu}ST03jEolbO>%cW+|?Fo5lzDf%nkL7n;uU)lx-~Gh5 zYhs!1HNpU`A377h^WhWgy8Iqi|`{(40k4eSSYI~b@h8k#>t_$(jPK-xJi#-)O*h{;@F#zJzM@MxV)BVuF8h{s?tY%)E0is?P-?LjUua=K?|Z#$ fp_%`GgTe~DWM4fQ-h|( 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 52bed7a7458b014336f438bbedfd58b6fc618014..c01a0a63eabf06f3e3a95cb5cba9e917642ce0f1 100644 GIT binary patch delta 838 zcmZp#e_pp?Gqa$fk*RWx$a!M(V(vc%EESQm zU6U8v=+`%Rx;TbZ++sQC*(c&I!f@fgvXZe;_NiIBc6Svi=Ll3hY@N8i;fSt)y7Q)# z_y*BvzJ?U^;h%r6)!sVe0_MT`RVM>FE>Ab_SHSY z+bcPOVqd87KxrcTQyVq{@rIh^7FET1;md;_b>brb$x!Z zjK?$YUwJ2$O4<)i=Vj<%PtOhfG~GUL53^6wy=EDgeKuX3?dzURZp`JatWVf{=2=(p z_P<4!?`Rq39D8~G^@?NbY-dhuxxA|>fkC0;s?@7<_hfErEDVc}oA*1$(6Z&-`s~YQ zHqsHYvre(eZNA9jFw6d5p_ihworj{V`F+2p9uB?&i;M67r`|kbd@hZ9fk24!y-62! zVhtr{#_AeBIC)3De39kL2$|aVE8c3>%l+Cd>~@5066?f&Uv9iDI?pNB$%DGxOgTe~DWM4f7cX?8 delta 860 zcmaD}*IvJ2Gqa$9sji_#h@qvGfr*u=k+y-+NyZ$*P?riva`v;$V-!lr&>HG2K$RmH73%eiH2Uk}z&OM&^-r1Xf z+scXNduLp|d)0*J!HH96-*c%;Dt|w=L1sbq1owM?XWExCh%88(BVTejB;Hx$!-EY|Y-* zzs+tnz4*n)H2;-(>&NQF>)597ZkeSWIPdO%*S(k8yqC{oJjpnn?RY@d^`!2D-5KA{ zyPj}1i;UdMz92~W+KWt|^RH*zI`hd}{6*vLwz|Zp>&;#~ooIg|*HUar`4-2Rsxo!OMP^Wh1x6_~ft=aSM*`@uR(%idigkIEN6q9%B?rE7^mdd&Lg2+j=2fIWx zx265fuutobXt6%B@V`#X8@^1{lR~oT^)eZefpwoQ^IyOD&3gnbsSn;>6~DBMTffSG)`}Td-~3v&U(@bcb;f^t2I=yd Wa<2dE{xUEyFnGH9xvX*0oGcP0=+rPBSntvan1tFtFHsg5?bhQ7R|PahPLTv{`}ch#||7yLas;zp&P? z&+>F}45_%K5_G$0k%Pd~_n)Wm-fTTz38sL_h749+3U!hqUVeE6+c^dC|*gq z`>cT1^vM%hvKXfQJr>KMT6=Nr27gYTg)Kte#!DIfa=jE(Hyly;5FYKlgr#a#K+=H% zuY}G6h1>7lEY7=A^{Zx=uk+edwZ~Q#-8Wy>d|m27%ihmVwQ6btHr*&O`}1Jyv5kxu z=CJ;I_4(tm%PsXLSC-8`&ogDYeCRvz6V*HaZj><7Y?QhDc-7;Jx0(Ik{&}nr`yl=ho!&>EW`Q9WDi=hC3$T%D)rHRG77!>wIf~mXZFgwaoSPp-BM>>qCEY zemQA*$+q;&e)~;f+cux7)%y@WPc4AysTy4h=>BHp_cro*eB&Ml9m{H4 zmR~8lTb2}d3(n!4&!TlQCgYq<=!&BK_jh!EGxA#VWI=)Gx2K-gb{bO-%+;NCg87%r z8`G{ci&^INS9LbtSj+yeOQ^ywt6s)C%P`{@d#Y{b<11#xDLd9~5M5&R@!sxAtb??sI-=97|OKR^Rb=*0r~u;*fmv`t-d*%zC#@s}ygZTxs{} z)tU>-+Sp&S;hvcz0|Nttr>ma} J%Q~loCIEUlbou}Q delta 935 zcmbPMJE?BNW@bSHQ(Xh25JOWd6ALRt6Kw;d$w!z?v50c9%u+G4Of)hvOG?x=OiE1B zO*S_%&`mNxd!CU6pfPlV4ct z*FW=gaSW-r#d0t=_!b)j!-GH5>Vnj(7F`vnJjt!dsq&;(WrBl%a6~sp%LD}{uHvBU z2j3n@-Vw%fecje?>#Wzu|K@*l{2Tk%N`~b(#aLMHaCgnwuzT;{A3vItFHa0O@|i7c z>$wX(p~YWw<}GBESse3Rq~iOx&%b_!`DxGDvP*q!eVm^$r;;E;^P(Buu9~KkWA*NR z-Me}A&*LXk)IKRGoQ_(Wv)j+#Yo*O})1D%)DIs4sgsjmKoA2|u^8ZoErUwu1?JJCU z7{U3X>=(~jcc+PK&+4)$dZq1*Dhv<5F1x#TkqV2eSMP z_wQXr9PJYW40`GpiEu3rJG*n{{hPh#0(U;Mvh_8t@XOoz_varzj(3Z#t$&AY&6K*z z|6cx$oB7%&%PzkT&#|K@9gJul5k`~CH`>JIUgOtIsS>+B^s zk273eVJ7{SK|+nw&QDEa($}BY>O;4dSniw@>=kABxvF*H)6=Ibd6s(}OZsXc- ztGge{i`O6boTc<~+U3heR-Oi5XFa{4%W~{r>>k?_(lV=8tl~`I_)}zXE^AqR_U|1* z{fQ}ut>*SDSLt(Z+@O>$sA4F2e}>!Flar@zS;HvdbVU$>3D?Kkn}hBd)dstJ?~fth5s1Tb-#Z z_q;wb_VcdhdEc$ugc{b_D|ar@(CC_D`#X1mM*H7;^Y6>;??3JxYyW7+mp^B7SB9id kzI1%I{-PECWEfs^sBCU9zL(6vz`)??>gTe~DS@#G0FG6tLjV8( 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 71e61c11c85ef9594a851123f209adf6610fbd77..33ebb6fcedf68c6edae360c14468528185097778 100644 GIT binary patch delta 962 zcmbQ$z}V2pxM4H1prMhjfnkWDv6Z2Lm9dewf#KvM%%+&4o4HsdnN*T3EzAte%#w92 zQj;unjgw43EXy=q%VgseOLLPnOA|}u$?j~fD#nJ1riRAJM!Jb9sfN0ShN)({mWF1@ zx+#g~hGv##=E+8umYX-QHM0;SAV-7U;q7Sp3Ld{FQjMNTEx6LCsNhc-QK=lcBetDO7+_3 zccvb`x%#)i-?B@VYYLuAUW%<(@6fTo5F5X__UcE~(`hMhXDeKl+~;=Dv@5INO!k}^ z`{EC=>7Qe~D##=KB8>Z`ucsobOTmN(s*~JH-7*T46g^UB)$YG#6+Gwoug}Gc9-dgY zvTE8Ziz#}StWtQ7%4iRP^N?=k7D$~})sU+WDz z4{7in>U%hI)$+)B$rWasuIh(mzxl|SV_-u)kzePV9YX#zBr;<85<}a0%IW{8jjN_rgb^`s-c1x?x*NOGBT=g-PF?skx@SW;o! z_BbcP;DSZH^Lr_+gq0(J+vu@%-`->*Ij<;I0JysMaxVps7 zWZL#VB(aliQohsuNzBn7ZElu|92e7d-cl0QXd-l5>A{38Y)j^CcFlQzl1Woz)$7@H zZ+^&{zj%?y;p=}PM6D@Vk z4U^4vO-xOUbdxO7(sYxP3=&Nf%@a*cQw=A(v$;-oV^!O{iLH@^I3062t@uzKv3WlC z5knTW6EoB%r`zh+=X<(1hE&`NITaax+d`rt@&A8&qvD_$MHyC0TV|wnY!+%?de|s( zL+aaU$)5A4@R%Lj`@;A4yyu^Ie|1MzSo6Ps{`}*M&nX{D#pa$}6le49?D55^HgS6U zbk*b+cRyZHZYCLXbn}BE%kBTAe`CY%%(Za$VC>y_RAxqz<#is%CIv~Iw1YqFo=pq#om4aX z$?e_<;oggSXUjSydb&!y&Ch@O=xJl~sa`*A@dEjNzO~oS`dzgw57`-WGv;Q@lo%^V zM&;QGvz2B~QnH>M!+O_KLohwghRmA^`@c>EUE zPhfgDZ=uoDKH=Gdvjr!oiYd;{>AJcsBKPR8{eL)5KBjuiLLwfVeN1CA1}}Ud)eN--)irUO%ipJ4ATsBlhRUC49qM{jZ=-yHqU2$!$OqG$?LhyF>RV`%Xwn+e(pa8ECqq8 zYLoZd=-1!yba4!+xW#htt-mxY!-0ptvmVVi5bl-#o3PE2`PPOv)$z0-+E@t*P;&9xVMpm|KBAYZ-Zp*A}ow8+j*@3B-%r$i{@O^pVox$zC^Y*Fp z&joA3`H%m8-E98q-%I<~`{RVSnYiSh4U8_1Si{}jo?3jh{)#`_&dUM<_b1h@>4>xw zoR-t8p)}L++ONpH2QT~m+wJ>q-mAZ6?|&$ie!qL=z`Bt4r&|S+6L%CXeBL1-pSAQw zi^Y)ysd)!#y~^hOU8=tS!sPk(-JvfRD(~8_WxC~j`ALN%xw>oqb8>Is2>h_o*6F3( ztNfHG&-sa8jfHe~<@o%q{}*&&Pk0BP+2{ANUPdm7l1c^#`-F2Pu6nKOzHwaV>dSvz zOP{wMcw3aX@4HQ=wyI=GhXaq&8=sBI%QI58<*(BFR=_N2uPJIBUmS$Bro* zEza4QASb4HqHpe3J~97IUlh6BYS#rxuIl@fBw{0eKl!RtUC$Yf+j3r;1?n4JD-K*f zo#J|JR%GUd>9eO?G#0$5V)Jw1tRuQ%zdGX7|4;B$Z#6WVyFxkR@e948v?n+zD{hg*aljZkL+nwvgORvvv$^Ll#!HOpr zrCFqJ{*gXkPbdv?a1_50Dkt&LfClds%e|9bNJSNCjt<||z|cxZi!?25}NYMN~~_!hP@ z-Q_*>sp!G-R_piLi#%W6S{_rYo4xux-`rES7XEu?|IFLe_k3n&(5+UvTTvU;<;pnb z<=-otfBSW=vB%ofpy-(;3w?G4=xvpsa*N;dzHGtPea2ruf82R*ebZmx{`E5D+hu>% aGgKPct-ZF>vxR|yfx*+&&t;ucLK6VmQLDiK delta 837 zcmcaz-&((6Gqa$9sji`Ah=GBXfu)s!iMD~!1}qEr ztX7}A-$uW_$ZlKKFg!bL;14-kj?@Kl#D0>8sk#I15<6 z@%lB%+P?C?@*52|lis5L6TcsN$#t3i?eqC+iVfcK(#9X-R@HNLyXM@!R(;Z)Upt$h%TR%-V-!q>5Rrun_@8zpw-iVm?W_upHSy)E~)iJl@? zsPmHz$}e*#EG=HTYU1+kPrt}3O<%M>;)sN!-^HK0g}Y@_YV~SUJ~fKi7H`VBWS1h7 z^DIZ}sKC=q4u#9R+NQX7-uV8?>s`(&?a;Me$BLf3JtCKXtYg)EC zA2?S(P2woX>pk=5oow|z-)F_wR|r(z*dbqEzn{rE$kfp3%!E%7UA3of{<+4RF1KTi z{cOX)^sfp1>Du4+ms(f#zAdf%p0ckhdb7Ni?%lw48Sii6H&xZ2Sgh1mJl@+SX>tUn|xZ|JR;j)uUDUj4@|UGcYhPc)I$ztaD0e0sw)4e@p-X 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 291df0dbd5dde303df79370cebb05e21f27dfa6f..31f699570a1a7e312f1f7e4b7ecb9b752da13552 100644 GIT binary patch delta 725 zcmbPQH@R-ZW@bS{BV7Z-5JO`t0~0F~V{HS&$w!z?F-13Xu@o|@m?j$;8Jb!o>RKk5 zrs^6Qm?Y|28YY_Pnwut?Sf(bM8YCK|ZJy8ihJ`4Vlh<>ZW7;&?mh;5s{oH>HShjpJ zcsY5$jefm=r;B4q#VwP5@1i>f0?wuFGas(Mc~@oj6ql|kI_GbA#!U4;y7T|cO*2xO zSzj?~_@v&RUZ?X{<96J(yzwePoP~7EPOW$6;)c^V8w|{Swt>fzZfB&|SFWs}mX8O`; zx4hpfruJ#-%=Mam+|u*y@z;MJ|LzZ}zI}e%{1X$M9%;y^PP_{qUT;N&gsfE_-%JX) zm7y>pbX%=gDfc8zmgh1;mGv$R{Bpb%uLUiBD%^_5J$TG=tD)y>BmLLcCUOWe-VEHr zw}yG?S>Nc?HJ99?3o<8e^AECCUnn3TXp_Z#ta9nu$@?PfH~(8U#VD+Ln%S}~+bq`0 zC<#eF-^!Xg=VOk|{Wbfgc4U-?zFIU_X`0{owDFv(zwp< z-kN&7C05Js>~bv=nR595mat=STX#zBklK;BCu#>nc2D6=wUyE?jT(Al;@nG^GQ%YD z?X-N_Ha}d$$eVuJsd8@7>%zFpL5D9@<|S(0tjJ5uOw686?` zn&_Gtnk4I5rluw9nk6PCC8t^>Cnu*SZ=TQkhJ`4Vlh<>Z^P$>5*^2Y@=Kb7%3|N#R zUujL=Z=+u?>((Rzz1|qJ1g(vp)o%5aaR;4fbxP#sj2QHNf+YbN#?1O%iMQ|`4mr_<2XHA;Muu*AAW^s9) zt^9ZUZRNZF{;iAX?M}NnZKr3wkXfRtklM*Gi!4!Q|HoTuZ>-(*b;rFkvr{j{6wM9J z^je*jc5=%MF}1IJS|1AP%lF@xefD;d-r7u~vud557F=x|9;Z&K%uHcev*+{Ss+`%C zo~5x;iJ_jSj;Saru<$S%x+n&leTdjOGyc1C^!A%wU51*jfLrwz z!Wa@I+%~7onv^y*WmZe*jVZcHif%5y*pfsQ%+Aj7$n%`yYiYG zPF}5^zLPfHwC8nQs~dmdKI;Vst0E53kaR2}S 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 72a39cbd34ab08bbefd62aa9eef33dd3c4d8cbc6..1385cb2d1c399ad76ce71092481db1b609347513 100644 GIT binary patch delta 996 zcmX?Azo3C}!)9hdLnB=S!w^GbD+6;Y6GLqS!^uaOO)*6`bFmaMDkr8Sn_HTjnd@4n znkVTRnVKZ&TAEs#=%%F@7#JoeC#9vPZl1^bmW3FFlh<)sVA?a;mh;5s{oH>HSRNK- z&zij7Mz5Y(*3-o?q~aEX0Q37l4BuWH{`TVVmuCk)Ki&87@t(K$cf7v4?di>BS5Hnq zw6ksJy3$n(QdZ4R-MBPw$C{e5Q4(6M6m2(w_Rzu7*&CFRzZSUzFcp>vH92)0u+}^`{Qh9NJnkr^O{P zK%u+bqN&uaq1d&zz+ytNQ+1l<#F}7+&o6c#-dcI?;G}ntcfEPI`PuE2x6jWxf2d{8 z>iku+(`WZ3E}4|HYGV9>WrZ{9e7kDA89qE-clfxv>#9#_s}5y&bZ!38?L}J_$6h%$>FJF*ThG#a5J zHFFE*^rg(}OUN;sq4b_gz6LrhAoTg*Va!jnBN+?aenFE6=l1YS8iWc zIj=i=PDk4G`p9kbD&oD>8#7&cD}&~Ar)EZ&GOU|fx_Me|f2rrf-h_>F^P39XOOjj) zLyXb`bTb0969aX_y|oKcT&A|iFPvGCm+HbWcVgeW81aWvYE@q)Dv5W{8_okiE2* vqk@l%il3XhzpF}^r$)55rnjv$Geh&-8IR6AQi@?bP0l+XkK-_6-x delta 906 zcmZ3`z<8>D!)9hd15;f?ix5LgD+3EFQxk0iqsd2@O)*6`bFmaMDqAF)SSA^nS?Zdk z8m8!4q?j1!TBI16=vo@3np-5NBqv#>ZJx*amW3FFlh<)s@S)m1*^2Y@=Kb7%3|L;w zZrMC}zl~l!({WE1$B>F!EC)0FFDEcCJov}l&!6-DZgN~;!rR-`uU~a=38@x!%;Kms z{CIegOUmml$>9rAn|Vc|n;R?k|DIC&c8?&Da<`Qq5dA3c_zx|a%#=*6P zS~6$mRfbKO{OIJr%BAnUt?Mhd*(!bIE;+os)7x6EH)d1P!CkJWtZvN}Xx+Q9c(&c` zFGr6gd-j$3h}=#&>}K2lE#^*PLCT|LtgHFfMpcxDh}50Gcq1{}Qp$SA(?{!C!*VZe z4zTy1zq{fp!`6i%vEHF38&(`%=ijP-`O+%&vfMv9?bVi-3@?_=%duLLzIb0_eN@)2 zWeX=Pc3^F6tUDL<@ac_{%Y0{AT+U3z{Dirxx#~t?@Xe0 zekV(X^`&) zFLs;>oO-z3YR!ucXC5xkRC{y&gz03Rml{O{2@fu~FuIHKhL(hw1|B##X;$2$1yg*d zZdw^098zIisI=wf-oy(9CpI|>%{GyZGAu}06wq!etGDVyBiFlmzEj&Sc{Xy*PhS$4 z`e0(4a}wWl%QXcNC!4ysURzbHXqwQhE;Ge)hdqzm$BBLYt=E%h-u0f@{QA-E!k_1T zH-(;g)2m^>ZsOn7ImgfEi1_{8H_>X3<2QBBpn!jO<$l;Re46?|Rkg3wfPsO5!PC{x JWt~$(69D@1o*e)H 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 367e09368667adcb5b5f65cf40228298da18ba4f..6b6b469d4d9b10a351840217756959d01d0bb436 100644 GIT binary patch delta 995 zcmdni$at-hal>Y2K|>>51H%wQV=F^LD`P`#1H;Kjm`yQ7H*>M5GpSgZ8CoWprWos{ z878Iani`lG=~|c?8tWPvm?b8g7?`J+7#VL4WqZRyl*-AgInA-yw3hpbA&cN8eY?q} zwtDrgeC?`G0#efA=N+of!UWQqZqyslQft z{9M}ey0PJVSIe{fio@oi3?I8|f4zDA>+#)RPwxGCa{t%kd%td9`u*nWx3jappPByS z!m>~2*M8d6@_NgZ3rU5?^}`rG&7Sz<_RT*ZKmPgf{@<@(_5XhT`t#w#zh6K8{rvIw z$B*AHcl>%f^~;LV7i}4rT|c5{qf8D$L>(R?sa_MTl{5C z(%%E6-)5%1s)>HvpZfho#j6PO8~$-ewIdmxN9F!FyzKXb#p2S%j5o> zDzE>xApJva`0I+uFN;#YtB@ zZYum(ANHy={8M-QuM=(GW+pt3u)EVM9#a)njwjBj(} z-?pWF=+5|cee%ysTYhYv^vcKdZfNvLohXLqsd*pjXO(?hTl8a1{?EF_W;`Luo%!?V2XH&e2|ZK?UOuIR_cvd^nZU(YCd zH$CU?^}6pD`hMQt^yA+7@26J2PV#<`ns`z-l;KTb;fJ}^ujl4{-dg-&RoVN6wVzkF zeA`;}Jyx2OKsldE5ME_xE{aW^{hxRyV|^RnD~bp;Q~6Yod4JqdSsli>U= z)%|Uv-wp726yWwE!t;5w z@6#~%r@`*e;{2b4dp!-{1MVt?e;oJBACk0mn3*&uaM`SMxk-sp@}N#qY3+ z>k(DA3;I46G;J?vS)SK2yQrahQBCEnn%YGpcV>nv(=Xr4W23$^FfcH9y85}Sb4q9e E0MSA(s{jB1 delta 961 zcmccC$hfVMal>Y2K?74=LyHhYODh9QDM5GpQJwB_|pf8C&Wm z8XFkt8k(6H>slBZ8ta;vCYc!<8YEdJnj~!wWqZRyl*-AgIjy*nET8;=^YrFYo<9aG zwZH%ToLp+FSI_j<)5S5Q;ug!n+j*DM7#I@vpU_h?S|)aBl5=rE&i^v0r7F3b)Yi@p zSY9|sE%TL`=gfw#xD8I%7kX~sHT3n#5Eh=bEY!Ngi@A)kx^H2r!1cW8$A0o}dwl2J zZ;iK;o@+dKc`4b-ex>T-<0~i3`}TVCy~l5MOykaax+HFA&I!-O^%D$^WajF5e4Vo8 z^Q+F^$DhADUH$Gf`@7H8ix2Pq=70Ueb)%nItu@PT@S9!mtJ@GSSrhb1EOOQUz=HT1 z%c|N3cJ($@Uq8QC&;0$od|NyJ-S~X#{coc0U->XsCM(u$?#<28-M5N*UY(TuUQqwz z&BGU85571$`QpRH54VTEjlFm;wtiDyyyJD_4BJkThF6`A>iJKau6SCS)|6eZ-Syn= zZt4Ep+uob6oy+<=O3Ivd(XowM57-=1#ZKN?F!91>yHhL9S?<4ISbwK@-~Da-1J*=W zZkp@L)f}!AF-vK+NfyTnwt{BKEt8{;dB5a-^I?1RxyQ55Eq?uNxp#_sYZOChriyDq zy+zrFhs>zI zB(5pjbDQ;+SaQX@*3Tw!eG{{$tZ^-v+sM^m)a_Mo7{jAzm=M;wIHtkqQe3ri-c;o! zB8QFqwHVeHx%58N<=f7><>X^F_f;m74*mT)v)pyoC2@5R_6dCnTO(JWeH_NL`m&2? zz-;%o7I(Z3oUN#zDtX0m|76Qkts1d=Qc5c>JzTqbPO0;Tyk#e@@dR34=~-OLARQCW z_h0>&k7?$KKlRcEesgvFBHvmBGUi=!Nj<5yAw=rBLbP0l+XkKMrgl+ 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 9bd120b1d03eaf6bb4f9e12981ad80e68939a49d..eec6810e58137747a292c875a9561a085cb18534 100644 GIT binary patch delta 990 zcmZo}V4T&!xM4H1prMhjfnkWDv6Z2bm7$@wf#KvM%%+&4o4HsD8I{c~Qccs+EKPNd z&5g`-6HQIbbS(`njC9S7jS|h$Oi~O|Q#Q|Ieak|O!pZBnEHLevY|D9K^M39>1}yje z4)2`2-$uV)+|$J|q~aFK!QcKug$xWIe)lI82n0%Ltas*?|Nfx5d``JT*CL6)FBfb$ zM0JiDYYPWEo)VYVSh`?RYRaucMZ9k}h88a^&ON&|%eL;-=fxVg?DfQ%YLC~PHnA&G|En9x)c3t_x zxv|B@mf=?y-JP*5J3Z^`>8+}kUUOM?iB#|DZZj!=ZS}eNXMO9T{pEk^>Yv}ca8zIM z_HVPY&qgz|4b$$vaMS+xPw3x`=5_N!za(5ZDH&d2Jn#2!t^dm>{MdO)-epIW^el?nZ z*WHMXso`rFQs)GnpOyMnVoATH{{9!-e>=+RWxv+-S=jRht*`y!t^e)L;`ptr>ceh6 zGQBn7xry;ZxMTcfic?vMTco_pQexY}!Z5t#w1XHR7Y2_5V65xS+i>(R=! z7ECG3JGSsPKVe*!we8~Hh080gIpktBsxK@#J;%z7^}*~FMobejkIi@}b3W=zVA!SR zL%CNcL>P$kU$xlIlKiVj?NWqQo~>d1uOmVAwKtnYD-TRf*G<**K7Gv8ov>SLLI_e4%k>^tIFb@cM@M2k)4z3H-_q*>m$Dn?GZ>>DwGCw$t* zETK7BUGdh>qnKL#u( zJ1>2oyx&H@p25?_F{I)a%faaITWkyr5B}`g`zA4+-}>&$mzLY2OSk!Tg*qzfnhRk!-8ya3Y7y(d_Z&Ch zd$G-6n#H^FDRIVX$BueE4CN4;suV8v|AH;+Bg?qIPzcZy>H+9 zFmi3IzWiI`^_A}&G|InaTGmyp%9-S-a3HBY*Y&T#p5O1I^9#y;|GfO7s;1Jm>UW`z zeCW5RP_5Y~-gv({d;7Dt=_EzQ(wd)7-@X3v>+Z^1@B8)It}i}+|9zIa*V^hSdY%kUyJI{ZBz0yeFb3+asDIqJWB&T@vzuoZe%=%OQp@eeE}lrAj=PdyW=xox{*AT8 zEjUy&@Dx+go_vJo$?5O9a856U1zrC2*aeE>k_hoIV)6G36b-ciRE_Omj0Go z%%fcR?+D+HeM#SUH=D?%l|9R0vzaU4ZRuTqfcJus`!Wfm(?(3o3twm-Z%=)ip!;ZX zQ78K?dvlJGbF1c?>NZT!oum@;L~Vmxj-lndgMS`(J`axC?3aB>a?Y~$TPr>P^6W@E zW^`oFVS$uIi{^BHGE6?eY4K-XY-)bi%lz;ItBWP(H$-W?ir%8{pCNyEM*rE5KchJN zer*(Sd|ofC$HVx~$ma4oorQ&S&K!|czx=9KHcu>P QU|?YIboFyt=akR{0725TW&i*H 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 32f7eba25999d377c9472af05f8025987d4f9246..b83e53353c3cdfa62e1da38f83c7b260fa087243 100644 GIT binary patch delta 956 zcmca#|Eqq(W@bS{BV7Z-5JO`t5HipvXUZ&`>@IC(vnIi@|6Z8=YD-p~EVfMw>?9Rid0 z+vwMS_jGX#skp^*@V~!wChkxuW8X{v^-ARJX1gK2!Qj@} zGm^1PuR?f?Wlv@-H42jC+2woZk;k)~hzpI%hj}_XkDW>BjNfD-TyJ>sMg7C)i}%Qx zrJ-3(P+_8r%pVud)&+89OKKZzP(kba#TOae? z(GSg^xZ*JX`=@=mGiL5CyYKw}h0&?Cn;tEGQ^CA!*0%WNw#w}dM(aQNeqU<;IoSW{ zM)}BxFDIU=ol@=admpd6c;by^Gn)%ua7{UFba~Rv$#*?0*PqT^|0O)}jdIvV#U;6Psd%xIk{x$z=U;f5> zyiz$QeQxtifBRVw`p9N2??1+#*Rq#3-$huH+(;thc24(c!lqt{D2)I=C3Ag5Bhns z1yU5WKZ1S80sb^nHuUQ8(CT!8JQ(n7+4x^p3nN0g&2jC*K?Wkq1ry#iu3g5{oH>HSa{UA ztS9fc(XYSb>Eaktam(g>wEyJ*h65k#SdQ%~wcWk-Zdui>uXDCVZx`L=Yb+aQAaFs^ z`9Psy;_G8B60=SmuxOH0cHHBZY+{$0bVWVhr-y&vuXUWAYTfq_vp22(|K$6J<*OR> zi&uyVq~B@OR5jpd);P9N9K`8DCh-`t%0 zybo=2>`aSG{ccU`4G*iUpE|v~@KvEsa6#2dFNIHcWnP@SD)0KmylPu?)Vq$2%$L3g zY`d>y&y~Hzv|TYexX*0Z(Fne&Wgx!e7i1ZOK7pB#@%kI z^+xGAe7UDSwx_+DbKCvwuIBf>ch+|vwH3J^I?4XnGjpYs;J*9^N0|Dvly27hr9JyI zk?m61qnC{03-rEM$O(K7u1n!wWqt8T$rT#5AQ`_Bdad!J4_YqG|%$ z6;<}zVUzeLspq$!n3l68IjncO^rSfVS2pT;u2Yl)#J7ennO|7B(vUsFYh&q>>6JSh zx8&~KujV2>X14>rlK^R9{wQLj~$PLiJVpMP;q zf##wqirX^yO+A_?#+99TxKX0u+QB&mMmy!oPaRz{*Ju9e;-+s)GS#j>K4&pANB^?B d@qac3o#yk?qq2@)XJBAp@O1TaS?83{1OQN|qO1S_ 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 aba44643c9f9b6ce58df78cd8cdf1a95a19e2b9b..aa4fbafa73d0d3b5fefb465d45f83315fa4b7b81 100644 GIT binary patch delta 985 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 VzvqPKNd^W622WQ%mvv4FO#sd`j#U5v delta 888 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 VD~U_<1VJY)c)I$ztaD0e0suJH!ifL? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7ac79e9f147fe7a03ba089435055ae40362de68d GIT binary patch literal 18955 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 literal 0 HcmV?d00001 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 94b9b323dd380995233583b558ee6220443c0e0c..237de66d57c94196bca582090307202b08bc2382 100644 GIT binary patch delta 1023 zcmbQ!%lKd-;{-_#CI$wE2@^BSHY(m`7Bn=}HM9sZGPW`>vNAE!HZYvb%VLTtx;dDo zkWs}vDa|k`#mqoAH6<-o*Cf>>P1nLS)lk>jU=78+6<^jB&w%{?lycE@M_J4e|kmhn3dA(>b{-2(DUO2FUG_b>MHGNQ=&d^ zkdnW6>)EUJhHKK{4r*KLujjv+7L$ZIu;RpIa)Oe6o6W z^uZ|ZV%_A678BFo-sGB?*t>F#=H5Ksry=VKJSuootn)eQYp!jd^5*;Ey>gQuetFnZ zr|X#;Hhuf<#&dd+S~tzj4Aq*B-?%YZSmCanS#`LnitwGv9anCA+!$(oT=J6Ss-W&S z@)t|zJ$t>YKxV1)v>4l~*366kXv@~`Wsy8-xzP6fr+H4TE4Rd$-n)LU^fOc8{)AJ{ zHU{u~UmsOe^Xr4MK=vMooX_UVc=x^Ko2eV{M(uJ&wU%$P&EXHa;^${ivW!l-E2b9_ z^mOfZ`-ZQ}=YRb9^Y?w;2Ec delta 401 zcmaDbk#SBh;{-_#HUzsRPdH|Ljq?eSCpGpncl?VoS|u>Q~@&;N(hw)|JuPXT728q;<C#Znp+xM=$aZD zBB&H_o8k-p#r6s1A85vq6ZJx+_kA*0elW%gEW7;%Xk@Ljn#oT`kSQG;~ zxh5~R(XUVQba4!+xW#hNH-Ac~1lxn(mGg@4l`kuCvyxqKOCerLMEGJ${|19cho*YR z&fw_m^xppNhv=FgoGm3QH%bUQJ3Tt())}~niB~gZ#=@fu_gvmre6Bcey|>)j`K=|c zT89*+9&fr)_iU}n?FI+Irf+kq)3`-Ge(~N=vBmz6(krVc^`dIi%b5JUzsLHoKE)`| z>Q=dM#_3PzcW63ZX?hoMUi04-gHvUW7L9ysin$CXu6#Ia`P)fzRtlFG3UIyD_@_}Z z`&Zq8&}m^?+CK?Y38X%$Qhl1AcJs`#4Z5y{3mD}XRz)})zLyynV7OV(KJfL?`HT%TL zGs5R@#d9B?Q}-u--`>amLf;vk(~AA$mNoil2yb+$6t&nlaewZF{+90VY1gwq{xmq_ zbIiBto$gW5rHaoxHDomNNEl-PY^v<$fD|RQ=JG0(p9#g{` zuSn@*`s)AwGHy;;xoO*`^Gaci9b4378AFzSn{puc=#{UpxwiM+I_5Ba+M&Pm>J(xW zrLP9Qxw5EMFqA>nwzYoxY1hNPQ|4pHut)->!=(zd!lMt^-V^>n=Us z`M1{S=gQpg)B0<*Rvff;4C~mfmEYrTx4*t(<%#S^(G4vfO;5!5&V4V5-(P9=Pw~B} zWoO%Q!*3ziR{yejDzM;QpGVt*-zz6idfg#BA?WJcydA46Z#X@^V;!nknsE8PjU4A! zqZLN?Y<7Mw5?kxeP{N&)UaiEiLda8{OH*l8kiO21|I7>%9qpNVZukCRU|?YIboFyt I=akR{0C-?)DgXcg delta 758 zcmX?GH@|MfW@bSHQ(Z%g5JO8VBTFkob8Q2o$w!z?F-13Xu_QC9q^260q#7Be>ZY2e zTIiY?npo;4S(=;Z8k-pzm>Zj>86;VnZl1_`k42dXm6LC9SaT!UJz0+P^ybCfe+*dK z0+yLiUTmXZZ{g|U7*cVI<>1*o8CL;@2dmb-+CTHAMckfKs^S(3iuby z)3Myxy!YM)W81&su{HAleja}x+qPiN{`hB4Wf|7w``gd)tNWI)h-=He_<8oiHy`Y2 zc$jxBzW(P~3BR{KGBf{t{dMwUb*qxYPCLV${N?tGi`MafkGHEY++(TPq!dx-t|kyE z->0zn%H{^uqE*gc&L)_&BzD~?@qRk*XTWQ}n!{(e?wb1R#a+#(;-}C3yl}d9fpvQ^ z4|l&^N8f^Eji+xfe!lcH>m^4PN6kt7YOfP~f*mI|n_qt|&U{UQ_wL$Wt`!ZI`}uC( zIJ5bG=hrYVhQgGb^EaQYolrm1Yi~zd*<}9qTjy3N?Df?BA1mj!e4q8(F!$-#ZhXG` z^Xqy6{w1IH*-0mtb|}j1o%{dq@itfAtARz59h0{ldwzYreVxn8+`Ib}H*kv`T>9lg z@x-tw-6Ju-Qx%%GEj)EO(eq{W&5foWFZ1QoloGSo@*g|raD2)-w{XeGmPC!;67|cT z*5;nitTi%u&buUUd4KtW6J<%&-4aJPZ%yVgeAc`6v6Rt1o-6{&`>zL*K#& ze^PSSu+G`KH{4lTI(YAARdsQ(N2=%a^26UhH@r13JX4l|QDDl+2Sq;;mc2Z-V3K2I zZir*5EW-h-4j+TIk`pgP1)|nh-?dD?!m9f_Flwp!$qmA-lfGZ`n%wlwpz7`3Yn#3* z-u^bXdcNF#JAs)~zM1w)sL39>keyxatyeQ|`i$+*CGxL-jXL_*o?*e-GXLy6vBeAw O3=E#GelF{r5}E+dA6bC_ 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 816cb5951cd755dc91f3756c24a16d203f8d1e74..e7cbd1f9f33235f17e7ba2fe4c5994707078441b 100644 GIT binary patch delta 854 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 L^>bP0l+XkK;o5@? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f5b694ea6881a48a054cc747f4ed1db57939f7e6 GIT binary patch literal 16416 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_qnj%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&Fq(6f1n55dCF&X( z8(119o0=tAq#1+L2C8y^ zU#S5x3akpZA;tM=CFO}lsgCKXc_qXYXb@9TwV@ji$q(qc1Qa@;7|O|{AR>wr%P5P6 zBy%$(Q{%)m-9!r`3*Dp?lVn{B^F#w(Lla|5lhmX{qeNpXBY5GBqzbnosNqROy#g^6RU2;OlQRU%p2Z>MAG7(nJVwRycpw^O=e^F*?UP&Uj+%vS%#}Gq=1w?%W zs2t5H1*`R!J3})YeXt&M39K3;acM-7fNF$96;eL| zT#Z3QgIwI~xNP*n-5XF>2P_4zb7;kYI*eAvL(Cnu1QHHJlB2;zWI#cbjRqGa9Ec=G zgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuh zl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUD zTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$I(3R2di=ni&{={%2rlc*(#}YQVtoDuIE)Y6b&? zc>bjLqizfg%(9*?jv*Dd7zCK#|6!xF49j#1PIm}yPt2+D4=-@{ zO0{=Qvh$3$^-po}&ku+S)pul=R#x%+%$CoOF1)#Q>FtHRA1)r*(lz1PhFza_@4mly z?zc-@em*;La?Ql|H`bipJ3q?QjiEj&^TXLCpYI>Ld-~wJ8%KZKIQC-Wk{@S|{djug z*5dU)o?QBM;n<6d+kZUV^7_H{6qgW&s-WbLC+B>+f8xse3EwW9{dx1$-7Ql;T-y8j z#jy{^H~oHkk4I+zzPtDL^&M~b&;9%0*vFU0gY;Y&rWTjK+SC8;#)Xqpy1(z={p;ef#~b?o z+}iW+$;p?ekNU%mO~#iQ?z z&HZ=%#^1*$-&{ER_x0sp+qS&jwfxt`BcEPg2-0_B=t)k$zrOAFt-Y65FZ;TD*S{-A z-<{d?`~3Mo_Yc22wfEgq1ZR_@#dxvCwE<5*zsfW zjz1Spe?E8c=doSCE^K{#X34iZYknQr^KRd)pI5iPymdIm(Vrp9CHV2C+CS&^+}XG8 z=jv^LPM>;l`ry|Ci+*3U+y42<;R`#LeYt<`-Nkj8ZXpcG&LM~A zH(cJe_|UA1{j294nOU-9@uX{qR$V{6{p9vlx3+IRx^3;j^($|j*l~POLvBD6gP*2r zlBH*aiGPAkSg@W~n4xd5u9vrpi@Sooo4mcVjE$qTrI)I`kD9%gvbDRSEi*%~xX`Ja TERXMl_V9bU`njxgN@xNAI<@U! literal 0 HcmV?d00001 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 7ea420d1bafadbcb7db0fb79ce69edf0ad8afd9f..7c133acdbd157bd776880aa9337059ab2c96c033 100644 GIT binary patch delta 984 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 A4gdfE literal 0 HcmV?d00001 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 55f2dcdd5777476b2b68bf4590e68e1d243f0ffe..3230362f03b949b8806da6dc641fe2b10e7aacd1 100644 GIT binary patch delta 1093 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 Du?a&` literal 0 HcmV?d00001 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 1869eafa983a8c6a78bdf13c36d6d0b0c62c3c07..694f60522d2ee45ce47143089361b34c96d72096 100644 GIT binary patch delta 989 zcmey}!1%j?al>Y2K|>>51H%wQQ!7&oD+5by1H;Kjm`yQ7H*>L^VN@|RvoK0bGc?vU zNVGK9HBB@z)U`A*vd~RTF-o*FGEXx#N=n`Qi}ei)Q7R_~aGGP@9j|=`7emej!cl!PmFq0K z_IPG4)O5_@Whk3zd;C%7y&tRZeqVm$)2!XnzWryut8ZxUgsnQMRQY0us7EARbSb@%(S>mR2deN?#qTJ)p?dbyh<%C|{$?>Am@ zHel)zqx6+B-qj)u4GZm#J*>O&X~DhkEAIbXbNlO}b1xeXKFD2m#;$3HT-6rovQ6@> zyJd4X3I|OTa4z6yD41ff|8Du!_jBrReqM0*`|^7~R^I-)=+e8MEjOa(pKt5-)EfOw8{0xb$3LDPH9Dm+%{!QPFPqXiSUw-HN^6Q_bAAOX)^=ja}qw2+5 zL^4*%EI8-XvO~_bl$Rl^Pht59uZ=fzjy-R`{C@haFAHydS#bU1^plT^SDm+6aoTXk zA-SgA^%6@@oAmG13~J$JD4r%i=b+`B)4nrL`K-K}e&TuKrMJD8-u0b)QhMNS+>r;F zE6-X?*eAW@l>Wp624U^I47CenrtH;Tdfu;kyGr{W&Bf;fcHhfB`l#sY`-#`y&p!9E zZu15E83#Zb8g?lMwDU96&X=9EQ)BU2_xc^`-TSpC9?_{^aVhk~v)c17n=iiZz4W^8 z%(IGvcjI>744!}7DY#3Rp?Ic5+9L6u{TeNM^jddox9^s1-Xp!^X6)%_4M!j3TzJ`k z_5H*PubU6vO;~p}Jf>HWA#;Lg;aZ7h=X@8P@tb|pe#Q~)vh89sj%shb#)9e#0p{wI=MboV3S&-hQ{$ zXJVHh58ZsR=-}PveRnFm*IF`|NAsFQ@H%7)*d+7WrtmrC@Hyx5d*t(b74mC)7V!mE s@`pAGB=!nsPL;@>A{W^p#>}vtVcy>z?Xue#7#J8lUHx3vIVCg!0PXYHE&u=k delta 983 zcmey}!1%j?al>Y2K?74=LyHhYODiK&D?=k~1Ea}Dm`yQ7H*>L^VN@|nGB!0#G)>es zPEJhKH8C?W)wMKCG}1M*NH#Z5G&3_#wKU!Qi}ei)Q7R_~a9VLASw5MMqiHffC)eiN z+}4IHHxttiPnNQ^sdp*jaLHr$E#Yv@W_QbFbIWIUNN01*XLT-P^QqvdS}Kv=#~)V3 zWuMIKn8D(Z#>x=Y#lut|9SNrgjqtXH4Z zo^wE?ez~A`9vee+C+DdrCTE`*9=vUN@`=NNTe9oU3r{&BI^hss!LoYZg+~NdofEBI z#b38pan=EGk6d z_X*Z*6q<2FBeDEm=>C<_O<}+o^X7cY~ z>DT__kiiMwJAcf&^R;w4;u z^&C-s+|~)~3>K-ZbI!_?t>>*=Co}Vq%C>9z^^1<`WG$Ac-XK-HQX+p9f5jT!&aDD{ zJNV022zr%pF<7Os#?KY>>1NAWCegZ8Va*wV$$OMyW(pUs7ENCuRKHbn))Bd?H9|8F zineYSw@YJZFbHSyYU9mWD%`qBZuUW$wP)EE9bwB~B2lxBD|-n~-g1tF*}U1yg=9E$%2#pr@8!-}D%rAKrgfKe z!wNyOBo+pvAZC+z7UMV;qgWP`1ZKw^HoJ6I$8-+oY));XC>HAsR_hE_%VbvlNM`*= fX5CO`W`<5D1HsR6o2N4{Ffe$!`njxgN@xNA18-=Z 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 0000000000000000000000000000000000000000..e72e2ad0fe9fdbaa6030e18c4e059886d0b85057 GIT binary patch literal 16507 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 B*=Ya( literal 0 HcmV?d00001 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 8117b3eea12cdec26e2c245683b8be7a3681ebee..20a8aca64c8f9b5e6369259ba06a7f863b843e0c 100644 GIT binary patch delta 994 zcmbQ$z&NLYal>Y2K|>>51H%wQQ!7&oD`Qh_1H;Kjm`yQ7H*>KRGOC!GSSBT=Bq!=x z8krmG8XB3T=vo>Z8SAE+SQ;B9B^x9rr5S9V&-#XiD3z1fbD3k>G})H(#OD3ne+*b$ zPOxs6yx&H@UeeRWF{I)a%fZ+FLW~RyAAU!~&sz6&;kK}|U+e6*oVj)_`Bqn^TZeY# z44IM}w@n0uC;IgtS7bk4*ueg%vw*4mcp=BW85s+@zs6)=UGr~ho&AG`Ggm*VX~}lX z3wzjZZCm=O^D)0|`qdv#<2IcY3G6?YrPEW>uX!DNdOrK= z+N+noUwyQ_=3VoFP^B+k4RN3R_0OtYTYRRfZS9VehaxYq&w26b(&yPr`|VH1{}=6^ z|6}T^>H1&&_4ji;uhv{R`$=fak6BTbE;{yypY?0nI!vAxvnFrq{y*CF|90>CsJwSi zXMt#k){Cak0UlQb7j;H`G0v`c%L;5v@ym2}_&oW7*H{0YyS4`Wc{gkAgOyu5cTQq@ z9G5UhF4^?n7QV-CAGWeb)D?v*NJ{_PixA|IdrDU?4hrNLHiH8IaebdZMyiy`*n)fW}f8`WH=?qfm*N>wQSQzFinli&FLq}n%+i+8`r?!Gm5>)Jk(x7&|x-`ewbNADG{ v98;m{wMW8=*;h`yk)^tAmi4y(%na+zCr&XJJ*UdRz`)??>gTe~DWM4fI$Y3A delta 989 zcmbQ!z&NXcal>Y2K?74=LyHhYODjVID?>AF1Ea}Dm`yQ7H*>KRGODDSn;BY|q?qca zrkEJ$8l{++=vpQlo9P-Q85kNT85)=;8JTaM&-#XiD3z1fbD8s@+CSNf^YrHZ+iSd8ZxgZ4)~YU?8MSj&Y);tu`nZ!)21-Bq*UWpH zQIM~)tNi<=`*OF>zq@r__t@6csi)KX^k;TY(_K1$?a%wGx&D7xI^U;Vc=?1!M~~e& z_jmVyIko?1=iM)|+@7@7p6TlRTR%gscNh46{;}v?tn~Iw^M5ZM?b~wdxTeeZWx89p zPr5Nz`u@!C|L5l2?CQzepYf~e@|OB%*Yrz2eD0eSo^;h+eeXTD{afWd=Q*ExHf!?k zekSY7ckP8QtzUU;z1-t|@B@J@cYiOiQ$Q>P=%dlVb{%pRetE8+iZS z+|{!aA4cyfEFb(`TnW#g}3)BS#bztH== z`PtLBt1i7+uS8xfE?|5V=h31d+4{+1%5lk`8}xkFIPiIys!qPvR_cFu(dL>*Ne5@R zO0H+E<9d53Ehad9%c_g7v+gWqjq_kxQM-t3;#cWnw));_p)Y^zZQE0~`cQPNM1H{0 zS1EO}0-1+aE64CWOyOkbW=Y%M?>fc#E9>^NUvjc9e)uW;IK1fZvOE8*T%V|LI102W z@HjF&lIz&1D7frfr&No~mDR^qcN*~42#9MHxU;@%a%ghtn8s_6GDp!};*l8ZFAbwp zOFW}gidU$WUva5-v#6Y*+^i#+kSe77I`xEtx7&_2D-??x&hJ?n?jzN=%x^jSR}R4x zL&x5)85`typM@>vGkq1X*pK&FTg!CDI4N<3Yq5@e7g>X^mDo26F!JqCEO1tExWMda zeneKF-04A+!-5V4<{A@A9&Y*Q&%){a9z0D|B}>+GecrU=$iuxxGHQi0P9(?4374)| saoB}V*h1&bW5It3EBL-j{^Mu3C7zteFCDyzfq{X+)78&qol`;+0JHGFvj6}9 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 bb0c6eadaf998fa88249bcaddd0037cb028c5b3b..1c5539cfca21be8620e2e1576e74ba993a628b01 100644 GIT binary patch delta 1263 zcmZ2heX4rH3dYI0OqG*YFt$!!#&lB9&`{UVBE-nZ%D~Xd)JWUFaB>5)%H%i9{4g0~ zD-$y-BQuZ;4~x>|Ma;rjWR5W_PX5c0Fj<>LQpGaKASuZp(MZ?O(9%HH(A>mSH_5`p zNY~QRBr(x6#n9Noz-)2`i>peCS+bF3vWbyyVoIukuAyP7nXaXwS+Z_QqPd}&rI~rM zk)`G2i!AnPN#@B$N#OESa6(9eY$H~cjtXY3#vwZ#26<^e+*1t0R=`_>p>x{W~m94BzITYjD zLW<_Q-}626?n@?9pXep+%Cxzf&tm#J_3c#m?P{%2SH{gtnEHF=v6`xEZeBKs)@nUn797Isj}e*9)8TZ`p+wYc!MM{$zfRxP2z z#}XrstSCwTajm(2SALu4Rh>ou1TQClj$qqc6H-5U*|PkMe0hf%S6nyxyLc?EdvtKZ z{K|Z`<))p9Djj(iExz)HGvkxXx1U+FyQ3DRThDUH70&(0*m_+<-4Ck{u>95%6hX4cS|?T(nt!~ z#c2_KQvB5Nf~8eHO56JH&po_=>#=12r?0xI&41bSuE#siC|-K;ZsCK;n|%7uPK-PG zU%pTLH#nWHe{n&D_v>2@zih7H{U=UeiuYKik(WKm=^y_j?{=S= z*Jqfm75?=6g!m~P*7AbvrZ3vZBm!sosrk$d+rYca^Ej8wUdv6Z*;SIy&)BrYAS=0r z`R8R#?}M@~Q~Q6{vi+($w)4-!(iZktsygMaK@ZhkY9bdMe81s#nBnWkEq^MtuGZIk z9O+hh_ygF8$X>p!p;N#<~_%2*GZQB&?{XJJS{+`T}Ut9BTMem+)I=^7! zH{p~`W_qz%i*|eW`&=ti;$Sc4(O#CB`|4R-alhQ>8O yxzGM~&o6#>SMA*1pN7xxS)2@?EA>y7;n3{YlO{7-?qy(LVDNPHb6Mw<&;$V8cNXUW delta 1227 zcmX?Ay{vk}3dYHbOs$hwFjh`p#&lB9z+BhJB*e(j%EZFT#8lhBXmSIy%H$W!f(RK? zV=EH_kPH`#;^g_vB3NXOFe^>&V-Zs^FgG$yG%!!pHA^v0(KR(TN!GPAGBVM%OiMK~ zu}m?uG%~lGe1gSQ#U#}@)y&wyOxM&f#X{H6Fx5=g(#Y6EH`&6%)WpI(+1S`Jak3$+ zy;_=?Nm{B=lA&&rSz@YgnxToMZlYPLrLL*5rJ1pLnxUbwxsi?jWPeu4$?I8wqTYryike+JKFJuCfs z6Hgb%kcwL-2YvHzmoOZ7IREW_+2dtN>b{rMUPs-!Sl-*4 zCqABjOl{H}1I@FApHkZU3^;bB>*!yVh?1XV>U+oH=+|>M=4dOwnRKXE=tNMz!Mmd3 zy>=7nYh$`XRYqSZMk>f!-RnHs6bdGb(;JN}v7t zSTe)Bxn>_WndXI+a&1=k=&yfYKTT|Is8yW!MBg9tSEVy_95UQ_(0t30-zQFS9KJGP z>I5}Wu4&C0V$&?9vx=v?uZfR7Fx7iXx7n8ePJuN?rgS~qYM}1!qo%cN;|YUu?zORt zvMf3}_=<~PpZR6|FVdQ&MBb@0RKn=3;+NC 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 83b93732393a45350d8743b5fdd11c680d00a9b2..c77036e10bbdfce99e958697db6c03499028985f 100644 GIT binary patch delta 1066 zcmexTH>rVff+b`AMypC@K|>>51LF`wV=GfbD?KhGpbmaCZ#2t zm|EysT9~Bh8d{iG>L#Y88tGb?S{fOerdTAI8YfMj$f|FZn3A8AYL$|ooS9-(kda@K zU!0L&U}a#KYHna*kffWKl4_`HXqalIYiVeftecW(ZfIs{W}a+hX}S3gYcmUR7Tx49 z$8_jqMa~nO7jyqHV6kFu^qsueMz5Y(*3-o?q~aEX0Q37l40Dy8rpPu(<^fx+E#{gFbhX>$bl`|#p;_>&Yd1dMxc2$f!LP@6|39?x*ZihG zt0(f;gPHV&ucfo-n#kq@`WE4PS*dwaN_Ur zJ%9FZ_%*fk=ftAlQ_6l#Ec%?|`mHqZZJb4qk}ktJE04d&PyRb|`q!q#f3`3EyJz+9 zW!>K<7yVw|`>E9DTYJ*)g{?26jJ}lkeJu@GYpl(%$H@8biBo^~?fJ82!H;Qme^yNS z-j@1%-OS%>r+%pkd6R7MJksDrjN#826+b7`=bv`eW$2c&{CDiszkU1v%%1dT^Qu2< z7ye#2;oIcuACroHOfCI6yY_XG`Kx%7pOcGzFKk(*ZOqUsZ}so=`9CXG{poK1yJg+q zQ^$TSpZk46-S>v%&n12j>WJnPq#_WB=_nr?@=y^J<~ooN0%(%@Tb{Lks-z0wX0-BM=XGxL8px4-cXeV>^8 ztGne#P0^1DZ68{zFU3Y)j1Bu(5&XWy@8`1KZ!>GUBpn&Lr7W)6dfj*SKVs^7%*^$^ ztIxg2=pTI@zb1A3oY3@p)r=oYdOtNMed^8qx@kU0LzkrO_xjAd@2S~mEj_N-cs=(B zK5OUwBR~I3M9|Nk#y_j({N6D8b$RI5S#`e-ZaH9~$Ivh1@HssCU3uLr?~os*)!#Go z4_kQrsH*$b)%CNZ5ft40MW1RSer}rk9ur{pX4OmtFN3_L&-eugUrn9d*{p_i1qC+t%)v zHH|;lZumZJ>gWEpUn}SS+Pvt?;-23p_x;$pVy%ub!(0`sFBOqrOXH5XxE*nEzY!br zG$Zv(L-n`G-QO2Z{&R5aul*Z-9NF>v$kuN=S9i*LFierRou**BNX@cK(y_}@(xFSz zwp+@&TgtLq%DPL^u1nHkqO5(Fq+_qNL$|b3m!u;zL!ZEbbyj;`FflMNFnGH9xvXKhGpd-I7+M%7 zTA1k?8W@}Frlpvq>L#TbTj&~Cnp!5Am>L_V8e2@B$f`ftkj-Q>6I(S4aXJ=qne(B# zW3mqC>CGFt{}`}b{QPS7jypMOz&AC1Q{o(un zcT}c#_0L-(v*S3&ZMF-+B0Fy|8|WLY=Sq)+>?blJm-S00{IJ{oE;EadERGqt<4rrav zd%xlT)9WHZ2g+wJKlwpZAoE+??|kO6VQ9BkK2{pUY>)JjrS~8 zB$vrwT$UEMyIAGVyROx1Ty{-kF$=a1yY}WoPsZK)-$4u+3mASaD$f_S;Eng9Rnb$au9WV>E(Si9MPbLpMb!gI~*ufEpE z+L_5}q<&exx}1?|eMqa0Jj=TKAxA$LWxv$kIPtlIJ@>`dT}QX2rbvBqO`SG9%ih7` z``xsUE3F##*wu@)AK(5&FsnVy^oqcxT=C+-h;6UqC&sFFtm)xe`lCYVU61_Hdri!C z)6AJ?ElhPYI?d;jYx7InSB^8pX+q2LW3fF-Y=4d^Ft*?O>5%SQa`Tq?MuA0w3(i*Q zY%Wc{ERdJ6yLXvn%VG^xrl;GOtJ^o4Of}Bc<9&Z5P)_UR_PN~kM;*hK=l@x*nSIGX zbE`F9U3acGM=isP0~UAcBD*&&=)RTz>(Rj-zvg^c%%S%3?uGlC>+)B(mR8TSaf<)@ z`{B==Ge5r1|M8f;`Tx16H`m(PK8%#`Xp-zA#0IbnGlmy}PG$--+GZ)_(cV%&_TGqmYsNTx$jf O1_n=8KbLh*2~7YXNQ4{! 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 8cbab0269541e96b637b5ccfe969dd6f8e47de81..a4c81f114ca7a6d186328703639b470f289cca38 100644 GIT binary patch delta 932 zcmexTzq5YBW@bS{BV7Z-5JNL717j;A18oDt$w!z?F-13Xu@o|@SX!8+T9_Lf>L#UF zn(C$|n;7X@Sf(25niyGFCMKCBCtDg@OrFo`rfi;UW}a-CqMKx%Vyg<{C>~hk|%rc9^lV%?|Ce6Yk!V;nSd~!oCY3j+!?R8gc*9FYw zy1Mg7bo_>I$6tN*{Q7H2QEAh?f2HO1)t8UuM^*TTv5WMbIQ@b9?;F*bvP&=5EY~xR zDW1KkvhkvZ>5JEVdaJ5tRK4WS7US*Ub9!}4@@Ix>wDHL|q4&xYs#ES6{^9lA&(Ize zV}0uIBZkfM4LV%+^gdYjN&n|vucGX&50`UaYSB;+tLEX9i7H&{DmS&gVDt6ES95j- z?yI*|lJ)-SWA>-!_)fdbgI@i=kA2+o@X`S@v6orjweRnr*}aBcEpAKMJ2`=va693z z`<_m|wdGjh*Tx&HVv7D>47#@;|N4)2o!7aB*wS~$t=E5Q;pl#O{8p-aS+>sq6P+R( zJa1k)bT+$EgYW(2Ei%#*!V;b5u%7ha{z+ES<=*`G_w{l!K88B zPS<<2Mm%kUuOg3u-+HYX3W-fDO(JRSSNr1&LVI%KnI_-6pio(GJL&wqi0kL)+%mqz zeC=hZsIZD|$MTmm=Jc7d(D8%Rt%rdz{|fpn|J_<=I>Bzk1+j&!ozwH0 zAH6s-d!p!vQ!Nj^nk~P#{pPLiFUMJbKIFN)Ec>URbBg$)wc`4B59KUp^$y$od)EDg zt?F4Nk;~7^&$$0T^IzGmA0>Co!rYf0R_I#SD^e@>ygOCQJyIyOaEsrffSS!7-I1$K z7o@Rd&v^6fWS*RQEFU8SgLiPs)q1_lNOPgg&ebxsLQ05Be*lmGw# delta 957 zcmdm4|D}GzW@bSHQ(Z%g5JO8V12ZcV18oDN$w!z?F-13Xu@o|@q?o3fTcny>=%!kj zS?C%Vo0#faCYz+{8kiaynVK1yC7W0nOrFo`Hu(*U>SivsMi%09tmiW4Lv_bwE6&rK z_jCU-V7V#MWiWZajeh+{PZ!6Kid!rP-v-}GV_^93$NTrLyRQxesw-r;268;S`mjvy zwdU^9uF~-J*LUq(xb;?Js33>_$;kq(>i+Ydcsg+`SgXIf{B7><4f~hwmp^Lv?^nv> zb02p-)_87n!t&lznWgT^XP@_do9C@rvE?y?j$dbW-G=A6Z-4*X(|zgY0r&b(kL?e) z%lB^8{`A}79PiV3{eo}HcGoHD|IJ-@Z^r6vQ%qVq?(uZ*j_WcJ`@g&H(|`4EpP#P2 z{qV8enQs?QmF9o8{du;{J67}7Jxk#F4*|x+;GP!=aqPv9_O;gsX>~?h7gz85d@yG7#YtB^<5y^>X(x7Q z`ueQ0@!c_jFJmtM%RhTUW-OS(Rhzmtrc8d`<28y$LiKXyE-gKCLd zRl6Bm9@P7rMaezTdH878ghRa?dj5-@^=-av>AzESbMXedrO({g?EiPl^<(Ao(phh` zBc;=-KG?0iyhAGBbnuT18PV8VA31b(Jy^&+RXyP7^_quEe*B5}ZgTaww)37l?UHNF z))qSk&oDk38U5*-%J#7N4p$4eTIO;cytb~J>9(A-UMAD!@Ot?bF*8h>**I>!{os&z zE->N3%w1uzR_4vxb>2Qj(R^HQd?bRrgdeHJ98*~NiF0cAOQ$na7B!!{qdITT!DMFx zz5QP&du^HWyN_x8d&!_#9Gs7J7B?(8v(&`!a^m6*#}-KCnk`?m>b#!i#djK7ZCt1M zy3YH*KE#xFMB(&_QnoP3`lUNHu8SQl|NQ5+WJJN@yPmHPP7#>PtPR2U*X=i z=d17clgI8pzLSx8R?+VBw)kIG=WFgdE%+TiPr|G8`3<7*`urYr3|`tzY{9uETp O1B0ilpUXO@geCycAIf_G 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 ef5d02c0bf7aa68fe32bfcdcde47206511ca281e..e47d8bd06f0c2fed6e7e37f1563f5713b70380b2 100644 GIT binary patch delta 990 zcmcaNk@3q!#tna%1r3dK4GcpJ&8!SetW1ow4GbsqvY29uZVqNCWK=OXNHt3|HA&G; zNli`GH8eFb*R?QAGSN*oGD!qd(!mhY1}m zANm4AI{KNkVkc@H3X{K{l^wnH>&4r-*`;rH#g^~=oA&-qZ1wi~#QW?SF~L>_U6U&3 z7IGb9(LJ+ztBlvPw&SnU%9@|N5=-MfbZJ5rlbg}2IQa`J)9Q2E)|78~#kt0MW;550LjXNN5R z)ZmG}^%b|}R~R2$n`q?E$GJmsb?UK{q58vyzpR?Qhqu}q07qx#sDDBzdU63kk z%wCyZ@@}PGvOt-?@P&-or#MP@`qYjbyZ3ZzNOi3BkK(^Sk6t{!`q)eL^M{gGN7Sny zoqzTt*O@ark4p6wdWo`?e6hUyPPMSKUq9#gGx@34=7*mDU-jwreQEam88ug}YUO9o zII31O?ZF<#UX2iq1uvJ+J)D{M$?oO(BxNU;sMRv@Ha0ckH|;so!@u}QeN$_5iqzWI z^dhpAi}gSr7i+EF`z5_+c_RMUviNd)dw<LWYaax6fv=ooBZ3=f|VI z^EYHk&)!vk`rL(;)n`%^_14~OQc6i(yCva5RmygSh8JIV`fAE_&N|Hf?Z&2F-Gp;I zk`oG|6c!6j)v{V7l=IjmO3dZ3ktNfM>Y6EroZRN~$b=y}R zU-+tQOZjc9{M%QUOMdGzO)z&f7rnr*J0XVg)GWtHV~ya96oa$3q`BVqK69+>ewU`L ol+QXlsw6je*|o68|Ct%~Dx`6Q96h#-fq{X+)78&qol`;+0QUXDU;qFB delta 964 zcmew|k@4O{#tna%1r5w~jZ8ueEv-yUtxPPn4U8u9vY29uZVqNCWK=OtG)^%yv@q8- zF|#z$HL^4@(6uy9P0=+lut-cYHBK})F*V%$f|ZGfD3z1#I4yWlteLay z`B<8Bz`^^&?azJ|^5rWp7;krh-2PwQBwMU#%)c7)RRg@ zZjEskTGjRY4qZJaymjXlJBMv%X`dHGdSypSZIB69?mDzGYs>O_fi9tUb%ope_nyl3 z3T58QuYF3~E7UoD>Xp*@f7aNYc*gMJ%Zy!b7oVN}<$+r1ZSi*Iw1Q?+zaI}3ZvF4y zwJ)VDJn?DHzA*mz^|cyP8FrKk?0n@~r}5;0R%!KQ*>BF%ZFkil<=f9*6?^=1+xtI< zKOLX;d`FnXB_15Rk^L|OqefU1N;=ksn@S}0}+rF90nQoWKFWXvw zlH)`45$-(h0N1*Zlg-(zv5pOXTAxiNE2quV{#0O@c>AP6wB+6cI&(s{Y!oo)T0BkW zueIPMLG8&RhS7p+*EM}NA zN%Cyg6@^U&kxkbwEfCp0?NUJG3`t(l*anQfNaVVGdXc6#MY3u{r%-W|4=Bfp8a z%U;+aryL|Vu_$4Zu|bd7j-;fQlJn+w9_Q6Db-nycVVMni>1X~{TzM*4xZ~KJdAqy4%Vky^YtAnCZp*$ZvglsvLMi3$7yp?VSXRvHcIcd> R&%nUI;OXk;vd$@?2>^1zu_^!n 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 52340ce60ba3b674f217233c019c42c3c81109f3..ebc8e172f388dda155614948bc84610b44b85a01 100644 GIT binary patch delta 1279 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 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 97f51ac6fe9f485ac3a447634538706b41bb48cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16309 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_qlwnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc+^Q87{^!7`jvVmhiQOd==K4pMBSPPWvwG%!yyHZe|4HAytJ(FbMToJ^cXSL7DxrDUd9nHZ*; zS*Dt&>Y5sw8|x+;n560^8KkD_ni(3K8m5>gr5dN=FbrY^s`HV<2A}6aY0B5v$}_LH zBrz{J)zifeuZ3sVzwT?^wBBV7Xv!xY0L1M_5~R6}q= zL)DHH{NRjk1+yJ$H1S@=(2ilWe^F+7W?o_rg;roO2E!_kOi;3^M2$soc^{lwh$@Om zHsEr*AhD=86;vwOD#3~+ctH;-B_N~?xOB5hOa_(scFCYZBQ?cFA4L@5EQlVERS*T4 zm=Q=^g2K>_+m7;#)I5BJ4#X(1D%^$?=ckpFCl;kTrl;nW5K|sPOhwg(ZagFh;Lch zs=)yaEBg(NLktY849%N75}0ME4XCkY_fT__ZQSqiaRz49&|du``0&h9-=p3)CWn zG*^NP5|dNy%uG#Okih0%2cWLBi+M7U(;rsfrA=I7ZNnnCrTOJLO)iAy7r1XLp= zs*t)F;A#va8sy?;$7Q1r?j3=8N?<8?okJ@I)M2zT9%AmOC6I6+k{k^#A_EGdY&5ta z;Xoug8eBvM6hzr*a6!U>NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(yn zE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U z2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr! zHX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLaSW-r#d0vZTR2^U;lcY4b;~VNCfz+^mVISiSHz2{5B$GQ zuXxz&p{cutbz%6lZ937nI@E3!s?9v}(0ZR8f9=S&qVVSc}|#=@y^}Gva{ev$l6o84^HbUdMRqU$J*au zqQb9v(`?sn(&U+ApR!-w{Ll8&Gf%d%EDM~Gb*|{d&78EN$Q6dCni2J#~5E* z{rxNu(#0*Nek!X-MLc!MW8dTH+OK3Z_g#5AdwzY&cJu8Ag>^T6SgskNz4N-N;i5fT z>Rv@kt;y*KR=U-yHaoP5F;kk^HnQ)&{O-MJg*`V#xS6lsleKvLd|$Dld|d=E+01>*f8yX-=BM>TU$SUOk1h5q?hGAn@|^P z+EM1)vTLFwjdnMkw~e1S@$h!5)by`RVczK$Rc_S}J2srkRdwR}7r4~=IFJ6c)Q#Dj zCM=$wx&7;!yxAvAf==1GuJh;!E;%yeTgaD+yPvoAuI^qf^Ky>Ry*qCg3SA0tlIW~p zQ*B6{n4;k_|Imy_R*yV7Pj`knRnHGqol<7q*QI^P(@W8%Ng?RIsbr(%f9Z}rs~U7{7lkY5&dM@;#XHh>OT3z6{MZx{(kuDExEd1|M~vi*|eUS Y;bLxSc~QfBSkg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&rl;x`Kk#BxVs-3Zo zJ~m;jx?J*;OF_xnF)ul_xFo-*7%7rq8O|v&9aR)2k&|f$DK=8_lQUDS5SAL6q?#L> z8d~Za8YCv^8XBgW=_Vy7Tk2XGn5P+=7$>KiB%0djgEDVUCaTd8QB)g|y@Suapk(0d zYvq|&T#}fVoa*UfSCLzwmzkMjm6)26VxDZCs%w~(nxvbWW|FFFnPix#n`my3Xk?g} zY?*4722LBO+L1yGoHwmtwtKozV)X zVkjq*f`}+iETb$MObsm!&61NXbkma3OmtH$Ow4qX5-m+Y`O7HHC^^x{*vJSL%}B9` z?nRJiAVC2RV0hte6k=p-WngAyY6>fOkyPO}1T{Q~s8=ASqH4o!d~!x&UV3VZoj%NG zFadNegE{7iD-R(7Lwd|%sWKr(f#VlFoDk8E8U=$b<{wh8eMB7eyzyT=vomvL-R6A z?2Mqcp$Q}D0yXI%?Tz4q#N<>vGgDJzQyYDBVRRhej`FVDRW>7uo z5?D1x;?jsD0o4eJDx`h_xEh0q2D!M|aoOmDyEmY&4p<6a=g^7)br`LThnPER2_zhd zBu9gb$bf<<8x1ZNOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnH zIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA z3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B z3ZiT@xFF#`B#Ae;xDb1aQ}a@6mCBXu?Sd>Gb2Bh7C?tCX`7$t6sWLD$G&3;#{LjG9 z@REU{)PRBERRRNp)eHs(@%%~gN8K10m>zh#IEGZ*VmVmvF{NCF{e$}a_r>4mTu)nm zMD^mScR`mo=;Ul!^Q^6>iDQi?^Ti~P4i-xmNd8X-3ocWNdB(K#ua`q-CWy6YV$AV zdtKMM`(Tll>9$iwU&_6*E-$ffXFp`KWhT4*vxBLBH0H}k+*!OMxN!F)@2eCMfTpmHl-ZU4(xutndk0|g}a$A z)HmH;xOhR-h4l*reqC3H>$@Viy@#_QS3+@i~4N4De z7nDl;X8K>-xm|mr#`C)UcVztU`w@2fFpKC9uZnrZAAOYRIdfpMW>NX1FU!1l&%HGx z@rBs-cN&L28^nbquMs<$TQDtoi9~tYgEE2b%M|7{-;?RAR(V#cwYM$L=<8P-6|D&o z{o&FRBKoGg{;=+_-nnB&@3WXWbJ~g>Ge3BBU+1jkiOqj)TxT<@wR(P1iea1mVF%5& z(-*cggg;+kDz3i#(F%XQ)KeQfzf8@2kv9Jw&x1nAr0x$3M5cFNG?nI`z93z1-I>X= zYGm{eysd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcRHB=a zT9TNOSdvJTDadM(%t=YMO3N?GO)Rm?%uP&B)i20Px6wxkBB_L@Dl6ywocto+{FGEX zV;g;J!brNnDb30=uec;JFFDoI#jYZ^Krb^h#VXm@FxkM+I7v4-&Dc`cGTFpZ*TUE& zRW~Wg)HEeAHQB(-A{88nzP`xXF^qP}Pc8-J7O2rFnJHGrDF$YS1}Vn6Nv27Ox<)A` z$-0&)hQ_*S$%$shi7BQ=7A9seqmi^@80}w_nVy-Kn1iGS!g))YA+;)^_q~_tvP!OZQs&E@poS#-wo>-LXn4X$fLQGzV zn2M?m-FO>)Q0bqONrQ+ePAsD=8i>nB5MLt2BDxn5Q4J1YNV$f!OoA8%R)yOT)bJ#t z$c31SstvdC$r*`x>8UAp`mh8H6F}F3J?0>ys5uK(AYkT18&Gv*Wup&nKZ4qlU@3UXMJoo>VYD(HV(zFVkZ>T991Sia0}7&S zG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$NOCl|hzux*veDpzgaeV}XmAl3P!MIK z!37BiBFWLsqfNH`Eljs_Qz z0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+ zB;MfSLTuVh%}cRWDp#_%dw*2jih+SaA=x9ymw};5m4Tt5nStTwe+GtzmkbQ01`G_Z z5*Qe)W-u^_=TC}1>c+sp?C$B}7*cUd<;;D5X;y{sk(%E#YliM;_O}@? zW7j|R)7bm1YXAFN+1k7}8-g}$ViNbNXHYddGskM%iq6i!%7VbjsS^T^9C>rGg?+!> zo6qbuElz=lO?*XC`CJ1FWcrsr727oD*d`e+*6ygajXL#BsV`HEJk`|f4t>_%a$A<= zwjsxA*Q~8dv!)%~B*SFCBx>zsq0~*0Q~lECuGH+TusP{(Z~x%p;&zE;Zg%#~36XNv z*10mr7um~9@JN}U!g^o-a*kPK-nvPCr!D*(w(suEY-_p7*6G4_+DtISv_Ec3=g~(I z)0#7XS@<2;{C>G*b4bv<*+cUSbe?%sQ@ zX77;b&0WenH^mD?YOv& zW!+pafk!_@XU*Rlk+p8J*J%~?Xg7w08)>ikPbK_pTAbGk@)!oW-^%c#V z@5d#64D*O6`>54Zz@$kezEcF!+SRI zav?w7e+uPdWxoCG{-3V7wu-A(b;=X&S~+*gu+5e&r?QHZ;hpD{k(cEzJD*oQtER#JvDV|bF<>p p18#vPUTuC#9~oKCKKakcQ22b_#d+da_kp%kd%F6$taD0e0stZTxC;OP 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 2130671afc7b0e0f4fefe03fee42acd2dfeeca37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16169 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 FCIIf%tn&Z> 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 b29c12c93e38eb0fd12a4690682474f8a513f033..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15210 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_sMFnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcBAW{Q=mVUm$)lA)2VQA%QpZipa5Pf}-wPP6VlAl}($}OHQc94Q4B|kYc#R}mpV*?{g<0J!PU4!IgBV9woR5M-6 zq$C5~q(oCwW3#lBq%=ztm_GBKl* zxFEpLj@yp%jMO}Q*$ZM6SQTzViu2P-$`gxH9n(|uN{Gq%5K~dLp&M_b52_1tGHDPI z#ffELlZ{Q1*$NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{ zAmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`h zAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KN#YGIF2okj)Vvg1rE(>E zJELhvj~N&k6p}rHd>I(3R2di=ni&{={%2rlc*(#}YQVtoDuIE)Y6b&?c>bjLqizfg z3_m|FJIUNk{vRzOLU7MM-Z~Jxe z#t%D1Z*70_!){i2FVdQ&MBb@0I_VIr2qf` 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 4de3538bfd60069b4f6cfa3be72c974dc48d0ef7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16201 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 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 819d42202679bedfe766cfb4eb5d2ede10f67043..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16136 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_tXHnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcpquSZWi9QA0ZBAn}P>Cc=tx%revl)R3_9FUm~KD@g>Gdxkdp z7-EPt15qCVDo1ll!RpP83=9km^bJ8IR4cMHy4FbiT9KvEwIXze=4F=H89{AB6GqYn zYVAO(;^2bBqnNLTW;TOHYVskc*ogmyJHS zNOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C< z1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`Q zl6ZrQ3$ficH7~_hsa(n4F5#n(7Xt%>Lb6AYF9SoBDg#49GXulV{|pQbFBuq04Hy_+ zB``2p&0t^<&z}^3)Qy3G>6NF8V@Sm4k=D6o&r5)dWcD--)Vn#O&iZUlTycK^^vvgYCp#$a4bDdwVR@4pI?)~Ft$n#1=uqK{fb zc8MkVEH37Vlw0Na&GXb>rX{Ps-I%9)UinDnA7nEV$Ph6CjUO32s^;sWjNWO zW4h5xepbWaHTSmm3j63C^tk`sXF9|3fIZFy?&sq9e~C-{5ZB!wcQR0~2cg}$I`?;o-Hwm?tHv_tN1W|K z#*_b5PI>+Qu>Ib}_p`s-_gDD-U(V^hb5_7!zetZi3yl*E#1>uXm&snYQPpepyBjKj z5tp+1)}5XdFze(Yj<(?WXYO07HO`&7w~)z2Gkf0q-M=;#msBTsdcU5(an*tJirZD~ zSK||XrtH1;;pS)20}X#_l0%DyFEa~SyD%HY&@WY>? zM>kkI7haB7d;ingWeQXOS?A83^|s4qv(bEYoeob4masKfLi!&6Vou&!*jvF8l>Geb z>#J8kU3sY~xhv56`&XSAn!AtJM=^FC4y)^Nm*hyFE@#<1+2T_C-aotJqQBIBTUG6~ wP=+T@-LubPTjtk_YZ15qNGa!-e*MqRAW<{H`T^Ip{h+<-p00i_>zopr0QQ0k{Qv*} 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 38be3fb0a9640010120c0094e74ad9e241ef33b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16356 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qnj%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&?+%p@EgD5waObD$&hI zElEsCEJ-BF6lAqX=AKEjt+vp<%kyOG{m6daTPJWSZeoCsH zv5h`9VXV4b@{>zJ$=We5IkmVXzo-}~l3*FmDKQ;Y6ef|AX$L7bQu32CQ>+k{rkENV zr6pRV=^7d&TId=Yrkd#{B_~_zS{j(A8Jid0(!rTcDSjnPO#XV3}-enq;YKY-(VtYnftVpqpr7X`yS8W|C%U zo@|(8WClqasM?W244gNuV77a@P~>q8!!RuJFUm~M%uCEcvJm8#l*|+>%Va|nOG{%* zT?;c43thux6ARtMG~-m=G>a5N)6`UBqogDYa60$(wZdWyhE*P!pm?uDiw02K1g93F ziX!42T<{ho78R$0iWOTWSh)f(sUg`MLfU|fC#%F{P?2qy49fMXDK`2jq6lX}^nk2_ zD9FT&PU3<9LpyFe$}>{)@Rb@6qrj?g8&aH~R#Ki=lI7v5c~4FgG(wG)*y2)-_1BG}5&+HA&I6G`29(HMLAkGfFczHZrs@ zfJHM>ETVf6V2e3Oe4>_#uyPi&47CBZ zmO$liYF)&gat%>1gIR%DFv%HH!?6VFwi#ykx;G3(&$SA6K38+R$R3Y^fz||N;G|0uxj>|?L+`R#Hb-+^aI)_#asKaPwJjC2l zOCaGuBsm&fLqG_5gAYrWuw6b2?rv{(cmI7 zpdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T9 z91Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm z1qlZt$NOCl|hzux*veDpzgaeV} zXmAl3P!MIK!37BiB1yc##f8{YoSK(nt5mLJZ`c2_ubzQ{K_S^A$d`ekN|k}3p_zf< z=YIxypOxqFF)+n;^+J!JZ?#0I)3uH5~k zZ0`dvu9dq}l=(gHiWco`D=>Y2XOe&3b?%#4&X0cZFVs+}{H(EPLUfH{Va=zvedjxy z^~@}Je5VxgCI;j(*tk66ewpO?Y`vzR;Pa0?HWklzpU_-1;ctS|f)`7=RZpHdnzKc4 zUs?5}mrd{2_pG*jK2LSYyRO?$Tkc;z(OfQc{ITwm+E{chda* zk!wvi;wI#8zv0{IaB<>kQ$A*SN8yIrQ;KO z1M_Xq8OMIGEQ}~gnNv2uaIfpOTLlucUL*;J2hG^FOQ!8va;xLk#-MckCHu%Vrmaekw*2n!Kfh&O{J-@I)3bYC>#Fs}=R8rog zY}x00&fS_9bwgiHU3J5^^VxavSN`WuJe8_vV@T@n6OdiMmH`AjUHx3vIVCg!0L(~C Ai2wiq 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 d924fc47317a51e1dfd8b980aae606c8e7f09587..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16187 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 L)z4*}Q$iB}JZ%}u 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 c34d6087c3e87b31e79d2a2e56aa8575684c1591..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16382 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 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 c7ea1527f46ecb6583340163c94036d85b540de5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16081 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 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 83257ccc82310d412319675cc714ba975efa0120..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15722 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_sM}nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcRlqtw+k<3X+wo1z{%1tb>%gjwoPt`BTOSjQS2qLM3rz$Jw{G9wE-~5zRJ7XJt zY{E#oz$wkjGq1QLF)umQ)5WeLw?Hp5GsVi%Jk`W9Ey+aJDA71k*TUGuRM#@uEJ@eY zG}YWF(Ks#DD9sWah`zqa+A)lF$xki?u=R*A`=(#$Rylp#`6Z1hn? z5zd0>0a*o6kckX@FIS3*o)hnR}0 z4c&MfeNgG2lSzY!C{8S+EEF5m5~eU`V-!wM>E-1y+UI5Y+G_qR54q zimDB_@yQv9dFiPscKWac3==@tf<5LSqNq6wRv=*JL>o|bWaVF!nVMIU2+lo*Hu@N1 z2%915BS5(^rxdK-+{nPdz(C&+L_)P9OQUOz#IF@u8eJ zQlJMHBqpcYnVFgzo7(833#01@$gD`siEzoxP0cIL%+IqkG=u6vm%yqq5|>6K38+R$ zR3SCQzNOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(yn zE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U z2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr! zHX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLfU?r>3s9=<7Ce z5pq(xW~MRq)QVMYtFmL+E=GOo4*X-6kJOA+OJHzU{)zaBiPJMlSzwqTH@ilqRBuwLt zcP*Q=b=${1TIc8K3iSIM?ptWMd!MI~Wp}RlhPOkm z&)qv}vVCV^GEeB$i1p?>x9xRa{dBUQzEJNm0jEpvzX!hh8f>#(%ETzIb>sJRAHQRg z^7~t-NPhcoyZriV#iv3}9=G1wzbx6s%v*9-Nv1F1HmjfCtDL;Flh1V@ebkid4c629 zwc}mGfx?)QyH2N6l_myGI(f5^`>>W6|Br_c&(~;AH$1Bwr7M5F+WpB_zW7z^cYJIM9Mc6)SP1`Wfw8M6m+C*cIX{U6g#m?@xVsxKF z>lVtZsIu?=vJkDuzjN!N;vOEKYs>Z2+2*~h*Y@A$`|dw`cb7Bio1A(6u@i6KZ2I+V z!u$JSFH3eE+;zA}X1Yt#te-zy8@ac|I$Y2>>DFWr8VuU+}z>NY23i8j}@Wj;%bTr6Y`8t8oc&fjEGC&M6o WR7lc8JS!Ho8`{&=&t;ucLK6UKKA0~6 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 4e5d8aceb881da9d81a76859fa27dbe696cfc66a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15668 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_tZJnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcE_RTDB_%&OGsOzwtYjl2;}naOBwd3P z6H8q~!&EcfBohl0-4s((V`DQzGh>5P3z$VnhGAIbUzC}inU|P@qz2@dl*|;XBol)q zlcZ!L-Bc4pBi$5B6I0#9R3k%O6AOcsL}T;Bq?F_&m=#!z!LZ6Bv$!O`s1hj^!%C#! z)IwBIm_$w{xP&T5EGkX~h8Hsu6sVR2)FmJ&G z(6tQaXd|vLgaiz!(T25RffzNUV-6CZs0AXdki{%OZ9r`bEB~U*)Vz{JaG_^tqmLnm zNHY-i5uiderxdK-+{nPdz(C&+L_)P9OQUOz#IF@u8eJSnh zs6uK@gNsgxXpoDW9hZ$hxDx>C5P+rN6%MT!P>0dVc!;^9mO#RRNOCl|hzux*veDpz zgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*R zxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa z9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3Q)e ziwm*yHZ?EBR;gUc-tH8~L@x#g28CpgAYTTCDpdxChGqtapZ^&c8eTFmlo~KFyh>nT zu$sZZAf7)d{-_%R10%Pmi(^Q|t&&NG*@qo?TE7-=P2td3B58z>Sh7fQ`Trlk|JwXDNuK|2`g4!8YdwFroYB7-9vPk* zo9bG(eaD8TyrS|qj|Ds{!}dS;#Ai3AC@-)78&q Iol`;+0Q$ruTL1t6 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 bb1f7b6780ab4cbb901ee64b3b776ed9bdb50df3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16409 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_qlOnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc$V<1;M+hRRgr_Pi=lq=fBH#R!R6AoE zeQd&5b-Cmxmx7YDV_tGOEiVrZIXX_|)JXox7PXOKe*Ur>Njn6IyuXI^nhVqS8pr;A-hZh>BA zW{Op!sey&Dg^8uEL7IWFu0g7ap{}KwS(>hqWs146xrMR0aiRq{*`aDjiVSeJw}RR3 z=|WMMVi<;Dk$+KUdS+f?4w8i+zocZQSQ%KRrka}>o9G%?rl#no7=ZnfXr^nNW@>C^ zVPtHSXl4fU3l?KAtn$bNC88UAp`Y@lt1kkk%=9nX{JcI-c=`n|;Hij5Aq+<>e zpQvRbtenLxLv26}F)RO~%+$P+L~yxhXrqrIhDb9I^%0Bwe7^BBUu3T#%TYYG-C@YHVtwk1mX^BOtRP zH7CL)GdDG_I5R)b&d?012VDZI#zNOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8 zqHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ z;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec?G1{W7%yK-t?img()lD!?n%Hod<3=9g% z9znhg3{|QO3=Pc;3_t%fFf_bmU???UV0e|lz+g3lfk8ZfQv6Xj1_q|xo-U3d6}MOp zR{NY`WH|8g{h!AFIk!H!*Z*i%H0w9Yek{KzZQ;ykQFkKFEcWEqe!cMBqM-e|-(5T$ zGeyt(rQh=6=T#L~UzXhM^a`0&@~-ZrZONMYT051L$rUq=jUE|C%s;j3@R4N`3#MIB zTB15fJFT2;cE8YMpEHizJRT(Rc6+b?+bG?5w5_${p7e#9kE#A0>C663k~GXM()+hM z|Nrjud;U0VZ*QKi5bkJjNi5E!&56H`ee1#vb&4x^T3(4ct$P1&%R^1JV-?n2S3BRz zF7J8}!Z>mN`oj~`AL%Fh>3sdwy}w%j=QHkoKJTSwca`?9-@uP79F!=F1@Zhpu;PxF_(p+#r5&~=u*dVbFuFSsZyiS8*m$G+-F z!=3FD-v5uau#>j768>5zb)BUzP-gL${tMqHUdfs8%vgOIYg5(w2(!PB_Y_w=Js-bm zl{Z%x-nnm3xxy%5-SaZ- zrp8-k@5(OZq&jQ8@p|5Cy)rxDF|+iovUep5HZL?(&VJ}+8_Bh4%99l*uPS9H<#HYI zG~Czms?^iu*wmRt>#`@@U;f38)#{V9g|7PI8Bb2Dq!jI$aJAa8s5^}Rnc*zi81ujs z=WEVSy+!y|#RXBrruF%o2 zT454!?NpzS#}1EV^G{``Zml#?oDo}h@4S)jpxn5T(- zsq|TnTm4rmR>(QocC6!$73bZ1W#58xO$jPitdoi}iWhBJ{KhGB`7NhPcJp2i{{UOZ zT$e<*yUnM(T%`lq72-}^6JBHOc1G};jG|U+sOK856mP5Bmu^mR`XYCOvv33Nwomm8 YUnC>y%!0fHL7VqIUHx3vIVCg!0P4v`DgXcg 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 cbd7271a706905d5aa8b3daf3b7b1cbe3900ad69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16507 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 b?#v9X(>uRTyApl@bUc8ktDnm{r-UW|39x@( 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 a305bae30c686ef453a8f1e453aee66effc8260a..ca66cd55da7929999a95a630e2a421237ebe956e 100644 GIT binary patch delta 954 zcmaFVz<8>Gal>Y2K|>>51H%wQ3o9c7D+6oMBW+GBZy}OG-=C zO*JyL)U_}%N!GQrG&0joNwzReO)<1cN=ixF{EPJs3sEX32XLBW+B8{^qkb|!C)eiN z+}4IHuQzR2KUvCFub%0Rr;B4q#Vwsl(f+p*7}|cHF59T%J?&`D&AW96^vouwp4^tA zKKC4RNPvtH>(r_l=R!jqZZ%yve@R$FDdFjrz^)<*(K!n2(Pdk?%l|(+`B_C@<rT?tiI;OpH_21HGvl=+RS{R)8tW36k(ODi_#S_{p zhC+{e4<1OFpSdLezRGo(=~88% zUU_KMk_B(YSX-Oi#15FpF1x*Owr_oaP5IGc@5Tc+JpZ^acfMcco@^X{t?k#{%`ZPm z9bt-?GBM_5^@a7!_dbSYC!aC?tGzogZ+COuT!H8t{x_1@;~%SUw#nBqn;Y=(dw`T0}bQ~aN& zG_o4V&ghUolXCiXi9>l&PMB5R($|eyTIX8T{Qbk+w}0h7c0W!dWaG;-VqsdUcV1oS z-l?mXqBEUo=d1I!=L;^ZZ#L}yn*dj5<8K>*7%d)Ni`TqWq2kTyXW_5DD%E(iSjNo)%rePpuH6zQ!V?|Z7s<4>Y zftzz|CvKEIo>M!UdA;7AqQcMTx0+9#xqfBE!y@m?KjQk=ua=nN6J^>vS^M?LC8oN1 zX0sQRyj{e+E9ab^m&f|)0U>|B{VeSjPY2K?74=LyHhYODjVQD-$Da1Ea}Dm`yQ7H*>L^VN|g&Gqp4}NlMW* zN=-A>HA^;0)wN7YG14_LOiWHSH?>SjN;BX5i}ei)Q7R_~a9VLASw5MMqiHffC)eiN z+}4IHhZPK0PnNRPt7m5Mba4!+xTSOYt-o+O1H*^k<~<9Y&6!?33ySvI`R(P^TbHi+ zExYV?r{H9gQ30c)z-g6+%sT?D8_s?Vi>lgEzIXTYdG~(X)=rf3iC8Uqg>_QuP5aII zzia;sp8N7D)puW{na$1AuI1}j7@SC3H0echU-FHHJzwQ&gG*#f5QiQ$f*M<*; zHxF+As(xIa?RE8i^SHDBYbCay`up2D`Te~w(+X|`tiN_@0SEIgsYAzB&U9~4pDva6 z&+^;5(m$y?&#&^4H$A+pW_#rO`}Y;Oed+_IDycSWbvXvVK6p&s-d63-%&Ga`*W7&E zJY(hE71Px3ng1%=zCQZugp~}9-%o2qnbipKBf2K{m%1*>Et}*Nlh6A7>Ne$w_nNO6L-}3_P2ifl(}Z)TL0H3y z*h@WJ&P3m|2r5#l5Rl|1DCQRCDg^^W71*=0)wU->{R><=^I|&t0;U4xKfM z+gI@K`~5vk-kMF5{eFtFq&!(*%uuLu-r~|rJuB&;)ObDb8^@0C+S$bK6t4Ez{enKH zxY26{PCLn+MJB4<44>A8%zCu*U+ik@txj9+$baLIQFXfhOs#=Q)zMvzwQItpiQ4|Z zMO{Q)<)b^owViu^J+J5f-17Dzhd`x$)3>Lh`3o5o(*4&m9tkvhleA4q_3f7XMQ_N@wKdtJR; z-c}(>j_+oj%ufx&s-y>fZ|`}Wez8}W`Tk9z#p%x`$*UhbfA;?!!|884&M9nBT^_A| g+@Fv4k2!;#)daD=jem|ZFfcH9y85}Sb4q9e05QSClmGw# 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 5b8859443d565c7d1b36f9526b94153a96b12248..317e11b328b3b31011dd83e12714d0e38c285c16 100644 GIT binary patch delta 937 zcmX?5y|;dXBnJ}%1H*)g8D<+5Cou~e8tEDsh8UV#85vs{8)zFCPCmkHiYdC8izS&+ zB`ML|z|6wZMAzIRIZ-zy$s|$N!ZOK3*DNX7!pPLj#4N=yaq~phdn`n$oP3kR9Mh)B zikv4lFXsMZz!K=TZT;lMHhT3;*F0SuLn?0BO!Upa#m3MUFFpH1VlvOhg;(;tjHD(_ z+v>T*EJ!=_s@2;o_7|f4cl+L|oj&*aWxd_G!COCTz4hMhlV#np>dS={jFu)Wmu?*4 z(>!J-;e4QieTi)R%ZrQMt2(PbA20FaagYo7#@OM_boSWotH}&WaURcIrafSMQP1pr zH=ALB+Pe?+R#Sb8rW?0gUkx$Kl)C16{&KZ^(`%K+nY*qFOlM(8S+=1j;HLQJrX4B) z+$R2N*3Z8kC`s;&aF`sd`pCKN<@?@0Ul%u7MbM%C=Y8|I2W$U-ntWzc)T_(ekDhjFn|pl8 zlAQacp7*~W-BXa3x%=s-yqz_datvjZ4GsVAUVi-RG=+jklL`{68LZs3d|N#;edkpP z&x>Xe@IEr5q~`Ai-@5;2{ybyXJS!RY{?NCMf(t<=m8q^hIznG3rzdt@`kL1<#p$1f z!@vG|t*iCBjAw0#uM_MxlK$S+_mU;fL|K(>v*1i2aZ}f?YZr#qA69EWI_X2So|%Nd z_ot+ndkfdSTpwq4tLxR*+lvoy3$mEnXIsrX6MZ=RQcTuS## zIVlD|nR?2OLCdiqu=3%Ly-XKYFWvp^%@l?iZ>49l&##OswyBr0uc`d>`|pVb%gC6Hv8$dWfoH{Up)`M_jy0Vg?QUTaf?%9);xV2{xtN}f=%*D2Q~%n&A!c2T@mGE6&0m=BcSq6lG6Toq-=CBBUVXi*rmwv1v5C03)w65Y+E$gN zMCPoP4+^?gy4TxB%)$Oe>pYu%@ezAHk1(GvTqzJ4u~W{^l|OEO@}!6RlAo{7xuv{$ m=js=;j-8sba_(PqhW35oQw`=SA7Nl%VDNPHb6Mw<&;$U_Xs!|f delta 419 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7e4d7c229123a9c452c5664e56ff823955a47e1b GIT binary patch literal 16346 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4f14e7ac879b5c1ea5a878e0f927f2a48e2553a2 GIT binary patch literal 16328 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 F0RW6{feruw delta 890 zcmbPMzpH-3W@bSHQ(Z%g5JO8VBV#LLLu~`2$w!z?F-13Xu@o|@7$lh{875n%>ROl> zBZ^P$>5*^2Y@=Kb7%3|P_* zEcBSX-$uWFyQhm|NX0Fc)3N!N(-Q*lea&z3c9!xLZ#fn|Ts(pI+QL9i zQBGeEXO9DpKQu(Nsu((yrYf~q+%Va)d6OfzsI2FV+ZO*;C0nomYhy0N?s5I)(hH{z zcV>N?Kl5UdWrWbVvrU&T9A|8qr6rNcg>-`a~$E}mEs*k3Q!{&;DkYISW#d7Vqm zQ*K>{drw{%?M{C<=g>RJFLka)?G=0%b^c7A8QL4}<@M{kNEI*3e#d*xRpOf(pC}!= z%<;P8oWeiWi#&(suLw>px2jVV`FUMX<@&@J*OJaf+;^!spE>sk*VmI=EtKPA0s zuKbDBDyv;x_sO}}^L=!!cM;dHIe(C6PjUhO;q^fQPai}}q^D2X>-A~Rk`wkUlO$a> zbEI#qmOH5P=kkZX!|Q`T7_*oDxcnjOL;pd0L3_g~PgeFNF#WT*!@0xs$MOf)6T@%J zS~6FwbXAUgW3cn~V|Sz8-ZaIBNStV8G75~N>9+%QXcdF9&5(3EVE zZJf8CtmAawkh@{&SlbUU%!{~oN`+(^K zi5p^f{>=-F65X^cW4GH}&Ah2U{Z04I55LrE`^9Bx>eOl9Q~SSPJZvNPG{aCof5peG t2X`z~{Tx-4zQW#KmZtq?*Ozkjs^$jTFU|?Wi@O1TaS?83{1OPi8mCOJD 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 0000000000000000000000000000000000000000..904c9a5bc6c12bcf7577030e52e594be7a08383d GIT binary patch literal 16576 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_s-P%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&Fq(6f1K&>%4hYIJh4rLLucd780_ zadN6jqA5Y6D{>3;QZiGlj8hEE3=L9@b(2h!5_OGIOprwc`Kk6{>wMgB#Z>6v+nIY<_Q z`~nJFBMSqQq}0S@UCYEI6WwGJ6HDDhLj!YN(^N~#ZAW=VY979V6Jiut6>dX{^V3So6N^$E(^KHCwh8eMB7eyzyT=vomvL-R6A?2Mqcp$Q}D z0<~%(O|IaA#N<>vGgDJgPDd9;*Ab9ek(v|Xl9`*DSDcxjXJ=?;qYu`DE`e2JBrc6e z5>Snhs6y&0fvYiyXpoDW9hZ$hxQ7So?SZA>bq=i

0dVc!;^9mO#RRNOCl|hzux* zveDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNo zfk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cb zjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&f zLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4 zM3Q)eiwm)>IyEoFR;gUc-fn}9z%>R228CpgAYTTCDpdxChGqtapZ^&c8eTFmlo~KF zyh>nTu$sZZAf7)d{-_%R1Jf=~7srr_TQ-xTvqd6BT3_o&OfCNQ@|9muXzcT#(sM6E zF1^fKwq^2`ZDn~$DvDD270zmXNe--{TlXeS5KwYq>Qqwt*i<;<%#Q^eMm=mS$7fD& zd||mtb>0s2eibXQmsHe$6km2Cs25|$o&SME7tTCz% zD+T5#pB9PP-53AJlu6;RN84Ko<(Fjw49XLaCC1lZfA??QT?u7-=3Ciap`KP-CMGaF zNWUqy)o}f3mIDj+eTaF*sJ*QuFn*Wh?+Xe3wf7gwD*rCKqP6B`*p)o)ON|#gqniUC z{=UL2=DO5if@ATs7bgz9o_V(ZzV=y}yK%Z^f6Xk-sw?`19^G~l5lxXuJY6E|#!#bf zTwe3#?%#voKWDGM-d@I+A5~ZIvuyA8TaLZbIz1B)&RlX+XH!_I*xsm#+g`u9caZn= zX8XNAQ(s-3eAK*N_w2lN|IO`pZhIlbkTR3)>(T_pO=oT|-)3uTzHQ^>_v=OKWZun_ zv;Y0+;`zC60OGN-?sx1&o(I5{Oi>u#EQ_nW0Nz2(#O%D1G3$;HLYd;RnI_tw>4 zPkJBc3*kEFkbZmDjwVAT2OcJc9b!JA-se2d{{Qp(&Z$RNobwf zTguFN#|xToZoc(}Cm&*}T*&yZ=*q^KlZE1< zes22|+;y`xMlxBYf;(B)Ypd$QsSm8ypZ1)wMtwr6P(#`Wn}o_(w`rOcdZ$D!PD`>V z@NDH#?z#9~-ff!Z;cE@<_X7*g&QMCImu0wjW4p!5#Z^h5GX^|e{an^LB{Ts5Q0#P6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b3898328e95633f4ef7f32127481e85bf7240e6e GIT binary patch literal 16268 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 delta 848 zcmaD}KcRlZW@bSHb6q2o5F;ZiV@oRo6Kw;d$w!z?F-13Xu@o|@7+IJbnOPbp>!z3) zChH~|n;7a^rkN$`rWhw1nHd-xn^;(yY@W~hhJ`4Vlh<>Z^P$>5*^2Y@=Kb7%3|OXc zx80k(-$uW_*VDx@q~eyz`P)T{JQx@P>Ml*;Um3HaLvoM8THozXmmSO%dSh67mMrQ# zJfpCD&8gsh`EuL7{W&;MBUw1Mo#STT<$e3)?Cegh`t|em_5IghugksPcYM(*v&d;r zGOwE4{i!4CFR#>h*~Itrn%BGDzkh%D_rlj!iY|L@%J8vYFO{rMpHr-O&M=V?u6;iS|{55G8SE}gP0Gb(hdz##)3j)x^y zwN+I`vEkF6?%r+fd->M3-pe7Y%Fdd3e}7msJAL`(m#@#OJ~Zi4VrWQ>oKt++q@7oh4(o!`8&oAyX z{$=Phw{_iXiO0u}yZ3xNd)9aV{q&xd=MR6pe7DG|Kz8}f_o_J)OGQ?$>f-UxK9XXAWVQ<{~fB*hHe3-a3%CTqZM6=9UZkJ8A%n(je zY!NWxIXod%QqhG&^RKE~#@48(t{YDpo#g&ozkU1mO*-+XX6!Waob>-#*CHJ;?w*a# znF1`k))k-AOb$|-;qBXF$lwqfdfqJAZ|C!*9`@#gIcC8kuG5}=tmqL~6&JVU-5=vl zrSqQ;eYFyL^y5}ceR8Dln?--QSo?EQZv1p6Ve?A7YZEcAgro{YWU|?YIboFyt=akR{0MTB7 A!vFvP 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 d28101d6dcefd1cafa5ed64836bc0b7c4fd36b30..54fde77b667566fac46f7e3a736e9c22b84903eb 100644 GIT binary patch delta 1033 zcmaD|^Sgm@f+PnM0|Uc^i5X@S6~&osZfvxwWEM0u(lsy)F*LU_G_x``(Kaxge1zE) zizpY%Ltay}q@)x>6H{G7gT$oC>sWOsH?VG0NlQ*OGDuD}(zQ%VGS)RPGO^T6G*3;{ zO-V~hGcigrN=-^J-W|RAva)t^vTjOBmE7EWQ&VSpdgfbL_^GNc2@X1x zpU1F2Gjo==SE8fzqWCyT4h{`*5wUDRi6SAMOs+UKwmDHzo~*2n8r+q}s!0Y0>(kR1 zitOy#TwUizM=1*k#K!B?cYf@6__sg0$JlGRC36HjS2l-wl&GngXq<_$Gbd+nfIma4 zm#4d$nh-mCW2;l!>4K{tr&WD&GrMldG?9aQ0sHO$2I}>EoHK+DRaces@Z{Q9Gdx^e zvpq6mNmG>HCfjK*+p^B2F?zA8o|B7yYo>CTpTU%oL7OR1Uwcltv!YHtbD5J9Ll8TA zt*eVlsZRI#*yUGZgSXlTZa4E>sK`ErhasMob*3m^CR_1ro%|GCF>Y>sVPS>{HntW| zkMaaZ)fvWWiTtKZjXaiV9C%dbwa}WuhK+ldQt=iMjxe@{7X46GRvQiuh742VY8Pi^ z0sh)7fA20wnKoVHCIz)b{(A34w*1#DMEk_l%Q@ttSTzcT44PH@1Oyo3^z{O@xyziK zR)kwE6cE@wGlxN!!?WDNa*nz4M2q8(3)NG&6(d*~jG1rj>3w~49YeL9ZM>e|iR!8v zUfx!JWBv$%-S@Ja4!Z;{({XQ-X0T${4Chu3W92I3npo&m&cVSDs;N;{&&|CeBcQ|I zU%-TY;t`$nbP0l+XkK Dzp*rj delta 466 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 delta 888 zcmbQ#z}Q8KX1RS>*>?~QYWbfd8~iG^$lN;z@w(mUFp%go>%X` z&Ck#1mR7;>t)X_$uZ)Oe3#{ktw+&gjhr9l1XnmhlRI`}LP4`ZZ7qixF*FNwxS|nk~ z`L4M$ABHV|d(&>MMz^Gr)+5pF7QZTg&)?FJIVH?~PMD^&)HEC!6_SIzm*NGCrC#Yt@*`tofXNy?p)tIR1Y2dGF85rSC{Qbo6pk zk(KNm-lbZM^$eW8dDG1Iz4zAKyKB8>lmy%Hd8;{6t!9-~$Eq~yoc(k_(oKS);D5z) z%XzuCm$*foymnsuQqHch?aQuBXgcJ~aJ<=2ck`6xJ5TJtUnjnFheUkFDmI1#Q-6Li zu(q}ItXSiiJMrwygcl2Bx;7o)*q;}FNoS_tx!K1ASqyrbe0R*O-!s4GmU`_a|II4* zWm{G%_Iy~k;ORo1LmwXfndDezz5iy5^lTa5w&023s~mP0ZI4>NAy+MxC-NKvgCh5; zAf2%8-SYb*PMxcIeDda%Rq~o`n|SKNH!ZSiwF+ri^y>MndzU!XwmlTMvqL7n_m}$K zu=UN>g17hW*~_H(dezNL`S|^gwM$uDuVotR3W@JB4Z0lqSM|Qe&PlB|i+8vP{4Bfw oc4z#*zcw=cUXjaee%3RzYL=)NtvmjTfq{X+)78&qol`;+0NrYgJpcdz 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 0000000000000000000000000000000000000000..7f57ab84a208474b2054f0dcdfd7a327e1bedc37 GIT binary patch literal 16291 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 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 7d4b3c7d8685e276509aa9bc4c57273a2686bc1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16364 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 Pp#Ausu6{1-oD!M<{?1P+ 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 10be0abe6d1b66b6f1f04049476029f8ab6a316a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15816 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_sMFnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAccSYnr%o0y)eUyzq>qmK|oQVCC0R?hi3`9;3@DXDhGHu~6vk#vDm znw4i>aYdlP|3=9nP4M8MSE3!1Y)=2zXk)_eKB6No4WtP|(L2W}5M$!eUK_SI^a6w{ns-2ms zsj;bzKDscvj)2UH)SL*H%-qzx;>`R!J3}+59&`z;8Y6LOM3R7NghUlmvkaUEA)-Mp zZgyNY`ry_isAUP3f|p#hVn7{6E8`*Nj#>f<2O`PQ;36`hAj(FA3la`QlB2;zWI#cb zjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&f zLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4 zM3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&S zG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$k04(LhALGChK6PahM)f#7#dzOFq9fFFuY1&V6d9Oz#yJKDgLM% z0|RrIr;B4q#Vwmlx&G3u3Dik0H`6289`iY^n(epxi1}6%63@aTF?(via+;@$PMN{|aQpJxF>jt(%($Gn z?$nhct>@o;t6s|b0p0lXR{Lmgf<&evPIl2cTO??l3 zFtWLL`sFf5zpsj2+kYthlCzf+xp~TEBGX+RAD+a1R?c75Ka%|1D*je9?^-H2?~QZk z&I{ose;C;>KV+PxIy22vt?D~p{=WQzEy}@Oy&rZY3HW{cc;S-3t7&d`FIk*pv(RDF z2&=ub#XKNMZ^{bk;%m)M-X{4@&&*G~Vfxsoon0ek@1DIi4FzGo!XLgWxX=0XtE9Wa z@rWLu!J6-zCii{%x~y@pfrH}X)QlUQYb-7@DINFrTqkXIX!&;`nKLinELj}$PPAi5 zp0a0bj-=qJm4bEu)^yAgw2Yglv}9N1*6dH;<>NQzzqYw;DmYEuStsxJ4~^xQGN-=S z;?;9nsQ&MzC+&+}KYeuc``)(m&km0b_Z`htH|A%?#KvySf6c*qxLc@L(A@Rhs?5G= zlVWswg14K@dy|rBA|$Exazdz3i=WY8McW%3}iw^(!?8-Bd z{I7+%oDId>k8<9NF*~u+PEJ?tZ_F8+o`njxgN@xNALAcSj 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 2caaf9c538f418fbcdacea50a372ec500cb12a10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16416 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_qnj%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&KEjt+vp<%kyOG{m6daTPJWSZeoCsH zv5h`9VXV4b@{>zJ$=We5IkmVXzo-}~l3*FmDKQ;Y6ef|AX$L7bQu32CQ>+k{rX?Ae zTBezs=^7d&Cg~a)rkd#{B_~_zS{j(A8Jid0(!rTcDSjnPO#@m}+F4YGJCIlAL0wo0e>1qHAf9Vxnu2WNBz@ zWN2h&U~U9X8>rfmLJXWYtzfo$x=`eC48t%i@-NCv&&*5AL9!6!mz2yDD^p{G6gR=Cg{Y#4 zcn24}1&Kw)si0!TRtZ+Fz)NaKHiwWl;NrBD>m6F}E8m}8E(@(>a*q{bZ9DidN9IDXN?2@(CMQ83tI4icZJWg@Jc#VkW@K&>S! z|Dw#)yplw4xo2pjk0FK#3yAs%P&t}Y3RZ7!WME)mpl=8wp<0op(X~e6*NQBSt`(s( zG%vHn&IoE7nlO?sP?HYQ-Uu#8Oir~kGc`3fwb4fxM%NLLS&^C(;gXq~npd2epJ!)i z2GxTufmLH9E{#YMP>qnNLh2`gt1*aZkc*ogmyJHSdjsm~fTiGd4y_nahtbM-h`FPd zK*E7Yax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8 zqHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ z;36`hAj(FA3la`Ql6ZrQ3$dp-H7~_hsa(n4Zu05$=L`%C3dtTpz6=aistgPb%?u1b z|1&T&ykuY~HDF+PmB7GYHG_dcJbzOBQ8xw#W?4@c$B>F!3fX`g4^E%CfAZA5W5*wyJoWV4`F*XO3^(`eySjbn z(@U3M-n{wp#*LTPuRp(Z`S!j8=T@${cl_joGv^+hJ@??u*&F*0o?N{2(1ghhcMl(Z zdhznh>o;EBxcTzttrs_LKDl`5-jSnsj~u&q?D)OoC+;0TapSgI z;>y(**KRz&eD(3^vv-dizjx%=mCakPY~FHy)tYn5SDanG{OqdLXIHL1vwYS5wr+;I z$4)#wcj4K^OOH;Uy>sBmjU9U~ZPrxz|bvuM%z)oV}9oxdt1 zlHtM0)3^8RzkT4)%{}|BZQFHm-G-C%7M-5E;Pjk%r)JGPIb+tzY12;4n0bEXs!MCu zFR`*`cy{jm(cXz?=Py3Lbj8V8b572hb7I!KlT&A$oG|6&q-iJmCLHhSJ<&Je^2#-j zPMzsyU}e}-QM)6j=tx`7iQb7PdMAL;#3{#nCmrwTJJHc|yt!?EQR&X~>|MDf69uKZ z7&sY@_Dnk3J>huIgp*yp$D3P^H#8mZ>^{~zXkxh5M@;_SU!Ts;b*nQM0S0Vt;krj+~-3AyG3; ztQii~x9+cQ+TYZ9psi?p^4*2SyGklRN-Ju1H?(ZZEnJ_Nx-v9so`cI|T_c7) z)%Cl}YIc>@>?*6-U0uJYzG-)P<<5fQbuqDPB4f7X>O8VyXtevG5>!V_q**nfuP+DYevB1K5o~iXhd#7dYUhP8S43AHo znyqI%U0rv&yz)d2?up!jOD$|39zN2<%rJqOeY&{BY%QI6CKkK$3vX=NT*bh^(8<8m z&A>EOSaKpePX{wY2O~o(BSRGjLlqZ8I|E}E17kM>V=psD2Lp2z7egfn12e;xoQucR T9Wq~n_V9bU`njxgN@xNAg(a>| 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 a2c1cb9ec56eb23cc80f6d55675eaf90a7df55de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16026 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcrie z(@fG#4J;E)63r7Wz=7!Ni>w{PXqWutQc!O3bg_dJEGhZPnJHEXXPFq87+9JaCg~ca zrCR738m5}*T9}#{=%$()r<$6iBpD`}!7V~E48tP-qRjNnyu=(NH6XvFWTsdprllDr zr&=27CYq<3=q4wdr0H51Czi31*08@ll} z`k=ZXCzA#dQJh#tSu_|VnHZXz8Jp>*rX;88nj4!~>RK3@80cDB7#b!T7$q7Rq@}^4 z87UUgy@-fvZ~((gIinB*11keVD^nv_2?Yr-uqxb!poS+A1u(=^RBgD8PtHipOHWO) z(}(#CCV;MGFvlEm`R!J3}+59&`z;8Y6LO zM3R7NghUlmgBo0VLPUdH-0Zk)^uhfAP@e!S1+Q~x#eh1DR>nij9km1!4n&fp!9`?1 zL6nUK7bF~rBu9gb$bf<<8x1ZNOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8 zqHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ z;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-z za3GSz8(dt7&9|v}DYi=GO7?aE#?8D83=9g%9znhg3{|QO3=Pc;3_t%fFf_bmU???U zV0e|lz+g3lfk8ZfQv6Xj1_q`)PZ!6Kid!+0&t?ldN*w!M|MAJe?l>C`R~Me7rQ)pi zPAd+EEnVC3<%PRuSmb0A6VK#DI=-Hlr%Cb5(qX-;8oT1MjM5>qmevita!x8IRaw&1 zrY~t(Px6_;=T?@?Uvd5z{HoS$p^V zStfJqlF11iB@rU_wgP7x+d69fV*{riRh7SyEI%i)iuu8x2#w= z$Kj@ad!pnj8-=jh(*&X;8D(!Rm~+4=BWi}6v35>+eTMh#m%kt1SUuxJim^n2aBLXM$NLOVS(x*x_>PEdTlV+Ht`fo4 zd{&+voS*(MmO15bD1IxmsMs-MXQ)Ya@SrkWH_KWD*jVd-fT>uq}PzL9!y!EN@m z4HJJfoQaj6bkSgzZT^{(jQ)bf9M(^p-y0Z7RxUVPvL%yq%4A`?f7)eIv(y!Y#DC8h z7T;iJ*>~o$`wyW#%vLrN7ByXnpZY_i^Y>E&u8$lV>L;F=P3YLu{%rQ4=d05f9$ggl z;Oi057vGsyT(>n6O-wI;!=scxJzx%3RbQK#o$m1sk~>^8f$< 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 a2cbd94dc99bad9adce161d273da3cadbbe331e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15548 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_sMFnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAccSYnr%o0y)eUyzq>qmK|oQVCC0R?hi3`9;3@DXDhGHu~6vk#vDm znw4i>aY~6Js+|6T>8v3R*A`=vdu0Tls!^YZ1hn?5zd0>0a*o6 zkckX@FIS3*qAhnR}04c&MfeNbJH zlSzY!C{8S+EEF5m5~eV6;*WxrBlk1y+UI5Y+G_q5y`NimDB_@yQv9 zdFiPscKWac3==@tf<5LSqNq6wmRm7%q7A5Wvhpv=OwB7v1m_+@8+{Bhgv}835un_d zQwmmZZe(C!V4!aZBB5H5rO~xU;@65Sjjk1;Gc+%=#Lft68=5eZE>H~$Dc*w%5|dNy z%uG#Okih0%2cWLBi+M7U(;rsfrA=I7ZNnnCrTOJLO)iAy7r1XLp=s*svx;5-Ns z4RUd_M&Xv4>5Pt5=b}@Nsa~=kpTr!HX2-za3GQ#4K5-B z3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{ z(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS} zkZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$ z5M`sm1qlZt$ND^;waUr&Frsk#C zDwQkQ+fDtV4cgqPkn9oU%fL{j%D~Xj%)s#TKLbOtXyshVJ-O3(=Jc80jXc%n zKkF6Qy38$m;g(RA)uB34%|UB}G#i^{iJ@X^6Jc- zrL4NtCA&9KB4h2vsL%E>N>v`3?sge#J(piLneCgkRjSvm*=@0*lg3h&hrjLCz5ev| zC~H|&>ASF?AN&0ErY{zbYB~D)Ns(oXz?b`eNAL0;mJq0z*Pc1+%&+S^N@uq z#GSjm&Zqy3(!#B7nyxED9z9(<*(R6!nU?3b?XPR<%^bI=UN*THHQ8(FjTp;w)607q z9R*lSPMfa`^U^7Qm0~1Wrz4-5pE~F7SK&8hlmD}5Xe|}tTq-i}`9ll7xevHW57By9 zDc6?B)0Qzy?eEpqd*bcRKF^!CwzuJ3(xiW%IcH6Eys${;#x~n3?!yZUV#RN7d#T^^ zG4~tCOdqz}+dkUxUoX8GE&KREg55Sj_LuLqW$dOMZZqF>>~O>3hQy%52LBX)8#64u W+_l(p(?@ww67+QSb6Mw<&;$TTfIA@o 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 c3f9d53f3103be3fd26015dc619f8f7cb62c188a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15473 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 TxhP%(+MVy|>gTe~DWM4fcaliS 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 ca7d2952ef496d998d52689b2196373590f6becb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16454 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 Po8~=T{an^LB{Ts5Dt;s? 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 9348e24fd08d7790137ba8f66799c6f762f0dc19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16401 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 WG9`@fS{i8IHiM_DpUXO@geCy@o^de% 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 c8530cf9e59f45d0f653ca35d540169be6400695..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15280 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_sN=nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcIJFQ} z6ef|A2`-xo5{rscK{?M>36}NXg&8C#Ku8;K4z@~629;`d$)Jppnqs4mB8qSpL=VU+ zh=NSa=p-%(Ftp>gqdX%u4`0TD7zI{^+mPb?w370~qEyH9)Vva6@;t;;RBhD zL^R07&5p}PAKZupH7LPS@M4Qr45-6sWjw^(QA;4L?LBfGZax}Pz z3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnH zIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O>$l!NrBxxtW@m zVyjfHWN#<9{_P?L1_p&>k04(LhALGChK6PahM)f#7#dzOFq9fFFuY1&V6d9Oz#yJK zDgLM%0|TSGr;B4q#jP`!ZT*=X1sWcno_4_M&fAUO9~Pcgl3_Qj6P5B+$x8I`>1Yj` zwk_G4{I5bIm}Jw+hvbHs>Yz+V@;_zZ0&!uBLOVSoT}g)9Xo$|55XKuu=xnlC>(=*ma&TNxg0c85@?`4LOH;?ZI_n(_awY&_1VIP?P7+pUO+EeT4 L>gTe~DWM4f7DBoC 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 3155328069319b83ca245a607b90a48df6c8d71f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15895 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qlwnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcT=0XE(IlP$Gqg!;*$KLVx&ldWjLqAbW~B8L{6q1q}WKwPtHuSLRe~QmXwrY zXkw~sXpoqsYiO8irkj+UY^iH$V4h}dVw{|6l4xq956ZkbnK+HE$Su%I$xN{_F-$eH zOf^r{H8nIh)=f4rN!3jGc-0eOfgMLHBQB07{m%x=Oc#=KF@>Fl&`OqXI^nh zVqS8pr;8oPJ(-y)RtCw5mKG^S$+`x{DaN{KmL`_E78XY4x+w-JNr{OT#>U1eso;c$ zsvRl#!5Q5OW;@hq;=PKY9m8n1LIf3@Y*Ml0k(=YKo0MiYUTa5IrEPAPO=u zBapZRg`pj{9pxFRdH4z)h*4lwxD6@JPb(=;EJ}4uPt7YKraXk0imDCWct{SwoyjPO zh~mUD%Az|7dx(lkZa($dsS*CfrvSU1Vg!az60z%1D`%`nj{DKQlm%}B9`?nOjY zg98{=_8S_97#LU?npqjb%WX)2fmPu)1T{Q~sFon6qH4o!d~!x&UV3VZoj%NGFadNe zgE{7iD*+(^Lu$-nt#Khn4e6MJ#3yQ*2&*M9%TOCoW6R3FC^I#$BoSQh8QSP$h#}Gp zM12IP9L*^Ot2Z|?FfcICHw2MTt;o{oS|jmmMV3a_iqILFmsw(G1hoxK7)ckXMF?rG z1Q#SGr`nmBni`wh=%Wjx>j=oKNX?0G$;?g7E6&W%vokb<>Oq&lsxcCmMkEQSMo3g4 zbu+-#7(_J4#m$b(MjzZe0`-)@QtRt%`aXk|Ra+)+y);Xoug8eBvM6hzr*a6!U> zNOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C< z1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`Q zlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@ zxFF#`Bsm&fLqG_5gAYrWuw6b2?rucyurnV z*pi%@mtw0_u4HewI#tq%fq_9G*(1o8fuTy3fuW(9f#K(W28M>03=E|P3=FRl7#OT( zFffScPl`Y4#=yXE)zif>q~g|-$+lk1i2`l&Z{Al~ecCC@`XKWRZjDteL{Aun7(#f`14DrngZE_IpfxQ7hTEEe`s+> z;HToErek_*b^fG$nzF82>G{KVYB#w*_}4wGW|++F*R{xSzBOp;wx_F~%Q~loCIH1< BP{#lO 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 4a80b4e7f3830021ec2cbdd60cebda5bf663e5d4..392f2300039e5fc340950d1bcba137b44c3bba31 100644 GIT binary patch delta 555 zcmdm2eW+%`W@bS{LtR6Q5JM9yV{I*c|PkK7NS&6Ue9HY#YMK9CpPcr{$s!r#@RDt@_rk=dPaLs7srr_ zTW2oc^`FEj(e|-B^~c4WDU%ZyoNK+NFm``wzga5JI^lNNj(f&JH9{X884}(+aI&&}Ja=CM z3-5c@3zn0kPK!S+PG0J)o?UzMheCF}>&(+t>JFw;KEF3I&D>O-x}`2<(ZA4bR(2<^ z)ZTn|@`Q0dtH<=7cX6i$n9qS%l_Kx-!RS|EG9`=m~oRqUNXO zgrrRh$~gI&HFDL-wBSR_LUtL+?Pv9Pvh>olq|3|g>%2C;sd##3;osoMze@SvR4gVc z?70|z>MYN)`<^S6W~Sb}G4bl0HKHlnQ*O%6H(!^UdVP2Fj1%6wbPg}BFTc0uRGIgp w&y&tp|974hIq|3K$u-_@);9n4sb^!T+g(0mPE_?x1_lNOPgg&ebxsLQ03%WB%K!iX delta 385 zcmX?9v#)x?W@bSHb6q3D5F=wNV{T5Rc*2$YnF5d5+*S8#aFs&_Bz;W-H+UCpJ71^sFuG#kg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&Fq(6f1(Ch8^` z8mFchC8by<8>fQP2C8>q)f&i!m5hd1QiOx)LqmL9r2>T8Ju& zh-q+9TaZ{(oC+#PY?WXo3A}8EWNZj&11^xP5|crNv|TbNpQonS=%a`toCVPXvI?Rg z6H5dV70MXeaobUzk(!6EoPZbwR)yP;;{3Fd^2DN4$Mn>^5@L!lh^eUB(2a-W0Q7tT z3LQ`kU#vaW@BqJgfViLs?gYEq(6qOmC~ znvr4=-HRa4K!O4sz^KKwp`n!#ytqbEh1(F+@Fb!pftZS_4Y%>h8Hsu6sVR2)FrUE$ z(6tQam?N$PgaizUF^9d9gct>mU-WQ7L_ca247Qkq#3yQ*2&*M9%TOCo`^d__C^I#$ zBoSQh8QSP$h#|rPqCNstj^>nt)teg`7#JAn8-hrvR%B^(t&#Y(B1@xdMd%F8%Pg@o zg4%{AjHCJL#vr0WE^c;QHu~TW4XASimV(zgv|>OVMl0hX=8jqd2?rv{ z(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS} zkZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$ z5M`sm1qlZt$NOCl|hzux*veDpz zgaeV}XmAl3P!MIK!37BiBFWLsqfNH`El;teh?#4h60ycAodawU7ajPBL17#J87l0AZa85pWm85kOx85n;4XJBY} z$-q!*z`*b-fq}tl1_Oh5{-pS$ZVU{JXFXjULn?0Vne6W&QYdoVe)Ef-)z7lR4!P7% zJNh9&q-2G&fQZCYfmoK^mE2Y(T(6#NbY^KUv-@WOxKKFV;_Q^a!58H|lKR*7hlY9TWqN`)W%nut+{@C8|e6DiQ*AGwa&ub{9 zes}dZNp2RTRv#b3hoUHZ{3-qu*>Vu zS(e~r;h2E)+B~nNeP#9pJrS?XDCu1#Km##P2jJ4--9aBAAeJs!F~RM$Sux! z0q?JE_?_EOv-tGhC&7BUB^s`G{e}I{GhcXZClr6?*^hOKyft&%GG-lZ zzVxrc_D8bSv{a98VdF}-^UBTOUN08E+54{J?CPw&*?}=~ANKdZ{LL`4Sx0f!ohl2^ OE^|*;KbLh*2~7ZG0JnJn literal 0 HcmV?d00001 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 7530a161978329abafb8862f7354238039763ce5..e81f6be825e70ce7f164673edf9831549d7d610b 100644 GIT binary patch delta 604 zcmdm8{iSBZW@bS{BV7Z-5CcOiBQq-lGi?LI$w!z?v50c9JXA3^Pctz|OG?r;Ofxgr zH8e~$)3q=$Ow+YAG)Of}Gd4A_NKTu~&zhrbY?)-3Vr-GBn__65sB4yDlB#QAnrfnJ zm||p-l$K_eVq&s+9_w2cViZnZ$7O-VJ+_=DHt*;DW59A-y*g&{ejB}d#zIdQ$B>F! zXD(mNz8oNO{No;uqRUG>clGSb3wV9&)v>R7%RKXUm2S+Pv`jkBXyMV)Lo+%$-u$os z^J~!|pIU+VZv_wL+~>E;KhDteU-EGwbGy?eQT-kFqW@cexD_IE{g}vZ)rA-8UCr9q z{h1ftnsEN3xLEb`ly^4@K9Xy5U(FEWNR{?a&W!dv!`?3 z#u(f^HS_(MlWUq>dNR77hcLumf0B1{SNY-4Y|m#;b!I(3vt8WhkL0B=kKY{*EpNKx zL?!C4Bp<3evT5t1tl!M3pL-TX8kGn+sXLjwx%l;%hz7mT+K{uBCsTXL(j8y)J-{4?4 vw*J#|gST5Rc*2$YnF17WvY>R zqJ^=pWs0epuBEw&fv#neS+cHyiLtSXiMhFvVan!ttZ!L}Q8;-WmjxfHBPLsMp5DBl z`;P&ON64Z3llR-`)idnyba4!+xRvzd|9^XC)ftHr(ih%XJ#=21dAwce?=OB8=?&`= zKL6MC-2Kmg!;HWC&+T|#-&uFKeiBcF#Ew7p^KYK{zqF0_|7ISq|Ic5A|L?zg>bL(E z##SrS|K2=N|I}ZL|Nnly|F`_w`CsiFm%p(0Onk6V^rO9({qy~+mdKI;Vst07Xcgq5uE@ 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 0000000000000000000000000000000000000000..d83edc13c3176dab9239726021a068b8a2fbe868 GIT binary patch literal 16043 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 R7l5{zd%F6$taD0e0swM)tKt9v literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..53c28a458fac98e8e88b878b95cf8c0685ba23dd GIT binary patch literal 16140 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qlOnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcrl;x`Kk#BxV zs-3ZoJ~m;jx?J*;OF_xnF)ul_xFo-*7%7rq8O|v&9aR)2k&|f$DK=8_lQUDS5SAL6 zq?#L>8d~Za8YCv^8XBgW=_Vy7Tk2XGn5P+=7$>KiB%0djgEDVUCW%Iyo2QwWq$MTk z8m5_QdOtCVsOieX6Gd9sRuuM(SO))Sr)U`BAG}ARsGc`7|FfukuG&6%)fyEdM zt2{D6NvaYxhQW0~aB3l{C?ZLL%k+Z8qT*CgiDjz0q_qQTVA($Fk9*+MrhDa}MT#lpl)H!0E5L^n0f z#3;=uInl`2$OsnANU@0SMMPAC0~lT}7=;)aTN#*HnVQ1t1xSE_RpB-SH9U!^vLL3S zYQt@Oaz6nAWCu*4pD`zpwP#aJ~ z%*wwgGc~Uy5nS#W+UR45A<_&)eFUf+%_#+|H#agcFfh5PSSz>1dwGB-eNf)TK2x-a$7bGU9+L@V}8k^eaqYIL?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$NOCl|hzux*veDpzgaeV}XmAl3P!MIK z!37BiBFWLsqfNH`Eljs_Qz z0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+ zqqrn9U2O>$l!NrBxuAG{eVyjfHWN(+pw`?{81A{`cN02WALzOB6LqjtI z!_WT=3=Jfq`+Ir;B4q#jP`!?LDL!MUH=r-pyh9 z{OKeUPwy_#Ow;Ci183DOQX5MI9OrQHnazF>x+^)p z$*)avx;W#=<%L!&S`MF9z3-=0v{FH~q~dV(p8M&QHjD!QmbaYdZJ8Ic*hIu2P;tKe zk86+B=T@BhmNFqA{=s~Ydk;S~h$`RgUbs&|IA878spB#2>iS7iI@@laP??{+qFLgV z!OknPTiy#rEn-=EHrvV1)a!QcrPb#Rf*d!k)Z3J$y>m+YnfFeY;$61fG@7DzTl0y^ zornVuy@cHswdQo3;9zzTP@@{kYKM#@A^Huht#O*vp%|xoys?BBiw+g)g6b!j}E>_qQ!_u@5u!--|Y-_9bgP5wDDX p=(4ip^RawezImK6Cyf8fGQ5)AeO);_<}GNyx~Hq3%Q~loCIF{5#%BNk literal 0 HcmV?d00001 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 843a699c9908730bfb710243fca0dfe0f461c4f8..4087a5ae5c5369d426ad0c82de4c0cec345d18ba 100644 GIT binary patch delta 614 zcmdmAeWhlCC1d_Zt4d};LnB=S!w>^QD`O)oLqlx?!^uaOO|gh_v7EL_Ovz75wMxlP z&P=f?$jC3rFV4s>urfDKGcid^O42nW5B`^bSGi*VjI1B#&}N`$B>F!M<$>3dYvH9Hs5o9P3EjCKb$$11{`#? zoc{RO(VYy_k4s-zdauD-Tu-#*@zx6FN0!{2MSRPr^{Xs9yF+00C9S58&2wgcPkff@ z7BcmG%W?I`*^Ekyls>)dduF?F>$GK=0)nBTKR>W2Eowf<5UR>^IP#ry!*aLhGL!31 zvLy3dyJfC;PpNSA)k8mIZQgI3vrN-bz(9uYx#Fs>Rg+R?9xGfkS0m8ja!%~ycU|9p z*RrNnp8sre(x~>*SsxxN*>`gmmng5mJ&z004=ZPWzw529C^DqS@Nmn;{BHEWP-1ldheC{`;fm$L+O95@2tEN&ko+({84{?=JPKy z4c&KZ|HZ^=IZR6J`7|e9J$*gj%MZ`5**u7z_cD<|=ydnN&?MF{j96 zRn{;SOH&KuG&2(mT~qUvL|qd@lT_U#%T!BUfcGhXN#8_iqa_JQgJ+aI=Q# zxSyS4a*dGN9G{v-y?wlflQtNBWKl5)O6~|#`ugo&xBX;k6_d0+n*PkKK`#@)rj zMUVZ}d)~e>*|x>Yea?vg^PD?-h4{N)#oJmfX7Vkmt!%u;9rDrf*EFHn^0}8dy!KDl z%};-_Iy^;p&iu-rW8Z_M9;W9W{JPP#FLeG2r^HWDl`IX@4>p%r9gkQ$V|kl}-yAQ+ ztl)&+^O+ZvuGD=MJM>J{adD%z*!jyLSr5biK0khDM*h3J$p!k&^_yDHGR(}3{4n9~ SHzNiH1_n=8KbLh*2~7aZy{13_ 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 5f104d585f33eacde0760974addae6b5374557d3..03ba9bfabc4399783bc6c71df5361e833a5c9571 100644 GIT binary patch delta 622 zcmdm6-BP<@Gqa$fk*c0@nEfKuYz`f%GgHV8rvOd>4wu>BGN*TSGv9~1n zb1&Qfygk{iSt_2dYDUVWpHGWtoaAuWv+T%kwmz$JG zSTo{(d9=A%Zc~YtG(T-9`o6;6pQ--LnnT;0Ij%O%Zw{KVD>dNk&dC1kH4=+$xON<4 z+hG&^ynMUQVxfob+TF4K1$nP>()Z5z>1uNQ?%X>jjg_sFz2@u}myWPBfB8Zr++FkB zYQ76azj8k54B&3B7tBvo~#rA{pI zIr>2}W7Xu>Z}x`oa9c9vkfn~t(K#8fSZ2L?^6ibI)C1pnFaI+fHE3?Wwq)~W1_lNO MPgg&ebxsLQ05Tr`jsO4v delta 385 zcmZpv-CMn3Gqa$9xvr66h>@|CvALD0k+y-+|c$WS-M&@3s{&^*n;!Ypa?eAYKCM5&y-p39sM)ftnmI8Sfh z&;7@M<=zIJ+mrX(=+!gq@^om)jqTHVBZcg^#e*{HL5 z;&a7GR}TM8Ox!Nt$XT&(o5v;QM>7;`^b5YIU-0B^WwgIguy?J%oRl5+0vWblW{&Jm z_;tWQ^@gAPHMgckW(R5>1?3(xa243x`*P1QKAz(?B}xg)u3UT>_92kHDPmd8R+s;# ePZw45GfZ3l{r{Y-tX~Wa3=E#GelF{r5}E*{k(Q|d 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 0000000000000000000000000000000000000000..ae09fc4a16db91d60f5469f28d6a5e856ed650c0 GIT binary patch literal 16254 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_oQ>%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&@sr`(^K^e^3rYe5rRl6;i<~XIX@@A$TvSF z)y~*PADb{%T`u{_rJ!W(n3tSdT#{c@j1)<*4Cj=Xjw%Y1$jP*W6dNh|$(bou2usb) z(@ad#l9F@{)6C3u4GmMxbS+E_({wEj4N?u$j7<$JlGAMTL76uvlSHEvElo@flgyKJ z4Gj{LAVw!8CtK=T8knaUn;0jjnk1T%X>@XOT2h*!Su)6IOOlL+Scn=<$dQ0AltGEt z*VoE3uec;JFFDoI#jYZ^Krb^h#mdAm(Za+u$yhhlG$~m()!ZaiH_0%?L^sXEFgeA* z)F8#c7?PqgZiABY!pu*5r304}y>laAj1R-s}g{oCzGN_`lO9quy zsVO%4D53~wLG*yEf+)zuj85W$07E-&JIXUs^YE2*5Tn4Va2rybpH@vobY>RXLCV1FOPq2x@o|Q5!-`Mb(De z_~eYly!6x*JAIhXU;^k`26N02R~|wFhQye|UeQC08qzTbiBHrr5mwG(mZ3JFHXf+_ zP0cGw1ebe;Hu@N1h%^IH9|0;yb4tPL&5aBU3=H%QK_pZwvNXEZNc>unrO~w_bcW_- zme?6VZ9@}A(gkXWLRv||1&PV2c4nrg#-=v<=)&ka0x~O7b0S-gO8*nuS5e;&2v*WVS2Y1Rq9W<~Myw0H&1L`nZ84odc)DlQI z5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q z(cprF1Ciuta1j|$5M`sm1qlZt$ zNOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C< z1{6fuXmCNofk+Z>aB(4aLZ{}X*eaDP+1o{Zl`>&qU{FZ*2=ZlMs8VHMXlQ0&`1zlK zq2VP1L#Y7+!>a@a2CEqi4C48d;*Yv9FfbnVba4!+xOL|8dGE`GGRHrjx4*Em`|c}& z)(1;h9K3E|{NlLyqD7uAe$i%srHw!xmU&3Ik-8Q zay7kJ;C5o$`|qEBo_qH2=1PTSAtfsgOUF&W{`f=Fc7`MO=ls~;_+wp^+U@TNORN9O zR9t>`%xm6Zzc}T)c^f`dJo(<3e*C-Pe=T1_;lpOXH@?6B@NS^_Ifp0L4|J>bIvE{2 zbo~37<#LJlUpVuz&g}dl8Mkd#Me8<`2_JWA`YqF_JrPtj^TF#Y5=R4tD=mEz4Gv82 zb92kuGJk@6V$EZ-Pv6%CpE;tDI%!H!vWBtGLnrl5HRf3#crO2|va9|!>4I4>o6X8w zrv#4oHmsHZ0Yp&bYPQAJA@RL5%#8TPBXAS4FuZzuFzxLS0(v2Dn z9GfpGhg=aj=it(lzv4;eS-!UGA;QsH<=n3y{r+jv0sG2j`OFNPFI_yjisxrCXotL~ LtDnm{r-UW|<39Gi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cea52ca9139af0d86d6a1fd62b0248f2c9dcd94a GIT binary patch literal 16050 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fa9f3001d03bcfa4512867c35348b0a1c3374f6c GIT binary patch literal 16093 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 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 76a8cdafa41afdc423668c5465ba3b06043e3f56..35770593a4435ed5dc8dd76a30cc688d8ccf08c9 100644 GIT binary patch delta 653 zcmdl`zpZY9BnKM<1B3kM|A`Y7#hGl4H(FIP3mO{f8W@Hc7+RSaSs9pX8yHSL!fYyt zA-b81rHpZM0vFe0eO7T5bMrJ4leDBHUBfgpb6rEjR5M)*6T>uJOGATH!!%=41B>Le z$rCulCO5E#sTi4?7#pTq80e;@Bw6TM7@3&pT9~96=o%y%nwlr2C8n9Bq;CGj`i6xl zm6HQF%`u%fS&*ZCvMx8*=G)xXhAe3lioZ>kvem0+to3wp45_$v=CZASaG}i6kCV4F zZQXjuyZU#*?I5nT6Pi|RHGeCgx7N9NTDzK*f?`&p#zYr3;bfU+^oR3ZG~;I@dAgr z=K20Fx85uM@pex8;?E^kwpu&2-n#XNY->~b#WZQfPw6esx83|%bL>dP+|0|V-(E^B z-P8YCN+@sc#79OeU7GhDIDOW3&oe%KtNAZxl-ua(2hNL8o;K(B$@(8Wy#7KPk8!Yc z|7ASssI}pq^}^%8Ff-;weV<~p7q=g2id+eT^X*Mdo*Ybs_&tnxZE*MUoj>-g7ThJY*c0xwlL vT{7aivu$G6{pN)QG4_5x-_L(3R>hDIllf%dbtz8<1_lOCS3j3^P6eVv^dAc};RNP`Ycyrnu4F-mQ|Nomm zP4O&Rc6s?^uiUJa3QE>YOiD|y`FxsG&An8lBICJ?lLtqmz^h$+$vy0@?#_iQ{I}yu zY6Ww3ITeqZ_$J-?{eQtmuWnCvvp47WT+WmCtB&iR^R2Rnt?Fv3dvJ+2hvKn}-6tgVr*O#Z zulxU>-TqtUncLfb*Uf!tcDpsn{H0|}!dhN4w@FKp&(FMgwJ-UwW&IsBzqtZTSJv%Xb=$u>=ik1P z@1kbhYo@RJw1DfWwZ6vEIhj2-p1y986Jk8PGo?rPh~rYtf**@G#Ew}UJMz_qizBfz z@w)Ku?~{N1aGzuU;%$$E@-O2|`(N)`epMZiP;Qy!&aU{!nt@e&>6#ellUEoR7#KWV L{an^LB{Ts5E&F7p 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 6ae2fbb5224060a9b77e45558130bd56b4fb776b..d84b6b958dd31ea220ba8c7f2ad73746436336bb 100644 GIT binary patch delta 658 zcmaD*`@VL9BnKM<1B3kM|A`Y7B^YmPw5ntlG&IsRFbpv;v@$WaGBD9LFr0jZ*%XT? z7t2ExbMrJ4leDBHUBfgpb6rEjR5M)*6T>uJOGATH!!%=41B>Le$?rK8CSPG$u3}l+rLR8C&cWsb#Fwwxz6 z@8|wwz_Rn>r#X}N+vwL%^mK6yskn9KvSa=w28m-I>)3cZ{R9hTBQEnD%gB@nl2Axq zQ{vHB+T!VS+`w(o%^=|Yn;h|#w|BCoa5O>gIda zj~rc+*)(>=dzA8ZN{O9b=BzPORpPwzvij3Dv1bM2v?ojVysVqAB=t5@VU}5B#7&i? z8!T}dHd9KU1WE4ZxTA7$y85(LE7)?IHY>Gvc zi{;^Ddp5PnIjmVKmKJ8oMrJ9Ax+bZnDY}*hCg!?{7AB^;rlyu@Nk*n-Y351En}4ys zVIfN8H>)DIcvEkZh-2o_j4YFxlKYc#|0V@^{>eDHL{#^S`?Gz;?|zpUigKO*H0SWn z>60ZsC#x|{RxLi(v@ye^=cu{Vu^vOw8N6qv`KY@I-#w^Z<<$Q|bngQ3j|zPEZwRdP z=>2)*2Me=Fle@&uu1dPUC{Z+=!ICOc8;bmzr}x}N$Y`Gp!m8>Me{=U7Yo370Bc z&anFO7rkBM{!KY{iq-NYjk=Dy)ES&2s=FI~zRW3GB75?P zqe^c|qf$Y5QCyMbv)H6H3mAWOy;GJvr4(DzR5aybt3=4hMfq2RlW%GsDSYCQ;%7Xm zJ1^zb(YCp{%iqqi3Rg96d_8HiL*S*=TDprLdkE() z(w(wcZkOBlB$c+%Juj?XPsV&*dL?r8HKnRYE<8ud4OgrR&sxrLM$PSPMZ8fg?~NHo qX+5(7&7bw|3Y0ev6rAzLnnBbrzdBL;iXQ_51B0ilpUXO@geCxl2pKd0 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 f7f091ab6b57668223a1efe5d9e17402b55c4024..4d64390df14c450c7218caf8e70ba8fdfe5210b9 100644 GIT binary patch delta 645 zcmX?AJEwNTW@bS{BV7Z-5CcOi6JskABW(l2$w!z?v50c9JXA3^Pctz|OG?r;Ofxgr zH8e~$)3q=$Ow+YAG)Of}Gd4A_NKTu~&zhrRk!)y@Vw{?!Ym{PcshenKlBSzvkYc23 zY+{g_m~3fck(!dUc|PkK7NS&6Ue9HY#YMK9CpPcr{$s#Ww81uN@_rlr`k9_Cjv*Dd z&RpJ~EnFyZ{Nr!^t`&l=D};EKmb~7t;Kz6Fu62iVmtRsl+gbsU%WJ3kL|M(6ZDsLN zr6Y5Jh<@he-&23zyZin3-uHJ+ohz+Fqk;koFFa&Ef0%jw!-thR2Y$_t_%FY}_35+B zIe}B}9aK%Jdwjm}!2YIlWgK^Q@3<#Z9~Dw3&vAJ5lb>p?Hy0Y*&iFb>V`bnRoqtjm zpH{CZnYrkPL*y-wn}=qIxo-3lxj)P4oawn0Z9(rX?Cz*=1+B=6_~8Tq8Vrzq+CShexV^3K}&JNXDp(@NUUT z-jrLmmk1X;u$y2x*927g3ZC7^28zT6-tdiv%00+X5s^9c8sx<;FuujLBebUU@Z;+}2WyHvHMxv?BR zUbl;WZU6Zzmu>15!&j_UvFd`SdlqZ`{iiee(l$MobB0QjFKydZ&8<<~9&)|oQDoQT mqraDL-t7MM{rs258Q9a9AGxI8f5^bVz~JfX=d#Wzp$P!gJQY#^ delta 669 zcmbPJd#ZNBW@bSHQ(Z&T5CcOiBTFk|Gi?K-$w!z?v50c9JmgKZG%+B!d8(;pqM31`+2;AIZ&-*@ zIe9&oIUlN{CR=fy-n^gtj{%Dx!-vU}_uJ^#ANO=|45_$vWU_U3NT5ioIcM0;WgLqx zy0KVuyKdO9MU+Ke;7XE|NPF*b92rsWgK8vTT*aPYyZ)EZ?>{d_!@Cdc0<(7aMs-l*$OU4^f$LR}Z#-%t~&uR~49ZY(=|7 z=%E)vZhIF@y|ZxTI^ovqKOQ|*u-mk$FIFI^+}!Q{(z$jAS9to=^oP}So5&pGXY)L) zcyA?lit*he#d`zZH5G~ftaH34V$FHkeaj(jlgEOaju}MO8~F+GOn8~RME=`?dAUke zc@J5fL+&Q-`;{JWvG9{R>qc&;X?~Mbw}0GgCpPJ`&e?YgHMh=gKP6T&Jnld1uh7rJOuc(wbhWPfzJ~8taO`!Szu)u!*fF^5cYX83EAc7= P0|SGntDnm{r-UW|N8lI0 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 0000000000000000000000000000000000000000..e23f882b3be55627292e5e1f81e91f4b999cfdca GIT binary patch literal 15982 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qnj%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&gF8Rr&pk(csmz-K$l3!Ge6iKiQ=aiU^DhiXx$+UwM8!7q8nJHEXOU=#G zOia>}l5`Ez%*=HS4O7i@Eldp4bS(`HQVr9LO${uP(`@uXnKvgB)o6$)s*T9r!RKC3 zGVt}a^2{qPNz6-5^>neT$Su&z%uKOLGBGnxHa1DtwMwibC^X)hGAIbUzC}inU|P@qz2@dl*|+>%Va|nOG{%*T?;c43thux6ARtMG~-m= zG>a5N)6`UBqogDYm=#!z!LZ6B6BO^2Xwd+Qo8Z(!R8d5{gA3k*#G>La|tMPKrxh)NkK#uCzeqb4d!M> ziKZ#$$+`x~mPWdkrl4G9Y+_d!ouPS|C3Z$o+t7rObb*?5koHD! zL1J>Motderv8jzdx-hzqfXs^2oCuf9+|<0{%=|n%Lo=uzbP22)BXMa&l7MQ2L={p$ z0bGqiM1x%1?6_?7!QC5BR|hNwuXAX{fI5s;#zV{(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L? zLBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAdHE{-7;x6WMl&A;rx(DIP=s!|A}_S8vcoGY*O$?E^>NM3)vQ?qOX zgK8G{TB-m4_kSvScts@S2qRzd%)`aA1RH+L?)WcVq5A7fOYhC{dbSz0>gU*txBToo zmp`NL-sgpuHv9&^&lR<^R+hH!tV)>q-r%P0w2HHv8-A`>l*2dWHgjcVbKd&SNB%0V z-TB!*;s2#9wz5t6%KZA9Ls{wBSC9Eb%}<={Qn)c;#rZk&S!_7J#O+zQ=AEWl`I4)B zDW9jt)I0Z?7R@sHC>HY6_F#^$g_b4Tk?3hz?h#vBcBzKNbL`bEn)7hyteIRNl6)Vn zk^FXFmRbKO=e}qG9c`!miZNR%HZ#3kW)bHj@brg~qp#_v`SQ%mR_iLV+%rgDx@|{Z zld#JP1E;g54^ta=ov{#QR+`zpoFQ>nRK%j=Gi?>)Of+^Xe({c3S-6a|FE(LU)E_Z} zSlu)Gyq{VmKU`C&7j*88p?&qoimCtq`Pj2DJecnPwPTv32WUsQr>mdKI;Vst06|KG AxBvhE literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7f1a8c8512d21d5a0319c8a60230b287b7f19a80 GIT binary patch literal 16396 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s;PnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcglCEKznYpf^VXB#~g^6LBuBD+ts$rV3sewgunvFgv^X6odXmp~biK$_dd6KT7 zL1Gfb=%nOiOI=F?^E6`<`5J(+r?S zn_C#`rX*S>nIA(W{Q=GVXB#Bs(GresiC>CZnA+%s&0}&YO1c8 zp|Po9ifK}+aVm}=fLMVVpU8;?UupnlGGAXS&%EN2#JuEGPZv9odon@pNlQ*lH8wNT zO-@ZU(Y3HNG15&;Nln%@F*h+bH8w~#HZo5I=R8#HNa+z=@>#)b_jJLLtdfZeMGV6* zEb=ePOwY_q%t5jcLnwuG$=o(n2rs$>^m>B9>nkAa)8mE~Wn^_nc8zq{V z!Tf^77!0dCGC{ej5;c*7tHa>bLR3*it^!wU1&Kw)sh~pJRtZ*W!|OpvAqpXFz=gk6 zVlt>gv`Yq+si`S8`Y56ZXF>FUtb!=W#Eeejf&fE1Zac~|QuFYY$q=K!s&E@poS#-w zo>-LXn4X$fLQHi5F%?xCy77?wfV&K$AR>wr%P5NmQ$tHbv*ct8-L#}M6WtUG6EoeU zL`xIh)HD;LG^6B1BV!{YSTrNWBDxn5Q4J1Yc-3eWVq|P(U}j}%3ac6+0R~ou+Yr?7 zB%;=an2M?mxADmtiFxU%DR%lWpTPvswG8H%Ga;%xgaizUF^9cD0x@bx#~dU+QOiVF zIg43_+JM@kR{lkqsd*)d;BwENkBD1q6(=O2Cl{+qCqZhc3d|4;LancBMFv**EzIe zKpjRa<00mbS^^0NBFWLsqf zNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlW zh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=G zgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuh zl#K=#Bpiq&M}v#VfPyF+4K7GH5J}<xWwew*TDpEc=gwCU@?>KLsbUZaib(>bm2i=aI1IY3}Fz zgs(6Csq*s@-|buc?Pq1|_SNsSuB}0w(9!s=?onIg&vkMr{a|!V`sP30n|3E}e{slT>B+cqqFXt~NAia0jhXL-B+pbG-P#~Icb4#RCiioy zVr_OClp}9u{5~juRzs}TIGpM7+Osli&no2KoRGHMLeBj0pPYl4rVkCmmG@~ngikrq z>X2L{aBgQ}-_pz{-|zqY8hGBzUzXjTeZpEdGwaC{c3I81Fl~|k=>xn1vx{!TOQpZ| zwysWQ`?g;y^7UHBOtz;QAHE-#; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ed999d792183b7e91ee8f07a02f73408ebba8362 GIT binary patch literal 16150 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qlOnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAchEVTggDm5G^^k%_i}A>0fk zmFQ-qmL#SmmLw8o3bI-xb5fG6((;RP6HDwea}(23^$YUSZS)a>NGjo}%E~!EC%?!y zKPA=9*hU|lFjieI`N^fAWbK%joLXFxUsQ|~Nw5s(l$eex3X{mmw1X5IDf!8nDOLze z&CSzHOwy8)bPdzY%ykV7Q_XZOObpX>Ee#D)4bzNG4J?w=Z1h2yHz$)sqZ2JnObwIF zlXMLY5|bcCCnYCa>RK9@rx}|VC#RYunqoH^B8uu6ucqiS6q^qmz?V9 zVpow{pqH7MVwGlUX=-Y2nWAfHo|vkeXklWmo0M#5pqpftXl`MeWR#X>X#!4msM?Vt z1Dx%xV77a@;0ROVJdR-)hDH8GndzB%i8)9Xg8Y(_nPO#RVPKM!nwYF>nV4jvn`~lY zshenMV6JPLYH69AVrpq%W}XW33l?KAtn$bNC816@NCV@s3Nq(q}cV^df(BgG=R7ZFhn4q()J!O+mk z2wpEh0t~DQw;`zENko+eF%?xCZsU_P67$kiQ|$C%K7$FMYZ=TjM_hRb2^bP%4ts43 zF=|N193(zb%S2c?i&=)+fEr>}{zaLoc_oS9a?j94A43e0W+3V#K;>voDOkO^k%57M zfxaP#gla{WM%NmNUn{aSx>khF(7enNJ0qxVXu?RkK&?ecQzp0|F*()F%+wT=)6s>| zbp&Kqq~=7pWag&k6=&w>*%_MI=!5m3OJLO)iAy7r1XLp=s*t)M;A#va8sy?;$7Q1r z?m2;aQD7-}okJ@I)M2zT9%AmOC6I6+k{k^#A_EGdY&5ta;Xoug8eBvM6hzr*a6!U> zNOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C< z1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`Q zlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@ zxFF#`Bsm&fL_0a$K*nZ10U~emJ1xeG26=E_#Nw|nJ1S_zu}_1%}96V`Xsd|k4(NmmsE2_ zZ7ma@h21N9!a5W=n-u;nbXa+Ur`+RaVp0W%vd69;?9*#(S(`~1mi zmG3>3xPss2g)M)5^T)N*X&(&tvt`|oIFtU)lV@L6>$RN9`h-WzoGczZ^c&d(O_NJRwf_98nE$~?cwsu%>AT`H*Kadg6eU@tYV^+L z_wdnuMfA8>Mzy0NJ48JxlcAl>< RbqKU`-P6_2Wt~$(69CHx!{7h_ literal 0 HcmV?d00001 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 9e1616ae5573d19e37a9f5963a60632b8bf62a39..b3784ff56e32aa9b01802c3b0cf8cac688997637 100644 GIT binary patch delta 471 zcmeCJeqX&|Gqa$fk*Nz}D8HaF2V zHZwJ{v`92hGdD}wJfHOq3sEX3ujewy;v!ql6Px#Q|1n_kEN5e$yx&H@{*9-LV@SoV zGne<~H5*8@K3wlCD)8{UM2@zCg70jTNy~M1vb_7>c8@PtVBrO?x04>~Y&)0yda`cA zAN5Z+8afn|{%{HihUA@i^v6AAYt5_kKbn_s(`_|deIjXRsqViAnX%nh`?QQZY;={n zpPqhsXruL_AlHSwVb*4j9%3r@C+w~-dR}$zu66!d?N+V*K?^^3X?S*SpZ|G=lJbHe z*Zk^l+m;8YhHhPap-sc{Cd2rgq`3L`~eV&}3ee3G}{mtT=#oyZo`|OT-_VoA@&;$SttGVU? delta 336 zcmaD~-CMn3Gqa$9xvr66h>@|CvALCrxwe7P^UH)2r=HqV@Zkt^zO(`&gdgrP9N+8Iq~kg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&@sr`(^K^e^3rYe5rRl6;i<~XIX@@A$TvSF z)y~*PADb{%T`u{_rJ!W(n3tSdT#{c@j1)<*4Cj=Xjw%Y1$jP*W6dNh|$(bou2usb) z(@ad#l9F@{)6C3u4GmMxbS+E_({wEj4N?u$j7<$JlGAMTL76uv6V+&lD5{Of-ofWy zP%`lKwerj>E=kNwPW5!LtH>?T%gju%GB-6#G&VC&(M?LRNYphmFfr9lGEGj?wMa6u zG&M~&Of$7K1*Z*E?MNX8&YM;++dW-yc-+LmIL*}5&`{UVATb%@@ucKrOI=F?^E6`< z1IyG@b2DQTT?5P16x|d96GL4~vqUpp z<1|xaGYcbQqeL?^m|w6MgJG3NCMe!3(V_tqH^HfesG^8?2N%2riABY!pkl>V30AJa zOKM0qhmbbl;>jv88B}E3C4+K(YKo0MiYUTa5IrEPAPO=uqm#HGz|fA{j`EDuJba}F z#3-;T+=dkAr z4b761Ep*e8(oA$yEKJOFlM*dWbW_tzjM9vf6OD|Gj9}4>6pQFy1bGG$6yN}c7v4r8 zM#feKW>%)Au)-Tj6>dXN!;^@51!5|yHr&Q1XC&sOr>5BH!+Zu4K-V&uV~)7;5E3vX z#vJx46JiuNe$m4T5&fu9FxX-a5}&ALBCMRnEJJNTttBh}qRiC1l0LH8nQ1(MK0X*Ab9ek(v|Xl9`*DSDcxjXJ=>z)q^g9RbwPBjYtwujgY89 z>L-A!F^Fi8i<=#njXt=01M2F4rQmfAtr$>;(aLy;xucdq!huL~G`NTiD2TGr;DUq$ zk>qG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+ z4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz z3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWL(bV> zbJxv%d(3Tn>ekl|$GZ81<}CX7;^^t?%@>bM`60w#Rl&Fa$;Io|I%9iOYfMl zX^yV$N6qjb#S7GzR<8Hh6BC{G>YMI5bMF28JZmb|?ka^ZkDg;U`Qv6uxz$R)w*Jn3 zut)FHL48BXm3wZTE4Zmu^x)ac?ejMn)~Xkt% zJ>+Xk-=wy7gL#H}V^LvOUXH=8np2_S&zGz#u(-sL)cc}zW>v)DSG#6x^LuqrhjT&f z%;!f>@&&Fi&dd7oSZjAOd;W_HoVKR|o4uYSzrDTW*(Fbf{Wa6;;*kx-kgct1D~C=bofF**Mij o_4KYipZ5L;elXwW@^nUqNj*Pap7v2t0&N-hboFyt=akR{0M5dlZ~y=R literal 0 HcmV?d00001 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 4d9e89cb890fdfbca7ec76540ee13c537be99fa7..26ece65600f00aa25bb4291831e40acb96ac887f 100644 GIT binary patch delta 613 zcmdl|{kvwvW@bS{BV7Z-5CcOiQv)jlBW(l2$w!z?v50c9JXA3^Pctz|OG?r;Ofxgr zH8e~$)3q=$Ow+YAG)Of}Gd4A_NKTu~&zhrRkd$bcY;0hln{1L~s+(qLlBAnxX_BIA zXlapRYG`g^Zf2agc|PkK7NS&6Ue9HY#YMK9CpPcr{$s#mSz>l#@_rk=dd3P*7srr_ zTW2oc_P@m-a{S|GgXuG`TstSIpINZvMAQK%&Je4K52Sb$*z(s38u|z?UZhw3=^Oi- z%KsnB^}7QvrrwnM@^H@|IXg>BamFY0UUB9NIu>+(@NZbU|G5>9W&SnK)l#7M(u zkIU8v7^J_nth6c?TkFzgF!|{L?ZTLEFMr8-cSbH^75A51zMzMf+1~%RP`IgB=v>~* zOWs$@gw%ZdD>QMkVpKuqS&0|@+deY9NcWl)V)|&6oAtZ}YmRd~-(2%&Zf%$;TkoyU z(JyZ9+gTe~DWM4f DR&e=- delta 376 zcmexev!!~&W@bSHb6q3D5F=wNV{T5Rc*2$YnDo)u}O+a zQevWRs;N=3u1T_qg|4N6ahk5Bxk;*tsj<0Ps+q;+`K)hPh*CLuJ(oEjsxu~Aah~41 zpZkvi%NrZT6_fYd=+!f9^mK6yskrsz(nhW(2Zm#X@=BAI*zEON!yOX98SJIiB(+55 zlxEH<-AxV|uO`0d-4}Oo_1d=lzr6DGtPP*ePLXGGS}r1|&$7K(k#~)nso7@nX`a0n zD<1IqO<-E~Pd4+%ksB)ode#-Z<<>ZPQNrVow9FVdQ&MBb@0Ch%+z5oCK 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 0000000000000000000000000000000000000000..caa1904e39ec2ae73f876db4752f3f7f8a5dcc15 GIT binary patch literal 16128 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 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 db9febcf37ea443d0813a3c33ee2f767e874ed26..16f6c77fdf1ec22633568b251477de5fb604bfe6 100644 GIT binary patch delta 674 zcmbPL(^a=&Gqa$fk*}l5`Ez z%*=HS4O7i@Eldp4bS(`HQVr9LO${uP(g5S!e<8m3~BVriL_mTaVJW}IxUo1AE3 zp=)7cW~^&!nrfMpl46l)o@}uB7wa1qqEt=};55f{)?`7B`pNv9T$^umTN|<{W!>za zEM==#&$!0Z#WAGf)|tz9y@MGgj(>c9=Z7HH0{(=6SeMiJI#H2q#!#|Dlg4q zQR+^a|0i1eQqQ$_X>3>^w1^-Z7ruHs;r!oL~Iw`}r@$4CYx=wchog SFlAt1VDNPHb6Mw<&;$Tc2pwYp delta 407 zcmeCGn^m)6Gqa$9xvr66h>@|CvALCrg|>mw3!|yx>LF z>W9(whmXfIE~qhn+RivT@FG`jV(v93DT%c7o_Xawa;$Iua83R-fvKw9_LpnlySGe} z)i?CX^lp&RWW8nG<~MI)aHW@{MC-(37n*gK*j)(YeqqCu$av+c%q8`#dCgTmj*~c6 zy*|NgdY-w{`Nf=r95ppp98-FVdQ&MBb@ E0CF9c5C8xG 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 92d3cbf31b0f1a7e1001740043efec3635c64d5a..de3f26bddc399d7e2f3e1efdd3590ce1d70f0b25 100644 GIT binary patch delta 661 zcmbPL(^EUalCgH9RVA~ap^>hEVTggDm8q$fk%hK_;p8LCrdUL|SRSgFo2QwWq$MTk z8m5_<>lzxSn(11Y7^dl38XBY;rWuhCxq&rICDk%9B{|8$NY}#LEJ-&d z%_L1XG0h@T*Vxj)B+bIeFfBF7bn-7&SKhQF15?X1b2D8-gT$oGK5VmCh|?RuX^zF6 zf*kde`8l~Z-{!V9WVx`*PJXhKtzJE2r>Bc!NX4x)m;L>36)+t8cz^aR_Q{sL&L>aE zEZ}hx`T3Yd^k~r0iHzHVz2RtRnQm?!>y&-u4!WxoYVmoD$BPm;B~ zUSA~>;XftwUHQ+n*iWxtiQO)+xORT!p8q~NL9z~VEov{fY~fp1da^%n{`_~mvX7aT z798okwPa=718Hs}5e}bUmX~vHEpy)fE@8EqY2@az7C()7Ja5OFXTDjk-8o-`Z=Ymq^^tsA-+WTqzeJ#eg=@*P&o7=@*`7YS zCeovj+4A0kDV8b5D+T6oY@WK}LA9V1%aa)IJyIV7C-MD=FbOE*@yd?B@Ps)ev%eO`|EDoNSpic|NNvs`kwvS!b~jr*}Pkg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&Fq(6f1rka@~=_Z;aC+Vh` zCK^~686>8d7$<|%2C8Bwe6J9HfO2T#%TYYG-C@3d-r|!st2zGAmMZB3v?aQ}c>5^YiQs&203+ zde9}XYK+9C5lI575fW8MJp*tx1`!Q%akJyH(Fb>EK%E<~6ui!%6$9!pS{V;9chnL{ zI1ovW1{aY51yME{T##@ek{k^#A_EGdY&5ta;Xoug8eBvM6hzr*a6!U>NOCl|hzux* zveDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNo zfk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cb zjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&f zL0p!z`&r8>=ES4z)+>iz|hdl!0_`w z14F}028L1t28LG&3=CE?7#PI!C&eFiV_;ys=;`7ZQgLg~<+I))i6X~8zW;ouvM?@7 zDtV6D)Je-0iENpE)j^OaOu9L4fx-;ezl>bEO;O*(UDhsA2*?gUc;VEFRyP+d5tYEQ zgX^ZqVdlJ@KD{oI1*w@R;Ce~~$VkNL&`OO3y)O4K6G`Uy7^pgKkgxJY*wl3f0kIa+^yRTomoRP=9`aWbM)4{Ms_P z>xvdHf6xCYGW*kMvwi)^9Z7sM_qs3O(*DJB>HXph*P3H~c+~_R3xJst)|i=~&tBAA0+n%tPnQXUmFi zM3)KYbtX*9O-uj0BXzp!T8CFYQCAol)&+_zo-ecX*nL4?mq5|>3ulz_RyIBKC~Fh* zm}{jiC0D4c@^)c^McKy<8dCNjZiy{Z-B>$G_<8W6EmxG(+T)Gwl5*x8`TxylKRd(R X?>nt-3*Maw+G+0T>gTe~DWM4fhe5f6 literal 0 HcmV?d00001 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 fc7f9dd7b1a00801719d055e7011a28e61af8428..192550fb1cddc33db83ec6db2505508e2e4b7ae2 100644 GIT binary patch delta 650 zcmbPV|EzX`BnKM<1B3kM|A`Y7B^YmPw5ntlG&IsRFbpv;v@*4{GBngSFr0jZ*%XT? z7t2ExbMrJ4leDBHUBfgpb6rEjR5M)*6T>uJOGATH!!%=41B>Le$?rK8CSPG$u3}=G zl9X&|oT{5_YMQK@lxSk1n`CHds+*i-ZfKEcm}H)0n7nyD>l+rLR8C&cWsb#Fwwxz6 z@8|wwz|z5PUO#!ijb1%tho_5UNX4x)m(P0NE?_wJ@&5eX%@zS{#U97o*v(ybMTOr= z+ZPZR9^1Zc>w><>NAzkcVgy~p1l)e+Cy<56GtM-1A62k-s!#t>C>oMV5OGzh&DI=dr%pGd3^S za+>Ap)hX9i)tGi)QoDLf@L|8=!?P2%Jxq#{?dcXc{3-K<)Y)ZSD_2c1l9yl(ddahU zs&mw=#&=~F*JYx1wI=Q|*3Dj=jxSTqY$K1}v`)#b>YFIu z(dn=*LSW|;t>u@*me1$okWP2;ZT)q~h~4<}lyu>qJq|uBb!Sg-ADR48^VDWeE#uE2 r^Y{Kyw3MlA{9*LJHLK{BnJ}%1H*)g8DGvc zi{;^Ddp5PnIjmVK<|)aE7UqVjx`vjf7P@9hCMmiW7HKKE7N%y2mWd{bN#+Jdn}4ys zVIfN8_Fb^-%y z!T-5WFEPJb>Y7vg+1}lx3ao-+jCraBNLmB=2UeG}ALFhq7kWem!cLZW4dk z=hzy*h~^D!FZ-`@t`=5H4yz41oO5&j1F`RiXBN*0`f40{+D6bsC1b^sg_GKn)_(R_ zEInoFgf%|@tsY(TE1o{hwLPugWRdgdOPlo01m2hVdNxqZ9s&dPbOmuCkV*mXnr)mV?%!|CyYD#~*5%Zk zy<4q)aG6wQ>EW|^ORmn1uzoPDrn50s^1JijZ~N}ao9MBf?RK0RyTo+Ll?yZbHnHhB zDJf|wS?!j8l*XT2$S_&TD_djn<2m(>-4jH3=3EPuIgr7x#&G7<4h~PwN#*MdzW-US ze&JQ+t5x1%HEZJ*-0fZ^b)T_@{YdE9=+`?|y_H@0Qp^13x1UdT&5q_vUnln_`uF?Z z+;}^ip2peIf4`OaG%R5_xg+u9+2Z?)e{wBLwUKM*n7}ciqa(y%t(~2(tBZGsM@LSWig^nA28M(!H+xNX9c+6w*}7)6_21j4*M8cWeS6=Q zHTx`gZG4-3d*8OV+OHe=&T=gi^>KA!@$j19(V-*Pvh(SMNKPTaNgqv_R4SWAc$Acs z6t$GJ9D)oAE-EOgazMQZG){3=ilTq-}C2j{j)EAe?FXf+bT2f#Gkl~ qENhF6&*qiL?JJP;Tetf^FGIw&lq~nq6a5Sf3=E#GelF{r5}E)I*@5c- 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 0000000000000000000000000000000000000000..6eaee381aa493e59a1316aad85399d34b8628f7a GIT binary patch literal 16019 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 literal 0 HcmV?d00001 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 770521ff10893b1f3696a83eb9fb7e145689ad1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15859 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 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 9c5d844bc3e1ff0e44f5901c99bc2b7b2d60c804..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15269 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 KpUXO@geCyLbo%oE 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 d7a59f65c12ea36a829c25cb9d59e01be2e1e9b7..bc38832598b8a61fc8bfccf3628d0c865fa7692b 100644 GIT binary patch delta 723 zcmdm2bFgN^W@bS{LtR7j5JO8VBSR|_Q*8so$w!z?v50c9%vLr`GB&iZG}N_7v9Q!l zG%-ojO)|7F(KSj=N-?l7HZwI$HrRZE3b&naW<@YJd3u<{E_tfr>-=H~rPK=WgEoeImn46V*d9JgakDZXV0)G_icO{^!ws#<5mUo&9&#Z~8P6|` zmBy#iq}{hpRVw!h#VvUI!doi+`h~MP&u{J0C@~ETi0^g{-Jns%H9Pjky5Abo)sC4J zlV-U;Uco$>{cVMDrHyc)PLb)fO+j2C>er5Si)_o7@{K<@b6xPnh-JI-+0Nc@;yt^t z_NU+LPipmhrEh!8^Wj^4*YoftC9`sESJ}H$?z}x*XW#S3#_RGkv#1=|`^#mXu45=l zkvd)?^0lxcydd-7fmIfoJIf~TS~-1A?(Tz6ukcrymA~-Idnh;O$j=Xw-}u>z{+Je} z%;H+hZ)&n%`$O8N2EGbQFONHcIs{cM|}T<;i~B;P|gsVdoP_&+RKW8 Pfq}u()z4*}Q$iB}gb6Kc delta 717 zcmX?Dv#(~uW@bSHQ(Z&T5CcOiV-qV=BW(kt$w!z?v50c9%vLrqH#N2}Hq|vvOfuCq zO);_1O-eJc)J-!=u}Dd>NHsP~Hr#xICRTO z(1Xjg=4e{*Z(GULt0+G0gTcYSBI~;Y*PX9_a;IKw$&^FOv|=u{W%%w*Uo=M{!1J-a zhf(;&!apBAX$T+t_LjMxGf#K*jgZy{>kcMub$GR*BksOh@coC?rsqRc&u(5@`D@$r zihcVW=F8buDvur`go?>2EE>ki+*nW;XcEl>&pzs zIX5MLef=@j$-rY&lbL1c$~** z*S3?%vDQK+Z80;p8eQ~i>}#4I_Lkc}Jndy{d_v9IhQnVjY&A 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 0000000000000000000000000000000000000000..0117982283956e88f5b0a1e9bf46b3288b7c2d45 GIT binary patch literal 15855 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc0(!rTcDSjnPO#bkeHa7l$xrWYHVPlo0w{1uA7*c zXsMfKlwy%)mS~Y;VrU8uL|` zQgCV^swhk%Clg#k6(klFr-JgItr9E)!izLWet?iR;CyVAm<%f0?2ZAW=VY97Aq1u+V&3b!G}`DrEPiAAZ7>8W`o#N>R4si@k} zjknPU)de}3G>C}e#4^gF!Q9L!(KN+8S=S)h(n#0R)FegM(%8aC*VHmG%_z;>*vQbr z02a+iv54+PL{x(V7+%U5g%}xI85mfZn8HdqNPvM=;Wh*{Jc%fPA*P~g!)<(WMq*xi zYKomc%x5qGbS;BA=7=f}Apt{T%wexvAVv-8n1jS8YMBTtXEDoA8&I>t%D*TxHLoNQ zT<#g#=wpZ>(hNj>1gIR%DFv%HH!?6VFwi#ykx;G3(&$Okih0%2cWLBi+M7U(;rsfrA=I7ZNnnCrTOJLO) ziAy7r1XLp=s*oDg;L;N!8sy?;$7Q1r?gxPS1Yjw6okJ@I)M2zT9%AmOC6I6+k{k^# zA_EGdY&5ta;Xoug8eBvM6hzr*a6!U>NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37Bi zBFWLsqfNH`Eljs_Qz0R>Su z8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{K zNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fL&WEz>{|g6?aVtxCaqijb;m1-t2<3D z@xE@|A(~mzIjhBO?bfYxx6M5_wNW~6N0gi7rcL(cuM^}q#VCU>tt__Ou>zxfwbE$;m|a>2?exTJ>ZoW9WIYu+b1 zL@V~1J=pPWrhIjJ&vk#x+y75qs5;%{VXQmDVb&sJ9l63^pRDDj<0YorUGV3Bp~9ch zHhYT@`y0327Kdh+C}no}m2Nz^26=n za*XpWyZ(mfFNZ)-S2MYE7l8L6h3l3R(9Goz?asGD%!QYLL) za;uIQ(|5IrDxR}?&T-6=aGZQ)t>~%EV*XQQRIeVHw=rVR-Y4zL&VTvSyTCIn_9)+P z?US4S9RIyPZ_%fOH`Zc^CORWEcwq$#{`njxgN@xNA D@%DXI literal 0 HcmV?d00001 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 9c1da98e0bbf29813502bab60cb235fca2d1abcd..29f66483f0f6cba42236c06a4fc0fd2bc11ce7bc 100644 GIT binary patch delta 714 zcmX?6v!G_fW@bS{LtR7j5F=wN17j-_OKk(g$w!z?v50c9%u=yTGPN`{G&0k*OffUi zHBL22)=e}`G1N6rF*8avF*Y=G_&k@80aPxcbIcnG>gkp>EBb?WdR_h==(SP*rnj2x@vpOVFK%(-ay(r4((hQb zRKzqTA-;(xRc6f6yS#n7xFT!cWywLWSrC1{M>YA#iu#{76ykbOFz-y z`-Xklwk@B2+-5p|jN2{qs@(g0zP(d-|B{yeaDV^D;|%|NkEflQv#y7Mfq}u()z4*} HQ$iB}0J|;S delta 748 zcmZ2bbE0O$W@bSHQ(Z&z5JO8V6H_Z=3vC0V$w!z?v50c9%u+G6Ofol2N;K6qNl7!; zHAyrv*R?P*Hr7otPqau&Gcij`OEuhlg5@3yQ7R`3a9D98***CjThrw8>|C2?b6Fd* zXxvlXH2Idbe!Z5bi(^Q|ts|4qdrvNuIUavM{k-w_7xOl5eQK6IZP$toXAHL5uozpt zP+a&T==#5wUDxF=tXy0oq@<*%s>vau)IH@(lFCHBZ6ftKX6E1DTzp>n?X3W-klTZW z-(S}L*b~3}y1R#_rH2Tg#KO#5_OgC<-ePM z7-UrE6g<3k{Qhox24m;gOSZEQR83u4w4L)|=c8%jfqMgM*7f`E)11Vg6I5=;?R&Y7 zDQ>^SgpIu1Q9SozVw56ZI)pdvSaf3A^#wkho>OhqcGsw%ky`s*_{%+M@kfVmRPMaG zAn*;(#1$=tTcW0gwlk@g@MP6rj7VqPzxmk81lE;+AxBs|1sBHOh5XPTc_=PIwTxFKA+;#8AD%}v$frL305-8VBX zecdFgE~B6oddc=U$6W5sU9EgS8XK|~JzLFkxiI9nkM63V1D#hFEX(S!Gp?xityd83 z7B%_R5v+PPvFyf-@`&4KCfXz(EMwYS$6gxF7+s^>=6fywVW;UL?LZ}+g|klIxEE?9 zDVuuNS@ZP;*=)D-CJ%-6WW(okFn-9(aLBte@A#UW#69`TmK{HSDO}n-TtVPe;if9i z_g#K=GnKEJDSn&rW3`XH{FImf0>5m0+*0NI*W$6%!337G*%M`bwtVS+_+_8g?QOgV z?s&}a$-6%B^_t~>zbJ2D)SN^Am66WYn*6S{R}<_5Rb)oLRl{oJJo-R{0)2CB8JRB8y|b#nF&Q z>XxfLtoC*ddW}gk6V2i&dq;&sCY~B*_yrzz0*&=)O=;PUaGX$cWq6a zd89|a(Z{lhQ!9lT@9Yvgc2O*8d&r>+B_XZ{m)`c!;@VlVP3nPl%7m?5TPkaK>ig@I z?p*h-4d-7aFypr5sZC94B1T7<^cTx#yRnHC&zn_qpE)SowNI{D z*>XEgJ>vD#*T=ZzkEXZn-n99>%EpzfxBA#;cK9uL zrIot6=WM2Uz01zuPAm<}`QOi#uKB0*s=)eW&XNmne(hVfL^8c!lHue1+dr}yG?X62 VZ85dsXJBAp@O1TaS?83{1OOs-Qj`Dy delta 766 zcmcatbE{^|C2?b6Fd* z_|EzkI{B8he!Y#Si(^Q|ts|4qdW#gww9mhP=FOUO`<7(yyqy&pxcY_!$KC*y#JQ)k z+x-M(TVBYq?oE(ny||WRm&#vB)>cl(2!S^Tozs>*+x70%xi{-}8(VMw{aQg($o0X( z=YMMLmOs~CG9`zt)mO>q@}K30H#`5m^gYx~zAv|6%YM)2=VYdp*6(#&`>wF0Ksq%1 zx!aefJ;krDcNq9iF0tZuh>w?dZf;Le;bHVGcyL9osqK(cT4#WY*XoO{ug`vX*LwCr zrluahzrvC!clH#;NgZTpyXcbt-!IEI^iXWmpXofjzV6)9I81kOtcbqgEc(V@EMHCc zTYT+JMY+4XH5Sjk?YU*kgKPE10^uuvuwE;2Em_;UcA?6*F7G7q8kza-9~WC}a@nZ3 z!dh$A`dunXrbai{zwvOqmZu}Qw)4fJVrz}6zc0;L5z3UMpT}$Gv-F}? zp0QGvZ~40av&%X1gBX;|lZFjR-V`Mvjair;n zoRcrUZsfg`uW4Urb)YlZUt*`N&g)hDhmxP%`fTrIZ{S;OyX60`-uvtf%FM4zHh+oS R#lXP8;OXk;vd$@?2>@M_Nbdju 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 dd3561a58cb52665204b66e6e1658932744840aa..969dd475d466e7f2ac1f5ba974818f5185803136 100644 GIT binary patch delta 791 zcmexYx2Ar>W@bS{BV7Z-5CcOiBTFj-OKk(g$w!z?F-13Xv7BL4F*P?cPP9li)=f(? zG14_RF)`4!FfcLHH8)5#GfuHgN;ET1-TaI74GU2!CkJqvW7;%XkfVMwKPT7b+uYWM zEY~MV$V`^9)vx#Sba4!+xOHT*ugB#=iH7>+D)u+-{3~80u=T2odfk%^K7pq;yQBs# zd9&c6(uWI)s!?w3JSmQsyrwwtC+)IYDmF`K;*8GB!=}Q5e>{$Cm}0X1|DFFYH-xO9C$DEvAkWYO_`XTsN(L;g>pZHIax39Zb_S+aqd?8rWu_^ z<^HzGVy>$)0>qfH$Nn5M+Yy4P|c6#!$W8H^Yo_GB)t7?4uPixY4c7t)iR5F_UN%84?o{( zneaAD@%Gw97gr>&(ro)C)48ukcl)NVCMm5dsftl8oa;*dxowMfo-Wa6(Ia$KQt@J{ or%2+V-v)xq|J>jI@j1hf*_D1DPk&y`z`(%Z>FVdQ&MBb@03G0BNdN!< delta 739 zcmZ2e|F3StW@bSHQ(Z&z5F;ZiQwu9&V{HSY$w!z?F-13Xv7BL4Ni{M{GqW%-(M?TC zO4dy_H%ZgAOiMM;HB2@(O*S_(G%z<#-u#R84GU2!CkJp^aU)qinUAAsGCwER=G)xX zhAdSaHHRik+3MFTc)B=-RNOi;`K)(HqDcGuv}b$E#DyLaeJ`b2h0Fk_%uKhP9<0J8Th5r2mYkUN@!Z_Pbty0Qf7l|h zW+BHx*KYYapAUU5u$U9hIAyQP&CLf4dSX=X2o`9{`R~*b;(*Tp)kvjDVpzvDp|hdb{4ITP5tOCc|UjV z*RyJMId_y&+YOBCjJ{P~%2xNRkF*O5_g?WnWas78f%lgNUDndDf9_%#s_qeebxF|G zlsDcfZv;;E$e;f7NjLJ;V@Gk_yHerrSMBNZxaZ^DX781@h+X5GWxyF%r%y+oJTYfUvcuuWr3>!V1su38YQC}l zhhv+X>fFClk5|^j)lRE1_$(Q9PI1$W(-}7X`vS%Lf0^{SO}*@!RNd5|_hSA8ADy@9 ziVv6N#|X_lpQsd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAchEVTggDm9Zh%3`4jXNGj3I zNG(ZBNi0bu$`oX^Namy@Tcza}0(!rTcDSjnPO#ZWR{$4nrfhHVrG$|Yh+}Ss+(w@ zVxpU9kYsFPX_A;~VQC5uL|BMSqQq}0S@UCYEI6WwGJ z6HDDhLj!YN(^N~#XRGN~Z3s5ljr<7|~+Sq@%^L2>|uv;pT_tHfkbX=axU$`Gk3 zHu@-{2xmd`fUJTj$i$35;zAiiJ8nD5Gg9;LWhjVIU{$ycDb7zTDNig)bxcpqDmWi;U9J36y0W~D7{EISE^GXuI z<({F9K86?~%|O&gfXdOFQm}e+BLf2i1ARjf3Dt@$jjlBkzgA>vbgc-Tp?R4lc1BR! z(1ek6fm%C|syMhHF*()F%+wT=)6s>|bp&Kqq~=7pWag&k6=&w>*%_MI=!5m3OJLO) ziAy7r1XLp=s*sw{;L;N!8sy?;$7Q1rZux_H0bnV3okJ@I)M2zT9%AmOC6I6+k{k^# zA_EGdY&5ta;Xoug8eBvM6hzr*a6!U>NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37Bi zBFWLsqfNH`Eljs_Qz0R>Su z8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{K zNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fL>uI;{-u=7$=-$1ynPOd&*RyA(r>9$**E2tovZ%B3yk z@9j@~JZZk^om4Kzl*xvX(E<5v@t3iM%DtnU3 z!py85!?cxW!;O2qXZjx7lIzW*tH{!0sIhdzwMok~l@29s+%ZWo*+p}!3H#cQ_mX=e zw_TIU*1Z-b_l4cWm-oQMhmAph>*gO!Q1G6<)>Wwc6L03MNhz^mZ|3iik(FEVy3&wg z`SRtfuD|xYY{C$c{Bqsez%W(W?7YT2fj@mu|NYx{>E$Y)F2m0PmUe&EFsP;9&u?7k g9{Kls{vS(*g~8AEZs+{b3EH9U>FVdQ&MBb@0K6-EF8}}l literal 0 HcmV?d00001 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 7eb6f2b1002eb84f9ce42add6a47666cd7a8244e..9249927d3f91472a6767a54d08dbf7287c6200a2 100644 GIT binary patch delta 708 zcmeCJSzohZGqa$fk*n0f`n(3M*r=%Ghn;4{~B&BRV!SaTMD3z1tILt9E+N{8J#E|8N1!Q%(vtIb zZ_A&sq`%^weOv1<=4Ci)1ZhXR+6#VFyLm!)o0nYCN40(vIaDyfqi(k9^rm9CgGX_Q-Oh}o=pHb*DDe(#dBJv-ipnLX0G zb9k=H`*OievpKEwWMdqseNovXRx~khQ!(?3zjJf!y(e|9@Tp9xQ5Ndvul{g*_l$xW z8RlDLTsc1OZgsiPR{O##>%FL0x{SpypEbT3K2~S{JJt93Ef;o@*)owgI$#Rlqdd-~ z-*2tF(5e41poqg%dRB(n7Gc?i$xZ+NN!Rl-yq9A?y|k3oo`HdZ!PC{xWt~$(69BPu BF;@Tp delta 672 zcmZ2q(_6D)Gqa$9xvr5(h@qvGiIJ6|k+y-+KPw;x;TbZ+*&jFwx3j>NZa$JRiWKhJsKT+Z!9^Pi;5WfuU<0w$Y@pVAdt0mt@8oq z1-|kJuK%t|^iDFpccc4%n)?0edpG@C%5W-s(VnP;SKD%Ui!N(dZHrc`f1Y~KGfh-eY+_l@vZaOFb{=z0 zoa^2cKY!I7Q>~s=eDT~?m--afN?huA)a|-tr6RBB{eX#Wr!woNZdg(LUS9ju6NU2y z>i)|o9NM1bk)6r*%S|MH1sbtf0R)OpM; z8o$Cr*-L-_vDW%@!&T`&0xwulWe z8*(n(zw&ZdXZ!o^)|oqI#x9(Ekz=*A#^P13>XQ`;gy&3W3BO&*c3U!Pn%V51j3ED?#m0$q3BEPW{&&N)YQ*G-GVRnvsetDHDCF^O?zmq68;^A`>8UA%l> zsLE{eVy?@_#5U{pe2?8V(_(IKs+(#1v>D4&Gg+!yzWtJ(RW{}Ich|iC4(Go;__o61 zzHrPnnO)~>=3f^4HPz%Xf9kyKXPaH6-tYF|*N%DjEUx9>F_W|Z3w+j#{*hzwxbLpF U@_5QT1_lNOPgg&ebxsLQ0Glo-#{d8T 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 0000000000000000000000000000000000000000..0aba0312fcbc40f0a4f7b9ff72c318a2a37ee7df GIT binary patch literal 16361 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 delta 463 zcmeCGnO8l*g2|?Kqg5rdpng*A%O1P%?eyc3|UsCNN%3|!dkDMVYa7>V@SoVCznq1HaSSRCe8{t@bft%pOT}J zPLE5+!HoY~eb|qSN!)$;C~yDKvz`r4W~7or>+95%7wof^ zsdCN8H@<99_^wJTK6r<1l+NnL;M;{COj~s~9#c#bNbUILFy&ZAchI4<*+R98-k7*q z8*PdBlq1eBky^0Kq1*N8A$Qp)Gr1yXwb%PrzP-oHpkj1<=4v%0T1zs6%7|=hD1$K%Sv!b&~kJPTQ+-QK!~1^BFCiDH?X5~GyLZ&lT`mld(%uEK zeVV;v(G{b2hQ-HHmPDUTxi#UOtmWJ#7Y{hsis`Fz7b~{@?mD#LKZEsN!QC_T?N4e> zK2z8}nXlIDt+h_i^4#PQ&t$jylZiJolTK~x=1#TywN)WDs39u{Y7EgsTSKOB`%#ZV|mL)r_PHF-IXW3?kIk|@$gCW@gtWL^tMYy3wG9b zCC@qUu{<_^L3nUyR-)hZH_s;BKf86oWY+0ZpSwxF|8sNA39b7vQu9MwRYM6;iB7#KWV L{an^LB{Ts5DZ*3R delta 773 zcmbPGzo34@W@bSHQ(Z&z5F;ZiQxhvAQ*8sI$w!z?F-13Xv7BL4F*h+cF*GtU)-^LW zH_%NpGqKRMG%!!oHA*!wPBBR|Fi$o#-u#R84GU2!CkJp^aU)qinUAAsGCwER=G)xX zhAdL7l}jf}+3MFjdAc};RNOi;`L_4uLYemZdRKALh$+1W)#mr#-klT4YcgB!l+A;M zoyH}SY3!V{6qktI=sd#gsjC!p@(70z>)sbiZx_urx@(<2dsk&d>Y1FS)BVL4iU_ed z);=u$X(K+LKc2B;f9H>MruCD0uTN+acyyli-WsDlOZASK3jK@Hu9trw_aHQjX_eCP z6N`6@9OF5763cFNUv z+sA*qn)A=gZ8ExWcGK>8FaBn?_@@{@*HVv}czVm_GcAYDYzT7-O;KdqF7>m>Xl|>V z`9wYQ)8~IjX0Ciz94@^%^f*Vo<)xYBQ;l!NoV*<)tQgId)x@~JOge8a>qi&mjaP0R zULJhB^P1?#t&2NPG|z5X&CMBa+oEsZ{!)g!*uBKZEX?3yiBx3R{rHEjU1*iJ`1|Bu1{vCfygYyUL@ zITYJeWDowTaSK*$x>VMb+Riy`*`tl8_IO^7{&-`K=W@l~gS?z;-tA{&b_z}Tcu2u8 zbWOTXe!`J?9`R8^wZ~$=sQu?!+qinWR)A>am-ly^-QT#q%e}a+xsL7sdE>u&_t_bG YM4IbMzHJv`U|?YIboFyt=akR{0F@U=H2?qr 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 e5ca86c5414a2f9a066fe18fe0aaa4251a278b76..94f0dd242b8112ff46193f79d1757f4a898e2759 100644 GIT binary patch delta 808 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 Qf%aN^y85}Sb4q9e06{Ej-v9sr literal 0 HcmV?d00001 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 10eadb3daf0cb9d3c6fa407ae860593a24fc8c01..0d2b7cf5a42b0ee818ff2a6ec4aab1fac6fab30c 100644 GIT binary patch delta 784 zcmZpzUsk_iGqa$fp{}8Mh@pj*sfm@bfwqC+RP54 zSm+ugn8z$8XG4iSy~vI85*0UZ2raihDDhOm6QEBEif&bEXYwmS(lq@^KEWx zLzY>*UaFI&Z1w9sJY5_^DsHWr?Cl>MDB^a0!P9TwZXMrSdsBT%G?$=8N3N!+jaE|Q zson&KUWF5fxfBm3C`dK)q&k^+b*wnjQRtJDH1ngh&mTs$KNFuaczYJKso%6r=f8H! z@7#7)g>%7=?l5_u5tueZQDtvY_&w+P(*j+0`;$Hgzf-OCh)8Oyw_rSVA#>rY?&M(Q z8&|X1j+a%|0>(nb67+|O@h*Wtb-|k)1CK%_d9(?)G(*WteZ;M6P9@di?M3U4%@wDGI@y}<)IZQ> zDmCBezAkyv9FC*U)NfXG|NPqj;upil4Ecw@EdP8gEIOw5?w0k7v&JmaZUt?{7Jocr zOlxoK;XE^mSy4OgQn>re^EyT~^|N2i%41Xaws5YLIVh(W?+%v6+>rv9^KH6%%Z zrs^6QnxyC^nwc2unweWB8JZ;;q!=0*ZT`jjhJ`4VlLI&{cu}mM%*W9*S(lq@^KEWx zLl$qD*Xt%r+3MG;d%8G=RNOi;`L6fmLXn30@7dL+6^Bnv)$=)@Hvfv3yr*8dmo^3`%&T&i^RxnY57{h95*68m;a2|E3W z-JpD|#qG6=?(Ix%ZsEwV8GCjf^4K~5<1y7e@6LNfsk_A<_CIK~OcltqVIf z^0nm!*GMJQggK_~Ykt|$&s;xq?i=&_ZeCgr8D*9;;sY|YJ_)X=bX@V2bK$q^EUV{# zDzfql`&N7@=Wj-@F3XAg4}Zr$#+O~E8eeWGaVy3cWLv-cU@-PLgOmGZ?4 zUU}!VZA6XtRPH#kwyVFw@9V|O29EzOR!ijGJ#x%aAnWG2t4jRI#erU*e-%7osb8V{ z=Sb@#&t>n<2ZTRb{`rx@bFXT{l(Gfh`_CyBt5;usea$N1bXkvN|4Oa8;~%!VZjy;* zsh(yz^LFpms_9dD(!MR3w(#=x$t%{ot40T$6f@aXbL5xZ<44{%rWegTa%JS`0r`x#RDQg_|09_}uT=DB^UAaJ3=9kmp00i_>zopr04fAUQvd(} 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 0000000000000000000000000000000000000000..071feef28935d1fd2a42a548453df252edb391dd GIT binary patch literal 16214 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qnj%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&BifSXWcksCv zlni`*tvvIJOA_;vQ$1bmDsl_-GBZ=G%*~Tb(@av6b<@nv40J6_O;U9&l9J7JjV)7> z%}mWxQjH7}!D$0kJ5q>&^QINdc25_IJdR-)hDH8GndzB%i8)9Xg8Y(_nPO#NnVM>D zW^AHsV40etn_^&MsB3AKXr^nNW@>C^VPtHSXl4fU3l?KAtn$bN#d{@MG=SnJIJFQ} z6cO*>g0~>Cs5li=tk^2S$`yD?4aw#Z(gs{SStTZeifp@NP_9o+vC&5nMK}wh2V@mQ zK_+H&5*Gv*+Hu=ao{^e|uhf7T1y+UIkmCHblJdl&RLAtxyb@vxG>ECF+R%-Mc-}Ohwg(+xX;+#Ju#> z6gz#G&tL-RS_X5>5mz2U0*1tx!(L@Vi~`3mdN?7XA2kXFTg*Y?6SYi)m9v;-s12yK zWaVF!nVMIU2rl;wZS*n35McpP9|0;yb4tPL&5aBU3=H%QK_pZwvNXEZNc>unrO~w_ zbcW_-me?6VZ9@}A(gkYLLE0O^1&PV2c4nrg#-=v<=)&ka0x~O7b0S-h31aLJ55e;&2v*WVS2X}8kT^+C#yw0H&1L`nZ84odc z)DlQI5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz z3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnH zIT~C<1{6fuXmCNofk+Z>aB(5_6sP8;*eaDP+1s5wcVPfq^O5)5S5Q;?|nU-u}Uf0&V+yy&rQa zvkA0{X|y_N=4v*HYHlfb@a00$L?%s5CtVHpUL{ozk)0X~8bbA0U9?>uFOvQ*z}vq6 zVE!)<$kC@ZM-7?Z>TNRxZvy@i==$=Ms)T zziMyUo5{>!mXULwaECCEnyMIk^1_zyD>C*hQMVP8_(Sx2V>t?WX)e`>hSt4+Jx3vc{Y@ zo%npk;U}*ST$EjC^+Uw}zD(;ju`jA}JY}5Ag%UHKTOTst*R*KG52e6UwRJjP>gCRd zJ(>g0^zMCeR?g^a*t#^4NmKJxS0C`&cCm4Dq^itqXBM$XJbdRLO_5KSyl2Pa%Xc)^ zDDB=b>&u&67G9n2?j0iRS@=J7&Z1L(I`0&8*C)@I zWBcNis!Xr4hVy(5y?+lre$!jnYJ0^cXwKEli&DMGrEQsWZ!O6F#C&k7?62wjF74g& zar#Rc2k*>BDst=cg(K?xEB@VIHhJ;oZ~Xrb8^?-#NM~Rb_e{4t!?7E*^WD?c&t;uc GLK6U0>-Px& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c248342a930dcf84acc01d90e536c46730331da6 GIT binary patch literal 15880 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc0(!rTcDSjnPO#TU}R~Ynrf<>Xp~~9Ym{b^sGDeF zl%{KBVV07XnrfPqXl@A(L|-P&sGVR0pUd&BtJk%8*o0hN=ycoZFb3^?2(#cqmLqr za27-l$SR0}Ow8ycE(kER^5@K>b#8gym z=*HXVgX)5uOd3Q)abg)|(O_z5X=s+5Y@wT$lxCuvVqs#Yo0Mp2qMMp#Vw7f-oM>ch zWCV+5q*z4vA|k560SqtYj6#fztqjbpOif{>93;TNs&E^E8lFTHzz|bWwc$2CIU_MI zJvGHnALcWd0J@gJ9CO5#hme3FG3Kz>EfAxIbj(5G6SYi)m9v;-s12xDVdY-eIYH;ZZ5e;&2v*WVS2loR&eFCr)yw0H&1L`nZ84odc)DlQI5J`>( z7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF z1Ciuta1j|$5M`sm1qlZt$NOCl| zhzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fu zXmCNofk+Z>aB(3v-=^lJ*eaDP+1uS)EaktaqGzB{n^5aGVSm6Ee)0)J?JXaqEvEa zk;os$lPVfluN}0|6fb=9X7Qe*Z@D;UE@bE1 zDCnp3*2uA-A(r*8cjI%R6-;h6ikC#URP`FZ&s@HF%TojEc^hOu{WWfR#uym%xV`S! z^%aL!RUIskeYCvF@AkdJ&&?LjVebw0%R90 z)_brzyXBGA+mu!67qTB~M5j7GH+-bHtyFlep3)W1kSWQwv!3PJoOHK#_r3RMc8tp_ z*OICvZ-vXLEvJ&3EGK={S-s8SY}}%GXD(g%Z1PCRw{q@^>gh+$C0yR@^0L5R;1y@n zS=L=Ih19Bgt~~B|CmU5KxX`=gNvcwH-;sIh+ahQ2PER|$^qx%9s>|AeCwT14Uo0`! zFzmWHM{S|QoH@sCG}rvxQqK@nI_Islie^findKDwE}uT027AZ9Z#h=#|CGMM&aV3J d`~4r)40n>Y2w8qSw-&Tl+tbz0Wt~$(698o~hZFz+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cb11557dc21b7b26b976c099845e586bd9fb0d63 GIT binary patch literal 16291 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 b&&TlfM&jLTzNafe+xR_Q{an^LB{Ts5I}RU! literal 0 HcmV?d00001 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 b1b399eb3257ef270b8c1e3eaef1ae67df131b45..6814b9c45312f4cd4e4331f98b8705b496fdf4c5 100644 GIT binary patch delta 714 zcmexb+g`U}Gqa$fk*RV`%Xwn+e(pa8EXBK@ zJe$1VMz5ZU#nZ(xq~g|*$*~@j3q_8_Ylz%!t<7;1oS3uIQ!`rXtZ4BYU$u-DdEe7B z`V3Fo&G~7#iHWo6sZ-YrJq>tRtE+mrpy zY=4jXuw_?Xz2DVQEzrr`F*7YlP+aLAgCKw6|HgPl=i_I#+~nc;zD0QwbH@|aBPFIu z5A~9^NzV&8^w>{AzfDm0%acdiv31MOhaUK`lBr{t;AiI!^SUFyKX-IUyYU}fApDE_ zVT@V1%+8k6+XMWYNl4nQbj~!Kv@7#@@PRY8!+0+i ziC(@sQ{~RhBdfMQobuIUUy$vdF9(-Q&3}74FzWl~hl{$-Z|~7zDfX19zklZSF`aqW z(?2ZI>^^Z&=h4^Kp6|kzGs=dl?X$PyTBtQ`*EXZVYeycL>KaD#318#6H#hQdh_BlA z&sSo$z1Z;Pc4P3h$6NkS>0CF1}uDW zJ=Z4hx6!L-{N(B47*cWT$mCd$;6jOG{356BwASW03SPW%Yi7VE*9r4dtaFaA^cLLO z!c@vL{oBK9B@;zG1ZD_{TyYH$aS^YbsGd}sC@l7Hi%$1~ry3cZLS@>lQUBw`qXhzI zR9s|!|MYkDJn?zqOiPaTY{@vVf7Ll%;lQV?IUbWl%1*k3)JqG7w(SrWn#wbOeZsw^ zzc;GQi|bLmc}LF5Kf3wieV@`MbAg+aI}GKMUP&eG;hqpT*c_#C2@{;Ch?)`s)Sxn!=&0E#8`5e!ay&eA>@jfoGok zF;CVFJ0&*vTTf(gW{?^UNEqkW7W2WWe59{uFtO`0mWBml51s#F+ zt^UlL&pFRM@x;mPFRHeDamriBgRXRRh#mn^B5o;LYz z&Iv}VESZ}6E$oj>&m6mERB_|rmq_EqS%%H$nC{6(9rDOk3}3_MrztiiSNcPB%Aa@f zR)VW_Q+HiFRq@zuOLMBql&Ln^amVJat;(DBbkViy9LwYTS8m_c(y65!wW39wPx-0W ry_3nwj-_+2zbyazJ^zm(Lr3}FxC#53Z}2cMFfe$!`njxgN@xNA)V?fo 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 0000000000000000000000000000000000000000..381a23c586796561e4da5238087260fa3f0ff9ea GIT binary patch literal 15817 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcrl;x`Kk#BxV zs-3ZoJ~m+_UEq{v<(XGpl9-pA>gi%vkz1gbnVDjhmTGL6nq*+4YmsK0q-&XGVx*gx zYHp@$ZfTa5W@?_6WR#W&4n$vHWbGJ6yW}UAf^v(eiyfq3Ny$&nOtC^ZE7>y5)F{!! zP}k5PF-h0ZFx5;qDLL6v*V4c|&Dg{^In^Z56lM{UVHg(q7iFer<|XDJsR8*VB{Rj! z$il!RDK#-!*D^85L^s*Q#8NlW(7;^RG}Y2FImOh{z|1@qW(5{wFs$;(EH23}szge~ zuo5XawGdSlCXtf~E};q%i;7c0`Oj7fmI2{K8YDkJNE>iIwn|I}m2Gy(pzM*FVxx~D zif|T056CKrf=tZlBrXUrwBxp;JR>y^U-p6+1y+UIkmCHblJdl&RLAtxyb@w^KEza1 zZRp0^=!5EloJ<--L~&vnWzmpiZf0a^oS3GYXklcbo0MXbtZQMOXrOCoVr*%Wnv`gi zXlx3LW~5j|_aY*y!2yg~${8A38No|ANPvM=;Wh*{Jc%fPA*P~g!)<(WMq*xiYKomc z%x5qGbS;B9=7=i~Apt{T%wexvAVv-8n1jS8YMBTtXEDoA8&I>t%D*TxHLoNQT<#g# z=wpZ>(hNj>1gIR%DFv%HH!?6VFwi#ykx;G3(&$MQTojOJ;6rUU6oAo}HnYjXqcpx&&5@k+?J> zNkBD1q6(=&4K6()qCqZhc3d|4;C=w8PXLyJ*EzIeKpjRa<00mbS^^0NBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(yn zE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U z2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr! zHX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_ z5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH z5J}<b{t?_=EMKyjNJE~Z}J#L^b0>G9VmXfbwSS`=S3P^>C#Q_Gish> zl|Oj*?1W8EeS1jK$%V-$ndSTaYpm;^{`+v?<+C%-fBU~FuRfOdOE&4q zp3!>!nb)~*zh$l6uXu&?qUfqCD=vNb724Uce8Z!cwWps}ovyoQ*dzRRL)sbRi|TWD zZ)|dz-qbC7&DBY2#gWIoi#M1Rn95ni$x9}w{pc~}Th4QDO~$Ty0#P-0g?3Lg@i93( z>lAC#N{uxeW43Ug{&v>?)u{)`YW&hc^G-bWIis98gL9>G&4C?KE2Z~r5jhue%*5y{ zw_WNjt4rUE7fOFL3|!vR&-sxtHdG^aVXyO)htpp%*`>akGI46aa=vKylBWXl0;vFVdQ&MBb@09w~_iU0rr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..16668ce79440a60a0897de49a5dafa91becb06c2 GIT binary patch literal 16246 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qlOnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc0fk zmFQ-qmL#SmmLw8o3bI-xb5fG6((;RP6HDwea}(23^$YUSZS)a>NGjo}%E~!EC%?!y zKPA=9*hU|lFjieI`N^fAWbK%joLXFxUsQ|~Nw5s(l$eex3X{mmw1X5IDf!8nDOLze z4NX$bjZF?(2#^fEJ3tV~i&5|d3*4Rw=K zQcZM?QcMhW6O+wTbc!fi-#ep*R+Vo|DN zdTL$?F=ZvhR8(!~#zXQ0?hHslL=-2MQ5FrRhL(nA$;lSFX-R1&x+xYWX1Ym3lfu4?aWL~jZJOz(S^}<1Y}mE=0vz;=BDNq zXXfYG8Ja=$pi5xY7>P?Gk_1#EB&v|QAmC~YA{yl4X2)ft5AHdEdQo60c%4Hl2Gn7+ zG9F^?s3nkaAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+ zqqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!me zE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq& zM}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L? zLBfGZax}Pz3@C`Q(cprF1Cb=&;Nn7TS5D1Ku~jNpvbRg-Nqoh?z@U)q5#-CjP^HSi z(9q1l@bf>wwQFt*o^dwRDf_g9ZOaC4;}WmWJ@5G>@5>ez z-cGJ~T~Ji#@ba{t_g|S;2EMx{D|f6DU3eAvXIo$7bVKdJ zvNOKd%Kjd?&B)bjS~OeiqSMrl)W^EBe>|2vGDoqv>eADK3rhEM&gF{tWrP-+W3tCU}RBvmUSY}(Yl2HLk@>qMu< z%sN!i#R%t&J&yW zbN?}5`Q(yaH+jE}UOnSVPZ!6Kid#n}-_90J6mb76b>v3N67P(%+jsVzowfJLzN==p zrfq3kV`grqk~%p@WXW`KP7l_PVFHc*?bC%<0%rW&th~-m*^aL* z=IpUK)4S)~vaXobnlAF;D_8nf^&5hm)=C?tJCog2%$gjTj&7C6pY5yns#Gma)PDVC zaWUJ-2g}Z~eleMLU?S^W-QH_yeUIzcY!s=P?fc`-+Y5e6GS_OqaeLHl(e>cxw6?_@ zZE3BJ=ax)AQ#9w)AHfw14KCMA&D?iNA-zz-|C3W-p@^fm;EqE_u5$6To?Cs(?D3q| z^eCA%r@bAW&s_-Pm2oXtl2Ryga81BLQMSc%+Llj$p%PqTI@jgHJ*Dg0E=({sdBW4Y z=b+P{1?SdeJXp#9a;Z@S=gc>M*{?6GUoA3KV(O|rH}5~*v$MQ-d8pp|YZvPOAG^=Y Z&?Gc@f!f>^@eB+M44$rjF6*2UngB*f5a9p- delta 495 zcmcawy}NpX1(QwfMypC@K?8GLBf}6QV=H5GD^mk)1Ea}Dm`$;WavLQ5V-T&q*_sYZnA<4J@mqs1?UmQ~UUp!m-|M{S+KmCIwL{_}~s~>j#|NOO! zKHCTSM}D?H**Ig_ny>c3k-zJAP5SoVg0=J#uSe*mKl9fu`D*VR`MZ8k)3N$Zml~Jv oIKy7fd6Qq+R8zQ{k(nX%@6|{9=f1zqz`(%Z>FVdQ&MBb@0RNN5MF0Q* 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 e13556fcc15b6613d2cb02f07553150c78f2df08..1a02d3a16cbd4878e86f8a5833b38736c6bd1715 100644 GIT binary patch delta 562 zcmexX^RZ^bW@bS{BV7Z-5CcOiQ$s5wV{HS&$w!z?F-13Xu@o|@BwHq%BwD7W>KYp+ zo9ZT|ni%OOrY2hInj4rITc#!_8(Ns8Zl2HjhJ`4Vlh<>ZW7;&?mh;5s{oH>HSfX85 z?VY^eM!!DK)5S5Q;?|MN_8wOfWsZML=UB9Np`*aB&8{{(T%D2^9aJw&kme#j;v!|d~&Tu(89A_tJ}Jo7APDFKU|zuy0pppaC+r~zyE6F z=e-ve*fx1XuA|=c+d(OfIzK+w6t9?+Uci37`%1pSmf)U`_4k>k?zw6vzxyLY@{B_) z{^tUCvM1d?HktL+;fm(dD-!uazbrfuG%vdUoc|kfF!;{V&@*OHzYF-3@7(j= z*?o~&)7J5Vyn+AT#TTs_+&Kf1{;526m&kp3o5fx&QYLBP1%VXC%NG5?D?f%>8?&#J zO@FDBpTEhVp?b}fNEx5{$!oZ|YV?-}uAWua6(ho@!ZVipxOUHUgAdv~3n z&h`)gH0E2)ux{h2jN2akHm@m6IN4|YhteIB%d0CYJAVIOA^YrMq}uL(T&B80O)t4U zgKnK&dyRKtnxntR$!m(rdlipKm^EFN`}6+(k79;dLfu)<+*B?zFfcH9y0ZDXtaD0e F0sw#m?gIb- delta 564 zcmexZ^Q~sXW@bSHQ(Z&j5JO`tBSR|_6Kw;d$w!z?F-13Xu@o|@7@MRRrkI+h=vtbY zS?C%VnwaQX8YCI(8kwbZ^P$>5*^2Y@=Kb7%3|PJ_ zlyjcE-$uW_*we)^q~g|*%k~~u5@n8mOy^j%ccG%dug$JDTU>*Z7adeIDQR|8aBDVU zIlf-_$ONgT1pz)QW^3{HIOxB!GMIJem%G-M$ik}ufdV3~KZ+{+*6QgNWc<+K-*bQd z`@^4WnGRJ6UDG}BwCKM`qyl%H{eSC_lg1kw(_LR3=E)ODu8)abFlqahXU^*H9!ljU z^|&9`Y)d_<|M(=+SH(TYEUy@}YE=a$tUGae-qY7AKZ51OKCo;rU@VtfyVs&qa9!Tw zI|pB!o3c*f1^0|)_pW8UJ>JZsVOZPp`nN>x!`Bk_$7af=EW03(!YFLfx_ITsRPF8M zf!0UvNZyM{TP8nQXUa_3dXLF#IJj!`mj|wXyXXGl!+Ec!&#*uLT-wIo`>DZFSxs^C zzbZ5CpW4k_lau^P!RSflRj;j^IitLK4EG+IzOd|G-ovAL@A8&!oBmr};{6ZhD_cD7 z%gNu)e^fGQidpf}RNobz3$&M{Xiu2W@bS{LtSHo5F=wN6B8?AQ*8so$w!z?v50c9%u-1;H%m@2w@lGBNJ}x$ zO*S$~(@ioqG1N6lGEB2HF)&L@PBhwlg5?bhQ7R|PahPLTv{`}ch#`w~;bNi5FRb|^nS9%OGNZ(?{X)gR&2mpWccq2b${pAfpyB^xr={81YbQUx`3B{!Y$~RWe&I<{;2A|4v`P+Ia7|@$U7p`%nC+vOE|e_N`H+jK{)uO2^gh z{kP(H=M~t^H%p&cHTmS>8NE+?Iis9z&e@%Mhfh$&Q^@a2wqf~k#p*|aaxzJ8U)wHA z=Ji<Ha%7@u0~(VW3T03_J^{2nn5Em=bEX@$~Ih*OS&)4YJnpvy1#az)e zepjh{^>Edi+LKrOWe&=3U2yJ6q58E$AF^z7y;*n6dofY}rNEiKdXsf7sbc%@Jb1OK z^V74CbN*>b`)51)yDY2SIOCwW`p!Ke9ah`rRaZE2W?59*&*QqA zUR5#va`07QcgJS7?)d$&OPuXPZfif{kzNtNSCHlMWX7)cN!RwysJ*q{dH?D)p(^*M qcoZJKwq)*sw`%{s=l?NeSgZ84=xdzXZh61Q1taG@duFv@+1fm=U79a~Ug`ZYo~OsMSc!Ab3+DN!pI1J7TFa{N zEoftUqt5C7A;r^MZZ3Y}GBHNyh<{%AifhZ4oLj!AeqDT0&Eh!@Cd{WDn09lW<2joA zNp8Wm@J8z?rA_h!d`?D;z5!tb&) zyAwU@Qj9iT?9i`IN_h~`jh#jbmF?zWpw^T`=|rFiCQMg5(6Cu;3++wwWx+&8D(n!-_A%=IvTa*y5mWvg_h zpHE@DzGvF2MAK#aTwba7J?xe!Jolu){MMllQMS3>l@{|>U5pJ=gi*d)fAQI zvZD1{$+oyAI%+=+r_GqqE6rKCk!1uC{ z>_d~7V$K)qRfJv)%JY`^DVDNPHb6Mw<&;$S@AV-h@ 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 0000000000000000000000000000000000000000..6fdc676416ce2bd169b29992a8ca82f7d76fac72 GIT binary patch literal 16149 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qnj%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&gF8Rr&pk(csmz-K$l3!Ge6iKiQ=aiU^DhiXx$+UwM8!7q8nJHEXOHB-n z(@aeb4Rs9-5|ece4O7i@laiAybuA6d(~M1wlT%F+O>Oi+nKvgB)o6$)s*T9r!RKC3 zGVt}a^2{qPNz6-5^>neT$Su&z%uKPeG%_|aH#SVuHAyuv*0nS?G1aw9O*7IpGqp4} zHZm|xGB7g)rwvr?NFfH!n^rK}JzXgBIEG;u7Wo%trf23Q<{()J@=Ho)ij{$7YO1-J zv5BsMWon9Uih+rtuBBO`nXYk~sj-=bk+D&tnHkJ4Sd782$|DmL@0DoL0E(O7)IwBI zM7)Cw-h#xU;#5$vVygrzSKuWzB%4D>8*uStm6!}Fvh9*Vxjr?;Mju5K;Vg(AkW~-` znV8W@To7Pr$8AS>Mrt0uQUhWXSQTzViu2P-$`gxH9n(|uN{A`YAf}>fLpL6hAJB6N zD0DzEl#@w8L=-2MQ5FrRhL(nA$;lSFX-R1&x+xYWX1Ym3LL-a;e?2O)F>EiF$alH)G`rP&SI9KHlWs$ zm48uYYF)&gat%>1gIR%DFv%HH!?6VFwi#ykx;G3(&$SA6K38+R$R3Y^fz||N;G|0uxj>|?L+`R#Hb-+^aI)_#asKaPwJjC2l zOCaGuBsm&fLqG_5gAYrWuw6b2?rv{(cmI7 zpdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T9 z91Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm z1qlZt$NOCl|hzux*veDpzgaeV} zXmAl3P!MIK!37BiB1yc##f8{YoSK(nt5mLJZ})9~;Bp2A28CpgAYTTCDpdxChGqta zpZ^&c8eTFmlo~KFyh>nTu$sZZAf7)d{-_%R1Cx-ai(^Q|tu>Q9{U-;CwE25Z4ky7`n(sdV#sq{!3mjAF&PuAqkdp_sM9PNfVOP(BQ+N-hDMN{>-+h?U&)0OY{wXU`8c;_tj zcT107(ciBIMeC<0&(>I4rr_RD{8n&QTUti9?gtYqclVl!Hu+68woNzqe2Z3932ZET z+^P53aOb%fr_>&2NBiXET;9K>D?4W**Lm|Z?;piv@&*1e=*Y+lU-Uijp~;N6n@T%3 zde)TAKG7fl@x|cj_8OzPHY{Dyjqna;^SpMB2 z!QCO}@UD8o?zmNRnqx{^EN%;`et#<=es_LmhHue5xqEXRz6<)VyC~~lxUjaV=Qi7P zSvJ?Lf4A(5Q2OoLBjeu_Wa}|i?)Vy2gKSQtRmxK$4s}FSOLY8QQf%URa5KltZ+0^K z)=x37dk_>mVU4*TM(q o_#3OIub%RYfBwrQP4>(TESdk!-t)_y18rRQboFyt=akR{00r{W-2eap literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..25b6c2c74b56dd39488bf773056c0ae650919331 GIT binary patch literal 15992 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc0(!rTcDSjnPO#;W^7_+W|*XFZeVGsn`~^7sB4*+ zma1!+Vs31dl9Fa=Ze{`wL|q*)%aF$-P&sGVR0pUd&BtJk%8*o0hN=ycoZFb3^?2(#cqmLqr za27-l$SR0}Ow8ycE(kER^5@K>b#8gym z=*HXVgX)5uOd3Q)abg)|(U6#Ekz#IcW~iHFXpp39Y-Ez6o0w#3tZSN@m}Zb@o@!~B zWC4q2q*z4vA|k560SqtYj6#fztqd%!ObubB93;TNs&E^E8lFTHzz|bWwc$2CIU_MI zJvGHnALcWd0J@gJ9CO5#hme3FG3Kz>EfAxIbj(5G6SYi)m9v;-s12xDVdY-eIYH;ZZ5e;&2v*WVS2loR&eFCr)yw0H&1L`nZ84odc)DlQI5J`>( z7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF z1Ciuta1j|$5M`sm1qlZt$NOCl| zhzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fu zXmCNofk+Z>aB(3v-=^lJ*eaDP+1q*T|F@BWfk7eJBgmJ5p-Pp3p`n?9;pcw_hK836 z45bDP46hOx7_4S6Fo@?*ia+Ycz`*3=>Eaktacj+FYyV(IiMIa2iw94-2-hF@DQT5? z=z*%HXQ;qRg{5Cvaxyg^JdDyv=-%2IbW5mesV+xuBNI1EvSG#n4lQwJql`NeGJcmn z7G78sc(^J5liL01`tObR&S&5_zOf*uL8Hq(D)3X&q9^`lUWr*>{{Fec|K6SLtZCS- zvwSgp^3k*7J5}NoXYctVyg=ipaMvXJt5*e_%}SCCBWIr0*|2xx>1VrZ`S|v2+`Q2} zAz@0~XX81uzVJId-nm)))oZ4b)1GqWJ1PyQCujdvUVS?MX663lub*c>nHCli{qsPC z#?cMcV*R$=VNVaO^yGFroXZ^OKIi=WeH(V~J^$>NnD)+4wWLh3G_ezHo0mM2yfjfW z) zr^lp^8IwK)bga;K`+3!fnd`pUj-y!K^ zcOSc%nO#)9x#HTk#6ABx4i+8nx&BV^g`}dH#KLH!iJYmP6^DMjVcxN8{-rhRmw$8= zzGQ3rD@pcPR~pYH1}Dd9m(2Fq%DKrLmN1RFC4Z`7Zrr>r-vUd6kL!ktu2SMvTl+fv zg@2^iZiy|e8}6-LeDsdz$E{u=u1{Z_%8A*vLX7L5_aY6sbIXjhU!7KcapfvUlfsPi s^X)!Y?_kiF;vsVM{|BGrtTplso)IC%pM!r+2ki~_boFyt=akR{0O^{#qW}N^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ad2bc73b050434757dcdb03be5da95d2850094bf GIT binary patch literal 15971 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tXHnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAchEVThrrm8qqbv8A?wA>0fk zmFQ-qmL#SmmLw8o3bI-xb5fG6((;RP6HDwea}(23^$YUSZS)a>NGjo}%E~!EC%?!y zKPA=9*hU|lFp@5CO0)9JD=taQOHTE4v8%`}(96tBu}U*FF-}fPG}kpSF|^b*NHH%juo#13l}BcA zNq$i!Qo4neLBXkosG=~5oJ??;RFGIyoC?Zuwo0%p2QS1RIRHZ1fOD=@Vlt>Svr7hL zh}0AteH2lIvmkmvRzVbGVn!fwp^Tv&w;kmfsd@M^6vQa7D%^$?=ckpFCl;kTrl;nW z5R=y-rlM*?H{M1cRQl&+(jX#=6U!)zh9q+{BU9tVG~GlCBMaT66q96K3-d$+T|*ON zOOw>3M59DwQ&==3#Ui>F5m5~eVAOKW(9p^VUamm`46F*bA*kU=M3DSu8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb( zf`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3 zf+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=# zBpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&G zMA>L?LBfGZ5^r#EA-3D5=B3ywl`GlXU6+m(WME)WNcITwWnidMWngG%W?=aFpMjy_ zB?CjL0RzLU1O^7H84L{K`IF+0x-l>?xq7-dhE&`-GTGZBB$1(Y|Nnc|#&OFfO^<(+ zoYmuzDImnfnj9h#q1ohkZCTmYPBGD~oKagkZf(mAN=6{ZaDwq*4-1knsR3*%)XJ|CfL<O{r$9c-Tf6Ly^|jlADTNFViyl8Ivbd=6vGI3Jl;#unWnwW+ zYZATIhMX6E^Y)0TS;xeliSbcRD_69*v=f`GtH>=HOqnKx*T_CMOnovge3>t`z$|N4!DWfKk)$3lHN3t4im# z?Upw4^%L$-6XAdMhr=f?RhHd(ZS(hwPj{a`Wy{&NY_HGOxqt7b jFrKrI{PEu8pA^H310TgFPXE>o+6M0F>gTe~DWM4f)v%_2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b83419a1a2dd8511c48a6304559ac8460cf9724e GIT binary patch literal 16095 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qnj%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&@sr`(^K^e^3rYe5rRl6;i<~XIX@@A$TvSF z)y~*PADb{%T`u{_rJ!W(n3tSdT#{c@j1)<*4Cj=Xjw%Y1$jP*W6dNh|$(bou2um$e z&5cu2%nfx74HA=d4GmMxbd!>kEp;so%+ribjFVGM5>0LNL76uv6V+&lD5{Of-ofWy zP%`lKwerj>E=kNwPW5!LtH>?T%gju%GO$caHZ`)e(6ul#FwnKIFfr3jOi4A+wKTUh zOtMHaPf1HO0jCXA?MNX8&YM;++dW+<@;HWJ7#8^#Wu|B5CFUSm2=YrxW{Q3EMWU{uk%_UPiG`(cVyYp`FIbGhu*xG76z`R2(Ey5@;M77? zQAE6h3*LgnqT*Cgv0|$PD_7tpH6)uuNE>kRWR;i*IwYC|_3k{{4> z2`F?xF_e=@K|~ZMmQfZB#>r{P<|%3Bx(3OHM!HEUCTY4BmMP}C#)jr*21cfdmZ=t| zuxLh#MRYHMJOc>|Z~(&#Z=(<+V=Du5D-$DF;f5PSSz>1dwGB-eNf)R|2Wf8v7bGU9+L@V}8k^eaqYIL?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$NOCl|hzux*veDpzgaeV}XmAl3P!MIK z!37BiBFWLsqfNH`Eljs_Qz z0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+ zqqrn9U2O>$l!NrBxQ=FQYVyjfHWN#2iKER-;T|=aC9|Zr#}#@OXtCZ7+OTzNr<||E*?j?L z_fPVFe&p+vzaE>{7umg3Y_B|+x29rG#PJs%2P@-(=b!gD%~@G{(6h`>eZ579<$M2N zyR=!&dlqC`@7W?7mfOyI`(a;Z;u}xL)7pWFr=D+6SeX?S^?0ddT-=5v>oqs{tlw$g zb#$CGHDvKDm9RYqx;)Wbn;y30SS%~O@=T>8BG#ue+xp8Ewe?wlavIioO^OIC6-~B( zGB-1Eji+N!pJ$u!qg6}pe&YCKd}x!xMbW~T1*f|Xd_DPh!miabzA2^MZCLxhX`7bB zi%9|E74CYnQy;CKvd=5??GBzPi}t@Y@UR@A-es7?QV~zm*We{0OuK-P6_2Wt~$(69C(ez~}$~ literal 0 HcmV?d00001 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 3351cdae0c6797813a1795c3cd51ef366ea05464..13b6fec890cf4df8998da0ad0977a2c46b87e6c9 100644 GIT binary patch delta 725 zcmdmAy{=}%W@bS{BV7Z-5CbDC0|P4~b8Q2|$w!z?1u;drSZ1kMrWhn9CZ!qanx+~U z=~|?j80lJA7#ZjqrKVaYnVFjzrX-n7KEdM3n__Bgl$L0brfX=BXt7y}bruV8dgVCG zF|FRLz;(os<&MsYf0JKW>(w(cdAc};RNOi;`M!5>p~SKM)9=2Omx!%7_-M`5o7c+D zl@!nUn{_VrnaKG|k-JvrzMFny#_5?q76&Zi_}C#N>f#zJQL=H@t^eOXCMo!GvglVm z*jf4Tr_G)Z`>WsTLmTvg^i)o2^!dC0+a~kV8 z@{&1LW|{EYZ7TfG`S$I5k=4IjxP6`az3y=GTxRw-cV=?*?M1tO_ieZT|KZsabN%wV z4Rt?Sr*2i=bb39<^Kj3zYm=5_y_jk9sf}N;MPS|sfvtO;*Oax3&-cIa`&W0;-9@E; zdOsC+yXurjtH%jP*XtBQdB4|AcB$`M6P0*ix}s5pl8nxy&%Vhn&pmxZJePQ@ zB)iV}C(yNh{%iBO5pVkhoH!IidH?^Aar|$xt6HYNp38Z*YpJh5f&ZoFmp0xOeN)S~ zrp*1%TVu~q=dXQ5w@th9o^1SXd9KFp3iF1WIkp13-;3HcPS4 zO-eSg)U`BDG}KMANJ&gFNK8#mPBxr;g2k2BBGueDHO1Ue*U%s_X|ojTEEeMQ%5hln zp}JD{ASat)B4xc$(rVVi&+mWwO-g%F;d-)Q--F!aE}>W3nd`mNjgHUMm(+b%KO;=r zt-C8vrSj7s=B)?hANJl&+_hrDcYDvU{T$P^mpz@7r?AoWP^Zp@$y3rau3Zl_aX#+t zrMCS$&*m=AN_YExPi;8Z(OF}2W5u}C%0 zO))aD&`nITFx53pG&ZwLOf)yMG&IsS=FO}rtMpz7B$Rpah??~lK;oUbQN z=65^t_%HjxOKvaHZasVK*`2uV?9FwDZ;QvW{m!cA-6Xhc_Sqdl%xdj+^WWOdUlaW3 zx!gRHk4rrDlZ8`buQBY`)88@IZ>C(S#qH9H;E*G(M;F~YdX>i}^HD}<%-I7MSCy1U zefd63pz!7kWBrydMrQL&J}lX2^pCgll8TS{%lA8ZigVT4?F#K4JWuJGAy@h$J$BKW z?nzriZ(QX$R8l|ruyT8tQuoc9a{TQZQKvQWf3s?M-Fb?;Zf@rDy0&3*D%#{q z_3KZ1x;TbZ+&VJZJ6|YKq%Gajeu;H?U$0>X6E|;}l=s_km+mQyOZjryyAKECU2F2- zPEFV$8s*(_=}52V-`0Na9MSyDORoE$+^sqJdCr_U#VQWFyq0Klr$p`xF&y{R5dxEr&WEKhK%5^v^meb~6EqFeKz$Q7ZU zU1GMo4{S(Hc<*lUN`fcKYVo;Zt8EXKsOsICXtFTi|As?13!D7gBX{*O$^4>kRr8_u&QEbJ&k47a-GB^ES zPCt~=qflnm6U_5qMpN}VX<r&5VEl8Xlt0WqH@^zfe zx|!V`lfD#lP4#Jrcp{kgO7i3h=PwJUpZ}@R`s2?03+w%-rFu?MyIgSZ+~nJF3vxI@ t&Y!J!s*hb#d@^-`=E1G;kH0fA+?((^;?7j#Zww3!44$rjF6*2UngAyh8<+q9 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 4bd25a354414228de657a5374fddbb1b3048ac05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15055 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_sN=nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcrl;x`Kk#BxVs-3ZoJ~m+_ zUEnlk<(XGpl9-pA>gi%vkz1gbnVDi`ZeoyPo@SY9A*)cVHg(q7iFer<|XDJsR8*VB{Rj!BF!u*Ey=)4 zH!TTdMUqLXZc>t|sjh{Iu~Di~s&PtkiZRRzEXH71<&jxjl3!Gblzw4lQE+M@swhk% zClg#Y6(klFr-E{xtr9Hj!3#4;PJoa$;2dm~m<%e_?2ZAW=VY979f1u+V&3b!G}`DrEPiAAZ7>8W`o#N>I1si@k}jknPU)dD%0 zG>C}e#4^gFfw)`+@g-6$qI(e$)!+bzmv3lg6T}>_65J-B1||{ZF2qz+ZMcn3&PdEl zPffAYhoxSa0J;|J(FPGk%~r6iikS^loVTV~8PahNzDKWyPFQ zuzGVN0|NsCeM1ll)ru^Qt~Ccss~*HtHwxN8j&QR8X-}I)EWb4K!|9N zi<=#njXt;$32IP+rQpRDtr$>;(aLy;xucdq!huL~G`NTiD2TGr;DUq$k>qG_5gAYr zWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>( z7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF z1Ciuta1j|$5M`sm1qlZt$NOCl| zhzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLcKUAj-Zg*$$3ZY zxEKt|!&w^`cku7n{cO&pC0nO?tm3`$LBd&3anda|qs{DBc-Ot1dDA}0WzJibcs8z; gU!xD4uX`xLa5&`j)kL@a*Ptz@p00i_>zopr0Ctv6>Hq)$ 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 c35280390546ec3b1fb85c5bff48a13128db41cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15239 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_sMFnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAccSYnr%o0y)eUyzq>qmK|oQVCC0R?hi3`9;3@DXDhGHu~6vk#vDm znw4i>aY)eUY_e810guTnfr9o-THff+ZzCIWxry;jAQ6a|?4b3v*pVgG5tZL&H=v z-K6AXOI=F?^E6`<12c0oQ&R&YU1I}t zLtS%olN8+~OCtkabJN5m3zHOc(`55xm|w6MgJG3NW^qY=Q6*9;hLuRcsfDPbFo~Q@ za0ykASX7(}%73;>unY(<(jfT(LfU}yu~lL+sBE)K24#=b6dQdMQG~M~dO%h|6l7vX zCvic5p&hp!}rlM-YZG3V@VqSV` zik&_z0mB5)wP24qh$w2#g5_4soM;28oUHtdGE?(P62ZC0&_*9a3}G`weFP{s=9Gff zn;RJz7#Qdqf=H-VWNCD*k@&SDOQUN==nT!vEU`0!+J+{KqzhDoLW=j`g2d!hJ2O*L zV^bS_bYXNI0htx4IT0?Ixv6=@nfZBkhGtMb=n_~pM&i(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz z3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAdCO1!=E%WF9 z_2-w4{k~Z8LFS&wJ$1$VDog@zC%w4eaQN@u`x7LzBjdA$**tn)MzW=wtm^)(aEX6{ zMC+sivLn_i+X#PY7Fd70kEIpGr7#2W>BLi+KHtoqN$hv)x!qGI>Ljv+uFP4aQR4H>cVc ziECTb6Mw< G&;$U&Se>N+ 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 572fbe34df0142dfea7930b3e8e393b1f4d2f6ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15337 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_rCcnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcRlqtw+k<3X+wo1z{%1tb>%gjwoPt`BTOSjQS2qLM3rz$Jw{G9wE-~5zRJ7XJt zY{FP|x#TC8f|9jkUUF)2Nq$i=QY67LoKs>tswhk%C({m6Y^3BTXQo&oEHyGVNi$3{ zGSoFpGc(gQG)y(qO*FAg)3vZPH8wObG&M-EOtH}iW!{`jRHGrHs5T;d2cLUE$-vjw z$}_LHBrz{J)zihUBDX*5BGqlhA$ z10q_qJg+v1@R?PETVf6@f!sMa@~T+=`hKZ9sLdm48uYYFY=)?h0OiJvbgc-Tp?R4lc1BR!(1ek6 zff@#oS}V99F*()F%+%D_)J7j&7+ps|W<_dFgiB^_YF=?>ex9A78B`Ct1XhiaxHKY3 zKs7?53aPaTE({@}K`w4~TsHdPMlz_u43>hIT(n|99Y!nTA?A)+0tp8q$NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37Bi zBFWLsqfNH`Eljs_Qz0R>Su z8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{K zN#YGIF2v5%)Vvg1rE(>EyUvF0vkVLj3dtTpz6=aistgPb%?u1b|1&T&ykuY~HDF+P zmB7GYHG_dcJbzOBQ8xw#h6SE3jv*Dd&P+DsV^-v0`96K(A>(x?iQ2yQ!tirX* zW8I|>ZN80bloR>8Oxm9udvNop#DpXEjh`8=crp4g78P@OFzW1VYvN(lY^c%Ik*vAz z*lqhn;DT0l#2ZDS1zoZe^si2JwsOe6y>@y`v6$oSY5M9y7sOU++vE#39E}ZSY~$O* zUU#DV`s;bp-yW1#yt%mAFW%Aj;YE{q&y8!@7=B$3y6TaW*?y}vd$@?2>^UQ BrkMZ$ 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 42e83dd8f03ff18f29ccda96ae660ccfd3a30b53..133553f1c26330c47de830dd6a60ff7cef2c13f6 100644 GIT binary patch delta 375 zcmX?H{j_q!W@bS{LtR6Q5JO`tBV#KQBW(l2$w!z?v50c9%u-1;G_)|bFgDOlvoJ{0 zH8n6X)=e@sFwiwjHcd`6GEOo|GcewKg5?bhQ7R|PahPLTv{`}ch#|{`H9t}(zp&P; zXV~fK;uunKE9uAo|MtwPGZJS=UAT4Y)Pl_gH|zb(pZ|Yj_Uyl>S;O@skL))ux>K*F z+4(=G%u_HYF* RXJBAp@O1TaS?83{1OSQLoCg2^ delta 596 zcmaD_dANGRW@bSHQ(Z&j5Ca1%0}Cr7Lu~`2$w!z?v50c9%u+E-u{2IGF;3P^Ha9iY zH8e0W(M?QCG}cWvPD!*dOfoi2H8R|Mg5?bhQ7R|Paai%8+PztU>xd!C+WXb+lV4ct z)iX}_ba4!+xOHUmeZN}_BJIB=_FS5G@L0<3h)WWZNye|EG{Tz1jk$Jg+^|SDAS&!P z|AvUI(x>Cz+-^d(tr94h=;(z&@>4@F%p5%d-RS-ejy#U$?0 zvG*KlqOaW7R|IWnF^NqPd0RYvzQ7qRm&~~uwg>9JqpffeG6VHF~_T&?~l}ps);w5dH+uH=QWMuVIIcK2BsO` zx9!+)zaY(P&P<_4&$wGw?eqM%)${&+<=wVQe!PD&dlSM`Prl-5SM|xBoffXN%g7^$ zIeU%4o{)E}^|SOQJwN_qvese;RUh7}W?8@8Lfc}GbcfyvSZrK%diswEDy9X=qNnxj zI3~T8^2{>Wd1>PtrDfZ@U!L5t@R&vb=Q7i#nO&LFGiD3r20!}Sex1LmFZkJ^$sd(k z&s9!*`Denvh=q^eBw1S5JDy$>^Kf(Yv&F&BwrGDmdFz<`=`ZX{4cr&HS8teN;@cUP s|Jw7#eAi1Qg}NE8AMWq}_?%&)spf}U_XKw^FfcH9y85}Sb4q9e08NwraR2}S 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 f53955a651d0e9a5564005b86cb09f07b9e9fec7..d0806030f92e12ce807fa9cb5243b2842e550506 100644 GIT binary patch delta 402 zcmbPN{kn3)W@bS{BV7Z-5CcOiBNHoAGi?LI$w!z?v50c9%u+EnFitTsGBVUnF;7d= zO*Aqw)=jiXOVzbBHMB4_Fi1^HG&S9Pg5@5IG7%~#^K)2WvF9RN{p9oPT$^WeSsSuE z442w8`Ifa_J;PZ~7srr_TW=e0B+|&yN3UfW5W^$<8x5|sR^X<8Pn)!X@c}}g_K5e||-i)4;0yOV> zayNeU4w@dKeed=5`m9x7XBy6zV(+=_{C0KkO1twW=AS-(QcU6MbhDTtb7NvDp;gurbNBz;_1$q_0kid?t92f%3qC2Q7fW#YJ^W^|Wc5dp8)psVdn#X* tUD~?g!joU8@422Yo%i8C_a8on!k&Y7ni#687#J8BJYD@<);T3K0RR?;onrt1 delta 578 zcmaD|Ij?%dW@bSHQ(YsY5JMv?QxhvwQ*8sI$w!z?v50c9%u-1aF-SEsGD+Tig5@3yQ7R`3a9D98***CjThrw8>|C2?b6Fd* z*iCa{pM1+&ub#2N)5S5Q;?|MLJNxc9@VLnTp0G=`_gdMOk8S_{%YSUwSupe9i>!?= z6ZW+0TNosS$F(Z`)JQva|HQ}jC8tjMS^f<%|8tThfVbwdz-+Mt>rQL!=e2m6!uDj{ z@)wQea?fowRYRtly7>LnbzvyFEWu>wa%;+md!H3qwuGI#?Uof?zb5PehhkBr*tVa? z_PkYEKIe?7?kcaW=x@1?FB=$~HMVnO+VIXg_P(LM_BqQC(egJd8iniUJF)mowM$n? zZ!1(`J6{?ZV7%-z>vNftoX%b*hkxX$ERcFDmY_4E9po zs=HKVTU6yk^%)$lQ{x^iI#pj1nYs7*=f}#|A3xZm6Y_k5#Lj6>cg^=SSk~v;@$Fr@ z&OPK~+M87-_ZAy2TD73-8dqpw=)K9+v0;J@?fW)QFxncH65qM<@F_n{>vNXhex>a? z)7^36yTaW3%{C1`C03@b2;CO+E_~gw>1Lbm!N9=4;OXk;vd$@?2>{Rp_xu0= 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 302ab18df86a9b5373f0b82494e7ef95f0321a6c..8d1b13966f93165f3d087525af749cafa8e5f4c4 100644 GIT binary patch delta 363 zcmZ2jeY0}IW@bS{BV7Z-5CcOiBQq-l3vC0#$w!z?v50c9%u-1+OEO6@v^3N;w@5S9 zHMKBF(X~iQw$wFGOfgPOGf7RfG`HM*g5?bhQ7R|PahPLTv{`}ch#||h(!ke~Us&ta zGpzM=aSW-r_2kli?xp~dw#0*fg+xj;JGc38%ra`Pb4YwSb?ySZl3jF6P(DNDXfRa)8b<;NUX zU0!!?;oL`D{NWXQc;8rarf+{>q*d73J}EkEEr-imWxH){VLg)!Z^hp@A)75J7$Nxi zmy)jxQ&v0q8UC(4uhLOAm5qUcfx*+&&t;ucLK6VL CLx~~) delta 564 zcmcavxv+Y}W@bSHb6q2o5JOWdV`D2*BW(kt$w!z?v50c9%u=yTOg2bLGfmVrH8oAq zO*A)2(zUd(Ox3lpG%zzWGBz?XNHN@eg5?bhQ7R|PaaahT+rC+W>xdzX_qX;5lV4ct z)iaiQx;TbZ+&VJ(uK%q7iT2qAnU{pPp9bhy#BTYU9DjWim_s1 zo8SK5Us;yOV!h4dQLFg=*^@upystc8+0WvU-}xoYacR&^&1E@>r^M>lzh{}b$yGs# zNif$lt~G7?{s=j}$_zcvt?O0h&fxyoIq8Awl$v@E&-Gy`;@ZdLizh|7-P)OaYmSk9 z>?CQ|mnxGqqg8&%@~dm7-JP#G(r{BpoR-1dYs(Ae^WdXyD(;mE1+$WdIa)0;!lf6wFrwN6-FV$-7 z_`t99CvD3pf`ZrFE0m6e=6%d&?5pa%T#)frc3p5)Yr1Dn1(T{w|%dNui#R%t&J&yW zbN?}5S#MXiW%7O-{rVlAE{-7;x1LNgCNsnV&j zJIQI%#gwOQla1y~sIfa^^y;H{O%BidUsrzb>u1Zj@A5maVcqLlb3KaQpFg;B5l=*0 z@CLiXuZ~<6>v$%ym1{QljY-E#4sOj-RI2L>Y~IfJedghv#t$#ZDPA`G=GUvZ?y76% zk=T{T&hk78tICOHo)T{{%Qa>1`E>~jMU|xuI@bkvni$PXegFBxM0O?NM*<%{^=qwu bV#=Ud@tdjXs^U%t1_lOCS3j3^P6}1{rLaio>_H9qJ(ro{ozym-^I`U zE~pOr&pwH_Vng!r|MQpk|NXxy`}Y6y*i#R%X&J&v# zbN?}5>3;C>#N@>``t`RxT^vIyZatZ7pM5Anre(gluhP;|4n19quI5%JG4_+!4jw$K zf5Fv0(f#1bg~>S(_HZPztli#IDDV6z)M@k8 zu-|dky}KgR=FF4%y!B#F+xj1Mq9-RaJouNVz!ajLy5(Nb7cH%`>FK4`_SzdS&YElJ zlg`~0cTQ6Fd%LV_@uBUUPu4OR)a(%5Y#b9~c4a-o|0mq{nHe_AMrVIGvaXGRfq}u( L)z4*}Q$iB}BKo6Q delta 502 zcmexaxu|-A1(QwUMypC@K?8GLBhwH=BP%0AD`Qh_1Ea}Dm`$;Wa&)mCP%XBPYz-iF|^T#iXy4C z(Z^%vK+a}%RPBi&TXN4n-uiFc-x(PW`a5V}R*Vs6U|?YIboFyt=akR{02^#A|> 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 3607cf8f443c8c55b5b92b87705a8053c8dceda4..1bb1f1875ca1849cd43467a3112c751859cd5c1b 100644 GIT binary patch delta 440 zcmexb-Cwm~Gqa$fp{}7th@r8Sk+GGDfwqC+<8k-s=nI&yL!E%p+bT&E}d|=zKfIH%cm;neBaDVSn$|NsBV3EQtM`~N<^_V@pPSGWHcKWF!|{@Its|8HFR`~Uy^M!{&EITk-3 z?C)8@aCmk3e93=*ejnfP<&b7u^z(efocVEQJuYzb@bK`&*Vq3~N_d`-xa0pv+rz&e zt4rAU^h)wP71{8sK``9PWA=t0|0mDxm-wXAEHOhuLh{ZV6NyeP7m0#v*HQ(HHzrj4 z{w&SBZ%do8l&i%~iHI39B<9upJFwyBmrS-r$q!#0eJ*BD_Oq$?|6}WC4|*8qY&1CZ ei7A1ht#I~>$HCX@85kHi89ZJ6T-G@yGywq4y}5t@ delta 665 zcmeCL`dYnVGqa$9sjiVxh>?+%shO3jk+y-+Lw-`C+V6dnHm}yq#2l7B&KaX!E%p9inyMCbLL#t+t}k9%~^yd9$CV`^1B6x6G%k9%|KZEg21 z{lBLQ&4jkAZfRW*?0mu4ro%*C{W+I|X6r8fx4mtb*!u3yHSDgb_gfxyDdI(}_OkXv zw}ZQ#3iq9}mvkh58z!DX56aTPnCpIr0!tW=cT#(C3wA{Tz0;GM6bXQs2- zX=U@=kXwOGSGyASKFfMn@%N0Ob-7NClhvA;v0Mv1HS)EbUVhkjcveHA{-GSyx0XP2pMnYHbs z$(7ZW&V82i`rUs_)9(NBQ&V}i$Zi)rGbJ59>BeJ*C7?5LA?=TUcG zK~|?ZbIi?4WqtbLM`Jx#-sfgG_IKWkBbTSP{ahAQZ&dm9{{D}@8Q2dn#=GQu>|kJE OVDNPHb6Mw<&;$U0ycRM5 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 fd49fd638612778afa307836c56189fb7f469565..44272779c20f9cd376abf38f73ea966d39729ecc 100644 GIT binary patch delta 409 zcmbPNv#DmoW@bS{BV7Z-5CcOiLklYt3vC0#$w!z?F-13Xv7BL4wn$A*Gfgov&`mQ) zO3^hkFfq|hG&eTVO*Bb0Nii`sO|?kd{FC)9iwY464JHS0nqyitS&*ZCGCwER=G)xX zhAjHeZkSA#vemD@;_2cTQgJKk$N&HK%&IdIXGj^8z6xoJ6Yl(P{AKFD_5Gp0?k`kv zn#DLZYt{e%cJF@wf1GvdzkT@P4^mB`9}*V4{BO^H```aPFMj^N%z5~~f4SG+^?c^P z{P!^abNl~4?)&fm?*;GwH?RKsuii@YQ+@svhL3D(Lc`N7qIJLgzbu)x`hUEC_J8|O z%^x5+W>2;`s~-LTU$ptx|MSN!|LJcCQ8?T1|NnpEHCreA|NoTj_5bMI7XS1=URJo< zus4v2CtLT)|MM5Z{_GEnotwCJ*RKw*Q%e#KFkD)C!}}b={P_$F3=E#GelF{r5}E*; CowQ;A delta 385 zcmdl~Gp}aDW@bSHb6q3D5F=wNV{Bs;7_ROj?5+$SqF24V^uxQiC_I*dA~XJ@R3G z2D4tA{;&Ff(|-M*Y##dm{LM38_Sb73{=d@O!{EXH|NnVXg(d%$uTT6DA7i#eTBIk+C zi@E<8usE%rc6st*8~yq_o-U3d6}R3@_Vqh#Akb=WZoeh(hJ#q_7m+(lgQ}Ut-V`-? z6*Pvu3XE`CBDXB4Kq}Ey;LR~ZafXwj;yD$kmtR~yv(orb^?6mP!iE3j1pcRpxjIHp z+m{=i_Sv%hJO6fv&9SNbx!8||dD?8*sO(*rI}6KvC#gL@ zx+7Ni#qW6*eUfVuQ*=+CeYeMY#VW6w+OiX!E}E)!tA+pXKk%L5mU3t%+taK#1_lNO MPgg&ebxsLQ0PjPgK>z>% delta 530 zcmexWxvzSH1(QwUMypC@K?8GLBf}6QV=H5GD-%;~1Ea}Dm`$;Wa&)mCP%XBPYz-iF|^T#iXy4C z(Z^%vFBlBbnv&|=1?y(T1 zajZ6hXN#y)?c4p zrFvwN6{o3w09RQ_mOK0I@1nn|_BA$jG;3IWIiFsBHFI}Kdc3-@F#WF` z-=A|2H3T2ZgjxjG=RbHNyR7@2o+8WImv{L7?y)b`I`Z-PW|r%wB|N_$PkZ`o?(%Ow zqHYDo{L-}>wif4_o$Ok$P;#%WS7M7rbnyhyz()=elck)e$aO0-d|7TD^i^BpalwyG zU*5%qtQ1JDbv#`BF)KXeyWdZ-H7z@qdB#R9De_z?R%cRKdn0o7j(q+<@sfWg>(=ly Z)KvPv=GBz_dF*35SFiYKhg5?bhQ7R|PahPLTv{`}ch#^aAA&cVV7uI_9 z3>Q6J978H@J-M_u>rjG3+r#e(E=yRauV7L7!M-cP>vwHigsZP=%Z;vu0a=AB7p@J; z5IuPE=+(u0Y?%}fp5^;q#mnE%P~=y%u%W|a`%Lu;4Wpv29k)E#R-6)@ed6f`-p+ZV z6Z1Dm_da5dJDu|X^=2MfyLlq7GuxMy`sO4AoX+_8{ocdsM;myeYuL&wzAydJu$s4W zk6~w=iT!1>ecNW7-=e~FsBY@f9cQnv?hQUaSLV}`UCybWu4Nl+Tz!T6<&%chygPMM p0-ox8o;j^+>aXx{ze|M-@BB`LXnc3mVqjok@O1TaS?83{1OTfQo(TW| delta 573 zcmexcxu$xxd!CSGnaflV4ct z)iXADx;TbZ+&VHj(EnC~NL#h{G?Q&k3qO3-UivnCLu#L3!s!xkhSSHED=8Ii)X4e& z-`-}ofsld9?2k$6mHP9a&v|mzkm0ee;XR!n*FAl@k8Fu^eB&^8u~3xOmXP}Cds@tz z6<2FKwL1~f(Gq!Mkv(Vrt#d?LG?R&KCV#-aA$mOeJn?9o^@|PW9U=+kfNxZvRaw?^V}oi<`H<@W`^nd&TkomHeLn$C%+-Qk$Ur Ti@rt%1_lOCS3j3^P6i#cJg{h^vuAzlxnpskEvZZmF@#avrH!MV{oV=RT9MiJRYq^gY zviRM%J2JV{R=@t5r;B4q#jT_t|Nq-FtIkN2kS;J*{QQ6NlSlvMrGNk5|7o7vEXMM= zLI3_&{d(|!{crPs_4juE`hR#*!~Z3c0%2eOU;kSCf4|)P5C7jz+WFt#I`W^rQvT2R z8O(NRqW|l+XFmSl|62WT{pI-I|I<89{OA6-?uhh;@Ize>TUP!2UoM?<{ZIW=`Jex% zRG#>M_tL^6)eonBH)%^RWc)9`P5f`Y`R>2}7tiVWf4}^^s;*exk(U4a=SqM5-#7W~ zf8|r>mPmh4HJtRY!|lO;X03bw?Oj?8C*&O9IK|z-$dG^kHM7{w_fHrY7#KWV{an^L HB{Ts5ym7jC delta 407 zcmdl|^R;Gz1(U7uMypC@K?8GLBf}6QV=H5GD`P`#1Ea}Dm`$;WarS|nMT>82T2CYo9rr5T%~nr;5Y z`i6xlm6HQFEqGB}G?|a1X)-@2*XG;Y)`l!=vS)Toma^5a-{a}x7*cU7>Bs;7_ROj? z5+$Sy)~b9vy!Fun{^^@z>?hh;*7?7m+wkXqyGwum_gZxS zS7|-STmSg~dyshd)?Y#OhtI#TKiODeeC*f%<38>G<+)`3-}l&}cDEr~^4fpRK8kTIiY?rx>Os8yY2=rBtzKASJJ+w(ST0tk7{}o!-_oOX^O{9jV1Dt2Lgl zTeS7of8So${9MyHAAibLSa2<<5q|2<7#b?7yJe$S{|_@qsS8fCf6Nh*RX(DqwquD0 zt%aV<&&R&y2#fv(>eFyr~cq+CuKVg5T^vIyZXKEIn19=V$F26v%?P#SrAeokXn2*~DU06x_rLwOGLPAM-i@L!5}E8A z1U|@d24*!pGtRWry^&)k@5LdjSn{X#pQ1(!-}kQQofH2ETiO0UQmfXPILlH``>?=H zp+B5!kF(d+)ThnsKl6Fw9B!qVQDS|smEUo{`&xg=b2GQ~nK?P!3pll}SUBrs*o!zh7 z8ta-Gm>B9>nk1U&8kr;+BpM|fS(>D#PX5K}%4=wnYHn<5XsK&xkeIaDhiw)Mae4zd z%`xqsEXYwmnV*wu^KEWxLzd0Fiq4azZ1wB+db&7&TL12=tNs4JZI#$dwi0jcfBP4%{q=um&$0jA wpVI!H^kQGWbm_nQ*Ny(#3r#lClrUg8SAF$_`04k43=9kmp00i_>zopr08X2zhyVZp delta 365 zcmbPT(^9ixGqa$9xvr66h>@|CvALCzg|>mwf$)h0{X>enyxba4!+xb@_cA=e=ThSrC2UNLJpE-h-(*rml9$ggnj zkyeG>%4VQz1U8T*6TNw-aKc>pBSKiaN(aOap%H-FB$dV6gho&prq}*Hf zv2#;LVOrbjuoF3dI1P@zsd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc0(!rTcDSjnPO#-l4hP}o@lO{Xl#(CYi4F*q?>4% zWT0zgYLJ$gY-DC+l4uSNL|BMSqQq}0S@UCYEI6WwGJ z6HDDhLj!YN(^N~#XRGN~Z3s5ljr<7|~+Sq@%^L2>|uv;pT_tHfkbX=axU$`Gk3 zHu@-{2xmd`fUJTj$i$35;zAiiJ8nD5Gg9;LWhjVIU{$ycDb7zTDNig)bxcpqDmWi;U9J36y0W~D7{EISE^GXuI z<({F9K86?~%|O&gfXdOFQm}e+BLf2i1ARjf3Dt@$jjlBkzgA>vbgc-Tp?R4lc1BR! z(1ek6fm%C|syMhHF*()F%+wT=)6s>|bp&Kqq~=7pWag&k6=&w>*%_MI=!5m3OJLO) ziAy7r1XLp=s*sw{;L;N!8sy?;$7Q1rZux_H0bnV3okJ@I)M2zT9%AmOC6I6+k{k^# zA_EGdY&5ta;Xoug8eBvM6hzr*a6!U>NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37Bi zBFWLsqfNH`Eljs_Qz0R>Su z8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{K zNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLvVgFOq?QK_S^A$d`ekN|k}3p_zf<=YIx-SVXi4&If|*(A(&_@U8Z(QMuMCmuTgwS7>U9v0gA zymH&R>_r-n{?>6jOj0?|;3#loTQ1{;sA8G+-p3K|HWh6@WWZy_|E-Os#%KhRA7wBCN+|+&}x` zw_V@kf_dtnZT`zFm@+9fGUEEwWtmTQ&-wG8DV~|(UX{DzvR}0aKpT=hUHx3vIVCg! E0PWfL=Kufz literal 0 HcmV?d00001 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 8e03a4094418401b5b093249e34b83c6e88d0c33..7f8cb49b1ef2e40eb0d6646a7b5a9244671ff69a 100644 GIT binary patch delta 413 zcmdmA{jYL@1(Wr%jaHS+f`&%A28JO9hE~SrR;DJ}28NT5Fq>i#;YUWSEkgym>zB8y2EePF~Mtj>R%t&J&yW zbN?}5`T6^r^W^B%U1;#J~J^O#ASE_Qiw${n>v0`=7edKgwjEj{nd4`-k8B zcdq{XfBD+pf0O6%)kVHA-t)Emcm3sv`Cl?*5-S-E7<>!v8pPdV+RDJdz~JfX=d#Wz Gp$P!2pt@QB delta 498 zcmexYxxadX1(QwfMypC@K?8GLBf}6QV=H5GD`Qh_1Ea}Dm`$;Wa}lq5^TB;6E4^JLxRWD^TrOY`Iu-Q+Z*G;6 z56`l(pOACl?bWIO?ccBa@jtKV$^Y$p7ye&g%JN73WP`M@@c;T5f}j7FZvOv&dhWsh z@g~3j?+*L;k|6jQD`v2QE&;5Tdy6eAv{JWp?ml#;QNdNQSZ{6qr z*(b~X2bHtW`loIwz~3hEfB)onAN~i{}*e$|L^~b`TuzbG* z8tIytnHcFNnOG$18YibDnOYbonHi>Rp2zx@g&2jC*Kt{3+B4af^Tg);+aZ%m~R6U=v#OUhx`V+b@Y*ETwmE ze|h}vy=aVC+vb05#eJ+1_mBJvb-1eYjZcKzW#>Ve8`cxvT-ey&$M)p9rCUSQuaJvV zjJ|nn5|n8RS+17Pe6-g4-;BUc)fPRY=!Gugn}sfOw$whc-RU@Om&E#jlV&GOSH4)# zpIp3P$5(|-f#TA#SAM=>-^lOSy?@Up$2ew&`CYun{y*cfWME)m@O1TaS?83{1ORhA Bin9O! delta 362 zcmZ2gy`g%;W@bSHb6q3D5F=wNV{Y5lQ zrRgSGm>B6M8WHSh)Sp zFPXgGM!$Zor;B4q#jPio)^Z&RkZJokb>?2C*bl}Wi^6i3SI9O6ei0JUPdLrI@y3w^ zVOD(yfjI|LZZy{0r7ke2*wZ@qrpcbK;&F291^Z@xKHR`}+pT@x#n(+6*;L{VRx_WJ zNosW|eZvsR;O(J4f#;#A!#dGT%>9N-f(^LdnRc8yv9aT-Gka0shc^dzcK(pNrhaN4 z^LD#AyE^WlV0>d^u_YnewMl5F)dl10N0hJs$vzeNU6SF$t>5o8YZHDmFfcH9y85}S Ib4q9e0DyCdivR!s 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 83ddca35d71533f1bfffe1d150943b767fa82a46..123a5b1104941faef6e8d0d14fcd4f5027f357e2 100644 GIT binary patch delta 352 zcmX?FeW7y0W@bS{BV7Z-5CcOi69X#~BW(l2$w!z?v50c9%vLrrO-nROG15&*Oij{F zHZw8MwXiTS(>1U(Gfgy4F-lA}OWAyaP-r3_|G ztTz7;Vb-LuXacL&=|ZWGGDlymTDDqh$(|2UYpri{r&b=lqPy(ciI9gii-TB~U0hPw sHp$Yya>6l5PbK?n_M1-WRq``mdKI;Vst0NE~t82|tP delta 596 zcmcamd9-@NW@bSHQ(Z&z5F;ZiQ*$c=V{HSY$w!z?v50c9%vLr^wXn1>NYu47OE%Os zNii|fwKPji(KSo5Fg8q1G&VO+HQIcFE;O)OJCtN$IaK(#9R_Pvl_qG1ds~l=1gKfDA^s26$Q*L@+yC_oJ``1mCF0or7%XHhmbk@DOu&?fH zcS*aORDgB=isgoWw-%L&eM))oL?bUOaLWa?A72`$CQo6Q@VX+ th4~E5kkGT9a#_24-)a8;e*Z@{gI=WK2Q^X8{R|8Y44$rjF6*2UngB?y0mT3S 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 ee18c7c545319f22a1a71a0bb4eacbb4a8e03911..cabac86879d20223494f81613dcf33c6bf1e1659 100644 GIT binary patch delta 387 zcmbPJGrMNPW@bS{LtR6Q5JO`tBV#K=Gi?LI$w!z?F-13Xv7BL4NwPGsOfye2(KSpq zNYypAG%?XlGBr)sH8wFyN;5DsN-;39*!+w24GU2!CkJqvW7;%XkfVOGE;rZa+uYWM zEc!(P3X`R5_3QU~x;TbZ+)DcK|Gz!6>Wsu0QU}((IetJ}|J+&6|M+j>`lrA8;lKExyPxeZ zvQ^Aj{?GsX%OCT@_P@2CzUKD-Cu_d`FYOWfH(8`3=u+5!OOfRN*2jbM{;psC@caBH z5feiF|Gs}={(b+ZyifIvk?xmxKXl#yHb4H>L;LLu9@Pg*ZvLOLlv&Yo_kX6KW&hoi fg49@<*%-R)uJ@R#9QeV&z`)??>gTe~DWM4fD=wm# delta 384 zcmbPTGpA<5W@bSHb6q3D5F=wNV{NS7&YoxvYFZuDbhj~KSjWhoz*QEWOFK_n$|Ee#p|4(|cn{^$Oj|pM6 i>$$STM~97v;n{_c8X}DCn;94w7(8A5T-G@yGywp|1*P%; 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 ea8d7443dd1f3322cd8e5806456d720bfcea0a22..3699e38e2d53202d366bf512da08986f92823533 100644 GIT binary patch delta 400 zcmZ2feX)AOW@bS{BV7Z-5CcOi6C*2Q3vC0#$w!z?F-13Xu@o|@m>Zd=TAHVr>Lwc{ zrsx_On;7d_q$L~aCMPFaS|%l0rdS%9Y@W~hhJ`4Vlh<>ZW7;&?mh;5s{oH>HSniq% zubRByM!)`?r;B4q#jPio&w4Q>N;o|Hu6Czo^F+gqCceRoPwLdGrO5~jw<%mvj0yX2 z(qYDFmg%`g885f8#vT7C_Uv%1-nnl#Wf@cEKbg;Td;i)U^7eOn>{s@S{5`r}&LAdN z++9=iqDRk9xI&sXKnv-rHf2@?C)nR)fRG_HA(mdW5b;L{vK&s5r-$7D_O^1 rp(S*h|Kq)DDm_~=nAyJ^%44WMbFA=+Tf`{_1_lOCS3j3^P686?) zBJBpF&7m{?etZ=TQkhJ`4Vlh<>Zb0gV5*_`v-=Kb7%3|Kl3 zoNk}I-$uWFzNd?0NX4xumo{=8GLUe6xbOcXl`z32BAI~#f|^aU`Dz)$b^r37oO5zX z=EEOcy?Iu5zDnznl629#`Bji_uEH@%V%Ev tRt{L~d(>Tai_ykK&%VV6%kBQokUNE+efq?m>i(@jh^w$!yuGfOj0Hb^r|G)&%ng5?bhQ7R|Paai%8+PztU>xdysr{DHTlV4ct z)iWOSba4!+xOHT*ZFX>=O#69t&KVc1Ej7eszA#5z>3Z-$M1X}=@TEe?1gB{t-A%1R zT?(awy-o@y5?(JCbWiqPUdODtvvTM2d!NhB+t$iBO@ehCF>r#z2CU3_hRgv z-){C-Uan?s@V=}*r)|;`zLmF+iP{$|>)sk~_>22kiNP-C`}@@r=U&la=2+OjUa*~A zWnJUB+b{O?8pm$QOa3C~^>)z{?n!$Z`N9kGI&E|&wY&25YjM=p$lku~a@0Sdi2E_W z!LH_0Wgbtx>*v&W@%9INGjjet=SHr&S^cMcLW8U30)i)+z_-&ZsJGp!I zYA4Mnyi>mPeqze}6CuK>_mU3v&U9#1W8U0$woK!ZR^&$CXZIDl#cq`pyt59vy785$ zYsBGpEi;`S)|HWN^Gr@0vR;#|_&GWytJ`r?pV557ELQndKLVnTw%(SJ3tcAc)Z;C) z(uniCM2l2pkzo0!2~ARcvoCv3p1aPVYf`xf4rWNp^tf2_v{53ZVU_z44$rjF6*2UngEqZ2xI^N 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 0000000000000000000000000000000000000000..51d68197ffcd11799ad2be569fd8615d3756cd82 GIT binary patch literal 15799 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qnj%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&gF8Rr&pk(csmz-K$l3!Ge6iKiQ=aiU^DhiXx$+UwM8!7q8nJHEXOOun+ zlF|&#l64IY5-oKN4O7i@laiAybuA6d(~M1wlT%F+O>Oi+nKvgB)o6$)s*T9r!RKC3 zGVt}a^2{qPNz6-5^>neT$Su&z%uKN|vNTCHF)=pMO}0!-(M>WiG1N^mNlDc;Gq*6Z zFi$c}OGz~Zrwvr?NFfH!n^rK}Jza2k+$1H{B+<|$SvSetG#TP?%OpcH-DH#GR71m5 zOY>wibC^X)hGAIbUzC}inU|P@qz2@dl*|+>1IyG@b2DQTT?5P16x|e%Uo6cM&2){^ zOpVPfjEs#E&CFm{U@->6DvwN1yjP+{11N5SQwvc=5%CT#cncDXic>+wimei?T!EL= zkZcYiZNSBoRbn!z$hJ!c<@(eV8+{Z}gtH)eKvqE%WMW1qaY2Bg9k(6j8L4^rN)3on zU{$ycDb7zTDNig)bxcpqD{TYjC~*9uhZ7?DQKMk6#T+C)QOiVFIg43_+JIV1R{lkqsd*)d;BwE`7dNL(6`B%m50QH9h` z09RuW(I6K$J1!f2aQ6n()d5Sv>l|7!pbn#z@ep%IErEmsk>qG_5gAYrWuw6b2?rv{ z(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS} zkZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$ z5M`sm1qlZt$NOCl|hzux*veDpz zgaeV}XmAl3P!MIK!37BiBFWL(DHC^iv**qYvhrqiXCo~TUV^uc%*>oeSQ1= zL);rSUQW7|Z*-Kyp+@-Q;fB|47Tbvi7<)-`v-HoU-ZiU-bxP ze;Gf2HSVJZbCiv9*%*|%{444XDcvyoZ2rvQ^1hZ__Lhgs?@IhwtiOkyVSVqGBkxj5 RB0yWKJzf1=);T3K0RRz`EusJb literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..526714c98941a4c447126fdcb06689ccad1d77bf GIT binary patch literal 16067 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s-P%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&Mjw=Ub23RZIypHlDb3I<8Dz92 zm5okGG&VIiHqlK?PBVZSZEj(#o04dmWSW?iXkuw;M$pw2xdnPDnJHE#hN)(jsphG= zriSLmy2%D6sk%u9sj0eVhQ_9bDW*xO#;G`h0AdAdpd-g9z9<9b1Ych(&%EN2#JuEG zPZv9odon@pF*C9>Pqr}7O-wU4*ELEqNz=7RGEdY^HBU-RHn&VOF*7#=XAe~ENQnkq zJXyhP_jJJ#_sK+sB8FiY7Wo%trf23Q<{()J@(U4WQ@g2bZYR8Yxk zs{|`r;guDnq=S$);1b#@F&R{A*(HMtzSI;OeH2lIvmkmvRzVbGVn!!%L4cthw;kmf zsd@McPKZ%pRk#f)&QB{TPb^AxOi#@#A*M`+n2M?m-FQfTz+F&K5D~?RWt2sOsiCEz zS#q+4Zdy{BiEfI8iJ5LvqNRy$YMO~rno)A1k+G2xESiyG5#5W3s0Ifxy#6u@F*3F? zFtai>h1Fk>00XPSZ3t?35>d56Ohwg(+xX;+#Ju#>6gz#G&tL-RS_X5>nGjVTLIQ@w zn8V&`fEYETV-6CZsAVFooW(3dZ9ol1EB~U*)Vz{JaJgq_qmLnmNHY-i5ukE3rxdK- z+{nPdz(C&+L_)P9OQUOz#IF@u8eJ`7dNL(6`B%m50QH9i10#{=Y(I6K$ zJ1!f2a1RgE+XG9%>l|7!pbn#z@ep%IErEmsk>qG_5gAYrWuw6b2?rv{(cmI7pdiXd zg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia z0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt z$NOCl|hzux*veDpzgaeV}XmAl3 zP!MIK!37BiBFWL=_QqMhQ(SNIobjsUH=F!)Lei$28eX3F8YHfC&QU5k z(Gl~nX%xud!k45~fW)$b; zPq_XmkM$W34{!C|q?!B+#P`(j+^AxA3tzMQ)Y91p!?f?b)?DH>XG!gx+g#^1G+tfb zwD9EG4>$TMO{ydQD*XeeS8o>zo-;IvV^58BX49FI4XQc|0}slMKW3)hwSR Tgao&PwwZgn`njxgN@xNAZ$N!< literal 0 HcmV?d00001 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 2a52d02251ea467b969f70ab9024a82f61dcf05c..b6e25e5e91079551521076600c070806d9f33e0e 100644 GIT binary patch delta 385 zcmdm2eW-fFW@bS{LtR6Q5JO`tBV#Kg3vC0#$w!z?F-13Xu@o|@m|CVJCK*|n>l&w; z8|fw)nV9G%nwci)T9}$ynwh2<7^IpRZl2HjhJ`4Vlh<>ZW7;&?mh;5s{oH>HSk~l6 zRZQM*qhG(@)5S5Q;?|Q%hTM*U3~uigE=BXCEnS{tBoW8<+E|0RyE7;$$jH-Ev#Q&E z!4zM%{7o8@J=8SA*n}c=U&+-UOii|UEqU%cr$bHikHAI&C!IAWMf2VBxHY(s^>Tf> z;WCfi!2f_r(${`cSBFM#`=Pl*>iO5cdwc4dv2}Xjsq83 znd%y*m>B9>7+R+4CR>`PnV1_GrZ^P$>5*^2Y@=Kb7%3|Iof zzCE72-$uWFx2KC^NX4zBAOHW`Gpo)>l#u>VF!^x%@7HVW??k11X-r|BH`nX$|K~wR z{-3{n_h0?3q>ulv)vW!mBKe_W`SbtlqtE`^KY!_`|GCQ#{ogKo>i_zwp8wTvHAn~N z{M$c!$=Cm-3t#*Xue|hszWAws`@__}&tGC-FgTe~DWM4f5T>dh 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 6fbc0579f2850241449a19941e70f3a7c6817c4b..dd33f3fb0f3c2db71b65018f53419d2c550c3bda 100644 GIT binary patch delta 345 zcmeCFK3=(DGqa$fp{}7th@r8Sk+GGLrM7|L3^K^D`tSeGoc!XyYWucFD%y@~^*hxmoLO``dL_wBd)^ zBX>r{mV#5CYI4pzb~3o|o%!>Q4L;hrcN6+m9S@Yn?~GO3m3H8_aORxN{X+NH*4>qi zH_gaAv8cl-ddf-;Ekkdvlugbng>ti-!YABHj4|piGd*>qV8IvJAn7G$M=H;`+n?Z@ j6{7X;<0-{TUWWLm2fYq&*3D&LU|{fc^>bP0l+XkKd!d0D delta 542 zcmX?J*;Bn?Gqa$9xvr5(h@qvGiLsTTfwqCsKPL}T^vIyZXKEI*gxAqz|E4a=i@Dl=CciknkQF1|M&m?wM1I(QwX|*B_WuqhzL&pFOLq^PwC;$;o|c*po^!=E`!?TycjmO)UH-h| z%(3Nvet3TBF<*M-ZN-K)Q*VDf7o-&#J}K`-nZa4<`bp+4-_tkA`(BTZ5jgelEz74< zo8EcorQFrnZtYpVD6C3+gJRN}!x820mb}(otZ_Y4?Pc4U)-|nL?{)5cwC*PhoBJH@ zxG5I89b$UZzlo@

    QKq@`Ojxt(8Q{nRzmlen+%QHt8}%Il2R?ODMSwk~?AaH3}; zv!UpwYo8@fyPe^#SR}nzWsSV#q6f=ZJYqDB{hl3k n{r0lgZ?iw_|9@;gGei5$s 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 b2797b5968234b83eba6d571909a0ec8df450e24..f596d0f7190deab2bbfc37071cb029cc8c32dfac 100644 GIT binary patch delta 383 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 literal 0 HcmV?d00001 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 3e5a1e2e0db94bd0a298db2d3cc81a85f6953e7c..02c569518ff84ec735fb9bfc48b584ae2e1c8ba8 100644 GIT binary patch delta 372 zcmdm1J)?TVW@bS{LtR6Q5JO`tBV#LL6Kw;-$w!z?v50c9JmfGmNi{b%HME@khE;B| zAZwP2iIG8CnxR3euCckffo__SiHUAvlCgzuQc{w!X-b-9s)d318 zPTP7eb1crVEaktaqG?{TRz4_i6bAkm-0SjimGNg z>GnuSYi^GIMb8x)IZqb{UOXZ8h(k(TVZ{oOQ}d-g;;fEN`F#G&XCH?jt`GegGiR|y zKDc05gK^IeWiEEfeLW8K4&uO1kN({AcCK|8*998tD)B2I-!i)mxWZi$<-=(Gt zo@bq{eNCJ}@_EaiLmQs#mVI+e{_KC7rxJVF8RGu2EIH_4_JV38 zPTP7eb3RnZO}64Zy?Hg`7$D> kp4_AN-}LFGYJP?a7pCJnnr2<28NT5Fq>i#R%t&J&yW zbN?}5Nlj&Gn!Mjezka``i(^Q|t)w6S|JyUG&PbdgwP4w@V-MmEeY3CKd+qant4X3}=|Ib_fzcO3*-{h17tD#XRwm&!j%Kuln^Zw7}-uZv` zv*N$%w;CjubNv_3+wlK>mBOq2?wtqzUy=Ow|8n@Nzv`L-lfyaxmFtWDix1s(@@xI^ ze?R`K9Cvz=^76l{w9LQjIbZ+I-!f@_3G=J+AAkE}^*-Ati5>sHz;n(2lV0pQrB(i0 lhkX1a-|0D1ghztm^O8q17G!?mXJBAp@O1TaS?83{1OV%@t0e#c delta 479 zcmaD|xu$x81(QwfMypC@K?8GLBf}6QV=H5GD^n9~1Ea}Dm`$;Wa&-9%$kQ&S^Ti}Px#Z2&6d-Z5@caHgw!qCgQ{~c> zqP!|=?_Q`0;&gm;oy#x!!?iVR>A$39{s}R>ob74PqqCh&H_U40wRtU#YtDRJB4@kz z!wV~yInEp%=VW|uFIuzSW3$xsMUBsYO7O54x`&x?OcuE|@!&`18Q&P4u|B8-K&IED@?+keOa%`f47>UdO7#T VAIWZVwx znCqG(nwaTYB$=4%CK;ueB^wwgnj2Yep2zx@g&2jC*Kt{3+B4af^Tg);+sWosl?0>cXvCrw&Xod0Btv%hmsvpRfPxzlrhd=k0&y z?|yyZ|I^?7f6mX@{&9cW-An&fBsWz4U-;j6yZn#$A$x!954id1KhL+j|0R=t{S(f0 zIQ}a3|KC~R|E7D-`#k^Zw%7G(C#U@vx_SBEWRVV@hqeDD??n9zmR9xsr5|Gb-u~pq z1rx9QwO^ZYxxVpN>wnop(HSY9Wy z#!TLCqhG($)5S5Q;?|Q(j$BO+46TXz3;Pyd-PKWaMs3o9yx`mzk4BG#39b>brFkF9 zS(le>t+?HP{IO-jXWu#UY_m$w+n8U9xppanxl*Pmo_9xDZI-U)lz!2GmmOu2A5S>l z(pePg@u|~2eL;wwxo+mxCredJ-)xrO8Ic>{XFJQ}!5j|zGH3DEg5073s*G2CHc3~1 zbFlkpxuRjQP>#F23B#N!y)&Ak&*InLF@4X-Fz?ruKEajF#~BzH7(8A5T-G@yGywqI C$AicK 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 63c9c0523d9423021f72c7cb13bf3e4dada05085..e75924b7276770d17418a5a0750b3b584f9adda5 100644 GIT binary patch delta 380 zcmbPSbFXs4W@bS{LtR6Q5JO`tBV#LLOKk(g$w!z?v50c9%u+E=F;6lwOiI#CF*PvM zH8wOc)lIZ8Gt;%SNHI!DG&V3WH8+`jg2jzJ$-vYy&D?CWDC>L{;&jPzm}6SHS%K?_ zA&aE4(2U71to7;{HhH=@hE&{oa%nH$!2pJ%AMJeOS9dNHbg4P&;w9mtEOg|m*`sYM zvR*Cj+~DQjnf|Mqb$ai^HTxgVSKRh0@s7vvv2poR#RlfagiC)c0(+Co&V? ziD^1bX>kAM(lc#N6LaB&3tHb^%ofXM-fofl{EdgXW>~48kjoG5PS2puGV>*uBQ}{R8;16vM#fdeTvbH70l_C2REi~;r8{~$t3^Rp@&s;@frKLNY(X>3?iwY7T!#m SV8p<{z~JfX=d#Wzp$P!4C5TY~ delta 689 zcmcatIk{%TW@bSHQ(Z&z5F;Zi6GJOw3vC0V$w!z?v50c9%u-1+H8D>yHBHeqN;Njs zO*Aqw(6vl6Ow%L{;&jPzSn;8{W3vL+ z5kr~NAOIfe9pAeQ2b9Ge^4b@Vvojvi~MGs?ThL2M^)VW1mD?`qmk>d@1 zUSQF2_+i2Q|LRMktYXtW^0PMS8M_%RFqc(ssfaL`vpeIQz*))1we@|RsZQ!2HS*V; z*cbcwwC=T2`=@ib2DaGA7AJmPSr+ogL~+mFBfphi#^!Ncnz3PuOX@KrZ_c33`D!-X z`vjdh3g2Z^6nTGq+;;bE`J&o`CHt2KvK`soWH8<3_oRyO3mx^T z|N69}Zb5MItQCIUt8Om3^rz+4^$T-$mvSk#tl)W7A|_m=-7UPk&q_8?hd1i8o#^J1 z+FMUej9r}ETjyLKo*IxY)V^o?t2sMk?@6fdkzJj!?We()sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAchEVTggDm8qGPp^3JEA>0fk zmFQ-qmL#SmmLw8o3bI-xb5fG6((;RP6HDwea}(23^$YUSZS)a>NGjo}%E~!EC%?!y zKPA=9*hU|lFp@5CO0)9JD=taQOHTE4v8%`}(96tBu`)9?PBAw$wa~RpN;1&3Fg7vL zwJ=Dv)J;h=H%>9NNH$2dNC5|;uP?H845MB0lS@Il1!{CkW{Q=Og@H*@YGSgkWnz+v zZnBAqrEa33fw`_}s-%juo#13l}BcA zNq$i!Qo4neLBXkosG=~5oJ??;RFGIyoC?Zuwo0%p2QS1RIRHZ1fOD=@Vlt>Svr7hL zh}0AteH2lIvmkmvRzVbGVn!fwp^Tv&w;kmfsd@M^6vQa7D%^$?=ckpFCl;kTrl;nW z5R=y-rlM*?H{M1cRQl&+(jX#=6U!)zh9q+{BU9tVG~GlCBMaT66q96K3-d$+T|*ON zOOw>3M59DwQ&==3#Ui>F5m5~eVAOKW(9p^VUamm`46F*bA*kU=M3DSu8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb( zf`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3 zf+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=# zBpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&G zMA>L?LBfGZ5^r#EA-3D5=B3ywl`GlXF+{z(z`($ukn9oU%fL{j%D~Xj%)s#TKLbO< zO9qBg0|tgy2@DKYGZ+}e^C!h0bz@*)Wbt%y45_%4^ymM7duG*!&PFGL4{RG2a8Kc^ zG6rpF=qRfD|NidmBL}kcjw-BPa-`!lgIiAHj-cbe_UDC~F|VH~dH8;}yTrf$|Bfz@ zn0U-%3*&cjzaQt9^|QQDSZvfWhdJC5 z5)v^su99_Ls}29`uAKYu#!Y#iH}m%ki*p+kyxPdYe17h2o;&;Fj5qB6f9Svg1&0`` ziVdYxS(%xc51-YZFS-8yucHM|Z^gH{-)HscJ|;L#oPn94{7$r5ndH^$pk2(Ku6{1- HoD!M<>b?>k literal 0 HcmV?d00001 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 7e0fa5399a630efc3a050087cf86cbfed5609d88..e460a1e019db6cba2cb9633f730ca4023da501c4 100644 GIT binary patch delta 382 zcmZ2iy}x?HW@bS{BV7Z-5CcOiQwu8tBW(l2$w!z?F-13Xu@o|@n5HHgm?oR2>Y68} zrRgT7nON#t7+RRZW7;&?mh;5s{oH>HSOmp( zi%#BeqhG(r)5S5Q;?|SPd-)CqFdY5(dtPm;ox^;mBtwO1Q6<8vx``LsI0B`3r9Kww zcO`sas$c)$*s+3Z_Y3^`7><|=+HcVr9MxI|A3s;}sa#i(=sK?zty9YC;tq_;J^^x0W@bSHb6q3D5F=wNV{L#V8 zn(G=Hm>B9NrWzXPrWzUZ^P$>5*^2Y@=Kb7%3|KBM zS=Bmuzm0zVYEKu(kcwMRE_rh`1u(QGmfvTJa8p#WVq(k_KB{$_-ldmnvY%5j~yS+{C3Cvw~M*ojVYp; zkr(-uYY*J!^6OW3y0@`ORKE1W3!ae8>8tB~f8O28#*m)PZ7vck`;mcxfx*+&&t;uc GLK6Tj)rhnJ 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 b1dab28d98ae5031a23690b50de2821ec1d52c44..bc42bd69c7241165600f37d7f668b341642c2a18 100644 GIT binary patch delta 383 zcmexb{kC$$W@bS{BV7Z-5CcOiQ%fr&3vC0#$w!z?v50c9%u+EmPD?a5u`tk0O))pr zO-VE{)3r1<2U1un?9v6B4GQ8MN@=k z&q@0F^WVNEbLqpI|4m!IpW%qPusxSVn_|$mqkoE0Hv3;-3)<%Tr$XTV{4LiFpT6YL zO_&%HIWN!UHuKNA7D){s|Br?S(Xx{Bzl($ypK*wI7}jQS_uBIV?|urUE%5jq%C%K+ z)0M-M7vAGuWqFWa>C-=k)psti$Cx^aRi)hJlU%-%zrskQY@PG1b&pR5WH8rXIaJM{ Yy7`=IH_K#K1_lNOPgg&ebxsLQ0BGrz_y7O^ delta 646 zcmaD``L%k(W@bSHQ(Z%g5CcOi14}DYGi?K-$w!z?v50c9%u+E=O*Bq4ut?QSPE0n_ zO))hw)U`A+Gto^>F*3BYG`BQLHcH-ng5?bhQ7R|Paai%8+PztU>xdys(yM8FlV4ct z)ia*-ba4!+xOHUm`8=UQk=EzD6^v$nNhPx`6mHlr*!yo8cRFp-n^AxBS>pO?uA;ORKg$kmE_bdk`xPHicTfFR%;A{W#5*$|u{@|) zQTk!x-2C}3zwqDq_oeY`IP)Fx*hRfoAA8v*Ch;zQqSVi=;yFnrQk;c5^;_M)gxq?M z@4v&RS?%8P?SAmfw-0SH6Q^mrY|GNv*19NKBamA)?crXlHkH>+XP#xdDEcq9eem&} zv>fm68%K4M-qx#m-Ei8dt9B{!&{Fmnn~Np5D|Tjuy-3?9!tEi zMo&m{U4jKG&-J4oJARy%S!MiN+CZ_xCCkVD?Sq{BMX8sMOf#FYCVc19b;9%XglA|z z;64%(n005XNJJ$BtyMZB^YDk(!j-8lbKQBDCVe<=l;PL*`dI9q zR^lCE)*MVhX;iHU)(rG;^lu4!trabl8@k)=h7+2;AIZ&-*@ zIe9&oITq_}IZtff&;7@MWxEaktaqGz?N3X*HBCQX1H}lN35YSaq z?Rc=j_x6-M<@uANG7OJ79#GxFCLZ8AVf*|0x=$YZu>b$k%T5Rc*2$YnF<6a+-N^ zvbmA2rLj?(uDOAUnQoG$v8k?kszqW_vZ+a`rCG}6`K)hPh*CLuJ(oEjsxu~Aah~41 zpZkvi%dG=>yC?6r(XZd{>EaktaqG#YwOoe+7><6l?Z0Z(>^SGg#4}t;LPrt=^N$8Ea8pP^oPe~xsrugTe~DWM4f7lf7- 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 c2bbd34888e84eea40ce683e4a7625ca63a4b066..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16262 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qn+nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcx zU6Ul^lvFb#vqVcv3vhx%)s7Sy;0$jCv)$7LN0=I$CK;QhStRQkrX`s{!ZgV|DOEQ) zG0iyDC@Iy#I5ib!5t3mT7Wo%trf23Q<{+s7`6VSY#VXChz%bb`*;v=a%qUSeHQ6Lt zH_;;5Lf1Ss#WdA4)yUW~)fi?47Gp51^2h`wsY=us2G;_?sfDPbh$ICr%?lEXic>*l zm8}x2u!0x=kg@|p+JMVEtHfkbJz$p%DoRpQZ1hn?5zd0>0a*o6kck;}qRwLz6_^q?D9Y-83^pQ_JKu<76}AWLPvK#Ui>F5m5~eU|5Y{WEf&- zZe?U;Z^R)yOT)bJ#tvVxe3stvdC$r*`x>8UAp`Y@lt1kkk%=9nX{JcI-c z88L@e4@1lu($NNqOw)!&pf;fPmz94}W@=tZBDl~qw9&^9LnIi8`Up@Vno|l^ zZ*F8@U|^tc2qK|ck)_eKM&j3sERC)ep))iuv&7B_Y8#p`k}gmq5z>wcE=WvHwKFp{ zH8!=;M;Aud5s+DtniJuYnVXtdoSC0zXJ`i1gD!zpVO6s^;1v$77*L1N%6N#mqn1Fzfk<*RxQGlWh_cb(f`kK+q zqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~= zkpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+ z4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz z3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$6Lo)-z&;JYz4KEoON(~qoUL`OvSj}Ky5YL|!f7FeE zfyvO*#WAGf)|yLay)QG$9RK(}bGz)_`Uj=~N-q*7u*PyZMI~M`GQMzZ%ZJ7~JKg7B z%%yhvo?XtHZqiz#A+vMKGQKlL^9|=N+84d}2RY@x{o+L!b zOXA}cgB5q4%rxxYV<>v~Sw7Qzz2dvsUF>u2e${E8e?e@c@ZI-I&sR53T4nU*=vs{| z#>TE3D`hseYt}FLpC$yp6JoxxYmZH=MDl}T{#SdN9bC<}PnGIX_g{Rg_l)-Q0$u5d zTW3=(YUcl&#=h~u;(csQ-o1P7?K|{4UvrIw-lXW89{WzWd7eD}%+m4p?$vv4el#*k zQ3_bm&+6i`NrpA&-MmBl;*M`Ts+-4ayc}7O?1&anKZg+^#L}dq@3W?mr%eop#M{e@KflgLcY$y85}Sb4q9e0OMB#NB{r; 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 f1dfcf4ecf73473e14978b35259bf433730b2f4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15920 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcaT(nz^~5k*R^M zK~k!@uAyP7nXW~ep@D9SrMXe6iJ@tlrD+<>A|%5wEb=ePOwY_q%t2BE@=Ho)ij`@q zX>wYUsfDgllA(dFvAKznZjzC?xvsf^VNzn6S!$ALni` zQgCV^swhk%Clg#k6(klFr-JgItr9E)!izLWet?iR;CyVAm<%f0?2ZAW=VY97Aq1u+V&3b!G}`DrEPiAAZ7>8W`o#N>R4si@k} zjknPU)de}3G>C}e#4^gF!O%E0G1b7*KsV9MBw5$M$RtTOF*PYsH^nk7IXTV5)FRaw z9?eLxi0(y1RD%N;t&}siGB$*jP>=uvtHNyvYIqV+07Fbg)rQ;nLWnqXih0uy}6Nrfq{X(A&7)(MV3a_8i`*kvNXC@gwD{s%n~~zsBLJ%NV-66 zA4tUNOCl|hzux*veDpzgaeV} zXmAl3P!MIK!37BiBFWLsqf zNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlW zh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec?G z1{W7%^KEKgimg()lD%E%!rBK63=9g%9znhg3{|QO3=Pc;3_t%fFf_bmU???UV0e|l zz+g3lfk8ZfQv6Xj1_mY;PZ!6Kid#n}M|(^zlsI;O^@nxqnlFaNdMHflVo76l)OqdP z%6CNX5Z{&s(uP5ay(Yb0o{O#>jNBG^;=;3>+1ZDWY%o03-I?6|>hKS@ZM?oOH>~^i z`qAO1jY=OD+1r@w|C#r_@%vA1h1V0;+&+-C_21+(T?t_=S3mD}+V;8W=n`*UtusfZ zug_T1*!SilOUv$DH-92lv*e1v=8LCmW`3M- zQSHJby-g?Wt}K}3uN3~O+mprb!{^`WMfO4|`zFU`y+>g$A=yvg~R zhc1S7Ja*G;JjWYjwO!Ou`_Q9DOrP^-{}6ba6!>|u-`B}uwo5|!&t<#XWau7GyLs-$ zWUhO?ArmETw0+yvW3^a8Y%;?H-*18+%|2wkU^1WWy(22#BmTMKpYK|nHft2$+&Xw= z^IsSCGUJQUor`PLuZk{GpW(gFp?h~h*}KEVtLL2f+`Z$yoWi5r1Ig=?ZWML}yf=)y zRsOMViOAXb0|~d)Y#Sp5lk%7+9$Z}0wbkHWzS5U37LyNeb!qSUQX+HYxlQjg{RLm& zxV`Fenj4s5x0zLNVvVPp{9Dy$W*>IEHi(Os+;?wsOP=(LJpFUdS49^&pT2*|R#z?Y z&A!HY)6TZ+^3GUwwejhNE~d3|T^%z-7cMJ$t9Ca2!|`pW>i_rdXJh!56m!;e?MZFW Oo^DT9KbLh*2~7ayXQxj9 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 2b70a7ee1a214c84b50e1f122d2e06816c164c32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15409 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 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 7bb8d12d0e3e1a7d79435da6462953f360ccb9b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15827 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tZJnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcwMGmuoGn~_?Q zn37nMNR%naYLU!INw!MMFUn0UvCGU&Oi$G>$V<1;M+hRRgr_Pi=lq=fBH#R!R6AoE zeQd%=y1*&T$}_LHBrz{J)zihUBDX* z(hNj>1gH?rDFv%HH!?6VFwi#ykx;G3(&$Okih0%2cWLBi+M7U(;rsfrA=I7ZNnnCrTOJLO)iAy7r1XLp= zs*qaK;Gz>E8sy?;$7Q1r?gW531Yjw6g+nU_)M2zT9%AmOC6I6+k{k^#A_EGdY&5ta z;Xoug8eBvM6hzr*a6!U>NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(yn zE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U z2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr! zHX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLzU^`)jd1at)i^jys`82;YljWB{@|MWxH+V)~C+Q6O*i#IsE^U+dS3EYcCn@yNT?6 zI?-BV^NkN4S2nR|nKgQeTX9ZUl3?jpW$*oJ?&-5xeMg?_JTHHKVb;kL%XjCW_;Xhug9OavU;{N)o*wh?-ETf(LN=3iQVJU1?TP?zj?Uh z!#v+vJki!WY1_V9{*uo-oq|03tC6cSE^${(Q}N6e6EDk8uCHnM{Md5x`ZU9Blb3v- zb~1#^XHT5VI?w+s^Hgi=)jU7tx>){J^W3xZ+}B;sJGQy}36|UawDi`078d@we2-?$ zi8P#Hc_U@pzEd@e&)m5l^gOfsnPK?_*QWNqnpTd5zifN5+E%`0`M3Pyyu;0ndP?Un zT?m@-@VB6n?sVzilJqzC>z*e((3lir@^Njn%c_<8zFlUV^kf$E?cWXi&z@&w$UL>< U_H?bupl#a>p00i_>zopr07uVr{r~^~ 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 312594620a7729bfb2a3a8dc44328d9c7bef3a4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15333 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_sMFnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc76H{a}kW`|Zky?_N zl30>Rlqtw+k<3X+wo1z{%1tb>%gjwoPt`BTOSjQS2qLM3rz$Jw{G9wE-~5zRJ7XJt zY{E#oz$wkjGq1QLF)umQ)5WeLw?Hp5GsVi>%qY<`#XMQpAlcGL*V5D^Mc2~U!bsQD zGBM34&D_|?&;k;OzP`xXF^qP}Pc8-J7Ec#DNWqelpPZRug>Y7isj*R7qD7jnp+TaB zuAyP7nQl^YvZb!2fq9y-iE(nONunt@wtRi9kPO4H$iFBvJu@#c2T2XcFDaQRR+hwr%P5Nm;&K(lmq@XQ?nOjYg98{|%3+pJ5Tn4Va2tXeodlP|3=9nP4M8MSE3!1Y)=2zXk)_eKB6No4WtP|(L2W}5M$!eUK_SI^ za6w{ns-2mssj;bzKDscvj)2UH)SL*H%-qzx;>`R!J3}+59&`z;8Y6LOM3R7NghUlm zvkaUEA)-MpZgyNY`ry_isAUP3f|p#hVn7{6E8`*Nj#>f<2O`PQ;36`hAj(FA3la`Q zlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@ zxFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7 zpdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T9 z91Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm z1qlZt$>Q`$@>Az%a3PSE{oWA&iklNA3qAInw)Cy^rZd7f^MEgoeRSDyS5u1 zlHHi_b=j^8EvJ`^l~?8CmrTBSbW@oclkBm_n^TK@KOKGOyz##4i4La=$}?|03SQ=R zD=RrYYKhn@;YMXCi$xz9PKwRDpMLW7<5PNNyFAM_I-kqis1kMNT-x!OvkonG5ofpf zW_RrmU)ZYN+)@uUZvTbPpS|y3J0!a(<^4~;^_7+RZU27f|FLDbb#DUSLYv5|ppCem Lu6{1-oD!M<*wx); 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 d88529452ada50180a25b6bae0ed7fd8e7eedcb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15071 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_le2%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&j@wMt9|m1cIy zpbU|kVxx~Dif|T056CKrf=qHF5JNj|JIXUs^YCRTh*4lwxD6@JPb(=;EJ}4uPt7YK zCa*(GMb(CGyp2An^v}sejR=S+YW%=bEM|P#fC@D$|Dw#)yplw492nZ@V~8PahNzDK z#c56{SiQNCfq{X6z9EQ&YDJbt*BXgmE3!1YR)o&byv!0iBdBd?!brM6B`>5{2rfuW zPPH>LH8nQ1(MK0X*Ab9ek(v|Xl9`*DSDcxjXJ=>z)q^g9RbwPBjYtwujgY89s?NbN z2@wr)akJyH(FeCeKrIrm6g>UYiUD;Pt&E45J8B6e9Ec=GgNw+3f+!meE=V{KNsa~= zkpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+ z4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz z3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$ixk@&2p?9bVGR?+|US`;IMDlQgR zTAcqp=Wu18N=t(Agqtc$LelTqo6dUNd`Lq4fbBZ3?ANz?J<7VxH{G8+QEXADak@@q z(%OzP&ZcgeqoR*ZWd2^Xf+-)|4 ze*!6IR3G_&c)YE0Bi}C#U7JpwY>5*l#bxz;?+QaN-O`OK{OV!f9wS^~DtGT@{lrDH z)lynq>v?9SNlyMFTbnO7{q|{%vNHwyb0nX?n&7nAT6g2DSx!?DWIsKMo1_11A%!gSAFb7p%1l1d=Uy?jwuk@c1#LwWzTbVXPJIZplPWKIRjgC~ zrQa~bELhd)#_RPB#UlPe(z_OU#&nVW*yMFJ=CWG02 zr>;dNnFeb76|FdT)o|&H4?L@QzJE1V*S+|mlx?q2lUPRn+i5BdcbalOews9Y!NQjG zxy>>jehG(iRpv;fWc{=3)iW)6_U+ocua3XIZ1dhFFkMe>O247WP0zYdLgu@3R{O1Z z?U8+1y7N=PclILgO|3ee_Evv&KV7Q-f9yUp!z!_Bn%AmSE`zq9db;|#taD0e0sy## BvdI7d 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 f884b0ca79baa7f611b5fce504a572e6cc04935b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15999 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tXHnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc!g))YA+;)^_q~_tvP!OZQs&E@poS#-wo>-LXn4X$fLQGzV zn2M?m-FO>)Q0bqONrQ+ePAsD=8Y~UWj7=>~Q*l1fMMmDp>c?Tft8_|m7y`LOo9X$SQTzVP{WgmA{SyRsy5ul zCubz)rKhIY>BD>m6F}E8m}8E(5)cwFq{bZ9+5}?Mkd8S>e4>_#u%aBZ47C9@B&__4 zGE?(P62ax3p^ZL<7$VI;)JK5I(VSASdUGQK0|NtnLl6noiY$$;H4?v8WNCD*2%VvM znI(2cP}|Uik#vDtJCLe4xF9h()y~Y+)Y#NUA6*z-M?hvpYEFbpW^QU;ab|v=ouL_2 z54r?ajgh!CB1u3sLZS+(2@NhiA)-MpZgyNY`rwv7s22d1g4a2;Vn7{6E8`*Nj#>f< z2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr! zHX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_ z5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH z5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q z(cprF1Ciuta1j|$5M`sm1qlZt$2tc3 z?**;g;v;cVMD?h5s^(74i)Ml$6IQEm{9(Tp+FkV2?UZZxosz{4x-A(~B_&fIx5}tL zU$pFTZ1J&~#rwo22|9Av?H0fH{5bdf&m5Yn)e{fNsTQ5~dy{oBuiRtxS+CN&m5dke zUgc}}Wgi^3O-)&eRZ*0yFHR*pUhD7rcPH;psMmXuTcCZt{d7sJm4JlE^|*yUDhyvH z@++$HCLi;?p3t&l`Ser2+%Dd|x{udm>#WqWFtw$sOP|P}QkLpYY`K1MYfjEbL7z1C zhffvmyV{CPlaTn~m9S^-b^q#?6`Manc7r2PY@1dMrBXw##(x z(n{HdGd5bCQ91H@$MTvRTQ#~AS-o6@xK>*DY}od1=CNDcS3>3{nr`x3b-5?$lIEJ# zNs0#_L}#$}-}gS(_~xzoI^8u+ReI42IUa6kv$d4$zU*eO!KKboFtB8gG2^d&UlMb2 zKNV(lEIDFf^73(DYxs(%SD#zGySMZ1t+K_vch)qsq}Bdtj$_)V8M3>r{@nTYgWp#e z`7Gl3@M%i;pQ%TdJ;`R!xz6_F>1y+rm4D_;4t-iucJI(S&!oa=n-w!e82F9f7iTU@ zJ$~oH>tD5bZ>SCfzS&0To&rWF5+hK;X{-flg&pN*lo`|VRD Sca?0=7I9BkKbLh*2~7Y4ox@%L 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 9f7e64db68c5d72846ac73cca4ed11dbe44efa20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16286 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 R3fe%=;OXk;vd$@?2>@El3FH6( 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 a1593e392005fdf456148983544e9df461ac0b10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15960 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 X?dr{Q(GM6H7#KWV{an^LB{Ts5)l9@L 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 eef2f58e2f62e9db44370438518b893bac29dc8c..c6f1d3219b44bb9c5c2ae737e51f5a6ee5f3c452 100644 GIT binary patch delta 3898 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 delta 1342 zcmdlsiScOt1Pdmc8=I$cEn}Q~fX8vNHBakgM&6Tx2Bx|OMj-|URtCma#>UzPMw4&z zs!Vq0;}Jy8dBm;B_?+|;}h z$Gqg!;*$KLVmmGcBw$mNl4j+Um_E5yP{P_SF(p4K)hZ=FIWxtoAS1sdzc?emz{>umUdqX32>uX(mQy1oVqd z{x8C&?Ua~~x+aE37P^KOCMmj!W+utH zNohuw7RE-2X(^UzlUMWKCr;seVRI~TT`N>SSzmaLikU^KiGf9miLRw#l9_IDibPuS(2q?%4Ad{Osq^m$z^k`kRKy)VFK2Vk*I2gPE7tUqCa_!=o?lu zQ&VHp%`?UB=(BLdt38-p>84+w?&;zfQgO>ADAxOSg2*}lPjwqOXUpeYmX=JmD99#`pWx3Z(CV9C_Mb5eM6HoQ} zcI-ZEdA{=gbDQ&rr>+j>jW3bBIHhBm3(w^3Qkx?lb2Kmo-1bhGeER+V{VuP6wbUQx z5St}*u{gOZ?@a2FhuuG>C4Q1wr2VVy!rZ?XHnTW{Mn=3X`1#TC@RQP7rUs?fGi6&M zWS+;k#khq;2K=h)t`TYo>k4|cZ~HH+>=`zn0#g|i8K#`haW_?Ea(Kwkd(N1hpQ(MK zS0LA6A%@s^shW$*=X#FlRNqQ{a$)xK4?D8zZTIQ+owfUAC11b!S|IC!iZi#jZMu}b zzAVb)d}7PySB0_jGq#zTstVN_?W3O*I>Fxbuc~7=m z^)qUePh8aad8*#~Be%;XIS*e7{8_Ro_VntFMWv@wmn_PcN%2^!!5DBZamj}7fm2)O zx4)b<)y!vK%-m1RJ8$0l!hF-9a=PGcZ-wV=`b84@Tlfz*%O#rynxr&V{gY-0$+vnt Vdk23x0|Nttr>mdKI;RB2CID}O1C9Uy 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 0000000000000000000000000000000000000000..0666b400022feac6ee1d4f81b8ff40a4684c41a4 GIT binary patch literal 18759 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 delta 1433 zcmdlsiScLs1W67y1_lQC&;JuADvC4N)NY>2wTyA{0UpQ6);z6~8F^0%8kp)D7={>H zSQ%JY8Chr>7)`#-t1{W0j~^ssXaSNjGPg1{0Li5D$xr^pD~3fzkxy}Q8=ux>Jy8dB zm;B_?+|;}h$Gqg!;*$KLVmmGcBw$mNl4j+Um_E5yP{P_SF(p4K)hZ=FIWxtoAS1sd zzc?emz$(Sm*eEU0B2CxOAkjkC&@k0ZHz_&UQrFVJJk8j|I62iM(R8xDu-N4PB5c}D ziRnl-*ytmS!EnjsC48zXDM?AjW~P>@x+Z3(Cc25{CZ@WH7N)7X7AfWism5uRrshVb zli%{`TaxXz$?p6PDwfHHCYF}Qmbw;ZCKkGe$tD)MiD|~Ex@i_EhNh{h#zsj=7L!-= z-zQGtdtq}>u%ks)tx)}Bec?GO=4M8TrYYvhx(3OXM!J@!CMmj>#ui4prk06mMrr28 zMurv!lVL^}g%}xI85mfZm}(msZLSsaVDPbrba4!+xaBfAI{0>)i0fDJF4g-bze_fzNGm7vY>irBjY2aX7))psxor0H@oIjh%k5u_($3xceP)jC)6K6%j!ek<*m0o#{GMu$ zlXAgZlDob!uDfwq)H$b^eW82CPTfmI(yn}-rxhoy{CXqq?-`A%#4Vro>wjOg|6+Cj zMqKTJ%d=iJ5p44EHkTjyl8p!L|?&?8EY>2viy2j&i3|w&i1&DLz00%e9UW7 z_I^AN^;i4s18(i9`YiWY_kC?_vN*U^tv=|HK-=OV{Djor^HuB{hY!!PotJY}k>O1Qjm>&Zu9$;ZNqk463M4Es8->gBXm z|2tQeyI$SB=uO>`;=Ye_oOO!l_iXA)Sex-?7d}(Ea>s1e zE$4~OD#tq_XU-3rKR-zSeo&d7hUIdRBZB*iJF?{;L>VqKJ8&uk>ppd|KAy1j z6Ythbyjvfc?)xe|ue2#$_Hl>cI@!m!3=c^t^(Zd0tFTR+z_H?`qU-OTMYV0(eg$it zyWSc0b!3$kyRC4wC7s5=hg|&XPsE7`Xr<`{u$FhX@*YD#ezIH8yBW9 QFfcH9y85}Sb4q9e0J*(PCIA2c 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 0000000000000000000000000000000000000000..ff532327f0ebb2b64a3cb7c2934bbb53ec3892dc GIT binary patch literal 18961 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 literal 0 HcmV?d00001 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 0927f8c026ee1d7d92d2be3f3920a7891bf3cb35..f25c67c6797198b7a43ec94cb7ff47ef89732418 100644 GIT binary patch delta 3995 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 cZ9g-^F~zzopr001W>ivR!s 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 83c08e7db0a9ccab1880813e6699aadd4cf6e730..2fc50e7e99b0afd185d936bbc626895a213f0f19 100644 GIT binary patch delta 4016 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 delta 1238 zcmaDjg>ilT1PdmcQ=6x9En}Q~fX8vNHBakgM&6Tx2Bx|Oh9QO)Rt6SUMi$xzMw4&z zs!Vq0;|IwYT7(!GTbUYI8CZg3()r{k|Kb(HBBRKsIJu2aYw{XVuE`dnW|JetWF}t{ zRk2J=$xlkPO36>oOtC7+$S=t+&d4vYGD%J~vNW(r(KR$kOwu(pOf}O@N=~-awKOnK zGd3|!PBlrKtSBZv`L(F9ijjqZNm6QJvaV%fl8J7ziHW6dqM?Dgu4$^JWpawCrGc4w z>STRkvC02M*e2VFnNQxpC#hnZYLsM=nrNYGWSVH8Ym#b`rkiA%VxgO8k(_3jmTX~W zVPrV@EuTIP_a!H%C8ZgfC4<~&iNk&F{0=In#smYcR7v0VgK`+to<8~&ty5j z!CG&|GOo8wj8020NlZ>yvNp_Wk=d&&X;c18*`b-2v)rO^vRdKe8@xpVPOd6cAgo~6QI9#8v&uT|>Pw(=W2e17Yu_CDb@xi9;6HoUXVnt$$e zL+)+KXjub1m9brLq02Qxi+b!f|16~4L~e;72b%JXM! ztK1Z~KW^>U_ZxK?%O99T=ResszwNE-HFo|Y+l)=SK0mE@Kd!OXiPu&y9Z!k|zdb#|+icOub zzeK4sJu7J6^{#|JqPo5@_IKIyUabv+yMO&Vr+@tRdB)A_OuJMW|D7m3k$3R>vgRxE zo0?{1Jmq`u9P{tDrBBY@nd-)yLQMGnJFQz7aIborTHBA0>Z_w#K3u9}-Z`CzLE>)R zT9=K}o=Y=L3a`GEw{g3 zgfi|k>{b_E&)EMyr+HE?^P`)K$|&O^GMrdnm!CXuEplb znI}^C;EJd6+BkuL6DwVtxsCVkSQB<$+BD+%OB<;d3@_hS1hjGrEUnrd^QWF+(ZzM1 ViRbSIFfcGMc)I$ztaD0e0sxdF>`(vz 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 0000000000000000000000000000000000000000..c984ab5d52f48afdfd55d0cac7a0bbcb2a10b65a GIT binary patch literal 18991 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 X@y(44XK=d!+IR2i>gTe~DWM4fZ}>T# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..225b826d1302fb030f9a18a4ef09b16cf29b378d GIT binary patch literal 18956 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0c9fa1711fefa136d3f7cf22f39041aec9c0e9b8 GIT binary patch literal 18977 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 pwN