diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 3fa8e974e..a9aac8492 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -76,46 +76,44 @@ public final class LibResources { public static final String MODEL_PYLON_MANA = PREFIX_MODEL + "pylon_mana.png"; public static final String MODEL_PYLON_NATURA = PREFIX_MODEL + "pylon_natura.png"; public static final String MODEL_PYLON_GAIA = PREFIX_MODEL + "pylon_gaia.png"; - public static final String MODEL_LEXICA_DEFAULT = PREFIX_MODEL + "lexica_default.png"; - public static final String MODEL_LEXICA_ELVEN = PREFIX_MODEL + "lexica_elven.png"; + public static final String MODEL_LEXICA_DEFAULT = PREFIX_MODEL + "lexicon_default.png"; + public static final String MODEL_LEXICA_ELVEN = PREFIX_MODEL + "lexicon_elven.png"; public static final String MODEL_MANASTEEL_0 = PREFIX_MODEL + "manasteel_0.png"; public static final String MODEL_MANASTEEL_1 = PREFIX_MODEL + "manasteel_1.png"; public static final String MODEL_MANASTEEL_2 = PREFIX_MODEL + "manasteel_2.png"; - public static final String MODEL_MANASTEEL_NEW = PREFIX_MODEL + "manasteel_new.png"; + public static final String MODEL_MANASTEEL_NEW = PREFIX_MODEL + "armor_manasteel.png"; public static final String MODEL_TERRASTEEL_0 = PREFIX_MODEL + "terrasteel_0.png"; public static final String MODEL_TERRASTEEL_1 = PREFIX_MODEL + "terrasteel_1.png"; public static final String MODEL_TERRASTEEL_2 = PREFIX_MODEL + "terrasteel_2.png"; - public static final String MODEL_TERRASTEEL_NEW = PREFIX_MODEL + "terrasteel_new.png"; + public static final String MODEL_TERRASTEEL_NEW = PREFIX_MODEL + "armor_terrasteel.png"; public static final String MODEL_ELEMENTIUM_0 = PREFIX_MODEL + "elementium_0.png"; public static final String MODEL_ELEMENTIUM_1 = PREFIX_MODEL + "elementium_1.png"; public static final String MODEL_ELEMENTIUM_2 = PREFIX_MODEL + "elementium_2.png"; - public static final String MODEL_ELEMENTIUM_NEW = PREFIX_MODEL + "elementium_new.png"; + public static final String MODEL_ELEMENTIUM_NEW = PREFIX_MODEL + "armor_elementium.png"; public static final String MODEL_MANAWEAVE_0 = PREFIX_MODEL + "manaweave_0.png"; public static final String MODEL_MANAWEAVE_1 = PREFIX_MODEL + "manaweave_1.png"; - public static final String MODEL_MANAWEAVE_NEW = PREFIX_MODEL + "manaweave_new.png"; - public static final String MODEL_MANAWEAVE_NEW_HOLIDAY = PREFIX_MODEL + "manaweave_new_holiday.png"; + public static final String MODEL_MANAWEAVE_NEW = PREFIX_MODEL + "armor_manaweave.png"; + public static final String MODEL_MANAWEAVE_NEW_HOLIDAY = PREFIX_MODEL + "armor_manaweave_holiday.png"; public static final String MODEL_PIXIE = PREFIX_MODEL + "pixie.png"; public static final String MODEL_PIXIE_HALLOWEEN = PREFIX_MODEL + "pixie_halloween.png"; public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tiny_potato.png"; public static final String MODEL_TINY_POTATO_GS = PREFIX_MODEL + "tiny_potato_gray.png"; public static final String MODEL_TINY_POTATO_HALLOWEEN = PREFIX_MODEL + "tiny_potato_halloween.png"; - public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png"; - public static final String MODEL_TRAVEL_BELT = PREFIX_MODEL + "travelBelt.png"; - public static final String MODEL_SUPER_TRAVEL_BELT = PREFIX_MODEL + "superTravelBelt.png"; - public static final String MODEL_SPEED_UP_BELT = PREFIX_MODEL + "speedUpBelt.png"; - public static final String MODEL_KNOCKBACK_BELT = PREFIX_MODEL + "knockbackBelt.png"; + public static final String MODEL_TRAVEL_BELT = PREFIX_MODEL + "belt_travel.png"; + public static final String MODEL_SUPER_TRAVEL_BELT = PREFIX_MODEL + "belt_travel_super.png"; + public static final String MODEL_SPEED_UP_BELT = PREFIX_MODEL + "belt_speed.png"; + public static final String MODEL_KNOCKBACK_BELT = PREFIX_MODEL + "belt_knockback.png"; public static final String MODEL_HOLY_CLOAK = PREFIX_MODEL + "cloak_holy.png"; public static final String MODEL_UNHOLY_CLOAK = PREFIX_MODEL + "cloak_unholy.png"; public static final String MODEL_BALANCE_CLOAK = PREFIX_MODEL + "cloak_balance.png"; public static final String MODEL_HOLY_CLOAK_GLOW = PREFIX_MODEL + "cloak_holy_glow.png"; public static final String MODEL_UNHOLY_CLOAK_GLOW = PREFIX_MODEL + "cloak_unholy_glow.png"; public static final String MODEL_BALANCE_CLOAK_GLOW = PREFIX_MODEL + "cloak_balance_glow.png"; - public static final String MODEL_CORPOREA_INDEX = PREFIX_MODEL + "corporeaIndex.png"; - public static final String MODEL_INVISIBLE_ARMOR = PREFIX_MODEL + "invisibleArmor.png"; - public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "pinkWither.png"; - public static final String MODEL_CRYSTAL_CUBE = PREFIX_MODEL + "crystalCube.png"; + public static final String MODEL_CORPOREA_INDEX = PREFIX_MODEL + "corporea_index.png"; + public static final String MODEL_INVISIBLE_ARMOR = PREFIX_MODEL + "armor_invisible.png"; + public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "wither_pink.png"; + public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png"; public static final String MODEL_HOURGLASS = PREFIX_MODEL + "hourglass.png"; - public static final String MODEL_COCOON = PREFIX_MODEL + "cocoon.png"; public static final String MODEL_BELLOWS = PREFIX_MODEL + "bellows.png"; public static final String MODEL_TERU_TERU_BOZU = PREFIX_MODEL + "teruTeruBozu.png"; public static final String MODEL_TERU_TERU_BOZU_HALLOWEEN = PREFIX_MODEL + "teruTeruBozu_halloween.png"; diff --git a/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java b/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java deleted file mode 100644 index ad9e1df7c..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [? (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelCrystalCube extends ModelBase { - public final ModelRenderer cube; - public final ModelRenderer base1; - public final ModelRenderer base2; - - public ModelCrystalCube() { - textureWidth = 48; - textureHeight = 32; - cube = new ModelRenderer(this, 0, 0); - cube.setRotationPoint(0.0F, 12.0F, 0.0F); - cube.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8, 0.0F); - base1 = new ModelRenderer(this, 22, 0); - base1.setRotationPoint(0.0F, 16.0F, 0.0F); - base1.addBox(-3.0F, 7.0F, -3.0F, 6, 1, 6, 0.0F); - base2 = new ModelRenderer(this, 0, 16); - base2.setRotationPoint(0.0F, 0.0F, 0.0F); - base2.addBox(-5.0F, 3.0F, -5.0F, 10, 4, 10, 0.0F); - base1.addChild(base2); - } - - public void renderBase() { - float f5 = 1F / 16F; - base1.render(f5); - } - - public void renderCube() { - float f5 = 1F / 16F; - cube.render(f5); - } - - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -} diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index 58e9c79d5..dbf5386c6 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -19,38 +19,42 @@ import java.awt.Color; public class ModelHourglass extends ModelBase { - public final ModelRenderer ring; - public final ModelRenderer base1; - public final ModelRenderer base2; - public final ModelRenderer glass1; - public final ModelRenderer sand1; - public final ModelRenderer glass2; - public final ModelRenderer sand2; + public ModelRenderer top; + public ModelRenderer glassT; + public ModelRenderer ring; + public ModelRenderer glassB; + public ModelRenderer bottom; + + public ModelRenderer sandT; + public ModelRenderer sandB; public ModelHourglass() { - textureWidth = 48; - textureHeight = 24; - sand2 = new ModelRenderer(this, 24, 0); - sand2.setRotationPoint(0.0F, 0.0F, 0.0F); - sand2.addBox(0F, 0F, 0F, 5, 5, 5, 0.0F); // -2.5F, 1.0F, -2.5F - sand1 = new ModelRenderer(this, 24, 0); - sand1.setRotationPoint(0.0F, 0.0F, 0.0F); - sand1.addBox(0F, 0F, 0F, 5, 5, 5, 0.0F); // -2.5F, -6.0F, -2.5F - glass1 = new ModelRenderer(this, 0, 0); - glass1.setRotationPoint(0.0F, 0.0F, 0.0F); - glass1.addBox(-3.0F, -6.501F, -3.0F, 6, 6, 6, 0.0F); - base2 = new ModelRenderer(this, 0, 12); - base2.setRotationPoint(0.0F, 0.0F, 0.0F); - base2.addBox(-3.5F, 6.502F, -3.5F, 7, 1, 7, 0.0F); - base1 = new ModelRenderer(this, 0, 12); - base1.setRotationPoint(0.0F, 0.0F, 0.0F); - base1.addBox(-3.5F, -7.502F, -3.5F, 7, 1, 7, 0.0F); - ring = new ModelRenderer(this, 28, 12); - ring.setRotationPoint(0.0F, 15.5F, 0.0F); - ring.addBox(-2.0F, -16F, -2.0F, 4, 1, 4, 0.0F); - glass2 = new ModelRenderer(this, 0, 0); - glass2.setRotationPoint(0.0F, 0.0F, 0.0F); - glass2.addBox(-3.0F, 0.501F, -3.0F, 6, 6, 6, 0.0F); + + textureWidth = 64; + textureHeight = 32; + + top = new ModelRenderer(this, 20, 0); + top.setRotationPoint(0.0F, 0.0F, 0.0F); + top.addBox(-3.0F, -6.5F, -3.0F, 6, 1, 6, 0.0F); + glassT = new ModelRenderer(this, 0, 0); + glassT.setRotationPoint(0.0F, 0.0F, 0.0F); + glassT.addBox(-2.5F, -5.5F, -2.5F, 5, 5, 5, 0.0F); + ring = new ModelRenderer(this, 0, 20); + ring.setRotationPoint(0.0F, 0.0F, 0.0F); + ring.addBox(-1.5F, -0.5F, -1.5F, 3, 1, 3, 0.0F); + glassB = new ModelRenderer(this, 0, 10); + glassB.setRotationPoint(0.0F, 0.0F, 0.0F); + glassB.addBox(-2.5F, 0.5F, -2.5F, 5, 5, 5, 0.0F); + bottom = new ModelRenderer(this, 20, 7); + bottom.setRotationPoint(0.0F, 0.0F, 0.0F); + bottom.addBox(-3.0F, 5.5F, -3.0F, 6, 1, 6, 0.0F); + + sandT = new ModelRenderer(this, 20, 14); + sandT.setRotationPoint(0.0F, 0.0F, 0.0F); + sandT.addBox(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, -5.0F, -2.0F + sandB = new ModelRenderer(this, 20, 14); + sandB.setRotationPoint(0.0F, 0.0F, 0.0F); + sandB.addBox(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, 1.0F, -2.05F } public void render(float fract1, float fract2, boolean flip, int color) { @@ -62,8 +66,8 @@ public class ModelHourglass extends ModelBase { float f = 1F / 16F; ring.render(f); - base1.render(f); - base2.render(f); + top.render(f); + bottom.render(f); Color c = new Color(color); GL11.glColor3ub((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue()); @@ -74,38 +78,34 @@ public class ModelHourglass extends ModelBase { if(fract1 > 0) { GlStateManager.pushMatrix(); if(flip) - GlStateManager.translate(-2.5F * f, 1.0F * f, -2.5F * f); + GlStateManager.translate(-2.0F * f, 1.0F * f, -2.0F * f); else { GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-2.5F * f, -6.0F * f, -2.5F * f); + GlStateManager.translate(-2.0F * f, -5.0F * f, -2.0F * f); } - GlStateManager.scale(1F, fract1, 1F); - sand1.render(f); + sandT.render(f); GlStateManager.popMatrix(); } if(fract2 > 0) { GlStateManager.pushMatrix(); if(flip) - GlStateManager.translate(-2.5F * f, -6.0F * f, -2.5F * f); + GlStateManager.translate(-2.0F * f, -5.0F * f, -2.0F * f); else { GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-2.5F * f, 1.0F * f, -2.5F * f); + GlStateManager.translate(-2.0F * f, 1.0F * f, -2.0F * f); } - - GlStateManager.scale(1F, fract2, 1F); - - sand2.render(f); + sandB.render(f); GlStateManager.popMatrix(); } GL11.glPopAttrib(); GL11.glColor3ub((byte) 255, (byte) 255, (byte) 255); - glass1.render(f); - glass2.render(f); + glassT.render(f); + glassB.render(f); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index c7d7d414c..d6dba98d0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -46,7 +46,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor public TileCorporeaCrystalCube() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); + asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/corporeacrystalcube.json"), ImmutableMap.of()); } else { asm = null; } diff --git a/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json b/src/main/resources/assets/botania/armatures/block/corporea_crystal_cube_glass.json similarity index 100% rename from src/main/resources/assets/botania/armatures/block/crystalcube_cube.json rename to src/main/resources/assets/botania/armatures/block/corporea_crystal_cube_glass.json diff --git a/src/main/resources/assets/botania/asms/block/crystalcube_cube.json b/src/main/resources/assets/botania/asms/block/corporeacrystalcube.json similarity index 60% rename from src/main/resources/assets/botania/asms/block/crystalcube_cube.json rename to src/main/resources/assets/botania/asms/block/corporeacrystalcube.json index 969465469..6620c4f00 100644 --- a/src/main/resources/assets/botania/asms/block/crystalcube_cube.json +++ b/src/main/resources/assets/botania/asms/block/corporeacrystalcube.json @@ -3,7 +3,7 @@ "world_to_cycle": [ "/", 4 ] }, "clips": { - "moving": [ "apply", "botania:block/crystalcube_cube@moving", "#world_to_cycle" ] + "moving": [ "apply", "botania:block/corporea_crystal_cube_glass@moving", "#world_to_cycle" ] }, "states": [ "moving" ], "transitions": {}, diff --git a/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json b/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json index 16f37dc90..8f918bf35 100644 --- a/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json +++ b/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json @@ -2,27 +2,27 @@ "forge_marker": 1, "defaults": { "textures": { - "cloth": "botania:blocks/crystalcube_cloth", - "base": "botania:blocks/crystalcube_base", - "cube": "botania:blocks/crystalcube_cube", - "particle": "botania:blocks/storage2" + "cloth": "botania:blocks/corporea_crystal_cube_cloth", + "base": "botania:blocks/corporea_crystal_cube_base", + "glass": "botania:blocks/corporea_crystal_cube_glass", + "particle": "botania:blocks/corporea_crystal_cube_base" } }, "variants": { "static": { "true": { - "model": "botania:crystalcube_base" + "model": "botania:corporea_crystal_cube_base" }, "false": { - "model": "botania:crystalcube_cube" + "model": "botania:corporea_crystal_cube_glass" } }, "inventory": [{ - "model": "botania:crystalcube_base", + "model": "botania:corporea_crystal_cube_base", "transform": "forge:default-block", "submodel": { "cube": { - "model": "botania:crystalcube_cube", + "model": "botania:corporea_crystal_cube_glass", "transform": { "translation": [ 0, 0.5, 0 ] } diff --git a/src/main/resources/assets/botania/blockstates/manadetector.json b/src/main/resources/assets/botania/blockstates/manadetector.json index ade96b44f..250e84383 100644 --- a/src/main/resources/assets/botania/blockstates/manadetector.json +++ b/src/main/resources/assets/botania/blockstates/manadetector.json @@ -1,6 +1,6 @@ { "variants": { "powered=false": { "model": "botania:mana_detector" }, - "powered=true": { "model": "botania:mana_detector_powered" } + "powered=true": { "model": "botania:mana_detector_activated" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/opencrate.json b/src/main/resources/assets/botania/blockstates/opencrate.json index 4583f474c..0027f2451 100644 --- a/src/main/resources/assets/botania/blockstates/opencrate.json +++ b/src/main/resources/assets/botania/blockstates/opencrate.json @@ -1,25 +1,25 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:orientable_vertical", + "model": "botania:crate", "transform": "forge:default-block" }, "variants": { "pattern": { "none": {}, - "crafty_1_1": { "textures": { "side": "botania:blocks/ocpattern0" } }, - "crafty_2_2": { "textures": { "side": "botania:blocks/ocpattern1" } }, - "crafty_1_2": { "textures": { "side": "botania:blocks/ocpattern2" } }, - "crafty_2_1": { "textures": { "side": "botania:blocks/ocpattern3" } }, - "crafty_1_3": { "textures": { "side": "botania:blocks/ocpattern4" } }, - "crafty_3_1": { "textures": { "side": "botania:blocks/ocpattern5" } }, - "crafty_2_3": { "textures": { "side": "botania:blocks/ocpattern6" } }, - "crafty_3_2": { "textures": { "side": "botania:blocks/ocpattern7" } }, - "crafty_donut": { "textures": { "side": "botania:blocks/ocpattern8" } } + "crafty_1_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_0" } }, + "crafty_2_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_1" } }, + "crafty_1_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_2" } }, + "crafty_2_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_3" } }, + "crafty_1_3": { "textures": { "side": "botania:blocks/crate_crafty_pattern_4" } }, + "crafty_3_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_5" } }, + "crafty_2_3": { "textures": { "side": "botania:blocks/crate_crafty_pattern_6" } }, + "crafty_3_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_7" } }, + "crafty_donut": { "textures": { "side": "botania:blocks/crate_crafty_pattern_8" } } }, "variant": { - "open": { "x": 180, "textures": { "front": "botania:blocks/opencrate1", "side": "botania:blocks/opencrate0" } }, - "crafty": { "x": 180, "textures": { "front": "botania:blocks/opencrate3", "side": "botania:blocks/opencrate2" } } + "open": { "textures": { "bottom": "botania:blocks/crate_open_bottom", "side": "botania:blocks/crate_open", "particle": "botania:blocks/crate_open" } }, + "crafty": { "textures": { "bottom": "botania:blocks/crate_crafty_bottom", "side": "botania:blocks/crate_crafty", "particle": "botania:blocks/crate_crafty" } } } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cocoon.json b/src/main/resources/assets/botania/models/block/cocoon.json index 1f13c87b4..2d6e993ed 100644 --- a/src/main/resources/assets/botania/models/block/cocoon.json +++ b/src/main/resources/assets/botania/models/block/cocoon.json @@ -1,13 +1,13 @@ { "parent": "minecraft:block/block", "textures": { - "bottom": "botania:model/cocoon_bottom", - "top": "botania:model/cocoon_top", - "north": "botania:model/cocoon_north", - "south": "botania:model/cocoon_south", - "west": "botania:model/cocoon_west", - "east": "botania:model/cocoon_east", - "particle": "botania:model/cocoon_east" + "bottom": "botania:blocks/cocoon_bottom", + "top": "botania:blocks/cocoon_top", + "north": "botania:blocks/cocoon_north", + "south": "botania:blocks/cocoon_south", + "west": "botania:blocks/cocoon_west", + "east": "botania:blocks/cocoon_east", + "particle": "botania:blocks/cocoon_east" }, "elements": [ { @@ -20,7 +20,7 @@ "south": { "texture": "#south", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, "east": { "texture": "#east", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, "up": { "texture": "#top", "uv": [ 3.0, 3.0, 13.0, 13.0 ] }, - "down": { "texture": "#bottom", "uv": [ 3.0, 3.0, 13.0, 13.0 ], "cullface": "down" } + "down": { "texture": "#bottom", "uv": [ 3.0, 3.0, 13.0, 13.0 ]} } } ] diff --git a/src/main/resources/assets/botania/models/block/crystalcube_base.json b/src/main/resources/assets/botania/models/block/corporea_crystal_cube_base.json similarity index 100% rename from src/main/resources/assets/botania/models/block/crystalcube_base.json rename to src/main/resources/assets/botania/models/block/corporea_crystal_cube_base.json diff --git a/src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json b/src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json new file mode 100644 index 000000000..000a6e805 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#glass" + }, + "elements": [ + { + "name": "glass", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "up": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "north": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "south": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "west": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "east": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/corporea_funnel.json b/src/main/resources/assets/botania/models/block/corporea_funnel.json index 6444c4010..0e710354a 100644 --- a/src/main/resources/assets/botania/models/block/corporea_funnel.json +++ b/src/main/resources/assets/botania/models/block/corporea_funnel.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/corporeafunnel0", - "top": "botania:blocks/corporeafunnel0", - "side": "botania:blocks/corporeafunnel1" + "bottom": "botania:blocks/corporea_funnel_top_bottom", + "top": "botania:blocks/corporea_funnel_top_bottom", + "side": "botania:blocks/corporea_funnel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_interceptor.json b/src/main/resources/assets/botania/models/block/corporea_interceptor.json index 08fa3fc95..7c1c27a40 100644 --- a/src/main/resources/assets/botania/models/block/corporea_interceptor.json +++ b/src/main/resources/assets/botania/models/block/corporea_interceptor.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/corporeainterceptor0", - "top": "botania:blocks/corporeainterceptor0", - "side": "botania:blocks/corporeainterceptor1" + "bottom": "botania:blocks/corporea_interceptor_top_bottom", + "top": "botania:blocks/corporea_interceptor_top_bottom", + "side": "botania:blocks/corporea_interceptor_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_retainer.json b/src/main/resources/assets/botania/models/block/corporea_retainer.json index ad0bef12e..881bbd41c 100644 --- a/src/main/resources/assets/botania/models/block/corporea_retainer.json +++ b/src/main/resources/assets/botania/models/block/corporea_retainer.json @@ -1,6 +1,8 @@ { - "parent": "minecraft:block/cube_all", + "parent": "minecraft:block/cube_bottom_top", "textures": { - "all": "botania:blocks/corporearetainer" + "bottom": "botania:blocks/corporea_retainer_top_bottom", + "top": "botania:blocks/corporea_retainer_top_bottom", + "side": "botania:blocks/corporea_retainer_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crate.json b/src/main/resources/assets/botania/models/block/crate.json new file mode 100644 index 000000000..880b2cf21 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crate.json @@ -0,0 +1,16 @@ +{ + "parent": "minecraft:block/block", + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#bottom", "cullface": "down" }, + "up": { "texture": "#side", "cullface": "up" }, + "north": { "texture": "#side", "cullface": "north" }, + "south": { "texture": "#side", "cullface": "south" }, + "west": { "texture": "#side", "cullface": "west" }, + "east": { "texture": "#side", "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crystalcube_cube.json b/src/main/resources/assets/botania/models/block/crystalcube_cube.json deleted file mode 100644 index 6170d379c..000000000 --- a/src/main/resources/assets/botania/models/block/crystalcube_cube.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "textures": { - "particle": "#cube" - }, - "elements": [ - { - "name": "Cube", - "from": [ 4, 4, 4 ], - "to": [ 12, 12, 12 ], - "faces": { - "down": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, - "up": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, - "north": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, - "south": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, - "west": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, - "east": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] } - } - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/islands/island_grass.json b/src/main/resources/assets/botania/models/block/islands/island_grass.json index 55fd69aaf..29045eda8 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_grass.json +++ b/src/main/resources/assets/botania/models/block/islands/island_grass.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:blocks/islandtop", - "side": "botania:blocks/islandside" + "top": "botania:blocks/island_top", + "side": "botania:blocks/island_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_detector.json b/src/main/resources/assets/botania/models/block/mana_detector.json index 01b5e2d76..9d247dcfb 100644 --- a/src/main/resources/assets/botania/models/block/mana_detector.json +++ b/src/main/resources/assets/botania/models/block/mana_detector.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manadetector0" + "all": "botania:blocks/mana_detector" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_detector_powered.json b/src/main/resources/assets/botania/models/block/mana_detector_activated.json similarity index 54% rename from src/main/resources/assets/botania/models/block/mana_detector_powered.json rename to src/main/resources/assets/botania/models/block/mana_detector_activated.json index 2b69bb7d1..3c7e60f68 100644 --- a/src/main/resources/assets/botania/models/block/mana_detector_powered.json +++ b/src/main/resources/assets/botania/models/block/mana_detector_activated.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manadetector1" + "all": "botania:blocks/mana_detector_activated" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/turntable.json b/src/main/resources/assets/botania/models/block/turntable.json index 9fbef02b7..636e11069 100644 --- a/src/main/resources/assets/botania/models/block/turntable.json +++ b/src/main/resources/assets/botania/models/block/turntable.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/turntable1", - "top": "botania:blocks/turntable0", - "side": "botania:blocks/turntable1" + "bottom": "botania:blocks/spreader_turntable", + "top": "botania:blocks/spreader_turntable_top", + "side": "botania:blocks/spreader_turntable" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/blocks/cacophoniumblock1.png b/src/main/resources/assets/botania/textures/blocks/cacophonium_block.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/cacophoniumblock1.png rename to src/main/resources/assets/botania/textures/blocks/cacophonium_block.png diff --git a/src/main/resources/assets/botania/textures/blocks/cacophoniumblock0.png b/src/main/resources/assets/botania/textures/blocks/cacophonium_block_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/cacophoniumblock0.png rename to src/main/resources/assets/botania/textures/blocks/cacophonium_block_top.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_bottom.png b/src/main/resources/assets/botania/textures/blocks/cocoon_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_bottom.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_east.png b/src/main/resources/assets/botania/textures/blocks/cocoon_east.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_east.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_east.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_north.png b/src/main/resources/assets/botania/textures/blocks/cocoon_north.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_north.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_north.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_south.png b/src/main/resources/assets/botania/textures/blocks/cocoon_south.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_south.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_south.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_top.png b/src/main/resources/assets/botania/textures/blocks/cocoon_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_top.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_top.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_west.png b/src/main/resources/assets/botania/textures/blocks/cocoon_west.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_west.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_west.png diff --git a/src/main/resources/assets/botania/textures/blocks/crystalcube_base.png b/src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_base.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/crystalcube_base.png rename to src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_base.png diff --git a/src/main/resources/assets/botania/textures/blocks/crystalcube_cloth.png b/src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_cloth.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/crystalcube_cloth.png rename to src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_cloth.png diff --git a/src/main/resources/assets/botania/textures/blocks/crystalcube_cube.png b/src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_glass.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/crystalcube_cube.png rename to src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_glass.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeafunnel1.png b/src/main/resources/assets/botania/textures/blocks/corporea_funnel_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeafunnel1.png rename to src/main/resources/assets/botania/textures/blocks/corporea_funnel_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeafunnel0.png b/src/main/resources/assets/botania/textures/blocks/corporea_funnel_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeafunnel0.png rename to src/main/resources/assets/botania/textures/blocks/corporea_funnel_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeainterceptor1.png b/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeainterceptor1.png rename to src/main/resources/assets/botania/textures/blocks/corporea_interceptor_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeainterceptor0.png b/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeainterceptor0.png rename to src/main/resources/assets/botania/textures/blocks/corporea_interceptor_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporearetainer.png b/src/main/resources/assets/botania/textures/blocks/corporea_retainer_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporearetainer.png rename to src/main/resources/assets/botania/textures/blocks/corporea_retainer_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporea_retainer_top_bottom.png b/src/main/resources/assets/botania/textures/blocks/corporea_retainer_top_bottom.png new file mode 100644 index 000000000..76d5e5288 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/corporea_retainer_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty.png new file mode 100644 index 000000000..a4d986f25 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_bottom.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_bottom.png new file mode 100644 index 000000000..c204e7721 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_0.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_0.png new file mode 100644 index 000000000..bda2aa5b2 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_1.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_1.png new file mode 100644 index 000000000..bacb48c4f Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_2.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_2.png new file mode 100644 index 000000000..ff3910560 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_3.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_3.png new file mode 100644 index 000000000..376d6c340 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_3.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_4.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_4.png new file mode 100644 index 000000000..448396a8d Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_4.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_5.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_5.png new file mode 100644 index 000000000..76a7bdeda Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_5.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_6.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_6.png new file mode 100644 index 000000000..2a986340d Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_6.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_7.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_7.png new file mode 100644 index 000000000..b5c1a8a65 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_7.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_8.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_8.png new file mode 100644 index 000000000..911d8d5f1 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_8.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_open.png b/src/main/resources/assets/botania/textures/blocks/crate_open.png new file mode 100644 index 000000000..2d77e173e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_open.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crate_open_bottom.png b/src/main/resources/assets/botania/textures/blocks/crate_open_bottom.png new file mode 100644 index 000000000..d67d797bb Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crate_open_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick0.png b/src/main/resources/assets/botania/textures/blocks/custombrick0.png deleted file mode 100644 index 593c214e4..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick1.png b/src/main/resources/assets/botania/textures/blocks/custombrick1.png deleted file mode 100644 index 96a857486..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick2.png b/src/main/resources/assets/botania/textures/blocks/custombrick2.png deleted file mode 100644 index e179fa266..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick3.png b/src/main/resources/assets/botania/textures/blocks/custombrick3.png deleted file mode 100644 index 7c22f0f0e..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/custombrick3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/daybloom.png b/src/main/resources/assets/botania/textures/blocks/daybloom.png deleted file mode 100644 index 0e4d0d290..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/daybloom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/daybloomdecor.png b/src/main/resources/assets/botania/textures/blocks/daybloomdecor.png deleted file mode 100644 index 70c77c4c9..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/daybloomdecor.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/daybloomprime.png b/src/main/resources/assets/botania/textures/blocks/daybloomprime.png deleted file mode 100644 index 473d7d4b5..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/daybloomprime.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/dirtpath.png b/src/main/resources/assets/botania/textures/blocks/dirtpath.png deleted file mode 100644 index 8dc341c54..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/dirtpath.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/islandside.png b/src/main/resources/assets/botania/textures/blocks/island_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/islandside.png rename to src/main/resources/assets/botania/textures/blocks/island_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/islandtop.png b/src/main/resources/assets/botania/textures/blocks/island_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/islandtop.png rename to src/main/resources/assets/botania/textures/blocks/island_top.png diff --git a/src/main/resources/assets/botania/textures/blocks/mana_detector.png b/src/main/resources/assets/botania/textures/blocks/mana_detector.png new file mode 100644 index 000000000..85d2ec838 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/mana_detector.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/mana_detector_activated.png b/src/main/resources/assets/botania/textures/blocks/mana_detector_activated.png new file mode 100644 index 000000000..00054869d Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/mana_detector_activated.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/mana_fluxfield.png b/src/main/resources/assets/botania/textures/blocks/mana_fluxfield.png index db35d9318..a168e164e 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/mana_fluxfield.png and b/src/main/resources/assets/botania/textures/blocks/mana_fluxfield.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/manadetector0.png b/src/main/resources/assets/botania/textures/blocks/manadetector0.png deleted file mode 100644 index c1a9293e2..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/manadetector0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/manadetector1.png b/src/main/resources/assets/botania/textures/blocks/manadetector1.png deleted file mode 100644 index 687b83490..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/manadetector1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/nightshade.png b/src/main/resources/assets/botania/textures/blocks/nightshade.png deleted file mode 100644 index ae57c9154..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/nightshade.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/nightshadedecor.png b/src/main/resources/assets/botania/textures/blocks/nightshadedecor.png deleted file mode 100644 index 45c436a1c..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/nightshadedecor.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/nightshadeprime.png b/src/main/resources/assets/botania/textures/blocks/nightshadeprime.png deleted file mode 100644 index 902f574cd..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/nightshadeprime.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern0.png b/src/main/resources/assets/botania/textures/blocks/ocpattern0.png deleted file mode 100644 index 83dbcf8dc..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/ocpattern0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern1.png b/src/main/resources/assets/botania/textures/blocks/ocpattern1.png deleted file mode 100644 index 2dfb5e79f..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/ocpattern1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern2.png b/src/main/resources/assets/botania/textures/blocks/ocpattern2.png deleted file mode 100644 index b735d508c..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/ocpattern2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern3.png b/src/main/resources/assets/botania/textures/blocks/ocpattern3.png deleted file mode 100644 index e986e3d8b..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/ocpattern3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern4.png b/src/main/resources/assets/botania/textures/blocks/ocpattern4.png deleted file mode 100644 index a9dd9c957..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/ocpattern4.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern5.png b/src/main/resources/assets/botania/textures/blocks/ocpattern5.png deleted file mode 100644 index 5a112dbec..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/ocpattern5.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern6.png b/src/main/resources/assets/botania/textures/blocks/ocpattern6.png deleted file mode 100644 index 78e413227..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/ocpattern6.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern7.png b/src/main/resources/assets/botania/textures/blocks/ocpattern7.png deleted file mode 100644 index a489e780f..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/ocpattern7.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern8.png b/src/main/resources/assets/botania/textures/blocks/ocpattern8.png deleted file mode 100644 index 0c8447b77..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/ocpattern8.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/opencrate0.png b/src/main/resources/assets/botania/textures/blocks/opencrate0.png deleted file mode 100644 index 32c04c988..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/opencrate0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/opencrate1.png b/src/main/resources/assets/botania/textures/blocks/opencrate1.png deleted file mode 100644 index 22f5589ff..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/opencrate1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/opencrate2.png b/src/main/resources/assets/botania/textures/blocks/opencrate2.png deleted file mode 100644 index 0091add06..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/opencrate2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/opencrate3.png b/src/main/resources/assets/botania/textures/blocks/opencrate3.png deleted file mode 100644 index 41c5639b3..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/opencrate3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_0.png b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_0.png index a890bbd53..102a31474 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_0.png and b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/turntable1.png b/src/main/resources/assets/botania/textures/blocks/spreader_turntable.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/turntable1.png rename to src/main/resources/assets/botania/textures/blocks/spreader_turntable.png diff --git a/src/main/resources/assets/botania/textures/blocks/turntable0.png b/src/main/resources/assets/botania/textures/blocks/spreader_turntable_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/turntable0.png rename to src/main/resources/assets/botania/textures/blocks/spreader_turntable_top.png diff --git a/src/main/resources/assets/botania/textures/blocks/storage5.png b/src/main/resources/assets/botania/textures/blocks/storage5.png new file mode 100644 index 000000000..e13daa412 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/storage5.png differ diff --git a/src/main/resources/assets/botania/textures/model/elementium_new.png b/src/main/resources/assets/botania/textures/model/armor_elementium.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/elementium_new.png rename to src/main/resources/assets/botania/textures/model/armor_elementium.png diff --git a/src/main/resources/assets/botania/textures/model/invisiblearmor.png b/src/main/resources/assets/botania/textures/model/armor_invisible.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/invisiblearmor.png rename to src/main/resources/assets/botania/textures/model/armor_invisible.png diff --git a/src/main/resources/assets/botania/textures/model/manasteel_new.png b/src/main/resources/assets/botania/textures/model/armor_manasteel.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manasteel_new.png rename to src/main/resources/assets/botania/textures/model/armor_manasteel.png diff --git a/src/main/resources/assets/botania/textures/model/manaweave_new.png b/src/main/resources/assets/botania/textures/model/armor_manaweave.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manaweave_new.png rename to src/main/resources/assets/botania/textures/model/armor_manaweave.png diff --git a/src/main/resources/assets/botania/textures/model/manaweavenewholiday.png b/src/main/resources/assets/botania/textures/model/armor_manaweave_holiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manaweavenewholiday.png rename to src/main/resources/assets/botania/textures/model/armor_manaweave_holiday.png diff --git a/src/main/resources/assets/botania/textures/model/terrasteel_new.png b/src/main/resources/assets/botania/textures/model/armor_terrasteel.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/terrasteel_new.png rename to src/main/resources/assets/botania/textures/model/armor_terrasteel.png diff --git a/src/main/resources/assets/botania/textures/model/knockbackbelt.png b/src/main/resources/assets/botania/textures/model/belt_knockback.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/knockbackbelt.png rename to src/main/resources/assets/botania/textures/model/belt_knockback.png diff --git a/src/main/resources/assets/botania/textures/model/speedupbelt.png b/src/main/resources/assets/botania/textures/model/belt_speed.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/speedupbelt.png rename to src/main/resources/assets/botania/textures/model/belt_speed.png diff --git a/src/main/resources/assets/botania/textures/model/travelbelt.png b/src/main/resources/assets/botania/textures/model/belt_travel.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/travelbelt.png rename to src/main/resources/assets/botania/textures/model/belt_travel.png diff --git a/src/main/resources/assets/botania/textures/model/supertravelbelt.png b/src/main/resources/assets/botania/textures/model/belt_travel_super.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/supertravelbelt.png rename to src/main/resources/assets/botania/textures/model/belt_travel_super.png diff --git a/src/main/resources/assets/botania/textures/model/corporeaindex.png b/src/main/resources/assets/botania/textures/model/corporea_index.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/corporeaindex.png rename to src/main/resources/assets/botania/textures/model/corporea_index.png diff --git a/src/main/resources/assets/botania/textures/model/hourglass.png b/src/main/resources/assets/botania/textures/model/hourglass.png index e53cc2f82..f4bdef079 100644 Binary files a/src/main/resources/assets/botania/textures/model/hourglass.png and b/src/main/resources/assets/botania/textures/model/hourglass.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_gaia_halloween.png b/src/main/resources/assets/botania/textures/model/spreader_gaia_halloween.png index 63ead32da..7c15314f7 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_gaia_halloween.png and b/src/main/resources/assets/botania/textures/model/spreader_gaia_halloween.png differ diff --git a/src/main/resources/assets/botania/textures/model/pinkwither.png b/src/main/resources/assets/botania/textures/model/wither_pink.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/pinkwither.png rename to src/main/resources/assets/botania/textures/model/wither_pink.png