From a2c12f38410acd08d3cbbafcba99c5148e0fafe9 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 22 Dec 2016 19:16:10 -0800 Subject: [PATCH] Fix missing resources --- .../forestry/apiculture/BeekeepingLogic.java | 8 +- .../items/ItemRegistryApiculture.java | 32 +++--- .../arboriculture/PluginArboriculture.java | 7 +- .../arboriculture/blocks/BlockPile.java | 6 +- .../blocks/BlockRegistryArboriculture.java | 2 +- .../arboriculture/blocks/BlockSapling.java | 2 +- .../arboriculture/items/ItemGermlingGE.java | 5 +- .../items/ItemRegistryArboriculture.java | 4 +- .../models/ModelProviderGermling.java | 6 +- src/main/java/forestry/core/PluginCore.java | 2 +- .../forestry/core/blocks/BlockRegistry.java | 8 ++ .../core/blocks/BlockRegistryCore.java | 4 +- .../forestry/core/errors/EnumErrorCode.java | 92 ++++++++--------- .../core/gui/GuiCamouflageSprayCan.java | 2 +- .../core/items/ItemCamouflageSprayCan.java | 2 +- .../core/items/ItemCraftingMaterial.java | 2 +- .../forestry/core/items/ItemRegistry.java | 13 ++- .../forestry/core/items/ItemRegistryCore.java | 62 ++++++------ .../core/models/ModelCamouflageSprayCan.java | 4 +- .../forestry/core/network/PacketHandler.java | 1 + .../java/forestry/core/utils/StringUtil.java | 9 ++ .../forestry/food/items/ItemRegistryFood.java | 4 +- .../genetics/ButterflyDefinition.java | 4 +- .../genetics/MothDefinition.java | 4 +- .../items/ItemRegistryLepidopterology.java | 8 +- .../render/ModelButterflyItem.java | 5 +- .../storage/items/ItemRegistryStorage.java | 28 +++--- .../{bogEarth.json => bog_earth.json} | 0 .../{cratedGlass.json => crated_glass.json} | 0 .../{cratedPeat.json => crated_peat.json} | 0 .../{cratedStone.json => crated_stone.json} | 0 .../{cratedWood.json => crated_wood.json} | 0 .../forestry/blockstates/germlings.json | 70 ++++++------- .../assets/forestry/blockstates/pile.json | 6 +- ...urceStorage.json => resource_storage.json} | 0 .../chests/abandoned_mineshaft.json | 12 +-- .../loot_tables/chests/desert_pyramid.json | 4 +- .../loot_tables/chests/end_city_treasure.json | 8 +- .../loot_tables/chests/igloo_chest.json | 4 +- .../loot_tables/chests/jungle_temple.json | 4 +- .../loot_tables/chests/nether_bridge.json | 4 +- .../loot_tables/chests/simple_dungeon.json | 2 +- .../chests/stronghold_corridor.json | 2 +- .../chests/stronghold_crossing.json | 2 +- .../chests/stronghold_library.json | 4 +- .../chests/village_naturalist.json | 8 +- .../models/block/arboriculture/log_side.json | 2 +- .../block/{ashPile.json => ash_pile.json} | 0 .../assets/forestry/models/block/candle.json | 26 ++--- .../forestry/models/block/candle_off.json | 4 +- .../forestry/models/block/candle_on.json | 4 +- .../forestry/models/block/candle_up.json | 26 ++--- .../forestry/models/block/candle_up_off.json | 4 +- .../forestry/models/block/candle_up_on.json | 4 +- .../block/{dirtPile.json => dirt_pile.json} | 0 .../block/germlings/sapling.treeAcacia.json | 6 -- .../block/germlings/sapling.treeBalsa.json | 6 -- .../block/germlings/sapling.treeBaobab.json | 6 -- .../block/germlings/sapling.treeCherry.json | 6 -- .../block/germlings/sapling.treeChestnut.json | 6 -- .../block/germlings/sapling.treeCocobolo.json | 6 -- .../block/germlings/sapling.treeDate.json | 6 -- .../block/germlings/sapling.treeEbony.json | 6 -- .../block/germlings/sapling.treeGigant.json | 6 -- .../block/germlings/sapling.treeIpe.json | 6 -- .../block/germlings/sapling.treeKapok.json | 6 -- .../block/germlings/sapling.treeLarch.json | 6 -- .../block/germlings/sapling.treeLemon.json | 6 -- .../block/germlings/sapling.treeLime.json | 6 -- .../block/germlings/sapling.treeMahoe.json | 6 -- .../block/germlings/sapling.treeMahogony.json | 6 -- .../block/germlings/sapling.treeMaple.json | 6 -- .../block/germlings/sapling.treePadauk.json | 6 -- .../block/germlings/sapling.treePapaya.json | 6 -- .../block/germlings/sapling.treePine.json | 6 -- .../block/germlings/sapling.treePlum.json | 6 -- .../block/germlings/sapling.treePoplar.json | 6 -- .../block/germlings/sapling.treeSequoia.json | 6 -- .../block/germlings/sapling.treeSipiri.json | 6 -- .../block/germlings/sapling.treeTeak.json | 6 -- .../block/germlings/sapling.treeWalnut.json | 6 -- .../block/germlings/sapling.treeWenge.json | 6 -- .../block/germlings/sapling.treeWillow.json | 6 -- .../germlings/sapling.treeZebrawood.json | 6 -- .../block/germlings/sapling.tree_acacia.json | 6 ++ ....json => sapling.tree_acacia_vanilla.json} | 0 .../block/germlings/sapling.tree_balsa.json | 6 ++ .../block/germlings/sapling.tree_baobab.json | 6 ++ ...treeBirch.json => sapling.tree_birch.json} | 0 .../block/germlings/sapling.tree_cherry.json | 6 ++ .../germlings/sapling.tree_chestnut.json | 6 ++ .../germlings/sapling.tree_cocobolo.json | 6 ++ ...arkOak.json => sapling.tree_dark_oak.json} | 0 .../block/germlings/sapling.tree_date.json | 6 ++ .../block/germlings/sapling.tree_ebony.json | 6 ++ .../block/germlings/sapling.tree_gigant.json | 6 ++ .../block/germlings/sapling.tree_ipe.json | 6 ++ ...eeJungle.json => sapling.tree_jungle.json} | 0 .../block/germlings/sapling.tree_kapok.json | 6 ++ .../block/germlings/sapling.tree_larch.json | 6 ++ .../block/germlings/sapling.tree_lemon.json | 6 ++ .../block/germlings/sapling.tree_lime.json | 6 ++ .../block/germlings/sapling.tree_mahoe.json | 6 ++ .../germlings/sapling.tree_mahogony.json | 6 ++ .../block/germlings/sapling.tree_maple.json | 6 ++ ...ing.treeOak.json => sapling.tree_oak.json} | 0 .../block/germlings/sapling.tree_padauk.json | 6 ++ .../block/germlings/sapling.tree_papaya.json | 6 ++ .../block/germlings/sapling.tree_pine.json | 6 ++ .../block/germlings/sapling.tree_plum.json | 6 ++ .../block/germlings/sapling.tree_poplar.json | 6 ++ .../block/germlings/sapling.tree_sequoia.json | 6 ++ .../block/germlings/sapling.tree_sipiri.json | 6 ++ ...eeSpruce.json => sapling.tree_spruce.json} | 0 .../block/germlings/sapling.tree_teak.json | 6 ++ .../block/germlings/sapling.tree_walnut.json | 6 ++ .../block/germlings/sapling.tree_wenge.json | 6 ++ .../block/germlings/sapling.tree_willow.json | 6 ++ .../germlings/sapling.tree_zebrawood.json | 6 ++ .../forestry/models/block/woodPile.json | 93 ------------------ .../forestry/models/block/wood_pile.json | 93 ++++++++++++++++++ ...apiaristBoots.json => apiarist_boots.json} | 2 +- ...ituminousPeat.json => apiarist_chest.json} | 2 +- ...iaristHelmet.json => apiarist_helmet.json} | 2 +- ...{apiaristChest.json => apiarist_legs.json} | 2 +- .../assets/forestry/models/item/ashPile.json | 3 - .../assets/forestry/models/item/ash_pile.json | 3 + .../item/{beeCombs.json => bee_combs.json} | 4 +- .../forestry/models/item/beecombs/cocoa.json | 2 +- .../models/item/beecombs/darkened.json | 2 +- .../models/item/beecombs/dripping.json | 2 +- .../forestry/models/item/beecombs/frozen.json | 2 +- .../forestry/models/item/beecombs/honey.json | 2 +- .../models/item/beecombs/irradiated.json | 2 +- .../forestry/models/item/beecombs/mellow.json | 2 +- .../forestry/models/item/beecombs/mossy.json | 2 +- .../models/item/beecombs/mysterious.json | 2 +- .../forestry/models/item/beecombs/omega.json | 2 +- .../models/item/beecombs/parched.json | 2 +- .../models/item/beecombs/powdery.json | 2 +- .../models/item/beecombs/reddened.json | 2 +- .../forestry/models/item/beecombs/silky.json | 2 +- .../models/item/beecombs/simmering.json | 2 +- .../models/item/beecombs/stringy.json | 2 +- .../models/item/beecombs/wheaten.json | 2 +- .../forestry/models/item/bituminous_peat.json | 6 ++ .../models/item/broken_bronze_pickaxe.json | 6 ++ .../models/item/broken_bronze_shovel.json | 6 ++ ...bronzePickaxe.json => bronze_pickaxe.json} | 2 +- .../{bronzeShovel.json => bronze_shovel.json} | 2 +- .../{butterflyGE.json => butterfly_ge.json} | 0 .../models/item/camouflageSprayCan.json | 6 -- .../models/item/camouflageSprayCanFilled.json | 6 -- .../models/item/camouflage_spray_can.json | 6 ++ .../item/camouflage_spray_can_filled.json | 6 ++ ...aneling.json => camouflaged_paneling.json} | 2 +- .../craftingMaterial/dissipationCharge.json | 6 -- .../dissipation_charge.json} | 2 +- .../ice_shard.json} | 2 +- .../item/craftingMaterial/pulsatingDust.json | 6 -- .../item/craftingMaterial/pulsatingMesh.json | 6 -- .../item/craftingMaterial/pulsating_dust.json | 6 ++ .../item/craftingMaterial/pulsating_mesh.json | 6 ++ .../craftingMaterial/scentedPaneling.json | 6 -- .../craftingMaterial/scented_paneling.json | 6 ++ .../{iceShard.json => silk_wisp.json} | 2 +- .../woven_silk.json} | 2 +- .../forestry/models/item/decayingWheat.json | 6 -- .../forestry/models/item/decaying_wheat.json | 6 ++ .../assets/forestry/models/item/dirtPile.json | 3 - .../forestry/models/item/dirt_pile.json | 3 + .../models/item/dissipation_charge.json | 13 +++ .../forestry/models/item/fertilizerBio.json | 6 -- .../models/item/fertilizerCompound.json | 6 -- .../forestry/models/item/fertilizer_bio.json | 6 ++ ...ePickaxe.json => fertilizer_compound.json} | 2 +- ...tionCharge.json => frame_impregnated.json} | 2 +- .../item/{iceShard.json => frame_proven.json} | 2 +- ...rtableAlyzer.json => frame_untreated.json} | 2 +- .../forestry/models/item/gearCopper.json | 6 -- .../forestry/models/item/gear_bronze.json | 6 ++ .../forestry/models/item/gear_copper.json | 6 ++ .../silkWisp.json => gear_tin.json} | 2 +- .../item/germlings/sapling.treeAcacia.json | 6 -- .../item/germlings/sapling.treeBalsa.json | 6 -- .../item/germlings/sapling.treeBaobab.json | 6 -- .../item/germlings/sapling.treeCherry.json | 6 -- .../item/germlings/sapling.treeChestnut.json | 6 -- .../item/germlings/sapling.treeCocobolo.json | 6 -- .../item/germlings/sapling.treeDate.json | 6 -- .../item/germlings/sapling.treeEbony.json | 6 -- .../item/germlings/sapling.treeGigant.json | 6 -- .../item/germlings/sapling.treeIpe.json | 6 -- .../item/germlings/sapling.treeKapok.json | 6 -- .../item/germlings/sapling.treeLarch.json | 6 -- .../item/germlings/sapling.treeLemon.json | 6 -- .../item/germlings/sapling.treeLime.json | 6 -- .../item/germlings/sapling.treeMahoe.json | 6 -- .../item/germlings/sapling.treeMahogony.json | 6 -- .../item/germlings/sapling.treeMaple.json | 6 -- .../item/germlings/sapling.treePadauk.json | 6 -- .../item/germlings/sapling.treePapaya.json | 6 -- .../item/germlings/sapling.treePine.json | 6 -- .../item/germlings/sapling.treePlum.json | 6 -- .../item/germlings/sapling.treePoplar.json | 6 -- .../item/germlings/sapling.treeSequoia.json | 6 -- .../item/germlings/sapling.treeSipiri.json | 6 -- .../item/germlings/sapling.treeTeak.json | 6 -- .../item/germlings/sapling.treeWalnut.json | 6 -- .../item/germlings/sapling.treeWenge.json | 6 -- .../item/germlings/sapling.treeWillow.json | 6 -- .../item/germlings/sapling.treeZebrawood.json | 6 -- .../item/germlings/sapling.tree_acacia.json | 6 ++ .../item/germlings/sapling.tree_balsa.json | 6 ++ .../item/germlings/sapling.tree_baobab.json | 6 ++ .../item/germlings/sapling.tree_cherry.json | 6 ++ .../item/germlings/sapling.tree_chestnut.json | 6 ++ .../item/germlings/sapling.tree_cocobolo.json | 6 ++ .../item/germlings/sapling.tree_date.json | 6 ++ .../item/germlings/sapling.tree_ebony.json | 6 ++ .../item/germlings/sapling.tree_gigant.json | 6 ++ .../item/germlings/sapling.tree_ipe.json | 6 ++ .../item/germlings/sapling.tree_kapok.json | 6 ++ .../item/germlings/sapling.tree_larch.json | 6 ++ .../item/germlings/sapling.tree_lemon.json | 6 ++ .../item/germlings/sapling.tree_lime.json | 6 ++ .../item/germlings/sapling.tree_mahoe.json | 6 ++ .../item/germlings/sapling.tree_mahogony.json | 6 ++ .../item/germlings/sapling.tree_maple.json | 6 ++ .../item/germlings/sapling.tree_padauk.json | 6 ++ .../item/germlings/sapling.tree_papaya.json | 6 ++ .../item/germlings/sapling.tree_pine.json | 6 ++ .../item/germlings/sapling.tree_plum.json | 6 ++ .../item/germlings/sapling.tree_poplar.json | 6 ++ .../item/germlings/sapling.tree_sequoia.json | 6 ++ .../item/germlings/sapling.tree_sipiri.json | 6 ++ .../item/germlings/sapling.tree_teak.json | 6 ++ .../item/germlings/sapling.tree_walnut.json | 6 ++ .../item/germlings/sapling.tree_wenge.json | 6 ++ .../item/germlings/sapling.tree_willow.json | 6 ++ .../germlings/sapling.tree_zebrawood.json | 6 ++ .../forestry/models/item/grafterProven.json | 6 -- .../forestry/models/item/grafter_proven.json | 6 ++ ...bitatLocator.json => habitat_locator.json} | 0 .../forestry/models/item/hardenedMachine.json | 6 -- .../models/item/hardened_machine.json | 6 ++ .../forestry/models/item/honeyDrop.json | 7 -- .../assets/forestry/models/item/honeyPot.json | 6 -- .../forestry/models/item/honey_drop.json | 7 ++ .../wovenSilk.json => honey_pot.json} | 2 +- .../forestry/models/item/honeyedSlice.json | 6 -- ...d - Kopie (11).json => honeyed_slice.json} | 2 +- .../item/{wovenSilk.json => ice_shard.json} | 2 +- .../models/item/impregnatedCasing.json | 6 -- .../models/item/impregnated_casing.json | 6 ++ .../forestry/models/item/ingotBronze.json | 6 -- .../forestry/models/item/ingotCopper.json | 6 -- .../assets/forestry/models/item/ingotTin.json | 6 -- .../{apiaristLegs.json => ingot_bronze.json} | 2 +- .../forestry/models/item/ingot_copper.json | 6 ++ .../forestry/models/item/ingot_tin.json | 6 ++ .../forestry/models/item/iodineCapsule.json | 6 -- .../forestry/models/item/iodine_capsule.json | 6 ++ .../forestry/models/item/kitPickaxe.json | 6 -- .../forestry/models/item/kitShovel.json | 6 -- .../forestry/models/item/kit_pickaxe.json | 6 ++ .../forestry/models/item/kit_shovel.json | 6 ++ .../forestry/models/item/mouldyWheat.json | 6 -- .../forestry/models/item/mouldy_wheat.json | 6 ++ ...listHelmet.json => naturalist_helmet.json} | 0 .../assets/forestry/models/item/oakStick.json | 6 -- .../forestry/models/item/oak_stick.json | 6 ++ ...ameUntreated.json => portable_alyzer.json} | 2 +- .../forestry/models/item/pulsatingDust.json | 6 -- .../forestry/models/item/pulsatingMesh.json | 6 -- .../forestry/models/item/pulsating_dust.json | 6 ++ .../forestry/models/item/pulsating_mesh.json | 6 ++ .../forestry/models/item/refractoryWax.json | 6 -- .../forestry/models/item/refractory_wax.json | 6 ++ .../{researchNote.json => research_note.json} | 0 .../{frameProven.json => royal_jelly.json} | 2 +- .../forestry/models/item/scentedPaneling.json | 13 --- ...Impregnated.json => scented_paneling.json} | 2 +- .../item/{waxCast.json => silk_wisp.json} | 2 +- .../forestry/models/item/solderingIron.json | 6 -- .../forestry/models/item/soldering_iron.json | 6 ++ ...rsFireproof.json => stairs_fireproof.json} | 0 .../forestry/models/item/sturdyMachine.json | 6 -- .../forestry/models/item/sturdy_machine.json | 6 ++ .../forestry/models/item/thermionicTubes.json | 7 -- .../models/item/thermionic_tubes.json | 7 ++ .../item/{silkWisp.json => wax_cast.json} | 2 +- .../assets/forestry/models/item/woodPile.json | 3 - .../assets/forestry/models/item/woodPulp.json | 6 -- .../forestry/models/item/wood_pile.json | 3 + .../forestry/models/item/wood_pulp.json | 6 ++ .../item/{royalJelly.json => woven_silk.json} | 2 +- ...andleStumpLit.png => candle_stump_lit.png} | Bin ...eStumpUnlit.png => candle_stump_unlit.png} | Bin .../{candleTipLit.png => candle_tip_lit.png} | Bin ...andleTipUnlit.png => candle_tip_unlit.png} | Bin ...treeAcacia.png => sapling.tree_acacia.png} | Bin ...g.treeBalsa.png => sapling.tree_balsa.png} | Bin ...treeBaobab.png => sapling.tree_baobab.png} | Bin ...treeCherry.png => sapling.tree_cherry.png} | Bin ...Chestnut.png => sapling.tree_chestnut.png} | Bin ...Cocobolo.png => sapling.tree_cocobolo.png} | Bin ...ing.treeDate.png => sapling.tree_date.png} | Bin ...g.treeEbony.png => sapling.tree_ebony.png} | Bin ...treeGigant.png => sapling.tree_gigant.png} | Bin ...pling.treeIpe.png => sapling.tree_ipe.png} | Bin ...g.treeKapok.png => sapling.tree_kapok.png} | Bin ...g.treeLarch.png => sapling.tree_larch.png} | Bin ...g.treeLemon.png => sapling.tree_lemon.png} | Bin ...ing.treeLime.png => sapling.tree_lime.png} | Bin ...g.treeMahoe.png => sapling.tree_mahoe.png} | Bin ...Mahogony.png => sapling.tree_mahogony.png} | Bin ...g.treeMaple.png => sapling.tree_maple.png} | Bin ...treePadauk.png => sapling.tree_padauk.png} | Bin ...treePapaya.png => sapling.tree_papaya.png} | Bin ...ing.treePine.png => sapling.tree_pine.png} | Bin ...ing.treePlum.png => sapling.tree_plum.png} | Bin ...treePoplar.png => sapling.tree_poplar.png} | Bin ...treeRubber.png => sapling.tree_rubber.png} | Bin ...eeSequoia.png => sapling.tree_sequoia.png} | Bin ...treeSipiri.png => sapling.tree_sipiri.png} | Bin ...ing.treeTeak.png => sapling.tree_teak.png} | Bin ...treeWalnut.png => sapling.tree_walnut.png} | Bin ...g.treeWenge.png => sapling.tree_wenge.png} | Bin ...treeWillow.png => sapling.tree_willow.png} | Bin ...brawood.png => sapling.tree_zebrawood.png} | Bin .../forestry/textures/entity/bees/endBee.png | Bin 914 -> 0 bytes .../textures/entity/bees/honeyBee.png | Bin 979 -> 0 bytes .../forestry/textures/entity/bees/icyBee.png | Bin 922 -> 0 bytes .../textures/entity/bees/sinisterBee.png | Bin 933 -> 0 bytes .../textures/entity/bees/tropicalBee.png | Bin 981 -> 0 bytes .../{lepiAurora.png => lepi_aurora.png} | Bin .../{lepiBatesia.png => lepi_batesia.png} | Bin ...lackSwallow.png => lepi_black_swallow.png} | Bin .../{lepiBlueDuke.png => lepi_blue_duke.png} | Bin .../{lepiBlueWing.png => lepi_blue_wing.png} | Bin .../{lepiBrimstone.png => lepi_brimstone.png} | Bin ...ckledWood.png => lepi_c_speckled_wood.png} | Bin ...abbageWhite.png => lepi_cabbage_white.png} | Bin ...rusSwallow.png => lepi_citrus_swallow.png} | Bin .../{lepiComma.png => lepi_comma.png} | Bin ...{lepiDianaFrit.png => lepi_diana_frit.png} | Bin ...ldPeacock.png => lepi_emerald_peacock.png} | Bin .../{lepiGlasswing.png => lepi_glasswing.png} | Bin ...iGlassyTiger.png => lepi_glassy_tiger.png} | Bin ...iGozoraAzure.png => lepi_gozora_azure.png} | Bin ...{lepiLLacewing.png => lepi_l_lacewing.png} | Bin ...MBlueMorpho.png => lepi_m_blue_morpho.png} | Bin ...ckledWood.png => lepi_m_speckled_wood.png} | Bin .../{lepiMalachite.png => lepi_malachite.png} | Bin .../{lepiMonarch.png => lepi_monarch.png} | Bin ...PBlueMorpho.png => lepi_p_blue_morpho.png} | Bin ...noSulphur.png => lepi_palaeno_sulphur.png} | Bin ...lepiPostillion.png => lepi_postillion.png} | Bin .../{lepiPostman.png => lepi_postman.png} | Bin ...RBlueMorpho.png => lepi_r_blue_morpho.png} | Bin .../{lepiReseda.png => lepi_reseda.png} | Bin ...peckledWood.png => lepi_speckled_wood.png} | Bin .../{lepiSpicebush.png => lepi_spicebush.png} | Bin ...iSpringAzure.png => lepi_spring_azure.png} | Bin ...hoasSwallow.png => lepi_thoas_swallow.png} | Bin ...ebraSwallow.png => lepi_zebra_swallow.png} | Bin .../{mothAtlas.png => moth_atlas.png} | Bin ...othBombyxMori.png => moth_bombyx_mori.png} | Bin .../{mothBrimstone.png => moth_brimstone.png} | Bin ...ticedHeath.png => moth_latticed_heath.png} | Bin .../gui/{backpackT2.png => backpack_t2.png} | Bin ...eSprayCan.png => camouflage_spray_can.png} | Bin ...rcuitMismatch.png => circuit_mismatch.png} | Bin ...forcedCooldown.png => forced_cooldown.png} | Bin .../{invalidBiome.png => invalid_biome.png} | Bin .../errors/{isRaining.png => is_raining.png} | Bin ...oCircuitBoard.png => no_circuit_board.png} | Bin ...ircuitLayout.png => no_circuit_layout.png} | Bin .../{noDisposal.png => no_disposal.png} | Bin .../gui/errors/{noDrone.png => no_drone.png} | Bin .../{noEnergyNet.png => no_energy_net.png} | Bin .../{noFarmland.png => no_farmland.png} | Bin .../{noFertilizer.png => no_fertilizer.png} | Bin .../errors/{noFlower.png => no_flower.png} | Bin .../gui/errors/{noFuel.png => no_fuel.png} | Bin .../gui/errors/{noHeat.png => no_heat.png} | Bin .../gui/errors/{noHoney.png => no_honey.png} | Bin .../errors/{noLiquid.png => no_liquid.png} | Bin .../gui/errors/{noPaper.png => no_paper.png} | Bin .../gui/errors/{noPower.png => no_power.png} | Bin .../gui/errors/{noQueen.png => no_queen.png} | Bin .../errors/{noRecipe.png => no_recipe.png} | Bin .../{noRecipient.png => no_recipient.png} | Bin .../{noResource.png => no_resource.png} | Bin .../gui/errors/{noSky.png => no_sky.png} | Bin .../gui/errors/{noSpace.png => no_space.png} | Bin .../{noSpaceTank.png => no_space_tank.png} | Bin .../{noSpecimen.png => no_specimen.png} | Bin .../errors/{noStamps.png => no_stamps.png} | Bin ...AlphaNumeric.png => not_alpha_numeric.png} | Bin .../gui/errors/{notDay.png => not_day.png} | Bin .../errors/{notGloomy.png => not_gloomy.png} | Bin .../errors/{notLucid.png => not_lucid.png} | Bin .../errors/{notNight.png => not_night.png} | Bin .../{notRaining.png => not_raining.png} | Bin .../errors/{notUnique.png => not_unique.png} | Bin .../gui/errors/{tooCold.png => too_cold.png} | Bin .../gui/errors/{tooHot.png => too_hot.png} | Bin .../errors/{tooHumid.png => too_humid.png} | Bin ...wrongStacksize.png => wrong_stacksize.png} | Bin .../gui/{ledgerLeft.png => ledger_left.png} | Bin .../triggers/{hasMail.png => has_mail.png} | Bin .../triggers/{hasWork.png => has_work.png} | Bin .../{lowFertilizer.png => low_fertilizer.png} | Bin .../triggers/{lowFuel.png => low_fuel.png} | Bin .../{lowGermlings.png => low_germlings.png} | Bin .../triggers/{lowInput.png => low_input.png} | Bin .../{lowLiquid.png => low_liquid.png} | Bin .../triggers/{lowPaper.png => low_paper.png} | Bin .../{lowResources.png => low_resources.png} | Bin .../triggers/{lowSoil.png => low_soil.png} | Bin .../{lowStamps.png => low_stamps.png} | Bin .../{mailBuffer.png => mail_buffer.png} | Bin .../{missingDrone.png => missing_drone.png} | Bin .../{missingQueen.png => missing_queen.png} | Bin .../triggers/{noFrames.png => no_frames.png} | Bin .../{apiaristBoots.png => apiarist_boots.png} | Bin .../{apiaristChest.png => apiarist_chest.png} | Bin ...apiaristHelmet.png => apiarist_helmet.png} | Bin .../{apiaristLegs.png => apiarist_legs.png} | Bin .../items/{beeCombs.0.png => bee_combs.0.png} | Bin .../items/{beeCombs.1.png => bee_combs.1.png} | Bin .../items/{bioMass.png => bio_mass.png} | Bin ...bituminousPeat.png => bituminous_peat.png} | Bin ...ePickaxe.png => broken_bronze_pickaxe.png} | Bin ...nzeShovel.png => broken_bronze_shovel.png} | Bin .../{bronzePickaxe.png => bronze_pickaxe.png} | Bin .../{bronzeShovel.png => bronze_shovel.png} | Bin .../{lepiAurora.png => lepi_aurora.png} | Bin .../{lepiBatesia.png => lepi_batesia.png} | Bin ...lackSwallow.png => lepi_black_swallow.png} | Bin .../{lepiBlueDuke.png => lepi_blue_duke.png} | Bin .../{lepiBlueWing.png => lepi_blue_wing.png} | Bin .../{lepiBrimstone.png => lepi_brimstone.png} | Bin ...abbageWhite.png => lepi_cabbage_white.png} | Bin ...rusSwallow.png => lepi_citrus_swallow.png} | Bin .../{lepiComma.png => lepi_comma.png} | Bin ...eckledWood.png => lepi_cspeckled_wood.png} | Bin ...{lepiDianaFrit.png => lepi_diana_frit.png} | Bin ...ldPeacock.png => lepi_emerald_peacock.png} | Bin .../{lepiGlasswing.png => lepi_glasswing.png} | Bin ...iGlassyTiger.png => lepi_glassy_tiger.png} | Bin ...iGozoraAzure.png => lepi_gozora_azure.png} | Bin .../{lepiLLacewing.png => lepi_llacewing.png} | Bin .../{lepiMalachite.png => lepi_malachite.png} | Bin ...iMBlueMorpho.png => lepi_mblue_morpho.png} | Bin .../{lepiMonarch.png => lepi_monarch.png} | Bin ...eckledWood.png => lepi_mspeckled_wood.png} | Bin ...noSulphur.png => lepi_palaeno_sulphur.png} | Bin ...iPBlueMorpho.png => lepi_pblue_morpho.png} | Bin ...lepiPostillion.png => lepi_postillion.png} | Bin .../{lepiPostman.png => lepi_postman.png} | Bin ...iRBlueMorpho.png => lepi_rblue_morpho.png} | Bin .../{lepiReseda.png => lepi_reseda.png} | Bin ...peckledWood.png => lepi_speckled_wood.png} | Bin .../{lepiSpicebush.png => lepi_spicebush.png} | Bin ...iSpringAzure.png => lepi_spring_azure.png} | Bin ...hoasSwallow.png => lepi_thoas_swallow.png} | Bin ...ebraSwallow.png => lepi_zebra_swallow.png} | Bin .../{mothAtlas.png => moth_atlas.png} | Bin ...othBombyxMori.png => moth_bombyx_mori.png} | Bin .../{mothBrimstone.png => moth_brimstone.png} | Bin ...ticedHeath.png => moth_latticed_heath.png} | Bin ...eSprayCan.png => camouflage_spray_can.png} | Bin ...ed.png => camouflage_spray_can_filled.png} | Bin ...dPaneling.png => camouflaged_paneling.png} | Bin .../{decayingWheat.png => decaying_wheat.png} | Bin ...ationCharge.png => dissipation_charge.png} | Bin .../{fertilizerBio.png => fertilizer_bio.png} | Bin ...erCompound.png => fertilizer_compound.png} | Bin ...eImpregnated.png => frame_impregnated.png} | Bin .../{frameProven.png => frame_proven.png} | Bin ...frameUntreated.png => frame_untreated.png} | Bin .../items/{gearBronze.png => gear_bronze.png} | Bin .../items/{gearCopper.png => gear_copper.png} | Bin .../items/{gearTin.png => gear_tin.png} | Bin .../{grafterProven.png => grafter_proven.png} | Bin ...rdenedMachine.png => hardened_machine.png} | Bin .../{honeyDrop.0.png => honey_drop.0.png} | Bin .../{honeyDrop.1.png => honey_drop.1.png} | Bin .../items/{honeyPot.png => honey_pot.png} | Bin .../{honeyedSlice.png => honeyed_slice.png} | Bin .../items/{iceShard.png => ice_shard.png} | Bin ...natedCasing.png => impregnated_casing.png} | Bin .../{ingotBronze.png => ingot_bronze.png} | Bin .../{ingotCopper.png => ingot_copper.png} | Bin .../items/{ingotTin.png => ingot_tin.png} | Bin .../{iodineCapsule.png => iodine_capsule.png} | Bin .../items/{kitPickaxe.png => kit_pickaxe.png} | Bin .../items/{kitShovel.png => kit_shovel.png} | Bin .../{mouldyWheat.png => mouldy_wheat.png} | Bin ...ralistHelmet.png => naturalist_helmet.png} | Bin .../items/{oakStick.png => oak_stick.png} | Bin ...portableAlyzer.png => portable_alyzer.png} | Bin .../{pulsatingDust.png => pulsating_dust.png} | Bin .../{pulsatingMesh.png => pulsating_mesh.png} | Bin .../{refractoryWax.png => refractory_wax.png} | Bin .../items/{royalJelly.png => royal_jelly.png} | Bin ...entedPaneling.png => scented_paneling.png} | Bin .../items/{silkWisp.png => silk_wisp.png} | Bin .../{solderingIron.png => soldering_iron.png} | Bin .../{sturdyMachine.png => sturdy_machine.png} | Bin ...onicTubes.0.png => thermionic_tubes.0.png} | Bin ...onicTubes.1.png => thermionic_tubes.1.png} | Bin .../{vialCatalyst.png => vial_catalyst.png} | Bin .../items/{waxCast.png => wax_cast.png} | Bin .../items/{woodPulp.png => wood_pulp.png} | Bin .../items/{wovenSilk.png => woven_silk.png} | Bin 519 files changed, 974 insertions(+), 938 deletions(-) rename src/main/resources/assets/forestry/blockstates/{bogEarth.json => bog_earth.json} (100%) rename src/main/resources/assets/forestry/blockstates/crates/{cratedGlass.json => crated_glass.json} (100%) rename src/main/resources/assets/forestry/blockstates/crates/{cratedPeat.json => crated_peat.json} (100%) rename src/main/resources/assets/forestry/blockstates/crates/{cratedStone.json => crated_stone.json} (100%) rename src/main/resources/assets/forestry/blockstates/crates/{cratedWood.json => crated_wood.json} (100%) rename src/main/resources/assets/forestry/blockstates/{resourceStorage.json => resource_storage.json} (100%) rename src/main/resources/assets/forestry/models/block/{ashPile.json => ash_pile.json} (100%) rename src/main/resources/assets/forestry/models/block/{dirtPile.json => dirt_pile.json} (100%) delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcacia.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeBalsa.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeBaobab.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeCherry.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeChestnut.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeCocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeDate.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeEbony.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeGigant.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeIpe.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeKapok.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeLarch.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeLemon.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeLime.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahoe.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahogony.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeMaple.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treePadauk.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treePapaya.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treePine.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treePlum.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treePoplar.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequoia.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeSipiri.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeTeak.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeWalnut.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeWenge.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeWillow.json delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeZebrawood.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_acacia.json rename src/main/resources/assets/forestry/models/block/germlings/{sapling.treeAcaciaVanilla.json => sapling.tree_acacia_vanilla.json} (100%) create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_balsa.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_baobab.json rename src/main/resources/assets/forestry/models/block/germlings/{sapling.treeBirch.json => sapling.tree_birch.json} (100%) create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_cherry.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_chestnut.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_cocobolo.json rename src/main/resources/assets/forestry/models/block/germlings/{sapling.treeDarkOak.json => sapling.tree_dark_oak.json} (100%) create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_date.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_ebony.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_gigant.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_ipe.json rename src/main/resources/assets/forestry/models/block/germlings/{sapling.treeJungle.json => sapling.tree_jungle.json} (100%) create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_kapok.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_larch.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_lemon.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_lime.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_mahoe.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_mahogony.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_maple.json rename src/main/resources/assets/forestry/models/block/germlings/{sapling.treeOak.json => sapling.tree_oak.json} (100%) create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_padauk.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_papaya.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_pine.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_plum.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_poplar.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_sequoia.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_sipiri.json rename src/main/resources/assets/forestry/models/block/germlings/{sapling.treeSpruce.json => sapling.tree_spruce.json} (100%) create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_teak.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_walnut.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_wenge.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_willow.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.tree_zebrawood.json delete mode 100644 src/main/resources/assets/forestry/models/block/woodPile.json create mode 100644 src/main/resources/assets/forestry/models/block/wood_pile.json rename src/main/resources/assets/forestry/models/item/{apiaristBoots.json => apiarist_boots.json} (88%) rename src/main/resources/assets/forestry/models/item/{bituminousPeat.json => apiarist_chest.json} (54%) rename src/main/resources/assets/forestry/models/item/{apiaristHelmet.json => apiarist_helmet.json} (88%) rename src/main/resources/assets/forestry/models/item/{apiaristChest.json => apiarist_legs.json} (55%) delete mode 100644 src/main/resources/assets/forestry/models/item/ashPile.json create mode 100644 src/main/resources/assets/forestry/models/item/ash_pile.json rename src/main/resources/assets/forestry/models/item/{beeCombs.json => bee_combs.json} (81%) create mode 100644 src/main/resources/assets/forestry/models/item/bituminous_peat.json create mode 100644 src/main/resources/assets/forestry/models/item/broken_bronze_pickaxe.json create mode 100644 src/main/resources/assets/forestry/models/item/broken_bronze_shovel.json rename src/main/resources/assets/forestry/models/item/{bronzePickaxe.json => bronze_pickaxe.json} (54%) rename src/main/resources/assets/forestry/models/item/{bronzeShovel.json => bronze_shovel.json} (54%) rename src/main/resources/assets/forestry/models/item/{butterflyGE.json => butterfly_ge.json} (100%) delete mode 100644 src/main/resources/assets/forestry/models/item/camouflageSprayCan.json delete mode 100644 src/main/resources/assets/forestry/models/item/camouflageSprayCanFilled.json create mode 100644 src/main/resources/assets/forestry/models/item/camouflage_spray_can.json create mode 100644 src/main/resources/assets/forestry/models/item/camouflage_spray_can_filled.json rename src/main/resources/assets/forestry/models/item/{camouflagedPaneling.json => camouflaged_paneling.json} (81%) delete mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json rename src/main/resources/assets/forestry/models/item/{brokenBronzeShovel.json => craftingMaterial/dissipation_charge.json} (52%) rename src/main/resources/assets/forestry/models/item/{gearTin.json => craftingMaterial/ice_shard.json} (57%) delete mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json delete mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/pulsating_dust.json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/pulsating_mesh.json delete mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/scented_paneling.json rename src/main/resources/assets/forestry/models/item/craftingMaterial/{iceShard.json => silk_wisp.json} (57%) rename src/main/resources/assets/forestry/models/item/{gearBronze.json => craftingMaterial/woven_silk.json} (56%) delete mode 100644 src/main/resources/assets/forestry/models/item/decayingWheat.json create mode 100644 src/main/resources/assets/forestry/models/item/decaying_wheat.json delete mode 100644 src/main/resources/assets/forestry/models/item/dirtPile.json create mode 100644 src/main/resources/assets/forestry/models/item/dirt_pile.json create mode 100644 src/main/resources/assets/forestry/models/item/dissipation_charge.json delete mode 100644 src/main/resources/assets/forestry/models/item/fertilizerBio.json delete mode 100644 src/main/resources/assets/forestry/models/item/fertilizerCompound.json create mode 100644 src/main/resources/assets/forestry/models/item/fertilizer_bio.json rename src/main/resources/assets/forestry/models/item/{brokenBronzePickaxe.json => fertilizer_compound.json} (52%) rename src/main/resources/assets/forestry/models/item/{dissipationCharge.json => frame_impregnated.json} (82%) rename src/main/resources/assets/forestry/models/item/{iceShard.json => frame_proven.json} (83%) rename src/main/resources/assets/forestry/models/item/{portableAlyzer.json => frame_untreated.json} (88%) delete mode 100644 src/main/resources/assets/forestry/models/item/gearCopper.json create mode 100644 src/main/resources/assets/forestry/models/item/gear_bronze.json create mode 100644 src/main/resources/assets/forestry/models/item/gear_copper.json rename src/main/resources/assets/forestry/models/item/{craftingMaterial/silkWisp.json => gear_tin.json} (57%) delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_acacia.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_balsa.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_baobab.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_cherry.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_chestnut.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_cocobolo.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_date.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_ebony.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_gigant.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_ipe.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_kapok.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_larch.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_lemon.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_lime.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_mahoe.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_mahogony.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_maple.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_padauk.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_papaya.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_pine.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_plum.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_poplar.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_sequoia.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_sipiri.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_teak.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_walnut.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_wenge.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_willow.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.tree_zebrawood.json delete mode 100644 src/main/resources/assets/forestry/models/item/grafterProven.json create mode 100644 src/main/resources/assets/forestry/models/item/grafter_proven.json rename src/main/resources/assets/forestry/models/item/{habitatLocator.json => habitat_locator.json} (100%) delete mode 100644 src/main/resources/assets/forestry/models/item/hardenedMachine.json create mode 100644 src/main/resources/assets/forestry/models/item/hardened_machine.json delete mode 100644 src/main/resources/assets/forestry/models/item/honeyDrop.json delete mode 100644 src/main/resources/assets/forestry/models/item/honeyPot.json create mode 100644 src/main/resources/assets/forestry/models/item/honey_drop.json rename src/main/resources/assets/forestry/models/item/{craftingMaterial/wovenSilk.json => honey_pot.json} (57%) delete mode 100644 src/main/resources/assets/forestry/models/item/honeyedSlice.json rename src/main/resources/assets/forestry/models/item/{craftingMaterial/fertilizerCompound - Kopie (11).json => honeyed_slice.json} (55%) rename src/main/resources/assets/forestry/models/item/{wovenSilk.json => ice_shard.json} (84%) delete mode 100644 src/main/resources/assets/forestry/models/item/impregnatedCasing.json create mode 100644 src/main/resources/assets/forestry/models/item/impregnated_casing.json delete mode 100644 src/main/resources/assets/forestry/models/item/ingotBronze.json delete mode 100644 src/main/resources/assets/forestry/models/item/ingotCopper.json delete mode 100644 src/main/resources/assets/forestry/models/item/ingotTin.json rename src/main/resources/assets/forestry/models/item/{apiaristLegs.json => ingot_bronze.json} (55%) create mode 100644 src/main/resources/assets/forestry/models/item/ingot_copper.json create mode 100644 src/main/resources/assets/forestry/models/item/ingot_tin.json delete mode 100644 src/main/resources/assets/forestry/models/item/iodineCapsule.json create mode 100644 src/main/resources/assets/forestry/models/item/iodine_capsule.json delete mode 100644 src/main/resources/assets/forestry/models/item/kitPickaxe.json delete mode 100644 src/main/resources/assets/forestry/models/item/kitShovel.json create mode 100644 src/main/resources/assets/forestry/models/item/kit_pickaxe.json create mode 100644 src/main/resources/assets/forestry/models/item/kit_shovel.json delete mode 100644 src/main/resources/assets/forestry/models/item/mouldyWheat.json create mode 100644 src/main/resources/assets/forestry/models/item/mouldy_wheat.json rename src/main/resources/assets/forestry/models/item/{naturalistHelmet.json => naturalist_helmet.json} (100%) delete mode 100644 src/main/resources/assets/forestry/models/item/oakStick.json create mode 100644 src/main/resources/assets/forestry/models/item/oak_stick.json rename src/main/resources/assets/forestry/models/item/{frameUntreated.json => portable_alyzer.json} (88%) delete mode 100644 src/main/resources/assets/forestry/models/item/pulsatingDust.json delete mode 100644 src/main/resources/assets/forestry/models/item/pulsatingMesh.json create mode 100644 src/main/resources/assets/forestry/models/item/pulsating_dust.json create mode 100644 src/main/resources/assets/forestry/models/item/pulsating_mesh.json delete mode 100644 src/main/resources/assets/forestry/models/item/refractoryWax.json create mode 100644 src/main/resources/assets/forestry/models/item/refractory_wax.json rename src/main/resources/assets/forestry/models/item/{researchNote.json => research_note.json} (100%) rename src/main/resources/assets/forestry/models/item/{frameProven.json => royal_jelly.json} (84%) delete mode 100644 src/main/resources/assets/forestry/models/item/scentedPaneling.json rename src/main/resources/assets/forestry/models/item/{frameImpregnated.json => scented_paneling.json} (82%) rename src/main/resources/assets/forestry/models/item/{waxCast.json => silk_wisp.json} (84%) delete mode 100644 src/main/resources/assets/forestry/models/item/solderingIron.json create mode 100644 src/main/resources/assets/forestry/models/item/soldering_iron.json rename src/main/resources/assets/forestry/models/item/{stairsFireproof.json => stairs_fireproof.json} (100%) delete mode 100644 src/main/resources/assets/forestry/models/item/sturdyMachine.json create mode 100644 src/main/resources/assets/forestry/models/item/sturdy_machine.json delete mode 100644 src/main/resources/assets/forestry/models/item/thermionicTubes.json create mode 100644 src/main/resources/assets/forestry/models/item/thermionic_tubes.json rename src/main/resources/assets/forestry/models/item/{silkWisp.json => wax_cast.json} (84%) delete mode 100644 src/main/resources/assets/forestry/models/item/woodPile.json delete mode 100644 src/main/resources/assets/forestry/models/item/woodPulp.json create mode 100644 src/main/resources/assets/forestry/models/item/wood_pile.json create mode 100644 src/main/resources/assets/forestry/models/item/wood_pulp.json rename src/main/resources/assets/forestry/models/item/{royalJelly.json => woven_silk.json} (84%) rename src/main/resources/assets/forestry/textures/blocks/{candleStumpLit.png => candle_stump_lit.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/{candleStumpUnlit.png => candle_stump_unlit.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/{candleTipLit.png => candle_tip_lit.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/{candleTipUnlit.png => candle_tip_unlit.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeAcacia.png => sapling.tree_acacia.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeBalsa.png => sapling.tree_balsa.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeBaobab.png => sapling.tree_baobab.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeCherry.png => sapling.tree_cherry.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeChestnut.png => sapling.tree_chestnut.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeCocobolo.png => sapling.tree_cocobolo.png} (100%) rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeDate.png => sapling.tree_date.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeEbony.png => sapling.tree_ebony.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeGigant.png => sapling.tree_gigant.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeIpe.png => sapling.tree_ipe.png} (100%) rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeKapok.png => sapling.tree_kapok.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeLarch.png => sapling.tree_larch.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeLemon.png => sapling.tree_lemon.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeLime.png => sapling.tree_lime.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeMahoe.png => sapling.tree_mahoe.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeMahogony.png => sapling.tree_mahogony.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeMaple.png => sapling.tree_maple.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treePadauk.png => sapling.tree_padauk.png} (100%) rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treePapaya.png => sapling.tree_papaya.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treePine.png => sapling.tree_pine.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treePlum.png => sapling.tree_plum.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treePoplar.png => sapling.tree_poplar.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeRubber.png => sapling.tree_rubber.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeSequoia.png => sapling.tree_sequoia.png} (100%) rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeSipiri.png => sapling.tree_sipiri.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeTeak.png => sapling.tree_teak.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeWalnut.png => sapling.tree_walnut.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeWenge.png => sapling.tree_wenge.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeWillow.png => sapling.tree_willow.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeZebrawood.png => sapling.tree_zebrawood.png} (100%) delete mode 100755 src/main/resources/assets/forestry/textures/entity/bees/endBee.png delete mode 100755 src/main/resources/assets/forestry/textures/entity/bees/honeyBee.png delete mode 100755 src/main/resources/assets/forestry/textures/entity/bees/icyBee.png delete mode 100755 src/main/resources/assets/forestry/textures/entity/bees/sinisterBee.png delete mode 100755 src/main/resources/assets/forestry/textures/entity/bees/tropicalBee.png rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiAurora.png => lepi_aurora.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiBatesia.png => lepi_batesia.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiBlackSwallow.png => lepi_black_swallow.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiBlueDuke.png => lepi_blue_duke.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiBlueWing.png => lepi_blue_wing.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiBrimstone.png => lepi_brimstone.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiCSpeckledWood.png => lepi_c_speckled_wood.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiCabbageWhite.png => lepi_cabbage_white.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiCitrusSwallow.png => lepi_citrus_swallow.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiComma.png => lepi_comma.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiDianaFrit.png => lepi_diana_frit.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiEmeraldPeacock.png => lepi_emerald_peacock.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiGlasswing.png => lepi_glasswing.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiGlassyTiger.png => lepi_glassy_tiger.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiGozoraAzure.png => lepi_gozora_azure.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiLLacewing.png => lepi_l_lacewing.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiMBlueMorpho.png => lepi_m_blue_morpho.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiMSpeckledWood.png => lepi_m_speckled_wood.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiMalachite.png => lepi_malachite.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiMonarch.png => lepi_monarch.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiPBlueMorpho.png => lepi_p_blue_morpho.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiPalaenoSulphur.png => lepi_palaeno_sulphur.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiPostillion.png => lepi_postillion.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiPostman.png => lepi_postman.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiRBlueMorpho.png => lepi_r_blue_morpho.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiReseda.png => lepi_reseda.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiSpeckledWood.png => lepi_speckled_wood.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiSpicebush.png => lepi_spicebush.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiSpringAzure.png => lepi_spring_azure.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiThoasSwallow.png => lepi_thoas_swallow.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{lepiZebraSwallow.png => lepi_zebra_swallow.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{mothAtlas.png => moth_atlas.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{mothBombyxMori.png => moth_bombyx_mori.png} (100%) rename src/main/resources/assets/forestry/textures/entity/butterflies/{mothBrimstone.png => moth_brimstone.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/entity/butterflies/{mothLatticedHeath.png => moth_latticed_heath.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/gui/{backpackT2.png => backpack_t2.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/gui/{camouflageSprayCan.png => camouflage_spray_can.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{circuitMismatch.png => circuit_mismatch.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{forcedCooldown.png => forced_cooldown.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{invalidBiome.png => invalid_biome.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{isRaining.png => is_raining.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noCircuitBoard.png => no_circuit_board.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noCircuitLayout.png => no_circuit_layout.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noDisposal.png => no_disposal.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noDrone.png => no_drone.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noEnergyNet.png => no_energy_net.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noFarmland.png => no_farmland.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noFertilizer.png => no_fertilizer.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noFlower.png => no_flower.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noFuel.png => no_fuel.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noHeat.png => no_heat.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noHoney.png => no_honey.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noLiquid.png => no_liquid.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noPaper.png => no_paper.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noPower.png => no_power.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noQueen.png => no_queen.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noRecipe.png => no_recipe.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noRecipient.png => no_recipient.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noResource.png => no_resource.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noSky.png => no_sky.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noSpace.png => no_space.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noSpaceTank.png => no_space_tank.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noSpecimen.png => no_specimen.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{noStamps.png => no_stamps.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{notAlphaNumeric.png => not_alpha_numeric.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{notDay.png => not_day.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{notGloomy.png => not_gloomy.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{notLucid.png => not_lucid.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{notNight.png => not_night.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{notRaining.png => not_raining.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{notUnique.png => not_unique.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{tooCold.png => too_cold.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{tooHot.png => too_hot.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{tooHumid.png => too_humid.png} (100%) rename src/main/resources/assets/forestry/textures/gui/errors/{wrongStacksize.png => wrong_stacksize.png} (100%) rename src/main/resources/assets/forestry/textures/gui/{ledgerLeft.png => ledger_left.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{hasMail.png => has_mail.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{hasWork.png => has_work.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{lowFertilizer.png => low_fertilizer.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{lowFuel.png => low_fuel.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{lowGermlings.png => low_germlings.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{lowInput.png => low_input.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{lowLiquid.png => low_liquid.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{lowPaper.png => low_paper.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{lowResources.png => low_resources.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{lowSoil.png => low_soil.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{lowStamps.png => low_stamps.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{mailBuffer.png => mail_buffer.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{missingDrone.png => missing_drone.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{missingQueen.png => missing_queen.png} (100%) rename src/main/resources/assets/forestry/textures/gui/triggers/{noFrames.png => no_frames.png} (100%) rename src/main/resources/assets/forestry/textures/items/{apiaristBoots.png => apiarist_boots.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{apiaristChest.png => apiarist_chest.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{apiaristHelmet.png => apiarist_helmet.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{apiaristLegs.png => apiarist_legs.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{beeCombs.0.png => bee_combs.0.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{beeCombs.1.png => bee_combs.1.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{bioMass.png => bio_mass.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{bituminousPeat.png => bituminous_peat.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{brokenBronzePickaxe.png => broken_bronze_pickaxe.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{brokenBronzeShovel.png => broken_bronze_shovel.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{bronzePickaxe.png => bronze_pickaxe.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{bronzeShovel.png => bronze_shovel.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiAurora.png => lepi_aurora.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiBatesia.png => lepi_batesia.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiBlackSwallow.png => lepi_black_swallow.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiBlueDuke.png => lepi_blue_duke.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiBlueWing.png => lepi_blue_wing.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiBrimstone.png => lepi_brimstone.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiCabbageWhite.png => lepi_cabbage_white.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiCitrusSwallow.png => lepi_citrus_swallow.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiComma.png => lepi_comma.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiCSpeckledWood.png => lepi_cspeckled_wood.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiDianaFrit.png => lepi_diana_frit.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiEmeraldPeacock.png => lepi_emerald_peacock.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiGlasswing.png => lepi_glasswing.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiGlassyTiger.png => lepi_glassy_tiger.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiGozoraAzure.png => lepi_gozora_azure.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiLLacewing.png => lepi_llacewing.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiMalachite.png => lepi_malachite.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiMBlueMorpho.png => lepi_mblue_morpho.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiMonarch.png => lepi_monarch.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiMSpeckledWood.png => lepi_mspeckled_wood.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiPalaenoSulphur.png => lepi_palaeno_sulphur.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiPBlueMorpho.png => lepi_pblue_morpho.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiPostillion.png => lepi_postillion.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiPostman.png => lepi_postman.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiRBlueMorpho.png => lepi_rblue_morpho.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiReseda.png => lepi_reseda.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiSpeckledWood.png => lepi_speckled_wood.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiSpicebush.png => lepi_spicebush.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiSpringAzure.png => lepi_spring_azure.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiThoasSwallow.png => lepi_thoas_swallow.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{lepiZebraSwallow.png => lepi_zebra_swallow.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{mothAtlas.png => moth_atlas.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{mothBombyxMori.png => moth_bombyx_mori.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{mothBrimstone.png => moth_brimstone.png} (100%) rename src/main/resources/assets/forestry/textures/items/butterflies/{mothLatticedHeath.png => moth_latticed_heath.png} (100%) rename src/main/resources/assets/forestry/textures/items/{camouflageSprayCan.png => camouflage_spray_can.png} (100%) rename src/main/resources/assets/forestry/textures/items/{camouflageSprayCanFilled.png => camouflage_spray_can_filled.png} (100%) rename src/main/resources/assets/forestry/textures/items/{camouflagedPaneling.png => camouflaged_paneling.png} (100%) rename src/main/resources/assets/forestry/textures/items/{decayingWheat.png => decaying_wheat.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{dissipationCharge.png => dissipation_charge.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{fertilizerBio.png => fertilizer_bio.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{fertilizerCompound.png => fertilizer_compound.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{frameImpregnated.png => frame_impregnated.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{frameProven.png => frame_proven.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{frameUntreated.png => frame_untreated.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{gearBronze.png => gear_bronze.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{gearCopper.png => gear_copper.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{gearTin.png => gear_tin.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{grafterProven.png => grafter_proven.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{hardenedMachine.png => hardened_machine.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{honeyDrop.0.png => honey_drop.0.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{honeyDrop.1.png => honey_drop.1.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{honeyPot.png => honey_pot.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{honeyedSlice.png => honeyed_slice.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{iceShard.png => ice_shard.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{impregnatedCasing.png => impregnated_casing.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{ingotBronze.png => ingot_bronze.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{ingotCopper.png => ingot_copper.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{ingotTin.png => ingot_tin.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{iodineCapsule.png => iodine_capsule.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{kitPickaxe.png => kit_pickaxe.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{kitShovel.png => kit_shovel.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{mouldyWheat.png => mouldy_wheat.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{naturalistHelmet.png => naturalist_helmet.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{oakStick.png => oak_stick.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{portableAlyzer.png => portable_alyzer.png} (100%) rename src/main/resources/assets/forestry/textures/items/{pulsatingDust.png => pulsating_dust.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{pulsatingMesh.png => pulsating_mesh.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{refractoryWax.png => refractory_wax.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{royalJelly.png => royal_jelly.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{scentedPaneling.png => scented_paneling.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{silkWisp.png => silk_wisp.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{solderingIron.png => soldering_iron.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{sturdyMachine.png => sturdy_machine.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{thermionicTubes.0.png => thermionic_tubes.0.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{thermionicTubes.1.png => thermionic_tubes.1.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{vialCatalyst.png => vial_catalyst.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{waxCast.png => wax_cast.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{woodPulp.png => wood_pulp.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/items/{wovenSilk.png => woven_silk.png} (100%) mode change 100755 => 100644 diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index d5940a9e8..0572df4c9 100644 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -90,9 +90,11 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { beeProgress = nbttagcompound.getInteger("BreedingTime"); queenWorkCycleThrottle = nbttagcompound.getInteger("Throttle"); - NBTTagCompound queenNBT = nbttagcompound.getCompoundTag("queen"); - queenStack = new ItemStack(queenNBT); - queen = BeeManager.beeRoot.getMember(queenStack); + if (nbttagcompound.hasKey("queen")) { + NBTTagCompound queenNBT = nbttagcompound.getCompoundTag("queen"); + queenStack = new ItemStack(queenNBT); + queen = BeeManager.beeRoot.getMember(queenStack); + } setActive(nbttagcompound.getBoolean("Active")); diff --git a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java index 3fee68728..2e193665f 100644 --- a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java @@ -53,23 +53,23 @@ public class ItemRegistryApiculture extends ItemRegistry { public ItemRegistryApiculture() { // / BEES - beeQueenGE = registerItem(new ItemBeeGE(EnumBeeType.QUEEN), "beeQueenGE"); - beeDroneGE = registerItem(new ItemBeeGE(EnumBeeType.DRONE), "beeDroneGE"); - beePrincessGE = registerItem(new ItemBeeGE(EnumBeeType.PRINCESS), "beePrincessGE"); - beeLarvaeGE = registerItem(new ItemBeeGE(EnumBeeType.LARVAE), "beeLarvaeGE"); + beeQueenGE = registerItem(new ItemBeeGE(EnumBeeType.QUEEN), "bee_queen_ge"); + beeDroneGE = registerItem(new ItemBeeGE(EnumBeeType.DRONE), "bee_drone_ge"); + beePrincessGE = registerItem(new ItemBeeGE(EnumBeeType.PRINCESS), "bee_princess_ge"); + beeLarvaeGE = registerItem(new ItemBeeGE(EnumBeeType.LARVAE), "bee_larvae_ge"); - habitatLocator = registerItem(new ItemHabitatLocator(), "habitatLocator"); + habitatLocator = registerItem(new ItemHabitatLocator(), "habitat_locator"); imprinter = registerItem(new ItemImprinter(), "imprinter"); minecartBeehouse = registerItem(new ItemMinecartBeehouse(), "cart.beehouse"); // / COMB FRAMES - frameUntreated = registerItem(new ItemHiveFrame(80, 0.9f), "frameUntreated"); - frameImpregnated = registerItem(new ItemHiveFrame(240, 0.4f), "frameImpregnated"); - frameProven = registerItem(new ItemHiveFrame(720, 0.3f), "frameProven"); + frameUntreated = registerItem(new ItemHiveFrame(80, 0.9f), "frame_untreated"); + frameImpregnated = registerItem(new ItemHiveFrame(240, 0.4f), "frame_impregnated"); + frameProven = registerItem(new ItemHiveFrame(720, 0.3f), "frame_proven"); // / BEE RESOURCES - honeyDrop = registerItem(new ItemOverlay(Tabs.tabApiculture, EnumHoneyDrop.VALUES), "honeyDrop"); + honeyDrop = registerItem(new ItemOverlay(Tabs.tabApiculture, EnumHoneyDrop.VALUES), "honey_drop"); OreDictionary.registerOre(OreDictUtil.DROP_HONEY, honeyDrop); pollenCluster = registerItem(new ItemPollenCluster(), "pollen"); @@ -80,20 +80,20 @@ public class ItemRegistryApiculture extends ItemRegistry { honeydew = registerItem(new ItemForestry(Tabs.tabApiculture), "honeydew"); OreDictionary.registerOre(OreDictUtil.DROP_HONEYDEW, honeydew); - royalJelly = registerItem(new ItemForestry(Tabs.tabApiculture), "royalJelly"); + royalJelly = registerItem(new ItemForestry(Tabs.tabApiculture), "royal_jelly"); OreDictionary.registerOre(OreDictUtil.DROP_ROYAL_JELLY, royalJelly); - waxCast = registerItem(new ItemWaxCast(), "waxCast"); + waxCast = registerItem(new ItemWaxCast(), "wax_cast"); // / BEE COMBS - beeComb = registerItem(new ItemHoneyComb(), "beeCombs"); + beeComb = registerItem(new ItemHoneyComb(), "bee_combs"); OreDictionary.registerOre(OreDictUtil.BEE_COMB, beeComb.getWildcard()); // / APIARIST'S CLOTHES - apiaristHat = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.HEAD), "apiaristHelmet"); - apiaristChest = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.CHEST), "apiaristChest"); - apiaristLegs = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.LEGS), "apiaristLegs"); - apiaristBoots = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.FEET), "apiaristBoots"); + apiaristHat = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.HEAD), "apiarist_helmet"); + apiaristChest = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.CHEST), "apiarist_chest"); + apiaristLegs = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.LEGS), "apiarist_legs"); + apiaristBoots = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.FEET), "apiarist_boots"); // TOOLS scoop = registerItem(new ItemScoop(), "scoop"); diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 9deaf173e..2671e86de 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -95,6 +95,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; @@ -414,7 +415,11 @@ public class PluginArboriculture extends BlankForestryPlugin { RecipeManagers.squeezerManager.addRecipe(10, EnumFruit.PAPAYA.getStack(), Fluids.JUICE.getFluid(juiceMultiplier * 3), mulch, (int) Math.floor(mulchMultiplier * 0.5f)); RecipeManagers.squeezerManager.addRecipe(10, EnumFruit.DATES.getStack(), Fluids.JUICE.getFluid((int) Math.floor(juiceMultiplier * 0.25)), mulch, mulchMultiplier); - RecipeUtil.addFermenterRecipes(items.sapling.getItemStack(), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); + NonNullList saplings = NonNullList.create(); + items.sapling.addCreativeItems(saplings, false); + for (ItemStack sapling : saplings) { + RecipeUtil.addFermenterRecipes(sapling, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); + } } // Grafter diff --git a/src/main/java/forestry/arboriculture/blocks/BlockPile.java b/src/main/java/forestry/arboriculture/blocks/BlockPile.java index 7adbb604c..4caf132ce 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockPile.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockPile.java @@ -483,11 +483,11 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro @Override public void registerModel(Item item, IModelManager manager) { if (getPileType() == EnumPileType.WOOD) { - manager.registerItemModel(item, 0, "woodPile"); + manager.registerItemModel(item, 0, "wood_pile"); } else if (getPileType() == EnumPileType.DIRT) { - manager.registerItemModel(item, 0, "dirtPile"); + manager.registerItemModel(item, 0, "dirt_pile"); } else if (getPileType() == EnumPileType.ASH) { - manager.registerItemModel(item, 0, "ashPile"); + manager.registerItemModel(item, 0, "ash_pile"); } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java index 83af44674..72c21a7a7 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java @@ -227,7 +227,7 @@ public class BlockRegistryArboriculture extends BlockRegistry { // Saplings TreeDefinition.preInit(); saplingGE = new BlockSapling(); - registerBlock(saplingGE, new ItemBlockForestry(saplingGE), "saplingGE"); + registerBlock(saplingGE, new ItemBlockForestry(saplingGE), "sapling_ge"); registerOreDictWildcard(OreDictUtil.TREE_SAPLING, saplingGE); // Leaves diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java index e38b47ac8..380e598b9 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java @@ -129,7 +129,7 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat @Override public void registerModel(Item item, IModelManager manager) { //To delete the error message - manager.registerItemModel(item, 0, "germlings/sapling.treeLarch"); + manager.registerItemModel(item, 0, "germlings/sapling.tree_larch"); } /* PLANTING */ diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index e99671a62..50ea0294b 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -201,11 +201,12 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable, ICol @Override public float getFermentationModifier(ItemStack itemstack) { - ITree tree = TreeManager.treeRoot.getMember(itemstack); - if (tree == null) { + itemstack = GeneticsUtil.convertToGeneticEquivalent(itemstack); + if (!TreeManager.treeRoot.isMember(itemstack)) { return 1.0f; } + ITree tree = TreeManager.treeRoot.getMember(itemstack); return tree.getGenome().getSappiness() * 10; } } diff --git a/src/main/java/forestry/arboriculture/items/ItemRegistryArboriculture.java b/src/main/java/forestry/arboriculture/items/ItemRegistryArboriculture.java index ecc814a22..34a884364 100644 --- a/src/main/java/forestry/arboriculture/items/ItemRegistryArboriculture.java +++ b/src/main/java/forestry/arboriculture/items/ItemRegistryArboriculture.java @@ -25,9 +25,9 @@ public class ItemRegistryArboriculture extends ItemRegistry { sapling = registerItem(new ItemGermlingGE(EnumGermlingType.SAPLING), "sapling"); OreDictionary.registerOre(OreDictUtil.TREE_SAPLING, sapling.getWildcard()); - pollenFertile = registerItem(new ItemGermlingGE(EnumGermlingType.POLLEN), "pollenFertile"); + pollenFertile = registerItem(new ItemGermlingGE(EnumGermlingType.POLLEN), "pollen_fertile"); grafter = registerItem(new ItemGrafter(9), "grafter"); - grafterProven = registerItem(new ItemGrafter(149), "grafterProven"); + grafterProven = registerItem(new ItemGrafter(149), "grafter_proven"); } } diff --git a/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java b/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java index 8f70c6fb2..505865bd0 100644 --- a/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java +++ b/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java @@ -14,6 +14,7 @@ import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IGermlingModelProvider; import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.core.IModelManager; +import forestry.core.utils.StringUtil; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; @@ -29,8 +30,9 @@ public class ModelProviderGermling implements IGermlingModelProvider { private ModelResourceLocation germlingModel; private ModelResourceLocation pollenModel; - public ModelProviderGermling(String modelUid, ILeafSpriteProvider leafSpriteProvider) { - this.name = modelUid.substring("forestry.".length()); + public ModelProviderGermling(String uid, ILeafSpriteProvider leafSpriteProvider) { + String modelName = uid.substring("forestry.".length()); + this.name = StringUtil.camelCaseToUnderscores(modelName); this.leafSpriteProvider = leafSpriteProvider; } diff --git a/src/main/java/forestry/core/PluginCore.java b/src/main/java/forestry/core/PluginCore.java index 4d1b0daf9..a9cce4eb4 100644 --- a/src/main/java/forestry/core/PluginCore.java +++ b/src/main/java/forestry/core/PluginCore.java @@ -489,7 +489,7 @@ public class PluginCore extends BlankForestryPlugin { @SubscribeEvent @SideOnly(Side.CLIENT) public void onBakeModel(ModelBakeEvent event) { - ModelResourceLocation modelLocation = new ModelResourceLocation("forestry:camouflageSprayCan", "inventory"); + ModelResourceLocation modelLocation = new ModelResourceLocation("forestry:camouflage_spray_can", "inventory"); ModelEntry blockModelIndex = new ModelEntry(modelLocation, new ModelCamouflageSprayCan()); Proxies.render.registerModel(blockModelIndex); ModelManager.getInstance().registerCustomModels(event); diff --git a/src/main/java/forestry/core/blocks/BlockRegistry.java b/src/main/java/forestry/core/blocks/BlockRegistry.java index 0e525baaa..bb7d16a06 100644 --- a/src/main/java/forestry/core/blocks/BlockRegistry.java +++ b/src/main/java/forestry/core/blocks/BlockRegistry.java @@ -12,7 +12,10 @@ package forestry.core.blocks; import javax.annotation.Nullable; +import java.util.Locale; + import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; import forestry.plugins.PluginManager; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; @@ -25,6 +28,11 @@ public abstract class BlockRegistry { if (PluginManager.getStage() != PluginManager.Stage.REGISTER) { throw new RuntimeException("Tried to register Block outside of REGISTER"); } + + if (!name.equals(name.toLowerCase(Locale.ENGLISH))) { + Log.error("Name must be lowercase"); + } + block.setUnlocalizedName("for." + name); block.setRegistryName(name); GameRegistry.register(block); diff --git a/src/main/java/forestry/core/blocks/BlockRegistryCore.java b/src/main/java/forestry/core/blocks/BlockRegistryCore.java index fc1bb1707..2567b1f22 100644 --- a/src/main/java/forestry/core/blocks/BlockRegistryCore.java +++ b/src/main/java/forestry/core/blocks/BlockRegistryCore.java @@ -35,7 +35,7 @@ public class BlockRegistryCore extends BlockRegistry { registerBlock(escritoire, new ItemBlockForestry<>(escritoire), "escritoire"); bogEarth = new BlockBogEarth(); - registerBlock(bogEarth, new ItemBlockForestry<>(bogEarth), "bogEarth"); + registerBlock(bogEarth, new ItemBlockForestry<>(bogEarth), "bog_earth"); bogEarth.setHarvestLevel("shovel", 0); humus = new BlockHumus(); @@ -50,7 +50,7 @@ public class BlockRegistryCore extends BlockRegistry { OreDictionary.registerOre(OreDictUtil.ORE_TIN, resources.get(EnumResourceType.TIN, 1)); BlockResourceStorage resourceStorage = new BlockResourceStorage(); - registerBlock(resourceStorage, new ItemBlockForestry(resourceStorage), "resourceStorage"); + registerBlock(resourceStorage, new ItemBlockForestry(resourceStorage), "resource_storage"); resourceStorage.setHarvestLevel("pickaxe", 0); resourceStorageApatite = resourceStorage.get(EnumResourceType.APATITE); diff --git a/src/main/java/forestry/core/errors/EnumErrorCode.java b/src/main/java/forestry/core/errors/EnumErrorCode.java index 6d88d24e9..c2c2b2154 100644 --- a/src/main/java/forestry/core/errors/EnumErrorCode.java +++ b/src/main/java/forestry/core/errors/EnumErrorCode.java @@ -17,70 +17,70 @@ import net.minecraftforge.fml.relauncher.SideOnly; public enum EnumErrorCode implements IErrorState { // Bees - TOO_HOT("tooHot"), // The bees are melting in the heat here and unable to work. Use the habitat locator to find a cooler climate. - TOO_COLD("tooCold"), // The bees are huddled together to survive the freezing cold here. Use the habitat locator to find a warmer climate. - TOO_HUMID("tooHumid"), // The damp climate here has made the bees' wings too damp to fly. Use the habitat locator to find a dryer climate. - TOO_ARID("tooArid", "invalidBiome"), // The dry climate here has made the bees parched and unable do work. Use the habitat locator to find a wetter climate. - IS_RAINING("isRaining"), // Only tolerant fliers can work in the rain. - NOT_GLOOMY("notGloomy"), // The bees can only work in darkness. - NOT_BRIGHT("notLucid"), // The bees have trouble navigating in the dark. - NOT_DAY("notDay"), // The bees can only work during the daytime. - NOT_NIGHT("notNight"), // The bees can only work during the night. - NO_FLOWER("noFlower"), // Hive members are not finding the right flowers. Use the Beealyzer to discover their flower preference. - NO_QUEEN("noQueen"), // Supply this hive with a queen or a princess and a drone. - NO_DRONE("noDrone"), // Mating requires a drone present. - NO_SKY("noSky"), // The hive requires direct sunlight from above. + TOO_HOT("too_hot"), // The bees are melting in the heat here and unable to work. Use the habitat locator to find a cooler climate. + TOO_COLD("too_cold"), // The bees are huddled together to survive the freezing cold here. Use the habitat locator to find a warmer climate. + TOO_HUMID("too_humid"), // The damp climate here has made the bees' wings too damp to fly. Use the habitat locator to find a dryer climate. + TOO_ARID("too_arid", "invalid_biome"), // The dry climate here has made the bees parched and unable do work. Use the habitat locator to find a wetter climate. + IS_RAINING("is_raining"), // Only tolerant fliers can work in the rain. + NOT_GLOOMY("not_gloomy"), // The bees can only work in darkness. + NOT_BRIGHT("not_lucid"), // The bees have trouble navigating in the dark. + NOT_DAY("not_day"), // The bees can only work during the daytime. + NOT_NIGHT("not_night"), // The bees can only work during the night. + NO_FLOWER("no_flower"), // Hive members are not finding the right flowers. Use the Beealyzer to discover their flower preference. + NO_QUEEN("no_queen"), // Supply this hive with a queen or a princess and a drone. + NO_DRONE("no_drone"), // Mating requires a drone present. + NO_SKY("no_sky"), // The hive requires direct sunlight from above. // Machines - NO_RESOURCE("noResource"), // More resources need to be supplied for operation. - NO_RESOURCE_INVENTORY("noResourceInventory", "noResource"), // Resources need to be added to the machine's inventory to craft this recipe. - NO_RESOURCE_LIQUID("noResourceLiquid", "noLiquid"), // More liquid resources need to be supplied for operation. - NO_RECIPE("noRecipe"), // No matching recipe was found for the supplied resources. - NO_SPACE_INVENTORY("noSpace"), // Empty this machine's inventory. - NO_SPACE_TANK("noSpaceTank"), // Empty this machine's liquid tank. - NO_POWER("noPower"), // This machine requires RF energy from an engine to function. - NO_REDSTONE("noRedstone", "disabled"), // This machine requires a redstone signal to activate it. - DISABLED_BY_REDSTONE("disabledRedstone", "disabled"), // This machine is being disabled by a redstone signal. - NOT_DARK("notDark", "notGloomy"), // A lower light level is required for operation. + NO_RESOURCE("no_resource"), // More resources need to be supplied for operation. + NO_RESOURCE_INVENTORY("no_resource_inventory", "no_resource"), // Resources need to be added to the machine's inventory to craft this recipe. + NO_RESOURCE_LIQUID("no_resource_liquid", "no_liquid"), // More liquid resources need to be supplied for operation. + NO_RECIPE("no_recipe"), // No matching recipe was found for the supplied resources. + NO_SPACE_INVENTORY("no_space"), // Empty this machine's inventory. + NO_SPACE_TANK("no_space_tank"), // Empty this machine's liquid tank. + NO_POWER("no_power"), // This machine requires RF energy from an engine to function. + NO_REDSTONE("no_redstone", "disabled"), // This machine requires a redstone signal to activate it. + DISABLED_BY_REDSTONE("disabled_redstone", "disabled"), // This machine is being disabled by a redstone signal. + NOT_DARK("not_dark", "not_gloomy"), // A lower light level is required for operation. // Rain Tank - NOT_RAINING("notRaining"), // Operation is only possible when it is raining. - NO_RAIN_BIOME("noRainBiome", "notRaining"), // This location never receives rain. - NO_SKY_RAIN_TANK("noSkyRainTank", "noSky"), // Clear the area above this machine so it can gather rain. + NOT_RAINING("not_raining"), // Operation is only possible when it is raining. + NO_RAIN_BIOME("no_rain_biome", "not_raining"), // This location never receives rain. + NO_SKY_RAIN_TANK("no_sky_rain_tank", "no_sky"), // Clear the area above this machine so it can gather rain. // Alyzer - NO_HONEY("noHoney"), // This gadget requires honey drops or honeydew for operation. - NO_SPECIMEN("noSpecimen"), // Supply specimen to analyze. + NO_HONEY("no_honey"), // This gadget requires honey drops or honeydew for operation. + NO_SPECIMEN("no_specimen"), // Supply specimen to analyze. // Engines - FORCED_COOLDOWN("forcedCooldown"), // Engine has overheated and is forced into cooldown. - NO_FUEL("noFuel"), // (Biogas & Peat-fired) Replenish this machine's fuel supplies. - NO_HEAT("noHeat"), // (Biogas engine) Refill the heating tank. - NO_ENERGY_NET("noEnergyNet"), // Your world is barren of any electricity. (Install IndustrialCraft\u00b2.) + FORCED_COOLDOWN("forced_cooldown"), // Engine has overheated and is forced into cooldown. + NO_FUEL("no_fuel"), // (Biogas & Peat-fired) Replenish this machine's fuel supplies. + NO_HEAT("no_heat"), // (Biogas engine) Refill the heating tank. + NO_ENERGY_NET("no_energy_net"), // Your world is barren of any electricity. (Install IndustrialCraft\u00b2.) // Trade Station - NO_STAMPS("noStamps"), // The trade station requires more stamps to pay postage. - NO_PAPER("noPaper"), // The trade station requires more paper to send letters. - NO_SUPPLIES("noSupplies", "noResource"), // The trade station requires more supplies to send. - NO_TRADE("noTrade", "noResource"), // The trade station requires items to Send and Receive. + NO_STAMPS("no_stamps"), // The trade station requires more stamps to pay postage. + NO_PAPER("no_paper"), // The trade station requires more paper to send letters. + NO_SUPPLIES("no_supplies", "no_resource"), // The trade station requires more supplies to send. + NO_TRADE("no_trade", "no_resource"), // The trade station requires items to Send and Receive. // Trade Station naming - NOT_ALPHANUMERIC("notAlphaNumeric"), // A Trade Station name must consist of letters and numbers only. - NOT_UNIQUE("notUnique"), // Trade Station names must be unique and this name is already taken. + NOT_ALPHANUMERIC("not_alpha_numeric"), // A Trade Station name must consist of letters and numbers only. + NOT_UNIQUE("not_unique"), // Trade Station names must be unique and this name is already taken. // Letters - NOT_POST_PAID("notPostpaid", "noStamps"), // Apply more stamps to pay the postal service. - NO_RECIPIENT("noRecipient"), // You need to address your letter to a recipient to send it. + NOT_POST_PAID("not_postpaid", "no_stamps"), // Apply more stamps to pay the postal service. + NO_RECIPIENT("no_recipient"), // You need to address your letter to a recipient to send it. // Circuit Boards - NO_CIRCUIT_BOARD("noCircuitBoard"), // Insert a circuit board to solder the selected tubes onto it. - NO_CIRCUIT_LAYOUT("noCircuitLayout"), // No layouts available due to the current game settings. - CIRCUIT_MISMATCH("circuitMismatch"), // Amount of tubes does not match size of circuit board. + NO_CIRCUIT_BOARD("no_circuit_board"), // Insert a circuit board to solder the selected tubes onto it. + NO_CIRCUIT_LAYOUT("no_circuit_layout"), // No layouts available due to the current game settings. + CIRCUIT_MISMATCH("circuit_mismatch"), // Amount of tubes does not match size of circuit board. // Farms - NO_FERTILIZER("noFertilizer"), // Farms require fertilizer for function. Compost is insufficient. - NO_FARMLAND("noFarmland"), // Smooth sandstone, bricks or stone bricks create a platform the farm will build on. - NO_LIQUID_FARM("noLiquid") // Depending on rainfall, temperature and humidity farms need to be supplied with varying amounts of water. + NO_FERTILIZER("no_fertilizer"), // Farms require fertilizer for function. Compost is insufficient. + NO_FARMLAND("no_farmland"), // Smooth sandstone, bricks or stone bricks create a platform the farm will build on. + NO_LIQUID_FARM("no_liquid") // Depending on rainfall, temperature and humidity farms need to be supplied with varying amounts of water. ; private final String name; diff --git a/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java b/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java index a878c90d6..2aabbf2b0 100644 --- a/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java +++ b/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java @@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; public class GuiCamouflageSprayCan extends GuiForestry { public GuiCamouflageSprayCan(EntityPlayer player, ItemInventoryCamouflageSprayCan inventory) { - super(Constants.TEXTURE_PATH_GUI + "/camouflageSprayCan.png", new ContainerCamouflageSprayCan(inventory, player.inventory), inventory); + super(Constants.TEXTURE_PATH_GUI + "/camouflage_spray_can.png", new ContainerCamouflageSprayCan(inventory, player.inventory), inventory); widgetManager.add(new WidgetCamouflageSlot(widgetManager, 80, 39, inventory, null)); } diff --git a/src/main/java/forestry/core/items/ItemCamouflageSprayCan.java b/src/main/java/forestry/core/items/ItemCamouflageSprayCan.java index 5949da849..a6f9213d7 100644 --- a/src/main/java/forestry/core/items/ItemCamouflageSprayCan.java +++ b/src/main/java/forestry/core/items/ItemCamouflageSprayCan.java @@ -34,7 +34,7 @@ public class ItemCamouflageSprayCan extends ItemWithGui { @Override public void registerModel(Item item, IModelManager manager) { super.registerModel(item, manager); - ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:camouflageSprayCanFilled")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:camouflage_spray_can_filled")); } @Override diff --git a/src/main/java/forestry/core/items/ItemCraftingMaterial.java b/src/main/java/forestry/core/items/ItemCraftingMaterial.java index 3095477de..3888be4e0 100644 --- a/src/main/java/forestry/core/items/ItemCraftingMaterial.java +++ b/src/main/java/forestry/core/items/ItemCraftingMaterial.java @@ -20,7 +20,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCraftingMaterial extends ItemForestry { - private final String[] definition = new String[]{"pulsatingDust", "pulsatingMesh", "silkWisp", "wovenSilk", "dissipationCharge", "iceShard", "scentedPaneling", "camouflagedPaneling"}; + private final String[] definition = new String[]{"pulsating_dust", "pulsating_mesh", "silk_wisp", "woven_silk", "dissipation_charge", "ice_shard", "scented_paneling", "camouflaged_paneling"}; public ItemCraftingMaterial() { setMaxDamage(0); diff --git a/src/main/java/forestry/core/items/ItemRegistry.java b/src/main/java/forestry/core/items/ItemRegistry.java index 646ee873f..142a87c7d 100644 --- a/src/main/java/forestry/core/items/ItemRegistry.java +++ b/src/main/java/forestry/core/items/ItemRegistry.java @@ -10,7 +10,11 @@ ******************************************************************************/ package forestry.core.items; +import java.util.Locale; + +import com.google.common.base.Preconditions; import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; import forestry.plugins.PluginManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -22,6 +26,11 @@ public abstract class ItemRegistry { if (PluginManager.getStage() != PluginManager.Stage.REGISTER) { throw new RuntimeException("Tried to register Item outside of REGISTER"); } + + if (!name.equals(name.toLowerCase(Locale.ENGLISH))) { + Log.error("Name must be lowercase"); + } + item.setUnlocalizedName("for." + name); item.setRegistryName(name); @@ -34,8 +43,8 @@ public abstract class ItemRegistry { OreDictionary.registerOre(oreDictName, itemStack); } - public static ItemStack createItemForOreName(String oreName) { - ItemStack oreItem = new ItemStack(registerItem(new ItemForestry(), oreName)); + public static ItemStack createItemForOreName(String oreName, String registryName) { + ItemStack oreItem = new ItemStack(registerItem(new ItemForestry(), registryName)); OreDictionary.registerOre(oreName, oreItem); return oreItem; } diff --git a/src/main/java/forestry/core/items/ItemRegistryCore.java b/src/main/java/forestry/core/items/ItemRegistryCore.java index 96f0f87e9..5721ee740 100644 --- a/src/main/java/forestry/core/items/ItemRegistryCore.java +++ b/src/main/java/forestry/core/items/ItemRegistryCore.java @@ -91,30 +91,30 @@ public class ItemRegistryCore extends ItemRegistry { public final ItemCamouflageSprayCan camouflageSprayCan; public ItemRegistryCore() { - fertilizerBio = registerItem(new ItemForestry(), "fertilizerBio"); - fertilizerCompound = registerItem(new ItemFertilizer(), "fertilizerCompound"); + fertilizerBio = registerItem(new ItemForestry(), "fertilizer_bio"); + fertilizerCompound = registerItem(new ItemFertilizer(), "fertilizer_compound"); apatite = registerItem(new ItemForestry(), "apatite"); OreDictionary.registerOre(OreDictUtil.GEM_APATITE, apatite); - researchNote = registerItem(new ItemResearchNote(), "researchNote"); + researchNote = registerItem(new ItemResearchNote(), "research_note"); - portableAlyzer = registerItem(new ItemAlyzer(), "portableAlyzer"); + portableAlyzer = registerItem(new ItemAlyzer(), "portable_alyzer"); - ingotCopper = createItemForOreName(OreDictUtil.INGOT_COPPER); - ingotTin = createItemForOreName(OreDictUtil.INGOT_TIN); - ingotBronze = createItemForOreName(OreDictUtil.INGOT_BRONZE); + ingotCopper = createItemForOreName(OreDictUtil.INGOT_COPPER, "ingot_copper"); + ingotTin = createItemForOreName(OreDictUtil.INGOT_TIN, "ingot_tin"); + ingotBronze = createItemForOreName(OreDictUtil.INGOT_BRONZE, "ingot_bronze"); wrench = registerItem(new ItemWrench(), "wrench"); pipette = registerItem(new ItemPipette(), "pipette"); - sturdyCasing = registerItem(new ItemForestry(), "sturdyMachine"); - hardenedCasing = registerItem(new ItemForestry(), "hardenedMachine"); - impregnatedCasing = registerItem(new ItemForestry(), "impregnatedCasing"); + sturdyCasing = registerItem(new ItemForestry(), "sturdy_machine"); + hardenedCasing = registerItem(new ItemForestry(), "hardened_machine"); + impregnatedCasing = registerItem(new ItemForestry(), "impregnated_casing"); - craftingMaterial = registerItem(new ItemCraftingMaterial(), "craftingMaterial"); + craftingMaterial = registerItem(new ItemCraftingMaterial(), "crafting_material"); - spectacles = registerItem(new ItemArmorNaturalist(), "naturalistHelmet"); + spectacles = registerItem(new ItemArmorNaturalist(), "naturalist_helmet"); peat = registerItem(new ItemForestry(), "peat"); OreDictionary.registerOre(OreDictUtil.BRICK_PEAT, peat); @@ -122,55 +122,55 @@ public class ItemRegistryCore extends ItemRegistry { ash = registerItem(new ItemForestry(), "ash"); OreDictionary.registerOre(OreDictUtil.DUST_ASH, ash); - bituminousPeat = registerItem(new ItemForestry(), "bituminousPeat"); + bituminousPeat = registerItem(new ItemForestry(), "bituminous_peat"); - gearBronze = createItemForOreName(OreDictUtil.GEAR_BRONZE); - gearCopper = createItemForOreName(OreDictUtil.GEAR_COPPER); - gearTin = createItemForOreName(OreDictUtil.GEAR_TIN); + gearBronze = createItemForOreName(OreDictUtil.GEAR_BRONZE, "gear_bronze"); + gearCopper = createItemForOreName(OreDictUtil.GEAR_COPPER, "gear_copper"); + gearTin = createItemForOreName(OreDictUtil.GEAR_TIN, "gear_tin"); circuitboards = registerItem(new ItemCircuitBoard(), "chipsets"); solderingIron = new ItemSolderingIron(); solderingIron.setMaxDamage(5).setFull3D(); - registerItem(solderingIron, "solderingIron"); + registerItem(solderingIron, "soldering_iron"); - tubes = registerItem(new ItemElectronTube(), "thermionicTubes"); + tubes = registerItem(new ItemElectronTube(), "thermionic_tubes"); // / CARTONS carton = registerItem(new ItemForestry(), "carton"); // / CRAFTING CARPENTER - stickImpregnated = registerItem(new ItemForestry(), "oakStick"); - woodPulp = registerItem(new ItemForestry(), "woodPulp"); + stickImpregnated = registerItem(new ItemForestry(), "oak_stick"); + woodPulp = registerItem(new ItemForestry(), "wood_pulp"); OreDictionary.registerOre(OreDictUtil.PULP_WOOD, woodPulp); // / RECLAMATION - brokenBronzePickaxe = registerItem(new ItemForestry(), "brokenBronzePickaxe"); - brokenBronzeShovel = registerItem(new ItemForestry(), "brokenBronzeShovel"); + brokenBronzePickaxe = registerItem(new ItemForestry(), "broken_bronze_pickaxe"); + brokenBronzeShovel = registerItem(new ItemForestry(), "broken_bronze_shovel"); // / TOOLS bronzePickaxe = new ItemForestryTool(new ItemStack(brokenBronzePickaxe)); bronzePickaxe.setHarvestLevel("pickaxe", 3); - registerItem(bronzePickaxe, "bronzePickaxe"); + registerItem(bronzePickaxe, "bronze_pickaxe"); bronzeShovel = new ItemForestryTool(new ItemStack(brokenBronzeShovel)); bronzeShovel.setHarvestLevel("shovel", 3); - registerItem(bronzeShovel, "bronzeShovel"); + registerItem(bronzeShovel, "bronze_shovel"); // / ASSEMBLY KITS kitShovel = new ItemAssemblyKit(new ItemStack(bronzeShovel)); - registerItem(kitShovel, "kitShovel"); + registerItem(kitShovel, "kit_shovel"); kitPickaxe = new ItemAssemblyKit(new ItemStack(bronzePickaxe)); - registerItem(kitPickaxe, "kitPickaxe"); + registerItem(kitPickaxe, "kit_pickaxe"); // / MOISTENER RESOURCES - mouldyWheat = registerItem(new ItemForestry(), "mouldyWheat"); - decayingWheat = registerItem(new ItemForestry(), "decayingWheat"); + mouldyWheat = registerItem(new ItemForestry(), "mouldy_wheat"); + decayingWheat = registerItem(new ItemForestry(), "decaying_wheat"); mulch = registerItem(new ItemForestry(), "mulch"); // / RAINMAKER SUBSTRATES - iodineCharge = registerItem(new ItemForestry(), "iodineCapsule"); + iodineCharge = registerItem(new ItemForestry(), "iodine_capsule"); phosphor = registerItem(new ItemForestry(), "phosphor"); @@ -179,7 +179,7 @@ public class ItemRegistryCore extends ItemRegistry { beeswax.setCreativeTab(Tabs.tabApiculture); OreDictionary.registerOre(OreDictUtil.ITEM_BEESWAX, beeswax); - refractoryWax = registerItem(new ItemForestry(), "refractoryWax"); + refractoryWax = registerItem(new ItemForestry(), "refractory_wax"); // FRUITS fruits = registerItem(new ItemFruit(), "fruits"); @@ -189,7 +189,7 @@ public class ItemRegistryCore extends ItemRegistry { } // CAMOUFLAGE - camouflageSprayCan = registerItem(new ItemCamouflageSprayCan(), "camouflageSprayCan"); + camouflageSprayCan = registerItem(new ItemCamouflageSprayCan(), "camouflage_spray_can"); } } diff --git a/src/main/java/forestry/core/models/ModelCamouflageSprayCan.java b/src/main/java/forestry/core/models/ModelCamouflageSprayCan.java index a8034a00f..1f78fdef1 100644 --- a/src/main/java/forestry/core/models/ModelCamouflageSprayCan.java +++ b/src/main/java/forestry/core/models/ModelCamouflageSprayCan.java @@ -44,7 +44,7 @@ public class ModelCamouflageSprayCan extends BlankModel { @Override public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) { - IModel basicModel = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forestry:item/camouflageSprayCan")); + IModel basicModel = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forestry:item/camouflage_spray_can")); IBakedModel model = basicModel.bake(basicModel.getDefaultState(), DefaultVertexFormats.ITEM, new DefaultTextureGetter()); IBakedModel filledModel = basicModel.bake(basicModel.getDefaultState(), DefaultVertexFormats.ITEM, new DefaultTextureGetter()); IBakedModel camouflageModel = null; @@ -53,7 +53,7 @@ public class ModelCamouflageSprayCan extends BlankModel { ItemInventoryCamouflageSprayCan inventory = new ItemInventoryCamouflageSprayCan((EntityPlayer) entity, stack); ItemStack camouflage = inventory.getStackInSlot(0); if (!camouflage.isEmpty()) { - IModel filledBasicModel = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forestry:item/camouflageSprayCanFilled")); + IModel filledBasicModel = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forestry:item/camouflage_spray_can_filled")); filledModel = filledBasicModel.bake(filledBasicModel.getDefaultState(), DefaultVertexFormats.ITEM, new DefaultTextureGetter()); camouflageModel = new TRSRBakedModel(Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(camouflage), -0.0625F * 3, 0.0625F * 3, 0.0625F, 0.5F); diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java index c5a20db2c..237c78fab 100644 --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -12,6 +12,7 @@ package forestry.core.network; import java.io.IOException; +import com.google.common.base.Preconditions; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import net.minecraft.client.Minecraft; diff --git a/src/main/java/forestry/core/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java index c7906939c..bec89fc23 100755 --- a/src/main/java/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -10,12 +10,21 @@ ******************************************************************************/ package forestry.core.utils; +import java.util.Locale; +import java.util.regex.Pattern; + import forestry.core.proxy.Proxies; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; public class StringUtil { + private static final Pattern camelCaseToUnderscores = Pattern.compile("(.)([A-Z])"); + + public static String camelCaseToUnderscores(String uid) { + return camelCaseToUnderscores.matcher(uid).replaceAll("$1_$2").toLowerCase(Locale.ENGLISH); + } + public static String append(String delim, String source, String appendix) { if (source.length() <= 0) { return appendix; diff --git a/src/main/java/forestry/food/items/ItemRegistryFood.java b/src/main/java/forestry/food/items/ItemRegistryFood.java index 90df428b3..d8a5a9e43 100644 --- a/src/main/java/forestry/food/items/ItemRegistryFood.java +++ b/src/main/java/forestry/food/items/ItemRegistryFood.java @@ -27,10 +27,10 @@ public class ItemRegistryFood extends ItemRegistry { public ItemRegistryFood() { // / FOOD ITEMS - honeyedSlice = registerItem(new ItemForestryFood(8, 0.6f), "honeyedSlice"); + honeyedSlice = registerItem(new ItemForestryFood(8, 0.6f), "honeyed_slice"); beverage = registerItem(new ItemBeverage(), "beverage"); ambrosia = registerItem(new ItemAmbrosia().setIsDrink(), "ambrosia"); - honeyPot = registerItem(new ItemForestryFood(2, 0.2f).setIsDrink(), "honeyPot"); + honeyPot = registerItem(new ItemForestryFood(2, 0.2f).setIsDrink(), "honey_pot"); // / SEASONER infuser = new ItemInfuser(); diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java index ad9ccd732..0fa221b38 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java @@ -13,6 +13,7 @@ package forestry.lepidopterology.genetics; import java.awt.Color; import java.util.Arrays; import java.util.Locale; +import java.util.regex.Pattern; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -29,6 +30,7 @@ import forestry.api.lepidopterology.IButterflyMutationBuilder; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; +import forestry.core.utils.StringUtil; import net.minecraft.item.ItemStack; public enum ButterflyDefinition implements IButterflyDefinition { @@ -313,7 +315,7 @@ public enum ButterflyDefinition implements IButterflyDefinition { String unlocalizedName = "for.butterflies.species." + parent.getUID().substring(parent.getLevel().name().toLowerCase(Locale.ENGLISH).length() + 1) + '.' + speciesName; String unlocalizedDescription = "for.description." + uid; - String texture = "butterflies/" + uid; + String texture = StringUtil.camelCaseToUnderscores("butterflies/" + uid); IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.MOD_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); speciesBuilder.setRarity(rarity); diff --git a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java index d16030027..b77cb0375 100644 --- a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java @@ -13,6 +13,7 @@ package forestry.lepidopterology.genetics; import java.awt.Color; import java.util.Arrays; import java.util.Locale; +import java.util.regex.Pattern; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; @@ -27,6 +28,7 @@ import forestry.api.lepidopterology.IButterflyMutationBuilder; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; +import forestry.core.utils.StringUtil; import forestry.lepidopterology.genetics.alleles.ButterflyAlleles; import net.minecraft.item.ItemStack; @@ -72,7 +74,7 @@ public enum MothDefinition implements IButterflyDefinition { String unlocalizedName = "for.butterflies.species." + parent.getUID().substring(parent.getLevel().name().toLowerCase(Locale.ENGLISH).length() + 1) + '.' + speciesName; String unlocalizedDescription = "for.description." + uid; - String texture = "butterflies/" + uid; + String texture = StringUtil.camelCaseToUnderscores("butterflies/" + uid); IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.MOD_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); speciesBuilder.setRarity(rarity); diff --git a/src/main/java/forestry/lepidopterology/items/ItemRegistryLepidopterology.java b/src/main/java/forestry/lepidopterology/items/ItemRegistryLepidopterology.java index d556fb295..cbda0fb6d 100644 --- a/src/main/java/forestry/lepidopterology/items/ItemRegistryLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/items/ItemRegistryLepidopterology.java @@ -20,9 +20,9 @@ public class ItemRegistryLepidopterology extends ItemRegistry { public final ItemButterflyGE cocoonGE; public ItemRegistryLepidopterology() { - butterflyGE = registerItem(new ItemButterflyGE(EnumFlutterType.BUTTERFLY), "butterflyGE"); - serumGE = registerItem(new ItemButterflyGE(EnumFlutterType.SERUM), "serumGE"); - caterpillarGE = registerItem(new ItemButterflyGE(EnumFlutterType.CATERPILLAR), "caterpillarGE"); - cocoonGE = registerItem(new ItemButterflyGE(EnumFlutterType.COCOON), "cocoonGE"); + butterflyGE = registerItem(new ItemButterflyGE(EnumFlutterType.BUTTERFLY), "butterfly_ge"); + serumGE = registerItem(new ItemButterflyGE(EnumFlutterType.SERUM), "serum_ge"); + caterpillarGE = registerItem(new ItemButterflyGE(EnumFlutterType.CATERPILLAR), "caterpillar_ge"); + cocoonGE = registerItem(new ItemButterflyGE(EnumFlutterType.COCOON), "cocoon_ge"); } } diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java index 0adb90cde..a53ba4bac 100644 --- a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java @@ -15,6 +15,7 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; import com.google.common.base.Function; +import com.google.common.base.Throwables; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableMap; @@ -65,9 +66,9 @@ public class ModelButterflyItem extends BlankModel { if (modelButterfly == null) { try { - modelButterfly = ModelLoaderRegistry.getModel(new ResourceLocation("forestry:item/butterflyGE")); + modelButterfly = ModelLoaderRegistry.getModel(new ResourceLocation("forestry:item/butterfly_ge")); } catch (Exception e) { - throw new IllegalArgumentException(e); + Throwables.propagate(e); } if (modelButterfly == null) { throw new IllegalArgumentException("Could not bake butterfly model"); diff --git a/src/main/java/forestry/storage/items/ItemRegistryStorage.java b/src/main/java/forestry/storage/items/ItemRegistryStorage.java index b63ab12ee..30e9f694e 100644 --- a/src/main/java/forestry/storage/items/ItemRegistryStorage.java +++ b/src/main/java/forestry/storage/items/ItemRegistryStorage.java @@ -53,35 +53,35 @@ public class ItemRegistryStorage extends ItemRegistry { IBackpackInterface backpackInterface = BackpackManager.backpackInterface; if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - apiaristBackpack = registerItem(backpackInterface.createNaturalistBackpack("apiarist", BeeManager.beeRoot), "apiaristBag"); + apiaristBackpack = registerItem(backpackInterface.createNaturalistBackpack("apiarist", BeeManager.beeRoot), "apiarist_bag"); apiaristBackpack.setCreativeTab(Tabs.tabApiculture); } else { apiaristBackpack = null; } if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { - lepidopteristBackpack = registerItem(backpackInterface.createNaturalistBackpack("lepidopterist", ButterflyManager.butterflyRoot), "lepidopteristBag"); + lepidopteristBackpack = registerItem(backpackInterface.createNaturalistBackpack("lepidopterist", ButterflyManager.butterflyRoot), "lepidopterist_bag"); lepidopteristBackpack.setCreativeTab(Tabs.tabLepidopterology); } else { lepidopteristBackpack = null; } - minerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.NORMAL), "minerBag"); - minerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.WOVEN), "minerBagT2"); + minerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.NORMAL), "miner_bag"); + minerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.WOVEN), "miner_bag_t2"); - diggerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.NORMAL), "diggerBag"); - diggerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.WOVEN), "diggerBagT2"); + diggerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.NORMAL), "digger_bag"); + diggerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.WOVEN), "digger_bag_t2"); - foresterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.NORMAL), "foresterBag"); - foresterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.WOVEN), "foresterBagT2"); + foresterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.NORMAL), "forester_bag"); + foresterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.WOVEN), "forester_bag_t2"); - hunterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.NORMAL), "hunterBag"); - hunterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.WOVEN), "hunterBagT2"); + hunterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.NORMAL), "hunter_bag"); + hunterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.WOVEN), "hunter_bag_t2"); - adventurerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.NORMAL), "adventurerBag"); - adventurerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.WOVEN), "adventurerBagT2"); + adventurerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.NORMAL), "adventurer_bag"); + adventurerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.WOVEN), "adventurer_bag_t2"); - builderBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.NORMAL), "builderBag"); - builderBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.WOVEN), "builderBagT2"); + builderBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.NORMAL), "builder_bag"); + builderBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.WOVEN), "builder_bag_t2"); } } diff --git a/src/main/resources/assets/forestry/blockstates/bogEarth.json b/src/main/resources/assets/forestry/blockstates/bog_earth.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/bogEarth.json rename to src/main/resources/assets/forestry/blockstates/bog_earth.json diff --git a/src/main/resources/assets/forestry/blockstates/crates/cratedGlass.json b/src/main/resources/assets/forestry/blockstates/crates/crated_glass.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/crates/cratedGlass.json rename to src/main/resources/assets/forestry/blockstates/crates/crated_glass.json diff --git a/src/main/resources/assets/forestry/blockstates/crates/cratedPeat.json b/src/main/resources/assets/forestry/blockstates/crates/crated_peat.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/crates/cratedPeat.json rename to src/main/resources/assets/forestry/blockstates/crates/crated_peat.json diff --git a/src/main/resources/assets/forestry/blockstates/crates/cratedStone.json b/src/main/resources/assets/forestry/blockstates/crates/crated_stone.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/crates/cratedStone.json rename to src/main/resources/assets/forestry/blockstates/crates/crated_stone.json diff --git a/src/main/resources/assets/forestry/blockstates/crates/cratedWood.json b/src/main/resources/assets/forestry/blockstates/crates/crated_wood.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/crates/cratedWood.json rename to src/main/resources/assets/forestry/blockstates/crates/crated_wood.json diff --git a/src/main/resources/assets/forestry/blockstates/germlings.json b/src/main/resources/assets/forestry/blockstates/germlings.json index 0f4eeccc8..7ebc8271b 100644 --- a/src/main/resources/assets/forestry/blockstates/germlings.json +++ b/src/main/resources/assets/forestry/blockstates/germlings.json @@ -1,39 +1,39 @@ { "variants": { - "tree=oak": { "model": "forestry:germlings/sapling.treeOak" }, - "tree=darkoak": { "model": "forestry:germlings/sapling.treeDarkOak" }, - "tree=birch": { "model": "forestry:germlings/sapling.treeBirch" }, - "tree=lime": { "model": "forestry:germlings/sapling.treeLime" }, - "tree=walnut": { "model": "forestry:germlings/sapling.treeWalnut" }, - "tree=chestnut": { "model": "forestry:germlings/sapling.treeChestnut" }, - "tree=cherry": { "model": "forestry:germlings/sapling.treeCherry" }, - "tree=lemon": { "model": "forestry:germlings/sapling.treeLemon" }, - "tree=plum": { "model": "forestry:germlings/sapling.treePlum" }, - "tree=maple": { "model": "forestry:germlings/sapling.treeMaple" }, - "tree=spruce": { "model": "forestry:germlings/sapling.treeSpruce" }, - "tree=larch": { "model": "forestry:germlings/sapling.treeLarch" }, - "tree=pine": { "model": "forestry:germlings/sapling.treePine" }, - "tree=sequoia": { "model": "forestry:germlings/sapling.treeSequoia" }, - "tree=gigant": { "model": "forestry:germlings/sapling.treeGigant" }, - "tree=jungle": { "model": "forestry:germlings/sapling.treeJungle" }, - "tree=teak": { "model": "forestry:germlings/sapling.treeTeak" }, - "tree=ipe": { "model": "forestry:germlings/sapling.treeIpe" }, - "tree=kapok": { "model": "forestry:germlings/sapling.treeKapok" }, - "tree=ebony": { "model": "forestry:germlings/sapling.treeEbony" }, - "tree=zebrawood": { "model": "forestry:germlings/sapling.treeZebrawood" }, - "tree=mahogony": { "model": "forestry:germlings/sapling.treeMahogony" }, - "tree=acaciavanilla": { "model": "forestry:germlings/sapling.treeAcaciaVanilla" }, - "tree=acacia": { "model": "forestry:germlings/sapling.treeAcacia" }, - "tree=padauk": { "model": "forestry:germlings/sapling.treePadauk" }, - "tree=balsa": { "model": "forestry:germlings/sapling.treeBalsa" }, - "tree=cocobolo": { "model": "forestry:germlings/sapling.treeCocobolo" }, - "tree=wenge": { "model": "forestry:germlings/sapling.treeWenge" }, - "tree=baobab": { "model": "forestry:germlings/sapling.treeBaobab" }, - "tree=mahoe": { "model": "forestry:germlings/sapling.treeMahoe" }, - "tree=willow": { "model": "forestry:germlings/sapling.treeWillow" }, - "tree=sipiri": { "model": "forestry:germlings/sapling.treeSipiri" }, - "tree=papaya": { "model": "forestry:germlings/sapling.treePapaya" }, - "tree=date": { "model": "forestry:germlings/sapling.treeDate" }, - "tree=poplar": { "model": "forestry:germlings/sapling.treePoplar" } + "tree=oak": { "model": "forestry:germlings/sapling.tree_oak" }, + "tree=darkoak": { "model": "forestry:germlings/sapling.tree_dark_oak" }, + "tree=birch": { "model": "forestry:germlings/sapling.tree_birch" }, + "tree=lime": { "model": "forestry:germlings/sapling.tree_lime" }, + "tree=walnut": { "model": "forestry:germlings/sapling.tree_walnut" }, + "tree=chestnut": { "model": "forestry:germlings/sapling.tree_chestnut" }, + "tree=cherry": { "model": "forestry:germlings/sapling.tree_cherry" }, + "tree=lemon": { "model": "forestry:germlings/sapling.tree_lemon" }, + "tree=plum": { "model": "forestry:germlings/sapling.tree_plum" }, + "tree=maple": { "model": "forestry:germlings/sapling.tree_maple" }, + "tree=spruce": { "model": "forestry:germlings/sapling.tree_spruce" }, + "tree=larch": { "model": "forestry:germlings/sapling.tree_larch" }, + "tree=pine": { "model": "forestry:germlings/sapling.tree_pine" }, + "tree=sequoia": { "model": "forestry:germlings/sapling.tree_sequoia" }, + "tree=gigant": { "model": "forestry:germlings/sapling.tree_gigant" }, + "tree=jungle": { "model": "forestry:germlings/sapling.tree_jungle" }, + "tree=teak": { "model": "forestry:germlings/sapling.tree_teak" }, + "tree=ipe": { "model": "forestry:germlings/sapling.tree_ipe" }, + "tree=kapok": { "model": "forestry:germlings/sapling.tree_kapok" }, + "tree=ebony": { "model": "forestry:germlings/sapling.tree_ebony" }, + "tree=zebrawood": { "model": "forestry:germlings/sapling.tree_zebrawood" }, + "tree=mahogony": { "model": "forestry:germlings/sapling.tree_mahogony" }, + "tree=acaciavanilla": { "model": "forestry:germlings/sapling.tree_acacia_vanilla" }, + "tree=acacia": { "model": "forestry:germlings/sapling.tree_acacia" }, + "tree=padauk": { "model": "forestry:germlings/sapling.tree_padauk" }, + "tree=balsa": { "model": "forestry:germlings/sapling.tree_balsa" }, + "tree=cocobolo": { "model": "forestry:germlings/sapling.tree_cocobolo" }, + "tree=wenge": { "model": "forestry:germlings/sapling.tree_wenge" }, + "tree=baobab": { "model": "forestry:germlings/sapling.tree_baobab" }, + "tree=mahoe": { "model": "forestry:germlings/sapling.tree_mahoe" }, + "tree=willow": { "model": "forestry:germlings/sapling.tree_willow" }, + "tree=sipiri": { "model": "forestry:germlings/sapling.tree_sipiri" }, + "tree=papaya": { "model": "forestry:germlings/sapling.tree_papaya" }, + "tree=date": { "model": "forestry:germlings/sapling.tree_date" }, + "tree=poplar": { "model": "forestry:germlings/sapling.tree_poplar" } } } diff --git a/src/main/resources/assets/forestry/blockstates/pile.json b/src/main/resources/assets/forestry/blockstates/pile.json index 7b7c97f1f..98962d5cf 100644 --- a/src/main/resources/assets/forestry/blockstates/pile.json +++ b/src/main/resources/assets/forestry/blockstates/pile.json @@ -1,7 +1,7 @@ { "variants": { - "type=ash": { "model": "forestry:ashPile" }, - "type=dirt": { "model": "forestry:dirtPile" }, - "type=wood": { "model": "forestry:woodPile" } + "type=ash": { "model": "forestry:ash_pile" }, + "type=dirt": { "model": "forestry:dirt_pile" }, + "type=wood": { "model": "forestry:wood_pile" } } } diff --git a/src/main/resources/assets/forestry/blockstates/resourceStorage.json b/src/main/resources/assets/forestry/blockstates/resource_storage.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/resourceStorage.json rename to src/main/resources/assets/forestry/blockstates/resource_storage.json diff --git a/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft.json b/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft.json index 8d6a474b2..38f3cb479 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft.json @@ -6,22 +6,22 @@ "entries": [ { "type": "item", - "name": "forestry:brokenBronzeShovel", + "name": "forestry:broken_bronze_shovel", "weight": 10 }, { "type": "item", - "name": "forestry:brokenBronzePickaxe", + "name": "forestry:broken_bronze_pickaxe", "weight": 30 }, { "type": "item", - "name": "forestry:kitPickaxe", + "name": "forestry:kit_pickaxe", "weight": 10 }, { "type": "item", - "name": "forestry:kitShovel", + "name": "forestry:kit_shovel", "weight": 5 }, { @@ -36,7 +36,7 @@ "entries": [ { "type": "item", - "name": "forestry:minerBag", + "name": "forestry:miner_bag", "weight": 1 }, { @@ -52,7 +52,7 @@ { "type": "item", "entryName": "bee_steadfast_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", diff --git a/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid.json b/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid.json index 970f2da05..cc526f123 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid.json @@ -52,7 +52,7 @@ { "type": "item", "entryName": "bee_steadfast_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", @@ -64,7 +64,7 @@ { "type": "item", "entryName": "bee_modest_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", diff --git a/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure.json b/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure.json index b35176090..252c52737 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure.json @@ -31,7 +31,7 @@ { "type": "item", "entryName": "bee_steadfast_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", @@ -50,7 +50,7 @@ { "type": "item", "entryName": "bee_steadfast_princess", - "name": "forestry:beePrincessGE", + "name": "forestry:bee_princess_ge", "functions": [ { "function": "set_species_nbt", @@ -62,7 +62,7 @@ { "type": "item", "entryName": "bee_ended_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", @@ -90,7 +90,7 @@ "entries": [ { "type": "item", - "name": "forestry:grafterProven", + "name": "forestry:grafter_proven", "weight": 1 }, { diff --git a/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest.json b/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest.json index 29946e9e8..9ac0b2484 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest.json @@ -7,7 +7,7 @@ { "type": "item", "entryName": "bee_steadfast_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", @@ -19,7 +19,7 @@ { "type": "item", "entryName": "bee_wintry_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", diff --git a/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple.json b/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple.json index 6ccdf2416..9bdd9e8d8 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple.json @@ -7,7 +7,7 @@ { "type": "item", "entryName": "bee_steadfast_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", @@ -19,7 +19,7 @@ { "type": "item", "entryName": "bee_tropical_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", diff --git a/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge.json b/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge.json index 11199ee6b..3a316d90b 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge.json @@ -7,7 +7,7 @@ { "type": "item", "entryName": "bee_steadfast_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", @@ -19,7 +19,7 @@ { "type": "item", "entryName": "bee_sinister_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", diff --git a/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon.json b/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon.json index d0703724c..05199c913 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon.json @@ -7,7 +7,7 @@ { "type": "item", "entryName": "bee_steadfast_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", diff --git a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor.json b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor.json index d0703724c..05199c913 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor.json @@ -7,7 +7,7 @@ { "type": "item", "entryName": "bee_steadfast_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", diff --git a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing.json b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing.json index d0703724c..05199c913 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing.json @@ -7,7 +7,7 @@ { "type": "item", "entryName": "bee_steadfast_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", diff --git a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library.json b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library.json index 219873eb2..a6b234f79 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library.json @@ -7,7 +7,7 @@ { "type": "item", "entryName": "bee_steadfast_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", @@ -19,7 +19,7 @@ { "type": "item", "entryName": "bee_monastic_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", diff --git a/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist.json b/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist.json index 16596e48d..6effd0738 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist.json @@ -20,7 +20,7 @@ }, { "type": "item", - "name": "forestry:beeCombs", + "name": "forestry:bee_combs", "functions": [ { "function": "set_count", @@ -51,7 +51,7 @@ { "type": "item", "entryName": "bee_forest_princess", - "name": "forestry:beePrincessGE", + "name": "forestry:bee_princess_ge", "functions": [ { "function": "set_species_nbt", @@ -63,7 +63,7 @@ { "type": "item", "entryName": "bee_common_drone", - "name": "forestry:beeDroneGE", + "name": "forestry:bee_drone_ge", "functions": [ { "function": "set_species_nbt", @@ -75,7 +75,7 @@ { "type": "item", "entryName": "bee_meadows_princess", - "name": "forestry:beePrincessGE", + "name": "forestry:bee_princess_ge", "functions": [ { "function": "set_species_nbt", diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log_side.json index ddd9486b5..4a2b5246a 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log_side.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/log_side.json @@ -1,5 +1,5 @@ { - "parent": "block/column_side", + "parent": "block/cube_column", "textures": { "side": "forestry:blocks/wood/bark.acacia", "end": "forestry:blocks/wood/heart.acacia" diff --git a/src/main/resources/assets/forestry/models/block/ashPile.json b/src/main/resources/assets/forestry/models/block/ash_pile.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/ashPile.json rename to src/main/resources/assets/forestry/models/block/ash_pile.json diff --git a/src/main/resources/assets/forestry/models/block/candle.json b/src/main/resources/assets/forestry/models/block/candle.json index 87e67a0ed..33f6b32a9 100644 --- a/src/main/resources/assets/forestry/models/block/candle.json +++ b/src/main/resources/assets/forestry/models/block/candle.json @@ -1,7 +1,7 @@ { "ambientocclusion": false, "textures": { - "particle": "#candleStump" + "particle": "#candle_stump" }, "elements": [ { @@ -17,12 +17,12 @@ "down": { "uv": [ 7, 13, 9, 15 ], "tintindex": 0, - "texture": "#candleStump" + "texture": "#candle_stump" }, "up": { "uv": [ 7, 6, 9, 8 ], "tintindex": 0, - "texture": "#candleStump" + "texture": "#candle_stump" } } }, @@ -39,12 +39,12 @@ "west": { "uv": [ 0, 0, 16, 16 ], "tintindex": 0, - "texture": "candleStump" + "texture": "candle_stump" }, "east": { "uv": [ 0, 0, 16, 16 ], "tintindex": 0, - "texture": "candleStump" + "texture": "candle_stump" } } }, @@ -61,12 +61,12 @@ "north": { "uv": [ 0, 0, 16, 16 ], "tintindex": 0, - "texture": "#candleStump" + "texture": "#candle_stump" }, "south": { "uv": [ 0, 0, 16, 16 ], "tintindex": 0, - "texture": "#candleStump" + "texture": "#candle_stump" } } }, @@ -82,11 +82,11 @@ "faces": { "down": { "uv": [ 7, 13, 9, 15 ], - "texture": "#candleTip" + "texture": "#candle_tip" }, "up": { "uv": [ 7, 6, 9, 8 ], - "texture": "#candleTip" + "texture": "#candle_tip" } } }, @@ -102,11 +102,11 @@ "faces": { "west": { "uv": [ 0, 0, 16, 16 ], - "texture": "#candleTip" + "texture": "#candle_tip" }, "east": { "uv": [ 0, 0, 16, 16 ], - "texture": "#candleTip" + "texture": "#candle_tip" } } }, @@ -122,11 +122,11 @@ "faces": { "north": { "uv": [ 0, 0, 16, 16 ], - "texture": "#candleTip" + "texture": "#candle_tip" }, "south": { "uv": [ 0, 0, 16, 16 ], - "texture": "#candleTip" + "texture": "#candle_tip" } } } diff --git a/src/main/resources/assets/forestry/models/block/candle_off.json b/src/main/resources/assets/forestry/models/block/candle_off.json index a4e7b085f..5775d3f58 100644 --- a/src/main/resources/assets/forestry/models/block/candle_off.json +++ b/src/main/resources/assets/forestry/models/block/candle_off.json @@ -1,7 +1,7 @@ { "parent": "forestry:block/candle", "textures": { - "candleStump": "forestry:blocks/candleStumpUnlit", - "candleTip": "forestry:blocks/candleTipUnlit" + "candle_stump": "forestry:blocks/candle_stump_unlit", + "candle_tip": "forestry:blocks/candle_tip_unlit" } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/candle_on.json b/src/main/resources/assets/forestry/models/block/candle_on.json index 3c2e9699e..2a415d115 100644 --- a/src/main/resources/assets/forestry/models/block/candle_on.json +++ b/src/main/resources/assets/forestry/models/block/candle_on.json @@ -1,7 +1,7 @@ { "parent": "forestry:block/candle", "textures": { - "candleStump": "forestry:blocks/candleStumpLit", - "candleTip": "forestry:blocks/candleTipLit" + "candle_stump": "forestry:blocks/candle_stump_lit", + "candle_tip": "forestry:blocks/candle_tip_lit" } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/candle_up.json b/src/main/resources/assets/forestry/models/block/candle_up.json index 0f0bd7c7f..9f01823af 100644 --- a/src/main/resources/assets/forestry/models/block/candle_up.json +++ b/src/main/resources/assets/forestry/models/block/candle_up.json @@ -1,7 +1,7 @@ { "ambientocclusion": false, "textures": { - "particle": "#candleStump" + "particle": "#candle_stump" }, "elements": [ { @@ -12,12 +12,12 @@ "down": { "uv": [ 7, 13, 9, 15 ], "tintindex": 0, - "texture": "#candleStump" + "texture": "#candle_stump" }, "up": { "uv": [ 7, 6, 9, 8 ], "tintindex": 0, - "texture": "#candleStump" + "texture": "#candle_stump" } } }, @@ -29,12 +29,12 @@ "west": { "uv": [ 0, 0, 16, 16 ], "tintindex": 0, - "texture": "#candleStump" + "texture": "#candle_stump" }, "east": { "uv": [ 0, 0, 16, 16 ], "tintindex": 0, - "texture": "#candleStump" + "texture": "#candle_stump" } } }, @@ -46,12 +46,12 @@ "north": { "uv": [ 0, 0, 16, 16 ], "tintindex": 0, - "texture": "#candleStump" + "texture": "#candle_stump" }, "south": { "uv": [ 0, 0, 16, 16 ], "tintindex": 0, - "texture": "#candleStump" + "texture": "#candle_stump" } } }, @@ -62,11 +62,11 @@ "faces": { "down": { "uv": [ 7, 13, 9, 15 ], - "texture": "#candleTip" + "texture": "#candle_tip" }, "up": { "uv": [ 7, 6, 9, 8 ], - "texture": "#candleTip" + "texture": "#candle_tip" } } }, @@ -77,11 +77,11 @@ "faces": { "west": { "uv": [ 0, 0, 16, 16 ], - "texture": "#candleTip" + "texture": "#candle_tip" }, "east": { "uv": [ 0, 0, 16, 16 ], - "texture": "#candleTip" + "texture": "#candle_tip" } } }, @@ -92,11 +92,11 @@ "faces": { "north": { "uv": [ 0, 0, 16, 16 ], - "texture": "#candleTip" + "texture": "#candle_tip" }, "south": { "uv": [ 0, 0, 16, 16 ], - "texture": "#candleTip" + "texture": "#candle_tip" } } } diff --git a/src/main/resources/assets/forestry/models/block/candle_up_off.json b/src/main/resources/assets/forestry/models/block/candle_up_off.json index e1ada0cda..3b9127d94 100644 --- a/src/main/resources/assets/forestry/models/block/candle_up_off.json +++ b/src/main/resources/assets/forestry/models/block/candle_up_off.json @@ -1,7 +1,7 @@ { "parent": "forestry:block/candle_up", "textures": { - "candleStump": "forestry:blocks/candleStumpUnlit", - "candleTip": "forestry:blocks/candleTipUnlit" + "candle_stump": "forestry:blocks/candle_stump_unlit", + "candle_tip": "forestry:blocks/candle_tip_unlit" } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/candle_up_on.json b/src/main/resources/assets/forestry/models/block/candle_up_on.json index 6147720e8..6fecf031e 100644 --- a/src/main/resources/assets/forestry/models/block/candle_up_on.json +++ b/src/main/resources/assets/forestry/models/block/candle_up_on.json @@ -1,7 +1,7 @@ { "parent": "forestry:block/candle_up", "textures": { - "candleStump": "forestry:blocks/candleStumpLit", - "candleTip": "forestry:blocks/candleTipLit" + "candle_stump": "forestry:blocks/candle_stump_lit", + "candle_tip": "forestry:blocks/candle_tip_lit" } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/dirtPile.json b/src/main/resources/assets/forestry/models/block/dirt_pile.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/dirtPile.json rename to src/main/resources/assets/forestry/models/block/dirt_pile.json diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcacia.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcacia.json deleted file mode 100644 index b3a4edfe5..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcacia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeAcacia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBalsa.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBalsa.json deleted file mode 100644 index a3623a99d..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBalsa.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeBalsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBaobab.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBaobab.json deleted file mode 100644 index 1d105b78d..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBaobab.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeBaobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCherry.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCherry.json deleted file mode 100644 index f72e4b935..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCherry.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeCherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeChestnut.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeChestnut.json deleted file mode 100644 index 86eeef903..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeChestnut.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeChestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCocobolo.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCocobolo.json deleted file mode 100644 index 9e3638824..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCocobolo.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeCocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeDate.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeDate.json deleted file mode 100644 index d2bebbc7d..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeDate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeDate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeEbony.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeEbony.json deleted file mode 100644 index 8567aefd8..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeEbony.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeEbony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeGigant.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeGigant.json deleted file mode 100644 index a35c52a5b..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeGigant.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeGigant" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeIpe.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeIpe.json deleted file mode 100644 index 86dd228a7..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeIpe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeIpe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeKapok.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeKapok.json deleted file mode 100644 index 9dab02cc3..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeKapok.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeKapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLarch.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLarch.json deleted file mode 100644 index 7f80b6026..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLarch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeLarch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLemon.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLemon.json deleted file mode 100644 index e1817a43c..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLemon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeLemon" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLime.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLime.json deleted file mode 100644 index 928819462..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeLime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahoe.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahoe.json deleted file mode 100644 index d2a268362..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeMahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahogony.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahogony.json deleted file mode 100644 index e28eda188..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahogony.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeMahogony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMaple.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMaple.json deleted file mode 100644 index 93b1f244b..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMaple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeMaple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePadauk.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePadauk.json deleted file mode 100644 index b23bd2998..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePadauk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treePadauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePapaya.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePapaya.json deleted file mode 100644 index 25c196202..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePapaya.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treePapaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePine.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePine.json deleted file mode 100644 index 6adad1995..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePine.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treePine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePlum.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePlum.json deleted file mode 100644 index 454471d59..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePlum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treePlum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePoplar.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePoplar.json deleted file mode 100644 index 11914b2ab..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePoplar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treePoplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequoia.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequoia.json deleted file mode 100644 index 823d4437b..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequoia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeSequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSipiri.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSipiri.json deleted file mode 100644 index 71a28eff6..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSipiri.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeSipiri" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeTeak.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeTeak.json deleted file mode 100644 index e889624b7..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeTeak.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeTeak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWalnut.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWalnut.json deleted file mode 100644 index 06f56b5b7..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWalnut.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeWalnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWenge.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWenge.json deleted file mode 100644 index 979c98b99..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWenge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeWenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWillow.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWillow.json deleted file mode 100644 index 2fe061d65..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWillow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeWillow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeZebrawood.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeZebrawood.json deleted file mode 100644 index 58350e6f2..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeZebrawood.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeZebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_acacia.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_acacia.json new file mode 100644 index 000000000..e56ec20a8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_acacia.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcaciaVanilla.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_acacia_vanilla.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcaciaVanilla.json rename to src/main/resources/assets/forestry/models/block/germlings/sapling.tree_acacia_vanilla.json diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_balsa.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_balsa.json new file mode 100644 index 000000000..ba32cb3f0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_balsa.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_baobab.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_baobab.json new file mode 100644 index 000000000..8a653d9a8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_baobab.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBirch.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_birch.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/germlings/sapling.treeBirch.json rename to src/main/resources/assets/forestry/models/block/germlings/sapling.tree_birch.json diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_cherry.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_cherry.json new file mode 100644 index 000000000..7921cf3e6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_cherry.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_chestnut.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_chestnut.json new file mode 100644 index 000000000..7778ca292 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_chestnut.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_cocobolo.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_cocobolo.json new file mode 100644 index 000000000..15c3e3a9a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_cocobolo.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeDarkOak.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_dark_oak.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/germlings/sapling.treeDarkOak.json rename to src/main/resources/assets/forestry/models/block/germlings/sapling.tree_dark_oak.json diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_date.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_date.json new file mode 100644 index 000000000..944d46d46 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_date.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_date" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_ebony.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_ebony.json new file mode 100644 index 000000000..5ba844809 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_ebony.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_gigant.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_gigant.json new file mode 100644 index 000000000..67e3d369e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_gigant.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_gigant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_ipe.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_ipe.json new file mode 100644 index 000000000..c6962d18c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_ipe.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeJungle.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_jungle.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/germlings/sapling.treeJungle.json rename to src/main/resources/assets/forestry/models/block/germlings/sapling.tree_jungle.json diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_kapok.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_kapok.json new file mode 100644 index 000000000..1314a193e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_kapok.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_larch.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_larch.json new file mode 100644 index 000000000..cde4e4995 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_larch.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_lemon.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_lemon.json new file mode 100644 index 000000000..3aa427373 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_lemon.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_lemon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_lime.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_lime.json new file mode 100644 index 000000000..68e1ca0ab --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_mahoe.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_mahoe.json new file mode 100644 index 000000000..fd43b0ed5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_mahoe.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_mahogony.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_mahogony.json new file mode 100644 index 000000000..333125eb1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_mahogony.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_mahogony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_maple.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_maple.json new file mode 100644 index 000000000..c04dce65c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_maple.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeOak.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_oak.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/germlings/sapling.treeOak.json rename to src/main/resources/assets/forestry/models/block/germlings/sapling.tree_oak.json diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_padauk.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_padauk.json new file mode 100644 index 000000000..943934d5a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_padauk.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_papaya.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_papaya.json new file mode 100644 index 000000000..afe7ea71c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_papaya.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_pine.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_pine.json new file mode 100644 index 000000000..dd69152cd --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_pine.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_plum.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_plum.json new file mode 100644 index 000000000..ac4507bf1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_plum.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_poplar.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_poplar.json new file mode 100644 index 000000000..f9dfe1e1a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_poplar.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_sequoia.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_sequoia.json new file mode 100644 index 000000000..49efabe7e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_sequoia.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_sipiri.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_sipiri.json new file mode 100644 index 000000000..941a52ced --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_sipiri.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_sipiri" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSpruce.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_spruce.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/germlings/sapling.treeSpruce.json rename to src/main/resources/assets/forestry/models/block/germlings/sapling.tree_spruce.json diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_teak.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_teak.json new file mode 100644 index 000000000..aa777202b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_teak.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_walnut.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_walnut.json new file mode 100644 index 000000000..97f0394cc --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_walnut.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_wenge.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_wenge.json new file mode 100644 index 000000000..5679f7e5c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_wenge.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_willow.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_willow.json new file mode 100644 index 000000000..af5d3f353 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_willow.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_zebrawood.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_zebrawood.json new file mode 100644 index 000000000..b2e2bd196 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.tree_zebrawood.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.tree_zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/woodPile.json b/src/main/resources/assets/forestry/models/block/woodPile.json deleted file mode 100644 index 9aa7c6fa4..000000000 --- a/src/main/resources/assets/forestry/models/block/woodPile.json +++ /dev/null @@ -1,93 +0,0 @@ -{ -"textures": { - "woodTop": "forestry:blocks/wood/heart.larch", - "woodBark": "forestry:blocks/wood/bark.larch" -}, -"elements": [ -{ - "from": [ 0, 0, 0 ], - "to": [ 8, 16, 8 ], - "faces": { - "down": { "uv": [ 16, 16, 0, 0 ], "texture": "#woodTop" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodTop" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" } - } -}, -{ - "from": [ 0, 0, 8 ], - "to": [ 8, 16, 16 ], - "faces": { - "down": { "uv": [ 16, 16, 0, 0 ], "texture": "#woodTop" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodTop" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" } - } -}, -{ - "from": [ 8, 0, 0 ], - "to": [ 16, 16, 8 ], - "faces": { - "down": { "uv": [ 16, 16, 0, 0 ], "texture": "#woodTop" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodTop" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" } - } -}, -{ - "from": [ 8, 0, 8 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 16, 16, 0, 0 ], "texture": "#woodTop" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodTop" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#woodBark" } - } -} -], -"display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.5, 0.5, 0.5 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - } -} -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/wood_pile.json b/src/main/resources/assets/forestry/models/block/wood_pile.json new file mode 100644 index 000000000..13c96e0fa --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/wood_pile.json @@ -0,0 +1,93 @@ +{ +"textures": { + "wood_top": "forestry:blocks/wood/heart.larch", + "wood_bark": "forestry:blocks/wood/bark.larch" +}, +"elements": [ +{ + "from": [ 0, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "down": { "uv": [ 16, 16, 0, 0 ], "texture": "#wood_top" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_top" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" } + } +}, +{ + "from": [ 0, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "down": { "uv": [ 16, 16, 0, 0 ], "texture": "#wood_top" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_top" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" } + } +}, +{ + "from": [ 8, 0, 0 ], + "to": [ 16, 16, 8 ], + "faces": { + "down": { "uv": [ 16, 16, 0, 0 ], "texture": "#wood_top" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_top" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" } + } +}, +{ + "from": [ 8, 0, 8 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 16, 16, 0, 0 ], "texture": "#wood_top" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_top" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#wood_bark" } + } +} +], +"display": { + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "thirdperson_lefthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + } +} +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/apiaristBoots.json b/src/main/resources/assets/forestry/models/item/apiarist_boots.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/apiaristBoots.json rename to src/main/resources/assets/forestry/models/item/apiarist_boots.json index 881a7cc46..69325e4f9 100644 --- a/src/main/resources/assets/forestry/models/item/apiaristBoots.json +++ b/src/main/resources/assets/forestry/models/item/apiarist_boots.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/apiaristBoots" + "layer0": "forestry:items/apiarist_boots" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/bituminousPeat.json b/src/main/resources/assets/forestry/models/item/apiarist_chest.json similarity index 54% rename from src/main/resources/assets/forestry/models/item/bituminousPeat.json rename to src/main/resources/assets/forestry/models/item/apiarist_chest.json index ceb13a69a..94e15c808 100644 --- a/src/main/resources/assets/forestry/models/item/bituminousPeat.json +++ b/src/main/resources/assets/forestry/models/item/apiarist_chest.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/bituminousPeat" + "layer0": "forestry:items/apiarist_chest" } } diff --git a/src/main/resources/assets/forestry/models/item/apiaristHelmet.json b/src/main/resources/assets/forestry/models/item/apiarist_helmet.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/apiaristHelmet.json rename to src/main/resources/assets/forestry/models/item/apiarist_helmet.json index c494b8fcd..7360639c8 100644 --- a/src/main/resources/assets/forestry/models/item/apiaristHelmet.json +++ b/src/main/resources/assets/forestry/models/item/apiarist_helmet.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/apiaristHelmet" + "layer0": "forestry:items/apiarist_helmet" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/apiaristChest.json b/src/main/resources/assets/forestry/models/item/apiarist_legs.json similarity index 55% rename from src/main/resources/assets/forestry/models/item/apiaristChest.json rename to src/main/resources/assets/forestry/models/item/apiarist_legs.json index 6295e01e4..7a85cd759 100644 --- a/src/main/resources/assets/forestry/models/item/apiaristChest.json +++ b/src/main/resources/assets/forestry/models/item/apiarist_legs.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/apiaristChest" + "layer0": "forestry:items/apiarist_legs" } } diff --git a/src/main/resources/assets/forestry/models/item/ashPile.json b/src/main/resources/assets/forestry/models/item/ashPile.json deleted file mode 100644 index 11fe40d47..000000000 --- a/src/main/resources/assets/forestry/models/item/ashPile.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/ashPile" -} diff --git a/src/main/resources/assets/forestry/models/item/ash_pile.json b/src/main/resources/assets/forestry/models/item/ash_pile.json new file mode 100644 index 000000000..251d936a2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ash_pile.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/ash_pile" +} diff --git a/src/main/resources/assets/forestry/models/item/beeCombs.json b/src/main/resources/assets/forestry/models/item/bee_combs.json similarity index 81% rename from src/main/resources/assets/forestry/models/item/beeCombs.json rename to src/main/resources/assets/forestry/models/item/bee_combs.json index af92eaa67..51b88746f 100644 --- a/src/main/resources/assets/forestry/models/item/beeCombs.json +++ b/src/main/resources/assets/forestry/models/item/bee_combs.json @@ -1,8 +1,8 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/beeCombs.0", - "layer1": "forestry:items/beeCombs.1" + "layer0": "forestry:items/bee_combs.0", + "layer1": "forestry:items/bee_combs.1" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/beecombs/cocoa.json b/src/main/resources/assets/forestry/models/item/beecombs/cocoa.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/cocoa.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/cocoa.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/darkened.json b/src/main/resources/assets/forestry/models/item/beecombs/darkened.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/darkened.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/darkened.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/dripping.json b/src/main/resources/assets/forestry/models/item/beecombs/dripping.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/dripping.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/dripping.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/frozen.json b/src/main/resources/assets/forestry/models/item/beecombs/frozen.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/frozen.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/frozen.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/honey.json b/src/main/resources/assets/forestry/models/item/beecombs/honey.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/honey.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/honey.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/irradiated.json b/src/main/resources/assets/forestry/models/item/beecombs/irradiated.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/irradiated.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/irradiated.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/mellow.json b/src/main/resources/assets/forestry/models/item/beecombs/mellow.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/mellow.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/mellow.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/mossy.json b/src/main/resources/assets/forestry/models/item/beecombs/mossy.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/mossy.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/mossy.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/mysterious.json b/src/main/resources/assets/forestry/models/item/beecombs/mysterious.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/mysterious.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/mysterious.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/omega.json b/src/main/resources/assets/forestry/models/item/beecombs/omega.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/omega.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/omega.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/parched.json b/src/main/resources/assets/forestry/models/item/beecombs/parched.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/parched.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/parched.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/powdery.json b/src/main/resources/assets/forestry/models/item/beecombs/powdery.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/powdery.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/powdery.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/reddened.json b/src/main/resources/assets/forestry/models/item/beecombs/reddened.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/reddened.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/reddened.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/silky.json b/src/main/resources/assets/forestry/models/item/beecombs/silky.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/silky.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/silky.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/simmering.json b/src/main/resources/assets/forestry/models/item/beecombs/simmering.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/simmering.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/simmering.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/stringy.json b/src/main/resources/assets/forestry/models/item/beecombs/stringy.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/stringy.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/stringy.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/beecombs/wheaten.json b/src/main/resources/assets/forestry/models/item/beecombs/wheaten.json index ef4036335..ae6a024ef 100644 --- a/src/main/resources/assets/forestry/models/item/beecombs/wheaten.json +++ b/src/main/resources/assets/forestry/models/item/beecombs/wheaten.json @@ -1,3 +1,3 @@ { - "parent": "forestry:item/beeCombs" + "parent": "forestry:item/bee_combs" } diff --git a/src/main/resources/assets/forestry/models/item/bituminous_peat.json b/src/main/resources/assets/forestry/models/item/bituminous_peat.json new file mode 100644 index 000000000..4e059ba5b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/bituminous_peat.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/bituminous_peat" + } +} diff --git a/src/main/resources/assets/forestry/models/item/broken_bronze_pickaxe.json b/src/main/resources/assets/forestry/models/item/broken_bronze_pickaxe.json new file mode 100644 index 000000000..f2d41725b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/broken_bronze_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/broken_bronze_pickaxe" + } +} diff --git a/src/main/resources/assets/forestry/models/item/broken_bronze_shovel.json b/src/main/resources/assets/forestry/models/item/broken_bronze_shovel.json new file mode 100644 index 000000000..02bebc174 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/broken_bronze_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/broken_bronze_shovel" + } +} diff --git a/src/main/resources/assets/forestry/models/item/bronzePickaxe.json b/src/main/resources/assets/forestry/models/item/bronze_pickaxe.json similarity index 54% rename from src/main/resources/assets/forestry/models/item/bronzePickaxe.json rename to src/main/resources/assets/forestry/models/item/bronze_pickaxe.json index 886fa8fcc..42ffd3670 100644 --- a/src/main/resources/assets/forestry/models/item/bronzePickaxe.json +++ b/src/main/resources/assets/forestry/models/item/bronze_pickaxe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "forestry:items/bronzePickaxe" + "layer0": "forestry:items/bronze_pickaxe" } } diff --git a/src/main/resources/assets/forestry/models/item/bronzeShovel.json b/src/main/resources/assets/forestry/models/item/bronze_shovel.json similarity index 54% rename from src/main/resources/assets/forestry/models/item/bronzeShovel.json rename to src/main/resources/assets/forestry/models/item/bronze_shovel.json index 9141647a1..b96b8ba5b 100644 --- a/src/main/resources/assets/forestry/models/item/bronzeShovel.json +++ b/src/main/resources/assets/forestry/models/item/bronze_shovel.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "forestry:items/bronzeShovel" + "layer0": "forestry:items/bronze_shovel" } } diff --git a/src/main/resources/assets/forestry/models/item/butterflyGE.json b/src/main/resources/assets/forestry/models/item/butterfly_ge.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/butterflyGE.json rename to src/main/resources/assets/forestry/models/item/butterfly_ge.json diff --git a/src/main/resources/assets/forestry/models/item/camouflageSprayCan.json b/src/main/resources/assets/forestry/models/item/camouflageSprayCan.json deleted file mode 100644 index af58a5361..000000000 --- a/src/main/resources/assets/forestry/models/item/camouflageSprayCan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/camouflageSprayCan" - } -} diff --git a/src/main/resources/assets/forestry/models/item/camouflageSprayCanFilled.json b/src/main/resources/assets/forestry/models/item/camouflageSprayCanFilled.json deleted file mode 100644 index 22901c9fb..000000000 --- a/src/main/resources/assets/forestry/models/item/camouflageSprayCanFilled.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/camouflageSprayCanFilled" - } -} diff --git a/src/main/resources/assets/forestry/models/item/camouflage_spray_can.json b/src/main/resources/assets/forestry/models/item/camouflage_spray_can.json new file mode 100644 index 000000000..48ca46145 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/camouflage_spray_can.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/camouflage_spray_can" + } +} diff --git a/src/main/resources/assets/forestry/models/item/camouflage_spray_can_filled.json b/src/main/resources/assets/forestry/models/item/camouflage_spray_can_filled.json new file mode 100644 index 000000000..20eb17bbb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/camouflage_spray_can_filled.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/camouflage_spray_can_filled" + } +} diff --git a/src/main/resources/assets/forestry/models/item/camouflagedPaneling.json b/src/main/resources/assets/forestry/models/item/camouflaged_paneling.json similarity index 81% rename from src/main/resources/assets/forestry/models/item/camouflagedPaneling.json rename to src/main/resources/assets/forestry/models/item/camouflaged_paneling.json index 8ad6b5f51..3600df71a 100644 --- a/src/main/resources/assets/forestry/models/item/camouflagedPaneling.json +++ b/src/main/resources/assets/forestry/models/item/camouflaged_paneling.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/camouflagedPaneling" + "layer0": "forestry:items/camouflaged_paneling" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json deleted file mode 100644 index cea30fbc8..000000000 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/dissipationCharge" - } -} diff --git a/src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipation_charge.json similarity index 52% rename from src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json rename to src/main/resources/assets/forestry/models/item/craftingMaterial/dissipation_charge.json index bbaaadfd9..8db2d62e7 100644 --- a/src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipation_charge.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/brokenBronzeShovel" + "layer0": "forestry:items/dissipation_charge" } } diff --git a/src/main/resources/assets/forestry/models/item/gearTin.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/ice_shard.json similarity index 57% rename from src/main/resources/assets/forestry/models/item/gearTin.json rename to src/main/resources/assets/forestry/models/item/craftingMaterial/ice_shard.json index c9d18bec6..dd8c7aab3 100644 --- a/src/main/resources/assets/forestry/models/item/gearTin.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/ice_shard.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/gearTin" + "layer0": "forestry:items/ice_shard" } } diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json deleted file mode 100644 index 3e7959ddc..000000000 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/pulsatingDust" - } -} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json deleted file mode 100644 index da2366510..000000000 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/pulsatingMesh" - } -} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsating_dust.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsating_dust.json new file mode 100644 index 000000000..da8acb6a4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsating_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/pulsating_dust" + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsating_mesh.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsating_mesh.json new file mode 100644 index 000000000..1ac13725f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsating_mesh.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/pulsating_mesh" + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json deleted file mode 100644 index 7f23fa36e..000000000 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/scentedPaneling" - } -} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/scented_paneling.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/scented_paneling.json new file mode 100644 index 000000000..92e898d45 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/scented_paneling.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/scented_paneling" + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/silk_wisp.json similarity index 57% rename from src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json rename to src/main/resources/assets/forestry/models/item/craftingMaterial/silk_wisp.json index 173a335d9..67369ddd7 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/silk_wisp.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/iceShard" + "layer0": "forestry:items/silk_wisp" } } diff --git a/src/main/resources/assets/forestry/models/item/gearBronze.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/woven_silk.json similarity index 56% rename from src/main/resources/assets/forestry/models/item/gearBronze.json rename to src/main/resources/assets/forestry/models/item/craftingMaterial/woven_silk.json index 46c23f431..faa833bb0 100644 --- a/src/main/resources/assets/forestry/models/item/gearBronze.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/woven_silk.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/gearBronze" + "layer0": "forestry:items/woven_silk" } } diff --git a/src/main/resources/assets/forestry/models/item/decayingWheat.json b/src/main/resources/assets/forestry/models/item/decayingWheat.json deleted file mode 100644 index 6bc51433c..000000000 --- a/src/main/resources/assets/forestry/models/item/decayingWheat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/decayingWheat" - } -} diff --git a/src/main/resources/assets/forestry/models/item/decaying_wheat.json b/src/main/resources/assets/forestry/models/item/decaying_wheat.json new file mode 100644 index 000000000..394073214 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/decaying_wheat.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/decaying_wheat" + } +} diff --git a/src/main/resources/assets/forestry/models/item/dirtPile.json b/src/main/resources/assets/forestry/models/item/dirtPile.json deleted file mode 100644 index 96efc2d4f..000000000 --- a/src/main/resources/assets/forestry/models/item/dirtPile.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/dirtPile" -} diff --git a/src/main/resources/assets/forestry/models/item/dirt_pile.json b/src/main/resources/assets/forestry/models/item/dirt_pile.json new file mode 100644 index 000000000..9f53dc8b1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/dirt_pile.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/dirt_pile" +} diff --git a/src/main/resources/assets/forestry/models/item/dissipation_charge.json b/src/main/resources/assets/forestry/models/item/dissipation_charge.json new file mode 100644 index 000000000..d0a554cc2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/dissipation_charge.json @@ -0,0 +1,13 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/dissipation_charge" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fertilizerBio.json b/src/main/resources/assets/forestry/models/item/fertilizerBio.json deleted file mode 100644 index 6024dff50..000000000 --- a/src/main/resources/assets/forestry/models/item/fertilizerBio.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/fertilizerBio" - } -} diff --git a/src/main/resources/assets/forestry/models/item/fertilizerCompound.json b/src/main/resources/assets/forestry/models/item/fertilizerCompound.json deleted file mode 100644 index 7adee3df4..000000000 --- a/src/main/resources/assets/forestry/models/item/fertilizerCompound.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/fertilizerCompound" - } -} diff --git a/src/main/resources/assets/forestry/models/item/fertilizer_bio.json b/src/main/resources/assets/forestry/models/item/fertilizer_bio.json new file mode 100644 index 000000000..e1d3b2299 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fertilizer_bio.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/fertilizer_bio" + } +} diff --git a/src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json b/src/main/resources/assets/forestry/models/item/fertilizer_compound.json similarity index 52% rename from src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json rename to src/main/resources/assets/forestry/models/item/fertilizer_compound.json index 5c36eed0d..2c226f1dd 100644 --- a/src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json +++ b/src/main/resources/assets/forestry/models/item/fertilizer_compound.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/brokenBronzePickaxe" + "layer0": "forestry:items/fertilizer_compound" } } diff --git a/src/main/resources/assets/forestry/models/item/dissipationCharge.json b/src/main/resources/assets/forestry/models/item/frame_impregnated.json similarity index 82% rename from src/main/resources/assets/forestry/models/item/dissipationCharge.json rename to src/main/resources/assets/forestry/models/item/frame_impregnated.json index 7920f9213..2576bf45a 100644 --- a/src/main/resources/assets/forestry/models/item/dissipationCharge.json +++ b/src/main/resources/assets/forestry/models/item/frame_impregnated.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/dissipationCharge" + "layer0": "forestry:items/frame_impregnated" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/iceShard.json b/src/main/resources/assets/forestry/models/item/frame_proven.json similarity index 83% rename from src/main/resources/assets/forestry/models/item/iceShard.json rename to src/main/resources/assets/forestry/models/item/frame_proven.json index 9c37a87de..98a8184a7 100644 --- a/src/main/resources/assets/forestry/models/item/iceShard.json +++ b/src/main/resources/assets/forestry/models/item/frame_proven.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/iceShard" + "layer0": "forestry:items/frame_proven" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/portableAlyzer.json b/src/main/resources/assets/forestry/models/item/frame_untreated.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/portableAlyzer.json rename to src/main/resources/assets/forestry/models/item/frame_untreated.json index c0a0299c9..203b15cd9 100644 --- a/src/main/resources/assets/forestry/models/item/portableAlyzer.json +++ b/src/main/resources/assets/forestry/models/item/frame_untreated.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/portableAlyzer" + "layer0": "forestry:items/frame_untreated" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/gearCopper.json b/src/main/resources/assets/forestry/models/item/gearCopper.json deleted file mode 100644 index 83c288515..000000000 --- a/src/main/resources/assets/forestry/models/item/gearCopper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/gearCopper" - } -} diff --git a/src/main/resources/assets/forestry/models/item/gear_bronze.json b/src/main/resources/assets/forestry/models/item/gear_bronze.json new file mode 100644 index 000000000..90a6027b7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/gear_bronze.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/gear_bronze" + } +} diff --git a/src/main/resources/assets/forestry/models/item/gear_copper.json b/src/main/resources/assets/forestry/models/item/gear_copper.json new file mode 100644 index 000000000..d246717fa --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/gear_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/gear_copper" + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json b/src/main/resources/assets/forestry/models/item/gear_tin.json similarity index 57% rename from src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json rename to src/main/resources/assets/forestry/models/item/gear_tin.json index 9715b2033..5f51b2a17 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json +++ b/src/main/resources/assets/forestry/models/item/gear_tin.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/silkWisp" + "layer0": "forestry:items/gear_tin" } } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json deleted file mode 100644 index e906834f9..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeAcacia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json deleted file mode 100644 index 8f4faf08f..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeBalsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json deleted file mode 100644 index 9aab7bdc7..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeBaobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json deleted file mode 100644 index 6481cb350..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeCherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json deleted file mode 100644 index 9a0087ca9..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeChestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json deleted file mode 100644 index dac4285b3..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeCocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json deleted file mode 100644 index 0a8d9786e..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeDate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json deleted file mode 100644 index a4df57811..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeEbony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json deleted file mode 100644 index 1a12a73a6..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeGigant" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json deleted file mode 100644 index 81fc7a8b4..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeIpe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json deleted file mode 100644 index 71216526d..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeKapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json deleted file mode 100644 index 02513d0dd..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeLarch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json deleted file mode 100644 index cebd34b58..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeLemon" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json deleted file mode 100644 index 9b3f010fc..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeLime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json deleted file mode 100644 index 848e0458e..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeMahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json deleted file mode 100644 index d3c4ade30..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeMahogony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json deleted file mode 100644 index d3d4d959f..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeMaple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json deleted file mode 100644 index 9d55438b5..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treePadauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json deleted file mode 100644 index 01982f311..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treePapaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json deleted file mode 100644 index 04de881f6..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treePine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json deleted file mode 100644 index 37e885b42..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treePlum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json deleted file mode 100644 index 12a0b5ec7..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treePoplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json deleted file mode 100644 index 8a0f6dbe3..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeSequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json deleted file mode 100644 index 2979f73f9..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeSipiri" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json deleted file mode 100644 index 22cc310e9..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeTeak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json deleted file mode 100644 index 71382d4df..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeWalnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json deleted file mode 100644 index 992876d91..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeWenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json deleted file mode 100644 index 08fd7db3e..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeWillow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json deleted file mode 100644 index c312c28c2..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeZebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_acacia.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_acacia.json new file mode 100644 index 000000000..5a322392a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_acacia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_balsa.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_balsa.json new file mode 100644 index 000000000..5ba8ba355 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_balsa.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_baobab.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_baobab.json new file mode 100644 index 000000000..8443c1d58 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_baobab.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_cherry.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_cherry.json new file mode 100644 index 000000000..aac5af49f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_cherry.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_chestnut.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_chestnut.json new file mode 100644 index 000000000..41b37c428 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_chestnut.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_cocobolo.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_cocobolo.json new file mode 100644 index 000000000..181d554cb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_cocobolo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_date.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_date.json new file mode 100644 index 000000000..a4382a1f5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_date.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_date" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_ebony.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_ebony.json new file mode 100644 index 000000000..872b51847 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_ebony.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_gigant.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_gigant.json new file mode 100644 index 000000000..e2c99eb7b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_gigant.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_gigant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_ipe.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_ipe.json new file mode 100644 index 000000000..24f2a8138 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_ipe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_kapok.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_kapok.json new file mode 100644 index 000000000..3e641935c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_kapok.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_larch.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_larch.json new file mode 100644 index 000000000..c1038946f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_larch.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_lemon.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_lemon.json new file mode 100644 index 000000000..8730b3a74 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_lemon.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_lemon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_lime.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_lime.json new file mode 100644 index 000000000..ddf63ad7e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_mahoe.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_mahoe.json new file mode 100644 index 000000000..71d34e945 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_mahoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_mahogony.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_mahogony.json new file mode 100644 index 000000000..00e7e3be0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_mahogony.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_mahogony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_maple.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_maple.json new file mode 100644 index 000000000..bfda37a9a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_maple.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_padauk.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_padauk.json new file mode 100644 index 000000000..e27e8cdd0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_padauk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_papaya.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_papaya.json new file mode 100644 index 000000000..a4e41b66b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_papaya.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_pine.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_pine.json new file mode 100644 index 000000000..f89a69f76 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_pine.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_plum.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_plum.json new file mode 100644 index 000000000..abd4f4803 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_plum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_poplar.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_poplar.json new file mode 100644 index 000000000..722302bbe --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_poplar.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_sequoia.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_sequoia.json new file mode 100644 index 000000000..1c879536b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_sequoia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_sipiri.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_sipiri.json new file mode 100644 index 000000000..238fd871a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_sipiri.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_sipiri" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_teak.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_teak.json new file mode 100644 index 000000000..16821ddf5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_teak.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_walnut.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_walnut.json new file mode 100644 index 000000000..d217574db --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_walnut.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_wenge.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_wenge.json new file mode 100644 index 000000000..2620d8c33 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_wenge.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_willow.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_willow.json new file mode 100644 index 000000000..6c36116f8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_willow.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_zebrawood.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_zebrawood.json new file mode 100644 index 000000000..9783ee7f8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.tree_zebrawood.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.tree_zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/grafterProven.json b/src/main/resources/assets/forestry/models/item/grafterProven.json deleted file mode 100644 index db0df3d8d..000000000 --- a/src/main/resources/assets/forestry/models/item/grafterProven.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/grafterProven" - } -} diff --git a/src/main/resources/assets/forestry/models/item/grafter_proven.json b/src/main/resources/assets/forestry/models/item/grafter_proven.json new file mode 100644 index 000000000..9c84ed711 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/grafter_proven.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/grafter_proven" + } +} diff --git a/src/main/resources/assets/forestry/models/item/habitatLocator.json b/src/main/resources/assets/forestry/models/item/habitat_locator.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/habitatLocator.json rename to src/main/resources/assets/forestry/models/item/habitat_locator.json diff --git a/src/main/resources/assets/forestry/models/item/hardenedMachine.json b/src/main/resources/assets/forestry/models/item/hardenedMachine.json deleted file mode 100644 index d64abe8d7..000000000 --- a/src/main/resources/assets/forestry/models/item/hardenedMachine.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/hardenedMachine" - } -} diff --git a/src/main/resources/assets/forestry/models/item/hardened_machine.json b/src/main/resources/assets/forestry/models/item/hardened_machine.json new file mode 100644 index 000000000..6183f4e1a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/hardened_machine.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/hardened_machine" + } +} diff --git a/src/main/resources/assets/forestry/models/item/honeyDrop.json b/src/main/resources/assets/forestry/models/item/honeyDrop.json deleted file mode 100644 index cfe243c6d..000000000 --- a/src/main/resources/assets/forestry/models/item/honeyDrop.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/honeyDrop.0", - "layer1": "forestry:items/honeyDrop.1" - } -} diff --git a/src/main/resources/assets/forestry/models/item/honeyPot.json b/src/main/resources/assets/forestry/models/item/honeyPot.json deleted file mode 100644 index 897c7b2e4..000000000 --- a/src/main/resources/assets/forestry/models/item/honeyPot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/honeyPot" - } -} diff --git a/src/main/resources/assets/forestry/models/item/honey_drop.json b/src/main/resources/assets/forestry/models/item/honey_drop.json new file mode 100644 index 000000000..65affe2a7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/honey_drop.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/honey_drop.0", + "layer1": "forestry:items/honey_drop.1" + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json b/src/main/resources/assets/forestry/models/item/honey_pot.json similarity index 57% rename from src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json rename to src/main/resources/assets/forestry/models/item/honey_pot.json index 00e7fee9c..c7057b16c 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json +++ b/src/main/resources/assets/forestry/models/item/honey_pot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/wovenSilk" + "layer0": "forestry:items/honey_pot" } } diff --git a/src/main/resources/assets/forestry/models/item/honeyedSlice.json b/src/main/resources/assets/forestry/models/item/honeyedSlice.json deleted file mode 100644 index 399733eac..000000000 --- a/src/main/resources/assets/forestry/models/item/honeyedSlice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/honeyedSlice" - } -} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json b/src/main/resources/assets/forestry/models/item/honeyed_slice.json similarity index 55% rename from src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json rename to src/main/resources/assets/forestry/models/item/honeyed_slice.json index da2366510..a8edc1753 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json +++ b/src/main/resources/assets/forestry/models/item/honeyed_slice.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/pulsatingMesh" + "layer0": "forestry:items/honeyed_slice" } } diff --git a/src/main/resources/assets/forestry/models/item/wovenSilk.json b/src/main/resources/assets/forestry/models/item/ice_shard.json similarity index 84% rename from src/main/resources/assets/forestry/models/item/wovenSilk.json rename to src/main/resources/assets/forestry/models/item/ice_shard.json index d65b16f5f..6c88474bd 100644 --- a/src/main/resources/assets/forestry/models/item/wovenSilk.json +++ b/src/main/resources/assets/forestry/models/item/ice_shard.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/wovenSilk" + "layer0": "forestry:items/ice_shard" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/impregnatedCasing.json b/src/main/resources/assets/forestry/models/item/impregnatedCasing.json deleted file mode 100644 index 0e7994990..000000000 --- a/src/main/resources/assets/forestry/models/item/impregnatedCasing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/impregnatedCasing" - } -} diff --git a/src/main/resources/assets/forestry/models/item/impregnated_casing.json b/src/main/resources/assets/forestry/models/item/impregnated_casing.json new file mode 100644 index 000000000..27a9e60f7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/impregnated_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/impregnated_casing" + } +} diff --git a/src/main/resources/assets/forestry/models/item/ingotBronze.json b/src/main/resources/assets/forestry/models/item/ingotBronze.json deleted file mode 100644 index 58ada37b1..000000000 --- a/src/main/resources/assets/forestry/models/item/ingotBronze.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/ingotBronze" - } -} diff --git a/src/main/resources/assets/forestry/models/item/ingotCopper.json b/src/main/resources/assets/forestry/models/item/ingotCopper.json deleted file mode 100644 index b75dd4a12..000000000 --- a/src/main/resources/assets/forestry/models/item/ingotCopper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/ingotCopper" - } -} diff --git a/src/main/resources/assets/forestry/models/item/ingotTin.json b/src/main/resources/assets/forestry/models/item/ingotTin.json deleted file mode 100644 index fde26163a..000000000 --- a/src/main/resources/assets/forestry/models/item/ingotTin.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/ingotTin" - } -} diff --git a/src/main/resources/assets/forestry/models/item/apiaristLegs.json b/src/main/resources/assets/forestry/models/item/ingot_bronze.json similarity index 55% rename from src/main/resources/assets/forestry/models/item/apiaristLegs.json rename to src/main/resources/assets/forestry/models/item/ingot_bronze.json index ace14877d..6bb2a282f 100644 --- a/src/main/resources/assets/forestry/models/item/apiaristLegs.json +++ b/src/main/resources/assets/forestry/models/item/ingot_bronze.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/apiaristLegs" + "layer0": "forestry:items/ingot_bronze" } } diff --git a/src/main/resources/assets/forestry/models/item/ingot_copper.json b/src/main/resources/assets/forestry/models/item/ingot_copper.json new file mode 100644 index 000000000..c3a544faa --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ingot_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/ingot_copper" + } +} diff --git a/src/main/resources/assets/forestry/models/item/ingot_tin.json b/src/main/resources/assets/forestry/models/item/ingot_tin.json new file mode 100644 index 000000000..5f57888cd --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ingot_tin.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/ingot_tin" + } +} diff --git a/src/main/resources/assets/forestry/models/item/iodineCapsule.json b/src/main/resources/assets/forestry/models/item/iodineCapsule.json deleted file mode 100644 index 760402e4d..000000000 --- a/src/main/resources/assets/forestry/models/item/iodineCapsule.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/iodineCapsule" - } -} diff --git a/src/main/resources/assets/forestry/models/item/iodine_capsule.json b/src/main/resources/assets/forestry/models/item/iodine_capsule.json new file mode 100644 index 000000000..290427c13 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/iodine_capsule.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/iodine_capsule" + } +} diff --git a/src/main/resources/assets/forestry/models/item/kitPickaxe.json b/src/main/resources/assets/forestry/models/item/kitPickaxe.json deleted file mode 100644 index 94ab258f9..000000000 --- a/src/main/resources/assets/forestry/models/item/kitPickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/kitPickaxe" - } -} diff --git a/src/main/resources/assets/forestry/models/item/kitShovel.json b/src/main/resources/assets/forestry/models/item/kitShovel.json deleted file mode 100644 index ea0c0b28d..000000000 --- a/src/main/resources/assets/forestry/models/item/kitShovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/kitShovel" - } -} diff --git a/src/main/resources/assets/forestry/models/item/kit_pickaxe.json b/src/main/resources/assets/forestry/models/item/kit_pickaxe.json new file mode 100644 index 000000000..ba1a680ae --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/kit_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/kit_pickaxe" + } +} diff --git a/src/main/resources/assets/forestry/models/item/kit_shovel.json b/src/main/resources/assets/forestry/models/item/kit_shovel.json new file mode 100644 index 000000000..fc9b77822 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/kit_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/kit_shovel" + } +} diff --git a/src/main/resources/assets/forestry/models/item/mouldyWheat.json b/src/main/resources/assets/forestry/models/item/mouldyWheat.json deleted file mode 100644 index 668889b87..000000000 --- a/src/main/resources/assets/forestry/models/item/mouldyWheat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/mouldyWheat" - } -} diff --git a/src/main/resources/assets/forestry/models/item/mouldy_wheat.json b/src/main/resources/assets/forestry/models/item/mouldy_wheat.json new file mode 100644 index 000000000..d5e0255ce --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mouldy_wheat.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/mouldy_wheat" + } +} diff --git a/src/main/resources/assets/forestry/models/item/naturalistHelmet.json b/src/main/resources/assets/forestry/models/item/naturalist_helmet.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/naturalistHelmet.json rename to src/main/resources/assets/forestry/models/item/naturalist_helmet.json diff --git a/src/main/resources/assets/forestry/models/item/oakStick.json b/src/main/resources/assets/forestry/models/item/oakStick.json deleted file mode 100644 index f6a9fb52b..000000000 --- a/src/main/resources/assets/forestry/models/item/oakStick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/oakStick" - } -} diff --git a/src/main/resources/assets/forestry/models/item/oak_stick.json b/src/main/resources/assets/forestry/models/item/oak_stick.json new file mode 100644 index 000000000..37578c9da --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/oak_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/oak_stick" + } +} diff --git a/src/main/resources/assets/forestry/models/item/frameUntreated.json b/src/main/resources/assets/forestry/models/item/portable_alyzer.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/frameUntreated.json rename to src/main/resources/assets/forestry/models/item/portable_alyzer.json index a5bbe0adf..4cef760fe 100644 --- a/src/main/resources/assets/forestry/models/item/frameUntreated.json +++ b/src/main/resources/assets/forestry/models/item/portable_alyzer.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/frameUntreated" + "layer0": "forestry:items/portable_alyzer" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/pulsatingDust.json b/src/main/resources/assets/forestry/models/item/pulsatingDust.json deleted file mode 100644 index 3e7959ddc..000000000 --- a/src/main/resources/assets/forestry/models/item/pulsatingDust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/pulsatingDust" - } -} diff --git a/src/main/resources/assets/forestry/models/item/pulsatingMesh.json b/src/main/resources/assets/forestry/models/item/pulsatingMesh.json deleted file mode 100644 index da2366510..000000000 --- a/src/main/resources/assets/forestry/models/item/pulsatingMesh.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/pulsatingMesh" - } -} diff --git a/src/main/resources/assets/forestry/models/item/pulsating_dust.json b/src/main/resources/assets/forestry/models/item/pulsating_dust.json new file mode 100644 index 000000000..da8acb6a4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/pulsating_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/pulsating_dust" + } +} diff --git a/src/main/resources/assets/forestry/models/item/pulsating_mesh.json b/src/main/resources/assets/forestry/models/item/pulsating_mesh.json new file mode 100644 index 000000000..1ac13725f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/pulsating_mesh.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/pulsating_mesh" + } +} diff --git a/src/main/resources/assets/forestry/models/item/refractoryWax.json b/src/main/resources/assets/forestry/models/item/refractoryWax.json deleted file mode 100644 index ab9d7035d..000000000 --- a/src/main/resources/assets/forestry/models/item/refractoryWax.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/refractoryWax" - } -} diff --git a/src/main/resources/assets/forestry/models/item/refractory_wax.json b/src/main/resources/assets/forestry/models/item/refractory_wax.json new file mode 100644 index 000000000..b7a4b8a2c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/refractory_wax.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/refractory_wax" + } +} diff --git a/src/main/resources/assets/forestry/models/item/researchNote.json b/src/main/resources/assets/forestry/models/item/research_note.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/researchNote.json rename to src/main/resources/assets/forestry/models/item/research_note.json diff --git a/src/main/resources/assets/forestry/models/item/frameProven.json b/src/main/resources/assets/forestry/models/item/royal_jelly.json similarity index 84% rename from src/main/resources/assets/forestry/models/item/frameProven.json rename to src/main/resources/assets/forestry/models/item/royal_jelly.json index 7c056fbb5..884f63037 100644 --- a/src/main/resources/assets/forestry/models/item/frameProven.json +++ b/src/main/resources/assets/forestry/models/item/royal_jelly.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/frameProven" + "layer0": "forestry:items/royal_jelly" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/scentedPaneling.json b/src/main/resources/assets/forestry/models/item/scentedPaneling.json deleted file mode 100644 index 60a1e84d5..000000000 --- a/src/main/resources/assets/forestry/models/item/scentedPaneling.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/scentedPaneling" - }, - "display": { - "thirdperson": { - "rotation": [ 0, 90, -35 ], - "translation": [ 0, 1.25, -3.5 ], - "scale": [ 0.85, 0.85, 0.85 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/frameImpregnated.json b/src/main/resources/assets/forestry/models/item/scented_paneling.json similarity index 82% rename from src/main/resources/assets/forestry/models/item/frameImpregnated.json rename to src/main/resources/assets/forestry/models/item/scented_paneling.json index 893ffdc11..1bff8b235 100644 --- a/src/main/resources/assets/forestry/models/item/frameImpregnated.json +++ b/src/main/resources/assets/forestry/models/item/scented_paneling.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/frameImpregnated" + "layer0": "forestry:items/scented_paneling" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/waxCast.json b/src/main/resources/assets/forestry/models/item/silk_wisp.json similarity index 84% rename from src/main/resources/assets/forestry/models/item/waxCast.json rename to src/main/resources/assets/forestry/models/item/silk_wisp.json index 047b7d12a..591437a02 100644 --- a/src/main/resources/assets/forestry/models/item/waxCast.json +++ b/src/main/resources/assets/forestry/models/item/silk_wisp.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/waxCast" + "layer0": "forestry:items/silk_wisp" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/solderingIron.json b/src/main/resources/assets/forestry/models/item/solderingIron.json deleted file mode 100644 index 66a358726..000000000 --- a/src/main/resources/assets/forestry/models/item/solderingIron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/solderingIron" - } -} diff --git a/src/main/resources/assets/forestry/models/item/soldering_iron.json b/src/main/resources/assets/forestry/models/item/soldering_iron.json new file mode 100644 index 000000000..450f94850 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/soldering_iron.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/soldering_iron" + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairsFireproof.json b/src/main/resources/assets/forestry/models/item/stairs_fireproof.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/stairsFireproof.json rename to src/main/resources/assets/forestry/models/item/stairs_fireproof.json diff --git a/src/main/resources/assets/forestry/models/item/sturdyMachine.json b/src/main/resources/assets/forestry/models/item/sturdyMachine.json deleted file mode 100644 index d91d3e04a..000000000 --- a/src/main/resources/assets/forestry/models/item/sturdyMachine.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/sturdyMachine" - } -} diff --git a/src/main/resources/assets/forestry/models/item/sturdy_machine.json b/src/main/resources/assets/forestry/models/item/sturdy_machine.json new file mode 100644 index 000000000..2539e1bbb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/sturdy_machine.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/sturdy_machine" + } +} diff --git a/src/main/resources/assets/forestry/models/item/thermionicTubes.json b/src/main/resources/assets/forestry/models/item/thermionicTubes.json deleted file mode 100644 index 07224142d..000000000 --- a/src/main/resources/assets/forestry/models/item/thermionicTubes.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/thermionicTubes.0", - "layer1": "forestry:items/thermionicTubes.1" - } -} diff --git a/src/main/resources/assets/forestry/models/item/thermionic_tubes.json b/src/main/resources/assets/forestry/models/item/thermionic_tubes.json new file mode 100644 index 000000000..a28dc5d84 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/thermionic_tubes.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/thermionic_tubes.0", + "layer1": "forestry:items/thermionic_tubes.1" + } +} diff --git a/src/main/resources/assets/forestry/models/item/silkWisp.json b/src/main/resources/assets/forestry/models/item/wax_cast.json similarity index 84% rename from src/main/resources/assets/forestry/models/item/silkWisp.json rename to src/main/resources/assets/forestry/models/item/wax_cast.json index 4f411530d..237ad4468 100644 --- a/src/main/resources/assets/forestry/models/item/silkWisp.json +++ b/src/main/resources/assets/forestry/models/item/wax_cast.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/silkWisp" + "layer0": "forestry:items/wax_cast" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/woodPile.json b/src/main/resources/assets/forestry/models/item/woodPile.json deleted file mode 100644 index e8e282c90..000000000 --- a/src/main/resources/assets/forestry/models/item/woodPile.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/woodPile" -} diff --git a/src/main/resources/assets/forestry/models/item/woodPulp.json b/src/main/resources/assets/forestry/models/item/woodPulp.json deleted file mode 100644 index 43c0085d5..000000000 --- a/src/main/resources/assets/forestry/models/item/woodPulp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/woodPulp" - } -} diff --git a/src/main/resources/assets/forestry/models/item/wood_pile.json b/src/main/resources/assets/forestry/models/item/wood_pile.json new file mode 100644 index 000000000..299faa1ce --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/wood_pile.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/wood_pile" +} diff --git a/src/main/resources/assets/forestry/models/item/wood_pulp.json b/src/main/resources/assets/forestry/models/item/wood_pulp.json new file mode 100644 index 000000000..0d4cac729 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/wood_pulp.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/wood_pulp" + } +} diff --git a/src/main/resources/assets/forestry/models/item/royalJelly.json b/src/main/resources/assets/forestry/models/item/woven_silk.json similarity index 84% rename from src/main/resources/assets/forestry/models/item/royalJelly.json rename to src/main/resources/assets/forestry/models/item/woven_silk.json index b0028285c..a9957f64f 100644 --- a/src/main/resources/assets/forestry/models/item/royalJelly.json +++ b/src/main/resources/assets/forestry/models/item/woven_silk.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/royalJelly" + "layer0": "forestry:items/woven_silk" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/textures/blocks/candleStumpLit.png b/src/main/resources/assets/forestry/textures/blocks/candle_stump_lit.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/candleStumpLit.png rename to src/main/resources/assets/forestry/textures/blocks/candle_stump_lit.png diff --git a/src/main/resources/assets/forestry/textures/blocks/candleStumpUnlit.png b/src/main/resources/assets/forestry/textures/blocks/candle_stump_unlit.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/candleStumpUnlit.png rename to src/main/resources/assets/forestry/textures/blocks/candle_stump_unlit.png diff --git a/src/main/resources/assets/forestry/textures/blocks/candleTipLit.png b/src/main/resources/assets/forestry/textures/blocks/candle_tip_lit.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/candleTipLit.png rename to src/main/resources/assets/forestry/textures/blocks/candle_tip_lit.png diff --git a/src/main/resources/assets/forestry/textures/blocks/candleTipUnlit.png b/src/main/resources/assets/forestry/textures/blocks/candle_tip_unlit.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/candleTipUnlit.png rename to src/main/resources/assets/forestry/textures/blocks/candle_tip_unlit.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeAcacia.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_acacia.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeAcacia.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_acacia.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeBalsa.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_balsa.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeBalsa.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_balsa.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeBaobab.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_baobab.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeBaobab.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_baobab.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeCherry.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_cherry.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeCherry.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_cherry.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeChestnut.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_chestnut.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeChestnut.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_chestnut.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeCocobolo.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_cocobolo.png similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeCocobolo.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_cocobolo.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeDate.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_date.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeDate.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_date.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeEbony.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_ebony.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeEbony.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_ebony.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeGigant.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_gigant.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeGigant.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_gigant.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeIpe.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_ipe.png similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeIpe.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_ipe.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeKapok.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_kapok.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeKapok.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_kapok.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLarch.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_larch.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLarch.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_larch.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLemon.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_lemon.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLemon.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_lemon.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLime.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_lime.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLime.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_lime.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMahoe.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_mahoe.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMahoe.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_mahoe.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMahogony.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_mahogony.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMahogony.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_mahogony.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMaple.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_maple.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMaple.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_maple.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePadauk.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_padauk.png similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePadauk.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_padauk.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePapaya.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_papaya.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePapaya.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_papaya.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePine.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_pine.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePine.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_pine.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePlum.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_plum.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePlum.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_plum.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePoplar.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_poplar.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePoplar.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_poplar.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeRubber.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_rubber.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeRubber.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_rubber.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSequoia.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_sequoia.png similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSequoia.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_sequoia.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSipiri.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_sipiri.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSipiri.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_sipiri.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeTeak.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_teak.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeTeak.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_teak.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWalnut.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_walnut.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWalnut.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_walnut.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWenge.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_wenge.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWenge.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_wenge.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWillow.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_willow.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWillow.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_willow.png diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeZebrawood.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_zebrawood.png similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeZebrawood.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.tree_zebrawood.png diff --git a/src/main/resources/assets/forestry/textures/entity/bees/endBee.png b/src/main/resources/assets/forestry/textures/entity/bees/endBee.png deleted file mode 100755 index 942640474a3e5569e012f88bb0926da4b6f778dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 914 zcmV;D18w|?P)Y}j6o#L3J#pe-r$tIhB7%gX3e*Ki7G6|H+4WDbwOB;#yXcM`3;sY>-ts?K02M|7 zA|V7QiUibA3#9q$Kw zVhvKF#R3&$AwJ|Lm91P-`p+ zxDJEYVK6`0e$dnQgPyY56HUM<;8&T1D6fg${G@1$b0&bDec9NXKyAHdtyb&86D8o& zzh{bQrpT2xf!xC2;#?R4`m{5QyVJXxanh2LN^f%h#_*~Au{XT=AGaEs0*-+q5c~5x zEA^pqS@V3i)ldPb0J}birQSbp{agt+t)k`9*#py?IK9E=8S~{vgM_>om;&~Jk`wWM zwSMmUxjMnqs#z|bZ?j)Ghyw5!n0GKMEAbhFrJ!KAw#Gr~3Z~*jxviD8B;7Lm= z_%xAU21wG0FL`2SC;uu8&ij4Vfp;80!Jqg2cMq5uG0$5W#Ju2X2M0dw%TIgTQp(i@ zI+D6T-^^lwi2aK#a+G*;XRQq^yDj73+rSNA?|<~-uIfcs%2`*aSzuaHWM%{3b~|-u zZAo1-lWlx7=Dd`sQs-#z38)Rm?z+Yze1bFI19Gh7`V*DlY z(=SU}aK(IE((7h+;C^9XW?xGR?gRR6t^MfF-J`KZ?&=@82~>bLB&|wXmV~5L;0K^9 z>75Wl;(ObP^+xwT+8p;UKEa({8F6)dA@B>Z;4%IQ@H-HD`zK&Cm4C%!Pk@;vSzgb9?Sv41mNbx5GP7I2zL_1G*(2ar zAD3j~jQuC?j6C2bup+5!W_!SIo(DXh#5^Fe{oqMY-$CvGN!;(HGQndXKN%YEytRPe o|EUEg>R+F%YA~q;&#DIh1_&0J!UkZodjJ3c07*qoM6N<$g1MWs_y7O^ diff --git a/src/main/resources/assets/forestry/textures/entity/bees/honeyBee.png b/src/main/resources/assets/forestry/textures/entity/bees/honeyBee.png deleted file mode 100755 index 511b7354d14eda567bd6acd742e969bf72dba7b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 979 zcmV;^11$WBP)bL86o#KOzK(t4kESUmq)iop5U4>^AiS+u0HS*~`~VhF_uV4YEq@??0I@|vLWngx zjD)BZ5Fnw55{D*D+9cS%z8`Nl<6=i~l7bO?+45JUAvD{F7rEVMM1dWC7U6LndzX*NnJ*_{V7A zZ7cML<`_3;AdF~!KfDcaCOzLEd~PkVJ)$-cY*p!-I~qj zi5KdD?|&{%q2d&0+66|I2CpsV2Y~+COa^#6-Lsh|t*5E}Lq2n1P-|O{1`nTog{%Wv z1>80eLd!wv<{;m&b=qH}Vg&pF$yIOIobXr6~I9gEr*9Q_8;Ql0iT9v^Hac} z9YXXF!T^$s5Z!~>D%9RTe*cjM!Goq*4v+WQA3uTF8L$*u8_=GGOEs|9j^9wzu+@SZ z5LSRLOszwy1lb6avZN=t%xoy8Kzidyz-HeXfEuXw7Hob7eika>CxR9FJH0Wr`8;^4u~pJR*Mn}6V4paNW#bVJgDBqZGcR)I*;tIoN^ zyFnXh0R(T~x;ySSKF+&98F&`B0K6`#;G8R_X7YdPXP{KQtkwuw}cr< zWLdUhW}&2`UrM+B36#pkrp&eeg?1-VUEK z_z2hsegWouj^6}+2QvTu6L8nZfUf^;yaixpy(+Kkfo(YFewLI<3eBtr?3&rWnXLoA zdA^Rf7{>m}TT0KL55 z?W+V^o_{hd;AwjSKR)RNChA|GVclS_6FjUNd<+e&nM#yk|NQ^}002ovPDHLkV1h^_ B$dv#9 diff --git a/src/main/resources/assets/forestry/textures/entity/bees/icyBee.png b/src/main/resources/assets/forestry/textures/entity/bees/icyBee.png deleted file mode 100755 index 4bb1157060e1a7e871f344819291adfae9e80215..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 922 zcmV;L17-Y)P)M?uL`o%8tLma4#J1h>0DcCP6>F+&*+%pcqCP`cya8+wQbi?@ zY9v|;B`U?Hb(;8d{w#7P9Y>kerG~_A&gS~gJ#+5){umosunx_Qrs|t@V=eXkOXdnf z)pVXZ*N=V~jqPSq0cU0K ztPD;MZrqe^+?2BRbFF~m1V7D6h^9s8i_gq1Ux)(*+uCMJ{!pZ;CU zqhg*@9RgD;gO@KXj0yV7AHy-+ZvS-FNlPr1X7cTG<5qk8WSse1u>=o*^QotIX@pB- zcv*CA#lPzLyB(kc3}}S>ME6fs0f$|*Tsj&t&BS2_Uj}EZE#Nlr5%3Lg)ld4s1JR>(y1Z+CvYGArR3BmZ6QM)O|5fa5@IO`AU|SlmiyL zxUp5#@mTh?ASp7l5zqzpJmcnoJxM(?Q*`_5 zg^4aoESDAMjqvVCHgg4F5m=J60#qd}0!2wOvo_E&vm`8HU<3>zW*;KAepyltSOYFe zde6){o)<=D_MN2QIbh&rXAu3>em1j`yZc8T0u|uAq-&DaBq8Y<@FUQZbR~o^^f1^1 zb^)SKKfg2UUwndxKpA)kI0t+zsSrXajz*(O2;m1as{t2*hpwO%wl@NIjAdcg0 zGb>5Tg%FawuqvtIc)9=Nd%y`o?De<@?3!5z*pbwg)G@OiplfCydh#1heH=bv;d{Ui z@H0^J8viHoI}rQ+E^x6j(P&WHtZ9+~&__ca+~V;QbL-^Ec;IR* z0l1>UD;gY~IKOS@w>|87q5(L~@XHKBHnL(;`ar9TGQifJHTEe`+pMY4Xq3$I2UIBK)@H~pq-Y6;AkE2o2P{lI) z)l;>Wz81jeRr#IVY?j19D7^z1ct1BEm&9jPc`1y1bNgf_n6Ba`FdcK}Vx2ay^bb94 zy97)HyJdg?+wKBgpew2Sw`i~z$E8^Hei%`X`|}YA-SF-(xw$=hinN`=@G>wH$EgAU zpc5FkY`1}qq#i)VIpeO}cm4>d1^_?By#?U62<6@Xu!={hPe%!vi_$U&lx=5{^2pRf zU_bnHXuB=R**ABl&h?@kMPeT1r~tkY+tv%ZX4Uz zf$xB}?UzzY-AIGOU|_Nv@7*2uFFq+!paMJtTmxRQT}~;@dglu}U_R&6iDxYED!J>UYR7Yy76nv(W`1KTaz`;rcTmZX=X z_~j$t4qveG?dZRL1XhCM?*qRAy}14!xEnR#sAz4*8URT}mv@ diff --git a/src/main/resources/assets/forestry/textures/entity/bees/tropicalBee.png b/src/main/resources/assets/forestry/textures/entity/bees/tropicalBee.png deleted file mode 100755 index b8b0510eab0e434f7e3619198fe7fe54f06258c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 981 zcmV;`11kK9P)zmk4Y&lJETuM+;iG*5-msnS9Soi~E-wiAF-6GU2pMrhX$lrhkssvON z2`F!xn1nQm-S~O^XOVI0guEIIiA|1Vjpxp}bLRZdYi6!Eir$CHQpM%vvRD{+{t;tE z(NP1HrHV_X5|yQj8Don0pVK7(mjE0?)oPXUa#`aHfIdEA;4aTb%-zFZ#`}6B3BY9; zyexymqdWI*`OdvtKB_;~034_IMFt@r)F(ogwl8L#RNqpAi+rK5-)iey`xoEqV0A<{W8!VW zB-Anasr`IM%~NgSxwJ^FL4DRtw?Jv3*r$>|Q~(aTXfAs=d`_+i06q z12P%dFl4sj%DgDf`9%3cO@aqqGnYL%X1{&}xmid{w5w({hTNQ(*U91D&6t&SxKF#ykV>FcGoLl! z-4_KL0PxeAd8H^)ImqqF{X5;r^c6ff?tfzKC@7u=GNGLq0H6c3fTryh(2>*wh}k}! zkVka`@FnKWyr5y~Kp_VJug;3~j(PeEwCDf3EFN5a637BmKrXat+p(ksXaWtO2Bd(7 z?Up3RUwk@oDnX0$2;i-F&|1%|ruf{-eH<)44b0ds0#|HL0~ycstJRMohgZsxJ1oFVkwr|^Bu#N58 zz(b&A`}HV_x*-f2zz#tC-Ukmx{l+H>A&>*+fdcTh?Q|4HnIuW_Q51b8sRS$nj{{)Q zINb?G!4qa|)9dwCC1q`=qA2R;g{!vnfiLy1+y|T^^+KI*0XvdvK;3rJc1=;!iL|9E)7^PUAlyLT2CtFJz1ISu{=;q$UPAF=6U00000NkvXXu0mjf Dy;jkG diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiAurora.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_aurora.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiAurora.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_aurora.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiBatesia.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_batesia.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiBatesia.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_batesia.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlackSwallow.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_black_swallow.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlackSwallow.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_black_swallow.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlueDuke.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_blue_duke.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlueDuke.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_blue_duke.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlueWing.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_blue_wing.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlueWing.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_blue_wing.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiBrimstone.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_brimstone.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiBrimstone.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_brimstone.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiCSpeckledWood.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_c_speckled_wood.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiCSpeckledWood.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_c_speckled_wood.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiCabbageWhite.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_cabbage_white.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiCabbageWhite.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_cabbage_white.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiCitrusSwallow.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_citrus_swallow.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiCitrusSwallow.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_citrus_swallow.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiComma.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_comma.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiComma.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_comma.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiDianaFrit.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_diana_frit.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiDianaFrit.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_diana_frit.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiEmeraldPeacock.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_emerald_peacock.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiEmeraldPeacock.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_emerald_peacock.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiGlasswing.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_glasswing.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiGlasswing.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_glasswing.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiGlassyTiger.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_glassy_tiger.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiGlassyTiger.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_glassy_tiger.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiGozoraAzure.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_gozora_azure.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiGozoraAzure.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_gozora_azure.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiLLacewing.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_l_lacewing.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiLLacewing.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_l_lacewing.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiMBlueMorpho.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_m_blue_morpho.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiMBlueMorpho.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_m_blue_morpho.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiMSpeckledWood.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_m_speckled_wood.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiMSpeckledWood.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_m_speckled_wood.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiMalachite.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_malachite.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiMalachite.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_malachite.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiMonarch.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_monarch.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiMonarch.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_monarch.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiPBlueMorpho.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_p_blue_morpho.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiPBlueMorpho.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_p_blue_morpho.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiPalaenoSulphur.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_palaeno_sulphur.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiPalaenoSulphur.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_palaeno_sulphur.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiPostillion.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_postillion.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiPostillion.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_postillion.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiPostman.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_postman.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiPostman.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_postman.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiRBlueMorpho.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_r_blue_morpho.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiRBlueMorpho.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_r_blue_morpho.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiReseda.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_reseda.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiReseda.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_reseda.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpeckledWood.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_speckled_wood.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpeckledWood.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_speckled_wood.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpicebush.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_spicebush.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpicebush.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_spicebush.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpringAzure.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_spring_azure.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpringAzure.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_spring_azure.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiThoasSwallow.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_thoas_swallow.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiThoasSwallow.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_thoas_swallow.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/lepiZebraSwallow.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepi_zebra_swallow.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/lepiZebraSwallow.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepi_zebra_swallow.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/mothAtlas.png b/src/main/resources/assets/forestry/textures/entity/butterflies/moth_atlas.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/mothAtlas.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/moth_atlas.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/mothBombyxMori.png b/src/main/resources/assets/forestry/textures/entity/butterflies/moth_bombyx_mori.png similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/mothBombyxMori.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/moth_bombyx_mori.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/mothBrimstone.png b/src/main/resources/assets/forestry/textures/entity/butterflies/moth_brimstone.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/mothBrimstone.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/moth_brimstone.png diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/mothLatticedHeath.png b/src/main/resources/assets/forestry/textures/entity/butterflies/moth_latticed_heath.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/entity/butterflies/mothLatticedHeath.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/moth_latticed_heath.png diff --git a/src/main/resources/assets/forestry/textures/gui/backpackT2.png b/src/main/resources/assets/forestry/textures/gui/backpack_t2.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/backpackT2.png rename to src/main/resources/assets/forestry/textures/gui/backpack_t2.png diff --git a/src/main/resources/assets/forestry/textures/gui/camouflageSprayCan.png b/src/main/resources/assets/forestry/textures/gui/camouflage_spray_can.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/camouflageSprayCan.png rename to src/main/resources/assets/forestry/textures/gui/camouflage_spray_can.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/circuitMismatch.png b/src/main/resources/assets/forestry/textures/gui/errors/circuit_mismatch.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/circuitMismatch.png rename to src/main/resources/assets/forestry/textures/gui/errors/circuit_mismatch.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/forcedCooldown.png b/src/main/resources/assets/forestry/textures/gui/errors/forced_cooldown.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/forcedCooldown.png rename to src/main/resources/assets/forestry/textures/gui/errors/forced_cooldown.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/invalidBiome.png b/src/main/resources/assets/forestry/textures/gui/errors/invalid_biome.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/invalidBiome.png rename to src/main/resources/assets/forestry/textures/gui/errors/invalid_biome.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/isRaining.png b/src/main/resources/assets/forestry/textures/gui/errors/is_raining.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/isRaining.png rename to src/main/resources/assets/forestry/textures/gui/errors/is_raining.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noCircuitBoard.png b/src/main/resources/assets/forestry/textures/gui/errors/no_circuit_board.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noCircuitBoard.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_circuit_board.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noCircuitLayout.png b/src/main/resources/assets/forestry/textures/gui/errors/no_circuit_layout.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noCircuitLayout.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_circuit_layout.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noDisposal.png b/src/main/resources/assets/forestry/textures/gui/errors/no_disposal.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noDisposal.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_disposal.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noDrone.png b/src/main/resources/assets/forestry/textures/gui/errors/no_drone.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noDrone.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_drone.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noEnergyNet.png b/src/main/resources/assets/forestry/textures/gui/errors/no_energy_net.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noEnergyNet.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_energy_net.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noFarmland.png b/src/main/resources/assets/forestry/textures/gui/errors/no_farmland.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noFarmland.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_farmland.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noFertilizer.png b/src/main/resources/assets/forestry/textures/gui/errors/no_fertilizer.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noFertilizer.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_fertilizer.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noFlower.png b/src/main/resources/assets/forestry/textures/gui/errors/no_flower.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noFlower.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_flower.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noFuel.png b/src/main/resources/assets/forestry/textures/gui/errors/no_fuel.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noFuel.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_fuel.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noHeat.png b/src/main/resources/assets/forestry/textures/gui/errors/no_heat.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noHeat.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_heat.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noHoney.png b/src/main/resources/assets/forestry/textures/gui/errors/no_honey.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noHoney.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_honey.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noLiquid.png b/src/main/resources/assets/forestry/textures/gui/errors/no_liquid.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noLiquid.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_liquid.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noPaper.png b/src/main/resources/assets/forestry/textures/gui/errors/no_paper.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noPaper.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_paper.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noPower.png b/src/main/resources/assets/forestry/textures/gui/errors/no_power.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noPower.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_power.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noQueen.png b/src/main/resources/assets/forestry/textures/gui/errors/no_queen.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noQueen.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_queen.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noRecipe.png b/src/main/resources/assets/forestry/textures/gui/errors/no_recipe.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noRecipe.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_recipe.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noRecipient.png b/src/main/resources/assets/forestry/textures/gui/errors/no_recipient.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noRecipient.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_recipient.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noResource.png b/src/main/resources/assets/forestry/textures/gui/errors/no_resource.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noResource.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_resource.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noSky.png b/src/main/resources/assets/forestry/textures/gui/errors/no_sky.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noSky.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_sky.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noSpace.png b/src/main/resources/assets/forestry/textures/gui/errors/no_space.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noSpace.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_space.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noSpaceTank.png b/src/main/resources/assets/forestry/textures/gui/errors/no_space_tank.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noSpaceTank.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_space_tank.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noSpecimen.png b/src/main/resources/assets/forestry/textures/gui/errors/no_specimen.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noSpecimen.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_specimen.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/noStamps.png b/src/main/resources/assets/forestry/textures/gui/errors/no_stamps.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/noStamps.png rename to src/main/resources/assets/forestry/textures/gui/errors/no_stamps.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/notAlphaNumeric.png b/src/main/resources/assets/forestry/textures/gui/errors/not_alpha_numeric.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/notAlphaNumeric.png rename to src/main/resources/assets/forestry/textures/gui/errors/not_alpha_numeric.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/notDay.png b/src/main/resources/assets/forestry/textures/gui/errors/not_day.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/notDay.png rename to src/main/resources/assets/forestry/textures/gui/errors/not_day.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/notGloomy.png b/src/main/resources/assets/forestry/textures/gui/errors/not_gloomy.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/notGloomy.png rename to src/main/resources/assets/forestry/textures/gui/errors/not_gloomy.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/notLucid.png b/src/main/resources/assets/forestry/textures/gui/errors/not_lucid.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/notLucid.png rename to src/main/resources/assets/forestry/textures/gui/errors/not_lucid.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/notNight.png b/src/main/resources/assets/forestry/textures/gui/errors/not_night.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/notNight.png rename to src/main/resources/assets/forestry/textures/gui/errors/not_night.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/notRaining.png b/src/main/resources/assets/forestry/textures/gui/errors/not_raining.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/notRaining.png rename to src/main/resources/assets/forestry/textures/gui/errors/not_raining.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/notUnique.png b/src/main/resources/assets/forestry/textures/gui/errors/not_unique.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/notUnique.png rename to src/main/resources/assets/forestry/textures/gui/errors/not_unique.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/tooCold.png b/src/main/resources/assets/forestry/textures/gui/errors/too_cold.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/tooCold.png rename to src/main/resources/assets/forestry/textures/gui/errors/too_cold.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/tooHot.png b/src/main/resources/assets/forestry/textures/gui/errors/too_hot.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/tooHot.png rename to src/main/resources/assets/forestry/textures/gui/errors/too_hot.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/tooHumid.png b/src/main/resources/assets/forestry/textures/gui/errors/too_humid.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/tooHumid.png rename to src/main/resources/assets/forestry/textures/gui/errors/too_humid.png diff --git a/src/main/resources/assets/forestry/textures/gui/errors/wrongStacksize.png b/src/main/resources/assets/forestry/textures/gui/errors/wrong_stacksize.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/errors/wrongStacksize.png rename to src/main/resources/assets/forestry/textures/gui/errors/wrong_stacksize.png diff --git a/src/main/resources/assets/forestry/textures/gui/ledgerLeft.png b/src/main/resources/assets/forestry/textures/gui/ledger_left.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/ledgerLeft.png rename to src/main/resources/assets/forestry/textures/gui/ledger_left.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/hasMail.png b/src/main/resources/assets/forestry/textures/gui/triggers/has_mail.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/hasMail.png rename to src/main/resources/assets/forestry/textures/gui/triggers/has_mail.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/hasWork.png b/src/main/resources/assets/forestry/textures/gui/triggers/has_work.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/hasWork.png rename to src/main/resources/assets/forestry/textures/gui/triggers/has_work.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/lowFertilizer.png b/src/main/resources/assets/forestry/textures/gui/triggers/low_fertilizer.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/lowFertilizer.png rename to src/main/resources/assets/forestry/textures/gui/triggers/low_fertilizer.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/lowFuel.png b/src/main/resources/assets/forestry/textures/gui/triggers/low_fuel.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/lowFuel.png rename to src/main/resources/assets/forestry/textures/gui/triggers/low_fuel.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/lowGermlings.png b/src/main/resources/assets/forestry/textures/gui/triggers/low_germlings.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/lowGermlings.png rename to src/main/resources/assets/forestry/textures/gui/triggers/low_germlings.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/lowInput.png b/src/main/resources/assets/forestry/textures/gui/triggers/low_input.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/lowInput.png rename to src/main/resources/assets/forestry/textures/gui/triggers/low_input.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/lowLiquid.png b/src/main/resources/assets/forestry/textures/gui/triggers/low_liquid.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/lowLiquid.png rename to src/main/resources/assets/forestry/textures/gui/triggers/low_liquid.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/lowPaper.png b/src/main/resources/assets/forestry/textures/gui/triggers/low_paper.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/lowPaper.png rename to src/main/resources/assets/forestry/textures/gui/triggers/low_paper.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/lowResources.png b/src/main/resources/assets/forestry/textures/gui/triggers/low_resources.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/lowResources.png rename to src/main/resources/assets/forestry/textures/gui/triggers/low_resources.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/lowSoil.png b/src/main/resources/assets/forestry/textures/gui/triggers/low_soil.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/lowSoil.png rename to src/main/resources/assets/forestry/textures/gui/triggers/low_soil.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/lowStamps.png b/src/main/resources/assets/forestry/textures/gui/triggers/low_stamps.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/lowStamps.png rename to src/main/resources/assets/forestry/textures/gui/triggers/low_stamps.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/mailBuffer.png b/src/main/resources/assets/forestry/textures/gui/triggers/mail_buffer.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/mailBuffer.png rename to src/main/resources/assets/forestry/textures/gui/triggers/mail_buffer.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/missingDrone.png b/src/main/resources/assets/forestry/textures/gui/triggers/missing_drone.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/missingDrone.png rename to src/main/resources/assets/forestry/textures/gui/triggers/missing_drone.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/missingQueen.png b/src/main/resources/assets/forestry/textures/gui/triggers/missing_queen.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/missingQueen.png rename to src/main/resources/assets/forestry/textures/gui/triggers/missing_queen.png diff --git a/src/main/resources/assets/forestry/textures/gui/triggers/noFrames.png b/src/main/resources/assets/forestry/textures/gui/triggers/no_frames.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/triggers/noFrames.png rename to src/main/resources/assets/forestry/textures/gui/triggers/no_frames.png diff --git a/src/main/resources/assets/forestry/textures/items/apiaristBoots.png b/src/main/resources/assets/forestry/textures/items/apiarist_boots.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/apiaristBoots.png rename to src/main/resources/assets/forestry/textures/items/apiarist_boots.png diff --git a/src/main/resources/assets/forestry/textures/items/apiaristChest.png b/src/main/resources/assets/forestry/textures/items/apiarist_chest.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/apiaristChest.png rename to src/main/resources/assets/forestry/textures/items/apiarist_chest.png diff --git a/src/main/resources/assets/forestry/textures/items/apiaristHelmet.png b/src/main/resources/assets/forestry/textures/items/apiarist_helmet.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/apiaristHelmet.png rename to src/main/resources/assets/forestry/textures/items/apiarist_helmet.png diff --git a/src/main/resources/assets/forestry/textures/items/apiaristLegs.png b/src/main/resources/assets/forestry/textures/items/apiarist_legs.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/apiaristLegs.png rename to src/main/resources/assets/forestry/textures/items/apiarist_legs.png diff --git a/src/main/resources/assets/forestry/textures/items/beeCombs.0.png b/src/main/resources/assets/forestry/textures/items/bee_combs.0.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/beeCombs.0.png rename to src/main/resources/assets/forestry/textures/items/bee_combs.0.png diff --git a/src/main/resources/assets/forestry/textures/items/beeCombs.1.png b/src/main/resources/assets/forestry/textures/items/bee_combs.1.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/beeCombs.1.png rename to src/main/resources/assets/forestry/textures/items/bee_combs.1.png diff --git a/src/main/resources/assets/forestry/textures/items/bioMass.png b/src/main/resources/assets/forestry/textures/items/bio_mass.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/bioMass.png rename to src/main/resources/assets/forestry/textures/items/bio_mass.png diff --git a/src/main/resources/assets/forestry/textures/items/bituminousPeat.png b/src/main/resources/assets/forestry/textures/items/bituminous_peat.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/bituminousPeat.png rename to src/main/resources/assets/forestry/textures/items/bituminous_peat.png diff --git a/src/main/resources/assets/forestry/textures/items/brokenBronzePickaxe.png b/src/main/resources/assets/forestry/textures/items/broken_bronze_pickaxe.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/brokenBronzePickaxe.png rename to src/main/resources/assets/forestry/textures/items/broken_bronze_pickaxe.png diff --git a/src/main/resources/assets/forestry/textures/items/brokenBronzeShovel.png b/src/main/resources/assets/forestry/textures/items/broken_bronze_shovel.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/brokenBronzeShovel.png rename to src/main/resources/assets/forestry/textures/items/broken_bronze_shovel.png diff --git a/src/main/resources/assets/forestry/textures/items/bronzePickaxe.png b/src/main/resources/assets/forestry/textures/items/bronze_pickaxe.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/bronzePickaxe.png rename to src/main/resources/assets/forestry/textures/items/bronze_pickaxe.png diff --git a/src/main/resources/assets/forestry/textures/items/bronzeShovel.png b/src/main/resources/assets/forestry/textures/items/bronze_shovel.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/bronzeShovel.png rename to src/main/resources/assets/forestry/textures/items/bronze_shovel.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiAurora.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_aurora.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiAurora.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_aurora.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBatesia.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_batesia.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiBatesia.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_batesia.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlackSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_black_swallow.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiBlackSwallow.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_black_swallow.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueDuke.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_blue_duke.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueDuke.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_blue_duke.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueWing.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_blue_wing.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueWing.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_blue_wing.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBrimstone.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_brimstone.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiBrimstone.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_brimstone.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiCabbageWhite.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_cabbage_white.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiCabbageWhite.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_cabbage_white.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiCitrusSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_citrus_swallow.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiCitrusSwallow.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_citrus_swallow.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiComma.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_comma.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiComma.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_comma.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiCSpeckledWood.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_cspeckled_wood.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiCSpeckledWood.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_cspeckled_wood.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiDianaFrit.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_diana_frit.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiDianaFrit.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_diana_frit.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiEmeraldPeacock.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_emerald_peacock.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiEmeraldPeacock.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_emerald_peacock.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlasswing.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_glasswing.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiGlasswing.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_glasswing.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlassyTiger.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_glassy_tiger.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiGlassyTiger.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_glassy_tiger.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGozoraAzure.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_gozora_azure.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiGozoraAzure.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_gozora_azure.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiLLacewing.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_llacewing.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiLLacewing.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_llacewing.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMalachite.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_malachite.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiMalachite.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_malachite.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMBlueMorpho.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_mblue_morpho.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiMBlueMorpho.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_mblue_morpho.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMonarch.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_monarch.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiMonarch.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_monarch.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMSpeckledWood.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_mspeckled_wood.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiMSpeckledWood.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_mspeckled_wood.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPalaenoSulphur.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_palaeno_sulphur.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiPalaenoSulphur.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_palaeno_sulphur.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPBlueMorpho.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_pblue_morpho.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiPBlueMorpho.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_pblue_morpho.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPostillion.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_postillion.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiPostillion.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_postillion.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPostman.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_postman.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiPostman.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_postman.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiRBlueMorpho.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_rblue_morpho.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiRBlueMorpho.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_rblue_morpho.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiReseda.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_reseda.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiReseda.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_reseda.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpeckledWood.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_speckled_wood.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiSpeckledWood.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_speckled_wood.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpicebush.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_spicebush.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiSpicebush.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_spicebush.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpringAzure.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_spring_azure.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiSpringAzure.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_spring_azure.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiThoasSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_thoas_swallow.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiThoasSwallow.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_thoas_swallow.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiZebraSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepi_zebra_swallow.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/lepiZebraSwallow.png rename to src/main/resources/assets/forestry/textures/items/butterflies/lepi_zebra_swallow.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothAtlas.png b/src/main/resources/assets/forestry/textures/items/butterflies/moth_atlas.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/mothAtlas.png rename to src/main/resources/assets/forestry/textures/items/butterflies/moth_atlas.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothBombyxMori.png b/src/main/resources/assets/forestry/textures/items/butterflies/moth_bombyx_mori.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/mothBombyxMori.png rename to src/main/resources/assets/forestry/textures/items/butterflies/moth_bombyx_mori.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothBrimstone.png b/src/main/resources/assets/forestry/textures/items/butterflies/moth_brimstone.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/mothBrimstone.png rename to src/main/resources/assets/forestry/textures/items/butterflies/moth_brimstone.png diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothLatticedHeath.png b/src/main/resources/assets/forestry/textures/items/butterflies/moth_latticed_heath.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/butterflies/mothLatticedHeath.png rename to src/main/resources/assets/forestry/textures/items/butterflies/moth_latticed_heath.png diff --git a/src/main/resources/assets/forestry/textures/items/camouflageSprayCan.png b/src/main/resources/assets/forestry/textures/items/camouflage_spray_can.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/camouflageSprayCan.png rename to src/main/resources/assets/forestry/textures/items/camouflage_spray_can.png diff --git a/src/main/resources/assets/forestry/textures/items/camouflageSprayCanFilled.png b/src/main/resources/assets/forestry/textures/items/camouflage_spray_can_filled.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/camouflageSprayCanFilled.png rename to src/main/resources/assets/forestry/textures/items/camouflage_spray_can_filled.png diff --git a/src/main/resources/assets/forestry/textures/items/camouflagedPaneling.png b/src/main/resources/assets/forestry/textures/items/camouflaged_paneling.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/camouflagedPaneling.png rename to src/main/resources/assets/forestry/textures/items/camouflaged_paneling.png diff --git a/src/main/resources/assets/forestry/textures/items/decayingWheat.png b/src/main/resources/assets/forestry/textures/items/decaying_wheat.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/decayingWheat.png rename to src/main/resources/assets/forestry/textures/items/decaying_wheat.png diff --git a/src/main/resources/assets/forestry/textures/items/dissipationCharge.png b/src/main/resources/assets/forestry/textures/items/dissipation_charge.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/dissipationCharge.png rename to src/main/resources/assets/forestry/textures/items/dissipation_charge.png diff --git a/src/main/resources/assets/forestry/textures/items/fertilizerBio.png b/src/main/resources/assets/forestry/textures/items/fertilizer_bio.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/fertilizerBio.png rename to src/main/resources/assets/forestry/textures/items/fertilizer_bio.png diff --git a/src/main/resources/assets/forestry/textures/items/fertilizerCompound.png b/src/main/resources/assets/forestry/textures/items/fertilizer_compound.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/fertilizerCompound.png rename to src/main/resources/assets/forestry/textures/items/fertilizer_compound.png diff --git a/src/main/resources/assets/forestry/textures/items/frameImpregnated.png b/src/main/resources/assets/forestry/textures/items/frame_impregnated.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/frameImpregnated.png rename to src/main/resources/assets/forestry/textures/items/frame_impregnated.png diff --git a/src/main/resources/assets/forestry/textures/items/frameProven.png b/src/main/resources/assets/forestry/textures/items/frame_proven.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/frameProven.png rename to src/main/resources/assets/forestry/textures/items/frame_proven.png diff --git a/src/main/resources/assets/forestry/textures/items/frameUntreated.png b/src/main/resources/assets/forestry/textures/items/frame_untreated.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/frameUntreated.png rename to src/main/resources/assets/forestry/textures/items/frame_untreated.png diff --git a/src/main/resources/assets/forestry/textures/items/gearBronze.png b/src/main/resources/assets/forestry/textures/items/gear_bronze.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/gearBronze.png rename to src/main/resources/assets/forestry/textures/items/gear_bronze.png diff --git a/src/main/resources/assets/forestry/textures/items/gearCopper.png b/src/main/resources/assets/forestry/textures/items/gear_copper.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/gearCopper.png rename to src/main/resources/assets/forestry/textures/items/gear_copper.png diff --git a/src/main/resources/assets/forestry/textures/items/gearTin.png b/src/main/resources/assets/forestry/textures/items/gear_tin.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/gearTin.png rename to src/main/resources/assets/forestry/textures/items/gear_tin.png diff --git a/src/main/resources/assets/forestry/textures/items/grafterProven.png b/src/main/resources/assets/forestry/textures/items/grafter_proven.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/grafterProven.png rename to src/main/resources/assets/forestry/textures/items/grafter_proven.png diff --git a/src/main/resources/assets/forestry/textures/items/hardenedMachine.png b/src/main/resources/assets/forestry/textures/items/hardened_machine.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/hardenedMachine.png rename to src/main/resources/assets/forestry/textures/items/hardened_machine.png diff --git a/src/main/resources/assets/forestry/textures/items/honeyDrop.0.png b/src/main/resources/assets/forestry/textures/items/honey_drop.0.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/honeyDrop.0.png rename to src/main/resources/assets/forestry/textures/items/honey_drop.0.png diff --git a/src/main/resources/assets/forestry/textures/items/honeyDrop.1.png b/src/main/resources/assets/forestry/textures/items/honey_drop.1.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/honeyDrop.1.png rename to src/main/resources/assets/forestry/textures/items/honey_drop.1.png diff --git a/src/main/resources/assets/forestry/textures/items/honeyPot.png b/src/main/resources/assets/forestry/textures/items/honey_pot.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/honeyPot.png rename to src/main/resources/assets/forestry/textures/items/honey_pot.png diff --git a/src/main/resources/assets/forestry/textures/items/honeyedSlice.png b/src/main/resources/assets/forestry/textures/items/honeyed_slice.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/honeyedSlice.png rename to src/main/resources/assets/forestry/textures/items/honeyed_slice.png diff --git a/src/main/resources/assets/forestry/textures/items/iceShard.png b/src/main/resources/assets/forestry/textures/items/ice_shard.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/iceShard.png rename to src/main/resources/assets/forestry/textures/items/ice_shard.png diff --git a/src/main/resources/assets/forestry/textures/items/impregnatedCasing.png b/src/main/resources/assets/forestry/textures/items/impregnated_casing.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/impregnatedCasing.png rename to src/main/resources/assets/forestry/textures/items/impregnated_casing.png diff --git a/src/main/resources/assets/forestry/textures/items/ingotBronze.png b/src/main/resources/assets/forestry/textures/items/ingot_bronze.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/ingotBronze.png rename to src/main/resources/assets/forestry/textures/items/ingot_bronze.png diff --git a/src/main/resources/assets/forestry/textures/items/ingotCopper.png b/src/main/resources/assets/forestry/textures/items/ingot_copper.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/ingotCopper.png rename to src/main/resources/assets/forestry/textures/items/ingot_copper.png diff --git a/src/main/resources/assets/forestry/textures/items/ingotTin.png b/src/main/resources/assets/forestry/textures/items/ingot_tin.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/ingotTin.png rename to src/main/resources/assets/forestry/textures/items/ingot_tin.png diff --git a/src/main/resources/assets/forestry/textures/items/iodineCapsule.png b/src/main/resources/assets/forestry/textures/items/iodine_capsule.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/iodineCapsule.png rename to src/main/resources/assets/forestry/textures/items/iodine_capsule.png diff --git a/src/main/resources/assets/forestry/textures/items/kitPickaxe.png b/src/main/resources/assets/forestry/textures/items/kit_pickaxe.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/kitPickaxe.png rename to src/main/resources/assets/forestry/textures/items/kit_pickaxe.png diff --git a/src/main/resources/assets/forestry/textures/items/kitShovel.png b/src/main/resources/assets/forestry/textures/items/kit_shovel.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/kitShovel.png rename to src/main/resources/assets/forestry/textures/items/kit_shovel.png diff --git a/src/main/resources/assets/forestry/textures/items/mouldyWheat.png b/src/main/resources/assets/forestry/textures/items/mouldy_wheat.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/mouldyWheat.png rename to src/main/resources/assets/forestry/textures/items/mouldy_wheat.png diff --git a/src/main/resources/assets/forestry/textures/items/naturalistHelmet.png b/src/main/resources/assets/forestry/textures/items/naturalist_helmet.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/naturalistHelmet.png rename to src/main/resources/assets/forestry/textures/items/naturalist_helmet.png diff --git a/src/main/resources/assets/forestry/textures/items/oakStick.png b/src/main/resources/assets/forestry/textures/items/oak_stick.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/oakStick.png rename to src/main/resources/assets/forestry/textures/items/oak_stick.png diff --git a/src/main/resources/assets/forestry/textures/items/portableAlyzer.png b/src/main/resources/assets/forestry/textures/items/portable_alyzer.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/portableAlyzer.png rename to src/main/resources/assets/forestry/textures/items/portable_alyzer.png diff --git a/src/main/resources/assets/forestry/textures/items/pulsatingDust.png b/src/main/resources/assets/forestry/textures/items/pulsating_dust.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/pulsatingDust.png rename to src/main/resources/assets/forestry/textures/items/pulsating_dust.png diff --git a/src/main/resources/assets/forestry/textures/items/pulsatingMesh.png b/src/main/resources/assets/forestry/textures/items/pulsating_mesh.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/pulsatingMesh.png rename to src/main/resources/assets/forestry/textures/items/pulsating_mesh.png diff --git a/src/main/resources/assets/forestry/textures/items/refractoryWax.png b/src/main/resources/assets/forestry/textures/items/refractory_wax.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/refractoryWax.png rename to src/main/resources/assets/forestry/textures/items/refractory_wax.png diff --git a/src/main/resources/assets/forestry/textures/items/royalJelly.png b/src/main/resources/assets/forestry/textures/items/royal_jelly.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/royalJelly.png rename to src/main/resources/assets/forestry/textures/items/royal_jelly.png diff --git a/src/main/resources/assets/forestry/textures/items/scentedPaneling.png b/src/main/resources/assets/forestry/textures/items/scented_paneling.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/scentedPaneling.png rename to src/main/resources/assets/forestry/textures/items/scented_paneling.png diff --git a/src/main/resources/assets/forestry/textures/items/silkWisp.png b/src/main/resources/assets/forestry/textures/items/silk_wisp.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/silkWisp.png rename to src/main/resources/assets/forestry/textures/items/silk_wisp.png diff --git a/src/main/resources/assets/forestry/textures/items/solderingIron.png b/src/main/resources/assets/forestry/textures/items/soldering_iron.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/solderingIron.png rename to src/main/resources/assets/forestry/textures/items/soldering_iron.png diff --git a/src/main/resources/assets/forestry/textures/items/sturdyMachine.png b/src/main/resources/assets/forestry/textures/items/sturdy_machine.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/sturdyMachine.png rename to src/main/resources/assets/forestry/textures/items/sturdy_machine.png diff --git a/src/main/resources/assets/forestry/textures/items/thermionicTubes.0.png b/src/main/resources/assets/forestry/textures/items/thermionic_tubes.0.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/thermionicTubes.0.png rename to src/main/resources/assets/forestry/textures/items/thermionic_tubes.0.png diff --git a/src/main/resources/assets/forestry/textures/items/thermionicTubes.1.png b/src/main/resources/assets/forestry/textures/items/thermionic_tubes.1.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/thermionicTubes.1.png rename to src/main/resources/assets/forestry/textures/items/thermionic_tubes.1.png diff --git a/src/main/resources/assets/forestry/textures/items/vialCatalyst.png b/src/main/resources/assets/forestry/textures/items/vial_catalyst.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/vialCatalyst.png rename to src/main/resources/assets/forestry/textures/items/vial_catalyst.png diff --git a/src/main/resources/assets/forestry/textures/items/waxCast.png b/src/main/resources/assets/forestry/textures/items/wax_cast.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/waxCast.png rename to src/main/resources/assets/forestry/textures/items/wax_cast.png diff --git a/src/main/resources/assets/forestry/textures/items/woodPulp.png b/src/main/resources/assets/forestry/textures/items/wood_pulp.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/woodPulp.png rename to src/main/resources/assets/forestry/textures/items/wood_pulp.png diff --git a/src/main/resources/assets/forestry/textures/items/wovenSilk.png b/src/main/resources/assets/forestry/textures/items/woven_silk.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/wovenSilk.png rename to src/main/resources/assets/forestry/textures/items/woven_silk.png