diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index 62ef043d..1343a66f 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -28,8 +28,8 @@ import java.util.List; public class ItemInsulatedTube extends ItemCore implements IColoredItem { public ItemInsulatedTube() { - super("insulatedTube"); - setUnlocalizedName("insulatedTube"); + super("insulated_tube"); + setUnlocalizedName("insulated_tube"); setCreativeTab(CreativeTabBotany.instance); setHasSubtypes(true); } diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index a323f184..f48e8420 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -134,7 +134,13 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { if (modelName.isEmpty()) { modelName = "normal"; } - manager.registerItemModel(item, moisture.ordinal() + acidity.ordinal() * 3, type.getName() + (weedKilled ? "NoWeed" : "") + "/" + modelName); + final String identifier; + if (weedKilled) { + identifier = type.getName() + "_no_weed/" + modelName; + } else { + identifier = type.getName() + "/" + modelName; + } + manager.registerItemModel(item, moisture.ordinal() + acidity.ordinal() * 3, identifier); } } diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 8e817cf5..85f06598 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -27,9 +27,9 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { public ItemSoilMeter() { this.setCreativeTab(CreativeTabBotany.instance); - this.setUnlocalizedName("soilMeter"); + this.setUnlocalizedName("soil_meter"); this.setMaxStackSize(1); - setRegistryName("soilMeter"); + setRegistryName("soil_meter"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index 643bc3f6..a8d23f62 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -40,9 +40,9 @@ public class ItemTrowel extends Item implements IItemModelRegister { this.maxStackSize = 1; this.setMaxDamage(p_i45343_1_.getMaxUses()); this.setCreativeTab(CreativeTabBotany.instance); - this.setUnlocalizedName("trowel" + material); - this.locName = "trowel" + material; - setRegistryName("trowel" + material); + this.setUnlocalizedName("trowel_" + material); + this.locName = "trowel_" + material; + setRegistryName("trowel_" + material); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index ea488e51..685dfd61 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -57,25 +57,25 @@ public class ModuleGardening implements IInitializable { Botany.proxy.registerBlock(Botany.loam, new ItemSoil(Botany.loam)); Botany.flowerbed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbed", false); Botany.proxy.registerBlock(Botany.flowerbed, new ItemSoil(Botany.flowerbed)); - Botany.soilNoWeed = new BlockSoil(EnumSoilType.SOIL, "soilNoWeed", true); + Botany.soilNoWeed = new BlockSoil(EnumSoilType.SOIL, "soil_no_weed", true); Botany.proxy.registerBlock(Botany.soilNoWeed, new ItemSoil(Botany.soilNoWeed)); - Botany.loamNoWeed = new BlockSoil(EnumSoilType.LOAM, "loamNoWeed", true); + Botany.loamNoWeed = new BlockSoil(EnumSoilType.LOAM, "loam_no_weed", true); Botany.proxy.registerBlock(Botany.loamNoWeed, new ItemSoil(Botany.loamNoWeed)); - Botany.flowerbedNoWeed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbedNoWeed", true); + Botany.flowerbedNoWeed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbed_no_weed", true); Botany.proxy.registerBlock(Botany.flowerbedNoWeed, new ItemSoil(Botany.flowerbedNoWeed)); Botany.soilMeter = new ItemSoilMeter(); Botany.proxy.registerItem(Botany.soilMeter); Botany.insulatedTube = new ItemInsulatedTube(); Botany.proxy.registerItem(Botany.insulatedTube); - Botany.trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "Wood"); + Botany.trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "wood"); Botany.proxy.registerItem(Botany.trowelWood); - Botany.trowelStone = new ItemTrowel(Item.ToolMaterial.STONE, "Stone"); + Botany.trowelStone = new ItemTrowel(Item.ToolMaterial.STONE, "stone"); Botany.proxy.registerItem(Botany.trowelStone); - Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron"); + Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "iron"); Botany.proxy.registerItem(Botany.trowelIron); - Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.DIAMOND, "Diamond"); + Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.DIAMOND, "diamond"); Botany.proxy.registerItem(Botany.trowelDiamond); - Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold"); + Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "gold"); Botany.proxy.registerItem(Botany.trowelGold); Botany.misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values()); Botany.proxy.registerItem(Botany.misc); diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index e00fe28a..505f307a 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -25,8 +25,8 @@ import java.util.TreeSet; public class FlowerBreedingSystem extends BreedingSystem { public FlowerBreedingSystem() { - this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscoveredBee"); - this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discoveredBee"); + this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscovered_bee"); + this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discovered_bee"); } @Override diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index ce0fd166..421a5778 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -35,8 +35,8 @@ public class ItemDictionary extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { - manager.registerItemModel(item, 0, "botanistDatabase"); - manager.registerItemModel(item, 1, "masterBotanistDatabase"); + manager.registerItemModel(item, 0, "botanist_database"); + manager.registerItemModel(item, 1, "master_botanist_database"); } @Override diff --git a/src/main/java/binnie/botany/items/BotanyItems.java b/src/main/java/binnie/botany/items/BotanyItems.java index 080536ff..635c09a3 100644 --- a/src/main/java/binnie/botany/items/BotanyItems.java +++ b/src/main/java/binnie/botany/items/BotanyItems.java @@ -7,12 +7,12 @@ import net.minecraft.item.ItemStack; import java.util.List; public enum BotanyItems implements IItemMiscProvider { - AshPowder("Ash Powder", "powderAsh"), - PulpPowder("Wood Pulp Powder", "powderPulp"), - MulchPowder("Mulch Powder", "powderMulch"), - SulphurPowder("Sulphur Powder", "powderSulphur"), - FertiliserPowder("Fertiliser Powder", "powderFertiliser"), - CompostPowder("Compost Powder", "powderCompost"), + AshPowder("Ash Powder", "powder_ash"), + PulpPowder("Wood Pulp Powder", "powder_pulp"), + MulchPowder("Mulch Powder", "powder_mulch"), + SulphurPowder("Sulphur Powder", "powder_sulphur"), + FertiliserPowder("Fertiliser Powder", "powder_fertiliser"), + CompostPowder("Compost Powder", "powder_compost"), Mortar("Mortar", "mortar"), Weedkiller("Weedkiller", "weedkiller"); diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index aa4e0ad5..f8c40e02 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -24,8 +24,8 @@ import java.util.TreeSet; class BeeBreedingSystem extends BreedingSystem { public BeeBreedingSystem() { - this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscoveredBee"); - this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discoveredBee"); + this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscovered_bee"); + this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discovered_bee"); } @Override diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index 9fa14f9f..5c06a3de 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -21,8 +21,8 @@ import java.util.TreeSet; class MothBreedingSystem extends BreedingSystem { public MothBreedingSystem() { - this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscoveredMoth"); - this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discoveredMoth"); + this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscovered_moth"); + this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discovered_moth"); } @Override diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 97aedb1c..67f39649 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -51,8 +51,8 @@ public class TreeBreedingSystem extends BreedingSystem { this.discoveredFruits = new UniqueItemStackSet(); this.discoveredWoods = new UniqueItemStackSet(); this.discoveredPlanks = new UniqueItemStackSet(); - this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscoveredTree"); - this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discoveredTree"); + this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscovered_tree"); + this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discovered_tree"); } @Override diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/core/item/ItemFieldKit.java index ff107efb..c122aefe 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/core/item/ItemFieldKit.java @@ -27,8 +27,8 @@ public class ItemFieldKit extends ItemCore { private ModelResourceLocation fieldKit3; public ItemFieldKit() { - super("fieldKit"); - this.setUnlocalizedName("fieldKit"); + super("field_kit"); + this.setUnlocalizedName("field_kit"); this.setCreativeTab(CreativeTabs.TOOLS); this.setMaxStackSize(1); this.setMaxDamage(64); @@ -38,10 +38,10 @@ public class ItemFieldKit extends ItemCore { @Override public void registerModel(Item item, IModelManager manager) { manager.registerItemModel(item, new FieldKitMeshDefinition()); - fieldKit = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit", "inventory"); - fieldKit1 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit1", "inventory"); - fieldKit2 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit2", "inventory"); - fieldKit3 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit3", "inventory"); + fieldKit = new ModelResourceLocation(Constants.CORE_MOD_ID + ":field_kit", "inventory"); + fieldKit1 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":field_kit1", "inventory"); + fieldKit2 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":field_kit2", "inventory"); + fieldKit3 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":field_kit3", "inventory"); ModelBakery.registerItemVariants(item, fieldKit, fieldKit1, fieldKit2, fieldKit3); } diff --git a/src/main/java/binnie/core/machines/storage/StandardCompartment.java b/src/main/java/binnie/core/machines/storage/StandardCompartment.java index bbb3f558..166e9410 100644 --- a/src/main/java/binnie/core/machines/storage/StandardCompartment.java +++ b/src/main/java/binnie/core/machines/storage/StandardCompartment.java @@ -30,7 +30,7 @@ class StandardCompartment { public static class PackageCompartmentCopper extends Compartment.PackageCompartment { public PackageCompartmentCopper() { - super("compartmentCopper", BinnieCoreTexture.CompartmentCopper); + super("compartment_copper", BinnieCoreTexture.CompartmentCopper); } @Override @@ -51,7 +51,7 @@ class StandardCompartment { public static class PackageCompartmentBronze extends Compartment.PackageCompartment { public PackageCompartmentBronze() { - super("compartmentBronze", BinnieCoreTexture.CompartmentBronze); + super("compartment_bronze", BinnieCoreTexture.CompartmentBronze); } @Override @@ -72,7 +72,7 @@ class StandardCompartment { public static class PackageCompartmentIron extends Compartment.PackageCompartment { public PackageCompartmentIron() { - super("compartmentIron", BinnieCoreTexture.CompartmentIron); + super("compartment_iron", BinnieCoreTexture.CompartmentIron); } @Override @@ -93,7 +93,7 @@ class StandardCompartment { public static class PackageCompartmentGold extends Compartment.PackageCompartment { public PackageCompartmentGold() { - super("compartmentGold", BinnieCoreTexture.CompartmentGold); + super("compartment_gold", BinnieCoreTexture.CompartmentGold); } @Override @@ -114,7 +114,7 @@ class StandardCompartment { public static class PackageCompartmentDiamond extends Compartment.PackageCompartment { public PackageCompartmentDiamond() { - super("compartmentDiamond", BinnieCoreTexture.CompartmentDiamond); + super("compartment_diamond", BinnieCoreTexture.CompartmentDiamond); } @Override diff --git a/src/main/java/binnie/core/texture/BinnieCoreTexture.java b/src/main/java/binnie/core/texture/BinnieCoreTexture.java index fd22705d..a944964f 100644 --- a/src/main/java/binnie/core/texture/BinnieCoreTexture.java +++ b/src/main/java/binnie/core/texture/BinnieCoreTexture.java @@ -11,12 +11,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; public enum BinnieCoreTexture implements IBinnieTexture { - Compartment(ResourceType.Tile, "Compartment"), - CompartmentIron(ResourceType.Tile, "CompartmentIron"), - CompartmentDiamond(ResourceType.Tile, "CompartmentDiamond"), - CompartmentCopper(ResourceType.Tile, "CompartmentCopper"), - CompartmentGold(ResourceType.Tile, "CompartmentGold"), - CompartmentBronze(ResourceType.Tile, "CompartmentBronze"), + Compartment(ResourceType.Tile, "compartment"), + CompartmentIron(ResourceType.Tile, "compartment_iron"), + CompartmentDiamond(ResourceType.Tile, "compartment_diamond"), + CompartmentCopper(ResourceType.Tile, "compartment_copper"), + CompartmentGold(ResourceType.Tile, "compartment_gold"), + CompartmentBronze(ResourceType.Tile, "compartment_bronze"), GUIBreeding(ResourceType.GUI, "breeding"), GUIAnalyst(ResourceType.GUI, "guianalyst"); diff --git a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java index 26392593..6ca2dc5c 100644 --- a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java @@ -55,7 +55,7 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { EnumHiveFrame(int maxDamage) { this.maxDamage = maxDamage; this.logic = new BeeModifierLogic(); - this.item = new ItemHiveFrame(this).setRegistryName("hiveFrame." + name().toLowerCase()); + this.item = new ItemHiveFrame(this).setRegistryName("hive_frame." + name().toLowerCase()); } public int getIconIndex() { diff --git a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java index 67b95332..455f1d91 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java @@ -28,7 +28,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt this.setMaxDamage(frame.getMaxDamage()); this.setCreativeTab(Tabs.tabApiculture); this.setMaxStackSize(1); - this.setUnlocalizedName("hiveFrame"); + this.setUnlocalizedName("hive_frame"); } @Override diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java index 9118ebaa..6792631b 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java @@ -16,36 +16,36 @@ import javax.annotation.Nullable; import java.util.List; public enum ExtraBeeItems implements IItemMiscProvider { - ScentedGear("Scented Gear", "scentedGear"), - DiamondShard("Diamond Fragment", "diamondShard"), - EmeraldShard("Emerald Fragment", "emeraldShard"), - RubyShard("Ruby Fragment", "rubyShard"), - SapphireShard("Sapphire Fragment", "sapphireShard"), - LapisShard("Lapis Fragment", "lapisShard"), - IronDust("Iron Grains", "ironDust"), - GoldDust("Gold Grains", "goldDust"), - SilverDust("Silver Grains", "silverDust"), - PlatinumDust("Platinum Grains", "platinumDust"), - CopperDust("Copper Grains", "copperDust"), - TinDust("Tin Grains", "tinDust"), - NickelDust("Nickel Grains", "nickelDust"), - LeadDust("Lead Grains", "leadDust"), - ZincDust("Zinc Grains", "zincDust"), - TitaniumDust("Titanium Grains", "titaniumDust"), - TungstenDust("Tungsten Grains", "tungstenDust"), - UraniumDust("Radioactive Fragments", "radioactiveDust"), - CoalDust("Coal Grains", "coalDust"), - RedDye("Red Dye", "dyeRed"), - YellowDye("Yellow Dye", "dyeYellow"), - BlueDye("Blue Dye", "dyeBlue"), - GreenDye("Green Dye", "dyeGreen"), - WhiteDye("White Dye", "dyeWhite"), - BlackDye("Black Dye", "dyeBlack"), - BrownDye("Brown Dye", "dyeBrown"), - ClayDust("Clay Dust", "clayDust"), - YelloriumDust("Yellorium Grains", "yelloriumDust"), - BlutoniumDust("Blutonium Grains", "blutoniumDust"), - CyaniteDust("Cyanite Grains", "cyaniteDust"); + ScentedGear("Scented Gear", "scented_gear"), + DiamondShard("Diamond Fragment", "diamond_shard"), + EmeraldShard("Emerald Fragment", "emerald_shard"), + RubyShard("Ruby Fragment", "ruby_shard"), + SapphireShard("Sapphire Fragment", "sapphire_shard"), + LapisShard("Lapis Fragment", "lapis_shard"), + IronDust("Iron Grains", "iron_dust"), + GoldDust("Gold Grains", "gold_dust"), + SilverDust("Silver Grains", "silver_dust"), + PlatinumDust("Platinum Grains", "platinum_dust"), + CopperDust("Copper Grains", "copper_dust"), + TinDust("Tin Grains", "tin_dust"), + NickelDust("Nickel Grains", "nickel_dust"), + LeadDust("Lead Grains", "lead_dust"), + ZincDust("Zinc Grains", "zinc_dust"), + TitaniumDust("Titanium Grains", "titanium_dust"), + TungstenDust("Tungsten Grains", "tungsten_dust"), + UraniumDust("Radioactive Fragments", "radioactive_dust"), + CoalDust("Coal Grains", "coal_dust"), + RedDye("Red Dye", "dye_red"), + YellowDye("Yellow Dye", "dye_yellow"), + BlueDye("Blue Dye", "dye_blue"), + GreenDye("Green Dye", "dye_green"), + WhiteDye("White Dye", "dye_white"), + BlackDye("Black Dye", "dye_black"), + BrownDye("Brown Dye", "dye_brown"), + ClayDust("Clay Dust", "clay_dust"), + YelloriumDust("Yellorium Grains", "yellorium_dust"), + BlutoniumDust("Blutonium Grains", "blutonium_dust"), + CyaniteDust("Cyanite Grains", "cyanite_dust"); String name; String modelPath; diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index a13d6b64..04ea3397 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -67,6 +67,6 @@ public class ItemDictionary extends Item implements IItemModelRegister { @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { manager.registerItemModel(item, 0, getRegistryName().getResourcePath()); - manager.registerItemModel(item, 1, getRegistryName().getResourcePath() + "Master"); + manager.registerItemModel(item, 1, getRegistryName().getResourcePath() + "_master"); } } diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index 4c6d1d39..0f09689c 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -19,8 +19,8 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { public ItemHoneyComb() { super(EnumHoneyComb.values()); this.setCreativeTab(Tabs.tabApiculture); - this.setUnlocalizedName("honeyComb"); - setRegistryName("honeyComb"); + this.setUnlocalizedName("honey_comb"); + setRegistryName("honey_comb"); } public static void addSubtypes() { diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java b/src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java index ba951b12..d607c1b3 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java @@ -24,7 +24,7 @@ public class ItemHoneyCrystal extends Item { this.setMaxDamage(27); this.setMaxStackSize(1); this.setCreativeTab(Tabs.tabApiculture); - this.setUnlocalizedName("honeyCrystal"); + this.setUnlocalizedName("honey_crystal"); setRegistryName(name); ExtraBees.proxy.registermodel(this, 0); } diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java b/src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java index c91f897d..ec4563e6 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java @@ -8,7 +8,7 @@ public class ItemHoneyCrystalEmpty extends ItemHoneyCrystal { super(name); this.setMaxDamage(0); this.setMaxStackSize(64); - this.setUnlocalizedName("honeyCrystalEmpty"); + this.setUnlocalizedName("honey_crystal_empty"); } // @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java index 63742aaf..42796f4b 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java @@ -10,8 +10,8 @@ public class ItemHoneyDrop extends ItemProduct implements IColoredItem { public ItemHoneyDrop() { super(EnumHoneyDrop.values()); this.setCreativeTab(Tabs.tabApiculture); - this.setUnlocalizedName("honeyDrop"); - setRegistryName("honeyDrop"); + this.setUnlocalizedName("honey_drop"); + setRegistryName("honey_drop"); } diff --git a/src/main/java/binnie/extrabees/products/ModuleProducts.java b/src/main/java/binnie/extrabees/products/ModuleProducts.java index 6e667037..6668131a 100644 --- a/src/main/java/binnie/extrabees/products/ModuleProducts.java +++ b/src/main/java/binnie/extrabees/products/ModuleProducts.java @@ -11,8 +11,8 @@ import net.minecraftforge.oredict.OreDictionary; public class ModuleProducts implements IInitializable { @Override public void preInit() { - ExtraBees.honeyCrystal = new ItemHoneyCrystal("honeyCrystal"); - ExtraBees.honeyCrystalEmpty = new ItemHoneyCrystalEmpty("honeyCrystalEmpty"); + ExtraBees.honeyCrystal = new ItemHoneyCrystal("honey_crystal"); + ExtraBees.honeyCrystalEmpty = new ItemHoneyCrystalEmpty("honey_crystal_empty"); ExtraBees.honeyDrop = new ItemHoneyDrop(); ExtraBees.comb = new ItemHoneyComb(); ExtraBees.propolis = new ItemPropolis(); diff --git a/src/main/java/binnie/extratrees/block/EnumETLog.java b/src/main/java/binnie/extratrees/block/EnumETLog.java index 01a0bf89..6a7211d6 100644 --- a/src/main/java/binnie/extratrees/block/EnumETLog.java +++ b/src/main/java/binnie/extratrees/block/EnumETLog.java @@ -1,7 +1,5 @@ package binnie.extratrees.block; -import javax.annotation.Nonnull; - import binnie.Constants; import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; @@ -9,6 +7,8 @@ import forestry.api.arboriculture.WoodBlockKind; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; +import java.util.Locale; + public enum EnumETLog implements IWoodType { Apple("Apple", PlankType.ExtraTreePlanks.Apple), Fig("Fig", PlankType.ExtraTreePlanks.Fig), @@ -76,7 +76,6 @@ public enum EnumETLog implements IWoodType { return this.name; } - public void addRecipe() { if (this.plank == null) { return; @@ -116,7 +115,8 @@ public enum EnumETLog implements IWoodType { @Override public String getHeartTexture() { - return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + name().toLowerCase() + "Trunk"; + String name = name().toLowerCase(Locale.ENGLISH).replace(" ", "_"); + return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + name + "_trunk"; } @Override @@ -131,7 +131,8 @@ public enum EnumETLog implements IWoodType { @Override public String getBarkTexture() { - return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + name().toLowerCase() + "Bark"; + String name = name().toLowerCase(Locale.ENGLISH).replace(" ", "_"); + return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + name + "_bark"; } @Override diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 9c612c68..895c528b 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -244,7 +244,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { if (itemstack.getItem() == Mods.Forestry.item("honeydew")) { return 0.7f; } - if (itemstack.getItem() == Mods.Forestry.item("bee_comb")) { + if (itemstack.getItem() == Mods.Forestry.item("bee_combs")) { return 0.4f; } if (AlleleManager.alleleRegistry.isIndividual(itemstack)) { diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index 908ac20c..541bdac2 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -7,20 +7,20 @@ import net.minecraft.item.ItemStack; import java.util.List; public enum ExtraTreeItems implements IItemMiscProvider { - CarpentryHammer("Fake Hammer", "carpentryHammer"), + CarpentryHammer("Fake Hammer", "carpentry_hammer"), Sawdust("Sawdust", "sawdust"), Bark("Bark", "bark"), - ProvenGear("Proven Gear", "provenGear"), - WoodWax("Wood Polish", "woodWax"), + ProvenGear("Proven Gear", "proven_gear"), + WoodWax("Wood Polish", "wood_wax"), Hops("Hops", "hops"), Yeast("Yeast", "yeast"), - LagerYeast("Lager Yeast", "yeastLager"), - GrainWheat("Wheat Grain", "grainWheat"), - GrainBarley("Barley Grain", "grainBarley"), - GrainRye("Rye Grain", "grainRye"), - GrainCorn("Corn Grain", "grainCorn"), - GrainRoasted("Roasted Grain", "grainRoasted"), - GlassFitting("Glass Fittings", "glassFitting"); + LagerYeast("Lager Yeast", "yeast_lager"), + GrainWheat("Wheat Grain", "grain_wheat"), + GrainBarley("Barley Grain", "grain_barley"), + GrainRye("Rye Grain", "grain_rye"), + GrainCorn("Corn Grain", "grain_corn"), + GrainRoasted("Roasted Grain", "grain_roasted"), + GlassFitting("Glass Fittings", "glass_fitting"); String name; String modelPath; diff --git a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java index 45e2051b..390b9641 100644 --- a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java @@ -48,8 +48,8 @@ public class ItemArboristDatabase extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { - manager.registerItemModel(item, 0, "arboristDatabase"); - manager.registerItemModel(item, 1, "masterArboristDatabase"); + manager.registerItemModel(item, 0, "arborist_database"); + manager.registerItemModel(item, 1, "master_arborist_database"); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index dde7735d..a1c35e15 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -17,16 +17,16 @@ public class ItemHammer extends Item implements IToolHammer, IItemModelRegister this.isDurableHammer = false; this.isDurableHammer = durable; this.setCreativeTab(CreativeTabs.TOOLS); - this.setUnlocalizedName(durable ? "durableHammer" : "hammer"); + this.setUnlocalizedName(durable ? "durable_hammer" : "hammer"); this.setMaxStackSize(1); this.setMaxDamage(durable ? 1562 : 251); - setRegistryName(durable ? "durableHammer" : "hammer"); + setRegistryName(durable ? "durable_hammer" : "hammer"); } @Override @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { - manager.registerItemModel(item, 0, isDurableHammer ? "durableHammer" : "carpentryHammer"); + manager.registerItemModel(item, 0, isDurableHammer ? "durable_hammer" : "carpentry_hammer"); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 5a8cba87..8ea2ad16 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -32,8 +32,8 @@ public class ItemMothDatabase extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { - manager.registerItemModel(item, 0, "lepiDatabase"); - manager.registerItemModel(item, 1, "masterLepiDatabase"); + manager.registerItemModel(item, 0, "lepi_database"); + manager.registerItemModel(item, 1, "master_lepi_database"); } @Override diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 0d629cb2..226fbe6c 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -140,7 +140,7 @@ public class ModuleItems implements IInitializable { GameRegistry.addSmelting(ExtraTreeItems.GrainCorn.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); GameRegistry.addSmelting(ExtraTreeItems.GrainBarley.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); try { - final Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("miniumShard").get(null); + final Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("minium_shard").get(null); CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(Food.PAPAYIMAR.get(1), minium, "cropPapaya")); } catch (Exception ex) { } diff --git a/src/main/java/binnie/genetics/core/GeneticsTexture.java b/src/main/java/binnie/genetics/core/GeneticsTexture.java index d0aa97ba..66954e1f 100644 --- a/src/main/java/binnie/genetics/core/GeneticsTexture.java +++ b/src/main/java/binnie/genetics/core/GeneticsTexture.java @@ -13,20 +13,20 @@ import javax.annotation.Nullable; public enum GeneticsTexture implements IBinnieTexture { GeneticMachine(ResourceType.Tile, "GeneticMachine"), - Genepool(ResourceType.Tile, "Genepool"), - Incubator(ResourceType.Tile, "Incubator"), + Genepool(ResourceType.Tile, "genepool"), + Incubator(ResourceType.Tile, "incubator"), GUIProcess(ResourceType.GUI, "process"), GUIProcess2(ResourceType.GUI, "process2"), - Isolator(ResourceType.Tile, "Isolator"), - Sequencer(ResourceType.Tile, "Sequencer"), - Polymeriser(ResourceType.Tile, "Polymeriser"), - Inoculator(ResourceType.Tile, "Inoculator"), - Analyser(ResourceType.Tile, "Analyser"), + Isolator(ResourceType.Tile, "isolator"), + Sequencer(ResourceType.Tile, "sequencer"), + Polymeriser(ResourceType.Tile, "polymeriser"), + Inoculator(ResourceType.Tile, "inoculator"), + Analyser(ResourceType.Tile, "analyser"), MachineGlow(ResourceType.Tile, "MachineGlow"), GeneBank(ResourceType.Tile, "GeneBank"), - LabMachine(ResourceType.Tile, "LabMachine"), - Acclimatiser(ResourceType.Tile, "Acclimatiser"), - Splicer(ResourceType.Tile, "Splicer"); + LabMachine(ResourceType.Tile, "lab_machine"), + Acclimatiser(ResourceType.Tile, "acclimatiser"), + Splicer(ResourceType.Tile, "splicer"); private final String texture; private final ResourceType type; diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java index cf78f8e2..b7e61223 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java @@ -26,7 +26,7 @@ public class GenepoolRecipeCategory extends BlankRecipeCategory binniecore.gui.designer.pattern=%1$s Pattern diff --git a/src/main/resources/assets/binniecore/lang/en_US.lang b/src/main/resources/assets/binniecore/lang/en_US.lang index 1a4590fd..3979885a 100644 --- a/src/main/resources/assets/binniecore/lang/en_US.lang +++ b/src/main/resources/assets/binniecore/lang/en_US.lang @@ -198,11 +198,11 @@ binniecore.item.container.glass=Bottle binniecore.item.container.cylinder=Cylinder binniecore.machine.storage.compartment=Compartment -binniecore.machine.storage.compartmentIron=Iron Compartment -binniecore.machine.storage.compartmentDiamond=Diamond Compartment -binniecore.machine.storage.compartmentCopper=Copper Compartment -binniecore.machine.storage.compartmentBronze=Bronze Compartment -binniecore.machine.storage.compartmentGold=Gold Compartment +binniecore.machine.storage.compartment_iron=Iron Compartment +binniecore.machine.storage.compartment_diamond=Diamond Compartment +binniecore.machine.storage.compartment_copper=Copper Compartment +binniecore.machine.storage.compartment_bronze=Bronze Compartment +binniecore.machine.storage.compartment_gold=Gold Compartment binniecore.machine.tooltips.processing=Processing diff --git a/src/main/resources/assets/binniecore/models/block/storage.json b/src/main/resources/assets/binniecore/models/block/storage.json index 95c2bf68..34a8fd68 100644 --- a/src/main/resources/assets/binniecore/models/block/storage.json +++ b/src/main/resources/assets/binniecore/models/block/storage.json @@ -156,7 +156,7 @@ } ], "textures": { - "all": "binniecore:tile/Compartment", - "particle": "binniecore:tile/Compartment" + "all": "binniecore:tile/compartment", + "particle": "binniecore:tile/compartment" } } \ No newline at end of file diff --git a/src/main/resources/assets/binniecore/models/item/cylinder_empty.json b/src/main/resources/assets/binniecore/models/item/cylinder_empty.json index 17237917..ebf93f64 100644 --- a/src/main/resources/assets/binniecore/models/item/cylinder_empty.json +++ b/src/main/resources/assets/binniecore/models/item/cylinder_empty.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "genetics:items/cylinderEmpty" + "layer0": "genetics:items/cylinder_empty" } } diff --git a/src/main/resources/assets/binniecore/models/item/fieldKit1.json b/src/main/resources/assets/binniecore/models/item/field_kit.json similarity index 56% rename from src/main/resources/assets/binniecore/models/item/fieldKit1.json rename to src/main/resources/assets/binniecore/models/item/field_kit.json index b27b7ea9..084f5570 100644 --- a/src/main/resources/assets/binniecore/models/item/fieldKit1.json +++ b/src/main/resources/assets/binniecore/models/item/field_kit.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "binniecore:items/fieldKit1" + "layer0": "binniecore:items/field_kit" } } diff --git a/src/main/resources/assets/binniecore/models/item/field_kit1.json b/src/main/resources/assets/binniecore/models/item/field_kit1.json new file mode 100644 index 00000000..ace1c28a --- /dev/null +++ b/src/main/resources/assets/binniecore/models/item/field_kit1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "binniecore:items/field_kit1" + } +} diff --git a/src/main/resources/assets/binniecore/models/item/field_kit2.json b/src/main/resources/assets/binniecore/models/item/field_kit2.json new file mode 100644 index 00000000..adfc27df --- /dev/null +++ b/src/main/resources/assets/binniecore/models/item/field_kit2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "binniecore:items/field_kit2" + } +} diff --git a/src/main/resources/assets/binniecore/models/item/field_kit3.json b/src/main/resources/assets/binniecore/models/item/field_kit3.json new file mode 100644 index 00000000..4519f0da --- /dev/null +++ b/src/main/resources/assets/binniecore/models/item/field_kit3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "binniecore:items/field_kit3" + } +} diff --git a/src/main/resources/assets/binniecore/textures/items/actions/CancelTask.png b/src/main/resources/assets/binniecore/textures/items/actions/cancel_task.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/actions/CancelTask.png rename to src/main/resources/assets/binniecore/textures/items/actions/cancel_task.png diff --git a/src/main/resources/assets/binniecore/textures/items/actions/PauseProcess.png b/src/main/resources/assets/binniecore/textures/items/actions/pause_process.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/actions/PauseProcess.png rename to src/main/resources/assets/binniecore/textures/items/actions/pause_process.png diff --git a/src/main/resources/assets/binniecore/textures/items/fieldKit.png b/src/main/resources/assets/binniecore/textures/items/field_kit.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/fieldKit.png rename to src/main/resources/assets/binniecore/textures/items/field_kit.png diff --git a/src/main/resources/assets/binniecore/textures/items/fieldKit1.png b/src/main/resources/assets/binniecore/textures/items/field_kit1.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/fieldKit1.png rename to src/main/resources/assets/binniecore/textures/items/field_kit1.png diff --git a/src/main/resources/assets/binniecore/textures/items/fieldKit2.png b/src/main/resources/assets/binniecore/textures/items/field_kit2.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/fieldKit2.png rename to src/main/resources/assets/binniecore/textures/items/field_kit2.png diff --git a/src/main/resources/assets/binniecore/textures/items/fieldKit3.png b/src/main/resources/assets/binniecore/textures/items/field_kit3.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/fieldKit3.png rename to src/main/resources/assets/binniecore/textures/items/field_kit3.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/CanWork.png b/src/main/resources/assets/binniecore/textures/items/triggers/can_work.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/CanWork.png rename to src/main/resources/assets/binniecore/textures/items/triggers/can_work.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/CannotWork.png b/src/main/resources/assets/binniecore/textures/items/triggers/cannot_work.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/CannotWork.png rename to src/main/resources/assets/binniecore/textures/items/triggers/cannot_work.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/IsNotWorking.png b/src/main/resources/assets/binniecore/textures/items/triggers/is_not_working.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/IsNotWorking.png rename to src/main/resources/assets/binniecore/textures/items/triggers/is_not_working.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/IsWorking.png b/src/main/resources/assets/binniecore/textures/items/triggers/is_working.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/IsWorking.png rename to src/main/resources/assets/binniecore/textures/items/triggers/is_working.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/PowerFull.png b/src/main/resources/assets/binniecore/textures/items/triggers/power_full.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/PowerFull.png rename to src/main/resources/assets/binniecore/textures/items/triggers/power_full.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/PowerHigh.png b/src/main/resources/assets/binniecore/textures/items/triggers/power_high.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/PowerHigh.png rename to src/main/resources/assets/binniecore/textures/items/triggers/power_high.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/PowerLow.png b/src/main/resources/assets/binniecore/textures/items/triggers/power_low.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/PowerLow.png rename to src/main/resources/assets/binniecore/textures/items/triggers/power_low.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/PowerMedium.png b/src/main/resources/assets/binniecore/textures/items/triggers/power_medium.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/PowerMedium.png rename to src/main/resources/assets/binniecore/textures/items/triggers/power_medium.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/PowerNone.png b/src/main/resources/assets/binniecore/textures/items/triggers/power_none.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/PowerNone.png rename to src/main/resources/assets/binniecore/textures/items/triggers/power_none.png diff --git a/src/main/resources/assets/binniecore/textures/tile/CompartmentBronze.png b/src/main/resources/assets/binniecore/textures/tile/compartment_bronze.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/CompartmentBronze.png rename to src/main/resources/assets/binniecore/textures/tile/compartment_bronze.png diff --git a/src/main/resources/assets/binniecore/textures/tile/CompartmentCopper.png b/src/main/resources/assets/binniecore/textures/tile/compartment_copper.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/CompartmentCopper.png rename to src/main/resources/assets/binniecore/textures/tile/compartment_copper.png diff --git a/src/main/resources/assets/binniecore/textures/tile/CompartmentDiamond.png b/src/main/resources/assets/binniecore/textures/tile/compartment_diamond.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/CompartmentDiamond.png rename to src/main/resources/assets/binniecore/textures/tile/compartment_diamond.png diff --git a/src/main/resources/assets/binniecore/textures/tile/CompartmentGold.png b/src/main/resources/assets/binniecore/textures/tile/compartment_gold.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/CompartmentGold.png rename to src/main/resources/assets/binniecore/textures/tile/compartment_gold.png diff --git a/src/main/resources/assets/binniecore/textures/tile/CompartmentIron.png b/src/main/resources/assets/binniecore/textures/tile/compartment_iron.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/CompartmentIron.png rename to src/main/resources/assets/binniecore/textures/tile/compartment_iron.png diff --git a/src/main/resources/assets/botany/blockstates/flowerbedNoWeed.json b/src/main/resources/assets/botany/blockstates/flowerbed_no_weed.json similarity index 59% rename from src/main/resources/assets/botany/blockstates/flowerbedNoWeed.json rename to src/main/resources/assets/botany/blockstates/flowerbed_no_weed.json index b89a1e1c..d48eccad 100644 --- a/src/main/resources/assets/botany/blockstates/flowerbedNoWeed.json +++ b/src/main/resources/assets/botany/blockstates/flowerbed_no_weed.json @@ -1,13 +1,13 @@ { "variants": { - "acidity=acid,moisture=damp": { "model": "botany:flowerbedNoWeed/acid_damp" }, - "acidity=acid,moisture=dry": { "model": "botany:flowerbedNoWeed/acid_dry" }, - "acidity=acid,moisture=normal": { "model": "botany:flowerbedNoWeed/acid" }, - "acidity=alkaline,moisture=damp": { "model": "botany:flowerbedNoWeed/alkaline_damp" }, - "acidity=alkaline,moisture=dry": { "model": "botany:flowerbedNoWeed/alkaline_dry" }, - "acidity=alkaline,moisture=normal": { "model": "botany:flowerbedNoWeed/alkaline" }, - "acidity=neutral,moisture=damp": { "model": "botany:flowerbedNoWeed/damp" }, - "acidity=neutral,moisture=dry": { "model": "botany:flowerbedNoWeed/dry" }, - "acidity=neutral,moisture=normal": { "model": "botany:flowerbedNoWeed/normal" } + "acidity=acid,moisture=damp": { "model": "botany:flowerbed_no_weed/acid_damp" }, + "acidity=acid,moisture=dry": { "model": "botany:flowerbed_no_weed/acid_dry" }, + "acidity=acid,moisture=normal": { "model": "botany:flowerbed_no_weed/acid" }, + "acidity=alkaline,moisture=damp": { "model": "botany:flowerbed_no_weed/alkaline_damp" }, + "acidity=alkaline,moisture=dry": { "model": "botany:flowerbed_no_weed/alkaline_dry" }, + "acidity=alkaline,moisture=normal": { "model": "botany:flowerbed_no_weed/alkaline" }, + "acidity=neutral,moisture=damp": { "model": "botany:flowerbed_no_weed/damp" }, + "acidity=neutral,moisture=dry": { "model": "botany:flowerbed_no_weed/dry" }, + "acidity=neutral,moisture=normal": { "model": "botany:flowerbed_no_weed/normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/loamNoWeed.json b/src/main/resources/assets/botany/blockstates/loamNoWeed.json deleted file mode 100644 index 582759ca..00000000 --- a/src/main/resources/assets/botany/blockstates/loamNoWeed.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "acidity=acid,moisture=damp": { "model": "botany:loamNoWeed/acid_damp" }, - "acidity=acid,moisture=dry": { "model": "botany:loamNoWeed/acid_dry" }, - "acidity=acid,moisture=normal": { "model": "botany:loamNoWeed/acid" }, - "acidity=alkaline,moisture=damp": { "model": "botany:loamNoWeed/alkaline_damp" }, - "acidity=alkaline,moisture=dry": { "model": "botany:loamNoWeed/alkaline_dry" }, - "acidity=alkaline,moisture=normal": { "model": "botany:loamNoWeed/alkaline" }, - "acidity=neutral,moisture=damp": { "model": "botany:loamNoWeed/damp" }, - "acidity=neutral,moisture=dry": { "model": "botany:loamNoWeed/dry" }, - "acidity=neutral,moisture=normal": { "model": "botany:loamNoWeed/normal" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/loam_no_weed.json b/src/main/resources/assets/botany/blockstates/loam_no_weed.json new file mode 100644 index 00000000..c4e316b1 --- /dev/null +++ b/src/main/resources/assets/botany/blockstates/loam_no_weed.json @@ -0,0 +1,13 @@ +{ + "variants": { + "acidity=acid,moisture=damp": { "model": "botany:loam_no_weed/acid_damp" }, + "acidity=acid,moisture=dry": { "model": "botany:loam_no_weed/acid_dry" }, + "acidity=acid,moisture=normal": { "model": "botany:loam_no_weed/acid" }, + "acidity=alkaline,moisture=damp": { "model": "botany:loam_no_weed/alkaline_damp" }, + "acidity=alkaline,moisture=dry": { "model": "botany:loam_no_weed/alkaline_dry" }, + "acidity=alkaline,moisture=normal": { "model": "botany:loam_no_weed/alkaline" }, + "acidity=neutral,moisture=damp": { "model": "botany:loam_no_weed/damp" }, + "acidity=neutral,moisture=dry": { "model": "botany:loam_no_weed/dry" }, + "acidity=neutral,moisture=normal": { "model": "botany:loam_no_weed/normal" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/soilNoWeed.json b/src/main/resources/assets/botany/blockstates/soilNoWeed.json deleted file mode 100644 index a72068ba..00000000 --- a/src/main/resources/assets/botany/blockstates/soilNoWeed.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "acidity=acid,moisture=damp": { "model": "botany:soilNoWeed/acid_damp" }, - "acidity=acid,moisture=dry": { "model": "botany:soilNoWeed/acid_dry" }, - "acidity=acid,moisture=normal": { "model": "botany:soilNoWeed/acid" }, - "acidity=alkaline,moisture=damp": { "model": "botany:soilNoWeed/alkaline_damp" }, - "acidity=alkaline,moisture=dry": { "model": "botany:soilNoWeed/alkaline_dry" }, - "acidity=alkaline,moisture=normal": { "model": "botany:soilNoWeed/alkaline" }, - "acidity=neutral,moisture=damp": { "model": "botany:soilNoWeed/damp" }, - "acidity=neutral,moisture=dry": { "model": "botany:soilNoWeed/dry" }, - "acidity=neutral,moisture=normal": { "model": "botany:soilNoWeed/normal" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/soil_no_weed.json b/src/main/resources/assets/botany/blockstates/soil_no_weed.json new file mode 100644 index 00000000..4bd31b21 --- /dev/null +++ b/src/main/resources/assets/botany/blockstates/soil_no_weed.json @@ -0,0 +1,13 @@ +{ + "variants": { + "acidity=acid,moisture=damp": { "model": "botany:soil_no_weed/acid_damp" }, + "acidity=acid,moisture=dry": { "model": "botany:soil_no_weed/acid_dry" }, + "acidity=acid,moisture=normal": { "model": "botany:soil_no_weed/acid" }, + "acidity=alkaline,moisture=damp": { "model": "botany:soil_no_weed/alkaline_damp" }, + "acidity=alkaline,moisture=dry": { "model": "botany:soil_no_weed/alkaline_dry" }, + "acidity=alkaline,moisture=normal": { "model": "botany:soil_no_weed/alkaline" }, + "acidity=neutral,moisture=damp": { "model": "botany:soil_no_weed/damp" }, + "acidity=neutral,moisture=dry": { "model": "botany:soil_no_weed/dry" }, + "acidity=neutral,moisture=normal": { "model": "botany:soil_no_weed/normal" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botany/lang/en_GB.lang b/src/main/resources/assets/botany/lang/en_GB.lang index 8375da40..5f14192d 100644 --- a/src/main/resources/assets/botany/lang/en_GB.lang +++ b/src/main/resources/assets/botany/lang/en_GB.lang @@ -12,11 +12,11 @@ botany.soil.soil=Soil botany.soil.loam=Loam botany.soil.flowerbed=Flowerbed -item.trowelWood.name=Wooden Trowel -item.trowelStone.name=Stone Trowel -item.trowelIron.name=Iron Trowel -item.trowelGold.name=Gold Trowel -item.trowelDiamond.name=Diamond Trowel +item.trowel_wood.name=Wooden Trowel +item.trowel_stone.name=Stone Trowel +item.trowel_iron.name=Iron Trowel +item.trowel_gold.name=Gold Trowel +item.trowel_diamond.name=Diamond Trowel botany.colour.aquamarine=Aquamarine botany.colour.black=Black diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index a28ec7de..9a12667c 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -26,13 +26,13 @@ item.botany.germling.name=Germling item.botany.pollen.name=Pollen item.botany.flower.corrupted.name=Corrupted Flower -item.trowelWood.name=Wooden Trowel -item.trowelStone.name=Stone Trowel -item.trowelIron.name=Iron Trowel -item.trowelGold.name=Gold Trowel -item.trowelDiamond.name=Diamond Trowel +item.trowel_wood.name=Wooden Trowel +item.trowel_stone.name=Stone Trowel +item.trowel_iron.name=Iron Trowel +item.trowel_gold.name=Gold Trowel +item.trowel_diamond.name=Diamond Trowel -item.insulatedTube.name=Insulated Electron Tube +item.insulated_tube.name=Insulated Electron Tube item.botany.encylopedia=Florist's Encyclopaedia item.botany.encylopedia_reinforced=Reinforced Florist's Encyclopaedia diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid.json b/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid.json rename to src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid.json diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid_damp.json rename to src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbedNoWeed/acid_dry.json rename to src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline.json b/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline.json rename to src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline.json diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline_damp.json rename to src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbedNoWeed/alkaline_dry.json rename to src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/damp.json b/src/main/resources/assets/botany/models/block/flowerbed_no_weed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbedNoWeed/damp.json rename to src/main/resources/assets/botany/models/block/flowerbed_no_weed/damp.json diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/dry.json b/src/main/resources/assets/botany/models/block/flowerbed_no_weed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbedNoWeed/dry.json rename to src/main/resources/assets/botany/models/block/flowerbed_no_weed/dry.json diff --git a/src/main/resources/assets/botany/models/block/flowerbedNoWeed/normal.json b/src/main/resources/assets/botany/models/block/flowerbed_no_weed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbedNoWeed/normal.json rename to src/main/resources/assets/botany/models/block/flowerbed_no_weed/normal.json diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/acid.json b/src/main/resources/assets/botany/models/block/loam_no_weed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loamNoWeed/acid.json rename to src/main/resources/assets/botany/models/block/loam_no_weed/acid.json diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/block/loam_no_weed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loamNoWeed/acid_damp.json rename to src/main/resources/assets/botany/models/block/loam_no_weed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/block/loam_no_weed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loamNoWeed/acid_dry.json rename to src/main/resources/assets/botany/models/block/loam_no_weed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline.json b/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loamNoWeed/alkaline.json rename to src/main/resources/assets/botany/models/block/loam_no_weed/alkaline.json diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loamNoWeed/alkaline_damp.json rename to src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loamNoWeed/alkaline_dry.json rename to src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/damp.json b/src/main/resources/assets/botany/models/block/loam_no_weed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loamNoWeed/damp.json rename to src/main/resources/assets/botany/models/block/loam_no_weed/damp.json diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/dry.json b/src/main/resources/assets/botany/models/block/loam_no_weed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loamNoWeed/dry.json rename to src/main/resources/assets/botany/models/block/loam_no_weed/dry.json diff --git a/src/main/resources/assets/botany/models/block/loamNoWeed/normal.json b/src/main/resources/assets/botany/models/block/loam_no_weed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loamNoWeed/normal.json rename to src/main/resources/assets/botany/models/block/loam_no_weed/normal.json diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/acid.json b/src/main/resources/assets/botany/models/block/soil_no_weed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soilNoWeed/acid.json rename to src/main/resources/assets/botany/models/block/soil_no_weed/acid.json diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/block/soil_no_weed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soilNoWeed/acid_damp.json rename to src/main/resources/assets/botany/models/block/soil_no_weed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/block/soil_no_weed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soilNoWeed/acid_dry.json rename to src/main/resources/assets/botany/models/block/soil_no_weed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline.json b/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soilNoWeed/alkaline.json rename to src/main/resources/assets/botany/models/block/soil_no_weed/alkaline.json diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soilNoWeed/alkaline_damp.json rename to src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soilNoWeed/alkaline_dry.json rename to src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/damp.json b/src/main/resources/assets/botany/models/block/soil_no_weed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soilNoWeed/damp.json rename to src/main/resources/assets/botany/models/block/soil_no_weed/damp.json diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/dry.json b/src/main/resources/assets/botany/models/block/soil_no_weed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soilNoWeed/dry.json rename to src/main/resources/assets/botany/models/block/soil_no_weed/dry.json diff --git a/src/main/resources/assets/botany/models/block/soilNoWeed/normal.json b/src/main/resources/assets/botany/models/block/soil_no_weed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soilNoWeed/normal.json rename to src/main/resources/assets/botany/models/block/soil_no_weed/normal.json diff --git a/src/main/resources/assets/botany/models/item/botanistDatabase.json b/src/main/resources/assets/botany/models/item/botanistDatabase.json deleted file mode 100644 index 67874645..00000000 --- a/src/main/resources/assets/botany/models/item/botanistDatabase.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/botanistDatabase" - } -} diff --git a/src/main/resources/assets/botany/models/item/botanist_database.json b/src/main/resources/assets/botany/models/item/botanist_database.json new file mode 100644 index 00000000..629ffa90 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/botanist_database.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/botanist_database" + } +} diff --git a/src/main/resources/assets/botany/models/item/encylopediaReinforced.json b/src/main/resources/assets/botany/models/item/encylopediaReinforced.json deleted file mode 100644 index 3e42f539..00000000 --- a/src/main/resources/assets/botany/models/item/encylopediaReinforced.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/encylopediaReinforced" - } -} diff --git a/src/main/resources/assets/botany/models/item/encylopedia_reinforced.json b/src/main/resources/assets/botany/models/item/encylopedia_reinforced.json new file mode 100644 index 00000000..b0748dbc --- /dev/null +++ b/src/main/resources/assets/botany/models/item/encylopedia_reinforced.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/encylopedia_reinforced" + } +} diff --git a/src/main/resources/assets/botany/models/item/fieldKit3.json b/src/main/resources/assets/botany/models/item/field_kit.json similarity index 58% rename from src/main/resources/assets/botany/models/item/fieldKit3.json rename to src/main/resources/assets/botany/models/item/field_kit.json index b1e40cd3..8d2db385 100644 --- a/src/main/resources/assets/botany/models/item/fieldKit3.json +++ b/src/main/resources/assets/botany/models/item/field_kit.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botany:items/fieldKit3" + "layer0": "botany:items/field_kit" } } diff --git a/src/main/resources/assets/botany/models/item/fieldKit.json b/src/main/resources/assets/botany/models/item/field_kit1.json similarity index 58% rename from src/main/resources/assets/botany/models/item/fieldKit.json rename to src/main/resources/assets/botany/models/item/field_kit1.json index 3bf45809..8d2db385 100644 --- a/src/main/resources/assets/botany/models/item/fieldKit.json +++ b/src/main/resources/assets/botany/models/item/field_kit1.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botany:items/fieldKit" + "layer0": "botany:items/field_kit" } } diff --git a/src/main/resources/assets/botany/models/item/fieldKit2.json b/src/main/resources/assets/botany/models/item/field_kit2.json similarity index 57% rename from src/main/resources/assets/botany/models/item/fieldKit2.json rename to src/main/resources/assets/botany/models/item/field_kit2.json index 2fbeaa87..6da10ea7 100644 --- a/src/main/resources/assets/botany/models/item/fieldKit2.json +++ b/src/main/resources/assets/botany/models/item/field_kit2.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botany:items/fieldKit2" + "layer0": "botany:items/field_kit2" } } diff --git a/src/main/resources/assets/botany/models/item/field_kit3.json b/src/main/resources/assets/botany/models/item/field_kit3.json new file mode 100644 index 00000000..6ab0595e --- /dev/null +++ b/src/main/resources/assets/botany/models/item/field_kit3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/field_kit3" + } +} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid.json deleted file mode 100644 index 15100337..00000000 --- a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/flowerbedNoWeed/acid" -} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_damp.json deleted file mode 100644 index bf0fe0ae..00000000 --- a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_damp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/flowerbedNoWeed/acid_damp" -} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_dry.json deleted file mode 100644 index 735ea4b7..00000000 --- a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/acid_dry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/flowerbedNoWeed/acid_dry" -} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline.json deleted file mode 100644 index cd4eb05f..00000000 --- a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/flowerbedNoWeed/alkaline" -} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_damp.json deleted file mode 100644 index 2d813916..00000000 --- a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_damp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/flowerbedNoWeed/alkaline_damp" -} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_dry.json deleted file mode 100644 index 171d3726..00000000 --- a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/alkaline_dry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/flowerbedNoWeed/alkaline_dry" -} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/damp.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/damp.json deleted file mode 100644 index cff0f84e..00000000 --- a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/damp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/flowerbedNoWeed/damp" -} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/dry.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/dry.json deleted file mode 100644 index b7c59d64..00000000 --- a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/dry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/flowerbedNoWeed/dry" -} diff --git a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/normal.json b/src/main/resources/assets/botany/models/item/flowerbedNoWeed/normal.json deleted file mode 100644 index 1831fc31..00000000 --- a/src/main/resources/assets/botany/models/item/flowerbedNoWeed/normal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/flowerbedNoWeed/normal" -} diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid.json b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid.json new file mode 100644 index 00000000..a3e7a5f1 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed_no_weed/acid" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_damp.json b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_damp.json new file mode 100644 index 00000000..2cbdbf5a --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed_no_weed/acid_damp" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_dry.json b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_dry.json new file mode 100644 index 00000000..33030ba4 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed_no_weed/acid_dry" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline.json b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline.json new file mode 100644 index 00000000..308ba561 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed_no_weed/alkaline" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_damp.json b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_damp.json new file mode 100644 index 00000000..0ebea491 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed_no_weed/alkaline_damp" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_dry.json b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_dry.json new file mode 100644 index 00000000..9e308282 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed_no_weed/alkaline_dry" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/damp.json b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/damp.json new file mode 100644 index 00000000..1493c44c --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed_no_weed/damp" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/dry.json b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/dry.json new file mode 100644 index 00000000..67ed231b --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed_no_weed/dry" +} diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/normal.json b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/normal.json new file mode 100644 index 00000000..ae958b1a --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowerbed_no_weed/normal.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/flowerbed_no_weed/normal" +} diff --git a/src/main/resources/assets/botany/models/item/insulatedTube.json b/src/main/resources/assets/botany/models/item/insulatedTube.json deleted file mode 100644 index 4ac593b4..00000000 --- a/src/main/resources/assets/botany/models/item/insulatedTube.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/insulatedTube.0", - "layer1": "botany:items/insulatedTube.1", - "layer2": "botany:items/insulatedTube.2" - } -} diff --git a/src/main/resources/assets/botany/models/item/insulated_tube.json b/src/main/resources/assets/botany/models/item/insulated_tube.json new file mode 100644 index 00000000..d62dbee6 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/insulated_tube.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/insulated_tube.0", + "layer1": "botany:items/insulated_tube.1", + "layer2": "botany:items/insulated_tube.2" + } +} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/acid.json b/src/main/resources/assets/botany/models/item/loamNoWeed/acid.json deleted file mode 100644 index 1de3eaf4..00000000 --- a/src/main/resources/assets/botany/models/item/loamNoWeed/acid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/loamNoWeed/acid" -} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/item/loamNoWeed/acid_damp.json deleted file mode 100644 index 43640a02..00000000 --- a/src/main/resources/assets/botany/models/item/loamNoWeed/acid_damp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/loamNoWeed/acid_damp" -} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/item/loamNoWeed/acid_dry.json deleted file mode 100644 index f7592a94..00000000 --- a/src/main/resources/assets/botany/models/item/loamNoWeed/acid_dry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/loamNoWeed/acid_dry" -} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline.json b/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline.json deleted file mode 100644 index ab79de87..00000000 --- a/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/loamNoWeed/alkaline" -} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_damp.json deleted file mode 100644 index 040af21a..00000000 --- a/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_damp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/loamNoWeed/alkaline_damp" -} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_dry.json deleted file mode 100644 index b8cd4693..00000000 --- a/src/main/resources/assets/botany/models/item/loamNoWeed/alkaline_dry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/loamNoWeed/alkaline_dry" -} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/damp.json b/src/main/resources/assets/botany/models/item/loamNoWeed/damp.json deleted file mode 100644 index d8b68104..00000000 --- a/src/main/resources/assets/botany/models/item/loamNoWeed/damp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/loamNoWeed/damp" -} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/dry.json b/src/main/resources/assets/botany/models/item/loamNoWeed/dry.json deleted file mode 100644 index c8382625..00000000 --- a/src/main/resources/assets/botany/models/item/loamNoWeed/dry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/loamNoWeed/dry" -} diff --git a/src/main/resources/assets/botany/models/item/loamNoWeed/normal.json b/src/main/resources/assets/botany/models/item/loamNoWeed/normal.json deleted file mode 100644 index 719d8bbc..00000000 --- a/src/main/resources/assets/botany/models/item/loamNoWeed/normal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/loamNoWeed/normal" -} diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/acid.json b/src/main/resources/assets/botany/models/item/loam_no_weed/acid.json new file mode 100644 index 00000000..38670eee --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam_no_weed/acid.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam_no_weed/acid" +} diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/acid_damp.json b/src/main/resources/assets/botany/models/item/loam_no_weed/acid_damp.json new file mode 100644 index 00000000..6b482d4d --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam_no_weed/acid_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam_no_weed/acid_damp" +} diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/acid_dry.json b/src/main/resources/assets/botany/models/item/loam_no_weed/acid_dry.json new file mode 100644 index 00000000..66feb371 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam_no_weed/acid_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam_no_weed/acid_dry" +} diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline.json b/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline.json new file mode 100644 index 00000000..b7d4670a --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam_no_weed/alkaline" +} diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_damp.json b/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_damp.json new file mode 100644 index 00000000..ceef320a --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam_no_weed/alkaline_damp" +} diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_dry.json b/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_dry.json new file mode 100644 index 00000000..aa82f09a --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam_no_weed/alkaline_dry" +} diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/damp.json b/src/main/resources/assets/botany/models/item/loam_no_weed/damp.json new file mode 100644 index 00000000..882bae69 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam_no_weed/damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam_no_weed/damp" +} diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/dry.json b/src/main/resources/assets/botany/models/item/loam_no_weed/dry.json new file mode 100644 index 00000000..8ed57849 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam_no_weed/dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam_no_weed/dry" +} diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/normal.json b/src/main/resources/assets/botany/models/item/loam_no_weed/normal.json new file mode 100644 index 00000000..466a9b00 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/loam_no_weed/normal.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/loam_no_weed/normal" +} diff --git a/src/main/resources/assets/botany/models/item/masterBotanistDatabase.json b/src/main/resources/assets/botany/models/item/masterBotanistDatabase.json deleted file mode 100644 index 6edab2dc..00000000 --- a/src/main/resources/assets/botany/models/item/masterBotanistDatabase.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/masterBotanistDatabase" - } -} diff --git a/src/main/resources/assets/botany/models/item/master_botanist_database.json b/src/main/resources/assets/botany/models/item/master_botanist_database.json new file mode 100644 index 00000000..95c6ada9 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/master_botanist_database.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/master_botanist_database" + } +} diff --git a/src/main/resources/assets/botany/models/item/misc/powderAsh.json b/src/main/resources/assets/botany/models/item/misc/powderAsh.json deleted file mode 100644 index 52bc0609..00000000 --- a/src/main/resources/assets/botany/models/item/misc/powderAsh.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/powderAsh" - } -} diff --git a/src/main/resources/assets/botany/models/item/misc/powderCompost.json b/src/main/resources/assets/botany/models/item/misc/powderCompost.json deleted file mode 100644 index 5099c8b8..00000000 --- a/src/main/resources/assets/botany/models/item/misc/powderCompost.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/powderCompost" - } -} diff --git a/src/main/resources/assets/botany/models/item/misc/powderFertiliser.json b/src/main/resources/assets/botany/models/item/misc/powderFertiliser.json deleted file mode 100644 index e0a606c1..00000000 --- a/src/main/resources/assets/botany/models/item/misc/powderFertiliser.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/powderFertiliser" - } -} diff --git a/src/main/resources/assets/botany/models/item/misc/powderMulch.json b/src/main/resources/assets/botany/models/item/misc/powderMulch.json deleted file mode 100644 index 8a398679..00000000 --- a/src/main/resources/assets/botany/models/item/misc/powderMulch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/powderMulch" - } -} diff --git a/src/main/resources/assets/botany/models/item/misc/powderPulp.json b/src/main/resources/assets/botany/models/item/misc/powderPulp.json deleted file mode 100644 index 0e099c52..00000000 --- a/src/main/resources/assets/botany/models/item/misc/powderPulp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/powderPulp" - } -} diff --git a/src/main/resources/assets/botany/models/item/misc/powderSulphur.json b/src/main/resources/assets/botany/models/item/misc/powderSulphur.json deleted file mode 100644 index 2acb5e66..00000000 --- a/src/main/resources/assets/botany/models/item/misc/powderSulphur.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/powderSulphur" - } -} diff --git a/src/main/resources/assets/botany/models/item/misc/powder_ash.json b/src/main/resources/assets/botany/models/item/misc/powder_ash.json new file mode 100644 index 00000000..95d93b0d --- /dev/null +++ b/src/main/resources/assets/botany/models/item/misc/powder_ash.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/powder_ash" + } +} diff --git a/src/main/resources/assets/botany/models/item/misc/powder_compost.json b/src/main/resources/assets/botany/models/item/misc/powder_compost.json new file mode 100644 index 00000000..e9ce6fb1 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/misc/powder_compost.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/powder_compost" + } +} diff --git a/src/main/resources/assets/botany/models/item/misc/powder_fertiliser.json b/src/main/resources/assets/botany/models/item/misc/powder_fertiliser.json new file mode 100644 index 00000000..bcf6e889 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/misc/powder_fertiliser.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/powder_fertiliser" + } +} diff --git a/src/main/resources/assets/binniecore/models/item/fieldKit.json b/src/main/resources/assets/botany/models/item/misc/powder_mulch.json similarity index 56% rename from src/main/resources/assets/binniecore/models/item/fieldKit.json rename to src/main/resources/assets/botany/models/item/misc/powder_mulch.json index 328dca7b..dad6c33d 100644 --- a/src/main/resources/assets/binniecore/models/item/fieldKit.json +++ b/src/main/resources/assets/botany/models/item/misc/powder_mulch.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "binniecore:items/fieldKit" + "layer0": "botany:items/powder_mulch" } } diff --git a/src/main/resources/assets/botany/models/item/misc/powder_pulp.json b/src/main/resources/assets/botany/models/item/misc/powder_pulp.json new file mode 100644 index 00000000..7fdb7ba5 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/misc/powder_pulp.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/powder_pulp" + } +} diff --git a/src/main/resources/assets/botany/models/item/misc/powder_sulphur.json b/src/main/resources/assets/botany/models/item/misc/powder_sulphur.json new file mode 100644 index 00000000..704b0c14 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/misc/powder_sulphur.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/powder_sulphur" + } +} diff --git a/src/main/resources/assets/botany/models/item/soilMeter.json b/src/main/resources/assets/botany/models/item/soilMeter.json deleted file mode 100644 index a96bb699..00000000 --- a/src/main/resources/assets/botany/models/item/soilMeter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/soilMeter" - } -} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/acid.json b/src/main/resources/assets/botany/models/item/soilNoWeed/acid.json deleted file mode 100644 index 513f1092..00000000 --- a/src/main/resources/assets/botany/models/item/soilNoWeed/acid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/soilNoWeed/acid" -} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/acid_damp.json b/src/main/resources/assets/botany/models/item/soilNoWeed/acid_damp.json deleted file mode 100644 index ffe03602..00000000 --- a/src/main/resources/assets/botany/models/item/soilNoWeed/acid_damp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/soilNoWeed/acid_damp" -} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/acid_dry.json b/src/main/resources/assets/botany/models/item/soilNoWeed/acid_dry.json deleted file mode 100644 index 5ccda7e0..00000000 --- a/src/main/resources/assets/botany/models/item/soilNoWeed/acid_dry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/soilNoWeed/acid_dry" -} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline.json b/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline.json deleted file mode 100644 index 835aaa12..00000000 --- a/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/soilNoWeed/alkaline" -} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_damp.json b/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_damp.json deleted file mode 100644 index bd0566e9..00000000 --- a/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_damp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/soilNoWeed/alkaline_damp" -} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_dry.json b/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_dry.json deleted file mode 100644 index c5c1d1c1..00000000 --- a/src/main/resources/assets/botany/models/item/soilNoWeed/alkaline_dry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/soilNoWeed/alkaline_dry" -} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/damp.json b/src/main/resources/assets/botany/models/item/soilNoWeed/damp.json deleted file mode 100644 index aa5b5c9f..00000000 --- a/src/main/resources/assets/botany/models/item/soilNoWeed/damp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/soilNoWeed/damp" -} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/dry.json b/src/main/resources/assets/botany/models/item/soilNoWeed/dry.json deleted file mode 100644 index 4edb8ea3..00000000 --- a/src/main/resources/assets/botany/models/item/soilNoWeed/dry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/soilNoWeed/dry" -} diff --git a/src/main/resources/assets/botany/models/item/soilNoWeed/normal.json b/src/main/resources/assets/botany/models/item/soilNoWeed/normal.json deleted file mode 100644 index 9860046f..00000000 --- a/src/main/resources/assets/botany/models/item/soilNoWeed/normal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botany:block/soilNoWeed/normal" -} diff --git a/src/main/resources/assets/botany/models/item/soil_meter.json b/src/main/resources/assets/botany/models/item/soil_meter.json new file mode 100644 index 00000000..97be44ac --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil_meter.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/soil_meter" + } +} diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/acid.json b/src/main/resources/assets/botany/models/item/soil_no_weed/acid.json new file mode 100644 index 00000000..4059533b --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil_no_weed/acid.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil_no_weed/acid" +} diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/acid_damp.json b/src/main/resources/assets/botany/models/item/soil_no_weed/acid_damp.json new file mode 100644 index 00000000..4412be1e --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil_no_weed/acid_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil_no_weed/acid_damp" +} diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/acid_dry.json b/src/main/resources/assets/botany/models/item/soil_no_weed/acid_dry.json new file mode 100644 index 00000000..46a612fc --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil_no_weed/acid_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil_no_weed/acid_dry" +} diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline.json b/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline.json new file mode 100644 index 00000000..626ad9de --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil_no_weed/alkaline" +} diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_damp.json b/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_damp.json new file mode 100644 index 00000000..8d57b6de --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil_no_weed/alkaline_damp" +} diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_dry.json b/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_dry.json new file mode 100644 index 00000000..f12f4eb9 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil_no_weed/alkaline_dry" +} diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/damp.json b/src/main/resources/assets/botany/models/item/soil_no_weed/damp.json new file mode 100644 index 00000000..bb768e4f --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil_no_weed/damp.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil_no_weed/damp" +} diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/dry.json b/src/main/resources/assets/botany/models/item/soil_no_weed/dry.json new file mode 100644 index 00000000..fee7f267 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil_no_weed/dry.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil_no_weed/dry" +} diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/normal.json b/src/main/resources/assets/botany/models/item/soil_no_weed/normal.json new file mode 100644 index 00000000..085c30ff --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soil_no_weed/normal.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/soil_no_weed/normal" +} diff --git a/src/main/resources/assets/botany/models/item/tools/trowelDiamond.json b/src/main/resources/assets/botany/models/item/tools/trowelDiamond.json deleted file mode 100644 index 81bc6a6c..00000000 --- a/src/main/resources/assets/botany/models/item/tools/trowelDiamond.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/tools/trowelDiamond" - } -} diff --git a/src/main/resources/assets/botany/models/item/tools/trowelGold.json b/src/main/resources/assets/botany/models/item/tools/trowelGold.json deleted file mode 100644 index 7b93e879..00000000 --- a/src/main/resources/assets/botany/models/item/tools/trowelGold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/tools/trowelGold" - } -} diff --git a/src/main/resources/assets/botany/models/item/tools/trowelIron.json b/src/main/resources/assets/botany/models/item/tools/trowelIron.json deleted file mode 100644 index 5a7aed05..00000000 --- a/src/main/resources/assets/botany/models/item/tools/trowelIron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/tools/trowelIron" - } -} diff --git a/src/main/resources/assets/botany/models/item/tools/trowelStone.json b/src/main/resources/assets/botany/models/item/tools/trowelStone.json deleted file mode 100644 index 61a0c068..00000000 --- a/src/main/resources/assets/botany/models/item/tools/trowelStone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/tools/trowelStone" - } -} diff --git a/src/main/resources/assets/botany/models/item/tools/trowelWood.json b/src/main/resources/assets/botany/models/item/tools/trowelWood.json deleted file mode 100644 index e2d254b8..00000000 --- a/src/main/resources/assets/botany/models/item/tools/trowelWood.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botany:items/tools/trowelWood" - } -} diff --git a/src/main/resources/assets/botany/models/item/tools/trowel_diamond.json b/src/main/resources/assets/botany/models/item/tools/trowel_diamond.json new file mode 100644 index 00000000..b5d239e4 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/tools/trowel_diamond.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/tools/trowel_diamond" + } +} diff --git a/src/main/resources/assets/botany/models/item/tools/trowel_gold.json b/src/main/resources/assets/botany/models/item/tools/trowel_gold.json new file mode 100644 index 00000000..c83e4362 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/tools/trowel_gold.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/tools/trowel_gold" + } +} diff --git a/src/main/resources/assets/botany/models/item/tools/trowel_iron.json b/src/main/resources/assets/botany/models/item/tools/trowel_iron.json new file mode 100644 index 00000000..2fe8242f --- /dev/null +++ b/src/main/resources/assets/botany/models/item/tools/trowel_iron.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/tools/trowel_iron" + } +} diff --git a/src/main/resources/assets/botany/models/item/tools/trowel_stone.json b/src/main/resources/assets/botany/models/item/tools/trowel_stone.json new file mode 100644 index 00000000..9b672d60 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/tools/trowel_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/tools/trowel_stone" + } +} diff --git a/src/main/resources/assets/botany/models/item/tools/trowel_wood.json b/src/main/resources/assets/botany/models/item/tools/trowel_wood.json new file mode 100644 index 00000000..36b3fc51 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/tools/trowel_wood.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/tools/trowel_wood" + } +} diff --git a/src/main/resources/assets/botany/textures/items/botanistDatabase.png b/src/main/resources/assets/botany/textures/items/botanist_database.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/botanistDatabase.png rename to src/main/resources/assets/botany/textures/items/botanist_database.png diff --git a/src/main/resources/assets/botany/textures/items/insulatedTube.0.png b/src/main/resources/assets/botany/textures/items/insulated_tube.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/insulatedTube.0.png rename to src/main/resources/assets/botany/textures/items/insulated_tube.0.png diff --git a/src/main/resources/assets/botany/textures/items/insulatedTube.1.png b/src/main/resources/assets/botany/textures/items/insulated_tube.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/insulatedTube.1.png rename to src/main/resources/assets/botany/textures/items/insulated_tube.1.png diff --git a/src/main/resources/assets/botany/textures/items/insulatedTube.2.png b/src/main/resources/assets/botany/textures/items/insulated_tube.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/insulatedTube.2.png rename to src/main/resources/assets/botany/textures/items/insulated_tube.2.png diff --git a/src/main/resources/assets/botany/textures/items/masterBotanistDatabase.png b/src/main/resources/assets/botany/textures/items/master_botanist_database.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/masterBotanistDatabase.png rename to src/main/resources/assets/botany/textures/items/master_botanist_database.png diff --git a/src/main/resources/assets/botany/textures/items/powderAsh.png b/src/main/resources/assets/botany/textures/items/powder_ash.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powderAsh.png rename to src/main/resources/assets/botany/textures/items/powder_ash.png diff --git a/src/main/resources/assets/botany/textures/items/powderCompost.png b/src/main/resources/assets/botany/textures/items/powder_compost.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powderCompost.png rename to src/main/resources/assets/botany/textures/items/powder_compost.png diff --git a/src/main/resources/assets/botany/textures/items/powderFertiliser.png b/src/main/resources/assets/botany/textures/items/powder_fertiliser.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powderFertiliser.png rename to src/main/resources/assets/botany/textures/items/powder_fertiliser.png diff --git a/src/main/resources/assets/botany/textures/items/powderMulch.png b/src/main/resources/assets/botany/textures/items/powder_mulch.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powderMulch.png rename to src/main/resources/assets/botany/textures/items/powder_mulch.png diff --git a/src/main/resources/assets/botany/textures/items/powderPulp.png b/src/main/resources/assets/botany/textures/items/powder_pulp.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powderPulp.png rename to src/main/resources/assets/botany/textures/items/powder_pulp.png diff --git a/src/main/resources/assets/botany/textures/items/powderSulphur.png b/src/main/resources/assets/botany/textures/items/powder_sulphur.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powderSulphur.png rename to src/main/resources/assets/botany/textures/items/powder_sulphur.png diff --git a/src/main/resources/assets/botany/textures/items/soilMeter.png b/src/main/resources/assets/botany/textures/items/soil_meter.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/soilMeter.png rename to src/main/resources/assets/botany/textures/items/soil_meter.png diff --git a/src/main/resources/assets/botany/textures/items/tools/trowelDiamond.png b/src/main/resources/assets/botany/textures/items/tools/trowel_diamond.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/tools/trowelDiamond.png rename to src/main/resources/assets/botany/textures/items/tools/trowel_diamond.png diff --git a/src/main/resources/assets/botany/textures/items/tools/trowelGold.png b/src/main/resources/assets/botany/textures/items/tools/trowel_gold.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/tools/trowelGold.png rename to src/main/resources/assets/botany/textures/items/tools/trowel_gold.png diff --git a/src/main/resources/assets/botany/textures/items/tools/trowelIron.png b/src/main/resources/assets/botany/textures/items/tools/trowel_iron.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/tools/trowelIron.png rename to src/main/resources/assets/botany/textures/items/tools/trowel_iron.png diff --git a/src/main/resources/assets/botany/textures/items/tools/trowelStone.png b/src/main/resources/assets/botany/textures/items/tools/trowel_stone.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/tools/trowelStone.png rename to src/main/resources/assets/botany/textures/items/tools/trowel_stone.png diff --git a/src/main/resources/assets/botany/textures/items/tools/trowelWood.png b/src/main/resources/assets/botany/textures/items/tools/trowel_wood.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/tools/trowelWood.png rename to src/main/resources/assets/botany/textures/items/tools/trowel_wood.png diff --git a/src/main/resources/assets/extrabees/models/item/dictionary.json b/src/main/resources/assets/extrabees/models/item/dictionary.json index bc2d721b..54adfc48 100644 --- a/src/main/resources/assets/extrabees/models/item/dictionary.json +++ b/src/main/resources/assets/extrabees/models/item/dictionary.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/apiaristDatabase" + "layer0": "extrabees:items/apiarist_database" } } \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/dictionaryMaster.json b/src/main/resources/assets/extrabees/models/item/dictionaryMaster.json deleted file mode 100644 index 5ea5a639..00000000 --- a/src/main/resources/assets/extrabees/models/item/dictionaryMaster.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/masterApiaristDatabase" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/dictionary_master.json b/src/main/resources/assets/extrabees/models/item/dictionary_master.json new file mode 100644 index 00000000..b5a33ed2 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/dictionary_master.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/master_apiarist_database" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.soul.json b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.soul.json deleted file mode 100644 index 19f1b332..00000000 --- a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.soul.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/frameSoul" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.debug.json b/src/main/resources/assets/extrabees/models/item/frames/hive_frame.cage.json similarity index 55% rename from src/main/resources/assets/extrabees/models/item/frames/hiveFrame.debug.json rename to src/main/resources/assets/extrabees/models/item/frames/hive_frame.cage.json index 0cc09f23..4de85873 100644 --- a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.debug.json +++ b/src/main/resources/assets/extrabees/models/item/frames/hive_frame.cage.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/frameDebug" + "layer0": "extrabees:items/frame_cage" } } \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cage.json b/src/main/resources/assets/extrabees/models/item/frames/hive_frame.clay.json similarity index 55% rename from src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cage.json rename to src/main/resources/assets/extrabees/models/item/frames/hive_frame.clay.json index d02fce47..dc08c090 100644 --- a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cage.json +++ b/src/main/resources/assets/extrabees/models/item/frames/hive_frame.clay.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/frameCage" + "layer0": "extrabees:items/frame_clay" } } \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cocoa.json b/src/main/resources/assets/extrabees/models/item/frames/hive_frame.cocoa.json similarity index 54% rename from src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cocoa.json rename to src/main/resources/assets/extrabees/models/item/frames/hive_frame.cocoa.json index ca6da73e..88f483ad 100644 --- a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cocoa.json +++ b/src/main/resources/assets/extrabees/models/item/frames/hive_frame.cocoa.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/frameCocoa" + "layer0": "extrabees:items/frame_cocoa" } } \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hive_frame.debug.json b/src/main/resources/assets/extrabees/models/item/frames/hive_frame.debug.json new file mode 100644 index 00000000..d08ecd42 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/frames/hive_frame.debug.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/frame_debug" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.clay.json b/src/main/resources/assets/extrabees/models/item/frames/hive_frame.soul.json similarity index 55% rename from src/main/resources/assets/extrabees/models/item/frames/hiveFrame.clay.json rename to src/main/resources/assets/extrabees/models/item/frames/hive_frame.soul.json index a25e689a..1bd373d3 100644 --- a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.clay.json +++ b/src/main/resources/assets/extrabees/models/item/frames/hive_frame.soul.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/frameClay" + "layer0": "extrabees:items/frame_soul" } } \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/honeyComb.json b/src/main/resources/assets/extrabees/models/item/honeyComb.json deleted file mode 100644 index 99705d69..00000000 --- a/src/main/resources/assets/extrabees/models/item/honeyComb.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/beeCombs.0", - "layer1": "forestry:items/beeCombs.1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/honeyCrystal.json b/src/main/resources/assets/extrabees/models/item/honeyCrystal.json deleted file mode 100644 index e68ac349..00000000 --- a/src/main/resources/assets/extrabees/models/item/honeyCrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/honeyCrystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/honeyCrystalEmpty.json b/src/main/resources/assets/extrabees/models/item/honeyCrystalEmpty.json deleted file mode 100644 index fb60c448..00000000 --- a/src/main/resources/assets/extrabees/models/item/honeyCrystalEmpty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/honeyCrystalEmpty" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/honeyDrop.json b/src/main/resources/assets/extrabees/models/item/honeyDrop.json deleted file mode 100644 index 0e7a3c2b..00000000 --- a/src/main/resources/assets/extrabees/models/item/honeyDrop.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/honeyDrop.0", - "layer1": "forestry:items/honeyDrop.1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/honey_comb.json b/src/main/resources/assets/extrabees/models/item/honey_comb.json new file mode 100644 index 00000000..e2edd391 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/honey_comb.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/bee_combs.0", + "layer1": "forestry:items/bee_combs.1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/honey_crystal.json b/src/main/resources/assets/extrabees/models/item/honey_crystal.json new file mode 100644 index 00000000..01f0b1d4 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/honey_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/honey_crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/honey_crystal_empty.json b/src/main/resources/assets/extrabees/models/item/honey_crystal_empty.json new file mode 100644 index 00000000..d20eaa83 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/honey_crystal_empty.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/honey_crystal_empty" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/honey_drop.json b/src/main/resources/assets/extrabees/models/item/honey_drop.json new file mode 100644 index 00000000..9da0b3a9 --- /dev/null +++ b/src/main/resources/assets/extrabees/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/misc/blutonium_dust.json b/src/main/resources/assets/extrabees/models/item/misc/blutonium_dust.json new file mode 100644 index 00000000..8794f8a5 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/blutonium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/blutonium_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/dyeBlue.json b/src/main/resources/assets/extrabees/models/item/misc/clay_dust.json similarity index 53% rename from src/main/resources/assets/extrabees/models/item/misc/dyeBlue.json rename to src/main/resources/assets/extrabees/models/item/misc/clay_dust.json index afeafc76..d421a028 100644 --- a/src/main/resources/assets/extrabees/models/item/misc/dyeBlue.json +++ b/src/main/resources/assets/extrabees/models/item/misc/clay_dust.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/misc/dyeBlue" + "layer0": "extrabees:items/misc/clay_dust" } } diff --git a/src/main/resources/assets/extrabees/models/item/misc/dyeBlack.json b/src/main/resources/assets/extrabees/models/item/misc/coal_dust.json similarity index 53% rename from src/main/resources/assets/extrabees/models/item/misc/dyeBlack.json rename to src/main/resources/assets/extrabees/models/item/misc/coal_dust.json index 3ffba485..86fdada6 100644 --- a/src/main/resources/assets/extrabees/models/item/misc/dyeBlack.json +++ b/src/main/resources/assets/extrabees/models/item/misc/coal_dust.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/misc/dyeBlack" + "layer0": "extrabees:items/misc/coal_dust" } } diff --git a/src/main/resources/assets/extrabees/models/item/misc/cyanitedust.json b/src/main/resources/assets/extrabees/models/item/misc/copper_dust.json similarity index 52% rename from src/main/resources/assets/extrabees/models/item/misc/cyanitedust.json rename to src/main/resources/assets/extrabees/models/item/misc/copper_dust.json index 38df2ea2..f805be96 100644 --- a/src/main/resources/assets/extrabees/models/item/misc/cyanitedust.json +++ b/src/main/resources/assets/extrabees/models/item/misc/copper_dust.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/misc/cyaniteDust" + "layer0": "extrabees:items/misc/copper_dust" } } diff --git a/src/main/resources/assets/extrabees/models/item/misc/cyanite_dust.json b/src/main/resources/assets/extrabees/models/item/misc/cyanite_dust.json new file mode 100644 index 00000000..e5621f98 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/cyanite_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/cyanite_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/blutoniumdust.json b/src/main/resources/assets/extrabees/models/item/misc/diamond_shard.json similarity index 51% rename from src/main/resources/assets/extrabees/models/item/misc/blutoniumdust.json rename to src/main/resources/assets/extrabees/models/item/misc/diamond_shard.json index e8ee45a7..7b68e6c3 100644 --- a/src/main/resources/assets/extrabees/models/item/misc/blutoniumdust.json +++ b/src/main/resources/assets/extrabees/models/item/misc/diamond_shard.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/misc/blutoniumDust" + "layer0": "extrabees:items/misc/diamond_shard" } } diff --git a/src/main/resources/assets/extrabees/models/item/misc/diamondshard.json b/src/main/resources/assets/extrabees/models/item/misc/diamondshard.json deleted file mode 100644 index dc7f85ac..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/diamondshard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/diamondShard" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/dyeBrown.json b/src/main/resources/assets/extrabees/models/item/misc/dyeBrown.json deleted file mode 100644 index fac6a330..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/dyeBrown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/dyeBrown" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/dyeGreen.json b/src/main/resources/assets/extrabees/models/item/misc/dyeGreen.json deleted file mode 100644 index 44b77e1a..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/dyeGreen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/dyeGreen" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/dyeWhite.json b/src/main/resources/assets/extrabees/models/item/misc/dyeWhite.json deleted file mode 100644 index e9e2813e..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/dyeWhite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/dyeWhite" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/dyeYellow.json b/src/main/resources/assets/extrabees/models/item/misc/dyeYellow.json deleted file mode 100644 index f8ad037a..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/dyeYellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/dyeYellow" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_black.json b/src/main/resources/assets/extrabees/models/item/misc/dye_black.json new file mode 100644 index 00000000..79513699 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/dye_black.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/dye_black" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/claydust.json b/src/main/resources/assets/extrabees/models/item/misc/dye_blue.json similarity index 54% rename from src/main/resources/assets/extrabees/models/item/misc/claydust.json rename to src/main/resources/assets/extrabees/models/item/misc/dye_blue.json index 8205dbeb..dce00725 100644 --- a/src/main/resources/assets/extrabees/models/item/misc/claydust.json +++ b/src/main/resources/assets/extrabees/models/item/misc/dye_blue.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/misc/clayDust" + "layer0": "extrabees:items/misc/dye_blue" } } diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_brown.json b/src/main/resources/assets/extrabees/models/item/misc/dye_brown.json new file mode 100644 index 00000000..b1a1a5e7 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/dye_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/dye_brown" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_green.json b/src/main/resources/assets/extrabees/models/item/misc/dye_green.json new file mode 100644 index 00000000..741db6f6 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/dye_green.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/dye_green" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/dyeRed.json b/src/main/resources/assets/extrabees/models/item/misc/dye_red.json similarity index 54% rename from src/main/resources/assets/extrabees/models/item/misc/dyeRed.json rename to src/main/resources/assets/extrabees/models/item/misc/dye_red.json index 488e7c69..f62572e6 100644 --- a/src/main/resources/assets/extrabees/models/item/misc/dyeRed.json +++ b/src/main/resources/assets/extrabees/models/item/misc/dye_red.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/misc/dyeRed" + "layer0": "extrabees:items/misc/dye_red" } } diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_white.json b/src/main/resources/assets/extrabees/models/item/misc/dye_white.json new file mode 100644 index 00000000..8fde0124 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/dye_white.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/dye_white" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/copperdust.json b/src/main/resources/assets/extrabees/models/item/misc/dye_yellow.json similarity index 52% rename from src/main/resources/assets/extrabees/models/item/misc/copperdust.json rename to src/main/resources/assets/extrabees/models/item/misc/dye_yellow.json index 11ff1225..05b5834c 100644 --- a/src/main/resources/assets/extrabees/models/item/misc/copperdust.json +++ b/src/main/resources/assets/extrabees/models/item/misc/dye_yellow.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/misc/copperDust" + "layer0": "extrabees:items/misc/dye_yellow" } } diff --git a/src/main/resources/assets/extrabees/models/item/misc/emerald_shard.json b/src/main/resources/assets/extrabees/models/item/misc/emerald_shard.json new file mode 100644 index 00000000..92810c66 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/emerald_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/emerald_shard" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/emeraldshard.json b/src/main/resources/assets/extrabees/models/item/misc/emeraldshard.json deleted file mode 100644 index 453d373a..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/emeraldshard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/emeraldShard" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/gold_dust.json b/src/main/resources/assets/extrabees/models/item/misc/gold_dust.json new file mode 100644 index 00000000..4b08b346 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/gold_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/gold_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/golddust.json b/src/main/resources/assets/extrabees/models/item/misc/golddust.json deleted file mode 100644 index 60dfe4c7..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/golddust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/goldDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/iron_dust.json b/src/main/resources/assets/extrabees/models/item/misc/iron_dust.json new file mode 100644 index 00000000..5b187732 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/iron_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/iron_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/irondust.json b/src/main/resources/assets/extrabees/models/item/misc/irondust.json deleted file mode 100644 index f260eb03..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/irondust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/ironDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/lapis_shard.json b/src/main/resources/assets/extrabees/models/item/misc/lapis_shard.json new file mode 100644 index 00000000..24ae41e0 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/lapis_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/lapis_shard" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/lapisshard.json b/src/main/resources/assets/extrabees/models/item/misc/lapisshard.json deleted file mode 100644 index a2479b6e..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/lapisshard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/lapisShard" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/lead_dust.json b/src/main/resources/assets/extrabees/models/item/misc/lead_dust.json new file mode 100644 index 00000000..cfc48769 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/lead_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/lead_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/leaddust.json b/src/main/resources/assets/extrabees/models/item/misc/leaddust.json deleted file mode 100644 index c65a7896..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/leaddust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/leadDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/nickel_dust.json b/src/main/resources/assets/extrabees/models/item/misc/nickel_dust.json new file mode 100644 index 00000000..f7902e5c --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/nickel_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/nickel_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/nickeldust.json b/src/main/resources/assets/extrabees/models/item/misc/nickeldust.json deleted file mode 100644 index 05ea611b..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/nickeldust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/nickelDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/platinum_dust.json b/src/main/resources/assets/extrabees/models/item/misc/platinum_dust.json new file mode 100644 index 00000000..2f5dd73f --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/platinum_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/platinum_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/platinumdust.json b/src/main/resources/assets/extrabees/models/item/misc/platinumdust.json deleted file mode 100644 index b9135587..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/platinumdust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/platinumDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/radioactive_dust.json b/src/main/resources/assets/extrabees/models/item/misc/radioactive_dust.json new file mode 100644 index 00000000..2c471867 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/radioactive_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/radioactive_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/ruby_shard.json b/src/main/resources/assets/extrabees/models/item/misc/ruby_shard.json new file mode 100644 index 00000000..b094ef28 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/ruby_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/ruby_shard" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/rubyshard.json b/src/main/resources/assets/extrabees/models/item/misc/rubyshard.json deleted file mode 100644 index fd907518..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/rubyshard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/rubyShard" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/sapphire_shard.json b/src/main/resources/assets/extrabees/models/item/misc/sapphire_shard.json new file mode 100644 index 00000000..7235ea87 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/sapphire_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/sapphire_shard" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/sapphireshard.json b/src/main/resources/assets/extrabees/models/item/misc/sapphireshard.json deleted file mode 100644 index ac88d718..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/sapphireshard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/sapphireShard" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/scented_gear.json b/src/main/resources/assets/extrabees/models/item/misc/scented_gear.json new file mode 100644 index 00000000..d140ecbd --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/scented_gear.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/scented_gear" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/scentedgear.json b/src/main/resources/assets/extrabees/models/item/misc/scentedgear.json deleted file mode 100644 index fcc54f5e..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/scentedgear.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/scentedGear" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/silver_dust.json b/src/main/resources/assets/extrabees/models/item/misc/silver_dust.json new file mode 100644 index 00000000..94294ea3 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/silver_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/silver_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/silverdust.json b/src/main/resources/assets/extrabees/models/item/misc/silverdust.json deleted file mode 100644 index b7bfe265..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/silverdust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/silverDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/coaldust.json b/src/main/resources/assets/extrabees/models/item/misc/tin_dust.json similarity index 54% rename from src/main/resources/assets/extrabees/models/item/misc/coaldust.json rename to src/main/resources/assets/extrabees/models/item/misc/tin_dust.json index f80be8c3..a08873dd 100644 --- a/src/main/resources/assets/extrabees/models/item/misc/coaldust.json +++ b/src/main/resources/assets/extrabees/models/item/misc/tin_dust.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/misc/coalDust" + "layer0": "extrabees:items/misc/tin_dust" } } diff --git a/src/main/resources/assets/extrabees/models/item/misc/tindust.json b/src/main/resources/assets/extrabees/models/item/misc/tindust.json deleted file mode 100644 index c38c36a7..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/tindust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/tinDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/titanium_dust.json b/src/main/resources/assets/extrabees/models/item/misc/titanium_dust.json new file mode 100644 index 00000000..05e1d519 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/titanium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/titanium_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/titaniumdust.json b/src/main/resources/assets/extrabees/models/item/misc/titaniumdust.json deleted file mode 100644 index 7a3c3f25..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/titaniumdust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/titaniumDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/tungsten_dust.json b/src/main/resources/assets/extrabees/models/item/misc/tungsten_dust.json new file mode 100644 index 00000000..ca1d5bb1 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/tungsten_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/tungsten_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/tungstendust.json b/src/main/resources/assets/extrabees/models/item/misc/tungstendust.json deleted file mode 100644 index ac82f9e7..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/tungstendust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/tungstenDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/uraniumdust.json b/src/main/resources/assets/extrabees/models/item/misc/uraniumdust.json deleted file mode 100644 index 7a984e47..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/uraniumdust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/radioactiveDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/yellorium_dust.json b/src/main/resources/assets/extrabees/models/item/misc/yellorium_dust.json new file mode 100644 index 00000000..efd0c700 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/yellorium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/yellorium_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/yelloriumdust.json b/src/main/resources/assets/extrabees/models/item/misc/yelloriumdust.json deleted file mode 100644 index da7b93fc..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/yelloriumdust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/yelloriumDust" - } -} diff --git a/src/main/resources/assets/extrabees/models/item/misc/zinc_dust.json b/src/main/resources/assets/extrabees/models/item/misc/zinc_dust.json new file mode 100644 index 00000000..fa7d8a0e --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/misc/zinc_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/misc/zinc_dust" + } +} diff --git a/src/main/resources/assets/extrabees/models/item/misc/zincdust.json b/src/main/resources/assets/extrabees/models/item/misc/zincdust.json deleted file mode 100644 index b0a756ac..00000000 --- a/src/main/resources/assets/extrabees/models/item/misc/zincdust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/misc/zincDust" - } -} diff --git a/src/main/resources/assets/extrabees/textures/gui/AlvearyFrame.png b/src/main/resources/assets/extrabees/textures/gui/alveary_frame.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/AlvearyFrame.png rename to src/main/resources/assets/extrabees/textures/gui/alveary_frame.png diff --git a/src/main/resources/assets/extrabees/textures/gui/AlvearyMutator.png b/src/main/resources/assets/extrabees/textures/gui/alveary_mutator.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/AlvearyMutator.png rename to src/main/resources/assets/extrabees/textures/gui/alveary_mutator.png diff --git a/src/main/resources/assets/extrabees/textures/gui/AlvearyStimulator.png b/src/main/resources/assets/extrabees/textures/gui/alveary_stimulator.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/AlvearyStimulator.png rename to src/main/resources/assets/extrabees/textures/gui/alveary_stimulator.png diff --git a/src/main/resources/assets/extrabees/textures/items/actions/CancelTask.png b/src/main/resources/assets/extrabees/textures/items/actions/cancel_task.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/actions/CancelTask.png rename to src/main/resources/assets/extrabees/textures/items/actions/cancel_task.png diff --git a/src/main/resources/assets/extrabees/textures/items/actions/PauseProcess.png b/src/main/resources/assets/extrabees/textures/items/actions/pause_process.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/actions/PauseProcess.png rename to src/main/resources/assets/extrabees/textures/items/actions/pause_process.png diff --git a/src/main/resources/assets/extrabees/textures/items/apiaristDatabase.png b/src/main/resources/assets/extrabees/textures/items/apiarist_database.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/apiaristDatabase.png rename to src/main/resources/assets/extrabees/textures/items/apiarist_database.png diff --git a/src/main/resources/assets/extrabees/textures/items/beekeepingPage.png b/src/main/resources/assets/extrabees/textures/items/beekeeping_page.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/beekeepingPage.png rename to src/main/resources/assets/extrabees/textures/items/beekeeping_page.png diff --git a/src/main/resources/assets/extrabees/textures/items/fieldGlass.png b/src/main/resources/assets/extrabees/textures/items/field_glass.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/fieldGlass.png rename to src/main/resources/assets/extrabees/textures/items/field_glass.png diff --git a/src/main/resources/assets/extrabees/textures/items/fieldKit.png b/src/main/resources/assets/extrabees/textures/items/field_kit.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/fieldKit.png rename to src/main/resources/assets/extrabees/textures/items/field_kit.png diff --git a/src/main/resources/assets/extrabees/textures/items/frameCage.png b/src/main/resources/assets/extrabees/textures/items/frame_cage.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/frameCage.png rename to src/main/resources/assets/extrabees/textures/items/frame_cage.png diff --git a/src/main/resources/assets/extrabees/textures/items/frameClay.png b/src/main/resources/assets/extrabees/textures/items/frame_clay.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/frameClay.png rename to src/main/resources/assets/extrabees/textures/items/frame_clay.png diff --git a/src/main/resources/assets/extrabees/textures/items/frameCocoa.png b/src/main/resources/assets/extrabees/textures/items/frame_cocoa.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/frameCocoa.png rename to src/main/resources/assets/extrabees/textures/items/frame_cocoa.png diff --git a/src/main/resources/assets/extrabees/textures/items/frameDebug.png b/src/main/resources/assets/extrabees/textures/items/frame_debug.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/frameDebug.png rename to src/main/resources/assets/extrabees/textures/items/frame_debug.png diff --git a/src/main/resources/assets/extrabees/textures/items/frameSoul.png b/src/main/resources/assets/extrabees/textures/items/frame_soul.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/frameSoul.png rename to src/main/resources/assets/extrabees/textures/items/frame_soul.png diff --git a/src/main/resources/assets/extrabees/textures/items/honeyCrystal.png b/src/main/resources/assets/extrabees/textures/items/honey_crystal.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/honeyCrystal.png rename to src/main/resources/assets/extrabees/textures/items/honey_crystal.png diff --git a/src/main/resources/assets/extrabees/textures/items/honeyCrystalEmpty.png b/src/main/resources/assets/extrabees/textures/items/honey_crystal_empty.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/honeyCrystalEmpty.png rename to src/main/resources/assets/extrabees/textures/items/honey_crystal_empty.png diff --git a/src/main/resources/assets/extrabees/textures/items/icon/discoveredBee.png b/src/main/resources/assets/extrabees/textures/items/icon/discovered_bee.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/icon/discoveredBee.png rename to src/main/resources/assets/extrabees/textures/items/icon/discovered_bee.png diff --git a/src/main/resources/assets/extrabees/textures/items/icon/undiscoveredBee.png b/src/main/resources/assets/extrabees/textures/items/icon/undiscovered_bee.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/icon/undiscoveredBee.png rename to src/main/resources/assets/extrabees/textures/items/icon/undiscovered_bee.png diff --git a/src/main/resources/assets/extrabees/textures/items/machines/serumCaps.png b/src/main/resources/assets/extrabees/textures/items/machines/serum_caps.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/machines/serumCaps.png rename to src/main/resources/assets/extrabees/textures/items/machines/serum_caps.png diff --git a/src/main/resources/assets/extrabees/textures/items/machines/serumEdges.png b/src/main/resources/assets/extrabees/textures/items/machines/serum_edges.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/machines/serumEdges.png rename to src/main/resources/assets/extrabees/textures/items/machines/serum_edges.png diff --git a/src/main/resources/assets/extrabees/textures/items/machines/serumFilling.png b/src/main/resources/assets/extrabees/textures/items/machines/serum_filling.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/machines/serumFilling.png rename to src/main/resources/assets/extrabees/textures/items/machines/serum_filling.png diff --git a/src/main/resources/assets/extrabees/textures/items/machines/serumFilling.png.mcmeta b/src/main/resources/assets/extrabees/textures/items/machines/serum_filling.png.mcmeta similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/machines/serumFilling.png.mcmeta rename to src/main/resources/assets/extrabees/textures/items/machines/serum_filling.png.mcmeta diff --git a/src/main/resources/assets/extrabees/textures/items/machines/serumFilling.txt b/src/main/resources/assets/extrabees/textures/items/machines/serum_filling.txt similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/machines/serumFilling.txt rename to src/main/resources/assets/extrabees/textures/items/machines/serum_filling.txt diff --git a/src/main/resources/assets/extrabees/textures/items/machines/serumOutline.png b/src/main/resources/assets/extrabees/textures/items/machines/serum_outline.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/machines/serumOutline.png rename to src/main/resources/assets/extrabees/textures/items/machines/serum_outline.png diff --git a/src/main/resources/assets/extrabees/textures/items/masterApiaristDatabase.png b/src/main/resources/assets/extrabees/textures/items/master_apiarist_database.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/masterApiaristDatabase.png rename to src/main/resources/assets/extrabees/textures/items/master_apiarist_database.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/blutoniumDust.png b/src/main/resources/assets/extrabees/textures/items/misc/blutonium_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/blutoniumDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/blutonium_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/clayDust.png b/src/main/resources/assets/extrabees/textures/items/misc/clay_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/clayDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/clay_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/coalDust.png b/src/main/resources/assets/extrabees/textures/items/misc/coal_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/coalDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/coal_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/copperDust.png b/src/main/resources/assets/extrabees/textures/items/misc/copper_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/copperDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/copper_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/cyaniteDust.png b/src/main/resources/assets/extrabees/textures/items/misc/cyanite_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/cyaniteDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/cyanite_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/diamondCracked.png b/src/main/resources/assets/extrabees/textures/items/misc/diamond_cracked.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/diamondCracked.png rename to src/main/resources/assets/extrabees/textures/items/misc/diamond_cracked.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/diamondShard.png b/src/main/resources/assets/extrabees/textures/items/misc/diamond_shard.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/diamondShard.png rename to src/main/resources/assets/extrabees/textures/items/misc/diamond_shard.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dyeBlack.png b/src/main/resources/assets/extrabees/textures/items/misc/dye_black.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dyeBlack.png rename to src/main/resources/assets/extrabees/textures/items/misc/dye_black.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dyeBlue.png b/src/main/resources/assets/extrabees/textures/items/misc/dye_blue.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dyeBlue.png rename to src/main/resources/assets/extrabees/textures/items/misc/dye_blue.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dyeBrown.png b/src/main/resources/assets/extrabees/textures/items/misc/dye_brown.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dyeBrown.png rename to src/main/resources/assets/extrabees/textures/items/misc/dye_brown.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dyeGreen.png b/src/main/resources/assets/extrabees/textures/items/misc/dye_green.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dyeGreen.png rename to src/main/resources/assets/extrabees/textures/items/misc/dye_green.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dyeRed.png b/src/main/resources/assets/extrabees/textures/items/misc/dye_red.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dyeRed.png rename to src/main/resources/assets/extrabees/textures/items/misc/dye_red.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dyeWhite.png b/src/main/resources/assets/extrabees/textures/items/misc/dye_white.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dyeWhite.png rename to src/main/resources/assets/extrabees/textures/items/misc/dye_white.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dyeYellow.png b/src/main/resources/assets/extrabees/textures/items/misc/dye_yellow.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dyeYellow.png rename to src/main/resources/assets/extrabees/textures/items/misc/dye_yellow.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/emeraldShard.png b/src/main/resources/assets/extrabees/textures/items/misc/emerald_shard.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/emeraldShard.png rename to src/main/resources/assets/extrabees/textures/items/misc/emerald_shard.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/goldDust.png b/src/main/resources/assets/extrabees/textures/items/misc/gold_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/goldDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/gold_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/ironDust.png b/src/main/resources/assets/extrabees/textures/items/misc/iron_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/ironDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/iron_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/lapisShard.png b/src/main/resources/assets/extrabees/textures/items/misc/lapis_shard.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/lapisShard.png rename to src/main/resources/assets/extrabees/textures/items/misc/lapis_shard.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/leadDust.png b/src/main/resources/assets/extrabees/textures/items/misc/lead_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/leadDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/lead_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/nickelDust.png b/src/main/resources/assets/extrabees/textures/items/misc/nickel_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/nickelDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/nickel_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/platinumDust.png b/src/main/resources/assets/extrabees/textures/items/misc/platinum_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/platinumDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/platinum_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/radioactiveDust.png b/src/main/resources/assets/extrabees/textures/items/misc/radioactive_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/radioactiveDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/radioactive_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/rubyShard.png b/src/main/resources/assets/extrabees/textures/items/misc/ruby_shard.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/rubyShard.png rename to src/main/resources/assets/extrabees/textures/items/misc/ruby_shard.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/sapphireShard.png b/src/main/resources/assets/extrabees/textures/items/misc/sapphire_shard.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/sapphireShard.png rename to src/main/resources/assets/extrabees/textures/items/misc/sapphire_shard.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/scentedGear.png b/src/main/resources/assets/extrabees/textures/items/misc/scented_gear.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/scentedGear.png rename to src/main/resources/assets/extrabees/textures/items/misc/scented_gear.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/silverDust.png b/src/main/resources/assets/extrabees/textures/items/misc/silver_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/silverDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/silver_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/tinBeeswax.png b/src/main/resources/assets/extrabees/textures/items/misc/tin_beeswax.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/tinBeeswax.png rename to src/main/resources/assets/extrabees/textures/items/misc/tin_beeswax.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/tinDust.png b/src/main/resources/assets/extrabees/textures/items/misc/tin_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/tinDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/tin_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/titaniumDust.png b/src/main/resources/assets/extrabees/textures/items/misc/titanium_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/titaniumDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/titanium_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/tungstenDust.png b/src/main/resources/assets/extrabees/textures/items/misc/tungsten_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/tungstenDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/tungsten_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/vialDNA.png b/src/main/resources/assets/extrabees/textures/items/misc/vial_dna.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/vialDNA.png rename to src/main/resources/assets/extrabees/textures/items/misc/vial_dna.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/vialDNA.png.mcmeta b/src/main/resources/assets/extrabees/textures/items/misc/vial_dna.png.mcmeta similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/vialDNA.png.mcmeta rename to src/main/resources/assets/extrabees/textures/items/misc/vial_dna.png.mcmeta diff --git a/src/main/resources/assets/extrabees/textures/items/misc/vialSterilised.png b/src/main/resources/assets/extrabees/textures/items/misc/vial_sterilised.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/vialSterilised.png rename to src/main/resources/assets/extrabees/textures/items/misc/vial_sterilised.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/yelloriumDust.png b/src/main/resources/assets/extrabees/textures/items/misc/yellorium_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/yelloriumDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/yellorium_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/zincDust.png b/src/main/resources/assets/extrabees/textures/items/misc/zinc_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/zincDust.png rename to src/main/resources/assets/extrabees/textures/items/misc/zinc_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/punnettSquare.png b/src/main/resources/assets/extrabees/textures/items/punnett_square.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/punnettSquare.png rename to src/main/resources/assets/extrabees/textures/items/punnett_square.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/CanWork.png b/src/main/resources/assets/extrabees/textures/items/triggers/can_work.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/CanWork.png rename to src/main/resources/assets/extrabees/textures/items/triggers/can_work.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/CannotWork.png b/src/main/resources/assets/extrabees/textures/items/triggers/cannot_work.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/CannotWork.png rename to src/main/resources/assets/extrabees/textures/items/triggers/cannot_work.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/IsNotWorking.png b/src/main/resources/assets/extrabees/textures/items/triggers/is_not_working.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/IsNotWorking.png rename to src/main/resources/assets/extrabees/textures/items/triggers/is_not_working.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/IsWorking.png b/src/main/resources/assets/extrabees/textures/items/triggers/is_working.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/IsWorking.png rename to src/main/resources/assets/extrabees/textures/items/triggers/is_working.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/NoBlankTemplate.png b/src/main/resources/assets/extrabees/textures/items/triggers/no_blank_template.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/NoBlankTemplate.png rename to src/main/resources/assets/extrabees/textures/items/triggers/no_blank_template.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/NoTemplate.png b/src/main/resources/assets/extrabees/textures/items/triggers/no_template.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/NoTemplate.png rename to src/main/resources/assets/extrabees/textures/items/triggers/no_template.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/PowerFull.png b/src/main/resources/assets/extrabees/textures/items/triggers/power_full.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/PowerFull.png rename to src/main/resources/assets/extrabees/textures/items/triggers/power_full.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/PowerHigh.png b/src/main/resources/assets/extrabees/textures/items/triggers/power_high.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/PowerHigh.png rename to src/main/resources/assets/extrabees/textures/items/triggers/power_high.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/PowerLow.png b/src/main/resources/assets/extrabees/textures/items/triggers/power_low.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/PowerLow.png rename to src/main/resources/assets/extrabees/textures/items/triggers/power_low.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/PowerMedium.png b/src/main/resources/assets/extrabees/textures/items/triggers/power_medium.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/PowerMedium.png rename to src/main/resources/assets/extrabees/textures/items/triggers/power_medium.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/PowerNone.png b/src/main/resources/assets/extrabees/textures/items/triggers/power_none.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/PowerNone.png rename to src/main/resources/assets/extrabees/textures/items/triggers/power_none.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/SerumEmpty.png b/src/main/resources/assets/extrabees/textures/items/triggers/serum_empty.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/SerumEmpty.png rename to src/main/resources/assets/extrabees/textures/items/triggers/serum_empty.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/SerumFull.png b/src/main/resources/assets/extrabees/textures/items/triggers/serum_full.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/SerumFull.png rename to src/main/resources/assets/extrabees/textures/items/triggers/serum_full.png diff --git a/src/main/resources/assets/extrabees/textures/items/triggers/SerumPure.png b/src/main/resources/assets/extrabees/textures/items/triggers/serum_pure.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/triggers/SerumPure.png rename to src/main/resources/assets/extrabees/textures/items/triggers/serum_pure.png diff --git a/src/main/resources/assets/extrabees/textures/tile/AdvancedGeneticMachine.png b/src/main/resources/assets/extrabees/textures/tile/advanced_genetic_machine.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/AdvancedGeneticMachine.png rename to src/main/resources/assets/extrabees/textures/tile/advanced_genetic_machine.png diff --git a/src/main/resources/assets/extrabees/textures/tile/AdvancedIndexer.png b/src/main/resources/assets/extrabees/textures/tile/advanced_indexer.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/AdvancedIndexer.png rename to src/main/resources/assets/extrabees/textures/tile/advanced_indexer.png diff --git a/src/main/resources/assets/extrabees/textures/tile/ApiaristDatabank.png b/src/main/resources/assets/extrabees/textures/tile/apiarist_databank.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/ApiaristDatabank.png rename to src/main/resources/assets/extrabees/textures/tile/apiarist_databank.png diff --git a/src/main/resources/assets/extrabees/textures/tile/ApiaristMachine.png b/src/main/resources/assets/extrabees/textures/tile/apiarist_machine.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/ApiaristMachine.png rename to src/main/resources/assets/extrabees/textures/tile/apiarist_machine.png diff --git a/src/main/resources/assets/extrabees/textures/tile/GeneticMachine.png b/src/main/resources/assets/extrabees/textures/tile/genetic_machine.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/GeneticMachine.png rename to src/main/resources/assets/extrabees/textures/tile/genetic_machine.png diff --git a/src/main/resources/assets/extrabees/textures/tile/IndustrialAlveary.png b/src/main/resources/assets/extrabees/textures/tile/industrial_alveary.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/IndustrialAlveary.png rename to src/main/resources/assets/extrabees/textures/tile/industrial_alveary.png diff --git a/src/main/resources/assets/extratrees/blockstates/germlings.json b/src/main/resources/assets/extratrees/blockstates/germlings.json index 81c94084..e9b265d2 100644 --- a/src/main/resources/assets/extratrees/blockstates/germlings.json +++ b/src/main/resources/assets/extratrees/blockstates/germlings.json @@ -1,115 +1,115 @@ { "variants": { - "tree=orchardapple": { "model": "extratrees:saplings/treeDefault" }, - "tree=sweetcrabapple": { "model": "extratrees:saplings/treeDefault" }, - "tree=floweringcrabapple": { "model": "extratrees:saplings/treeDefault" }, - "tree=prairiecrabapple": { "model": "extratrees:saplings/treeDefault" }, + "tree=orchardapple": { "model": "extratrees:saplings/tree_default" }, + "tree=sweetcrabapple": { "model": "extratrees:saplings/tree_default" }, + "tree=floweringcrabapple": { "model": "extratrees:saplings/tree_default" }, + "tree=prairiecrabapple": { "model": "extratrees:saplings/tree_default" }, - "tree=blackthorn": { "model": "extratrees:saplings/treeFruit" }, - "tree=cherryplum": { "model": "extratrees:saplings/treeFruit" }, - "tree=almond": { "model": "extratrees:saplings/treeFruit" }, - "tree=apricot": { "model": "extratrees:saplings/treeFruit" }, - "tree=peach": { "model": "extratrees:saplings/treeFruit" }, - "tree=nectarine": { "model": "extratrees:saplings/treeFruit" }, - "tree=wildcherry": { "model": "extratrees:saplings/treeFruit" }, - "tree=sourcherry": { "model": "extratrees:saplings/treeFruit" }, - "tree=blackcherry": { "model": "extratrees:saplings/treeFruit" }, + "tree=blackthorn": { "model": "extratrees:saplings/tree_fruit" }, + "tree=cherryplum": { "model": "extratrees:saplings/tree_fruit" }, + "tree=almond": { "model": "extratrees:saplings/tree_fruit" }, + "tree=apricot": { "model": "extratrees:saplings/tree_fruit" }, + "tree=peach": { "model": "extratrees:saplings/tree_fruit" }, + "tree=nectarine": { "model": "extratrees:saplings/tree_fruit" }, + "tree=wildcherry": { "model": "extratrees:saplings/tree_fruit" }, + "tree=sourcherry": { "model": "extratrees:saplings/tree_fruit" }, + "tree=blackcherry": { "model": "extratrees:saplings/tree_fruit" }, - "tree=orange": { "model": "extratrees:saplings/treeFruit" }, - "tree=manderin": { "model": "extratrees:saplings/treeFruit" }, - "tree=satsuma": { "model": "extratrees:saplings/treeFruit" }, - "tree=tangerine": { "model": "extratrees:saplings/treeFruit" }, - "tree=lime": { "model": "extratrees:saplings/treeFruit" }, - "tree=keylime": { "model": "extratrees:saplings/treeFruit" }, - "tree=fingerlime": { "model": "extratrees:saplings/treeFruit" }, - "tree=pomelo": { "model": "extratrees:saplings/treeFruit" }, - "tree=grapefruit": { "model": "extratrees:saplings/treeFruit" }, - "tree=kumquat": { "model": "extratrees:saplings/treeFruit" }, - "tree=citron": { "model": "extratrees:saplings/treeFruit" }, - "tree=buddhahand": { "model": "extratrees:saplings/treeFruit" }, + "tree=orange": { "model": "extratrees:saplings/tree_fruit" }, + "tree=manderin": { "model": "extratrees:saplings/tree_fruit" }, + "tree=satsuma": { "model": "extratrees:saplings/tree_fruit" }, + "tree=tangerine": { "model": "extratrees:saplings/tree_fruit" }, + "tree=lime": { "model": "extratrees:saplings/tree_fruit" }, + "tree=keylime": { "model": "extratrees:saplings/tree_fruit" }, + "tree=fingerlime": { "model": "extratrees:saplings/tree_fruit" }, + "tree=pomelo": { "model": "extratrees:saplings/tree_fruit" }, + "tree=grapefruit": { "model": "extratrees:saplings/tree_fruit" }, + "tree=kumquat": { "model": "extratrees:saplings/tree_fruit" }, + "tree=citron": { "model": "extratrees:saplings/tree_fruit" }, + "tree=buddhahand": { "model": "extratrees:saplings/tree_fruit" }, - "tree=banana": { "model": "extratrees:saplings/treeDefault" }, - "tree=redbanana": { "model": "extratrees:saplings/treeDefault" }, - "tree=plantain": { "model": "extratrees:saplings/treeDefault" }, + "tree=banana": { "model": "extratrees:saplings/tree_default" }, + "tree=redbanana": { "model": "extratrees:saplings/tree_default" }, + "tree=plantain": { "model": "extratrees:saplings/tree_default" }, - "tree=hemlock": { "model": "extratrees:saplings/treeDefault" }, - "tree=butternut": { "model": "extratrees:saplings/treeDefault" }, - "tree=rowan": { "model": "extratrees:saplings/treeDefault" }, + "tree=hemlock": { "model": "extratrees:saplings/tree_default" }, + "tree=butternut": { "model": "extratrees:saplings/tree_default" }, + "tree=rowan": { "model": "extratrees:saplings/tree_default" }, - "tree=ash": { "model": "extratrees:saplings/treeDefault" }, - "tree=alder": { "model": "extratrees:saplings/treeDefault" }, - "tree=beech": { "model": "extratrees:saplings/treeDefault" }, - "tree=copperbeech": { "model": "extratrees:saplings/treeDefault" }, - "tree=aspen": { "model": "extratrees:saplings/treeDefault" }, - "tree=yew": { "model": "extratrees:saplings/treeDefault" }, + "tree=ash": { "model": "extratrees:saplings/tree_default" }, + "tree=alder": { "model": "extratrees:saplings/tree_default" }, + "tree=beech": { "model": "extratrees:saplings/tree_default" }, + "tree=copperbeech": { "model": "extratrees:saplings/tree_default" }, + "tree=aspen": { "model": "extratrees:saplings/tree_default" }, + "tree=yew": { "model": "extratrees:saplings/tree_default" }, - "tree=cypress": { "model": "extratrees:saplings/treePoplar" }, + "tree=cypress": { "model": "extratrees:saplings/tree_poplar" }, - "tree=douglasfir": { "model": "extratrees:saplings/treeDefault" }, - "tree=hazel": { "model": "extratrees:saplings/treeDefault" }, + "tree=douglasfir": { "model": "extratrees:saplings/tree_default" }, + "tree=hazel": { "model": "extratrees:saplings/tree_default" }, - "tree=dwarfhazel": { "model": "extratrees:saplings/treeShrub" }, + "tree=dwarfhazel": { "model": "extratrees:saplings/tree_shrub" }, - "tree=sycamore": { "model": "extratrees:saplings/treeDefault" }, - "tree=whitebeam": { "model": "extratrees:saplings/treeDefault" }, - "tree=hawthorn": { "model": "extratrees:saplings/treeDefault" }, - "tree=pecan": { "model": "extratrees:saplings/treeDefault" }, - "tree=fir": { "model": "extratrees:saplings/treeDefault" }, - "tree=cedar": { "model": "extratrees:saplings/treeDefault" }, - "tree=sallow": { "model": "extratrees:saplings/treeDefault" }, - "tree=elm": { "model": "extratrees:saplings/treeDefault" }, - "tree=elder": { "model": "extratrees:saplings/treeDefault" }, - "tree=holly": { "model": "extratrees:saplings/treeDefault" }, - "tree=hornbeam": { "model": "extratrees:saplings/treeDefault" }, - "tree=acornoak": { "model": "extratrees:saplings/treeDefault" }, - "tree=redmaple": { "model": "extratrees:saplings/treeDefault" }, - "tree=balsamfir": { "model": "extratrees:saplings/treeDefault" }, - "tree=loblollypine": { "model": "extratrees:saplings/treeDefault" }, - "tree=olive": { "model": "extratrees:saplings/treeDefault" }, - "tree=sweetgum": { "model": "extratrees:saplings/treeDefault" }, - "tree=locust": { "model": "extratrees:saplings/treeDefault" }, - "tree=pear": { "model": "extratrees:saplings/treeDefault" }, - "tree=osangeosange": { "model": "extratrees:saplings/treeDefault" }, - "tree=oldfustic": { "model": "extratrees:saplings/treeDefault" }, - "tree=brazilwood": { "model": "extratrees:saplings/treeDefault" }, - "tree=logwood": { "model": "extratrees:saplings/treeDefault" }, - "tree=rosewood": { "model": "extratrees:saplings/treeDefault" }, - "tree=purpleheart": { "model": "extratrees:saplings/treeDefault" }, - "tree=iroko": { "model": "extratrees:saplings/treeDefault" }, - "tree=gingko": { "model": "extratrees:saplings/treeDefault" }, - "tree=brazilnut": { "model": "extratrees:saplings/treeDefault" }, - "tree=rosegum": { "model": "extratrees:saplings/treeDefault" }, - "tree=swampgum": { "model": "extratrees:saplings/treeDefault" }, - "tree=box": { "model": "extratrees:saplings/treeDefault" }, - "tree=clove": { "model": "extratrees:saplings/treeDefault" }, - "tree=coffee": { "model": "extratrees:saplings/treeDefault" }, - "tree=monkeypuzzle": { "model": "extratrees:saplings/treeDefault" }, - "tree=rainbowgum": { "model": "extratrees:saplings/treeDefault" }, - "tree=pinkivory": { "model": "extratrees:saplings/treeDefault" }, + "tree=sycamore": { "model": "extratrees:saplings/tree_default" }, + "tree=whitebeam": { "model": "extratrees:saplings/tree_default" }, + "tree=hawthorn": { "model": "extratrees:saplings/tree_default" }, + "tree=pecan": { "model": "extratrees:saplings/tree_default" }, + "tree=fir": { "model": "extratrees:saplings/tree_default" }, + "tree=cedar": { "model": "extratrees:saplings/tree_default" }, + "tree=sallow": { "model": "extratrees:saplings/tree_default" }, + "tree=elm": { "model": "extratrees:saplings/tree_default" }, + "tree=elder": { "model": "extratrees:saplings/tree_default" }, + "tree=holly": { "model": "extratrees:saplings/tree_default" }, + "tree=hornbeam": { "model": "extratrees:saplings/tree_default" }, + "tree=acornoak": { "model": "extratrees:saplings/tree_default" }, + "tree=redmaple": { "model": "extratrees:saplings/tree_default" }, + "tree=balsamfir": { "model": "extratrees:saplings/tree_default" }, + "tree=loblollypine": { "model": "extratrees:saplings/tree_default" }, + "tree=olive": { "model": "extratrees:saplings/tree_default" }, + "tree=sweetgum": { "model": "extratrees:saplings/tree_default" }, + "tree=locust": { "model": "extratrees:saplings/tree_default" }, + "tree=pear": { "model": "extratrees:saplings/tree_default" }, + "tree=osangeosange": { "model": "extratrees:saplings/tree_default" }, + "tree=oldfustic": { "model": "extratrees:saplings/tree_default" }, + "tree=brazilwood": { "model": "extratrees:saplings/tree_default" }, + "tree=logwood": { "model": "extratrees:saplings/tree_default" }, + "tree=rosewood": { "model": "extratrees:saplings/tree_default" }, + "tree=purpleheart": { "model": "extratrees:saplings/tree_default" }, + "tree=iroko": { "model": "extratrees:saplings/tree_default" }, + "tree=gingko": { "model": "extratrees:saplings/tree_default" }, + "tree=brazilnut": { "model": "extratrees:saplings/tree_default" }, + "tree=rosegum": { "model": "extratrees:saplings/tree_default" }, + "tree=swampgum": { "model": "extratrees:saplings/tree_default" }, + "tree=box": { "model": "extratrees:saplings/tree_default" }, + "tree=clove": { "model": "extratrees:saplings/tree_default" }, + "tree=coffee": { "model": "extratrees:saplings/tree_default" }, + "tree=monkeypuzzle": { "model": "extratrees:saplings/tree_default" }, + "tree=rainbowgum": { "model": "extratrees:saplings/tree_default" }, + "tree=pinkivory": { "model": "extratrees:saplings/tree_default" }, - "tree=blackcurrant": { "model": "extratrees:saplings/treeShrub" }, - "tree=redcurrant": { "model": "extratrees:saplings/treeShrub" }, - "tree=blackberry": { "model": "extratrees:saplings/treeShrub" }, - "tree=raspberry": { "model": "extratrees:saplings/treeShrub" }, - "tree=blueberry": { "model": "extratrees:saplings/treeShrub" }, - "tree=cranberry": { "model": "extratrees:saplings/treeShrub" }, - "tree=juniper": { "model": "extratrees:saplings/treeShrub" }, - "tree=gooseberry": { "model": "extratrees:saplings/treeShrub" }, - "tree=goldenraspberry": { "model": "extratrees:saplings/treeShrub" }, + "tree=blackcurrant": { "model": "extratrees:saplings/tree_shrub" }, + "tree=redcurrant": { "model": "extratrees:saplings/tree_shrub" }, + "tree=blackberry": { "model": "extratrees:saplings/tree_shrub" }, + "tree=raspberry": { "model": "extratrees:saplings/tree_shrub" }, + "tree=blueberry": { "model": "extratrees:saplings/tree_shrub" }, + "tree=cranberry": { "model": "extratrees:saplings/tree_shrub" }, + "tree=juniper": { "model": "extratrees:saplings/tree_shrub" }, + "tree=gooseberry": { "model": "extratrees:saplings/tree_shrub" }, + "tree=goldenraspberry": { "model": "extratrees:saplings/tree_shrub" }, - "tree=cinnamon": { "model": "extratrees:saplings/treeDefault" }, - "tree=coconut": { "model": "extratrees:saplings/treeDefault" }, - "tree=cashew": { "model": "extratrees:saplings/treeDefault" }, - "tree=avacado": { "model": "extratrees:saplings/treeDefault" }, - "tree=nutmeg": { "model": "extratrees:saplings/treeDefault" }, - "tree=allspice": { "model": "extratrees:saplings/treeDefault" }, - "tree=chilli": { "model": "extratrees:saplings/treeDefault" }, - "tree=staranise": { "model": "extratrees:saplings/treeDefault" }, - "tree=mango": { "model": "extratrees:saplings/treeDefault" }, - "tree=starfruit": { "model": "extratrees:saplings/treeDefault" }, - "tree=candlenut": { "model": "extratrees:saplings/treeDefault" } + "tree=cinnamon": { "model": "extratrees:saplings/tree_default" }, + "tree=coconut": { "model": "extratrees:saplings/tree_default" }, + "tree=cashew": { "model": "extratrees:saplings/tree_default" }, + "tree=avacado": { "model": "extratrees:saplings/tree_default" }, + "tree=nutmeg": { "model": "extratrees:saplings/tree_default" }, + "tree=allspice": { "model": "extratrees:saplings/tree_default" }, + "tree=chilli": { "model": "extratrees:saplings/tree_default" }, + "tree=staranise": { "model": "extratrees:saplings/tree_default" }, + "tree=mango": { "model": "extratrees:saplings/tree_default" }, + "tree=starfruit": { "model": "extratrees:saplings/tree_default" }, + "tree=candlenut": { "model": "extratrees:saplings/tree_default" } } } \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/lang/en_GB.lang b/src/main/resources/assets/extratrees/lang/en_GB.lang index b3d24654..c9e37d22 100644 --- a/src/main/resources/assets/extratrees/lang/en_GB.lang +++ b/src/main/resources/assets/extratrees/lang/en_GB.lang @@ -192,28 +192,28 @@ extratrees.species.sweetcrabapple.name=Sweet Crab Apple extratrees.species.floweringcrabapple.name=Flowering Crab Apple extratrees.species.prairiecrabapple.name=Prairie Crab Apple extratrees.species.blackthorn.name=Blackthorn -extratrees.species.cherryplum.name=Cherry Plum +extratrees.species.cherry_plum.name=Cherry Plum extratrees.species.peach.name=Peach extratrees.species.nectarine.name=Nectarine extratrees.species.apricot.name=Apricot extratrees.species.almond.name=Almond -extratrees.species.wildcherry.name=Wild Cherry -extratrees.species.sourcherry.name=Sour Cherry -extratrees.species.blackcherry.name=Black Cherry +extratrees.species.wild_cherry.name=Wild Cherry +extratrees.species.sour_cherry.name=Sour Cherry +extratrees.species.black_cherry.name=Black Cherry extratrees.species.orange.name=Orange extratrees.species.manderin.name=Mandarin extratrees.species.satsuma.name=Satsuma extratrees.species.tangerine.name=Tangerine extratrees.species.lime.name=Lime -extratrees.species.keylime.name=Key Lime -extratrees.species.fingerlime.name=Finger Lime +extratrees.species.key_lime.name=Key Lime +extratrees.species.finger_lime.name=Finger Lime extratrees.species.pomelo.name=Pomelo extratrees.species.grapefruit.name=Grapefruit extratrees.species.kumquat.name=Kumquat extratrees.species.citron.name=Citron -extratrees.species.buddhahand.name=Buddha's Hand +extratrees.species.buddha_hand.name=Buddha's Hand extratrees.species.banana.name=Banana -extratrees.species.redbanana.name=Red Banana +extratrees.species.red_banana.name=Red Banana extratrees.species.plantain.name=Plantain extratrees.species.butternut.name=Butternut extratrees.species.rowan.name=Common Rowan @@ -249,7 +249,7 @@ extratrees.species.loblollypine.name=Loblolly Pine extratrees.species.sweetgum.name=Sweetgum extratrees.species.locust.name=Black Locust extratrees.species.pear.name=Cultivated Pear -extratrees.species.osangeosange.name=Osage-Orange +extratrees.species.osange_orange.name=Osage-Orange extratrees.species.oldfustic.name=Old Fustic extratrees.species.brazilwood.name=Brazilwood extratrees.species.logwood.name=Logwood @@ -257,7 +257,7 @@ extratrees.species.rosewood.name=Rosewood extratrees.species.purpleheart.name=Purpleheart extratrees.species.iroko.name=Iroko extratrees.species.gingko.name=Ginkgo -extratrees.species.brazilnut.name=Brazil Nut +extratrees.species.brazil_nut.name=Brazil Nut extratrees.species.rosegum.name=Rose Gum extratrees.species.swampgum.name=Swamp Gum extratrees.species.box.name=Boxwood @@ -274,7 +274,7 @@ extratrees.species.blueberry.name=Blueberry extratrees.species.cranberry.name=Cranberry extratrees.species.juniper.name=Juniper extratrees.species.gooseberry.name=Gooseberry -extratrees.species.goldenraspberry.name=Golden Raspberry +extratrees.species.golden_raspberry.name=Golden Raspberry extratrees.species.cinnamon.name=Cinnamon extratrees.species.coconut.name=Coconut extratrees.species.cashew.name=Cashew @@ -282,7 +282,7 @@ extratrees.species.avacado.name=Avocado extratrees.species.nutmeg.name=Nutmeg extratrees.species.allspice.name=Allspice extratrees.species.chilli.name=Chilli Pepper -extratrees.species.staranise.name=Star Anise +extratrees.species.star_anise.name=Star Anise extratrees.species.mango.name=Mango extratrees.species.starfruit.name=Starfruit extratrees.species.candlenut.name=Candlenut @@ -295,41 +295,41 @@ extratrees.item.food.crabapple=Crab Apple extratrees.item.food.orange=Orange extratrees.item.food.kumquat=Kumquat extratrees.item.food.lime=Lime -extratrees.item.food.wildcherry=Wild Cherry -extratrees.item.food.sourcherry=Sour Cherry -extratrees.item.food.blackcherry=Black Cherry +extratrees.item.food.wild_cherry=Wild Cherry +extratrees.item.food.sour_cherry=Sour Cherry +extratrees.item.food.black_cherry=Black Cherry extratrees.item.food.blackthorn=Blackthorn -extratrees.item.food.cherryplum=Cherry Plum +extratrees.item.food.cherry_plum=Cherry Plum extratrees.item.food.almond=Almond extratrees.item.food.apricot=Apricot extratrees.item.food.grapefruit=Grapefruit extratrees.item.food.peach=Peach extratrees.item.food.satsuma=Satsuma -extratrees.item.food.buddhahand=Buddha’s Hand +extratrees.item.food.buddha_hand=Buddha’s Hand extratrees.item.food.citron=Citron -extratrees.item.food.fingerlime=Finger Lime -extratrees.item.food.keylime=Key Lime +extratrees.item.food.finger_lime=Finger Lime +extratrees.item.food.key_lime=Key Lime extratrees.item.food.manderin=Mandarin extratrees.item.food.nectarine=Nectarine extratrees.item.food.pomelo=Pomelo extratrees.item.food.tangerine=Tangerine extratrees.item.food.pear=Pear -extratrees.item.food.sandpear=Sand Pear +extratrees.item.food.sand_pear=Sand Pear extratrees.item.food.hazelnut=Hazelnut extratrees.item.food.butternut=Butternut extratrees.item.food.beechnut=Beechnut extratrees.item.food.pecan=Pecan Nut extratrees.item.food.banana=Banana -extratrees.item.food.redbanana=Red Banana +extratrees.item.food.red_banana=Red Banana extratrees.item.food.plantain=Plantain -extratrees.item.food.brazilnut=Brazil Nut +extratrees.item.food.brazil_nut=Brazil Nut extratrees.item.food.fig=Fig extratrees.item.food.acorn=Acorn extratrees.item.food.elderberry=Elderberry extratrees.item.food.olive=Olive -extratrees.item.food.gingkonut=Gingko Nut +extratrees.item.food.gingko_nut=Gingko Nut extratrees.item.food.coffee=Coffee -extratrees.item.food.osangeorange=Osage Orange +extratrees.item.food.osange_orange=Osage Orange extratrees.item.food.clove=Clove extratrees.item.food.papayimar=Papayimar extratrees.item.food.blackcurrant=Blackcurrant @@ -340,14 +340,14 @@ extratrees.item.food.blueberry=Blueberry extratrees.item.food.cranberry=Cranberry extratrees.item.food.juniper=Juniper extratrees.item.food.gooseberry=Gooseberry -extratrees.item.food.goldenraspberry=Golden Raspberry +extratrees.item.food.golden_raspberry=Golden Raspberry extratrees.item.food.coconut=Coconut extratrees.item.food.cashew=Cashew extratrees.item.food.avacado=Avocado extratrees.item.food.nutmeg=Nutmeg extratrees.item.food.allspice=Allspice extratrees.item.food.chilli=Chilli -extratrees.item.food.staranise=Star Anise +extratrees.item.food.star_anise=Star Anise extratrees.item.food.mango=Mango extratrees.item.food.starfruit=Starfruit extratrees.item.food.candlenut=Candlenut diff --git a/src/main/resources/assets/extratrees/lang/en_US.lang b/src/main/resources/assets/extratrees/lang/en_US.lang index d99880e1..d23771d3 100644 --- a/src/main/resources/assets/extratrees/lang/en_US.lang +++ b/src/main/resources/assets/extratrees/lang/en_US.lang @@ -244,28 +244,28 @@ extratrees.species.sweetcrabapple.name=Sweet Crabapple extratrees.species.floweringcrabapple.name=Flowering Crabapple extratrees.species.prairiecrabapple.name=Prairie Crabapple extratrees.species.blackthorn.name=Blackthorn -extratrees.species.cherryplum.name=Cherry Plum +extratrees.species.cherry_plum.name=Cherry Plum extratrees.species.peach.name=Peach extratrees.species.nectarine.name=Nectarine extratrees.species.apricot.name=Apricot extratrees.species.almond.name=Almond -extratrees.species.wildcherry.name=Wild Cherry -extratrees.species.sourcherry.name=Sour Cherry -extratrees.species.blackcherry.name=Black Cherry +extratrees.species.wild_cherry.name=Wild Cherry +extratrees.species.sour_cherry.name=Sour Cherry +extratrees.species.black_cherry.name=Black Cherry extratrees.species.orange.name=Orange extratrees.species.manderin.name=Manderine extratrees.species.satsuma.name=Satsuma extratrees.species.tangerine.name=Tangerine extratrees.species.lime.name=Lime -extratrees.species.keylime.name=Key Lime -extratrees.species.fingerlime.name=Finger Lime +extratrees.species.key_lime.name=Key Lime +extratrees.species.finger_lime.name=Finger Lime extratrees.species.pomelo.name=Pomelo extratrees.species.grapefruit.name=Grapefruit extratrees.species.kumquat.name=Kumquat extratrees.species.citron.name=Citron -extratrees.species.buddhahand.name=Buddha's Hand +extratrees.species.buddha_hand.name=Buddha's Hand extratrees.species.banana.name=Banana -extratrees.species.redbanana.name=Red Banana +extratrees.species.red_banana.name=Red Banana extratrees.species.plantain.name=Plantain extratrees.species.butternut.name=Butternut extratrees.species.rowan.name=Common Rowan @@ -301,7 +301,7 @@ extratrees.species.loblollypine.name=Loblolly Pine extratrees.species.sweetgum.name=Sweetgum extratrees.species.locust.name=Black Locust extratrees.species.pear.name=Cultivated Pear -extratrees.species.osangeosange.name=Osange-Orange +extratrees.species.osange_orange.name=Osange-Orange extratrees.species.oldfustic.name=Old Fustic extratrees.species.brazilwood.name=Brazilwood extratrees.species.logwood.name=Logwood @@ -309,7 +309,7 @@ extratrees.species.rosewood.name=Rosewood extratrees.species.purpleheart.name=Purpleheart extratrees.species.iroko.name=Iroko extratrees.species.gingko.name=Ginkgo -extratrees.species.brazilnut.name=Brazil Nut +extratrees.species.brazil_nut.name=Brazil Nut extratrees.species.rosegum.name=Rose Gum extratrees.species.swampgum.name=Swamp Gum extratrees.species.box.name=Boxwood @@ -326,7 +326,7 @@ extratrees.species.blueberry.name=Blueberry extratrees.species.cranberry.name=Cranberry extratrees.species.juniper.name=Juniper extratrees.species.gooseberry.name=Gooseberry -extratrees.species.goldenraspberry.name=Golden Raspberry +extratrees.species.golden_raspberry.name=Golden Raspberry extratrees.species.cinnamon.name=Cinnamon extratrees.species.coconut.name=Coconut extratrees.species.cashew.name=Cashew @@ -334,7 +334,7 @@ extratrees.species.avacado.name=Avacado extratrees.species.nutmeg.name=Nutmeg extratrees.species.allspice.name=Allspice extratrees.species.chilli.name=Chilli Pepper -extratrees.species.staranise.name=Star Anise +extratrees.species.star_anise.name=Star Anise extratrees.species.mango.name=Mango extratrees.species.starfruit.name=Starfruit extratrees.species.candlenut.name=Candlenut @@ -347,41 +347,41 @@ extratrees.item.food.crabapple=Crabapple extratrees.item.food.orange=Orange extratrees.item.food.kumquat=Kumquat extratrees.item.food.lime=Lime -extratrees.item.food.wildcherry=Wild Cherry -extratrees.item.food.sourcherry=Sour Cherry -extratrees.item.food.blackcherry=Black Cherry +extratrees.item.food.wild_cherry=Wild Cherry +extratrees.item.food.sour_cherry=Sour Cherry +extratrees.item.food.black_cherry=Black Cherry extratrees.item.food.blackthorn=Blackthorn -extratrees.item.food.cherryplum=Cherry Plum +extratrees.item.food.cherry_plum=Cherry Plum extratrees.item.food.almond=Almond extratrees.item.food.apricot=Apricot extratrees.item.food.grapefruit=Grapefruit extratrees.item.food.peach=Peach extratrees.item.food.satsuma=Satsuma -extratrees.item.food.buddhahand=Buddhas Hand +extratrees.item.food.buddha_hand=Buddhas Hand extratrees.item.food.citron=Citron -extratrees.item.food.fingerlime=Finger Lime -extratrees.item.food.keylime=Key Lime +extratrees.item.food.finger_lime=Finger Lime +extratrees.item.food.key_lime=Key Lime extratrees.item.food.manderin=Manderin extratrees.item.food.nectarine=Nectarine extratrees.item.food.pomelo=Pomelo extratrees.item.food.tangerine=Tangerine extratrees.item.food.pear=Pear -extratrees.item.food.sandpear=Sand Pear +extratrees.item.food.sand_pear=Sand Pear extratrees.item.food.hazelnut=Hazelnut extratrees.item.food.butternut=Butternut extratrees.item.food.beechnut=Beechnut extratrees.item.food.pecan=Pecan Nut extratrees.item.food.banana=Banana -extratrees.item.food.redbanana=Red Banana +extratrees.item.food.red_banana=Red Banana extratrees.item.food.plantain=Plantain -extratrees.item.food.brazilnut=Brazil Nut +extratrees.item.food.brazil_nut=Brazil Nut extratrees.item.food.fig=Fig extratrees.item.food.acorn=Acorn extratrees.item.food.elderberry=Elderberry extratrees.item.food.olive=Olive -extratrees.item.food.gingkonut=Gingko Nut +extratrees.item.food.gingko_nut=Gingko Nut extratrees.item.food.coffee=Coffee -extratrees.item.food.osangeorange=Osange Orange +extratrees.item.food.osange_orange=Osange Orange extratrees.item.food.clove=Clove extratrees.item.food.papayimar=Papayimar extratrees.item.food.blackcurrant=Blackcurrant @@ -392,14 +392,14 @@ extratrees.item.food.blueberry=Blueberry extratrees.item.food.cranberry=Cranberry extratrees.item.food.juniper=Juniper extratrees.item.food.gooseberry=Gooseberry -extratrees.item.food.goldenraspberry=Golden Raspberry +extratrees.item.food.golden_raspberry=Golden Raspberry extratrees.item.food.coconut=Coconut extratrees.item.food.cashew=Cashew extratrees.item.food.avacado=Avacado extratrees.item.food.nutmeg=Nutmeg extratrees.item.food.allspice=Allspice extratrees.item.food.chilli=Chilli -extratrees.item.food.staranise=Star Anise +extratrees.item.food.star_anise=Star Anise extratrees.item.food.mango=Mango extratrees.item.food.starfruit=Starfruit extratrees.item.food.candlenut=Candlenut diff --git a/src/main/resources/assets/extratrees/models/block/saplings/baseSapling.json b/src/main/resources/assets/extratrees/models/block/saplings/base_sapling.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/saplings/baseSapling.json rename to src/main/resources/assets/extratrees/models/block/saplings/base_sapling.json diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treeConifer.json b/src/main/resources/assets/extratrees/models/block/saplings/tree_conifer.json similarity index 71% rename from src/main/resources/assets/extratrees/models/block/saplings/treeConifer.json rename to src/main/resources/assets/extratrees/models/block/saplings/tree_conifer.json index d37a972f..b535e48a 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treeConifer.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/tree_conifer.json @@ -1,5 +1,5 @@ { - "parent": "extratrees:block/saplings/baseSapling", + "parent": "extratrees:block/saplings/base_sapling", "textures": { "leaves": "extratrees:blocks/saplings/conifer.leaves", "trunk": "extratrees:blocks/saplings/conifer.trunk" diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treeDefault.json b/src/main/resources/assets/extratrees/models/block/saplings/tree_default.json similarity index 71% rename from src/main/resources/assets/extratrees/models/block/saplings/treeDefault.json rename to src/main/resources/assets/extratrees/models/block/saplings/tree_default.json index f341ded2..84ecacd5 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treeDefault.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/tree_default.json @@ -1,5 +1,5 @@ { - "parent": "extratrees:block/saplings/baseSapling", + "parent": "extratrees:block/saplings/base_sapling", "textures": { "leaves": "extratrees:blocks/saplings/default.leaves", "trunk": "extratrees:blocks/saplings/default.trunk" diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treeFruit.json b/src/main/resources/assets/extratrees/models/block/saplings/tree_fruit.json similarity index 71% rename from src/main/resources/assets/extratrees/models/block/saplings/treeFruit.json rename to src/main/resources/assets/extratrees/models/block/saplings/tree_fruit.json index 671f1ec0..3a038914 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treeFruit.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/tree_fruit.json @@ -1,5 +1,5 @@ { - "parent": "extratrees:block/saplings/baseSapling", + "parent": "extratrees:block/saplings/base_sapling", "textures": { "leaves": "extratrees:blocks/saplings/fruit.leaves", "trunk": "extratrees:blocks/saplings/fruit.trunk" diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treeJungle.json b/src/main/resources/assets/extratrees/models/block/saplings/tree_jungle.json similarity index 71% rename from src/main/resources/assets/extratrees/models/block/saplings/treeJungle.json rename to src/main/resources/assets/extratrees/models/block/saplings/tree_jungle.json index 5abee181..a1380b31 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treeJungle.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/tree_jungle.json @@ -1,5 +1,5 @@ { - "parent": "extratrees:block/saplings/baseSapling", + "parent": "extratrees:block/saplings/base_sapling", "textures": { "leaves": "extratrees:blocks/saplings/jungle.leaves", "trunk": "extratrees:blocks/saplings/jungle.trunk" diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treePalm.json b/src/main/resources/assets/extratrees/models/block/saplings/tree_palm.json similarity index 70% rename from src/main/resources/assets/extratrees/models/block/saplings/treePalm.json rename to src/main/resources/assets/extratrees/models/block/saplings/tree_palm.json index 296a9a9b..0e0c8522 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treePalm.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/tree_palm.json @@ -1,5 +1,5 @@ { - "parent": "extratrees:block/saplings/baseSapling", + "parent": "extratrees:block/saplings/base_sapling", "textures": { "leaves": "extratrees:blocks/saplings/palm.leaves", "trunk": "extratrees:blocks/saplings/palm.trunk" diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treePoplar.json b/src/main/resources/assets/extratrees/models/block/saplings/tree_poplar.json similarity index 71% rename from src/main/resources/assets/extratrees/models/block/saplings/treePoplar.json rename to src/main/resources/assets/extratrees/models/block/saplings/tree_poplar.json index cb63e823..07291e1f 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treePoplar.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/tree_poplar.json @@ -1,5 +1,5 @@ { - "parent": "extratrees:block/saplings/baseSapling", + "parent": "extratrees:block/saplings/base_sapling", "textures": { "leaves": "extratrees:blocks/saplings/poplar.leaves", "trunk": "extratrees:blocks/saplings/poplar.trunk" diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treeShrub.json b/src/main/resources/assets/extratrees/models/block/saplings/tree_shrub.json similarity index 71% rename from src/main/resources/assets/extratrees/models/block/saplings/treeShrub.json rename to src/main/resources/assets/extratrees/models/block/saplings/tree_shrub.json index 15e723b8..eb4bb91f 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treeShrub.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/tree_shrub.json @@ -1,5 +1,5 @@ { - "parent": "extratrees:block/saplings/baseSapling", + "parent": "extratrees:block/saplings/base_sapling", "textures": { "leaves": "extratrees:blocks/saplings/shrub.leaves", "trunk": "extratrees:blocks/saplings/shrub.trunk" diff --git a/src/main/resources/assets/extratrees/models/item/arboristDatabase.json b/src/main/resources/assets/extratrees/models/item/arboristDatabase.json deleted file mode 100644 index 27d9dedf..00000000 --- a/src/main/resources/assets/extratrees/models/item/arboristDatabase.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/arboristDatabase" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/arborist_database.json b/src/main/resources/assets/extratrees/models/item/arborist_database.json new file mode 100644 index 00000000..4ba8d91e --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/arborist_database.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/arborist_database" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/carpentryHammer.json b/src/main/resources/assets/extratrees/models/item/carpentryHammer.json deleted file mode 100644 index 35f4fec5..00000000 --- a/src/main/resources/assets/extratrees/models/item/carpentryHammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/carpentryHammer" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/carpentry_hammer.json b/src/main/resources/assets/extratrees/models/item/carpentry_hammer.json new file mode 100644 index 00000000..f81bff49 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/carpentry_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/carpentry_hammer" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/durableHammer.json b/src/main/resources/assets/extratrees/models/item/durableHammer.json deleted file mode 100644 index 770987b9..00000000 --- a/src/main/resources/assets/extratrees/models/item/durableHammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/durableHammer" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/durable_hammer.json b/src/main/resources/assets/extratrees/models/item/durable_hammer.json new file mode 100644 index 00000000..c77c2bda --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/durable_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/durable_hammer" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/lepiDatabase.json b/src/main/resources/assets/extratrees/models/item/lepiDatabase.json deleted file mode 100644 index 2f929b2c..00000000 --- a/src/main/resources/assets/extratrees/models/item/lepiDatabase.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/lepiDatabase" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/lepi_database.json b/src/main/resources/assets/extratrees/models/item/lepi_database.json new file mode 100644 index 00000000..6d05aceb --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/lepi_database.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/lepi_database" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/masterArboristDatabase.json b/src/main/resources/assets/extratrees/models/item/masterArboristDatabase.json deleted file mode 100644 index 9ef5d7d2..00000000 --- a/src/main/resources/assets/extratrees/models/item/masterArboristDatabase.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/masterArboristDatabase" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/masterLepiDatabase.json b/src/main/resources/assets/extratrees/models/item/masterLepiDatabase.json deleted file mode 100644 index 5dc2ccd3..00000000 --- a/src/main/resources/assets/extratrees/models/item/masterLepiDatabase.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/masterLepiDatabase" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/master_arborist_database.json b/src/main/resources/assets/extratrees/models/item/master_arborist_database.json new file mode 100644 index 00000000..a5ab1b5c --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/master_arborist_database.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/master_arborist_database" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/master_lepi_database.json b/src/main/resources/assets/extratrees/models/item/master_lepi_database.json new file mode 100644 index 00000000..d27ae024 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/master_lepi_database.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/master_lepi_database" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/glassFitting.json b/src/main/resources/assets/extratrees/models/item/misc/glassFitting.json deleted file mode 100644 index 7f5278c9..00000000 --- a/src/main/resources/assets/extratrees/models/item/misc/glassFitting.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/misc/glassFitting" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/misc/glass_fitting.json b/src/main/resources/assets/extratrees/models/item/misc/glass_fitting.json new file mode 100644 index 00000000..88a06312 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/glass_fitting.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/glass_fitting" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grainBarley.json b/src/main/resources/assets/extratrees/models/item/misc/grainBarley.json deleted file mode 100644 index 477d1d59..00000000 --- a/src/main/resources/assets/extratrees/models/item/misc/grainBarley.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/misc/grainBarley" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grainCorn.json b/src/main/resources/assets/extratrees/models/item/misc/grainCorn.json deleted file mode 100644 index 2e01d2f3..00000000 --- a/src/main/resources/assets/extratrees/models/item/misc/grainCorn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/misc/grainCorn" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grainRoasted.json b/src/main/resources/assets/extratrees/models/item/misc/grainRoasted.json deleted file mode 100644 index c3df5661..00000000 --- a/src/main/resources/assets/extratrees/models/item/misc/grainRoasted.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/misc/grainRoasted" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grainRye.json b/src/main/resources/assets/extratrees/models/item/misc/grainRye.json deleted file mode 100644 index 4b1acf77..00000000 --- a/src/main/resources/assets/extratrees/models/item/misc/grainRye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/misc/grainRye" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grainWheat.json b/src/main/resources/assets/extratrees/models/item/misc/grainWheat.json deleted file mode 100644 index 6da96b85..00000000 --- a/src/main/resources/assets/extratrees/models/item/misc/grainWheat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/misc/grainWheat" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grain_barley.json b/src/main/resources/assets/extratrees/models/item/misc/grain_barley.json new file mode 100644 index 00000000..875ba91f --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/grain_barley.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/grain_barley" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grain_corn.json b/src/main/resources/assets/extratrees/models/item/misc/grain_corn.json new file mode 100644 index 00000000..19cf92a1 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/grain_corn.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/grain_corn" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grain_roasted.json b/src/main/resources/assets/extratrees/models/item/misc/grain_roasted.json new file mode 100644 index 00000000..01489b7a --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/grain_roasted.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/grain_roasted" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grain_rye.json b/src/main/resources/assets/extratrees/models/item/misc/grain_rye.json new file mode 100644 index 00000000..503ea1f6 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/grain_rye.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/grain_rye" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grain_wheat.json b/src/main/resources/assets/extratrees/models/item/misc/grain_wheat.json new file mode 100644 index 00000000..0249dfe7 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/grain_wheat.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/grain_wheat" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/provenGear.json b/src/main/resources/assets/extratrees/models/item/misc/provenGear.json deleted file mode 100644 index f21d6779..00000000 --- a/src/main/resources/assets/extratrees/models/item/misc/provenGear.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/misc/provenGear" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/misc/proven_gear.json b/src/main/resources/assets/extratrees/models/item/misc/proven_gear.json new file mode 100644 index 00000000..ae484942 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/proven_gear.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/proven_gear" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/woodWax.json b/src/main/resources/assets/extratrees/models/item/misc/woodWax.json deleted file mode 100644 index 916ce220..00000000 --- a/src/main/resources/assets/extratrees/models/item/misc/woodWax.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/misc/woodWax" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/misc/wood_wax.json b/src/main/resources/assets/extratrees/models/item/misc/wood_wax.json new file mode 100644 index 00000000..4633cec8 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/wood_wax.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/wood_wax" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/yeastLager.json b/src/main/resources/assets/extratrees/models/item/misc/yeastLager.json deleted file mode 100644 index 9a23cd7a..00000000 --- a/src/main/resources/assets/extratrees/models/item/misc/yeastLager.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extratrees:items/misc/yeastLager" - } -} diff --git a/src/main/resources/assets/extratrees/models/item/misc/yeast_lager.json b/src/main/resources/assets/extratrees/models/item/misc/yeast_lager.json new file mode 100644 index 00000000..0bba9dbe --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/yeast_lager.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/yeast_lager" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/saplings/treeConifer.json b/src/main/resources/assets/extratrees/models/item/saplings/tree_conifer.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/treeConifer.json rename to src/main/resources/assets/extratrees/models/item/saplings/tree_conifer.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/treeDefault.json b/src/main/resources/assets/extratrees/models/item/saplings/tree_default.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/treeDefault.json rename to src/main/resources/assets/extratrees/models/item/saplings/tree_default.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/treeFruit.json b/src/main/resources/assets/extratrees/models/item/saplings/tree_fruit.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/treeFruit.json rename to src/main/resources/assets/extratrees/models/item/saplings/tree_fruit.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/treeJungle.json b/src/main/resources/assets/extratrees/models/item/saplings/tree_jungle.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/treeJungle.json rename to src/main/resources/assets/extratrees/models/item/saplings/tree_jungle.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/treePalm.json b/src/main/resources/assets/extratrees/models/item/saplings/tree_palm.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/treePalm.json rename to src/main/resources/assets/extratrees/models/item/saplings/tree_palm.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/treePoplar.json b/src/main/resources/assets/extratrees/models/item/saplings/tree_poplar.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/treePoplar.json rename to src/main/resources/assets/extratrees/models/item/saplings/tree_poplar.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/treeShrub.json b/src/main/resources/assets/extratrees/models/item/saplings/tree_shrub.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/treeShrub.json rename to src/main/resources/assets/extratrees/models/item/saplings/tree_shrub.json diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/alderBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/alder_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/alderBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/alder_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/alderTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/alder_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/alderTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/alder_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/appleBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/apple_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/appleBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/apple_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/appleTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/apple_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/appleTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/apple_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/ashBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/ash_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/ashBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/ash_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/ashTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/ash_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/ashTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/ash_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/bananaBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/banana_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/bananaBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/banana_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/bananaTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/banana_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/bananaTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/banana_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/beechBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/beech_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/beechBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/beech_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/beechTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/beech_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/beechTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/beech_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/boxBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/box_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/boxBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/box_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/boxTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/box_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/boxTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/box_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/brazilwoodBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/brazilwoodBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/brazilwoodTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/brazilwoodTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/butternutBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/butternut_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/butternutBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/butternut_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/butternutTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/butternut_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/butternutTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/butternut_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cedarBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/cedar_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cedarBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/cedar_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cedarTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/cedar_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cedarTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/cedar_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cherryBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/cherry_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cherryBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/cherry_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cherryTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/cherry_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cherryTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/cherry_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cinnamonBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cinnamonBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cinnamonTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cinnamonTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cypressBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/cypress_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cypressBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/cypress_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cypressTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/cypress_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cypressTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/cypress_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/elderBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/elder_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/elderBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/elder_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/elderTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/elder_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/elderTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/elder_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/elmBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/elm_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/elmBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/elm_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/elmTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/elm_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/elmTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/elm_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2Bark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2Bark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2Trunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2Trunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3Bark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3Bark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3Trunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3Trunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptusBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptusBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptusTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptusTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/figBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/fig_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/figBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/fig_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/figTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/fig_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/figTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/fig_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/firBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/fir_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/firBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/fir_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/firTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/fir_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/firTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/fir_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/gingkoBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/gingko_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/gingkoBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/gingko_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/gingkoTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/gingko_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/gingkoTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/gingko_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hawthornBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hawthornBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hawthornTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hawthornTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hazelBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/hazel_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hazelBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/hazel_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hazelTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/hazel_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hazelTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/hazel_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hemlockBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hemlockBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hemlockTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hemlockTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hickoryBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/hickory_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hickoryBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/hickory_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hickoryTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/hickory_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hickoryTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/hickory_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hollyBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/holly_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hollyBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/holly_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hollyTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/holly_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hollyTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/holly_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hornbeamBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hornbeamBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hornbeamTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hornbeamTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/irokoBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/iroko_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/irokoBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/iroko_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/irokoTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/iroko_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/irokoTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/iroko_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/locustBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/locust_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/locustBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/locust_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/locustTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/locust_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/locustTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/locust_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/logwoodBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/logwood_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/logwoodBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/logwood_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/logwoodTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/logwood_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/logwoodTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/logwood_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/macluraBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/maclura_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/macluraBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/maclura_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/macluraTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/maclura_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/macluraTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/maclura_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/mapleBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/maple_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/mapleBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/maple_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/mapleTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/maple_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/mapleTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/maple_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/oliveBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/olive_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/oliveBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/olive_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/oliveTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/olive_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/oliveTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/olive_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/pearBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/pear_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/pearBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/pear_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/pearTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/pear_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/pearTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/pear_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/pinkivoryBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/pinkivoryBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/pinkivoryTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/pinkivoryTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/purpleheartBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/purpleheartBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/purpleheartTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/purpleheartTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/rosewoodBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/rosewoodBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/rosewoodTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/rosewoodTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/rowanBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/rowan_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/rowanBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/rowan_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/rowanTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/rowan_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/rowanTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/rowan_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/sweetgumBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/sweetgumBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/sweetgumTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/sweetgumTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/syzgiumBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/syzgiumBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/syzgiumTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/syzgiumTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/whitebeamBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/whitebeamBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/whitebeamTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/whitebeamTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/yewBark.png b/src/main/resources/assets/extratrees/textures/blocks/logs/yew_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/yewBark.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/yew_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/yewTrunk.png b/src/main/resources/assets/extratrees/textures/blocks/logs/yew_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/yewTrunk.png rename to src/main/resources/assets/extratrees/textures/blocks/logs/yew_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.treeAcacia.png b/src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_acacia.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.treeAcacia.png rename to src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_acacia.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.treePoplar.png b/src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_poplar.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.treePoplar.png rename to src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_poplar.png diff --git a/src/main/resources/assets/extratrees/textures/entities/CamberwellBeauty.png b/src/main/resources/assets/extratrees/textures/entities/camberwell_beauty.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/CamberwellBeauty.png rename to src/main/resources/assets/extratrees/textures/entities/camberwell_beauty.png diff --git a/src/main/resources/assets/extratrees/textures/entities/CrimsonRose.png b/src/main/resources/assets/extratrees/textures/entities/crimson_rose.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/CrimsonRose.png rename to src/main/resources/assets/extratrees/textures/entities/crimson_rose.png diff --git a/src/main/resources/assets/extratrees/textures/entities/GoldenBirdwing.png b/src/main/resources/assets/extratrees/textures/entities/golden_birdwing.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/GoldenBirdwing.png rename to src/main/resources/assets/extratrees/textures/entities/golden_birdwing.png diff --git a/src/main/resources/assets/extratrees/textures/entities/KaiserIHind.png b/src/main/resources/assets/extratrees/textures/entities/kaiser_i_hind.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/KaiserIHind.png rename to src/main/resources/assets/extratrees/textures/entities/kaiser_i_hind.png diff --git a/src/main/resources/assets/extratrees/textures/entities/MarbledWhite.png b/src/main/resources/assets/extratrees/textures/entities/marbled_white.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/MarbledWhite.png rename to src/main/resources/assets/extratrees/textures/entities/marbled_white.png diff --git a/src/main/resources/assets/extratrees/textures/entities/MarshFritillary.png b/src/main/resources/assets/extratrees/textures/entities/marsh_fritillary.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/MarshFritillary.png rename to src/main/resources/assets/extratrees/textures/entities/marsh_fritillary.png diff --git a/src/main/resources/assets/extratrees/textures/entities/MeadowBrown.png b/src/main/resources/assets/extratrees/textures/entities/meadow_brown.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/MeadowBrown.png rename to src/main/resources/assets/extratrees/textures/entities/meadow_brown.png diff --git a/src/main/resources/assets/extratrees/textures/entities/PaintedLady.png b/src/main/resources/assets/extratrees/textures/entities/painted_lady.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/PaintedLady.png rename to src/main/resources/assets/extratrees/textures/entities/painted_lady.png diff --git a/src/main/resources/assets/extratrees/textures/entities/PearlBorderedFritillary.png b/src/main/resources/assets/extratrees/textures/entities/pearl_bordered_fritillary.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/PearlBorderedFritillary.png rename to src/main/resources/assets/extratrees/textures/entities/pearl_bordered_fritillary.png diff --git a/src/main/resources/assets/extratrees/textures/entities/PurpleEmperor.png b/src/main/resources/assets/extratrees/textures/entities/purple_emperor.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/PurpleEmperor.png rename to src/main/resources/assets/extratrees/textures/entities/purple_emperor.png diff --git a/src/main/resources/assets/extratrees/textures/entities/QueenOfSpainFritillary.png b/src/main/resources/assets/extratrees/textures/entities/queen_of_spain_fritillary.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/QueenOfSpainFritillary.png rename to src/main/resources/assets/extratrees/textures/entities/queen_of_spain_fritillary.png diff --git a/src/main/resources/assets/extratrees/textures/entities/RedAdmiral.png b/src/main/resources/assets/extratrees/textures/entities/red_admiral.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/RedAdmiral.png rename to src/main/resources/assets/extratrees/textures/entities/red_admiral.png diff --git a/src/main/resources/assets/extratrees/textures/entities/ScotchAngus.png b/src/main/resources/assets/extratrees/textures/entities/scotch_angus.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/ScotchAngus.png rename to src/main/resources/assets/extratrees/textures/entities/scotch_angus.png diff --git a/src/main/resources/assets/extratrees/textures/entities/SmallHeath.png b/src/main/resources/assets/extratrees/textures/entities/small_heath.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/SmallHeath.png rename to src/main/resources/assets/extratrees/textures/entities/small_heath.png diff --git a/src/main/resources/assets/extratrees/textures/entities/SmallTortoiseshell.png b/src/main/resources/assets/extratrees/textures/entities/small_tortoiseshell.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/SmallTortoiseshell.png rename to src/main/resources/assets/extratrees/textures/entities/small_tortoiseshell.png diff --git a/src/main/resources/assets/extratrees/textures/entities/SpeckledWood.png b/src/main/resources/assets/extratrees/textures/entities/speckled_wood.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/SpeckledWood.png rename to src/main/resources/assets/extratrees/textures/entities/speckled_wood.png diff --git a/src/main/resources/assets/extratrees/textures/entities/WhiteAdmiral.png b/src/main/resources/assets/extratrees/textures/entities/white_admiral.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entities/WhiteAdmiral.png rename to src/main/resources/assets/extratrees/textures/entities/white_admiral.png diff --git a/src/main/resources/assets/extratrees/textures/gui/MothDatabase.png b/src/main/resources/assets/extratrees/textures/gui/moth_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/MothDatabase.png rename to src/main/resources/assets/extratrees/textures/gui/moth_database.png diff --git a/src/main/resources/assets/extratrees/textures/gui/MothDatabase2.png b/src/main/resources/assets/extratrees/textures/gui/moth_database2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/MothDatabase2.png rename to src/main/resources/assets/extratrees/textures/gui/moth_database2.png diff --git a/src/main/resources/assets/extratrees/textures/gui/TreeDatabase.png b/src/main/resources/assets/extratrees/textures/gui/tree_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/TreeDatabase.png rename to src/main/resources/assets/extratrees/textures/gui/tree_database.png diff --git a/src/main/resources/assets/extratrees/textures/gui/TreeDatabase2.png b/src/main/resources/assets/extratrees/textures/gui/tree_database2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/TreeDatabase2.png rename to src/main/resources/assets/extratrees/textures/gui/tree_database2.png diff --git a/src/main/resources/assets/extratrees/textures/items/arboristDatabase.png b/src/main/resources/assets/extratrees/textures/items/arborist_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/arboristDatabase.png rename to src/main/resources/assets/extratrees/textures/items/arborist_database.png diff --git a/src/main/resources/assets/extratrees/textures/items/carpentryHammer.png b/src/main/resources/assets/extratrees/textures/items/carpentry_hammer.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/carpentryHammer.png rename to src/main/resources/assets/extratrees/textures/items/carpentry_hammer.png diff --git a/src/main/resources/assets/extratrees/textures/items/durableHammer.png b/src/main/resources/assets/extratrees/textures/items/durable_hammer.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/durableHammer.png rename to src/main/resources/assets/extratrees/textures/items/durable_hammer.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Bay Laurel.png b/src/main/resources/assets/extratrees/textures/items/food/bay_laurel.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Bay Laurel.png rename to src/main/resources/assets/extratrees/textures/items/food/bay_laurel.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Bay Rum Berry.png b/src/main/resources/assets/extratrees/textures/items/food/bay_rum_berry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Bay Rum Berry.png rename to src/main/resources/assets/extratrees/textures/items/food/bay_rum_berry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Black Walnut.png b/src/main/resources/assets/extratrees/textures/items/food/black_walnut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Black Walnut.png rename to src/main/resources/assets/extratrees/textures/items/food/black_walnut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Bunya nut001.png b/src/main/resources/assets/extratrees/textures/items/food/bunya_nut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Bunya nut001.png rename to src/main/resources/assets/extratrees/textures/items/food/bunya_nut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/cinnamon sticks001.png b/src/main/resources/assets/extratrees/textures/items/food/cinnamon_sticks001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/cinnamon sticks001.png rename to src/main/resources/assets/extratrees/textures/items/food/cinnamon_sticks001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Curry Leaf001.png b/src/main/resources/assets/extratrees/textures/items/food/curry_leaf001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Curry Leaf001.png rename to src/main/resources/assets/extratrees/textures/items/food/curry_leaf001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Finger lime blackish001.png b/src/main/resources/assets/extratrees/textures/items/food/finger_lime_blackish001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Finger lime blackish001.png rename to src/main/resources/assets/extratrees/textures/items/food/finger_lime_blackish001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Finger Lime Green 001.png b/src/main/resources/assets/extratrees/textures/items/food/finger_lime_green_001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Finger Lime Green 001.png rename to src/main/resources/assets/extratrees/textures/items/food/finger_lime_green_001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Finger Lime orange 001.png b/src/main/resources/assets/extratrees/textures/items/food/finger_lime_orange_001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Finger Lime orange 001.png rename to src/main/resources/assets/extratrees/textures/items/food/finger_lime_orange_001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Finger Lime Yellow001.png b/src/main/resources/assets/extratrees/textures/items/food/finger_lime_yellow001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Finger Lime Yellow001.png rename to src/main/resources/assets/extratrees/textures/items/food/finger_lime_yellow001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Fruit progress.PNG b/src/main/resources/assets/extratrees/textures/items/food/fruit_progress.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Fruit progress.PNG rename to src/main/resources/assets/extratrees/textures/items/food/fruit_progress.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Ice Cream Bean002.png b/src/main/resources/assets/extratrees/textures/items/food/ice_cream_bean002.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Ice Cream Bean002.png rename to src/main/resources/assets/extratrees/textures/items/food/ice_cream_bean002.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Kola nut001.png b/src/main/resources/assets/extratrees/textures/items/food/kola_nut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Kola nut001.png rename to src/main/resources/assets/extratrees/textures/items/food/kola_nut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Kukui Nut001.png b/src/main/resources/assets/extratrees/textures/items/food/kukui_nut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Kukui Nut001.png rename to src/main/resources/assets/extratrees/textures/items/food/kukui_nut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/mamey sapote001.png b/src/main/resources/assets/extratrees/textures/items/food/mamey_sapote001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/mamey sapote001.png rename to src/main/resources/assets/extratrees/textures/items/food/mamey_sapote001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/MonkeyPuzzleNut.png b/src/main/resources/assets/extratrees/textures/items/food/monkey_puzzle_nut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/MonkeyPuzzleNut.png rename to src/main/resources/assets/extratrees/textures/items/food/monkey_puzzle_nut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Ohia ai001.png b/src/main/resources/assets/extratrees/textures/items/food/ohia_ai001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Ohia ai001.png rename to src/main/resources/assets/extratrees/textures/items/food/ohia_ai001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Paradise nut001.png b/src/main/resources/assets/extratrees/textures/items/food/paradise_nut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Paradise nut001.png rename to src/main/resources/assets/extratrees/textures/items/food/paradise_nut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/passion fruit001.png b/src/main/resources/assets/extratrees/textures/items/food/passion_fruit001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/passion fruit001.png rename to src/main/resources/assets/extratrees/textures/items/food/passion_fruit001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Peruvian pepper001.png b/src/main/resources/assets/extratrees/textures/items/food/peruvian_pepper001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Peruvian pepper001.png rename to src/main/resources/assets/extratrees/textures/items/food/peruvian_pepper001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Pine nut001.png b/src/main/resources/assets/extratrees/textures/items/food/pine_nut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Pine nut001.png rename to src/main/resources/assets/extratrees/textures/items/food/pine_nut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/Tropical Apricot001.png b/src/main/resources/assets/extratrees/textures/items/food/tropical_apricot001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/Tropical Apricot001.png rename to src/main/resources/assets/extratrees/textures/items/food/tropical_apricot001.png diff --git a/src/main/resources/assets/extratrees/textures/items/icon/discoveredMoth.png b/src/main/resources/assets/extratrees/textures/items/icon/discovered_moth.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/icon/discoveredMoth.png rename to src/main/resources/assets/extratrees/textures/items/icon/discovered_moth.png diff --git a/src/main/resources/assets/extratrees/textures/items/icon/discoveredTree.png b/src/main/resources/assets/extratrees/textures/items/icon/discovered_tree.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/icon/discoveredTree.png rename to src/main/resources/assets/extratrees/textures/items/icon/discovered_tree.png diff --git a/src/main/resources/assets/extratrees/textures/items/icon/undiscoveredMoth.png b/src/main/resources/assets/extratrees/textures/items/icon/undiscovered_moth.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/icon/undiscoveredMoth.png rename to src/main/resources/assets/extratrees/textures/items/icon/undiscovered_moth.png diff --git a/src/main/resources/assets/extratrees/textures/items/icon/undiscoveredTree.png b/src/main/resources/assets/extratrees/textures/items/icon/undiscovered_tree.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/icon/undiscoveredTree.png rename to src/main/resources/assets/extratrees/textures/items/icon/undiscovered_tree.png diff --git a/src/main/resources/assets/extratrees/textures/items/lepiDatabase.png b/src/main/resources/assets/extratrees/textures/items/lepi_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/lepiDatabase.png rename to src/main/resources/assets/extratrees/textures/items/lepi_database.png diff --git a/src/main/resources/assets/extratrees/textures/items/masterArboristDatabase.png b/src/main/resources/assets/extratrees/textures/items/master_arborist_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/masterArboristDatabase.png rename to src/main/resources/assets/extratrees/textures/items/master_arborist_database.png diff --git a/src/main/resources/assets/extratrees/textures/items/masterLepiDatabase.png b/src/main/resources/assets/extratrees/textures/items/master_lepi_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/masterLepiDatabase.png rename to src/main/resources/assets/extratrees/textures/items/master_lepi_database.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/glassFitting.png b/src/main/resources/assets/extratrees/textures/items/misc/glass_fitting.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/glassFitting.png rename to src/main/resources/assets/extratrees/textures/items/misc/glass_fitting.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/grainBarley.png b/src/main/resources/assets/extratrees/textures/items/misc/grain_barley.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/grainBarley.png rename to src/main/resources/assets/extratrees/textures/items/misc/grain_barley.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/grainCorn.png b/src/main/resources/assets/extratrees/textures/items/misc/grain_corn.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/grainCorn.png rename to src/main/resources/assets/extratrees/textures/items/misc/grain_corn.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/grainRoasted.png b/src/main/resources/assets/extratrees/textures/items/misc/grain_roasted.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/grainRoasted.png rename to src/main/resources/assets/extratrees/textures/items/misc/grain_roasted.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/grainRye.png b/src/main/resources/assets/extratrees/textures/items/misc/grain_rye.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/grainRye.png rename to src/main/resources/assets/extratrees/textures/items/misc/grain_rye.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/grainWheat.png b/src/main/resources/assets/extratrees/textures/items/misc/grain_wheat.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/grainWheat.png rename to src/main/resources/assets/extratrees/textures/items/misc/grain_wheat.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/provenGear.png b/src/main/resources/assets/extratrees/textures/items/misc/proven_gear.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/provenGear.png rename to src/main/resources/assets/extratrees/textures/items/misc/proven_gear.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/woodWax.png b/src/main/resources/assets/extratrees/textures/items/misc/wood_wax.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/woodWax.png rename to src/main/resources/assets/extratrees/textures/items/misc/wood_wax.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/yeastLager.png b/src/main/resources/assets/extratrees/textures/items/misc/yeast_lager.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/yeastLager.png rename to src/main/resources/assets/extratrees/textures/items/misc/yeast_lager.png diff --git a/src/main/resources/assets/extratrees/textures/items/setSquare0.png b/src/main/resources/assets/extratrees/textures/items/set_square0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/setSquare0.png rename to src/main/resources/assets/extratrees/textures/items/set_square0.png diff --git a/src/main/resources/assets/extratrees/textures/items/setSquare1.png b/src/main/resources/assets/extratrees/textures/items/set_square1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/setSquare1.png rename to src/main/resources/assets/extratrees/textures/items/set_square1.png diff --git a/src/main/resources/assets/extratrees/textures/items/setSquare2.png b/src/main/resources/assets/extratrees/textures/items/set_square2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/setSquare2.png rename to src/main/resources/assets/extratrees/textures/items/set_square2.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/NurseryOccupied.png b/src/main/resources/assets/forestry/textures/tile/extratrees/nursery_occupied.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/NurseryOccupied.png rename to src/main/resources/assets/forestry/textures/tile/extratrees/nursery_occupied.png diff --git a/src/main/resources/assets/genetics/blockstates/advMachine.json b/src/main/resources/assets/genetics/blockstates/adv_machine.json similarity index 91% rename from src/main/resources/assets/genetics/blockstates/advMachine.json rename to src/main/resources/assets/genetics/blockstates/adv_machine.json index 8c1f7197..88c8db5a 100644 --- a/src/main/resources/assets/genetics/blockstates/advMachine.json +++ b/src/main/resources/assets/genetics/blockstates/adv_machine.json @@ -10,7 +10,7 @@ "machine_type":{ "0": { "textures":{ - "all": "genetics:tile/Splicer" + "all": "genetics:tile/splicer" } }, "1": {}, diff --git a/src/main/resources/assets/genetics/blockstates/labMachine.json b/src/main/resources/assets/genetics/blockstates/lab_machine.json similarity index 73% rename from src/main/resources/assets/genetics/blockstates/labMachine.json rename to src/main/resources/assets/genetics/blockstates/lab_machine.json index f209e1b8..4f8c3351 100644 --- a/src/main/resources/assets/genetics/blockstates/labMachine.json +++ b/src/main/resources/assets/genetics/blockstates/lab_machine.json @@ -10,27 +10,27 @@ "machine_type":{ "0": { "textures":{ - "all": "genetics:tile/LabMachine" + "all": "genetics:tile/lab_machine" } }, "1": { "textures":{ - "all": "genetics:tile/Analyser" + "all": "genetics:tile/analyser" } }, "2": { "textures":{ - "all": "genetics:tile/Incubator" + "all": "genetics:tile/incubator" } }, "3": { "textures":{ - "all": "genetics:tile/Genepool" + "all": "genetics:tile/genepool" } }, "4": { "textures":{ - "all": "genetics:tile/Acclimatiser" + "all": "genetics:tile/acclimatiser" } }, "5": {}, diff --git a/src/main/resources/assets/genetics/blockstates/machine.json b/src/main/resources/assets/genetics/blockstates/machine.json index e1d2761a..9c86fa5b 100644 --- a/src/main/resources/assets/genetics/blockstates/machine.json +++ b/src/main/resources/assets/genetics/blockstates/machine.json @@ -10,22 +10,22 @@ "machine_type":{ "0": { "textures":{ - "all": "genetics:tile/Isolator" + "all": "genetics:tile/isolator" } }, "1": { "textures":{ - "all": "genetics:tile/Sequencer" + "all": "genetics:tile/sequencer" } }, "2": { "textures":{ - "all": "genetics:tile/Polymeriser" + "all": "genetics:tile/polymeriser" } }, "3": { "textures":{ - "all": "genetics:tile/Inoculator" + "all": "genetics:tile/inoculator" } }, "4": {}, diff --git a/src/main/resources/assets/genetics/lang/en_GB.lang b/src/main/resources/assets/genetics/lang/en_GB.lang index ad86e939..34dc77a4 100644 --- a/src/main/resources/assets/genetics/lang/en_GB.lang +++ b/src/main/resources/assets/genetics/lang/en_GB.lang @@ -13,22 +13,22 @@ genetics.machine.machine.polymeriser.info=The Polymeriser takes serums and refil genetics.machine.machine.inoculator=Inoculator genetics.machine.machine.inoculator.info=The Inoculator uses serums to add genes to breedable individuals. This process takes a very long time and requires a Bacteria Vector, but is 100% successful. -genetics.machine.labMachine.genepool=Genepool -genetics.machine.labMachine.genepool.info=The Genepool uses enzymes and ethanol to break down living things into DNA. All genetic information is lost and the source of the DNA is destroyed. +genetics.machine.lab_machine.genepool=Genepool +genetics.machine.lab_machine.genepool.info=The Genepool uses enzymes and ethanol to break down living things into DNA. All genetic information is lost and the source of the DNA is destroyed. -genetics.machine.labMachine.labMachine=Lab Stand +genetics.machine.lab_machine.lab_machine=Lab Stand -genetics.machine.labMachine.analyser=Analyser -genetics.machine.labMachine.analyser.info=The Analyser takes breedable individuals and DNA sequencers and analyses them to determine the genes present. This requires DNA Dye, created from purple dye and glowstone +genetics.machine.lab_machine.analyser=Analyser +genetics.machine.lab_machine.analyser.info=The Analyser takes breedable individuals and DNA sequencers and analyses them to determine the genes present. This requires DNA Dye, created from purple dye and glowstone -genetics.machine.labMachine.incubator=Incubator -genetics.machine.labMachine.incubator.info=The Incubator combines liquids and items and allows them to sit at an ideal temperature to encourage bacterial growth. +genetics.machine.lab_machine.incubator=Incubator +genetics.machine.lab_machine.incubator.info=The Incubator combines liquids and items and allows them to sit at an ideal temperature to encourage bacterial growth. -genetics.machine.labMachine.acclimatiser=Acclimatiser +genetics.machine.lab_machine.acclimatiser=Acclimatiser -genetics.machine.advMachine.splicer=Splicer -genetics.machine.advMachine.splicer.info=The Splicer is an incredibly powerful machine to insert genes into individuals. It is fast, but needs insane amounts of power. +genetics.machine.adv_machine.splicer=Splicer +genetics.machine.adv_machine.splicer.info=The Splicer is an incredibly powerful machine to insert genes into individuals. It is fast, but needs insane amounts of power. diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index cf3d2ed2..1961a063 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -49,38 +49,38 @@ genetics.machine.machine.inoculator.errors.no.individual.desc=No Individual to I genetics.machine.machine.inoculator.tooltips.logic.gene=Inoculating with 1 gene genetics.machine.machine.inoculator.tooltips.logic.genes=Inoculating with %s genes -genetics.machine.labMachine.genepool=Genepool -genetics.machine.labMachine.genepool.info=The Genepool uses enzymes and ethanol to break down living things into DNA. During this process, all genetic information is lost and the source of the DNA is destroyed. -genetics.machine.labMachine.genepool.errors.not.enough.ethanol.desc=Not enough Ethanol -genetics.machine.labMachine.genepool.errors.insufficient.enzyme.desc=Insufficient Enzyme +genetics.machine.lab_machine.genepool=Genepool +genetics.machine.lab_machine.genepool.info=The Genepool uses enzymes and ethanol to break down living things into DNA. During this process, all genetic information is lost and the source of the DNA is destroyed. +genetics.machine.lab_machine.genepool.errors.not.enough.ethanol.desc=Not enough Ethanol +genetics.machine.lab_machine.genepool.errors.insufficient.enzyme.desc=Insufficient Enzyme -genetics.machine.labMachine.labMachine=Lab Stand +genetics.machine.lab_machine.lab_machine=Lab Stand -genetics.machine.labMachine.analyser=Analyser -genetics.machine.labMachine.analyser.info=The Analyser takes breedable individuals and DNA sequencers and analyses them to determine the genes present. This requires DNA Dye, created from purple dye and glowstone -genetics.machine.labMachine.analyser.errors.insufficient.dye.desc=Insufficient Dye -genetics.machine.labMachine.analyser.errors.insufficient.dye.info=Not enough DNA dye to analyse -genetics.machine.labMachine.analyser.errors.already.analysed.desc=Already Analysed -genetics.machine.labMachine.analyser.errors.already.analysed.info=Item has already been analysed -genetics.machine.labMachine.analyser.errors.no.item.desc=No item to analyse -genetics.machine.labMachine.analyser.tooltips.slots.unanalysed=Unanalysed Item +genetics.machine.lab_machine.analyser=Analyser +genetics.machine.lab_machine.analyser.info=The Analyser takes breedable individuals and DNA sequencers and analyses them to determine the genes present. This requires DNA Dye, created from purple dye and glowstone +genetics.machine.lab_machine.analyser.errors.insufficient.dye.desc=Insufficient Dye +genetics.machine.lab_machine.analyser.errors.insufficient.dye.info=Not enough DNA dye to analyse +genetics.machine.lab_machine.analyser.errors.already.analysed.desc=Already Analysed +genetics.machine.lab_machine.analyser.errors.already.analysed.info=Item has already been analysed +genetics.machine.lab_machine.analyser.errors.no.item.desc=No item to analyse +genetics.machine.lab_machine.analyser.tooltips.slots.unanalysed=Unanalysed Item -genetics.machine.labMachine.incubator=Incubator -genetics.machine.labMachine.incubator.info=The Incubator combines liquids and items and allows them to sit at an ideal temperature to encourage bacterial growth. -genetics.machine.labMachine.incubator.errors.no.liquid.desc=Not enough incubation liquid -genetics.machine.labMachine.incubator.errors.no.room.desc=No room for output +genetics.machine.lab_machine.incubator=Incubator +genetics.machine.lab_machine.incubator.info=The Incubator combines liquids and items and allows them to sit at an ideal temperature to encourage bacterial growth. +genetics.machine.lab_machine.incubator.errors.no.liquid.desc=Not enough incubation liquid +genetics.machine.lab_machine.incubator.errors.no.room.desc=No room for output -genetics.machine.labMachine.acclimatiser=Acclimatiser -genetics.machine.labMachine.acclimatiser.errors.no.individual.desc=No Individual to Acclimatise -genetics.machine.labMachine.acclimatiser.errors.no.item.desc=No Acclimatising Items -genetics.machine.labMachine.acclimatiser.errors.can.not.acclimatise.desc=Cannot Acclimatise this individual with these items -genetics.machine.labMachine.acclimatiser.tooltips.slots.acclimatising=Acclimatising Items +genetics.machine.lab_machine.acclimatiser=Acclimatiser +genetics.machine.lab_machine.acclimatiser.errors.no.individual.desc=No Individual to Acclimatise +genetics.machine.lab_machine.acclimatiser.errors.no.item.desc=No Acclimatising Items +genetics.machine.lab_machine.acclimatiser.errors.can.not.acclimatise.desc=Cannot Acclimatise this individual with these items +genetics.machine.lab_machine.acclimatiser.tooltips.slots.acclimatising=Acclimatising Items -genetics.machine.advMachine.splicer=Splicer -genetics.machine.advMachine.splicer.info=The Splicer is an incredibly powerful machine that is used to insert genes into individuals. This process is fast, but requires monumental amounts of power. -genetics.machine.advMachine.splicer.tooltips.slots.serum=Serum Vials & Arrays -genetics.machine.advMachine.splicer.tooltips.slots.individual=Splicable Individual -genetics.machine.advMachine.splicer.errors.no.individual.desc=No Individual to Splice +genetics.machine.adv_machine.splicer=Splicer +genetics.machine.adv_machine.splicer.info=The Splicer is an incredibly powerful machine that is used to insert genes into individuals. This process is fast, but requires monumental amounts of power. +genetics.machine.adv_machine.splicer.tooltips.slots.serum=Serum Vials & Arrays +genetics.machine.adv_machine.splicer.tooltips.slots.individual=Splicable Individual +genetics.machine.adv_machine.splicer.errors.no.individual.desc=No Individual to Splice genetics.gui.analyst.soil.title=Soil genetics.gui.analyst.soil.tolerance.moisture=Moisture Tolerance diff --git a/src/main/resources/assets/genetics/models/block/machine.json b/src/main/resources/assets/genetics/models/block/machine.json index 117ac876..323701a2 100644 --- a/src/main/resources/assets/genetics/models/block/machine.json +++ b/src/main/resources/assets/genetics/models/block/machine.json @@ -92,7 +92,7 @@ } ], "textures": { - "all": "genetics:tile/LabMachineBase", - "particle": "genetics:tile/LabMachineBase" + "all": "genetics:tile/lab_machine_base", + "particle": "genetics:tile/lab_machine_base" } } \ No newline at end of file diff --git a/src/main/resources/assets/genetics/models/item/geneticdatabase.json b/src/main/resources/assets/genetics/models/item/geneticdatabase.json index a7ed51c7..8ff2f89e 100644 --- a/src/main/resources/assets/genetics/models/item/geneticdatabase.json +++ b/src/main/resources/assets/genetics/models/item/geneticdatabase.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "genetics:items/geneDatabase" + "layer0": "genetics:items/gene_database" } } diff --git a/src/main/resources/assets/genetics/models/item/geneticdatabase_master.json b/src/main/resources/assets/genetics/models/item/geneticdatabase_master.json index 69135bb6..44ae26ee 100644 --- a/src/main/resources/assets/genetics/models/item/geneticdatabase_master.json +++ b/src/main/resources/assets/genetics/models/item/geneticdatabase_master.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "genetics:items/masterGeneDatabase" + "layer0": "genetics:items/master_gene_database" } } diff --git a/src/main/resources/assets/genetics/models/item/masterRegistry.json b/src/main/resources/assets/genetics/models/item/masterRegistry.json deleted file mode 100644 index e6339b1c..00000000 --- a/src/main/resources/assets/genetics/models/item/masterRegistry.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/masterRegistry" - } -} diff --git a/src/main/resources/assets/genetics/models/item/master_registry.json b/src/main/resources/assets/genetics/models/item/master_registry.json new file mode 100644 index 00000000..84bfae76 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/master_registry.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/master_registry" + } +} diff --git a/src/main/resources/assets/genetics/models/item/misc/casingCircuit.json b/src/main/resources/assets/genetics/models/item/misc/casingCircuit.json deleted file mode 100644 index 61b01774..00000000 --- a/src/main/resources/assets/genetics/models/item/misc/casingCircuit.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/casingCircuit" - } -} diff --git a/src/main/resources/assets/genetics/models/item/misc/casingIron.json b/src/main/resources/assets/genetics/models/item/misc/casingIron.json deleted file mode 100644 index b1a7b2c7..00000000 --- a/src/main/resources/assets/genetics/models/item/misc/casingIron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/casingIron" - } -} diff --git a/src/main/resources/assets/genetics/models/item/misc/casing_circuit.json b/src/main/resources/assets/genetics/models/item/misc/casing_circuit.json new file mode 100644 index 00000000..d5ea7ec6 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/misc/casing_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/casing_circuit" + } +} diff --git a/src/main/resources/assets/binniecore/models/item/fieldKit2.json b/src/main/resources/assets/genetics/models/item/misc/casing_iron.json similarity index 56% rename from src/main/resources/assets/binniecore/models/item/fieldKit2.json rename to src/main/resources/assets/genetics/models/item/misc/casing_iron.json index 84c716ee..10666d27 100644 --- a/src/main/resources/assets/binniecore/models/item/fieldKit2.json +++ b/src/main/resources/assets/genetics/models/item/misc/casing_iron.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "binniecore:items/fieldKit2" + "layer0": "genetics:items/casing_iron" } } diff --git a/src/main/resources/assets/botany/models/item/fieldKit1.json b/src/main/resources/assets/genetics/models/item/misc/dna_dye.json similarity index 58% rename from src/main/resources/assets/botany/models/item/fieldKit1.json rename to src/main/resources/assets/genetics/models/item/misc/dna_dye.json index 3bf45809..33a121f5 100644 --- a/src/main/resources/assets/botany/models/item/fieldKit1.json +++ b/src/main/resources/assets/genetics/models/item/misc/dna_dye.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botany:items/fieldKit" + "layer0": "genetics:items/dna_dye" } } diff --git a/src/main/resources/assets/genetics/models/item/misc/dnadye.json b/src/main/resources/assets/genetics/models/item/misc/dnadye.json deleted file mode 100644 index 23d2894e..00000000 --- a/src/main/resources/assets/genetics/models/item/misc/dnadye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/dnaDye" - } -} diff --git a/src/main/resources/assets/genetics/models/item/misc/dyeFluor.json b/src/main/resources/assets/genetics/models/item/misc/dyeFluor.json deleted file mode 100644 index 77cabb12..00000000 --- a/src/main/resources/assets/genetics/models/item/misc/dyeFluor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/dyeFluor" - } -} diff --git a/src/main/resources/assets/genetics/models/item/misc/dye_fluor.json b/src/main/resources/assets/genetics/models/item/misc/dye_fluor.json new file mode 100644 index 00000000..eaf9fa64 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/misc/dye_fluor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/dye_fluor" + } +} diff --git a/src/main/resources/assets/genetics/models/item/misc/genomeEmpty.json b/src/main/resources/assets/genetics/models/item/misc/genomeEmpty.json deleted file mode 100644 index 6b908399..00000000 --- a/src/main/resources/assets/genetics/models/item/misc/genomeEmpty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/genomeEmpty" - } -} diff --git a/src/main/resources/assets/genetics/models/item/misc/genome_empty.json b/src/main/resources/assets/genetics/models/item/misc/genome_empty.json new file mode 100644 index 00000000..6f9e3c32 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/misc/genome_empty.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/genome_empty" + } +} diff --git a/src/main/resources/assets/genetics/models/item/misc/growth_medium.json b/src/main/resources/assets/genetics/models/item/misc/growth_medium.json new file mode 100644 index 00000000..4d34f736 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/misc/growth_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/growth_medium" + } +} diff --git a/src/main/resources/assets/genetics/models/item/misc/growthmedium.json b/src/main/resources/assets/genetics/models/item/misc/growthmedium.json deleted file mode 100644 index 5ff76829..00000000 --- a/src/main/resources/assets/genetics/models/item/misc/growthmedium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/growthMedium" - } -} diff --git a/src/main/resources/assets/genetics/models/item/misc/integrated_circuit.json b/src/main/resources/assets/genetics/models/item/misc/integrated_circuit.json new file mode 100644 index 00000000..6a6d5bcd --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/misc/integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/integrated_circuit" + } +} diff --git a/src/main/resources/assets/genetics/models/item/misc/integrated_cpu.json b/src/main/resources/assets/genetics/models/item/misc/integrated_cpu.json new file mode 100644 index 00000000..2f37accc --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/misc/integrated_cpu.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/integrated_cpu" + } +} diff --git a/src/main/resources/assets/genetics/models/item/misc/integratedcircuit.json b/src/main/resources/assets/genetics/models/item/misc/integratedcircuit.json deleted file mode 100644 index 8c556231..00000000 --- a/src/main/resources/assets/genetics/models/item/misc/integratedcircuit.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/integratedCircuit" - } -} diff --git a/src/main/resources/assets/genetics/models/item/misc/integratedcpu.json b/src/main/resources/assets/genetics/models/item/misc/integratedcpu.json deleted file mode 100644 index 977557e3..00000000 --- a/src/main/resources/assets/genetics/models/item/misc/integratedcpu.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/integratedCPU" - } -} diff --git a/src/main/resources/assets/genetics/models/item/misc/sequencerEmpty.json b/src/main/resources/assets/genetics/models/item/misc/sequencerEmpty.json deleted file mode 100644 index 05d9bc2c..00000000 --- a/src/main/resources/assets/genetics/models/item/misc/sequencerEmpty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/sequencerEmpty" - } -} diff --git a/src/main/resources/assets/genetics/models/item/misc/sequencer_empty.json b/src/main/resources/assets/genetics/models/item/misc/sequencer_empty.json new file mode 100644 index 00000000..2153a3e6 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/misc/sequencer_empty.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/sequencer_empty" + } +} diff --git a/src/main/resources/assets/genetics/models/item/misc/serumEmpty.json b/src/main/resources/assets/genetics/models/item/misc/serumEmpty.json deleted file mode 100644 index b7add8e6..00000000 --- a/src/main/resources/assets/genetics/models/item/misc/serumEmpty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "genetics:items/serumEmpty" - } -} diff --git a/src/main/resources/assets/binniecore/models/item/fieldKit3.json b/src/main/resources/assets/genetics/models/item/misc/serum_empty.json similarity index 56% rename from src/main/resources/assets/binniecore/models/item/fieldKit3.json rename to src/main/resources/assets/genetics/models/item/misc/serum_empty.json index 0350832b..c49dee3c 100644 --- a/src/main/resources/assets/binniecore/models/item/fieldKit3.json +++ b/src/main/resources/assets/genetics/models/item/misc/serum_empty.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "binniecore:items/fieldKit3" + "layer0": "genetics:items/serum_empty" } } diff --git a/src/main/resources/assets/genetics/models/item/serumArray.json b/src/main/resources/assets/genetics/models/item/serum_array.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/serumArray.json rename to src/main/resources/assets/genetics/models/item/serum_array.json diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaBee.png b/src/main/resources/assets/genetics/textures/items/bacteria_bee.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaBee.png rename to src/main/resources/assets/genetics/textures/items/bacteria_bee.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaBee.png.mcmeta b/src/main/resources/assets/genetics/textures/items/bacteria_bee.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaBee.png.mcmeta rename to src/main/resources/assets/genetics/textures/items/bacteria_bee.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaBee.txt b/src/main/resources/assets/genetics/textures/items/bacteria_bee.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaBee.txt rename to src/main/resources/assets/genetics/textures/items/bacteria_bee.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaButterfly.png b/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaButterfly.png rename to src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaButterfly.png.mcmeta b/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaButterfly.png.mcmeta rename to src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaButterfly.txt b/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaButterfly.txt rename to src/main/resources/assets/genetics/textures/items/bacteria_butterfly.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaDNA.png b/src/main/resources/assets/genetics/textures/items/bacteria_dna.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaDNA.png rename to src/main/resources/assets/genetics/textures/items/bacteria_dna.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaDNA.png.mcmeta b/src/main/resources/assets/genetics/textures/items/bacteria_dna.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaDNA.png.mcmeta rename to src/main/resources/assets/genetics/textures/items/bacteria_dna.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaDNA.txt b/src/main/resources/assets/genetics/textures/items/bacteria_dna.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaDNA.txt rename to src/main/resources/assets/genetics/textures/items/bacteria_dna.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaEnzyme.png b/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaEnzyme.png rename to src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaEnzyme.png.mcmeta b/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaEnzyme.png.mcmeta rename to src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaEnzyme.txt b/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaEnzyme.txt rename to src/main/resources/assets/genetics/textures/items/bacteria_enzyme.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaFermenter.png b/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaFermenter.png rename to src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaFermenter.png.mcmeta b/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaFermenter.png.mcmeta rename to src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaFermenter.txt b/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaFermenter.txt rename to src/main/resources/assets/genetics/textures/items/bacteria_fermenter.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaTree.png b/src/main/resources/assets/genetics/textures/items/bacteria_tree.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaTree.png rename to src/main/resources/assets/genetics/textures/items/bacteria_tree.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaTree.png.mcmeta b/src/main/resources/assets/genetics/textures/items/bacteria_tree.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaTree.png.mcmeta rename to src/main/resources/assets/genetics/textures/items/bacteria_tree.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteriaTree.txt b/src/main/resources/assets/genetics/textures/items/bacteria_tree.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteriaTree.txt rename to src/main/resources/assets/genetics/textures/items/bacteria_tree.txt diff --git a/src/main/resources/assets/genetics/textures/items/casingCircuit.png b/src/main/resources/assets/genetics/textures/items/casing_circuit.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/casingCircuit.png rename to src/main/resources/assets/genetics/textures/items/casing_circuit.png diff --git a/src/main/resources/assets/genetics/textures/items/casingCircuit.png.mcmeta b/src/main/resources/assets/genetics/textures/items/casing_circuit.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/casingCircuit.png.mcmeta rename to src/main/resources/assets/genetics/textures/items/casing_circuit.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/casingEtched.png b/src/main/resources/assets/genetics/textures/items/casing_etched.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/casingEtched.png rename to src/main/resources/assets/genetics/textures/items/casing_etched.png diff --git a/src/main/resources/assets/genetics/textures/items/casingIron.png b/src/main/resources/assets/genetics/textures/items/casing_iron.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/casingIron.png rename to src/main/resources/assets/genetics/textures/items/casing_iron.png diff --git a/src/main/resources/assets/genetics/textures/items/cylinderEmpty.png b/src/main/resources/assets/genetics/textures/items/cylinder_empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cylinderEmpty.png rename to src/main/resources/assets/genetics/textures/items/cylinder_empty.png diff --git a/src/main/resources/assets/genetics/textures/items/dnaDye.png b/src/main/resources/assets/genetics/textures/items/dna_dye.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/dnaDye.png rename to src/main/resources/assets/genetics/textures/items/dna_dye.png diff --git a/src/main/resources/assets/genetics/textures/items/dyeFluor.png b/src/main/resources/assets/genetics/textures/items/dye_fluor.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/dyeFluor.png rename to src/main/resources/assets/genetics/textures/items/dye_fluor.png diff --git a/src/main/resources/assets/genetics/textures/items/dyeFluor.png.mcmeta b/src/main/resources/assets/genetics/textures/items/dye_fluor.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/dyeFluor.png.mcmeta rename to src/main/resources/assets/genetics/textures/items/dye_fluor.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/fieldGlass.png b/src/main/resources/assets/genetics/textures/items/field_glass.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/fieldGlass.png rename to src/main/resources/assets/genetics/textures/items/field_glass.png diff --git a/src/main/resources/assets/genetics/textures/items/fieldKit.png b/src/main/resources/assets/genetics/textures/items/field_kit.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/fieldKit.png rename to src/main/resources/assets/genetics/textures/items/field_kit.png diff --git a/src/main/resources/assets/genetics/textures/items/gearGoldEtched.png b/src/main/resources/assets/genetics/textures/items/gear_gold_etched.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/gearGoldEtched.png rename to src/main/resources/assets/genetics/textures/items/gear_gold_etched.png diff --git a/src/main/resources/assets/genetics/textures/items/gearIronEtched.png b/src/main/resources/assets/genetics/textures/items/gear_iron_etched.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/gearIronEtched.png rename to src/main/resources/assets/genetics/textures/items/gear_iron_etched.png diff --git a/src/main/resources/assets/genetics/textures/items/geneDatabase.png b/src/main/resources/assets/genetics/textures/items/gene_database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/geneDatabase.png rename to src/main/resources/assets/genetics/textures/items/gene_database.png diff --git a/src/main/resources/assets/genetics/textures/items/genomeEmpty.png b/src/main/resources/assets/genetics/textures/items/genome_empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/genomeEmpty.png rename to src/main/resources/assets/genetics/textures/items/genome_empty.png diff --git a/src/main/resources/assets/genetics/textures/items/growthMedium.png b/src/main/resources/assets/genetics/textures/items/growth_medium.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/growthMedium.png rename to src/main/resources/assets/genetics/textures/items/growth_medium.png diff --git a/src/main/resources/assets/genetics/textures/items/integratedCircuit.png b/src/main/resources/assets/genetics/textures/items/integrated_circuit.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/integratedCircuit.png rename to src/main/resources/assets/genetics/textures/items/integrated_circuit.png diff --git a/src/main/resources/assets/genetics/textures/items/integratedCircuit.png.mcmeta b/src/main/resources/assets/genetics/textures/items/integrated_circuit.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/integratedCircuit.png.mcmeta rename to src/main/resources/assets/genetics/textures/items/integrated_circuit.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/integratedCPU.png b/src/main/resources/assets/genetics/textures/items/integrated_cpu.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/integratedCPU.png rename to src/main/resources/assets/genetics/textures/items/integrated_cpu.png diff --git a/src/main/resources/assets/genetics/textures/items/integratedCPU.png.mcmeta b/src/main/resources/assets/genetics/textures/items/integrated_cpu.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/integratedCPU.png.mcmeta rename to src/main/resources/assets/genetics/textures/items/integrated_cpu.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/masterGeneDatabase.png b/src/main/resources/assets/genetics/textures/items/master_gene_database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/masterGeneDatabase.png rename to src/main/resources/assets/genetics/textures/items/master_gene_database.png diff --git a/src/main/resources/assets/genetics/textures/items/masterRegistry.png b/src/main/resources/assets/genetics/textures/items/master_registry.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/masterRegistry.png rename to src/main/resources/assets/genetics/textures/items/master_registry.png diff --git a/src/main/resources/assets/genetics/textures/items/panelEtched.png b/src/main/resources/assets/genetics/textures/items/panel_etched.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/panelEtched.png rename to src/main/resources/assets/genetics/textures/items/panel_etched.png diff --git a/src/main/resources/assets/genetics/textures/items/sequencerEmpty.png b/src/main/resources/assets/genetics/textures/items/sequencer_empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/sequencerEmpty.png rename to src/main/resources/assets/genetics/textures/items/sequencer_empty.png diff --git a/src/main/resources/assets/genetics/textures/items/serumEmpty.png b/src/main/resources/assets/genetics/textures/items/serum_empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/serumEmpty.png rename to src/main/resources/assets/genetics/textures/items/serum_empty.png diff --git a/src/main/resources/assets/genetics/textures/items/serumSpray.png b/src/main/resources/assets/genetics/textures/items/serum_spray.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/serumSpray.png rename to src/main/resources/assets/genetics/textures/items/serum_spray.png diff --git a/src/main/resources/assets/genetics/textures/items/sterilisedDish.png b/src/main/resources/assets/genetics/textures/items/sterilised_dish.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/sterilisedDish.png rename to src/main/resources/assets/genetics/textures/items/sterilised_dish.png diff --git a/src/main/resources/assets/genetics/textures/tile/AdvGeneticMachine.png b/src/main/resources/assets/genetics/textures/tile/adv_genetic_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/AdvGeneticMachine.png rename to src/main/resources/assets/genetics/textures/tile/adv_genetic_machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/ApiaristDatabase.png b/src/main/resources/assets/genetics/textures/tile/apiarist_database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/ApiaristDatabase.png rename to src/main/resources/assets/genetics/textures/tile/apiarist_database.png diff --git a/src/main/resources/assets/genetics/textures/tile/ApiaristIndexer.png b/src/main/resources/assets/genetics/textures/tile/apiarist_indexer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/ApiaristIndexer.png rename to src/main/resources/assets/genetics/textures/tile/apiarist_indexer.png diff --git a/src/main/resources/assets/genetics/textures/tile/ArboristDatabase.png b/src/main/resources/assets/genetics/textures/tile/arborist_database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/ArboristDatabase.png rename to src/main/resources/assets/genetics/textures/tile/arborist_database.png diff --git a/src/main/resources/assets/genetics/textures/tile/ArboristIndexer.png b/src/main/resources/assets/genetics/textures/tile/arborist_indexer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/ArboristIndexer.png rename to src/main/resources/assets/genetics/textures/tile/arborist_indexer.png diff --git a/src/main/resources/assets/genetics/textures/tile/GeneticMachine.png b/src/main/resources/assets/genetics/textures/tile/genetic_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/GeneticMachine.png rename to src/main/resources/assets/genetics/textures/tile/genetic_machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/IsolatorProgress.png b/src/main/resources/assets/genetics/textures/tile/isolator_progress.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/IsolatorProgress.png rename to src/main/resources/assets/genetics/textures/tile/isolator_progress.png diff --git a/src/main/resources/assets/genetics/textures/tile/LabMachine.png b/src/main/resources/assets/genetics/textures/tile/lab_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/LabMachine.png rename to src/main/resources/assets/genetics/textures/tile/lab_machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/LabMachineBase.png b/src/main/resources/assets/genetics/textures/tile/lab_machine_base.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/LabMachineBase.png rename to src/main/resources/assets/genetics/textures/tile/lab_machine_base.png diff --git a/src/main/resources/assets/genetics/textures/tile/MachineGlow.png b/src/main/resources/assets/genetics/textures/tile/machine_glow.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/MachineGlow.png rename to src/main/resources/assets/genetics/textures/tile/machine_glow.png diff --git a/src/main/resources/assets/genetics/textures/tile/MasterGeneticMachine.png b/src/main/resources/assets/genetics/textures/tile/master_genetic_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/MasterGeneticMachine.png rename to src/main/resources/assets/genetics/textures/tile/master_genetic_machine.png