From 8012abee3bdbc93747a13b73653d8af54ef082bf Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Sun, 11 Dec 2016 11:34:56 -0800 Subject: [PATCH] Move dusts and smalldusts to json --- .../techreborn/client/RegisterItemJsons.java | 15 +- src/main/java/techreborn/init/ModRecipes.java | 56 +-- src/main/java/techreborn/init/OreDict.java | 18 +- src/main/java/techreborn/items/ItemDusts.java | 23 +- .../java/techreborn/items/ItemDustsSmall.java | 23 +- .../assets/techreborn/blockstates/dust.json | 316 +++++++++++++++++ .../techreborn/blockstates/smalldust.json | 326 ++++++++++++++++++ .../{almandinedust.png => almandine_dust.png} | Bin .../{aluminumdust.png => aluminum_dust.png} | Bin .../{andesitedust.png => andesite_dust.png} | Bin .../{andraditedust.png => andradite_dust.png} | Bin .../dust/{ashesdust.png => ashes_dust.png} | Bin .../dust/{basaltdust.png => basalt_dust.png} | Bin .../{bauxitedust.png => bauxite_dust.png} | Bin .../dust/{brassdust.png => brass_dust.png} | Bin .../dust/{bronzedust.png => bronze_dust.png} | Bin .../{calcitedust.png => calcite_dust.png} | Bin .../{charcoaldust.png => charcoal_dust.png} | Bin .../dust/{chromedust.png => chrome_dust.png} | Bin .../{cinnabardust.png => cinnabar_dust.png} | Bin .../dust/{claydust.png => clay_dust.png} | Bin .../dust/{coaldust.png => coal_dust.png} | Bin .../dust/{copperdust.png => copper_dust.png} | Bin ...{darkashesdust.png => dark_ashes_dust.png} | Bin .../{diamonddust.png => diamond_dust.png} | Bin .../{dioritedust.png => diorite_dust.png} | Bin .../{electrumdust.png => electrum_dust.png} | Bin .../{emeralddust.png => emerald_dust.png} | Bin .../{endereyedust.png => ender_eye_dust.png} | Bin ...nderpearldust.png => ender_pearl_dust.png} | Bin .../{endstonedust.png => endstone_dust.png} | Bin .../dust/{flintdust.png => flint_dust.png} | Bin .../dust/{galenadust.png => galena_dust.png} | Bin .../dust/{golddust.png => gold_dust.png} | Bin .../{granitedust.png => granite_dust.png} | Bin .../{grossulardust.png => grossular_dust.png} | Bin .../dust/{invardust.png => invar_dust.png} | Bin .../dust/{irondust.png => iron_dust.png} | Bin .../{lazuritedust.png => lazurite_dust.png} | Bin .../dust/{leaddust.png => lead_dust.png} | Bin .../{magnesiumdust.png => magnesium_dust.png} | Bin .../{manganesedust.png => manganese_dust.png} | Bin .../dust/{marbledust.png => marble_dust.png} | Bin ...netherrackdust.png => netherrack_dust.png} | Bin .../dust/{nickeldust.png => nickel_dust.png} | Bin .../{obsidiandust.png => obsidian_dust.png} | Bin .../{olivinedust.png => olivine_dust.png} | Bin .../{peridotdust.png => peridot_dust.png} | Bin ...osphorousdust.png => phosphorous_dust.png} | Bin .../{platinumdust.png => platinum_dust.png} | Bin .../dust/{pyritedust.png => pyrite_dust.png} | Bin .../dust/{pyropedust.png => pyrope_dust.png} | Bin ...{redgarnetdust.png => red_garnet_dust.png} | Bin .../dust/{rubydust.png => ruby_dust.png} | Bin .../{saltpeterdust.png => saltpeter_dust.png} | Bin .../{sapphiredust.png => sapphire_dust.png} | Bin .../{sawdustdust.png => saw_dust_dust.png} | Bin .../dust/{silverdust.png => silver_dust.png} | Bin .../{sodalitedust.png => sodalite_dust.png} | Bin ...essartinedust.png => spessartine_dust.png} | Bin ...sphaleritedust.png => sphalerite_dust.png} | Bin .../dust/{steeldust.png => steel_dust.png} | Bin .../dust/{sulfurdust.png => sulfur_dust.png} | Bin .../items/dust/{tindust.png => tin_dust.png} | Bin .../{titaniumdust.png => titanium_dust.png} | Bin .../{tungstendust.png => tungsten_dust.png} | Bin .../{uvarovitedust.png => uvarovite_dust.png} | Bin ...wgarnetdust.png => yellow_garnet_dust.png} | Bin .../dust/{zincdust.png => zinc_dust.png} | Bin ...andinedust.png => almandine_smalldust.png} | Bin ...luminumdust.png => aluminum_smalldust.png} | Bin ...ndesitedust.png => andesite_smalldust.png} | Bin ...raditedust.png => andradite_smalldust.png} | Bin ...smallashesdust.png => ashes_smalldust.png} | Bin ...allbasaltdust.png => basalt_smalldust.png} | Bin ...lbauxitedust.png => bauxite_smalldust.png} | Bin ...smallbrassdust.png => brass_smalldust.png} | Bin ...allbronzedust.png => bronze_smalldust.png} | Bin ...lcalcitedust.png => calcite_smalldust.png} | Bin ...harcoaldust.png => charcoal_smalldust.png} | Bin ...allchromedust.png => chrome_smalldust.png} | Bin ...innabardust.png => cinnabar_smalldust.png} | Bin .../{smallclaydust.png => clay_smalldust.png} | Bin .../{smallcoaldust.png => coal_smalldust.png} | Bin ...allcopperdust.png => copper_smalldust.png} | Bin ...ashesdust.png => dark_ashes_smalldust.png} | Bin ...ldiamonddust.png => diamond_smalldust.png} | Bin ...ldioritedust.png => diorite_smalldust.png} | Bin ...lectrumdust.png => electrum_smalldust.png} | Bin ...lemeralddust.png => emerald_smalldust.png} | Bin ...dereyedust.png => ender_eye_smalldust.png} | Bin ...earldust.png => ender_pearl_smalldust.png} | Bin ...ndstonedust.png => endstone_smalldust.png} | Bin ...smallflintdust.png => flint_smalldust.png} | Bin ...allgalenadust.png => galena_smalldust.png} | Bin ...wstonedust.png => glowstone_smalldust.png} | Bin .../{smallgolddust.png => gold_smalldust.png} | Bin ...lgranitedust.png => granite_smalldust.png} | Bin ...ssulardust.png => grossular_smalldust.png} | Bin ...smallinvardust.png => invar_smalldust.png} | Bin .../{smallirondust.png => iron_smalldust.png} | Bin ...azuritedust.png => lazurite_smalldust.png} | Bin .../{smallleaddust.png => lead_smalldust.png} | Bin ...nesiumdust.png => magnesium_smalldust.png} | Bin ...ganesedust.png => manganese_smalldust.png} | Bin ...allmarbledust.png => marble_smalldust.png} | Bin ...rrackdust.png => netherrack_smalldust.png} | Bin ...allnickeldust.png => nickel_smalldust.png} | Bin ...bsidiandust.png => obsidian_smalldust.png} | Bin ...lolivinedust.png => olivine_smalldust.png} | Bin ...lperidotdust.png => peridot_smalldust.png} | Bin ...rousdust.png => phosphorous_smalldust.png} | Bin ...latinumdust.png => platinum_smalldust.png} | Bin ...allpyritedust.png => pyrite_smalldust.png} | Bin ...allpyropedust.png => pyrope_smalldust.png} | Bin ...arnetdust.png => red_garnet_smalldust.png} | Bin ...edstonedust.png => redstone_smalldust.png} | Bin .../{smallrubydust.png => ruby_smalldust.png} | Bin ...tpeterdust.png => saltpeter_smalldust.png} | Bin ...apphiredust.png => sapphire_smalldust.png} | Bin ...sawdustdust.png => saw_dust_smalldust.png} | Bin ...mallsilverdust.png => siver_smalldust.png} | Bin ...odalitedust.png => sodalite_smalldust.png} | Bin ...tinedust.png => spessartine_smalldust.png} | Bin ...eritedust.png => sphalerite_smalldust.png} | Bin ...smallsteeldust.png => steel_smalldust.png} | Bin ...allsulfurdust.png => sulfur_smalldust.png} | Bin .../{smalltindust.png => tin_smalldust.png} | Bin ...itaniumdust.png => titanium_smalldust.png} | Bin ...ungstendust.png => tungsten_smalldust.png} | Bin ...rovitedust.png => uvarovite_smalldust.png} | Bin ...etdust.png => yellow_garnet_smalldust.png} | Bin .../{smallzincdust.png => zinc_smalldust.png} | Bin 133 files changed, 700 insertions(+), 77 deletions(-) create mode 100644 src/main/resources/assets/techreborn/blockstates/dust.json create mode 100644 src/main/resources/assets/techreborn/blockstates/smalldust.json rename src/main/resources/assets/techreborn/textures/items/dust/{almandinedust.png => almandine_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{aluminumdust.png => aluminum_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{andesitedust.png => andesite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{andraditedust.png => andradite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{ashesdust.png => ashes_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{basaltdust.png => basalt_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{bauxitedust.png => bauxite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{brassdust.png => brass_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{bronzedust.png => bronze_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{calcitedust.png => calcite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{charcoaldust.png => charcoal_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{chromedust.png => chrome_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{cinnabardust.png => cinnabar_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{claydust.png => clay_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{coaldust.png => coal_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{copperdust.png => copper_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{darkashesdust.png => dark_ashes_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{diamonddust.png => diamond_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{dioritedust.png => diorite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{electrumdust.png => electrum_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{emeralddust.png => emerald_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{endereyedust.png => ender_eye_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{enderpearldust.png => ender_pearl_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{endstonedust.png => endstone_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{flintdust.png => flint_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{galenadust.png => galena_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{golddust.png => gold_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{granitedust.png => granite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{grossulardust.png => grossular_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{invardust.png => invar_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{irondust.png => iron_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{lazuritedust.png => lazurite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{leaddust.png => lead_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{magnesiumdust.png => magnesium_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{manganesedust.png => manganese_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{marbledust.png => marble_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{netherrackdust.png => netherrack_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{nickeldust.png => nickel_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{obsidiandust.png => obsidian_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{olivinedust.png => olivine_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{peridotdust.png => peridot_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{phosphorousdust.png => phosphorous_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{platinumdust.png => platinum_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{pyritedust.png => pyrite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{pyropedust.png => pyrope_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{redgarnetdust.png => red_garnet_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{rubydust.png => ruby_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{saltpeterdust.png => saltpeter_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{sapphiredust.png => sapphire_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{sawdustdust.png => saw_dust_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{silverdust.png => silver_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{sodalitedust.png => sodalite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{spessartinedust.png => spessartine_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{sphaleritedust.png => sphalerite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{steeldust.png => steel_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{sulfurdust.png => sulfur_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{tindust.png => tin_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{titaniumdust.png => titanium_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{tungstendust.png => tungsten_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{uvarovitedust.png => uvarovite_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{yellowgarnetdust.png => yellow_garnet_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/dust/{zincdust.png => zinc_dust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallalmandinedust.png => almandine_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallaluminumdust.png => aluminum_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallandesitedust.png => andesite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallandraditedust.png => andradite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallashesdust.png => ashes_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallbasaltdust.png => basalt_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallbauxitedust.png => bauxite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallbrassdust.png => brass_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallbronzedust.png => bronze_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallcalcitedust.png => calcite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallcharcoaldust.png => charcoal_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallchromedust.png => chrome_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallcinnabardust.png => cinnabar_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallclaydust.png => clay_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallcoaldust.png => coal_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallcopperdust.png => copper_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smalldarkashesdust.png => dark_ashes_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smalldiamonddust.png => diamond_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smalldioritedust.png => diorite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallelectrumdust.png => electrum_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallemeralddust.png => emerald_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallendereyedust.png => ender_eye_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallenderpearldust.png => ender_pearl_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallendstonedust.png => endstone_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallflintdust.png => flint_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallgalenadust.png => galena_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallglowstonedust.png => glowstone_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallgolddust.png => gold_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallgranitedust.png => granite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallgrossulardust.png => grossular_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallinvardust.png => invar_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallirondust.png => iron_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smalllazuritedust.png => lazurite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallleaddust.png => lead_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallmagnesiumdust.png => magnesium_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallmanganesedust.png => manganese_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallmarbledust.png => marble_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallnetherrackdust.png => netherrack_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallnickeldust.png => nickel_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallobsidiandust.png => obsidian_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallolivinedust.png => olivine_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallperidotdust.png => peridot_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallphosphorousdust.png => phosphorous_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallplatinumdust.png => platinum_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallpyritedust.png => pyrite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallpyropedust.png => pyrope_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallredgarnetdust.png => red_garnet_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallredstonedust.png => redstone_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallrubydust.png => ruby_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallsaltpeterdust.png => saltpeter_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallsapphiredust.png => sapphire_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallsawdustdust.png => saw_dust_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallsilverdust.png => siver_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallsodalitedust.png => sodalite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallspessartinedust.png => spessartine_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallsphaleritedust.png => sphalerite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallsteeldust.png => steel_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallsulfurdust.png => sulfur_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smalltindust.png => tin_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smalltitaniumdust.png => titanium_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smalltungstendust.png => tungsten_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smalluvarovitedust.png => uvarovite_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallyellowgarnetdust.png => yellow_garnet_smalldust.png} (100%) rename src/main/resources/assets/techreborn/textures/items/smalldust/{smallzincdust.png => zinc_smalldust.png} (100%) diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 9fc7ae6a7..2e41a7fb9 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -7,10 +7,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import techreborn.init.ModBlocks; import techreborn.init.ModItems; -import techreborn.items.ItemGems; -import techreborn.items.ItemIngots; -import techreborn.items.ItemNuggets; -import techreborn.items.ItemPlates; +import techreborn.items.*; public class RegisterItemJsons { public static void registerModels() { @@ -59,6 +56,16 @@ public class RegisterItemJsons { String[] name = ItemNuggets.types.clone(); registerBlockstate(ModItems.nuggets, i, name[i]); } + + for (int i = 0; i < ItemDusts.types.length; ++i) { + String[] name = ItemDusts.types.clone(); + registerBlockstate(ModItems.dusts, i, name[i]); + } + + for (int i = 0; i < ItemDustsSmall.types.length; ++i) { + String[] name = ItemDustsSmall.types.clone(); + registerBlockstate(ModItems.smallDusts, i, name[i]); + } } private static void registerBlocks() { diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 35a41c961..f4888f1b9 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -1222,7 +1222,7 @@ public class ModRecipes { new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), new ItemStack(Items.ENDER_PEARL, 1), pulsatingIronStack, 200, 16)); RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), ItemDusts.getDustByName("enderPearl", 1), + new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), ItemDusts.getDustByName("ender_pearl", 1), pulsatingIronStack, 200, 16)); } @@ -1236,7 +1236,7 @@ public class ModRecipes { new AlloySmelterRecipe(energeticAlloyStack, new ItemStack(Items.ENDER_PEARL, 1), vibrantAlloyStack, 200, 16)); RecipeHandler.addRecipe( - new AlloySmelterRecipe(energeticAlloyStack, ItemDusts.getDustByName("enderPearl", 1), + new AlloySmelterRecipe(energeticAlloyStack, ItemDusts.getDustByName("ender_pearl", 1), vibrantAlloyStack, 200, 16)); } @@ -1300,20 +1300,20 @@ public class ModRecipes { RecipeHandler.addRecipe( new BlastFurnaceRecipe(new ItemStack(Items.IRON_INGOT), ItemDusts.getDustByName("coal", 2), - ItemIngots.getIngotByName("steel"), ItemDusts.getDustByName("darkAshes", 2), 500, 120, 1000)); + ItemIngots.getIngotByName("steel"), ItemDusts.getDustByName("dark_ashes", 2), 500, 120, 1000)); RecipeHandler.addRecipe( new BlastFurnaceRecipe(ItemIngots.getIngotByName("tungsten"), ItemIngots.getIngotByName("steel"), - ItemIngots.getIngotByName("hot_tungstensteel"), ItemDusts.getDustByName("darkAshes", 4), 500, + ItemIngots.getIngotByName("hot_tungstensteel"), ItemDusts.getDustByName("dark_ashes", 4), 500, 500, 3000)); RecipeHandler.addRecipe( new BlastFurnaceRecipe(new ItemStack(Blocks.IRON_ORE), ItemDusts.getDustByName("calcite"), - new ItemStack(Items.IRON_INGOT, 3), ItemDusts.getDustByName("darkAshes"), 140, 120, 1000)); + new ItemStack(Items.IRON_INGOT, 3), ItemDusts.getDustByName("dark_ashes"), 140, 120, 1000)); RecipeHandler.addRecipe( new BlastFurnaceRecipe(BlockOre.getOreByName("Pyrite"), ItemDusts.getDustByName("calcite"), - new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("darkAshes"), 140, 120, 1000)); + new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("dark_ashes"), 140, 120, 1000)); } static void addUUrecipes() { @@ -1472,7 +1472,7 @@ public class ModRecipes { // Blaze Powder Byproducts RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.BLAZE_POWDER), null, ItemDusts.getDustByName("darkAshes", 1), + new CentrifugeRecipe(new ItemStack(Items.BLAZE_POWDER), null, ItemDusts.getDustByName("dark_ashes", 1), ItemDusts.getDustByName("sulfur", 1), null, null, 1240, 5)); // Magma Cream Products @@ -1501,15 +1501,15 @@ public class ModRecipes { RecipeHandler.addRecipe( new CentrifugeRecipe(ItemDusts.getDustByName("basalt", 16), null, ItemDusts.getDustByName("peridot", 1), ItemDusts.getDustByName("calcite", 3), ItemDusts.getDustByName("magnesium", 8), - ItemDusts.getDustByName("darkAshes", 4), 2680, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("yellowGarnet", 16), null, + ItemDusts.getDustByName("dark_ashes", 4), 2680, 5)); + RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("yellow_garnet", 16), null, ItemDusts.getDustByName("andradite", 5), ItemDusts.getDustByName("grossular", 8), ItemDusts.getDustByName("uvarovite", 3), null, 2940, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("redGarnet", 16), null, + RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("red_garnet", 16), null, ItemDusts.getDustByName("pyrope", 3), ItemDusts.getDustByName("almandine", 5), ItemDusts.getDustByName("spessartine", 8), null, 2940, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(ItemDusts.getDustByName("darkAshes", 2), null, ItemDusts.getDustByName("ashes", 2), + new CentrifugeRecipe(ItemDusts.getDustByName("dark_ashes", 2), null, ItemDusts.getDustByName("ashes", 2), null, null, null, 240, 5)); RecipeHandler.addRecipe( new CentrifugeRecipe(ItemDusts.getDustByName("brass", 4), null, ItemDusts.getDustByName("zinc", 1), @@ -1521,8 +1521,8 @@ public class ModRecipes { new CentrifugeRecipe(ItemDusts.getDustByName("netherrack", 16), null, new ItemStack(Items.REDSTONE, 1), ItemDusts.getDustByName("sulfur", 4), ItemDusts.getDustByName("basalt", 1), new ItemStack(Items.GOLD_NUGGET, 1), 2400, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("enderEye", 1), null, - ItemDusts.getDustByName("enderPearl", 1), new ItemStack(Items.BLAZE_POWDER, 1), null, null, 1280, 5)); + RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("ender_eye", 1), null, + ItemDusts.getDustByName("ender_pearl", 1), new ItemStack(Items.BLAZE_POWDER, 1), null, null, 1280, 5)); RecipeHandler.addRecipe( new CentrifugeRecipe(new ItemStack(Items.GLOWSTONE_DUST, 16), RecipeUtils.getEmptyCell(1), @@ -1886,12 +1886,12 @@ public class ModRecipes { // Sphalerite Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("sphalerite", 2), - ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), + ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDustsSmall.getSmallDustByName("yellow_garnet", 1), null, 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("sphalerite", 2), - ItemDusts.getDustByName("zinc", 1), ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), null, 100, + ItemDusts.getDustByName("zinc", 1), ItemDustsSmall.getSmallDustByName("yellow_garnet", 1), null, 100, 120)); // Tungsten Ore @@ -2852,29 +2852,29 @@ public class ModRecipes { RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemIngots.getIngotByName("iridium_alloy"), new ItemStack(Blocks.TNT, 8), - OreDictionary.getOres("plateIridium").get(0).copy(), ItemDusts.getDustByName("darkAshes", 4), 20, 30)); + OreDictionary.getOres("plateIridium").get(0).copy(), ItemDusts.getDustByName("dark_ashes", 4), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("diamond", 4), new ItemStack(Blocks.TNT, 32), new ItemStack(Items.DIAMOND, 3), - ItemDusts.getDustByName("darkAshes", 16), 20, 30)); + ItemDusts.getDustByName("dark_ashes", 16), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("emerald", 4), new ItemStack(Blocks.TNT, 24), - new ItemStack(Items.EMERALD, 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); + new ItemStack(Items.EMERALD, 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("sapphire", 4), new ItemStack(Blocks.TNT, 24), - ItemGems.getGemByName("sapphire", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); + ItemGems.getGemByName("sapphire", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("ruby", 4), new ItemStack(Blocks.TNT, 24), - ItemGems.getGemByName("ruby", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("yellowGarnet", 4), + ItemGems.getGemByName("ruby", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30)); + RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("yellow_garnet", 4), new ItemStack(Blocks.TNT, 24), - ItemGems.getGemByName("yellow_garnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("redGarnet", 4), + ItemGems.getGemByName("yellow_garnet", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30)); + RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("red_garnet", 4), new ItemStack(Blocks.TNT, 24), - ItemGems.getGemByName("red_garnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); + ItemGems.getGemByName("red_garnet", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("peridot", 4), new ItemStack(Blocks.TNT, 24), - ItemGems.getGemByName("peridot", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); + ItemGems.getGemByName("peridot", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30)); // grinder @@ -2953,7 +2953,7 @@ public class ModRecipes { new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("sphalerite", 2), ItemDustsSmall.getSmallDustByName("Zinc", 1), - ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), + ItemDustsSmall.getSmallDustByName("yellow_garnet", 1), null, 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe( @@ -2961,7 +2961,7 @@ public class ModRecipes { new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("sphalerite", 2), ItemDusts.getDustByName("zinc", 1), - ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), + ItemDustsSmall.getSmallDustByName("yellow_garnet", 1), null, 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe( @@ -3134,7 +3134,7 @@ public class ModRecipes { // ItemCells.getCellByName("hydrogen", 4), ItemCells.getCellByName("empty", 5), // ItemCells.getCellByName("empty", 1), null, 100, 30)); - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("darkAshes"), + RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("dark_ashes"), ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30)); if (OreUtil.doesOreExistAndValid("dustSalt")) { diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index bc6ad15e0..508cc5ef0 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -11,7 +11,6 @@ import techreborn.Core; import techreborn.blocks.BlockMachineFrame; import techreborn.items.*; import techreborn.parts.powerCables.ItemStandaloneCables; -import techreborn.utils.OreDictUtils; public class OreDict { @@ -76,9 +75,8 @@ public class OreDict { OreDictionary.registerOre("materialResin", ItemParts.getPartByName("rubberSap")); OreDictionary.registerOre("materialRubber", ItemParts.getPartByName("rubber")); - OreDictionary.registerOre("pulpWood", ItemDusts.getDustByName("sawDust")); + OreDictionary.registerOre("pulpWood", ItemDusts.getDustByName("saw_dust")); - //Gems registration for (String type : ItemGems.types) { if (type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders! @@ -91,7 +89,6 @@ public class OreDict { ItemPlates.registerType(type); } - //Ingots registration for (String type : ItemIngots.types) { if (type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders! @@ -104,20 +101,23 @@ public class OreDict { ItemPlates.registerType(type); } - //Dusts, nuggets and plates auto-registration - for (String type : ItemPlates.types) { if (type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders! OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type)); } - //still need to switch these to snake_case and json for (String type : ItemDusts.types) { if (type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders! - String oreDictName = "dust" + OreDictUtils.toFirstUpper(type); - OreDictionary.registerOre(oreDictName, ItemDusts.getDustByName(type)); + OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type)); + } + + for (String type : ItemDustsSmall.types) { + if (type.equals(ModItems.META_PLACEHOLDER)) + continue; //Aware of placeholders! + OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_tiny_" + type), ItemDustsSmall.getSmallDustByName(type)); + OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type)); } for (String type : ItemNuggets.types) { diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index 312a2e2a1..f272cdd60 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -11,14 +11,14 @@ import techreborn.lib.ModInfo; import java.security.InvalidParameterException; -public class ItemDusts extends ItemTextureBase { +public class ItemDusts extends ItemTRNoDestroy { public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", "bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper", - "darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena", + "dark_ashes", "diamond", "electrum", "emerald", "ender_eye", "ender_pearl", "endstone", "flint", "galena", "gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack", - "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", ModItems.META_PLACEHOLDER, - "ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel", - "sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellowGarnet", "zinc", + "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet", ModItems.META_PLACEHOLDER, + "ruby", "saltpeter", "sapphire", "saw_dust", "silver", "sodalite", "spessartine", "sphalerite", "steel", + "sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellow_garnet", "zinc", "olivine", "andesite", "diorite", "granite" }; public ItemDusts() { @@ -74,17 +74,4 @@ public class ItemDusts extends ItemTextureBase { } } - @Override - public String getTextureName(int damage) { - if (types[damage].equals("%NULL%")) { - damage = 0; - } - return ModInfo.MOD_ID + ":items/dust/" + types[damage] + "Dust"; - } - - @Override - public int getMaxMeta() { - return types.length; - } - } diff --git a/src/main/java/techreborn/items/ItemDustsSmall.java b/src/main/java/techreborn/items/ItemDustsSmall.java index e015964e4..592c9ce0d 100644 --- a/src/main/java/techreborn/items/ItemDustsSmall.java +++ b/src/main/java/techreborn/items/ItemDustsSmall.java @@ -11,15 +11,15 @@ import techreborn.lib.ModInfo; import java.security.InvalidParameterException; -public class ItemDustsSmall extends ItemTextureBase { +public class ItemDustsSmall extends ItemTRNoDestroy { public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", "bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper", - "darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena", + "dark_ashes", "diamond", "electrum", "emerald", "ender_eye", "ender_pearl", "endstone", "flint", "galena", "gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack", - "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", ModItems.META_PLACEHOLDER, - "ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel", - "sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellowGarnet", "zinc", + "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet", ModItems.META_PLACEHOLDER, + "ruby", "saltpeter", "sapphire", "saw_dust", "silver", "sodalite", "spessartine", "sphalerite", "steel", + "sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellow_garnet", "zinc", "olivine", "redstone", "glowstone", "andesite", "diorite", "granite" }; public ItemDustsSmall() { @@ -64,17 +64,4 @@ public class ItemDustsSmall extends ItemTextureBase { } } - @Override - public String getTextureName(int damage) { - if (types[damage].equals(ModItems.META_PLACEHOLDER)) { - damage = 0; - } - return ModInfo.MOD_ID + ":items/smallDust/small" + StringUtils.toFirstCapital(types[damage]) + "Dust"; - } - - @Override - public int getMaxMeta() { - return types.length; - } - } diff --git a/src/main/resources/assets/techreborn/blockstates/dust.json b/src/main/resources/assets/techreborn/blockstates/dust.json new file mode 100644 index 000000000..5d24491e7 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/dust.json @@ -0,0 +1,316 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "almandine": { + "textures": { + "layer0": "techreborn:items/dust/almandine_dust" + } + }, + "aluminum": { + "textures": { + "layer0": "techreborn:items/dust/aluminum_dust" + } + }, + "andradite": { + "textures": { + "layer0": "techreborn:items/dust/andradite_dust" + } + }, + "ashes": { + "textures": { + "layer0": "techreborn:items/dust/ashes_dust" + } + }, + "basalt": { + "textures": { + "layer0": "techreborn:items/dust/basalt_dust" + } + }, + "bauxite": { + "textures": { + "layer0": "techreborn:items/dust/bauxite_dust" + } + }, + "brass": { + "textures": { + "layer0": "techreborn:items/dust/brass_dust" + } + }, + "bronze": { + "textures": { + "layer0": "techreborn:items/dust/bronze_dust" + } + }, + "calcite": { + "textures": { + "layer0": "techreborn:items/dust/calcite_dust" + } + }, + "charcoal": { + "textures": { + "layer0": "techreborn:items/dust/charcoal_dust" + } + }, + "chrome": { + "textures": { + "layer0": "techreborn:items/dust/chrome_dust" + } + }, + "cinnabar": { + "textures": { + "layer0": "techreborn:items/dust/cinnabar_dust" + } + }, + "clay": { + "textures": { + "layer0": "techreborn:items/dust/clay_dust" + } + }, + "coal": { + "textures": { + "layer0": "techreborn:items/dust/coal_dust" + } + }, + "copper": { + "textures": { + "layer0": "techreborn:items/dust/copper_dust" + } + }, + "dark_ashes": { + "textures": { + "layer0": "techreborn:items/dust/dark_ashes_dust" + } + }, + "diamond": { + "textures": { + "layer0": "techreborn:items/dust/diamond_dust" + } + }, + "electrum": { + "textures": { + "layer0": "techreborn:items/dust/electrum_dust" + } + }, + "emerald": { + "textures": { + "layer0": "techreborn:items/dust/emerald_dust" + } + }, + "ender_eye": { + "textures": { + "layer0": "techreborn:items/dust/ender_eye_dust" + } + }, + "ender_pearl": { + "textures": { + "layer0": "techreborn:items/dust/ender_pearl_dust" + } + }, + "endstone": { + "textures": { + "layer0": "techreborn:items/dust/endstone_dust" + } + }, + "flint": { + "textures": { + "layer0": "techreborn:items/dust/flint_dust" + } + }, + "galena": { + "textures": { + "layer0": "techreborn:items/dust/galena_dust" + } + }, + "gold": { + "textures": { + "layer0": "techreborn:items/dust/gold_dust" + } + }, + "grossular": { + "textures": { + "layer0": "techreborn:items/dust/grossular_dust" + } + }, + "invar": { + "textures": { + "layer0": "techreborn:items/dust/invar_dust" + } + }, + "iron": { + "textures": { + "layer0": "techreborn:items/dust/iron_dust" + } + }, + "lazurite": { + "textures": { + "layer0": "techreborn:items/dust/lazurite_dust" + } + }, + "lead": { + "textures": { + "layer0": "techreborn:items/dust/lead_dust" + } + }, + "magnesium": { + "textures": { + "layer0": "techreborn:items/dust/magnesium_dust" + } + }, + "manganese": { + "textures": { + "layer0": "techreborn:items/dust/manganese_dust" + } + }, + "marble": { + "textures": { + "layer0": "techreborn:items/dust/marble_dust" + } + }, + "netherrack": { + "textures": { + "layer0": "techreborn:items/dust/netherrack_dust" + } + }, + "nickel": { + "textures": { + "layer0": "techreborn:items/dust/nickel_dust" + } + }, + "obsidian": { + "textures": { + "layer0": "techreborn:items/dust/obsidian_dust" + } + }, + "peridot": { + "textures": { + "layer0": "techreborn:items/dust/peridot_dust" + } + }, + "phosphorous": { + "textures": { + "layer0": "techreborn:items/dust/phosphorous_dust" + } + }, + "platinum": { + "textures": { + "layer0": "techreborn:items/dust/platinum_dust" + } + }, + "pyrite": { + "textures": { + "layer0": "techreborn:items/dust/pyrite_dust" + } + }, + "red_garnet": { + "textures": { + "layer0": "techreborn:items/dust/red_garnet_dust" + } + }, + "ruby": { + "textures": { + "layer0": "techreborn:items/dust/ruby_dust" + } + }, + "saltpeter": { + "textures": { + "layer0": "techreborn:items/dust/saltpeter_dust" + } + }, + "sapphire": { + "textures": { + "layer0": "techreborn:items/dust/sapphire_dust" + } + }, + "saw_dust": { + "textures": { + "layer0": "techreborn:items/dust/saw_dust_dust" + } + }, + "silver": { + "textures": { + "layer0": "techreborn:items/dust/silver_dust" + } + }, + "sodalite": { + "textures": { + "layer0": "techreborn:items/dust/sodalite_dust" + } + }, + "spessartine": { + "textures": { + "layer0": "techreborn:items/dust/spessartine_dust" + } + }, + "sphalerite": { + "textures": { + "layer0": "techreborn:items/dust/sphalerite_dust" + } + }, + "steel": { + "textures": { + "layer0": "techreborn:items/dust/steel_dust" + } + }, + "sulfur": { + "textures": { + "layer0": "techreborn:items/dust/sulfur_dust" + } + }, + "tin": { + "textures": { + "layer0": "techreborn:items/dust/tin_dust" + } + }, + "titanium": { + "textures": { + "layer0": "techreborn:items/dust/titanium_dust" + } + }, + "tungsten": { + "textures": { + "layer0": "techreborn:items/dust/tungsten_dust" + } + }, + "uvarovite": { + "textures": { + "layer0": "techreborn:items/dust/uvarovite_dust" + } + }, + "yellow_garnet": { + "textures": { + "layer0": "techreborn:items/dust/yellow_garnet_dust" + } + }, + "zinc": { + "textures": { + "layer0": "techreborn:items/dust/zinc_dust" + } + }, + "olivine": { + "textures": { + "layer0": "techreborn:items/dust/olivine_dust" + } + }, + "andesite": { + "textures": { + "layer0": "techreborn:items/dust/andesite_dust" + } + }, + "diorite": { + "textures": { + "layer0": "techreborn:items/dust/diorite_dust" + } + }, + "granite": { + "textures": { + "layer0": "techreborn:items/dust/granite_dust" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/smalldust.json b/src/main/resources/assets/techreborn/blockstates/smalldust.json new file mode 100644 index 000000000..989a3158c --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/smalldust.json @@ -0,0 +1,326 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "almandine": { + "textures": { + "layer0": "techreborn:items/smalldust/almandine_smalldust" + } + }, + "aluminum": { + "textures": { + "layer0": "techreborn:items/smalldust/aluminum_smalldust" + } + }, + "andradite": { + "textures": { + "layer0": "techreborn:items/smalldust/andradite_smalldust" + } + }, + "ashes": { + "textures": { + "layer0": "techreborn:items/smalldust/ashes_smalldust" + } + }, + "basalt": { + "textures": { + "layer0": "techreborn:items/smalldust/basalt_smalldust" + } + }, + "bauxite": { + "textures": { + "layer0": "techreborn:items/smalldust/bauxite_smalldust" + } + }, + "brass": { + "textures": { + "layer0": "techreborn:items/smalldust/brass_smalldust" + } + }, + "bronze": { + "textures": { + "layer0": "techreborn:items/smalldust/bronze_smalldust" + } + }, + "calcite": { + "textures": { + "layer0": "techreborn:items/smalldust/calcite_smalldust" + } + }, + "charcoal": { + "textures": { + "layer0": "techreborn:items/smalldust/charcoal_smalldust" + } + }, + "chrome": { + "textures": { + "layer0": "techreborn:items/smalldust/chrome_smalldust" + } + }, + "cinnabar": { + "textures": { + "layer0": "techreborn:items/smalldust/cinnabar_smalldust" + } + }, + "clay": { + "textures": { + "layer0": "techreborn:items/smalldust/clay_smalldust" + } + }, + "coal": { + "textures": { + "layer0": "techreborn:items/smalldust/coal_smalldust" + } + }, + "copper": { + "textures": { + "layer0": "techreborn:items/smalldust/copper_smalldust" + } + }, + "dark_ashes": { + "textures": { + "layer0": "techreborn:items/smalldust/dark_ashes_smalldust" + } + }, + "diamond": { + "textures": { + "layer0": "techreborn:items/smalldust/diamond_smalldust" + } + }, + "electrum": { + "textures": { + "layer0": "techreborn:items/smalldust/electrum_smalldust" + } + }, + "emerald": { + "textures": { + "layer0": "techreborn:items/smalldust/emerald_smalldust" + } + }, + "ender_eye": { + "textures": { + "layer0": "techreborn:items/smalldust/ender_eye_smalldust" + } + }, + "ender_pearl": { + "textures": { + "layer0": "techreborn:items/smalldust/ender_pearl_smalldust" + } + }, + "endstone": { + "textures": { + "layer0": "techreborn:items/smalldust/endstone_smalldust" + } + }, + "flint": { + "textures": { + "layer0": "techreborn:items/smalldust/flint_smalldust" + } + }, + "galena": { + "textures": { + "layer0": "techreborn:items/smalldust/galena_smalldust" + } + }, + "gold": { + "textures": { + "layer0": "techreborn:items/smalldust/gold_smalldust" + } + }, + "grossular": { + "textures": { + "layer0": "techreborn:items/smalldust/grossular_smalldust" + } + }, + "invar": { + "textures": { + "layer0": "techreborn:items/smalldust/invar_smalldust" + } + }, + "iron": { + "textures": { + "layer0": "techreborn:items/smalldust/iron_smalldust" + } + }, + "lazurite": { + "textures": { + "layer0": "techreborn:items/smalldust/lazurite_smalldust" + } + }, + "lead": { + "textures": { + "layer0": "techreborn:items/smalldust/lead_smalldust" + } + }, + "magnesium": { + "textures": { + "layer0": "techreborn:items/smalldust/magnesium_smalldust" + } + }, + "manganese": { + "textures": { + "layer0": "techreborn:items/smalldust/manganese_smalldust" + } + }, + "marble": { + "textures": { + "layer0": "techreborn:items/smalldust/marble_smalldust" + } + }, + "netherrack": { + "textures": { + "layer0": "techreborn:items/smalldust/netherrack_smalldust" + } + }, + "nickel": { + "textures": { + "layer0": "techreborn:items/smalldust/nickel_smalldust" + } + }, + "obsidian": { + "textures": { + "layer0": "techreborn:items/smalldust/obsidian_smalldust" + } + }, + "peridot": { + "textures": { + "layer0": "techreborn:items/smalldust/peridot_smalldust" + } + }, + "phosphorous": { + "textures": { + "layer0": "techreborn:items/smalldust/phosphorous_smalldust" + } + }, + "platinum": { + "textures": { + "layer0": "techreborn:items/smalldust/platinum_smalldust" + } + }, + "pyrite": { + "textures": { + "layer0": "techreborn:items/smalldust/pyrite_smalldust" + } + }, + "red_garnet": { + "textures": { + "layer0": "techreborn:items/smalldust/red_garnet_smalldust" + } + }, + "ruby": { + "textures": { + "layer0": "techreborn:items/smalldust/ruby_smalldust" + } + }, + "saltpeter": { + "textures": { + "layer0": "techreborn:items/smalldust/saltpeter_smalldust" + } + }, + "sapphire": { + "textures": { + "layer0": "techreborn:items/smalldust/sapphire_smalldust" + } + }, + "saw_smalldust": { + "textures": { + "layer0": "techreborn:items/smalldust/saw_smalldust_smalldust" + } + }, + "silver": { + "textures": { + "layer0": "techreborn:items/smalldust/silver_smalldust" + } + }, + "sodalite": { + "textures": { + "layer0": "techreborn:items/smalldust/sodalite_smalldust" + } + }, + "spessartine": { + "textures": { + "layer0": "techreborn:items/smalldust/spessartine_smalldust" + } + }, + "sphalerite": { + "textures": { + "layer0": "techreborn:items/smalldust/sphalerite_smalldust" + } + }, + "steel": { + "textures": { + "layer0": "techreborn:items/smalldust/steel_smalldust" + } + }, + "sulfur": { + "textures": { + "layer0": "techreborn:items/smalldust/sulfur_smalldust" + } + }, + "tin": { + "textures": { + "layer0": "techreborn:items/smalldust/tin_smalldust" + } + }, + "titanium": { + "textures": { + "layer0": "techreborn:items/smalldust/titanium_smalldust" + } + }, + "tungsten": { + "textures": { + "layer0": "techreborn:items/smalldust/tungsten_smalldust" + } + }, + "uvarovite": { + "textures": { + "layer0": "techreborn:items/smalldust/uvarovite_smalldust" + } + }, + "yellow_garnet": { + "textures": { + "layer0": "techreborn:items/smalldust/yellow_garnet_smalldust" + } + }, + "zinc": { + "textures": { + "layer0": "techreborn:items/smalldust/zinc_smalldust" + } + }, + "olivine": { + "textures": { + "layer0": "techreborn:items/smalldust/olivine_smalldust" + } + }, + "andesite": { + "textures": { + "layer0": "techreborn:items/smalldust/andesite_smalldust" + } + }, + "diorite": { + "textures": { + "layer0": "techreborn:items/smalldust/diorite_smalldust" + } + }, + "granite": { + "textures": { + "layer0": "techreborn:items/smalldust/granite_smalldust" + } + }, + "redstone": { + "textures": { + "layer0": "techreborn:items/smalldust/redstone_smalldust" + } + }, + "glowstone": { + "textures": { + "layer0": "techreborn:items/smalldust/glowstone_smalldust" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/items/dust/almandinedust.png b/src/main/resources/assets/techreborn/textures/items/dust/almandine_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/almandinedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/almandine_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/aluminumdust.png b/src/main/resources/assets/techreborn/textures/items/dust/aluminum_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/aluminumdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/aluminum_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/andesitedust.png b/src/main/resources/assets/techreborn/textures/items/dust/andesite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/andesitedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/andesite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/andraditedust.png b/src/main/resources/assets/techreborn/textures/items/dust/andradite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/andraditedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/andradite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/ashesdust.png b/src/main/resources/assets/techreborn/textures/items/dust/ashes_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/ashesdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/ashes_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/basaltdust.png b/src/main/resources/assets/techreborn/textures/items/dust/basalt_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/basaltdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/basalt_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/bauxitedust.png b/src/main/resources/assets/techreborn/textures/items/dust/bauxite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/bauxitedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/bauxite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/brassdust.png b/src/main/resources/assets/techreborn/textures/items/dust/brass_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/brassdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/brass_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/bronzedust.png b/src/main/resources/assets/techreborn/textures/items/dust/bronze_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/bronzedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/bronze_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/calcitedust.png b/src/main/resources/assets/techreborn/textures/items/dust/calcite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/calcitedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/calcite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/charcoaldust.png b/src/main/resources/assets/techreborn/textures/items/dust/charcoal_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/charcoaldust.png rename to src/main/resources/assets/techreborn/textures/items/dust/charcoal_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/chromedust.png b/src/main/resources/assets/techreborn/textures/items/dust/chrome_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/chromedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/chrome_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/cinnabardust.png b/src/main/resources/assets/techreborn/textures/items/dust/cinnabar_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/cinnabardust.png rename to src/main/resources/assets/techreborn/textures/items/dust/cinnabar_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/claydust.png b/src/main/resources/assets/techreborn/textures/items/dust/clay_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/claydust.png rename to src/main/resources/assets/techreborn/textures/items/dust/clay_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/coaldust.png b/src/main/resources/assets/techreborn/textures/items/dust/coal_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/coaldust.png rename to src/main/resources/assets/techreborn/textures/items/dust/coal_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/copperdust.png b/src/main/resources/assets/techreborn/textures/items/dust/copper_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/copperdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/copper_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/darkashesdust.png b/src/main/resources/assets/techreborn/textures/items/dust/dark_ashes_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/darkashesdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/dark_ashes_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/diamonddust.png b/src/main/resources/assets/techreborn/textures/items/dust/diamond_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/diamonddust.png rename to src/main/resources/assets/techreborn/textures/items/dust/diamond_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/dioritedust.png b/src/main/resources/assets/techreborn/textures/items/dust/diorite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/dioritedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/diorite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/electrumdust.png b/src/main/resources/assets/techreborn/textures/items/dust/electrum_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/electrumdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/electrum_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/emeralddust.png b/src/main/resources/assets/techreborn/textures/items/dust/emerald_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/emeralddust.png rename to src/main/resources/assets/techreborn/textures/items/dust/emerald_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/endereyedust.png b/src/main/resources/assets/techreborn/textures/items/dust/ender_eye_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/endereyedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/ender_eye_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/enderpearldust.png b/src/main/resources/assets/techreborn/textures/items/dust/ender_pearl_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/enderpearldust.png rename to src/main/resources/assets/techreborn/textures/items/dust/ender_pearl_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/endstonedust.png b/src/main/resources/assets/techreborn/textures/items/dust/endstone_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/endstonedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/endstone_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/flintdust.png b/src/main/resources/assets/techreborn/textures/items/dust/flint_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/flintdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/flint_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/galenadust.png b/src/main/resources/assets/techreborn/textures/items/dust/galena_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/galenadust.png rename to src/main/resources/assets/techreborn/textures/items/dust/galena_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/golddust.png b/src/main/resources/assets/techreborn/textures/items/dust/gold_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/golddust.png rename to src/main/resources/assets/techreborn/textures/items/dust/gold_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/granitedust.png b/src/main/resources/assets/techreborn/textures/items/dust/granite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/granitedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/granite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/grossulardust.png b/src/main/resources/assets/techreborn/textures/items/dust/grossular_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/grossulardust.png rename to src/main/resources/assets/techreborn/textures/items/dust/grossular_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/invardust.png b/src/main/resources/assets/techreborn/textures/items/dust/invar_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/invardust.png rename to src/main/resources/assets/techreborn/textures/items/dust/invar_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/irondust.png b/src/main/resources/assets/techreborn/textures/items/dust/iron_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/irondust.png rename to src/main/resources/assets/techreborn/textures/items/dust/iron_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/lazuritedust.png b/src/main/resources/assets/techreborn/textures/items/dust/lazurite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/lazuritedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/lazurite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/leaddust.png b/src/main/resources/assets/techreborn/textures/items/dust/lead_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/leaddust.png rename to src/main/resources/assets/techreborn/textures/items/dust/lead_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/magnesiumdust.png b/src/main/resources/assets/techreborn/textures/items/dust/magnesium_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/magnesiumdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/magnesium_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/manganesedust.png b/src/main/resources/assets/techreborn/textures/items/dust/manganese_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/manganesedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/manganese_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/marbledust.png b/src/main/resources/assets/techreborn/textures/items/dust/marble_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/marbledust.png rename to src/main/resources/assets/techreborn/textures/items/dust/marble_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/netherrackdust.png b/src/main/resources/assets/techreborn/textures/items/dust/netherrack_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/netherrackdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/netherrack_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/nickeldust.png b/src/main/resources/assets/techreborn/textures/items/dust/nickel_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/nickeldust.png rename to src/main/resources/assets/techreborn/textures/items/dust/nickel_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/obsidiandust.png b/src/main/resources/assets/techreborn/textures/items/dust/obsidian_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/obsidiandust.png rename to src/main/resources/assets/techreborn/textures/items/dust/obsidian_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/olivinedust.png b/src/main/resources/assets/techreborn/textures/items/dust/olivine_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/olivinedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/olivine_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/peridotdust.png b/src/main/resources/assets/techreborn/textures/items/dust/peridot_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/peridotdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/peridot_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/phosphorousdust.png b/src/main/resources/assets/techreborn/textures/items/dust/phosphorous_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/phosphorousdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/phosphorous_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/platinumdust.png b/src/main/resources/assets/techreborn/textures/items/dust/platinum_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/platinumdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/platinum_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/pyritedust.png b/src/main/resources/assets/techreborn/textures/items/dust/pyrite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/pyritedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/pyrite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/pyropedust.png b/src/main/resources/assets/techreborn/textures/items/dust/pyrope_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/pyropedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/pyrope_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/redgarnetdust.png b/src/main/resources/assets/techreborn/textures/items/dust/red_garnet_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/redgarnetdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/red_garnet_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/rubydust.png b/src/main/resources/assets/techreborn/textures/items/dust/ruby_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/rubydust.png rename to src/main/resources/assets/techreborn/textures/items/dust/ruby_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/saltpeterdust.png b/src/main/resources/assets/techreborn/textures/items/dust/saltpeter_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/saltpeterdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/saltpeter_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/sapphiredust.png b/src/main/resources/assets/techreborn/textures/items/dust/sapphire_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/sapphiredust.png rename to src/main/resources/assets/techreborn/textures/items/dust/sapphire_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/sawdustdust.png b/src/main/resources/assets/techreborn/textures/items/dust/saw_dust_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/sawdustdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/saw_dust_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/silverdust.png b/src/main/resources/assets/techreborn/textures/items/dust/silver_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/silverdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/silver_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/sodalitedust.png b/src/main/resources/assets/techreborn/textures/items/dust/sodalite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/sodalitedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/sodalite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/spessartinedust.png b/src/main/resources/assets/techreborn/textures/items/dust/spessartine_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/spessartinedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/spessartine_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/sphaleritedust.png b/src/main/resources/assets/techreborn/textures/items/dust/sphalerite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/sphaleritedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/sphalerite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/steeldust.png b/src/main/resources/assets/techreborn/textures/items/dust/steel_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/steeldust.png rename to src/main/resources/assets/techreborn/textures/items/dust/steel_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/sulfurdust.png b/src/main/resources/assets/techreborn/textures/items/dust/sulfur_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/sulfurdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/sulfur_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/tindust.png b/src/main/resources/assets/techreborn/textures/items/dust/tin_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/tindust.png rename to src/main/resources/assets/techreborn/textures/items/dust/tin_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/titaniumdust.png b/src/main/resources/assets/techreborn/textures/items/dust/titanium_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/titaniumdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/titanium_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/tungstendust.png b/src/main/resources/assets/techreborn/textures/items/dust/tungsten_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/tungstendust.png rename to src/main/resources/assets/techreborn/textures/items/dust/tungsten_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/uvarovitedust.png b/src/main/resources/assets/techreborn/textures/items/dust/uvarovite_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/uvarovitedust.png rename to src/main/resources/assets/techreborn/textures/items/dust/uvarovite_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/yellowgarnetdust.png b/src/main/resources/assets/techreborn/textures/items/dust/yellow_garnet_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/yellowgarnetdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/yellow_garnet_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/zincdust.png b/src/main/resources/assets/techreborn/textures/items/dust/zinc_dust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/dust/zincdust.png rename to src/main/resources/assets/techreborn/textures/items/dust/zinc_dust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallalmandinedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/almandine_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallalmandinedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/almandine_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallaluminumdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/aluminum_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallaluminumdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/aluminum_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallandesitedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/andesite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallandesitedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/andesite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallandraditedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/andradite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallandraditedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/andradite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallashesdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/ashes_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallashesdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/ashes_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallbasaltdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/basalt_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallbasaltdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/basalt_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallbauxitedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/bauxite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallbauxitedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/bauxite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallbrassdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/brass_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallbrassdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/brass_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallbronzedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/bronze_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallbronzedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/bronze_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallcalcitedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/calcite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallcalcitedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/calcite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallcharcoaldust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/charcoal_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallcharcoaldust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/charcoal_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallchromedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/chrome_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallchromedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/chrome_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallcinnabardust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/cinnabar_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallcinnabardust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/cinnabar_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallclaydust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/clay_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallclaydust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/clay_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallcoaldust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/coal_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallcoaldust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/coal_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallcopperdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/copper_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallcopperdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/copper_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smalldarkashesdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/dark_ashes_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smalldarkashesdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/dark_ashes_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smalldiamonddust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/diamond_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smalldiamonddust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/diamond_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smalldioritedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/diorite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smalldioritedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/diorite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallelectrumdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/electrum_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallelectrumdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/electrum_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallemeralddust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/emerald_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallemeralddust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/emerald_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallendereyedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/ender_eye_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallendereyedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/ender_eye_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallenderpearldust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/ender_pearl_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallenderpearldust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/ender_pearl_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallendstonedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/endstone_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallendstonedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/endstone_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallflintdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/flint_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallflintdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/flint_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallgalenadust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/galena_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallgalenadust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/galena_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallglowstonedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/glowstone_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallglowstonedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/glowstone_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallgolddust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/gold_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallgolddust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/gold_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallgranitedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/granite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallgranitedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/granite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallgrossulardust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/grossular_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallgrossulardust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/grossular_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallinvardust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/invar_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallinvardust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/invar_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallirondust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/iron_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallirondust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/iron_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smalllazuritedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/lazurite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smalllazuritedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/lazurite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallleaddust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/lead_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallleaddust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/lead_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallmagnesiumdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/magnesium_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallmagnesiumdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/magnesium_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallmanganesedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/manganese_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallmanganesedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/manganese_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallmarbledust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/marble_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallmarbledust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/marble_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallnetherrackdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/netherrack_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallnetherrackdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/netherrack_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallnickeldust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/nickel_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallnickeldust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/nickel_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallobsidiandust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/obsidian_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallobsidiandust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/obsidian_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallolivinedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/olivine_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallolivinedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/olivine_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallperidotdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/peridot_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallperidotdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/peridot_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallphosphorousdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/phosphorous_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallphosphorousdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/phosphorous_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallplatinumdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/platinum_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallplatinumdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/platinum_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallpyritedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/pyrite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallpyritedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/pyrite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallpyropedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/pyrope_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallpyropedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/pyrope_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallredgarnetdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/red_garnet_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallredgarnetdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/red_garnet_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallredstonedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/redstone_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallredstonedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/redstone_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallrubydust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/ruby_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallrubydust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/ruby_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallsaltpeterdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/saltpeter_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallsaltpeterdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/saltpeter_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallsapphiredust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/sapphire_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallsapphiredust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/sapphire_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallsawdustdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/saw_dust_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallsawdustdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/saw_dust_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallsilverdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/siver_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallsilverdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/siver_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallsodalitedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/sodalite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallsodalitedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/sodalite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallspessartinedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/spessartine_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallspessartinedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/spessartine_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallsphaleritedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/sphalerite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallsphaleritedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/sphalerite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallsteeldust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/steel_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallsteeldust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/steel_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallsulfurdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/sulfur_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallsulfurdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/sulfur_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smalltindust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/tin_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smalltindust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/tin_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smalltitaniumdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/titanium_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smalltitaniumdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/titanium_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smalltungstendust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/tungsten_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smalltungstendust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/tungsten_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smalluvarovitedust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/uvarovite_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smalluvarovitedust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/uvarovite_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallyellowgarnetdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/yellow_garnet_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallyellowgarnetdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/yellow_garnet_smalldust.png diff --git a/src/main/resources/assets/techreborn/textures/items/smalldust/smallzincdust.png b/src/main/resources/assets/techreborn/textures/items/smalldust/zinc_smalldust.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/smalldust/smallzincdust.png rename to src/main/resources/assets/techreborn/textures/items/smalldust/zinc_smalldust.png