diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index d81be0141..f95f614de 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -65,51 +65,54 @@ public final class LibResources { public static final String ENTRY_METAMORPHIC_STONES = PREFIX_ENTRIES + "metamorphicStones.png"; public static final String ENTRY_BANNERS = PREFIX_ENTRIES + "banners.png"; - public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader.png"; - public static final String MODEL_SPREADER_REDSTONE = PREFIX_MODEL + "spreaderRedstone.png"; - public static final String MODEL_SPREADER_DREAMWOOD = PREFIX_MODEL + "spreaderDreamwood.png"; - public static final String MODEL_SPREADER_HALLOWEEN = PREFIX_MODEL + "spreader_halloween.png"; - public static final String MODEL_SPREADER_REDSTONE_HALLOWEEN = PREFIX_MODEL + "spreaderRedstone_halloween.png"; - public static final String MODEL_SPREADER_DREAMWOOD_HALLOWEEN = PREFIX_MODEL + "spreaderDreamwood_halloween.png"; - public static final String MODEL_PYLON_OLD = PREFIX_MODEL + "pylonOld.png"; - public static final String MODEL_PYLON = PREFIX_MODEL + "pylon.png"; - public static final String MODEL_PYLON_GREEN_OLD = PREFIX_MODEL + "pylonOld1.png"; - public static final String MODEL_PYLON_GREEN = PREFIX_MODEL + "pylon1.png"; - public static final String MODEL_PYLON_PINK_OLD = PREFIX_MODEL + "pylonOld2.png"; - public static final String MODEL_PYLON_PINK = PREFIX_MODEL + "pylon2.png"; - public static final String MODEL_LEXICA_DEFAULT = PREFIX_MODEL + "lexica0.png"; - public static final String MODEL_LEXICA_ELVEN = PREFIX_MODEL + "lexica1.png"; - public static final String MODEL_MANASTEEL_0 = PREFIX_MODEL + "manasteel0.png"; - public static final String MODEL_MANASTEEL_1 = PREFIX_MODEL + "manasteel1.png"; - public static final String MODEL_MANASTEEL_2 = PREFIX_MODEL + "manasteel2.png"; - public static final String MODEL_MANASTEEL_NEW = PREFIX_MODEL + "manasteelNew.png"; - public static final String MODEL_TERRASTEEL_0 = PREFIX_MODEL + "terrasteel0.png"; - public static final String MODEL_TERRASTEEL_1 = PREFIX_MODEL + "terrasteel1.png"; - public static final String MODEL_TERRASTEEL_2 = PREFIX_MODEL + "terrasteel2.png"; - public static final String MODEL_TERRASTEEL_NEW = PREFIX_MODEL + "terrasteelNew.png"; - public static final String MODEL_ELEMENTIUM_0 = PREFIX_MODEL + "elementium0.png"; - public static final String MODEL_ELEMENTIUM_1 = PREFIX_MODEL + "elementium1.png"; - public static final String MODEL_ELEMENTIUM_2 = PREFIX_MODEL + "elementium2.png"; - public static final String MODEL_ELEMENTIUM_NEW = PREFIX_MODEL + "elementiumNew.png"; - public static final String MODEL_MANAWEAVE_0 = PREFIX_MODEL + "manaweave0.png"; - public static final String MODEL_MANAWEAVE_1 = PREFIX_MODEL + "manaweave1.png"; - public static final String MODEL_MANAWEAVE_NEW = PREFIX_MODEL + "manaweaveNew.png"; - public static final String MODEL_MANAWEAVE_NEW_HOLIDAY = PREFIX_MODEL + "manaweaveNewHoliday.png"; + public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader_mana.png"; + public static final String MODEL_SPREADER_REDSTONE = PREFIX_MODEL + "spreader_redstone.png"; + public static final String MODEL_SPREADER_DREAMWOOD = PREFIX_MODEL + "spreader_dreamwood.png"; + public static final String MODEL_SPREADER_GAIA = PREFIX_MODEL + "spreader_gaia.png"; + public static final String MODEL_SPREADER_HALLOWEEN = PREFIX_MODEL + "spreader_mana_halloween.png"; + public static final String MODEL_SPREADER_REDSTONE_HALLOWEEN = PREFIX_MODEL + "spreader_redstone_halloween.png"; + public static final String MODEL_SPREADER_DREAMWOOD_HALLOWEEN = PREFIX_MODEL + "spreader_dreamwood_halloween.png"; + public static final String MODEL_SPREADER_GAIA_HALLOWEEN = PREFIX_MODEL + "spreader_gaia_halloween.png"; + public static final String MODEL_PYLON_MANA = PREFIX_MODEL + "pylon_mana.png"; + public static final String MODEL_PYLON = PREFIX_MODEL + "pylon_0.png"; + public static final String MODEL_PYLON_NATURA = PREFIX_MODEL + "pylon_natura.png"; + public static final String MODEL_PYLON_GREEN = PREFIX_MODEL + "pylon_1.png"; + public static final String MODEL_PYLON_GAIA = PREFIX_MODEL + "pylon_gaia.png"; + public static final String MODEL_PYLON_PINK = PREFIX_MODEL + "pylon_2.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_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_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_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_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_PIXIE = PREFIX_MODEL + "pixie.png"; - public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tinyPotato.png"; - public static final String MODEL_TINY_POTATO_GS = PREFIX_MODEL + "tinyPotatoGray.png"; - public static final String MODEL_TINY_POTATO_HALLOWEEN = PREFIX_MODEL + "tinyPotato_halloween.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_HOLY_CLOAK = PREFIX_MODEL + "holyCloak.png"; - public static final String MODEL_UNHOLY_CLOAK = PREFIX_MODEL + "unholyCloak.png"; - public static final String MODEL_BALANCE_CLOAK = PREFIX_MODEL + "balanceCloak.png"; - public static final String MODEL_HOLY_CLOAK_GLOW = PREFIX_MODEL + "holyCloakGlow.png"; - public static final String MODEL_UNHOLY_CLOAK_GLOW = PREFIX_MODEL + "unholyCloakGlow.png"; - public static final String MODEL_BALANCE_CLOAK_GLOW = PREFIX_MODEL + "balanceCloakGlow.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"; @@ -120,12 +123,12 @@ public final class LibResources { 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"; public static final String MODEL_AVATAR = PREFIX_MODEL + "avatar.png"; - public static final String MODEL_AVATAR_DIVINING = PREFIX_MODEL + "avatarDivining.png"; - public static final String MODEL_AVATAR_FIRE = PREFIX_MODEL + "avatarFire.png"; - public static final String MODEL_AVATAR_MISSILE = PREFIX_MODEL + "avatarMissile.png"; - public static final String MODEL_AVATAR_RAINBOW = PREFIX_MODEL + "avatarRainbow.png"; - public static final String MODEL_AVATAR_TORNADO = PREFIX_MODEL + "avatarTornado.png"; - public static final String MODEL_AVATAR_DIRT = PREFIX_MODEL + "avatarDirt.png"; + public static final String MODEL_AVATAR_DIVINING = PREFIX_MODEL + "avatar_divining.png"; + public static final String MODEL_AVATAR_FIRE = PREFIX_MODEL + "avatar_fire.png"; + public static final String MODEL_AVATAR_MISSILE = PREFIX_MODEL + "avatar_missile.png"; + public static final String MODEL_AVATAR_RAINBOW = PREFIX_MODEL + "avatar_rainbow.png"; + public static final String MODEL_AVATAR_TORNADO = PREFIX_MODEL + "avatar_tornado.png"; + public static final String MODEL_AVATAR_DIRT = PREFIX_MODEL + "avatar_dirt.png"; public static final String MISC_PARTICLES = PREFIX_MISC + "particles.png"; public static final String MISC_WISP_LARGE = PREFIX_MISC + "wispLarge.png"; diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index 08c251547..735070e0f 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -16,74 +16,46 @@ import net.minecraft.client.renderer.GlStateManager; public class ModelBellows extends ModelBase { - final ModelRenderer Base; - final ModelRenderer Top; - final ModelRenderer Funnel; - final ModelRenderer Pipe; - final ModelRenderer Handle1; - final ModelRenderer Handle2; - final ModelRenderer Handle3; + final ModelRenderer top; + final ModelRenderer base; + final ModelRenderer pipe; + final ModelRenderer funnel; public ModelBellows() { textureWidth = 64; textureHeight = 32; - - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 10, 2, 10); - Base.setRotationPoint(-5F, 22F, -5F); - Base.setTextureSize(64, 32); - Base.mirror = true; - Top = new ModelRenderer(this, 0, 14); - Top.addBox(0F, 0F, 0F, 8, 1, 8); - Top.setRotationPoint(-4F, 14F, -4F); - Top.setTextureSize(64, 32); - Top.mirror = true; - Funnel = new ModelRenderer(this, 34, 14); - Funnel.addBox(0F, 0F, 0F, 6, 7, 6); - Funnel.setRotationPoint(0F, 0F, 0F); - Funnel.setTextureSize(64, 32); - Funnel.mirror = true; - Pipe = new ModelRenderer(this, 43, 1); - Pipe.addBox(0F, 0F, 0F, 2, 2, 3); - Pipe.setRotationPoint(-1F, 22F, -8F); - Pipe.setTextureSize(64, 32); - Pipe.mirror = true; - Handle1 = new ModelRenderer(this, 43, 8); - Handle1.addBox(0F, 0F, -0.5F, 1, 2, 1); - Handle1.setRotationPoint(-2F, 12F, 0F); - Handle1.setTextureSize(64, 32); - Handle1.mirror = true; - Handle2 = new ModelRenderer(this, 48, 8); - Handle2.addBox(1F, 0F, -0.5F, 2, 1, 1); - Handle2.setRotationPoint(-2F, 12F, 0F); - Handle2.setTextureSize(64, 32); - Handle2.mirror = true; - Handle3 = new ModelRenderer(this, 55, 8); - Handle3.addBox(3F, 0F, -0.5F, 1, 2, 1); - Handle3.setRotationPoint(-2F, 12F, 0F); - Handle3.setTextureSize(64, 32); - Handle3.mirror = true; + + top = new ModelRenderer(this, 0, 0); + top.setRotationPoint(0.0F, 16.0F, 0.0F); + top.addBox(-4.0F, -2.0F, -4.0F, 8, 1, 8, 0.0F); + base = new ModelRenderer(this, 0, 9); + base.setRotationPoint(0.0F, 16.0F, 0.0F); + base.addBox(-5.0F, 6.0F, -5.0F, 10, 2, 10, 0.0F); + pipe = new ModelRenderer(this, 0, 21); + pipe.setRotationPoint(0.0F, 16.0F, 0.0F); + pipe.addBox(-1.0F, 6.0F, -8.0F, 2, 2, 3, 0.0F); + + funnel = new ModelRenderer(this, 40, 0); + funnel.setRotationPoint(0.0F, 0.0F, 0.0F); + funnel.addBox(0.0F, 0.0F, 0.0F, 6, 7, 6, 0.0F); } public void render(float fract) { float f5 = 1F / 16F; - Base.render(f5); - Pipe.render(f5); + base.render(f5); + pipe.render(f5); //float fract = Math.max(0.1F, (float) (Math.sin(((double) ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.5F); float mov = (1F - fract) * 0.5F; GlStateManager.translate(0F, mov, 0F); - Top.render(f5); - Handle1.render(f5); - Handle2.render(f5); - Handle3.render(f5); + top.render(f5); GlStateManager.translate(0F, -mov, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.19F, -1.375F, -0.19F); GlStateManager.scale(1F, fract, 1F); - Funnel.render(f5); + funnel.render(f5); GlStateManager.scale(1F, 1F / fract, 1F); } diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 0b64a8447..b0b2e94d0 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -17,31 +17,31 @@ import vazkii.botania.client.render.tile.RenderTileBrewery; public class ModelBrewery extends ModelBase { - final ModelRenderer Pole; - final ModelRenderer Top; - final ModelRenderer Bottom; - final ModelRenderer Plate; + final ModelRenderer top; + final ModelRenderer pole; + final ModelRenderer bottom; + + final ModelRenderer plate; public ModelBrewery() { - textureWidth = 64; - textureHeight = 32; - - Pole = new ModelRenderer(this, 0, 6); - Pole.addBox(0F, 0F, 0F, 2, 10, 2); - Pole.setRotationPoint(-1F, 10F, -1F); - Pole.setTextureSize(64, 32); - Top = new ModelRenderer(this, 18, 0); - Top.addBox(0F, 0F, 0F, 4, 1, 4); - Top.setRotationPoint(-2F, 9F, -2F); - Top.setTextureSize(64, 32); - Bottom = new ModelRenderer(this, 18, 7); - Bottom.addBox(0F, 0F, 0F, 4, 1, 4); - Bottom.setRotationPoint(-2F, 20F, -2F); - Bottom.setTextureSize(64, 32); - Plate = new ModelRenderer(this, 0, 0); - Plate.addBox(5F, 0F, -2F, 4, 1, 4); - Plate.setRotationPoint(0F, 17F, 0F); - Plate.setTextureSize(64, 32); + + textureWidth = 32; + textureHeight = 16; + + top = new ModelRenderer(this, 8, 0); + top.setRotationPoint(0.0F, 16.0F, 0.0F); + top.addBox(-2.0F, -7.0F, -2.0F, 4, 1, 4, 0.0F); + pole = new ModelRenderer(this, 0, 0); + pole.setRotationPoint(0.0F, 16.0F, 0.0F); + pole.addBox(-1.0F, -6.0F, -1.0F, 2, 10, 2, 0.0F); + bottom = new ModelRenderer(this, 8, 5); + bottom.setRotationPoint(0.0F, 16.0F, 0.0F); + bottom.addBox(-2.0F, 4.0F, -2.0F, 4, 1, 4, 0.0F); + + plate = new ModelRenderer(this, 8, 5); + plate.setRotationPoint(0.0F, 17.0F, 0.0F); + plate.addBox(5.0F, 0.0F, -2.0F, 4, 1, 4, 0.0F); + } public void render(RenderTileBrewery render, double time) { @@ -65,21 +65,21 @@ public class ModelBrewery extends ModelBase { GlStateManager.rotate(-180F, 1F, 0F, 0F); } - Pole.render(f); - Top.render(f); - Bottom.render(f); + pole.render(f); + top.render(f); + bottom.render(f); GlStateManager.rotate(-polerot, 0F, 1F, 0F); float degper = (float) (2F * Math.PI) / plates; for(int i = 0; i < plates; i++) { - Plate.rotateAngleY = deg; + plate.rotateAngleY = deg; float offset1 = (float) Math.sin(time / 20 + i * 40F) * 0.2F - 0.2F; if(time == -1) offset1 = 0F; GlStateManager.translate(0F, offset1, 0F); if(hasTile && !render.brewery.getItemHandler().getStackInSlot(i + 1).isEmpty()) { - float rot = Plate.rotateAngleY * 180F / (float) Math.PI; + float rot = plate.rotateAngleY * 180F / (float) Math.PI; float transX = 0.3125F; float transY = 1.06F; float transZ = 0.1245F; @@ -93,8 +93,7 @@ public class ModelBrewery extends ModelBase { GlStateManager.translate(-transX, -transY, -transZ); GlStateManager.rotate(-rot, 0F, 1F, 0F); } - - Plate.render(f); + plate.render(f); GlStateManager.translate(0F, -offset1, 0F); deg += degper; diff --git a/src/main/java/vazkii/botania/client/model/ModelCloak.java b/src/main/java/vazkii/botania/client/model/ModelCloak.java index ab5d5021b..83b6982eb 100644 --- a/src/main/java/vazkii/botania/client/model/ModelCloak.java +++ b/src/main/java/vazkii/botania/client/model/ModelCloak.java @@ -9,32 +9,36 @@ import net.minecraft.client.model.ModelRenderer; */ public class ModelCloak extends ModelBase { - public ModelRenderer armRpauldron; - public ModelRenderer armLpauldron; - public ModelRenderer helm; - + public ModelRenderer collar; + public ModelRenderer sideL; + public ModelRenderer sideR; + public ModelCloak() { + textureWidth = 64; textureHeight = 64; - armLpauldron = new ModelRenderer(this, 0, 15); - armLpauldron.mirror = true; - armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); - armLpauldron.addBox(-1.0F, 0.0F, -5.0F, 9, 20, 9, 0.0F); - setRotateAngle(armLpauldron, 0.08726646259971647F, -0.2617993877991494F, -0.17453292519943295F); - armRpauldron = new ModelRenderer(this, 0, 15); - armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - armRpauldron.addBox(-8.0F, 0.0F, -5.0F, 9, 20, 9, 0.0F); - setRotateAngle(armRpauldron, 0.08726646259971647F, 0.2617993877991494F, 0.17453292519943295F); - helm = new ModelRenderer(this, 0, 0); - helm.setRotationPoint(0.0F, 0.0F, 0.0F); - helm.addBox(-4.5F, -3.0F, -5.5F, 9, 4, 11, 0.0F); - setRotateAngle(helm, 0.2617993877991494F, 0.0F, 0.0F); + float s = 0.01F; + + collar = new ModelRenderer(this, 0, 0); + collar.setRotationPoint(0.0F, -3.0F, -4.5F); + collar.addBox(-5.5F, 0.0F, -1.5F, 11, 5, 11, s); + setRotateAngle(collar, 0.08726646259971647F, 0.0F, 0.0F); + sideL = new ModelRenderer(this, 0, 16); + sideL.mirror = true; + sideL.setRotationPoint(0.0F, 0.0F, 0.0F); + sideL.addBox(-0.5F, -0.5F, -5.5F, 11, 21, 10, s); + setRotateAngle(sideL, 0.08726646259971647F, -0.08726646259971647F, -0.17453292519943295F); + sideR = new ModelRenderer(this, 0, 16); + sideR.setRotationPoint(0.0F, 0.0F, 0.0F); + sideR.addBox(-10.5F, -0.5F, -5.5F, 11, 21, 10, s); + setRotateAngle(sideR, 0.08726646259971647F, 0.08726646259971647F, 0.17453292519943295F); + } public void render(float f5) { - armLpauldron.render(f5); - armRpauldron.render(f5); - helm.render(f5); + collar.render(f5); + sideL.render(f5); + sideR.render(f5); } public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { diff --git a/src/main/java/vazkii/botania/client/model/ModelPixie.java b/src/main/java/vazkii/botania/client/model/ModelPixie.java index 00a608151..913884090 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPixie.java +++ b/src/main/java/vazkii/botania/client/model/ModelPixie.java @@ -1,5 +1,5 @@ /** - * This class was created by . It's distributed as + * 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 * @@ -17,55 +17,67 @@ import net.minecraft.util.math.MathHelper; public class ModelPixie extends ModelBase { - final ModelRenderer Body; - final ModelRenderer LeftWing; - final ModelRenderer RightWing; + public ModelRenderer body; + public ModelRenderer leftWingT; + public ModelRenderer leftWingB; + public ModelRenderer rightWingT; + public ModelRenderer rightWingB; - public ModelPixie() { - textureWidth = 64; - textureHeight = 32; - - Body = new ModelRenderer(this, 0, 0); - Body.addBox(0F, 0F, 0F, 4, 4, 4); - Body.setRotationPoint(-2F, 16F, -2F); - Body.setTextureSize(64, 32); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - LeftWing = new ModelRenderer(this, 32, 0); - LeftWing.addBox(0F, 0F, -1F, 0, 4, 7); - LeftWing.setRotationPoint(2F, 15F, 2F); - LeftWing.setTextureSize(64, 32); - LeftWing.mirror = true; - setRotation(LeftWing, 0F, 0F, 0F); - RightWing = new ModelRenderer(this, 50, 0); - RightWing.addBox(0F, 0F, -1F, 0, 4, 7); - RightWing.setRotationPoint(-2F, 15F, 2F); - RightWing.setTextureSize(64, 32); - RightWing.mirror = true; - setRotation(RightWing, 0F, 0F, 0F); - } + public ModelPixie() { + + textureWidth = 32; + textureHeight = 32; + + body = new ModelRenderer(this, 0, 0); + body.setRotationPoint(0.0F, 16.0F, 0.0F); + body.addBox(-2.5F, 0.0F, -2.5F, 5, 5, 5, 0.0F); + + leftWingT = new ModelRenderer(this, 0, 4); + leftWingT.setRotationPoint(2.5F, 18.0F, 0.5F); + leftWingT.addBox(0.0F, -5.0F, 0.0F, 0, 5, 6, 0.0F); + setRotateAngle(leftWingT, 0.2617993877991494F, 0.5235987755982988F, 0.2617993877991494F); + leftWingB = new ModelRenderer(this, 0, 11); + leftWingB.setRotationPoint(2.5F, 18.0F, 0.5F); + leftWingB.addBox(0.0F, 0.0F, 0.0F, 0, 3, 4, 0.0F); + setRotateAngle(leftWingB, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); + rightWingT = new ModelRenderer(this, 0, 4); + rightWingT.setRotationPoint(-2.5F, 18.0F, 0.5F); + rightWingT.addBox(0.0F, -5.0F, 0.0F, 0, 5, 6, 0.0F); + setRotateAngle(rightWingT, 0.2617993877991494F, -0.5235987755982988F, -0.2617993877991494F); + rightWingB = new ModelRenderer(this, 0, 11); + rightWingB.setRotationPoint(-2.5F, 18.0F, 0.5F); + rightWingB.addBox(0.0F, 0.0F, 0.0F, 0, 3, 4, 0.0F); + setRotateAngle(rightWingB, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); + } @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); - Body.render(f5); - LeftWing.render(f5); - RightWing.render(f5); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; + + body.render(f5); + + leftWingT.render(f5); + leftWingB.render(f5); + rightWingT.render(f5); + rightWingB.render(f5); } + + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - RightWing.rotateAngleY = -(MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.5F); - LeftWing.rotateAngleY = MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.5F; + rightWingT.rotateAngleY = -(MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.5F); + leftWingT.rotateAngleY = MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.5F; + rightWingB.rotateAngleY = -(MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.25F); + leftWingB.rotateAngleY = MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.25F; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java b/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java new file mode 100644 index 000000000..07933e9c2 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java @@ -0,0 +1,131 @@ +/** + * 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 @ [Feb 18, 2014, 10:05:39 PM (GMT)] + */ +package vazkii.botania.client.model; + +import java.util.function.Function; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.common.model.IModelState; +import vazkii.botania.api.state.enums.PylonVariant; + +public class ModelPylonGaia extends ModelBase implements IModel { + + final ModelRenderer platef; + final ModelRenderer plateb; + final ModelRenderer platel; + final ModelRenderer plater; + + final ModelRenderer shardlbt; + final ModelRenderer shardrbt; + final ModelRenderer shardlft; + final ModelRenderer shardrft; + + final ModelRenderer shardlbb; + final ModelRenderer shardrbb; + final ModelRenderer shardlfb; + final ModelRenderer shardrfb; + + public ModelPylonGaia() { + + textureWidth = 64; + textureHeight = 64; + + //plates + platel = new ModelRenderer(this, 36, 0); + platel.setRotationPoint(0.0F, 16.0F, 0.0F); + platel.addBox(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); + setRotation(platel, 0.0F, 1.5707963267948966F, 0.0F); + plater = new ModelRenderer(this, 36, 0); + plater.setRotationPoint(0.0F, 16.0F, 0.0F); + plater.addBox(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); + setRotation(plater, 0.0F, -1.5707963267948966F, 0.0F); + platef = new ModelRenderer(this, 36, 0); + platef.setRotationPoint(0.0F, 16.0F, 0.0F); + platef.addBox(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); + plateb = new ModelRenderer(this, 36, 0); + plateb.setRotationPoint(0.0F, 16.0F, 0.0F); + plateb.addBox(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); + setRotation(plateb, 0.0F, 3.141592653589793F, 0.0F); + + //shards + shardrft = new ModelRenderer(this, 16, 32); + shardrft.setRotationPoint(0.0F, 16.0F, 0.0F); + shardrft.addBox(2.0F, -6.0F, -5.0F, 3, 2, 3, 0.0F); + shardlbt = new ModelRenderer(this, 0, 0); + shardlbt.setRotationPoint(0.0F, 16.0F, 0.0F); + shardlbt.addBox(-5.0F, -6.0F, 0.0F, 6, 5, 5, 0.0F); + shardrbt = new ModelRenderer(this, 22, 9); + shardrbt.setRotationPoint(0.0F, 16.0F, 0.0F); + shardrbt.addBox(3.0F, -5.0F, 0.0F, 2, 4, 5, 0.0F); + shardlft = new ModelRenderer(this, 0, 32); + shardlft.setRotationPoint(0.0F, 16.0F, 0.0F); + shardlft.addBox(-5.0F, -7.0F, -5.0F, 5, 6, 3, 0.0F); + + shardrfb = new ModelRenderer(this, 16, 37); + shardrfb.setRotationPoint(0.0F, 16.0F, 0.0F); + shardrfb.addBox(2.0F, -2.0F, -5.0F, 3, 6, 3, 0.0F); + shardlbb = new ModelRenderer(this, 0, 10); + shardlbb.setRotationPoint(0.0F, 16.0F, 0.0F); + shardlbb.addBox(-5.0F, 1.0F, 0.0F, 6, 3, 5, 0.0F); + shardrbb = new ModelRenderer(this, 22, 0); + shardrbb.setRotationPoint(0.0F, 16.0F, 0.0F); + shardrbb.addBox(3.0F, 1.0F, 0.0F, 2, 4, 5, 0.0F); + shardlfb = new ModelRenderer(this, 0, 41); + shardlfb.setRotationPoint(0.0F, 16.0F, 0.0F); + shardlfb.addBox(-5.0F, 1.0F, -5.0F, 5, 2, 3, 0.0F); + } + + public void renderCrystal(PylonVariant variant) { + float f = 1F / 16F; + + shardrft.render(f); + shardlbt.render(f); + shardrbt.render(f); + shardlft.render(f); + + shardrfb.render(f); + shardlbb.render(f); + shardrbb.render(f); + shardlfb.render(f); + } + + public void renderRing(PylonVariant variant) { + float f = 1F / 16F; + + platef.render(f); + plateb.render(f); + platel.render(f); + plater.render(f); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void renderGems(PylonVariant variant) {} + + @Override + public IBakedModel bake(IModelState state, VertexFormat format, + Function bakedTextureGetter) { + // TODO Auto-generated method stub + return null; + } + +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonMana.java b/src/main/java/vazkii/botania/client/model/ModelPylonMana.java new file mode 100644 index 000000000..08bfd4bdd --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/ModelPylonMana.java @@ -0,0 +1,108 @@ +/** + * 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 @ [Feb 18, 2014, 10:05:39 PM (GMT)] + */ +package vazkii.botania.client.model; + +import java.util.function.Function; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.common.model.IModelState; +import vazkii.botania.api.state.enums.PylonVariant; + +public class ModelPylonMana extends ModelBase implements IModel { + + final ModelRenderer platef; + final ModelRenderer plateb; + final ModelRenderer platel; + final ModelRenderer plater; + + final ModelRenderer shardlf; + final ModelRenderer shardrf; + final ModelRenderer shardlb; + final ModelRenderer shardrb; + + public ModelPylonMana() { + + textureWidth = 64; + textureHeight = 64; + + //plates + platef = new ModelRenderer(this, 36, 0); + platef.setRotationPoint(0.0F, 16.0F, 0.0F); + platef.addBox(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); + plateb = new ModelRenderer(this, 36, 0); + plateb.setRotationPoint(0.0F, 16.0F, 0.0F); + plateb.addBox(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); + setRotation(plateb, 0.0F, 3.141592653589793F, 0.0F); + platel = new ModelRenderer(this, 36, 0); + platel.setRotationPoint(0.0F, 16.0F, 0.0F); + platel.addBox(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); + setRotation(platel, 0.0F, 1.5707963267948966F, 0.0F); + plater = new ModelRenderer(this, 36, 0); + plater.setRotationPoint(0.0F, 16.0F, 0.0F); + plater.addBox(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); + setRotation(plater, 0.0F, -1.5707963267948966F, 0.0F); + + //shards + shardlf = new ModelRenderer(this, 0, 21); + shardlf.setRotationPoint(0.0F, 16.0F, 0.0F); + shardlf.addBox(-5.0F, -9.0F, -5.0F, 5, 16, 3, 0.0F); + shardrf = new ModelRenderer(this, 16, 21); + shardrf.setRotationPoint(0.0F, 16.0F, 0.0F); + shardrf.addBox(2.0F, -12.0F, -5.0F, 3, 16, 3, 0.0F); + shardlb = new ModelRenderer(this, 0, 0); + shardlb.setRotationPoint(0.0F, 16.0F, 0.0F); + shardlb.addBox(-5.0F, -10.0F, 0.0F, 6, 16, 5, 0.0F); + shardrb = new ModelRenderer(this, 22, 0); + shardrb.setRotationPoint(0.0F, 16.0F, 0.0F); + shardrb.addBox(3.0F, -11.0F, 0.0F, 2, 16, 5, 0.0F); + } + + public void renderCrystal(PylonVariant variant) { + float f = 1F / 16F; + + shardlf.render(f); + shardrf.render(f); + shardlb.render(f); + shardrb.render(f); + } + + public void renderRing(PylonVariant variant) { + float f = 1F / 16F; + + platef.render(f); + plateb.render(f); + platel.render(f); + plater.render(f); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void renderGems(PylonVariant variant) {} + + @Override + public IBakedModel bake(IModelState state, VertexFormat format, + Function bakedTextureGetter) { + // TODO Auto-generated method stub + return null; + } + +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java b/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java new file mode 100644 index 000000000..7b78a604a --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java @@ -0,0 +1,131 @@ +/** + * 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 @ [Feb 18, 2014, 10:05:39 PM (GMT)] + */ +package vazkii.botania.client.model; + +import java.util.function.Function; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.common.model.IModelState; +import vazkii.botania.api.state.enums.PylonVariant; + +public class ModelPylonNatura extends ModelBase implements IModel { + + final ModelRenderer platef; + final ModelRenderer plateb; + final ModelRenderer platel; + final ModelRenderer plater; + + final ModelRenderer shardlbt; + final ModelRenderer shardrbt; + final ModelRenderer shardlft; + final ModelRenderer shardrft; + + final ModelRenderer shardlbb; + final ModelRenderer shardrbb; + final ModelRenderer shardlfb; + final ModelRenderer shardrfb; + + public ModelPylonNatura() { + + textureWidth = 64; + textureHeight = 64; + + //plates + platef = new ModelRenderer(this, 36, 0); + platef.setRotationPoint(0.0F, 16.0F, 0.0F); + platef.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); + plateb = new ModelRenderer(this, 36, 0); + plateb.setRotationPoint(0.0F, 16.0F, 0.0F); + plateb.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); + setRotation(plateb, 0.0F, 3.141592653589793F, 0.0F); + platel = new ModelRenderer(this, 36, 0); + platel.setRotationPoint(0.0F, 16.0F, 0.0F); + platel.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); + setRotation(platel, 0.0F, 1.5707963267948966F, 0.0F); + plater = new ModelRenderer(this, 36, 0); + plater.setRotationPoint(0.0F, 16.0F, 0.0F); + plater.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); + setRotation(plater, 0.0F, -1.5707963267948966F, 0.0F); + + //shards + shardrft = new ModelRenderer(this, 16, 32); + shardrft.setRotationPoint(0.0F, 16.0F, 0.0F); + shardrft.addBox(2.0F, -13.0F, -5.0F, 3, 7, 3, 0.0F); + shardlbt = new ModelRenderer(this, 0, 0); + shardlbt.setRotationPoint(0.0F, 16.0F, 0.0F); + shardlbt.addBox(-5.0F, -11.0F, 0.0F, 6, 9, 5, 0.0F); + shardrbt = new ModelRenderer(this, 22, 0); + shardrbt.setRotationPoint(0.0F, 16.0F, 0.0F); + shardrbt.addBox(3.0F, -12.0F, 0.0F, 2, 8, 5, 0.0F); + shardlft = new ModelRenderer(this, 0, 32); + shardlft.setRotationPoint(0.0F, 16.0F, 0.0F); + shardlft.addBox(-5.0F, -10.0F, -5.0F, 5, 10, 3, 0.0F); + + shardrfb = new ModelRenderer(this, 16, 42); + shardrfb.setRotationPoint(0.0F, 16.0F, 0.0F); + shardrfb.addBox(2.0F, -4.0F, -5.0F, 3, 9, 3, 0.0F); + shardlbb = new ModelRenderer(this, 0, 14); + shardlbb.setRotationPoint(0.0F, 16.0F, 0.0F); + shardlbb.addBox(-5.0F, 0.0F, 0.0F, 6, 7, 5, 0.0F); + shardrbb = new ModelRenderer(this, 22, 13); + shardrbb.setRotationPoint(0.0F, 16.0F, 0.0F); + shardrbb.addBox(3.0F, -2.0F, 0.0F, 2, 8, 5, 0.0F); + shardlfb = new ModelRenderer(this, 0, 45); + shardlfb.setRotationPoint(0.0F, 16.0F, 0.0F); + shardlfb.addBox(-5.0F, 2.0F, -5.0F, 5, 6, 3, 0.0F); + } + + public void renderCrystal(PylonVariant variant) { + float f = 1F / 16F; + + shardrft.render(f); + shardlbt.render(f); + shardrbt.render(f); + shardlft.render(f); + + shardrfb.render(f); + shardlbb.render(f); + shardrbb.render(f); + shardlfb.render(f); + } + + public void renderRing(PylonVariant variant) { + float f = 1F / 16F; + + platef.render(f); + plateb.render(f); + platel.render(f); + plater.render(f); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void renderGems(PylonVariant variant) {} + + @Override + public IBakedModel bake(IModelState state, VertexFormat format, + Function bakedTextureGetter) { + // TODO Auto-generated method stub + return null; + } + +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/ModelSpreader.java b/src/main/java/vazkii/botania/client/model/ModelSpreader.java index 1fdb43acc..0e77f70c0 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpreader.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpreader.java @@ -15,78 +15,76 @@ import net.minecraft.client.model.ModelRenderer; public class ModelSpreader extends ModelBase { - final ModelRenderer cubeSide1; - final ModelRenderer cubeSide2; - final ModelRenderer cubeSide3; - final ModelRenderer cubeSide4; - final ModelRenderer cubeSide5; - final ModelRenderer cubeHole1; - final ModelRenderer cubeHole2; - final ModelRenderer cubeHole3; - final ModelRenderer cubeHole4; - final ModelRenderer cubeInside; + final ModelRenderer top; + final ModelRenderer sideL; + final ModelRenderer sideR; + final ModelRenderer bottom; + final ModelRenderer back; + + final ModelRenderer holeT; + final ModelRenderer holeL; + final ModelRenderer holeR; + final ModelRenderer holeB; + + final ModelRenderer inside; public ModelSpreader() { + textureWidth = 64; - textureHeight = 32; - - cubeSide1 = new ModelRenderer(this, 0, 0); - cubeSide1.addBox(0F, 0F, 0F, 14, 1, 14); - cubeSide1.setRotationPoint(-7F, 22F, -7F); - cubeSide1.setTextureSize(64, 32); - cubeSide2 = new ModelRenderer(this, 0, 0); - cubeSide2.addBox(0F, 0F, 0F, 14, 13, 1); - cubeSide2.setRotationPoint(-7F, 9F, -7F); - cubeSide2.setTextureSize(64, 32); - cubeSide3 = new ModelRenderer(this, 0, 0); - cubeSide3.addBox(0F, 0F, 0F, 1, 13, 13); - cubeSide3.setRotationPoint(-7F, 9F, -6F); - cubeSide3.setTextureSize(64, 32); - cubeSide4 = new ModelRenderer(this, 0, 0); - cubeSide4.addBox(0F, 0F, 0F, 1, 13, 13); - cubeSide4.setRotationPoint(6F, 9F, -6F); - cubeSide4.setTextureSize(64, 32); - cubeSide5 = new ModelRenderer(this, 0, 0); - cubeSide5.addBox(0F, 0F, 0F, 12, 1, 13); - cubeSide5.setRotationPoint(-6F, 9F, -6F); - cubeSide5.setTextureSize(64, 32); - cubeHole1 = new ModelRenderer(this, 0, 0); - cubeHole1.addBox(0F, 0F, 0F, 4, 12, 1); - cubeHole1.setRotationPoint(2F, 10F, 6F); - cubeHole1.setTextureSize(64, 32); - cubeHole2 = new ModelRenderer(this, 0, 0); - cubeHole2.addBox(0F, 0F, 0F, 4, 12, 1); - cubeHole2.setRotationPoint(-6F, 10F, 6F); - cubeHole2.setTextureSize(64, 32); - cubeHole3 = new ModelRenderer(this, 0, 0); - cubeHole3.addBox(0F, 0F, 0F, 4, 4, 1); - cubeHole3.setRotationPoint(-2F, 18F, 6F); - cubeHole3.setTextureSize(64, 32); - cubeHole4 = new ModelRenderer(this, 0, 0); - cubeHole4.addBox(0F, 0F, 0F, 4, 4, 1); - cubeHole4.setRotationPoint(-2F, 10F, 6F); - cubeHole4.setTextureSize(64, 32); - cubeInside = new ModelRenderer(this, 30, 17); - cubeInside.addBox(0F, 0F, 0F, 6, 6, 6); - cubeInside.setRotationPoint(-3F, 13F, -3F); - cubeInside.setTextureSize(64, 32); + textureHeight = 64; + + top = new ModelRenderer(this, 0, 0); + top.setRotationPoint(0.0F, 16.0F, 0.0F); + top.addBox(-7.0F, -7.0F, -7.0F, 14, 1, 14, 0.0F); + sideL = new ModelRenderer(this, 0, 30); + sideL.setRotationPoint(0.0F, 16.0F, 0.0F); + sideL.addBox(6.0F, -6.0F, -6.0F, 1, 12, 12, 0.0F); + sideR = new ModelRenderer(this, 0, 30); + sideR.setRotationPoint(0.0F, 16.0F, 0.0F); + sideR.addBox(-7.0F, -6.0F, -6.0F, 1, 12, 12, 0.0F); + back = new ModelRenderer(this, 0, 29); + back.setRotationPoint(0.0F, 16.0F, 0.0F); + back.addBox(-7.0F, -6.0F, -7.0F, 14, 12, 1, 0.0F); + bottom = new ModelRenderer(this, 0, 15); + bottom.setRotationPoint(0.0F, 16.0F, 0.0F); + bottom.addBox(-7.0F, 6.0F, -7.0F, 14, 1, 14, 0.0F); + + holeT = new ModelRenderer(this, 0, 54); + holeT.setRotationPoint(0.0F, 10.0F, 6.0F); + holeT.addBox(-7.0F, 0.0F, 0.0F, 14, 4, 1, 0.0F); + holeL = new ModelRenderer(this, 30, 54); + holeL.setRotationPoint(2.0F, 10.0F, 6.0F); + holeL.addBox(0.0F, 4.0F, 0.0F, 5, 4, 1, 0.0F); + holeR = new ModelRenderer(this, 30, 59); + holeR.setRotationPoint(0.0F, 10.0F, 6.0F); + holeR.addBox(-7.0F, 4.0F, 0.0F, 5, 4, 1, 0.0F); + holeB = new ModelRenderer(this, 0, 59); + holeB.setRotationPoint(0.0F, 18.0F, 6.0F); + holeB.addBox(-7.0F, 0.0F, 0.0F, 14, 4, 1, 0.0F); + + inside = new ModelRenderer(this, 30, 30); + inside.setRotationPoint(0.0F, 16.0F, 0.0F); + inside.addBox(-3.0F, -3.0F, -3.0F, 6, 6, 6, 0.0F); } public void render() { float f = 1F / 16F; - cubeSide1.render(f); - cubeSide2.render(f); - cubeSide3.render(f); - cubeSide4.render(f); - cubeSide5.render(f); - cubeHole1.render(f); - cubeHole2.render(f); - cubeHole3.render(f); - cubeHole4.render(f); + + top.render(f); + sideL.render(f); + sideR.render(f); + back.render(f); + bottom.render(f); + + holeT.render(f); + holeL.render(f); + holeR.render(f); + holeB.render(f); } public void renderCube() { float f = 1F / 16F; - cubeInside.render(f); + + inside.render(f); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java b/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java index ed63fbc13..999ed930a 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java +++ b/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java @@ -18,8 +18,8 @@ public class ModelTinyPotato extends ModelBase { final ModelRenderer potato; public ModelTinyPotato() { - textureWidth = 64; - textureHeight = 32; + textureWidth = 16; + textureHeight = 16; potato = new ModelRenderer(this, 0, 0); potato.addBox(0F, 0F, 0F, 4, 6, 4); diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 4ded2588f..a4d9e8e5e 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -10,217 +10,232 @@ */ package vazkii.botania.client.model.armor; +import javax.annotation.Nonnull; + import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.inventory.EntityEquipmentSlot; -import javax.annotation.Nonnull; - public class ModelArmorElementium extends ModelArmor { + + private final ModelRenderer helmAnchor; private final ModelRenderer helm; - public final ModelRenderer body; - private final ModelRenderer armR; + private final ModelRenderer helmFairy; + private final ModelRenderer helmWing1r; + private final ModelRenderer helmWing2l; + private final ModelRenderer helmWing1l; + private final ModelRenderer helmWing2r; + + private final ModelRenderer bodyAnchor; + private final ModelRenderer bodyTop; + private final ModelRenderer bodyBottom; + + private final ModelRenderer armLAnchor; private final ModelRenderer armL; - public final ModelRenderer belt; - private final ModelRenderer bootR; - private final ModelRenderer bootL; - private final ModelRenderer helm1; - private final ModelRenderer helm2; - private final ModelRenderer helm3; - private final ModelRenderer fairy; - private final ModelRenderer helmWing1; - private final ModelRenderer helmWing2; - private final ModelRenderer helmWing3; - private final ModelRenderer helmWing4; - private final ModelRenderer body2; - private final ModelRenderer armRpauldron; - private final ModelRenderer wing1; - private final ModelRenderer wing2; private final ModelRenderer armLpauldron; - private final ModelRenderer wing1_1; - private final ModelRenderer wing2_1; - private final ModelRenderer legR; - private final ModelRenderer legL; - private final ModelRenderer bootR1; - private final ModelRenderer wing1_2; - private final ModelRenderer wing2_2; - private final ModelRenderer bootL1; - private final ModelRenderer wing1_3; - private final ModelRenderer wing2_3; - + private final ModelRenderer armLwing1; + private final ModelRenderer armLwing2; + + private final ModelRenderer armRAnchor; + private final ModelRenderer armR; + private final ModelRenderer armRpauldron; + private final ModelRenderer armRwing1; + private final ModelRenderer armRwing2; + + private final ModelRenderer pantsAnchor; + private final ModelRenderer belt; + private final ModelRenderer legL; + private final ModelRenderer legR; + + private final ModelRenderer bootL; + private final ModelRenderer bootLwing1; + private final ModelRenderer bootLwing2; + private final ModelRenderer bootR; + private final ModelRenderer bootRwing1; + private final ModelRenderer bootRwing2; + public ModelArmorElementium(EntityEquipmentSlot slot) { super(slot); - textureWidth = 64; - textureHeight = 128; - float s = 0.6F; - fairy = new ModelRenderer(this, 34, 32); - fairy.setRotationPoint(0.0F, 0.0F, 0.0F); - fairy.addBox(-2.0F, -8.5F, -7.0F, 4, 4, 4, s); - setRotateAngle(fairy, -0.17453292519943295F, 0.0F, 0.0F); - helm3 = new ModelRenderer(this, 0, 32); - helm3.setRotationPoint(0.0F, 0.0F, 0.0F); - helm3.addBox(-1.0F, -5.5F, -5.5F, 2, 3, 1, s); - setRotateAngle(helm3, -0.17453292519943295F, 0.0F, 0.0F); - wing1_2 = new ModelRenderer(this, 56, 43); - wing1_2.mirror = true; - wing1_2.setRotationPoint(-2.5F, 9.0F, 0.0F); - wing1_2.addBox(0.5F, -2.0F, 0.0F, 0, 2, 3, s); - setRotateAngle(wing1_2, 0.2617993877991494F, -0.7853981633974483F, -0.2617993877991494F); - helm1 = new ModelRenderer(this, 50, 32); - helm1.setRotationPoint(0.0F, 0.0F, 0.0F); - helm1.addBox(-4.0F, -5.0F, -4.5F, 1, 5, 4, s); - legL = new ModelRenderer(this, 12, 79); - legL.mirror = true; - legL.setRotationPoint(1.9F, 12.0F, 0.0F); - legL.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); - setRotateAngle(legL, 0.0F, 0.0F, 0F); - armL = new ModelRenderer(this, 0, 79); - armL.mirror = true; - armL.setRotationPoint(5.0F, 2.0F, -0.0F); - armL.addBox(1.5F, 6.0F, -2.0F, 2, 4, 4, s); - setRotateAngle(armL, 0.0F, 0.0F, 0F); - armRpauldron = new ModelRenderer(this, 0, 67); - armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - armRpauldron.addBox(-4.0F, -2.5F, -3.0F, 5, 6, 6, s); - legR = new ModelRenderer(this, 12, 79); - legR.setRotationPoint(-1.9F, 12.0F, 0.0F); - legR.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); - setRotateAngle(legR, 0.0F, 0.0F, 0F); - helmWing2 = new ModelRenderer(this, 46, 45); - helmWing2.mirror = true; - helmWing2.setRotationPoint(-4.0F, -4.0F, -1.0F); - helmWing2.addBox(-0.5F, 0.0F, 0.0F, 1, 3, 4, s); - setRotateAngle(helmWing2, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); - bootL1 = new ModelRenderer(this, 12, 79); - bootL1.mirror = true; - bootL1.setRotationPoint(0.0F, 0.0F, 0.0F); - bootL1.addBox(-2.0F, 7.0F, -2.0F, 4, 1, 4, s); - armR = new ModelRenderer(this, 0, 79); - armR.setRotationPoint(-5.0F, 2.0F, 0.0F); - armR.addBox(-3.5F, 6.0F, -2.0F, 2, 4, 4, s); - setRotateAngle(armR, 0.0F, 0.0F, 0F); - bootR1 = new ModelRenderer(this, 12, 79); - bootR1.setRotationPoint(0.0F, 0.0F, 0.0F); - bootR1.addBox(-2.0F, 7.0F, -2.0F, 4, 1, 4, s); - bootR = new ModelRenderer(this, 12, 79); - bootR.setRotationPoint(-1.9F, 12.0F, 0.0F); - bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); - setRotateAngle(bootR, 0.0F, 0.0F, 0F); - wing2_1 = new ModelRenderer(this, 56, 42); - wing2_1.setRotationPoint(4.5F, 0.0F, 0.0F); - wing2_1.addBox(0.0F, 0.0F, -0.5F, 0, 2, 3, s); - setRotateAngle(wing2_1, 0.08726646259971647F, 0.7853981633974483F, 0.2617993877991494F); - wing2_2 = new ModelRenderer(this, 56, 44); - wing2_2.mirror = true; - wing2_2.setRotationPoint(-2.5F, 9.0F, 0.0F); - wing2_2.addBox(0.5F, 0.0F, 0.0F, 0, 1, 2, s); - setRotateAngle(wing2_2, 0.08726646259971647F, -0.7853981633974483F, -0.2617993877991494F); - bootL = new ModelRenderer(this, 12, 79); - bootL.mirror = true; - bootL.setRotationPoint(1.9F, 12.0F, 0.0F); - bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); - setRotateAngle(bootL, 0.0F, 0.0F, 0F); - body = new ModelRenderer(this, 0, 44); - body.setRotationPoint(0.0F, 0.0F, 0.0F); - body.addBox(-4.5F, 0.0F, -4.0F, 9, 5, 7, s); - setRotateAngle(body, 0.08726646259971647F, 0.0F, 0.0F); - belt = new ModelRenderer(this, 22, 56); - belt.setRotationPoint(0.0F, 0.0F, 0.0F); - belt.addBox(-4.5F, 9.5F, -3.0F, 9, 3, 5, s); - helm = new ModelRenderer(this, 0, 32); - helm.setRotationPoint(0.0F, 0.0F, 0.0F); - helm.addBox(-4.0F, -8.0F, -4.5F, 8, 3, 9, s); - setRotateAngle(helm, 0.08726646259971647F, 0.0F, 0.0F); - helmWing4 = new ModelRenderer(this, 46, 45); - helmWing4.setRotationPoint(4.0F, -4.0F, -1.0F); - helmWing4.addBox(-0.5F, 0.0F, 0.0F, 1, 3, 4, s); - setRotateAngle(helmWing4, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); - armLpauldron = new ModelRenderer(this, 0, 67); - armLpauldron.mirror = true; - armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); - armLpauldron.addBox(-1.0F, -2.5F, -3.0F, 5, 6, 6, s); - wing1_1 = new ModelRenderer(this, 56, 41); - wing1_1.setRotationPoint(4.5F, 0.0F, 0.0F); - wing1_1.addBox(0.0F, -3.0F, -0.5F, 0, 3, 4, s); - setRotateAngle(wing1_1, 0.2617993877991494F, 0.7853981633974483F, 0.2617993877991494F); - helm2 = new ModelRenderer(this, 50, 32); - helm2.mirror = true; - helm2.setRotationPoint(0.0F, 0.0F, 0.0F); - helm2.addBox(3.0F, -5.0F, -4.5F, 1, 5, 4, s); - wing2_3 = new ModelRenderer(this, 56, 44); - wing2_3.setRotationPoint(2.5F, 9.0F, 0.0F); - wing2_3.addBox(0.0F, 0.0F, -0.5F, 0, 1, 2, s); - setRotateAngle(wing2_3, 0.08726646259971647F, 0.7853981633974483F, 0.2617993877991494F); - wing1 = new ModelRenderer(this, 56, 41); - wing1.mirror = true; - wing1.setRotationPoint(-4.5F, 0.0F, 0.0F); - wing1.addBox(0.5F, -3.0F, 0.0F, 0, 3, 4, s); - setRotateAngle(wing1, 0.2617993877991494F, -0.7853981633974483F, -0.2617993877991494F); - body2 = new ModelRenderer(this, 0, 56); - body2.setRotationPoint(0.0F, 0.0F, 0.0F); - body2.addBox(-3.0F, 4.0F, -3.0F, 6, 6, 5, s); - setRotateAngle(body2, -0.08726646259971647F, 0.0F, 0.0F); - helmWing3 = new ModelRenderer(this, 32, 45); - helmWing3.setRotationPoint(4.0F, -4.0F, -1.0F); - helmWing3.addBox(-0.5F, -5.0F, 0.0F, 1, 5, 6, s); - setRotateAngle(helmWing3, 0.2617993877991494F, 0.5235987755982988F, 0.08726646259971647F); - helmWing1 = new ModelRenderer(this, 32, 45); - helmWing1.mirror = true; - helmWing1.setRotationPoint(-4.0F, -4.0F, -1.0F); - helmWing1.addBox(-0.5F, -5.0F, 0.0F, 1, 5, 6, s); - setRotateAngle(helmWing1, 0.2617993877991494F, -0.5235987755982988F, -0.08726646259971647F); - wing2 = new ModelRenderer(this, 56, 42); - wing2.mirror = true; - wing2.setRotationPoint(-4.5F, 0.0F, 0.0F); - wing2.addBox(0.5F, 0.0F, 0.0F, 0, 2, 3, s); - setRotateAngle(wing2, 0.08726646259971647F, -0.7853981633974483F, -0.2617993877991494F); - wing1_3 = new ModelRenderer(this, 56, 43); - wing1_3.setRotationPoint(2.5F, 9.0F, 0.0F); - wing1_3.addBox(0.0F, -2.0F, -0.5F, 0, 2, 3, s); - setRotateAngle(wing1_3, 0.2617993877991494F, 0.7853981633974483F, 0.2617993877991494F); - helm.addChild(fairy); - helm.addChild(helm3); - bootR.addChild(wing1_2); - helm.addChild(helm1); - belt.addChild(legL); - armR.addChild(armRpauldron); - belt.addChild(legR); - helm.addChild(helmWing2); - bootL.addChild(bootL1); - bootR.addChild(bootR1); - armLpauldron.addChild(wing2_1); - bootR.addChild(wing2_2); - helm.addChild(helmWing4); - armL.addChild(armLpauldron); - armLpauldron.addChild(wing1_1); - helm.addChild(helm2); - bootL.addChild(wing2_3); - armRpauldron.addChild(wing1); - body.addChild(body2); - helm.addChild(helmWing3); - helm.addChild(helmWing1); - armRpauldron.addChild(wing2); - bootL.addChild(wing1_3); + this.textureWidth = 64; + this.textureHeight = 128; + float s = 0.01F; + + //helm + this.helmAnchor = new ModelRenderer(this, 0, 0); + this.helmAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.helmAnchor.addBox(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); + this.helm = new ModelRenderer(this, 0, 0); + this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); + this.helm.addBox(-4.5F, -9.0F, -4.5F, 9, 9, 9, s); + this.helmFairy = new ModelRenderer(this, 36, 11); + this.helmFairy.setRotationPoint(0.0F, 0.0F, 0.0F); + this.helmFairy.addBox(-2.5F, -10.0F, -5.5F, 5, 5, 5, s); + this.helmWing1l = new ModelRenderer(this, 36, 0); + this.helmWing1l.mirror = true; + this.helmWing1l.setRotationPoint(4.5F, -6.0F, -0.5F); + this.helmWing1l.addBox(-1.0F, -5.0F, 0.0F, 1, 5, 6, s); + this.setRotateAngle(helmWing1l, 0.2617993877991494F, 0.5235987755982988F, 0.2617993877991494F); + this.helmWing2l = new ModelRenderer(this, 50, 0); + this.helmWing2l.setRotationPoint(4.5F, -6.0F, -0.5F); + this.helmWing2l.addBox(-1.0F, 0.0F, 0.0F, 1, 3, 4, s); + this.setRotateAngle(helmWing2l, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); + this.helmWing1r = new ModelRenderer(this, 36, 0); + this.helmWing1r.setRotationPoint(-4.5F, -6.0F, -0.5F); + this.helmWing1r.addBox(0.0F, -5.0F, 0.0F, 1, 5, 6, s); + this.setRotateAngle(helmWing1r, 0.2617993877991494F, -0.5235987755982988F, -0.2617993877991494F); + this.helmWing2r = new ModelRenderer(this, 50, 0); + this.helmWing2r.mirror = true; + this.helmWing2r.setRotationPoint(-4.5F, -6.0F, -0.5F); + this.helmWing2r.addBox(0.0F, 0.0F, 0.0F, 1, 3, 4, s); + this.setRotateAngle(helmWing2r, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); + + //body + this.bodyAnchor = new ModelRenderer(this, 0, 0); + this.bodyAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.bodyTop = new ModelRenderer(this, 0, 19); + this.bodyTop.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyTop.addBox(-4.5F, 0.0F, -3.0F, 9, 6, 6, s); + this.bodyBottom = new ModelRenderer(this, 0, 31); + this.bodyBottom.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyBottom.addBox(-3.5F, 5.0F, -2.5F, 7, 3, 5, s); + + //armL + this.armLAnchor = new ModelRenderer(this, 0, 0); + this.armLAnchor.mirror = true; + this.armLAnchor.setRotationPoint(4.0F, 2.0F, 0.0F); + this.armLAnchor.addBox(0.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armL = new ModelRenderer(this, 24, 40); + this.armL.mirror = true; + this.armL.setRotationPoint(0.0F, 0.0F, -0.0F); + this.armL.addBox(0.5F, 4.5F, -2.49F, 3, 6, 5, s); + this.armLpauldron = new ModelRenderer(this, 0, 40); + this.armLpauldron.mirror = true; + this.armLpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armLpauldron.addBox(-0.5F, -3.0F, -3.0F, 6, 7, 6, s); + this.armLwing1 = new ModelRenderer(this, 40, 35); + this.armLwing1.setRotationPoint(6.0F, -1.0F, 0.0F); + this.armLwing1.addBox(0.0F, -4.0F, 0.0F, 0, 4, 5, s); + this.setRotateAngle(armLwing1, 0.2617993877991494F, 0.5235987755982988F, 0.2617993877991494F); + this.armLwing2 = new ModelRenderer(this, 40, 40); + this.armLwing2.setRotationPoint(6.0F, -1.0F, 0.0F); + this.armLwing2.addBox(0.0F, 0.0F, 0.0F, 0, 3, 4, s); + this.setRotateAngle(armLwing2, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); + + //armR + this.armRAnchor = new ModelRenderer(this, 0, 0); + this.armRAnchor.mirror = true; + this.armRAnchor.setRotationPoint(-4.0F, 2.0F, 0.0F); + this.armRAnchor.addBox(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armR = new ModelRenderer(this, 24, 40); + this.armR.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armR.addBox(-3.5F, 4.5F, -2.51F, 3, 6, 5, s); + this.armRpauldron = new ModelRenderer(this, 0, 40); + this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armRpauldron.addBox(-5.5F, -3.0F, -3.0F, 6, 7, 6, s); + this.setRotateAngle(armRpauldron, 0.0F, 0.0F, 0.0017453292519943296F); + this.armRwing1 = new ModelRenderer(this, 40, 35); + this.armRwing1.mirror = true; + this.armRwing1.setRotationPoint(-6.5F, -1.0F, 0.0F); + this.armRwing1.addBox(0.0F, -4.0F, 0.0F, 0, 4, 5, s); + this.setRotateAngle(armRwing1, 0.2617993877991494F, -0.5235987755982988F, -0.2617993877991494F); + this.armRwing2 = new ModelRenderer(this, 40, 40); + this.armRwing2.mirror = true; + this.armRwing2.setRotationPoint(-6.5F, -1.0F, 0.0F); + this.armRwing2.addBox(0.0F, 0.0F, 0.0F, 0, 3, 4, s); + this.setRotateAngle(armRwing2, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); + + //pants + this.pantsAnchor = new ModelRenderer(this, 0, 0); + this.pantsAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.pantsAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.belt = new ModelRenderer(this, 0, 53); + this.belt.setRotationPoint(0.0F, 0.0F, 0.0F); + this.belt.addBox(-4.5F, 8.0F, -3.0F, 9, 5, 6, s); + this.legL = new ModelRenderer(this, 0, 64); + this.legL.mirror = true; + this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); + this.legL.addBox(-2.39F, 0.0F, -2.49F, 5, 6, 5, s); + this.legR = new ModelRenderer(this, 0, 64); + this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); + this.legR.addBox(-2.61F, 0.0F, -2.51F, 5, 6, 5, s); + + //boots + this.bootL = new ModelRenderer(this, 0, 75); + this.bootL.mirror = true; + this.bootL.setRotationPoint(1.9F, 12.0F, 0.0F); + this.bootL.addBox(-2.39F, 8.5F, -2.49F, 5, 5, 5, s); + this.bootLwing1 = new ModelRenderer(this, 40, 40); + this.bootLwing1.setRotationPoint(2.5F, 8.5F, 0.0F); + this.bootLwing1.addBox(0.0F, -3.0F, 0.0F, 0, 3, 4, s); + this.setRotateAngle(bootLwing1, 0.2617993877991494F, 0.5235987755982988F, 0.2617993877991494F); + this.bootLwing2 = new ModelRenderer(this, 40, 44); + this.bootLwing2.setRotationPoint(2.5F, 8.5F, 0.0F); + this.bootLwing2.addBox(0.0F, 0.0F, 0.0F, 0, 2, 3, s); + this.setRotateAngle(bootLwing2, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); + this.bootR = new ModelRenderer(this, 0, 75); + this.bootR.setRotationPoint(-1.9F, 12.0F, 0.0F); + this.bootR.addBox(-2.61F, 8.5F, -2.51F, 5, 5, 5, s); + this.bootRwing1 = new ModelRenderer(this, 40, 40); + this.bootRwing1.mirror = true; + this.bootRwing1.setRotationPoint(-2.6F, 8.5F, 0.0F); + this.bootRwing1.addBox(0.0F, -3.0F, 0.0F, 0, 3, 4, s); + this.setRotateAngle(bootRwing1, 0.2617993877991494F, -0.5235987755982988F, -0.2617993877991494F); + this.bootRwing2 = new ModelRenderer(this, 40, 44); + this.bootRwing2.mirror = true; + this.bootRwing2.setRotationPoint(-2.5F, 8.5F, 0.0F); + this.bootRwing2.addBox(0.0F, 0.0F, 0.0F, 0, 2, 3, s); + this.setRotateAngle(bootRwing2, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); + + //hierarchy + this.helmAnchor.addChild(this.helm); + this.helm.addChild(this.helmFairy); + this.helm.addChild(this.helmWing1l); + this.helm.addChild(this.helmWing2l); + this.helm.addChild(this.helmWing1r); + this.helm.addChild(this.helmWing2r); + + this.bodyAnchor.addChild(this.bodyTop); + this.bodyTop.addChild(this.bodyBottom); + this.armLAnchor.addChild(this.armL); + this.armL.addChild(this.armLpauldron); + this.armLpauldron.addChild(this.armLwing1); + this.armLpauldron.addChild(this.armLwing2); + this.armRAnchor.addChild(this.armR); + this.armR.addChild(this.armRpauldron); + this.armRpauldron.addChild(this.armRwing1); + this.armRpauldron.addChild(this.armRwing2); + + this.pantsAnchor.addChild(this.belt); + this.belt.addChild(this.legL); + this.belt.addChild(this.legR);; + + this.bootL.addChild(bootLwing1); + this.bootL.addChild(bootLwing2); + this.bootR.addChild(bootRwing1); + this.bootR.addChild(bootRwing2); } @Override public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - helm.showModel = slot == EntityEquipmentSlot.HEAD; - body.showModel = slot == EntityEquipmentSlot.CHEST; - armR.showModel = slot == EntityEquipmentSlot.CHEST; - armL.showModel = slot == EntityEquipmentSlot.CHEST; + + helmAnchor.showModel = slot == EntityEquipmentSlot.HEAD; + bodyAnchor.showModel = slot == EntityEquipmentSlot.CHEST; + armRAnchor.showModel = slot == EntityEquipmentSlot.CHEST; + armLAnchor.showModel = slot == EntityEquipmentSlot.CHEST; legR.showModel = slot == EntityEquipmentSlot.LEGS; legL.showModel = slot == EntityEquipmentSlot.LEGS; bootL.showModel = slot == EntityEquipmentSlot.FEET; bootR.showModel = slot == EntityEquipmentSlot.FEET; bipedHeadwear.showModel = false; - bipedHead = helm; - bipedBody = body; - bipedRightArm = armR; - bipedLeftArm = armL; + bipedHead = helmAnchor; + bipedBody = bodyAnchor; + bipedRightArm = armRAnchor; + bipedLeftArm = armLAnchor; if(slot == EntityEquipmentSlot.LEGS) { + bipedBody = pantsAnchor; bipedRightLeg = legR; bipedLeftLeg = legL; } else { diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index 043d03fa2..567e6d4cd 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -10,146 +10,186 @@ */ package vazkii.botania.client.model.armor; +import javax.annotation.Nonnull; + import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.inventory.EntityEquipmentSlot; -import javax.annotation.Nonnull; - public class ModelArmorManasteel extends ModelArmor { + + private final ModelRenderer helmAnchor; private final ModelRenderer helm; - public final ModelRenderer body; - private final ModelRenderer armR; + private final ModelRenderer helmTop; + private final ModelRenderer helmCrystal; + + private final ModelRenderer bodyAnchor; + private final ModelRenderer bodyTop; + private final ModelRenderer bodyBottom; + + private final ModelRenderer armLAnchor; private final ModelRenderer armL; - public final ModelRenderer belt; - private final ModelRenderer bootR; - private final ModelRenderer bootL; - private final ModelRenderer helm1; - private final ModelRenderer helm2; - private final ModelRenderer helm3; - private final ModelRenderer helm4; - private final ModelRenderer helm5; - private final ModelRenderer helm6; - private final ModelRenderer helm7; - private final ModelRenderer body2; - private final ModelRenderer armRpauldron; private final ModelRenderer armLpauldron; - private final ModelRenderer legR; - private final ModelRenderer legL; - + private final ModelRenderer armLcrystal; + + private final ModelRenderer armRAnchor; + private final ModelRenderer armR; + private final ModelRenderer armRpauldron; + private final ModelRenderer armRcrystal; + private final ModelRenderer pantsAnchor; + private final ModelRenderer belt; + private final ModelRenderer legL; + private final ModelRenderer legR; + + private final ModelRenderer bootL; + private final ModelRenderer bootLcrystal; + private final ModelRenderer bootR; + private final ModelRenderer bootRcrystal; + public ModelArmorManasteel(EntityEquipmentSlot slot) { super(slot); - textureWidth = 64; - textureHeight = 128; - float s = 0.6F; - armRpauldron = new ModelRenderer(this, 30, 47); - armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - armRpauldron.addBox(-4.0F, -2.0F, -2.5F, 4, 4, 5, 0.2F); - armL = new ModelRenderer(this, 0, 68); - armL.mirror = true; - armL.setRotationPoint(5.0F, 2.0F, -0.0F); - armL.addBox(1.0F, 3.0F, -2.0F, 2, 6, 4, s); - setRotateAngle(armL, 0.0F, 0.0F, -0.17453292519943295F); - legR = new ModelRenderer(this, 12, 68); - legR.setRotationPoint(-1.9F, 12.0F, 0.0F); - legR.addBox(-2.0F, 0.0F, -2.0F, 4, 8, 4, s); - setRotateAngle(legR, 0.0F, 0.0F, 0F); - helm3 = new ModelRenderer(this, 24, 32); - helm3.setRotationPoint(0.0F, 0.0F, 0.0F); - helm3.addBox(-1.0F, -8.5F, -6.5F, 2, 5, 1, s); - setRotateAngle(helm3, -0.17453292519943295F, 0.0F, 0.0F); - helm7 = new ModelRenderer(this, 24, 32); - helm7.setRotationPoint(0.0F, 0.0F, 0.0F); - helm7.addBox(-1.0F, -8.5F, -6.0F, 2, 3, 1, s); - setRotateAngle(helm7, -0.3490658503988659F, 0.0F, 0.0F); - bootL = new ModelRenderer(this, 28, 68); - bootL.mirror = true; - bootL.setRotationPoint(2.0F, 12.0F, 0.0F); - bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); - setRotateAngle(bootL, 0.0F, 0.0F, 0F); - helm4 = new ModelRenderer(this, 0, 39); - helm4.setRotationPoint(0.0F, 0.0F, 0.0F); - helm4.addBox(-4.0F, -8.0F, -0.5F, 1, 3, 5, s); - bootR = new ModelRenderer(this, 28, 68); - bootR.setRotationPoint(-2.0F, 12.0F, 0.0F); - bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); - setRotateAngle(bootR, 0.0F, 0.0F, 0F); - legL = new ModelRenderer(this, 12, 68); - legL.mirror = true; - legL.setRotationPoint(1.9F, 12.0F, 0.0F); - legL.addBox(-2.0F, 0.0F, -2.0F, 4, 8, 4, s); - setRotateAngle(legL, 0.0F, 0.0F, 0F); - armR = new ModelRenderer(this, 0, 68); - armR.setRotationPoint(-5.0F, 2.0F, 0.0F); - armR.addBox(-3.0F, 3.0F, -2.0F, 2, 6, 4, s); - setRotateAngle(armR, 0.0F, 0.0F, 0.17453292519943295F); - helm1 = new ModelRenderer(this, 12, 39); - helm1.setRotationPoint(0.0F, 0.0F, 0.0F); - helm1.addBox(-4.0F, -5.0F, -4.5F, 1, 3, 4, s); - helm2 = new ModelRenderer(this, 12, 39); - helm2.mirror = true; - helm2.setRotationPoint(0.0F, 0.0F, 0.0F); - helm2.addBox(3.0F, -5.0F, -4.5F, 1, 3, 4, s); - body2 = new ModelRenderer(this, 0, 59); - body2.setRotationPoint(0.0F, 0.0F, 0.0F); - body2.addBox(-4.0F, 6.0F, -2.5F, 8, 4, 5, s); - setRotateAngle(body2, -0.08726646259971647F, 0.0F, 0.0F); - body = new ModelRenderer(this, 0, 47); - body.setRotationPoint(0.0F, 0.0F, 0.0F); - body.addBox(-4.5F, 0.0F, -3.5F, 9, 6, 6, s); - setRotateAngle(body, 0.08726646259971647F, 0.0F, 0.0F); - helm6 = new ModelRenderer(this, 24, 32); - helm6.setRotationPoint(0.0F, 0.0F, 0.0F); - helm6.addBox(-1.0F, -8.5F, -5.5F, 2, 3, 1, s); - setRotateAngle(helm6, -0.5235987755982988F, 0.0F, 0.0F); - belt = new ModelRenderer(this, 26, 59); - belt.setRotationPoint(0.0F, 0.0F, 0.0F); - belt.addBox(-4.5F, 9.5F, -3.0F, 9, 3, 6, s); - helm = new ModelRenderer(this, 0, 32); - helm.setRotationPoint(0.0F, 0.0F, 0.0F); - helm.addBox(-4.0F, -8.0F, -4.5F, 8, 3, 4, s); - setRotateAngle(helm, 0.08726646259971647F, 0.0F, 0.0F); - armLpauldron = new ModelRenderer(this, 30, 47); - armLpauldron.mirror = true; - armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); - armLpauldron.addBox(0.0F, -2.0F, -2.5F, 4, 4, 5, s); - helm5 = new ModelRenderer(this, 0, 39); - helm5.mirror = true; - helm5.setRotationPoint(0.0F, 0.0F, 0.0F); - helm5.addBox(3.0F, -8.0F, -0.5F, 1, 3, 5, s); - - helm.addChild(helm3); - helm.addChild(helm7); - helm.addChild(helm4); - helm.addChild(helm6); - helm.addChild(helm1); - helm.addChild(helm2); - helm.addChild(helm5); - body.addChild(body2); - armL.addChild(armLpauldron); - armR.addChild(armRpauldron); - belt.addChild(legR); - belt.addChild(legL); + this.textureWidth = 64; + this.textureHeight = 128; + float s = 0.01F; + + //helm + this.helmAnchor = new ModelRenderer(this, 0, 0); + this.helmAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.helmAnchor.addBox(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); + this.helm = new ModelRenderer(this, 0, 0); + this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); + this.helm.addBox(-4.5F, -8.5F, -4.5F, 9, 9, 9, s); + this.helmTop = new ModelRenderer(this, 36, 6); + this.helmTop.setRotationPoint(0.0F, -8.5F, 3.5F); + this.helmTop.addBox(-1.5F, 0.0F, -7.0F, 3, 3, 7, s); + this.setRotateAngle(helmTop, -0.2617993877991494F, 0.0F, 0.0F); + this.helmCrystal = new ModelRenderer(this, 36, 0); + this.helmCrystal.setRotationPoint(0.0F, -7.5F, -4.5F); + this.helmCrystal.addBox(-1.5F, -4.0F, -1.0F, 3, 5, 1, s); + this.setRotateAngle(helmCrystal, 0.08726646259971647F, 0.0F, 0.0F); + + //body + this.bodyAnchor = new ModelRenderer(this, 0, 0); + this.bodyAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.bodyTop = new ModelRenderer(this, 0, 18); + this.bodyTop.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyTop.addBox(-4.5F, -0.5F, -3.0F, 9, 6, 6, s); + this.setRotateAngle(bodyTop, 0.0F, 0.0F, 0.0F); + this.bodyBottom = new ModelRenderer(this, 0, 30); + this.bodyBottom.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyBottom.addBox(-2.5F, 5.5F, -2.5F, 5, 3, 5, 0.0F); + + //armL + this.armLAnchor = new ModelRenderer(this, 0, 0); + this.armLAnchor.mirror = true; + this.armLAnchor.setRotationPoint(4.0F, 2.0F, 0.0F); + this.armLAnchor.addBox(0.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armL = new ModelRenderer(this, 22, 40); + this.armL.mirror = true; + this.armL.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armL.addBox(1.5F, 2.0F, -2.49F, 2, 6, 5, s); + this.armLpauldron = new ModelRenderer(this, 0, 40); + this.armLpauldron.mirror = true; + this.armLpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armLpauldron.addBox(-0.5F, -3.0F, -3.0F, 5, 4, 6, s); + this.armLcrystal = new ModelRenderer(this, 36, 40); + this.armLcrystal.mirror = true; + this.armLcrystal.setRotationPoint(2.0F, -2.5F, 0.0F); + this.armLcrystal.addBox(-0.5F, -2.5F, -1.5F, 2, 3, 3, s); + this.setRotateAngle(armLcrystal, 0.0F, 0.0F, -0.08726646259971647F); + + //armR + this.armRAnchor = new ModelRenderer(this, 0, 0); + this.armRAnchor.mirror = true; + this.armRAnchor.setRotationPoint(-4.0F, 2.0F, 0.0F); + this.armRAnchor.addBox(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armR = new ModelRenderer(this, 22, 40); + this.armR.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armR.addBox(-3.5F, 2.0F, -2.51F, 2, 6, 5, s); + this.armRpauldron = new ModelRenderer(this, 0, 40); + this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armRpauldron.addBox(-4.5F, -3.0F, -3.0F, 5, 4, 6, s); + this.armRcrystal = new ModelRenderer(this, 36, 40); + this.armRcrystal.setRotationPoint(-2.0F, -2.5F, 0.0F); + this.armRcrystal.addBox(-1.5F, -2.5F, -1.5F, 2, 3, 3, s); + this.setRotateAngle(armRcrystal, 0.0F, 0.0F, 0.08726646259971647F); + + //pants + this.pantsAnchor = new ModelRenderer(this, 0, 0); + this.pantsAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.pantsAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.belt = new ModelRenderer(this, 0, 51); + this.belt.setRotationPoint(0.0F, 0.0F, 0.0F); + this.belt.addBox(-4.5F, 9.0F, -3.0F, 9, 3, 6, s); + this.legL = new ModelRenderer(this, 0, 60); + this.legL.mirror = true; + this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); + this.legL.addBox(-0.39F, 0.0F, -2.49F, 3, 6, 5, s); + this.legR = new ModelRenderer(this, 0, 60); + this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); + this.legR.addBox(-2.61F, 0.0F, -2.51F, 3, 6, 5, s); + + //boots + this.bootL = new ModelRenderer(this, 0, 71); + this.bootL.mirror = true; + this.bootL.setRotationPoint(1.9F, 12.0F, 0.0F); + this.bootL.addBox(-2.39F, 8.5F, -2.49F, 5, 4, 5, s); + this.bootLcrystal = new ModelRenderer(this, 36, 46); + this.bootLcrystal.mirror = true; + this.bootLcrystal.setRotationPoint(2.5F, 9.0F, 2.0F); + this.bootLcrystal.addBox(-1.0F, -2.0F, -1.5F, 2, 3, 3, s); + this.setRotateAngle(bootLcrystal, 0.0F, 0.0F, 0.08726646259971647F); + this.bootR = new ModelRenderer(this, 0, 71); + this.bootR.setRotationPoint(-2.0F, 12.0F, 0.0F); + this.bootR.addBox(-2.5F, 8.5F, -2.51F, 5, 4, 5, s); + this.bootRcrystal = new ModelRenderer(this, 36, 46); + this.bootRcrystal.setRotationPoint(-2.5F, 9.0F, 2.0F); + this.bootRcrystal.addBox(-1.0F, -2.0F, -1.5F, 2, 3, 3, s); + this.setRotateAngle(bootRcrystal, 0.0F, 0.0F, -0.08726646259971647F); + + //hierarchy + this.helmAnchor.addChild(this.helm); + this.helm.addChild(this.helmTop); + this.helm.addChild(this.helmCrystal); + + this.bodyAnchor.addChild(this.bodyTop); + this.bodyTop.addChild(this.bodyBottom); + this.armLAnchor.addChild(this.armL); + this.armL.addChild(this.armLpauldron); + this.armLpauldron.addChild(this.armLcrystal); + this.armRAnchor.addChild(this.armR); + this.armR.addChild(this.armRpauldron); + this.armRpauldron.addChild(this.armRcrystal); + + this.pantsAnchor.addChild(this.belt); + this.belt.addChild(this.legL); + this.belt.addChild(this.legR);; + + this.bootL.addChild(bootLcrystal); + this.bootR.addChild(bootRcrystal); } @Override public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - helm.showModel = slot == EntityEquipmentSlot.HEAD; - body.showModel = slot == EntityEquipmentSlot.CHEST; - armR.showModel = slot == EntityEquipmentSlot.CHEST; - armL.showModel = slot == EntityEquipmentSlot.CHEST; + + helmAnchor.showModel = slot == EntityEquipmentSlot.HEAD; + bodyAnchor.showModel = slot == EntityEquipmentSlot.CHEST; + armRAnchor.showModel = slot == EntityEquipmentSlot.CHEST; + armLAnchor.showModel = slot == EntityEquipmentSlot.CHEST; legR.showModel = slot == EntityEquipmentSlot.LEGS; legL.showModel = slot == EntityEquipmentSlot.LEGS; bootL.showModel = slot == EntityEquipmentSlot.FEET; bootR.showModel = slot == EntityEquipmentSlot.FEET; bipedHeadwear.showModel = false; - bipedHead = helm; - bipedBody = body; - bipedRightArm = armR; - bipedLeftArm = armL; + bipedHead = helmAnchor; + bipedBody = bodyAnchor; + bipedRightArm = armRAnchor; + bipedLeftArm = armLAnchor; if(slot == EntityEquipmentSlot.LEGS) { + bipedBody = pantsAnchor; bipedRightLeg = legR; bipedLeftLeg = legL; } else { diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 193193576..b612caa3e 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -10,146 +10,159 @@ */ package vazkii.botania.client.model.armor; +import javax.annotation.Nonnull; + import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.inventory.EntityEquipmentSlot; -import javax.annotation.Nonnull; - public class ModelArmorManaweave extends ModelArmor { + + private final ModelRenderer helmAnchor; private final ModelRenderer helm; - public final ModelRenderer body; - private final ModelRenderer armR; - private final ModelRenderer armL; - private final ModelRenderer legR; - private final ModelRenderer legL; - private final ModelRenderer bootR; - private final ModelRenderer bootL; - private final ModelRenderer helm2; - private final ModelRenderer helm3; - private final ModelRenderer helm4; - private final ModelRenderer helmSeam1; - private final ModelRenderer helmSeam2; - private final ModelRenderer helmSeam3; - private final ModelRenderer helmSeam4; - private final ModelRenderer body2; - private final ModelRenderer armRpauldron; - private final ModelRenderer armLpauldron; - private final ModelRenderer skirtR; - private final ModelRenderer skirtL; + private final ModelRenderer bodyAnchor; + private final ModelRenderer bodyTop; + private final ModelRenderer bodyBottom; + + private final ModelRenderer armLAnchor; + private final ModelRenderer armL; + private final ModelRenderer armLpauldron; + private final ModelRenderer armRAnchor; + private final ModelRenderer armR; + private final ModelRenderer armRpauldron; + + private final ModelRenderer pantsAnchor; + private final ModelRenderer legL; + private final ModelRenderer skirtL; + private final ModelRenderer legR; + private final ModelRenderer skirtR; + + private final ModelRenderer bootL; + private final ModelRenderer bootR; + public ModelArmorManaweave(EntityEquipmentSlot slot) { super(slot); textureWidth = 64; textureHeight = 128; - float s = 0.6F; - helmSeam3 = new ModelRenderer(this, 26, 61); - helmSeam3.setRotationPoint(0.0F, 0.0F, 0.0F); - helmSeam3.addBox(-0.5F, -9.5F, 5.0F, 1, 11, 1, s); - helmSeam4 = new ModelRenderer(this, 39, 64); - helmSeam4.setRotationPoint(0.0F, 0.0F, 0.0F); - helmSeam4.addBox(-0.5F, 0.5F, -1.0F, 1, 1, 6, s); - skirtL = new ModelRenderer(this, 0, 83); - skirtL.mirror = true; - skirtL.setRotationPoint(0.0F, 0.0F, 0.0F); - skirtL.addBox(-2.0F, -2.0F, -3.5F, 5, 13, 7, s); - setRotateAngle(skirtL, 0.0F, -0.17453292519943295F, -0.2617993877991494F); - armR = new ModelRenderer(this, 24, 83); - armR.setRotationPoint(-5.0F, 2.0F, 0.0F); - armR.addBox(-3.0F, -1.5F, -2.5F, 4, 10, 5, s); - setRotateAngle(armR, 0.0F, 0.0F, 0F); - armL = new ModelRenderer(this, 24, 83); - armL.mirror = true; - armL.setRotationPoint(5.0F, 2.0F, -0.0F); - armL.addBox(-1.0F, -1.5F, -2.5F, 4, 10, 5, s); - setRotateAngle(armL, 0.0F, 0.0F, 0F); - bootR = new ModelRenderer(this, 0, 103); - bootR.setRotationPoint(-2.0F, 12.0F, 0.0F); - bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); - setRotateAngle(bootR, 0.0F, 0.0F, 0F); - legR = new ModelRenderer(this, 42, 81); - legR.setRotationPoint(-2.0F, 12.0F, 0.0F); - legR.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); - setRotateAngle(legR, 0.0F, 0.0F, 0F); - helm2 = new ModelRenderer(this, 38, 42); - helm2.setRotationPoint(0.0F, 0.0F, 0.0F); - helm2.addBox(-4.49F, -4.0F, -2.5F, 1, 5, 8, s); - skirtR = new ModelRenderer(this, 0, 83); - skirtR.setRotationPoint(0.0F, 0.0F, 0.0F); - skirtR.addBox(-3.0F, -2.0F, -3.5F, 5, 13, 7, s); - setRotateAngle(skirtR, 0.0F, 0.17453292519943295F, 0.2617993877991494F); - armRpauldron = new ModelRenderer(this, 0, 72); - armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - armRpauldron.addBox(-4.0F, -2.0F, -3.0F, 3, 5, 6, s); - setRotateAngle(armRpauldron, 0.0F, 0.0F, 0F); - bootL = new ModelRenderer(this, 0, 103); - bootL.setRotationPoint(2.0F, 12.0F, 0.0F); - bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); - setRotateAngle(bootL, 0.0F, 0.0F, 0F); - helmSeam1 = new ModelRenderer(this, 30, 61); - helmSeam1.setRotationPoint(0.0F, 0.0F, 0.0F); - helmSeam1.addBox(-0.5F, -10.5F, -5.0F, 1, 7, 2, s); - helm = new ModelRenderer(this, 0, 32); - helm.setRotationPoint(0.0F, 0.0F, 0.0F); - helm.addBox(-4.5F, -10.0F, -4.5F, 9, 6, 10, s); - setRotateAngle(helm, 0F, 0.0F, 0.0F); - armLpauldron = new ModelRenderer(this, 0, 72); - armLpauldron.mirror = true; - armLpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - armLpauldron.addBox(1.0F, -2.0F, -3.0F, 3, 5, 6, s); - setRotateAngle(armLpauldron, 0.0F, 0.0F, 0F); - helm4 = new ModelRenderer(this, 38, 32); - helm4.setRotationPoint(0.0F, 0.0F, 0.0F); - helm4.addBox(-3.5F, -4.0F, 0.49F, 7, 5, 5, s); - helmSeam2 = new ModelRenderer(this, 36, 61); - helmSeam2.setRotationPoint(0.0F, 0.0F, 0.0F); - helmSeam2.addBox(-0.5F, -10.5F, -3.0F, 1, 1, 9, s); - legL = new ModelRenderer(this, 42, 81); - legL.mirror = true; - legL.setRotationPoint(2.0F, 12.0F, 0.0F); - legL.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); - setRotateAngle(legL, 0.0F, 0.0F, 0F); - body2 = new ModelRenderer(this, 0, 61); - body2.setRotationPoint(0.0F, 0.0F, 0.0F); - body2.addBox(-4.0F, 6.0F, -2.5F, 8, 6, 5, s); - body = new ModelRenderer(this, 0, 48); - body.setRotationPoint(0.0F, 0.0F, 0.0F); - body.addBox(-4.5F, 0.0F, -3.0F, 9, 7, 6, s); - helm3 = new ModelRenderer(this, 38, 42); - helm3.mirror = true; - helm3.setRotationPoint(0.0F, 0.0F, 0F); - helm3.addBox(3.49F, -4.0F, -2.5F, 1, 5, 8, s); - helm.addChild(helmSeam3); - helm.addChild(helmSeam4); - legL.addChild(skirtL); - helm.addChild(helm2); - legR.addChild(skirtR); - armR.addChild(armRpauldron); - helm.addChild(helmSeam1); - armL.addChild(armLpauldron); - helm.addChild(helm4); - helm.addChild(helmSeam2); - body.addChild(body2); - helm.addChild(helm3); + float s = 0.01F; + + //helm + this.helmAnchor = new ModelRenderer(this, 0, 0); + this.helmAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.helmAnchor.addBox(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); + this.helm = new ModelRenderer(this, 0, 0); + this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); + this.helm.addBox(-4.5F, -9.5F, -4.0F, 9, 11, 10, s); + this.setRotateAngle(helm, 0.17453292519943295F, 0.0F, 0.0F); + + //body + this.bodyAnchor = new ModelRenderer(this, 0, 0); + this.bodyAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.bodyTop = new ModelRenderer(this, 0, 21); + this.bodyTop.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyTop.addBox(-4.5F, -0.5F, -3.0F, 9, 7, 6, s); + this.setRotateAngle(bodyTop, 0.0F, 0.0F, 0.0F); + this.bodyBottom = new ModelRenderer(this, 0, 34); + this.bodyBottom.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyBottom.addBox(-4.5F, 6.5F, -2.5F, 9, 5, 5, s); + this.setRotateAngle(bodyBottom, -0F, 0.0F, 0.0F); + + //armL + this.armLAnchor = new ModelRenderer(this, 0, 0); + this.armLAnchor.mirror = true; + this.armLAnchor.setRotationPoint(4.0F, 2.0F, 0.0F); + this.armLAnchor.addBox(0.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armL = new ModelRenderer(this, 0, 44); + this.armL.mirror = true; + this.armL.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armL.addBox(-1.5F, -2.5F, -2.49F, 5, 10, 5, s); + this.armLpauldron = new ModelRenderer(this, 20, 44); + this.armLpauldron.mirror = true; + this.armLpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armLpauldron.addBox(-1.0F, -3.0F, -3.0F, 6, 5, 6, s); + this.setRotateAngle(armLpauldron, 0.0F, 0.0F, -0.08726646259971647F); + + //armR + this.armRAnchor = new ModelRenderer(this, 0, 0); + this.armRAnchor.mirror = true; + this.armRAnchor.setRotationPoint(-4.0F, 2.0F, 0.0F); + this.armRAnchor.addBox(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armR = new ModelRenderer(this, 0, 44); + this.armR.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armR.addBox(-3.5F, -2.5F, -2.51F, 5, 10, 5, s); + this.armRpauldron = new ModelRenderer(this, 20, 44); + this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armRpauldron.addBox(-5.0F, -3.0F, -3.0F, 6, 5, 6, s); + this.setRotateAngle(armRpauldron, 0.0F, 0.0F, 0.08726646259971647F); + + //pants + this.pantsAnchor = new ModelRenderer(this, 0, 0); + this.pantsAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.pantsAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.legL = new ModelRenderer(this, 0, 78); + this.legL.mirror = true; + this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); + this.legL.addBox(-2.39F, -0.5F, -2.49F, 5, 6, 5, s); + this.skirtL = new ModelRenderer(this, 0, 59); + this.skirtL.mirror = true; + this.skirtL.setRotationPoint(-0.5F, -2.0F, -2.5F); + this.skirtL.addBox(-1.0F, 0.0F, -0.5F, 5, 13, 6, s); + this.setRotateAngle(skirtL, 0.0F, -0.17453292519943295F, -0.2617993877991494F); + this.legR = new ModelRenderer(this, 0, 78); + this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); + this.legR.addBox(-2.61F, 0.0F, -2.51F, 5, 6, 5, s); + this.skirtR = new ModelRenderer(this, 0, 59); + this.skirtR.setRotationPoint(0.5F, -2.0F, -2.5F); + this.skirtR.addBox(-4.0F, 0.0F, -0.5F, 5, 13, 6, s); + this.setRotateAngle(skirtR, 0.0F, 0.17453292519943295F, 0.2617993877991494F); + + //boot + this.bootL = new ModelRenderer(this, 0, 89); + this.bootL.mirror = true; + this.bootL.setRotationPoint(1.9F, 12.0F, 0.0F); + this.bootL.addBox(-2.39F, 8.5F, -2.49F, 5, 4, 5, s); + this.bootR = new ModelRenderer(this, 0, 89); + this.bootR.setRotationPoint(-1.9F, 12.0F, 0.0F); + this.bootR.addBox(-2.61F, 8.5F, -2.51F, 5, 4, 5, s); + + //hierarchy + this.helmAnchor.addChild(this.helm); + + this.bodyAnchor.addChild(this.bodyTop); + this.bodyTop.addChild(this.bodyBottom); + + this.armLAnchor.addChild(this.armL); + this.armL.addChild(this.armLpauldron); + + this.armRAnchor.addChild(this.armR); + this.armR.addChild(this.armRpauldron); + + this.pantsAnchor.addChild(this.legL); + this.pantsAnchor.addChild(this.legR); + this.legL.addChild(this.skirtL); + this.legR.addChild(this.skirtR); } @Override public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - helm.showModel = slot == EntityEquipmentSlot.HEAD; - body.showModel = slot == EntityEquipmentSlot.CHEST; - armR.showModel = slot == EntityEquipmentSlot.CHEST; - armL.showModel = slot == EntityEquipmentSlot.CHEST; + + helmAnchor.showModel = slot == EntityEquipmentSlot.HEAD; + bodyAnchor.showModel = slot == EntityEquipmentSlot.CHEST; + armRAnchor.showModel = slot == EntityEquipmentSlot.CHEST; + armLAnchor.showModel = slot == EntityEquipmentSlot.CHEST; legR.showModel = slot == EntityEquipmentSlot.LEGS; legL.showModel = slot == EntityEquipmentSlot.LEGS; bootL.showModel = slot == EntityEquipmentSlot.FEET; bootR.showModel = slot == EntityEquipmentSlot.FEET; bipedHeadwear.showModel = false; - bipedHead = helm; - bipedBody = body; - bipedRightArm = armR; - bipedLeftArm = armL; + bipedHead = helmAnchor; + bipedBody = bodyAnchor; + bipedRightArm = armRAnchor; + bipedLeftArm = armLAnchor; if(slot == EntityEquipmentSlot.LEGS) { bipedRightLeg = legR; bipedLeftLeg = legL; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 9287d775c..f8096f544 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -10,238 +10,283 @@ */ package vazkii.botania.client.model.armor; +import javax.annotation.Nonnull; + import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.inventory.EntityEquipmentSlot; -import javax.annotation.Nonnull; - public class ModelArmorTerrasteel extends ModelArmor { + + private final ModelRenderer helmAnchor; private final ModelRenderer helm; - public final ModelRenderer body; - private final ModelRenderer armr; + private final ModelRenderer helmFront; + private final ModelRenderer helmLeaf1l; + private final ModelRenderer helmLeaf2l; + private final ModelRenderer helmLeaf3l; + private final ModelRenderer helmLeaf1r; + private final ModelRenderer helmLeaf2r; + private final ModelRenderer helmLeaf3r; + private final ModelRenderer helmbranch1l; + private final ModelRenderer helmbranch2l; + private final ModelRenderer helmbranch1r; + private final ModelRenderer helmbranch2r; + + private final ModelRenderer bodyAnchor; + private final ModelRenderer bodyTop; + private final ModelRenderer bodyBottom; + + private final ModelRenderer armLAnchor; private final ModelRenderer armL; - public final ModelRenderer belt; - private final ModelRenderer bootR; - private final ModelRenderer bootL; - private final ModelRenderer helm2; - private final ModelRenderer helm3; - private final ModelRenderer helm4; - private final ModelRenderer helmLeaf1; - private final ModelRenderer helmLeaf2; - private final ModelRenderer helmLeaf3; - private final ModelRenderer helmLeaf4; - private final ModelRenderer helmLeaf5; - private final ModelRenderer helmLeaf6; - private final ModelRenderer helmbranch1; - private final ModelRenderer helmbranch2; - private final ModelRenderer helmbranch3; - private final ModelRenderer helmbranch4; - private final ModelRenderer body2; - private final ModelRenderer armRpauldron; - private final ModelRenderer armRbranch1; - private final ModelRenderer armRbranch2; private final ModelRenderer armLpauldron; private final ModelRenderer armLbranch1; private final ModelRenderer armLbranch2; - private final ModelRenderer legR; + + private final ModelRenderer armRAnchor; + private final ModelRenderer armR; + private final ModelRenderer armRpauldron; + private final ModelRenderer armRbranch1; + private final ModelRenderer armRbranch2; + + private final ModelRenderer pantsAnchor; + private final ModelRenderer belt; private final ModelRenderer legL; - private final ModelRenderer bootR1; - private final ModelRenderer bootRbranch; - private final ModelRenderer bootL2; - private final ModelRenderer bootLbranch; - + private final ModelRenderer legR; + + private final ModelRenderer bootL; + private final ModelRenderer bootLtop; + private final ModelRenderer bootLbranch1; + private final ModelRenderer bootLbranch2; + + private final ModelRenderer bootR; + private final ModelRenderer bootRtop; + private final ModelRenderer bootRbranch1; + private final ModelRenderer bootRbranch2; + public ModelArmorTerrasteel(EntityEquipmentSlot slot) { super(slot); - textureWidth = 64; + textureWidth = 128; textureHeight = 128; - float s = 0.6F; - armr = new ModelRenderer(this, 0, 77); - armr.setRotationPoint(-5.0F, 2.0F, -0.0F); - armr.addBox(-3.0F, 3.0F, -2.0F, 4, 7, 4, s); - setRotateAngle(armr, 0.0F, 0.0F, 0F); - body = new ModelRenderer(this, 0, 44); - body.setRotationPoint(0.0F, 0.0F, 0.0F); - body.addBox(-4.5F, 0.0F, -3.5F, 9, 6, 6, s); - setRotateAngle(body, 0F, 0.0F, 0.0F); - helm4 = new ModelRenderer(this, 56, 32); - helm4.setRotationPoint(0.0F, 0.0F, 0.0F); - helm4.addBox(-1.0F, -7.5F, -6.5F, 2, 6, 2, s); - setRotateAngle(helm4, 0F, 0.0F, 0.0F); - bootR1 = new ModelRenderer(this, 32, 77); - bootR1.setRotationPoint(0.0F, 0.0F, 0.0F); - bootR1.addBox(-2.0F, 6.0F, -2.0F, 4, 2, 4, s); - helmbranch4 = new ModelRenderer(this, 34, 43); - helmbranch4.mirror = true; - helmbranch4.setRotationPoint(0.0F, 0.0F, 0.0F); - helmbranch4.addBox(-2.0F, -8.0F, -4.0F, 1, 2, 7, s); - setRotateAngle(helmbranch4, 0.2617993877991494F, 0.0F, 1.0471975511965976F); - bootL = new ModelRenderer(this, 32, 83); - bootL.mirror = true; - bootL.setRotationPoint(1.9F, 12.0F, 0.0F); - bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); - setRotateAngle(bootL, 0.0F, 0.0F, 0F); - bootR = new ModelRenderer(this, 32, 83); - bootR.setRotationPoint(-1.9F, 12.0F, 0.1F); - bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); - setRotateAngle(bootR, 0.0F, 0.0F, 0F); - helmLeaf5 = new ModelRenderer(this, 50, 32); - helmLeaf5.mirror = true; - helmLeaf5.setRotationPoint(0.0F, 0.2F, 0.0F); - helmLeaf5.addBox(-1.0F, -11.0F, -4.5F, 2, 5, 1, s); - setRotateAngle(helmLeaf5, -0.5235987755982988F, -0.5235987755982988F, 0.5235987755982988F); - bootLbranch = new ModelRenderer(this, 48, 77); - bootLbranch.mirror = true; - bootLbranch.setRotationPoint(0.0F, 0.0F, 0.0F); - bootLbranch.addBox(8.0F, 1.0F, -2.0F, 1, 2, 5, s); - setRotateAngle(bootLbranch, 0.2617993877991494F, 0.0F, 1.0471975511965976F); - helmLeaf4 = new ModelRenderer(this, 50, 32); - helmLeaf4.mirror = true; - helmLeaf4.setRotationPoint(0.0F, 0.2F, 0.0F); - helmLeaf4.addBox(-1.5F, -9.0F, -6.0F, 2, 3, 1, s); - setRotateAngle(helmLeaf4, -0.2617993877991494F, -0.2617993877991494F, 0.5235987755982988F); - helmLeaf2 = new ModelRenderer(this, 50, 32); - helmLeaf2.setRotationPoint(0.0F, 0.2F, 0.0F); - helmLeaf2.addBox(-1.0F, -11.0F, -4.5F, 2, 5, 1, s); - setRotateAngle(helmLeaf2, -0.5235987755982988F, 0.5235987755982988F, -0.5235987755982988F); - helm = new ModelRenderer(this, 0, 32); - helm.setRotationPoint(0.0F, 0.0F, 0.0F); - helm.addBox(-4.0F, -8.0F, -4.5F, 8, 3, 9, s); - setRotateAngle(helm, 0.08726646259971647F, 0.0F, 0.0F); - helm2 = new ModelRenderer(this, 34, 32); - helm2.setRotationPoint(0.0F, 0.0F, 0.0F); - helm2.addBox(-4.0F, -5.0F, -4.5F, 2, 5, 6, s); - helm3 = new ModelRenderer(this, 34, 32); - helm3.mirror = true; - helm3.setRotationPoint(0.0F, 0.0F, 0.0F); - helm3.addBox(2.0F, -5.0F, -4.5F, 2, 5, 6, s); - helmbranch1 = new ModelRenderer(this, 34, 43); - helmbranch1.mirror = true; - helmbranch1.setRotationPoint(0.0F, 0.0F, 0F); - helmbranch1.addBox(-2.0F, -10.0F, -1.0F, 1, 2, 7, s); - setRotateAngle(helmbranch1, 0.5235987755982988F, 0.0F, -0.08726646259971647F); - bootL2 = new ModelRenderer(this, 32, 77); - bootL2.mirror = true; - bootL2.setRotationPoint(0.0F, 0.0F, 0.0F); - bootL2.addBox(-2.0F, 6.0F, -2.0F, 4, 2, 4, s); - helmbranch2 = new ModelRenderer(this, 34, 43); - helmbranch2.setRotationPoint(0.0F, 0.0F, 0.0F); - helmbranch2.addBox(1.0F, -10.0F, -1.0F, 1, 2, 7, s); - setRotateAngle(helmbranch2, 0.5235987755982988F, 0.0F, 0.08726646259971647F); - legR = new ModelRenderer(this, 16, 77); - legR.setRotationPoint(-1.9F, 12.0F, 0.0F); - legR.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); - setRotateAngle(legR, 0.0F, 0.0F, 0F); - helmLeaf6 = new ModelRenderer(this, 50, 32); - helmLeaf6.mirror = true; - helmLeaf6.setRotationPoint(0.0F, 0.2F, 0.0F); - helmLeaf6.addBox(-0.5F, -13.0F, -3.0F, 2, 7, 1, s); - setRotateAngle(helmLeaf6, -0.7853981633974483F, -0.7853981633974483F, 0.7853981633974483F); - armLbranch1 = new ModelRenderer(this, 51, 44); - armLbranch1.mirror = true; - armLbranch1.setRotationPoint(0.0F, 0.0F, -0.0F); - armLbranch1.addBox(2.5F, -5.0F, -1.0F, 1, 5, 2, s); - setRotateAngle(armLbranch1, 0.0F, 0.0F, 0.7853981633974483F); - bootRbranch = new ModelRenderer(this, 48, 77); - bootRbranch.setRotationPoint(0.0F, 0.0F, 0.0F); - bootRbranch.addBox(-9.0F, 1.0F, -2.0F, 1, 2, 5, s); - setRotateAngle(bootRbranch, 0.2617993877991494F, 0.0F, -1.0471975511965976F); - armRbranch2 = new ModelRenderer(this, 50, 43); - armRbranch2.setRotationPoint(0.0F, 0.0F, 0.0F); - armRbranch2.addBox(-1.5F, -5.0F, -1.5F, 1, 5, 3, s); - setRotateAngle(armRbranch2, 0.0F, 0.0F, -0.5235987755982988F); - helmLeaf3 = new ModelRenderer(this, 50, 32); - helmLeaf3.setRotationPoint(0.0F, 0.2F, 0.0F); - helmLeaf3.addBox(-1.5F, -13.0F, -3.0F, 2, 7, 1, s); - setRotateAngle(helmLeaf3, -0.7853981633974483F, 0.7853981633974483F, -0.7853981633974483F); - armRpauldron = new ModelRenderer(this, 0, 66); - armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - armRpauldron.addBox(-4.0F, -2.0F, -3.0F, 5, 5, 6, s); - armLbranch2 = new ModelRenderer(this, 50, 43); - armLbranch2.mirror = true; - armLbranch2.setRotationPoint(0.0F, 0.0F, -0.0F); - armLbranch2.addBox(0.5F, -5.0F, -1.5F, 1, 5, 3, s); - setRotateAngle(armLbranch2, 0.0F, 0.0F, 0.5235987755982988F); - armL = new ModelRenderer(this, 0, 77); - armL.mirror = true; - armL.setRotationPoint(5.0F, 2.0F, -0.0F); - armL.addBox(-1.0F, 3.0F, -2.0F, 4, 7, 4, s); - setRotateAngle(armL, 0.0F, 0.0F, 0F); - body2 = new ModelRenderer(this, 0, 57); - body2.setRotationPoint(0.0F, 0.0F, 0.0F); - body2.addBox(-4.0F, 6.0F, -2.5F, 8, 4, 5, s); - setRotateAngle(body2, -0.08726646259971647F, 0.0F, 0.0F); - helmbranch3 = new ModelRenderer(this, 34, 43); - helmbranch3.setRotationPoint(0.0F, 0.0F, 0.0F); - helmbranch3.addBox(1.0F, -8.0F, -4.0F, 1, 2, 7, s); - setRotateAngle(helmbranch3, 0.2617993877991494F, 0.0F, -1.0471975511965976F); - armRbranch1 = new ModelRenderer(this, 51, 44); - armRbranch1.setRotationPoint(0.0F, 0.0F, 0.0F); - armRbranch1.addBox(-3.5F, -5.0F, -1.0F, 1, 5, 2, s); - setRotateAngle(armRbranch1, 0.0F, 0.0F, -0.7853981633974483F); - belt = new ModelRenderer(this, 22, 66); - belt.setRotationPoint(0.0F, 0.0F, 0.0F); - belt.addBox(-4.5F, 9.5F, -3.0F, 9, 3, 6, s); - helmLeaf1 = new ModelRenderer(this, 50, 32); - helmLeaf1.setRotationPoint(0.0F, 0.2F, 0.0F); - helmLeaf1.addBox(-0.5F, -9.0F, -6.0F, 2, 3, 1, s); - setRotateAngle(helmLeaf1, -0.2617993877991494F, 0.2617993877991494F, -0.5235987755982988F); - armLpauldron = new ModelRenderer(this, 0, 66); - armLpauldron.mirror = true; - armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); - armLpauldron.addBox(-1.0F, -2.0F, -3.0F, 5, 5, 6, s); - legL = new ModelRenderer(this, 16, 77); - legL.mirror = true; - legL.setRotationPoint(1.9F, 12.0F, 0.0F); - legL.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); - setRotateAngle(legL, 0.0F, 0.0F, 0F); - - helm.addChild(helm4); - bootR.addChild(bootR1); - helm.addChild(helmbranch4); - helm.addChild(helmLeaf5); - bootL.addChild(bootLbranch); - helm.addChild(helmLeaf4); - helm.addChild(helmLeaf2); - helm.addChild(helm2); - helm.addChild(helm3); - helm.addChild(helmbranch1); - bootL.addChild(bootL2); - helm.addChild(helmbranch2); - belt.addChild(legR); - helm.addChild(helmLeaf6); - armLpauldron.addChild(armLbranch1); - bootR.addChild(bootRbranch); - armRpauldron.addChild(armRbranch2); - helm.addChild(helmLeaf3); - armr.addChild(armRpauldron); - armLpauldron.addChild(armLbranch2); - body.addChild(body2); - helm.addChild(helmbranch3); - armRpauldron.addChild(armRbranch1); - helm.addChild(helmLeaf1); - armL.addChild(armLpauldron); - belt.addChild(legL); + float s = 0.01F; + + //helm + this.helmAnchor = new ModelRenderer(this, 0, 0); + this.helmAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.helmAnchor.addBox(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); + this.helm = new ModelRenderer(this, 0, 0); + this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); + this.helm.addBox(-4.5F, -9.0F, -4.5F, 9, 11, 9, s); + this.helmFront = new ModelRenderer(this, 36, 0); + this.helmFront.setRotationPoint(0.0F, 0.0F, 0.0F); + this.helmFront.addBox(-1.5F, -10.0F, -5.5F, 3, 8, 7, s); + this.helmLeaf1l = new ModelRenderer(this, 56, 14); + this.helmLeaf1l.mirror = true; + this.helmLeaf1l.setRotationPoint(4.5F, -6.0F, -2.5F); + this.helmLeaf1l.addBox(0.0F, -3.0F, -1.0F, 2, 3, 1, s); + this.setRotateAngle(helmLeaf1l, -0.2617993877991494F, -0.2617993877991494F, 0.5235987755982988F); + this.helmLeaf2l = new ModelRenderer(this, 56, 8); + this.helmLeaf2l.mirror = true; + this.helmLeaf2l.setRotationPoint(4.5F, -6.0F, -0.5F); + this.helmLeaf2l.addBox(0.0F, -5.0F, -1.0F, 2, 5, 1, s); + this.setRotateAngle(helmLeaf2l, -0.5235987755982988F, -0.5235987755982988F, 0.7853981633974483F); + this.helmLeaf3l = new ModelRenderer(this, 56, 0); + this.helmLeaf3l.mirror = true; + this.helmLeaf3l.setRotationPoint(4.5F, -6.0F, 2.5F); + this.helmLeaf3l.addBox(0.0F, -7.0F, -1.0F, 2, 7, 1, s); + this.setRotateAngle(helmLeaf3l, -0.7853981633974483F, -0.7853981633974483F, 0.7853981633974483F); + this.helmLeaf1r = new ModelRenderer(this, 56, 14); + this.helmLeaf1r.setRotationPoint(-4.5F, -6.0F, -2.5F); + this.helmLeaf1r.addBox(-2.0F, -3.0F, -1.0F, 2, 3, 1, s); + this.setRotateAngle(helmLeaf1r, -0.2617993877991494F, 0.2617993877991494F, -0.5235987755982988F); + this.helmLeaf2r = new ModelRenderer(this, 56, 8); + this.helmLeaf2r.setRotationPoint(-4.5F, -6.0F, -0.5F); + this.helmLeaf2r.addBox(-2.0F, -5.0F, -1.0F, 2, 5, 1, s); + this.setRotateAngle(helmLeaf2r, -0.5235987755982988F, 0.5235987755982988F, -0.7853981633974483F); + this.helmLeaf3r = new ModelRenderer(this, 56, 0); + this.helmLeaf3r.setRotationPoint(-4.5F, -6.0F, 2.5F); + this.helmLeaf3r.addBox(-2.0F, -7.0F, -1.0F, 2, 7, 1, s); + this.setRotateAngle(helmLeaf3r, -0.7853981633974483F, 0.7853981633974483F, -0.7853981633974483F); + this.helmbranch1l = new ModelRenderer(this, 36, 15); + this.helmbranch1l.mirror = true; + this.helmbranch1l.setRotationPoint(2.5F, -9.0F, -3.5F); + this.helmbranch1l.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.setRotateAngle(helmbranch1l, 0.5235987755982988F, 0.2617993877991494F, 0.0F); + this.helmbranch2l = new ModelRenderer(this, 36, 15); + this.helmbranch2l.mirror = true; + this.helmbranch2l.setRotationPoint(4.5F, -3.0F, -2.5F); + this.helmbranch2l.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.setRotateAngle(helmbranch2l, 0.08726646259971647F, 0.2617993877991494F, 0.0F); + this.helmbranch1r = new ModelRenderer(this, 36, 15); + this.helmbranch1r.setRotationPoint(-2.5F, -9.0F, -3.5F); + this.helmbranch1r.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.setRotateAngle(helmbranch1r, 0.5235987755982988F, -0.2617993877991494F, 0.0F); + this.helmbranch2r = new ModelRenderer(this, 36, 15); + this.helmbranch2r.setRotationPoint(-4.5F, -3.0F, -2.5F); + this.helmbranch2r.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.setRotateAngle(helmbranch2r, 0.08726646259971647F, -0.2617993877991494F, 0.0F); + + //body + this.bodyAnchor = new ModelRenderer(this, 0, 0); + this.bodyAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.bodyTop = new ModelRenderer(this, 0, 20); + this.bodyTop.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyTop.addBox(-5.5F, 0.0F, -3.0F, 11, 6, 6, s); + this.bodyBottom = new ModelRenderer(this, 0, 32); + this.bodyBottom.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bodyBottom.addBox(-4.5F, 5.0F, -2.5F, 9, 3, 5, s); + + //armL + this.armLAnchor = new ModelRenderer(this, 0, 0); + this.armLAnchor.mirror = true; + this.armLAnchor.setRotationPoint(4.0F, 2.0F, 0.0F); + this.armLAnchor.addBox(0.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armL = new ModelRenderer(this, 0, 52); + this.armL.mirror = true; + this.armL.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armL.addBox(-1.5F, 3.0F, -2.49F, 5, 8, 5, s); + this.armLpauldron = new ModelRenderer(this, 0, 40); + this.armLpauldron.mirror = true; + this.armLpauldron.setRotationPoint(1.5F, 0.0F, 0.0F); + this.armLpauldron.addBox(-1.0F, -3.0F, -3.0F, 6, 6, 6, s); + this.armLbranch1 = new ModelRenderer(this, 36, 15); + this.armLbranch1.mirror = true; + this.armLbranch1.setRotationPoint(4.0F, -3.0F, -1.0F); + this.armLbranch1.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.setRotateAngle(armLbranch1, 0.5235987755982988F, 0.5235987755982988F, 0.0F); + this.armLbranch2 = new ModelRenderer(this, 36, 24); + this.armLbranch2.mirror = true; + this.armLbranch2.setRotationPoint(5.0F, -2.0F, 0.0F); + this.armLbranch2.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 5, s); + this.setRotateAngle(armLbranch2, 0.08726646259971647F, 0.7853981633974483F, 0.0F); + + //armR + this.armRAnchor = new ModelRenderer(this, 0, 0); + this.armRAnchor.mirror = true; + this.armRAnchor.setRotationPoint(-4.0F, 2.0F, 0.0F); + this.armRAnchor.addBox(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armR = new ModelRenderer(this, 0, 52); + this.armR.setRotationPoint(0.0F, 0.0F, 0.0F); + this.armR.addBox(-3.5F, 3.0F, -2.51F, 5, 8, 5, s); + this.armRpauldron = new ModelRenderer(this, 0, 40); + this.armRpauldron.setRotationPoint(-1.5F, 0.0F, 0.0F); + this.armRpauldron.addBox(-5.0F, -3.0F, -3.0F, 6, 6, 6, s); + this.armRbranch1 = new ModelRenderer(this, 36, 15); + this.armRbranch1.setRotationPoint(-4.0F, -3.0F, -1.0F); + this.armRbranch1.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.setRotateAngle(armRbranch1, 0.5235987755982988F, -0.5235987755982988F, 0.0F); + this.armRbranch2 = new ModelRenderer(this, 36, 24); + this.armRbranch2.setRotationPoint(-5.0F, -2.0F, 0.0F); + this.armRbranch2.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 5, s); + this.setRotateAngle(armRbranch2, 0.08726646259971647F, -0.7853981633974483F, 0.0F); + + //pants + this.pantsAnchor = new ModelRenderer(this, 0, 0); + this.pantsAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); + this.pantsAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.belt = new ModelRenderer(this, 0, 65); + this.belt.setRotationPoint(0.0F, 0.0F, 0.0F); + this.belt.addBox(-4.5F, 8.0F, -3.0F, 9, 5, 6, s); + this.legL = new ModelRenderer(this, 0, 76); + this.legL.mirror = true; + this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); + this.legL.addBox(-2.39F, -0.01F, -2.49F, 5, 6, 5, s); + this.legR = new ModelRenderer(this, 0, 76); + this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); + this.legR.addBox(-2.61F, -0.01F, -2.51F, 5, 6, 5, s); + + //boots + this.bootL = new ModelRenderer(this, 0, 94); + this.bootL.mirror = true; + this.bootL.setRotationPoint(1.9F, 12.0F, 0.0F); + this.bootL.addBox(-2.39F, 8.5F, -2.49F, 5, 4, 5, s); + this.bootLtop = new ModelRenderer(this, 0, 87); + this.bootLtop.mirror = true; + this.bootLtop.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bootLtop.addBox(-2.39F, 6.0F, -2.49F, 6, 2, 5, s); + this.bootLbranch1 = new ModelRenderer(this, 36, 15); + this.bootLbranch1.mirror = true; + this.bootLbranch1.setRotationPoint(3.5F, 6.0F, 0.0F); + this.bootLbranch1.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7,s); + this.setRotateAngle(bootLbranch1, 0.2617993877991494F, 0.2617993877991494F, -0.08726646259971647F); + this.bootLbranch2 = new ModelRenderer(this, 36, 24); + this.bootLbranch2.mirror = true; + this.bootLbranch2.setRotationPoint(2.5F, 9.0F, 0.0F); + this.bootLbranch2.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 5, s); + this.setRotateAngle(bootLbranch2, 0.08726646259971647F, 0.7853981633974483F, 0.0F); + this.bootR = new ModelRenderer(this, 0, 94); + this.bootR.setRotationPoint(-1.9F, 12.0F, 0.0F); + this.bootR.addBox(-2.61F, 8.5F, -2.51F, 5, 4, 5, s); + this.bootRtop = new ModelRenderer(this, 0, 87); + this.bootRtop.setRotationPoint(0.0F, 0.0F, 0.0F); + this.bootRtop.addBox(-3.61F, 6.0F, -2.51F, 6, 2, 5, s); + this.bootRbranch1 = new ModelRenderer(this, 36, 15); + this.bootRbranch1.setRotationPoint(-3.5F, 6.0F, 0.0F); + this.bootRbranch1.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.setRotateAngle(bootRbranch1, 0.2617993877991494F, -0.2617993877991494F, 0.08726646259971647F); + this.bootRbranch2 = new ModelRenderer(this, 36, 24); + this.bootRbranch2.setRotationPoint(-2.5F, 9.0F, 0.5F); + this.bootRbranch2.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 5, s); + this.setRotateAngle(bootRbranch2, 0.08726646259971647F, -0.7853981633974483F, 0.0F); + + //hierarchy + this.helmAnchor.addChild(this.helm); + this.helm.addChild(this.helmFront); + this.helm.addChild(this.helmLeaf1l); + this.helm.addChild(this.helmLeaf2l); + this.helm.addChild(this.helmLeaf3l); + this.helm.addChild(this.helmLeaf1r); + this.helm.addChild(this.helmLeaf2r); + this.helm.addChild(this.helmLeaf3r); + this.helm.addChild(this.helmbranch1l); + this.helm.addChild(this.helmbranch2l); + this.helm.addChild(this.helmbranch1r); + this.helm.addChild(this.helmbranch2r); + + this.bodyAnchor.addChild(this.bodyTop); + this.bodyTop.addChild(this.bodyBottom); + this.armLAnchor.addChild(this.armL); + this.armL.addChild(this.armLpauldron); + this.armLpauldron.addChild(this.armLbranch1); + this.armLpauldron.addChild(this.armLbranch2); + this.armRAnchor.addChild(this.armR); + this.armR.addChild(this.armRpauldron); + this.armRpauldron.addChild(this.armRbranch1); + this.armRpauldron.addChild(this.armRbranch2); + + this.pantsAnchor.addChild(this.belt); + this.belt.addChild(this.legL); + this.belt.addChild(this.legR); + + this.bootL.addChild(bootLtop); + this.bootLtop.addChild(bootLbranch1); + this.bootLtop.addChild(bootLbranch2); + this.bootR.addChild(bootRtop); + this.bootRtop.addChild(bootRbranch1); + this.bootRtop.addChild(bootRbranch2); } @Override public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - helm.showModel = slot == EntityEquipmentSlot.HEAD; - body.showModel = slot == EntityEquipmentSlot.CHEST; - armr.showModel = slot == EntityEquipmentSlot.CHEST; - armL.showModel = slot == EntityEquipmentSlot.CHEST; + + helmAnchor.showModel = slot == EntityEquipmentSlot.HEAD; + bodyAnchor.showModel = slot == EntityEquipmentSlot.CHEST; + armLAnchor.showModel = slot == EntityEquipmentSlot.CHEST; + armRAnchor.showModel = slot == EntityEquipmentSlot.CHEST; legR.showModel = slot == EntityEquipmentSlot.LEGS; legL.showModel = slot == EntityEquipmentSlot.LEGS; bootL.showModel = slot == EntityEquipmentSlot.FEET; bootR.showModel = slot == EntityEquipmentSlot.FEET; + bipedHeadwear.showModel = false; - bipedHead = helm; - bipedBody = body; - bipedRightArm = armr; - bipedLeftArm = armL; + bipedHead = helmAnchor; + bipedBody = bodyAnchor; + bipedRightArm = armRAnchor; + bipedLeftArm = armLAnchor; if(slot == EntityEquipmentSlot.LEGS) { + bipedBody = pantsAnchor; bipedRightLeg = legR; bipedLeftLeg = legL; } else { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index 8d38ba7ff..6107bdc88 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -56,17 +56,17 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { default: case MANA: { modelPath = MANA_MODEL_PATH; - textures = ImmutableMap.of("#pylon", "botania:model/pylon"); + textures = ImmutableMap.of("#pylon", "botania:model/pylon_0"); break; } case NATURA: { modelPath = NATURA_MODEL_PATH; - textures = ImmutableMap.of("#pylon", "botania:model/pylon1"); + textures = ImmutableMap.of("#pylon", "botania:model/pylon_1"); break; } case GAIA: { modelPath = GAIA_MODEL_PATH; - textures = ImmutableMap.of("#pylon", "botania:model/pylon2"); + textures = ImmutableMap.of("#pylon", "botania:model/pylon_2"); break; } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index a63112e45..5a5c2556c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -27,13 +27,13 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SPREADER); private static final ResourceLocation textureRs = new ResourceLocation(LibResources.MODEL_SPREADER_REDSTONE); private static final ResourceLocation textureDw = new ResourceLocation(LibResources.MODEL_SPREADER_DREAMWOOD); - + private static final ResourceLocation textureG = new ResourceLocation(LibResources.MODEL_SPREADER_GAIA); + private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_SPREADER_HALLOWEEN); private static final ResourceLocation textureRsHalloween = new ResourceLocation(LibResources.MODEL_SPREADER_REDSTONE_HALLOWEEN); private static final ResourceLocation textureDwHalloween = new ResourceLocation(LibResources.MODEL_SPREADER_DREAMWOOD_HALLOWEEN); + private static final ResourceLocation textureGHalloween = new ResourceLocation(LibResources.MODEL_SPREADER_GAIA_HALLOWEEN); private static final ModelSpreader model = new ModelSpreader(); @@ -49,7 +52,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer if(!spreader.getWorld().isBlockLoaded(spreader.getPos(), false) || spreader.getWorld().getBlockState(spreader.getPos()).getBlock() != ModBlocks.spreader) return; - + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); @@ -61,9 +64,9 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer GlStateManager.rotate(spreader.rotationY, 1F, 0F, 0F); GlStateManager.translate(0F, 1F, 0F); - ResourceLocation r = spreader.isRedstone() ? textureRs : spreader.isDreamwood() ? textureDw : texture; + ResourceLocation r = spreader.isRedstone() ? textureRs : spreader.isDreamwood() ? textureDw : spreader.isULTRA_SPREADER() ? textureG : texture; if(ClientProxy.dootDoot) - r = spreader.isRedstone() ? textureRsHalloween : spreader.isDreamwood() ? textureDwHalloween : textureHalloween; + r = spreader.isRedstone() ? textureRsHalloween : spreader.isDreamwood() ? textureDwHalloween : spreader.isULTRA_SPREADER() ? textureGHalloween : textureHalloween; Minecraft.getMinecraft().renderEngine.bindTexture(r); GlStateManager.scale(1F, -1F, -1F); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 6d83a0cb6..073f50ded 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -16,7 +16,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -29,12 +31,30 @@ import javax.annotation.Nonnull; public class BlockDistributor extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.0, 0.25, 0.75, 1.0, 0.75); + public BlockDistributor() { super(Material.ROCK, LibBlockNames.DISTRIBUTOR); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); } + + @Nonnull + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } @Override public boolean hasTileEntity(IBlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 2d3766901..4092ec68f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -51,7 +51,7 @@ import java.util.List; public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexiconable { - private static final AxisAlignedBB AABB = new AxisAlignedBB(3/16.0, 0, 3/16.0, 13/16.0, 14/16.0, 13/16.0); + private static final AxisAlignedBB AABB = new AxisAlignedBB(3/16.0, 1/16.0, 3/16.0, 13/16.0, 15/16.0, 13/16.0); public BlockForestDrum() { super(Material.WOOD, LibBlockNames.FOREST_DRUM); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 24fcc364e..c8acf88cf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -458,7 +458,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, public boolean isDreamwood() { updateContainingBlockInfo(); int variant = getBlockMetadata(); - return world == null ? staticDreamwood : variant == SpreaderVariant.ELVEN.ordinal() || variant == SpreaderVariant.GAIA.ordinal(); + return world == null ? staticDreamwood : variant == SpreaderVariant.ELVEN.ordinal(); } public boolean isULTRA_SPREADER() { diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json index 64dbd0d17..80d2e5aa2 100644 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -1,14 +1,14 @@ { "variants": { - "variant=default": { "model": "botania:apothecaries/default_apothecary" }, - "variant=forest": { "model": "botania:apothecaries/forest_apothecary" }, - "variant=plains": { "model": "botania:apothecaries/plains_apothecary" }, - "variant=mountain": { "model": "botania:apothecaries/mountain_apothecary" }, - "variant=fungal": { "model": "botania:apothecaries/fungal_apothecary" }, - "variant=swamp": { "model": "botania:apothecaries/swamp_apothecary" }, - "variant=desert": { "model": "botania:apothecaries/desert_apothecary" }, - "variant=taiga": { "model": "botania:apothecaries/taiga_apothecary" }, - "variant=mesa": { "model": "botania:apothecaries/mesa_apothecary" }, - "variant=mossy": { "model": "botania:apothecaries/mossy_apothecary" } + "variant=default": { "model": "botania:apothecary_default" }, + "variant=forest": { "model": "botania:apothecary_forest" }, + "variant=plains": { "model": "botania:apothecary_plains" }, + "variant=mountain": { "model": "botania:apothecary_mountain" }, + "variant=fungal": { "model": "botania:apothecary_fungal" }, + "variant=swamp": { "model": "botania:apothecary_swamp" }, + "variant=desert": { "model": "botania:apothecary_desert" }, + "variant=taiga": { "model": "botania:apothecary_taiga" }, + "variant=mesa": { "model": "botania:apothecary_mesa" }, + "variant=mossy": { "model": "botania:apothecary_mossy" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json b/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json index e338cdf21..16f37dc90 100644 --- a/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json +++ b/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json @@ -1,35 +1,33 @@ { - "forge_marker": 1, - "defaults": { - "textures": { - "stand": "botania:model/crystalcube_stand", - "base_sides": "botania:model/crystalcube_base_sides", - "base_top": "botania:model/crystalcube_base_top", - "base_bottom": "botania:model/crystalcube_base_bottom", - "cube": "botania:model/crystalcube_cube", - "particle": "botania:blocks/storage2" - } - }, - "variants": { - "static": { - "true": { - "model": "botania:crystalcube_base" - }, - "false": { - "model": "botania:crystalcube_cube" - } - }, - "inventory": [{ - "model": "botania:crystalcube_base", - "transform": "forge:default-block", - "submodel": { - "cube": { - "model": "botania:crystalcube_cube", - "transform": { - "translation": [ 0, 0.5, 0 ] - } - } - } - }] - } + "forge_marker": 1, + "defaults": { + "textures": { + "cloth": "botania:blocks/crystalcube_cloth", + "base": "botania:blocks/crystalcube_base", + "cube": "botania:blocks/crystalcube_cube", + "particle": "botania:blocks/storage2" + } + }, + "variants": { + "static": { + "true": { + "model": "botania:crystalcube_base" + }, + "false": { + "model": "botania:crystalcube_cube" + } + }, + "inventory": [{ + "model": "botania:crystalcube_base", + "transform": "forge:default-block", + "submodel": { + "cube": { + "model": "botania:crystalcube_cube", + "transform": { + "translation": [ 0, 0.5, 0 ] + } + } + } + }] + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lightrelay.json b/src/main/resources/assets/botania/blockstates/lightrelay.json index beada7b95..02eb57415 100644 --- a/src/main/resources/assets/botania/blockstates/lightrelay.json +++ b/src/main/resources/assets/botania/blockstates/lightrelay.json @@ -12,26 +12,26 @@ "variant": { "default": { "textures": { - "layer0": "botania:blocks/lightrelay0", - "particle": "botania:blocks/lightrelay1" + "layer0": "botania:blocks/luminizer", + "particle": "botania:blocks/luminizer" } }, "detector": { "textures": { - "layer0": "botania:blocks/lightrelay2", - "particle": "botania:blocks/lightrelay3" + "layer0": "botania:blocks/luminizer_detector", + "particle": "botania:blocks/luminizer_detector" } }, "fork": { "textures": { - "layer0": "botania:blocks/lightrelay4", - "particle": "botania:blocks/lightrelay5" + "layer0": "botania:blocks/luminizer_fork", + "particle": "botania:blocks/luminizer_fork" } }, "toggle": { "textures": { - "layer0": "botania:blocks/lightrelay6", - "particle": "botania:blocks/lightrelay7" + "layer0": "botania:blocks/luminizer_toggle", + "particle": "botania:blocks/luminizer_toggle" } } } diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index b4108d997..90b2e26d9 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -1,8 +1,8 @@ { "variants": { - "variant=default": { "model": "botania:default_pool" }, - "variant=diluted": { "model": "botania:diluted_pool" }, - "variant=creative": { "model": "botania:creative_pool" }, - "variant=fabulous": { "model": "botania:fabulous_pool" } + "variant=default": { "model": "botania:pool_default" }, + "variant=diluted": { "model": "botania:pool_diluted" }, + "variant=creative": { "model": "botania:pool_creative" }, + "variant=fabulous": { "model": "botania:pool_fabulous" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pump.json b/src/main/resources/assets/botania/blockstates/pump.json index 7379c75d5..77f937c9e 100644 --- a/src/main/resources/assets/botania/blockstates/pump.json +++ b/src/main/resources/assets/botania/blockstates/pump.json @@ -15,17 +15,17 @@ }, "static": { "true": { - "model": "botania:pump" + "model": "botania:mana_pump" }, "false": { - "model": "botania:pump_head" + "model": "botania:mana_pump_head" } }, "inventory": [{ - "model": "botania:pump", + "model": "botania:mana_pump", "submodel": { "head": { - "model": "botania:pump_head" + "model": "botania:mana_pump_head" } } }] diff --git a/src/main/resources/assets/botania/blockstates/pylon.json b/src/main/resources/assets/botania/blockstates/pylon.json index 8f430f3bf..ea3c280a8 100644 --- a/src/main/resources/assets/botania/blockstates/pylon.json +++ b/src/main/resources/assets/botania/blockstates/pylon.json @@ -52,9 +52,9 @@ }, "variants": { "variant": { - "mana": { "textures": { "#pylon": "botania:model/pylon" } }, - "natura": { "textures": { "#pylon": "botania:model/pylon1" } }, - "gaia": { "textures": { "#pylon": "botania:model/pylon2" } } + "mana": { "textures": { "#pylon": "botania:model/pylon_0" } }, + "natura": { "textures": { "#pylon": "botania:model/pylon_1" } }, + "gaia": { "textures": { "#pylon": "botania:model/pylon_2" } } } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spreader.json b/src/main/resources/assets/botania/blockstates/spreader.json index 2f9baaed6..0187bedbb 100644 --- a/src/main/resources/assets/botania/blockstates/spreader.json +++ b/src/main/resources/assets/botania/blockstates/spreader.json @@ -1,8 +1,8 @@ { "variants": { - "variant=mana": { "model": "botania:mana_spreader" }, - "variant=redstone": { "model": "botania:redstone_spreader" }, - "variant=elven": { "model": "botania:elven_spreader" }, - "variant=gaia": { "model": "botania:gaia_spreader" } + "variant=mana": { "model": "botania:spreader_mana" }, + "variant=redstone": { "model": "botania:spreader_redstone" }, + "variant=elven": { "model": "botania:spreader_elven" }, + "variant=gaia": { "model": "botania:spreader_gaia" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_default.json b/src/main/resources/assets/botania/models/block/apothecary_default.json new file mode 100644 index 000000000..57e9474cd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/apothecary_default.json @@ -0,0 +1,10 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:model/apothecary/stone_side", + "goblet": "botania:model/apothecary/stone_goblet", + "top_bottom": "botania:model/apothecary/stone_top_bottom", + "particle": "botania:model/apothecary/stone_top_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_desert.json b/src/main/resources/assets/botania/models/block/apothecary_desert.json new file mode 100644 index 000000000..1739be30e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/apothecary_desert.json @@ -0,0 +1,10 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:model/apothecary/desert_side", + "goblet": "botania:model/apothecary/desert_goblet", + "top_bottom": "botania:model/apothecary/desert_top_bottom", + "particle": "botania:model/apothecary/desert_top_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_forest.json b/src/main/resources/assets/botania/models/block/apothecary_forest.json new file mode 100644 index 000000000..82cf2612b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/apothecary_forest.json @@ -0,0 +1,10 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:model/apothecary/forest_side", + "goblet": "botania:model/apothecary/forest_goblet", + "top_bottom": "botania:model/apothecary/forest_top_bottom", + "particle": "botania:model/apothecary/forest_top_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_fungal.json b/src/main/resources/assets/botania/models/block/apothecary_fungal.json new file mode 100644 index 000000000..1d20c7e12 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/apothecary_fungal.json @@ -0,0 +1,10 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:model/apothecary/fungal_side", + "goblet": "botania:model/apothecary/fungal_goblet", + "top_bottom": "botania:model/apothecary/fungal_top_bottom", + "particle": "botania:model/apothecary/fungal_top_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_mesa.json b/src/main/resources/assets/botania/models/block/apothecary_mesa.json new file mode 100644 index 000000000..f0453ec81 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/apothecary_mesa.json @@ -0,0 +1,10 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:model/apothecary/mesa_side", + "goblet": "botania:model/apothecary/mesa_goblet", + "top_bottom": "botania:model/apothecary/mesa_top_bottom", + "particle": "botania:model/apothecary/mesa_top_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_mossy.json b/src/main/resources/assets/botania/models/block/apothecary_mossy.json new file mode 100644 index 000000000..a15a963a7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/apothecary_mossy.json @@ -0,0 +1,10 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:model/apothecary/mossy_side", + "goblet": "botania:model/apothecary/mossy_goblet", + "top_bottom": "botania:model/apothecary/mossy_top_bottom", + "particle": "botania:model/apothecary/mossy_top_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_mountain.json b/src/main/resources/assets/botania/models/block/apothecary_mountain.json new file mode 100644 index 000000000..f0e39848a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/apothecary_mountain.json @@ -0,0 +1,10 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:model/apothecary/mountain_side", + "goblet": "botania:model/apothecary/mountain_goblet", + "top_bottom": "botania:model/apothecary/mountain_top_bottom", + "particle": "botania:model/apothecary/mountain_top_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_plains.json b/src/main/resources/assets/botania/models/block/apothecary_plains.json new file mode 100644 index 000000000..453e4e394 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/apothecary_plains.json @@ -0,0 +1,10 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:model/apothecary/plains_side", + "goblet": "botania:model/apothecary/plains_goblet", + "top_bottom": "botania:model/apothecary/plains_top_bottom", + "particle": "botania:model/apothecary/plains_top_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_swamp.json b/src/main/resources/assets/botania/models/block/apothecary_swamp.json new file mode 100644 index 000000000..814636676 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/apothecary_swamp.json @@ -0,0 +1,10 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:model/apothecary/swamp_side", + "goblet": "botania:model/apothecary/swamp_goblet", + "top_bottom": "botania:model/apothecary/swamp_top_bottom", + "particle": "botania:model/apothecary/swamp_top_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_taiga.json b/src/main/resources/assets/botania/models/block/apothecary_taiga.json new file mode 100644 index 000000000..ed83f979a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/apothecary_taiga.json @@ -0,0 +1,10 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:model/apothecary/taiga_side", + "goblet": "botania:model/apothecary/taiga_goblet", + "top_bottom": "botania:model/apothecary/taiga_top_bottom", + "particle": "botania:model/apothecary/taiga_top_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/creative_pool_full.json b/src/main/resources/assets/botania/models/block/creative_pool_full.json deleted file mode 100644 index f4560e763..000000000 --- a/src/main/resources/assets/botania/models/block/creative_pool_full.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/pool_full", - "textures": { - "all": "botania:model/infinitepool", - "liquid": "botania:blocks/manawater" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crystalcube_base.json b/src/main/resources/assets/botania/models/block/crystalcube_base.json index e14c4f028..f09fd56eb 100644 --- a/src/main/resources/assets/botania/models/block/crystalcube_base.json +++ b/src/main/resources/assets/botania/models/block/crystalcube_base.json @@ -1,29 +1,213 @@ { - "elements": [ - { - "name": "Stand", - "from": [ 5.0, 0.0, 5.0 ], - "to": [ 11.0, 1.0, 11.0 ], - "faces": { - "west": { "texture": "#stand", "uv": [ 5.0, 7.0, 11.0, 8.0 ] }, - "north": { "texture": "#stand", "uv": [ 5.0, 9.0, 11.0, 10.0 ] }, - "east": { "texture": "#stand", "uv": [ 5.0, 11.0, 11.0, 12.0 ] }, - "south": { "texture": "#stand", "uv": [ 5.0, 13.0, 11.0, 14.0 ] }, - "down": { "texture": "#stand", "uv": [ 8.0, 0.0, 14.0, 6.0 ] } - } - }, - { - "name": "Base", - "from": [ 3.0, 1.0, 3.0 ], - "to": [ 13.0, 5.0, 13.0 ], - "faces": { - "west": { "texture": "#base_sides", "uv": [ 3.0, 0.0, 13.0, 4.0 ] }, - "north": { "texture": "#base_sides", "uv": [ 3.0, 4.0, 13.0, 8.0 ] }, - "east": { "texture": "#base_sides", "uv": [ 3.0, 8.0, 13.0, 12.0 ] }, - "south": { "texture": "#base_sides", "uv": [ 3.0, 12.0, 13.0, 16.0 ] }, - "up": { "texture": "#base_top", "uv": [ 3.0, 3.0, 13.0, 13.0 ] }, - "down": { "texture": "#base_bottom", "uv": [ 3.0, 3.0, 13.0, 13.0 ] } - } - } - ] + "comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "elements": [ + { + "__comment": "base", + "from": [ 5, 0, 5 ], + "to": [ 11, 2, 11 ], + "faces": { + "down": { "uv": [ 10, 0, 16, 6 ], "texture": "#base" }, + "north": { "uv": [ 10, 6, 16, 8 ], "texture": "#base" }, + "south": { "uv": [ 10, 6, 16, 8 ], "texture": "#base" }, + "west": { "uv": [ 10, 8, 16, 10 ], "texture": "#base" }, + "east": { "uv": [ 10, 8, 16, 10 ], "texture": "#base" } + } + }, + { + "__comment": "bottom", + "from": [ 3, 2, 3 ], + "to": [ 13, 2.001, 13 ], + "faces": { + "down": { "uv": [ 0, 0, 10, 10 ], "texture": "#base" } + } + }, + { + "__comment": "top", + "from": [ 3, 6, 3 ], + "to": [ 13, 6.001, 13 ], + "faces": { + "up": { "uv": [ 0, 0, 10, 10 ], "texture": "#cloth" } + } + }, + { + "__comment": "l1", + "from": [ 3, 1, 3 ], + "to": [ 3.001, 6, 5 ], + "faces": { + "west": { "uv": [ 0, 10, 2, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 9, 10, 11, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "l2", + "from": [ 3, 2, 5 ], + "to": [ 3.001, 6, 7 ], + "faces": { + "west": { "uv": [ 2, 11, 4, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 7, 11, 9, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "l3", + "from": [ 3, 1, 7 ], + "to": [ 3.001, 6, 9 ], + "faces": { + "west": { "uv": [ 4, 10, 6, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 7, 10, 9, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "l4", + "from": [ 3, 2, 9 ], + "to": [ 3.001, 6, 11 ], + "faces": { + "west": { "uv": [ 6, 11, 8, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 5, 11, 7, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "l5", + "from": [ 3, 1, 11 ], + "to": [ 3.001, 6, 13 ], + "faces": { + "west": { "uv": [ 4, 10, 6, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 7, 10, 9, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "r1", + "from": [ 13, 1, 11 ], + "to": [ 13.001, 6, 13 ], + "faces": { + "west": { "uv": [ 1, 10, 3, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 10, 10, 12, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "r2", + "from": [ 13, 2, 9 ], + "to": [ 13.001, 6, 11 ], + "faces": { + "west": { "uv": [ 2, 11, 4, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 8, 11, 10, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "r3", + "from": [ 13, 1, 7 ], + "to": [ 13.001, 6, 9 ], + "faces": { + "west": { "uv": [ 4, 10, 6, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 6, 10, 8, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "r4", + "from": [ 13, 2, 5 ], + "to": [ 13.001, 6, 7 ], + "faces": { + "west": { "uv": [ 6, 11, 8, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 4, 11, 6, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "r5", + "from": [ 13, 1, 3 ], + "to": [ 13.001, 6, 5 ], + "faces": { + "west": { "uv": [ 4, 10, 6, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 2, 10, 4, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "f1", + "from": [ 3, 1, 13 ], + "to": [ 5, 6, 13.001 ], + "faces": { + "north": { "uv": [ 1, 10, 3, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 10, 10, 12, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "f2", + "from": [ 5, 2, 13 ], + "to": [ 7, 6, 13.001 ], + "faces": { + "north": { "uv": [ 3, 11, 5, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 8, 11, 10, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "f3", + "from": [ 7, 1, 13 ], + "to": [ 9, 6, 13.001 ], + "faces": { + "north": { "uv": [ 5, 10, 7, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 6, 10, 8, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "f4", + "from": [ 9, 2, 13 ], + "to": [ 11, 6, 13.001 ], + "faces": { + "north": { "uv": [ 7, 11, 9, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 4, 11, 6, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "f5", + "from": [ 11, 1, 13 ], + "to": [ 13, 6, 13.001 ], + "faces": { + "north": { "uv": [ 9, 10, 11, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 2, 10, 4, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "b1", + "from": [ 11, 1, 3 ], + "to": [ 13, 6, 3.001 ], + "faces": { + "north": { "uv": [ 1, 10, 3, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 10, 10, 12, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "b2", + "from": [ 9, 2, 3 ], + "to": [ 11, 6, 3.001 ], + "faces": { + "north": { "uv": [ 3, 11, 5, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 8, 11, 10, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "b3", + "from": [ 7, 1, 3 ], + "to": [ 9, 6, 3.001 ], + "faces": { + "north": { "uv": [ 5, 10, 7, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 6, 10, 8, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "b4", + "from": [ 5, 2, 3 ], + "to": [ 7, 6, 3.001 ], + "faces": { + "north": { "uv": [ 7, 11, 9, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 4, 11, 6, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "b5", + "from": [ 3, 1, 3 ], + "to": [ 5, 6, 3.001 ], + "faces": { + "north": { "uv": [ 9, 10, 11, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 2, 10, 4, 15 ], "texture": "#cloth" } + } + } + ] } \ 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 index 2dd79d29d..6170d379c 100644 --- a/src/main/resources/assets/botania/models/block/crystalcube_cube.json +++ b/src/main/resources/assets/botania/models/block/crystalcube_cube.json @@ -1,20 +1,20 @@ { - "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 ] } - } - } - ] -} \ No newline at end of file + "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/default_pool_full.json b/src/main/resources/assets/botania/models/block/default_pool_full.json deleted file mode 100644 index 047faacc0..000000000 --- a/src/main/resources/assets/botania/models/block/default_pool_full.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/pool_full", - "textures": { - "all": "botania:model/pool", - "liquid": "botania:blocks/manawater" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/diluted_pool_full.json b/src/main/resources/assets/botania/models/block/diluted_pool_full.json deleted file mode 100644 index 92f4d92a9..000000000 --- a/src/main/resources/assets/botania/models/block/diluted_pool_full.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/pool_full", - "textures": { - "all": "botania:model/dilutedpool", - "liquid": "botania:blocks/manawater" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_canopy.json b/src/main/resources/assets/botania/models/block/drum_canopy.json index e21815c38..a5fb69332 100644 --- a/src/main/resources/assets/botania/models/block/drum_canopy.json +++ b/src/main/resources/assets/botania/models/block/drum_canopy.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/drum", "textures": { - "top": "botania:blocks/forestdrum4", - "side": "botania:blocks/forestdrum5" + "top": "botania:blocks/drum_0", + "side": "botania:blocks/drum_2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_gathering.json b/src/main/resources/assets/botania/models/block/drum_gathering.json index 90cc93a6b..1bd423218 100644 --- a/src/main/resources/assets/botania/models/block/drum_gathering.json +++ b/src/main/resources/assets/botania/models/block/drum_gathering.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/drum", "textures": { - "top": "botania:blocks/forestdrum2", - "side": "botania:blocks/forestdrum3" + "top": "botania:blocks/drum_0", + "side": "botania:blocks/drum_3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_wild.json b/src/main/resources/assets/botania/models/block/drum_wild.json index f79b07fcb..a6dabed74 100644 --- a/src/main/resources/assets/botania/models/block/drum_wild.json +++ b/src/main/resources/assets/botania/models/block/drum_wild.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/drum", "textures": { - "top": "botania:blocks/forestdrum0", - "side": "botania:blocks/forestdrum1" + "top": "botania:blocks/drum_0", + "side": "botania:blocks/drum_1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fabulous_pool_full.json b/src/main/resources/assets/botania/models/block/fabulous_pool_full.json deleted file mode 100644 index 047faacc0..000000000 --- a/src/main/resources/assets/botania/models/block/fabulous_pool_full.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/shapes/pool_full", - "textures": { - "all": "botania:model/pool", - "liquid": "botania:blocks/manawater" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_distributor.json b/src/main/resources/assets/botania/models/block/mana_distributor.json index 49a795162..2a00fbf2a 100644 --- a/src/main/resources/assets/botania/models/block/mana_distributor.json +++ b/src/main/resources/assets/botania/models/block/mana_distributor.json @@ -1,8 +1,75 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/distributor0", - "side": "botania:blocks/distributor1", - "bottom": "botania:blocks/livingrock0" - } + "__comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "minecraft:block/block", + "textures": { + "texture": "botania:blocks/splitter", + "particle": "botania:blocks/splitter" + }, + "elements": [ + { + "__comment": "pillar", + "from": [ 4, 0, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, + "up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, + "north": { "uv": [ 0, 0, 8, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "left", + "from": [ 0, 0, 4 ], + "to": [ 4, 8, 12 ], + "faces": { + "down": { "uv": [ 16, 8, 8, 12 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 8, 12, 16, 8 ], "texture": "#texture", "rotation": 90 }, + "south": { "uv": [ 8, 8, 16, 12 ], "texture": "#texture", "rotation": 90 }, + "west": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "right", + "from": [ 12, 0, 4 ], + "to": [ 16, 8, 12 ], + "faces": { + "down": { "uv": [ 8, 12, 16, 8 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 16, 16, 8, 12 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 8, 8, 16, 12 ], "texture": "#texture", "rotation": 90 }, + "south": { "uv": [ 8, 12, 16, 8 ], "texture": "#texture", "rotation": 90 }, + "west": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "front", + "from": [ 4, 0, 12 ], + "to": [ 12, 8, 16 ], + "faces": { + "down": { "uv": [ 8, 12, 16, 8 ], "texture": "#texture" }, + "up": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 12, 16, 8 ], "texture": "#texture", "rotation": 90 }, + "east": { "uv": [ 8, 8, 16, 12 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "back", + "from": [ 4, 0, 0 ], + "to": [ 12, 8, 4 ], + "faces": { + "down": { "uv": [ 16, 8, 8, 12 ], "texture": "#texture" }, + "up": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 8, 16, 12 ], "texture": "#texture", "rotation": 90 }, + "east": { "uv": [ 8, 12, 16, 8 ], "texture": "#texture", "rotation": 90 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_pump.json b/src/main/resources/assets/botania/models/block/mana_pump.json new file mode 100644 index 000000000..5713da3c8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_pump.json @@ -0,0 +1,61 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "textures": { + "structure": "botania:blocks/pump_structure", + "head_sheat": "botania:blocks/pump_head_sheat" + }, + "elements": [ + { + "Comment": "end_east", + "from": [ 4, 0, 14 ], + "to": [ 12, 8, 16 ], + "faces": { + "down": { "uv": [ 8, 2, 16, 4 ], "texture": "#structure" }, + "up": { "uv": [ 8, 2, 16, 4 ], "texture": "#structure" }, + "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#structure" }, + "south": { "uv": [ 0, 0, 8, 8 ], "texture": "#structure" }, + "west": { "uv": [ 8, 2, 16, 0 ], "texture": "#structure", "rotation": 90 }, + "east": { "uv": [ 8, 0, 16, 2 ], "texture": "#structure", "rotation": 90 } + } + }, + { + "Comment": "end_west", + "from": [ 4, 0, 0 ], + "to": [ 12, 8, 2 ], + "faces": { + "down": { "uv": [ 8, 2, 16, 4 ], "texture": "#structure" }, + "up": { "uv": [ 8, 2, 16, 4 ], "texture": "#structure" }, + "north": { "uv": [ 0, 0, 8, 8 ], "texture": "#structure" }, + "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#structure" }, + "west": { "uv": [ 8, 4, 16, 2 ], "texture": "#structure", "rotation": 90 }, + "east": { "uv": [ 8, 2, 16, 4 ], "texture": "#structure", "rotation": 90 } + } + }, + { + "Comment": "tube", + "from": [ 6, 2, 2 ], + "to": [ 10, 6, 10 ], + "faces": { + "down": { "uv": [ 12, 8, 16, 16 ], "texture": "#structure" }, + "up": { "uv": [ 12, 8, 16, 16 ], "texture": "#structure" }, + "north": { "uv": [ 8, 12, 12, 16 ], "texture": "#structure" }, + "south": { "uv": [ 8, 8, 12, 12 ], "texture": "#structure" }, + "west": { "uv": [ 8, 4, 16, 8 ], "texture": "#structure" }, + "east": { "uv": [ 8, 4, 16, 8 ], "texture": "#structure" } + } + }, + { + "Comment": "sheat", + "from": [ 4, 0, 10 ], + "to": [ 12, 8, 14 ], + "faces": { + "down": { "uv": [ 8, 4, 16, 8 ], "texture": "#head_sheat" }, + "up": { "uv": [ 8, 0, 16, 4 ], "texture": "#head_sheat" }, + "north": { "uv": [ 0, 0, 8, 8 ], "texture": "#head_sheat" }, + "south": { "uv": [ 0, 0, 8, 8 ], "texture": "#head_sheat" }, + "west": { "uv": [ 8, 8, 16, 4 ], "texture": "#head_sheat", "rotation": 90 }, + "east": { "uv": [ 8, 4, 16, 8 ], "texture": "#head_sheat", "rotation": 90 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_pump_head.json b/src/main/resources/assets/botania/models/block/mana_pump_head.json new file mode 100644 index 000000000..b11697450 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_pump_head.json @@ -0,0 +1,21 @@ +{ + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "textures": { + "head_sheat": "botania:blocks/pump_head_sheat" + }, + "elements": [ + { + "Comment": "head", + "from": [ 5, 1, 2 ], + "to": [ 11, 7, 6 ], + "faces": { + "down": { "uv": [ 6, 8, 12, 12 ], "texture": "#head_sheat" }, + "up": { "uv": [ 6, 8, 12, 12 ], "texture": "#head_sheat" }, + "north": { "uv": [ 0, 8, 6, 14 ], "texture": "#head_sheat" }, + "south": { "uv": [ 0, 8, 6, 14 ], "texture": "#head_sheat" }, + "west": { "uv": [ 6, 12, 12, 8 ], "texture": "#head_sheat", "rotation": 90 }, + "east": { "uv": [ 6, 8, 12, 12 ], "texture": "#head_sheat", "rotation": 90 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fabulous_pool.json b/src/main/resources/assets/botania/models/block/pool_creative.json similarity index 60% rename from src/main/resources/assets/botania/models/block/fabulous_pool.json rename to src/main/resources/assets/botania/models/block/pool_creative.json index 8ae898e5b..53fc3058a 100644 --- a/src/main/resources/assets/botania/models/block/fabulous_pool.json +++ b/src/main/resources/assets/botania/models/block/pool_creative.json @@ -1,12 +1,12 @@ { "parent": "botania:block/shapes/pool", "textures": { - "all": "botania:model/pool" + "all": "botania:blocks/pool_infinite" }, "overrides": [{ "predicate": { "botania:full": 1 }, - "model": "botania:block/fabulous_pool_full" + "model": "botania:block/pool_creative_full" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_creative_full.json b/src/main/resources/assets/botania/models/block/pool_creative_full.json new file mode 100644 index 000000000..097b5b214 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pool_creative_full.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/pool_full", + "textures": { + "all": "botania:blocks/pool_infinite", + "liquid": "botania:blocks/mana_water" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/diluted_pool.json b/src/main/resources/assets/botania/models/block/pool_default.json similarity index 61% rename from src/main/resources/assets/botania/models/block/diluted_pool.json rename to src/main/resources/assets/botania/models/block/pool_default.json index 77db73098..089b8254d 100644 --- a/src/main/resources/assets/botania/models/block/diluted_pool.json +++ b/src/main/resources/assets/botania/models/block/pool_default.json @@ -1,12 +1,12 @@ { "parent": "botania:block/shapes/pool", "textures": { - "all": "botania:model/dilutedpool" + "all": "botania:blocks/livingrock0" }, "overrides": [{ "predicate": { "botania:full": 1 }, - "model": "botania:block/diluted_pool_full" + "model": "botania:block/pool_default_full" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_default_full.json b/src/main/resources/assets/botania/models/block/pool_default_full.json new file mode 100644 index 000000000..cd1e09a90 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pool_default_full.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/pool_full", + "textures": { + "all": "botania:blocks/livingrock0", + "liquid": "botania:blocks/mana_water" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/creative_pool.json b/src/main/resources/assets/botania/models/block/pool_diluted.json similarity index 61% rename from src/main/resources/assets/botania/models/block/creative_pool.json rename to src/main/resources/assets/botania/models/block/pool_diluted.json index b94e8c506..d59ec7ffc 100644 --- a/src/main/resources/assets/botania/models/block/creative_pool.json +++ b/src/main/resources/assets/botania/models/block/pool_diluted.json @@ -1,12 +1,12 @@ { "parent": "botania:block/shapes/pool", "textures": { - "all": "botania:model/infinitepool" + "all": "botania:blocks/pool_diluted" }, "overrides": [{ "predicate": { "botania:full": 1 }, - "model": "botania:block/creative_pool_full" + "model": "botania:block/pool_diluted_full" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_diluted_full.json b/src/main/resources/assets/botania/models/block/pool_diluted_full.json new file mode 100644 index 000000000..787d22337 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pool_diluted_full.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/pool_full", + "textures": { + "all": "botania:blocks/pool_diluted", + "liquid": "botania:blocks/mana_water" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/default_pool.json b/src/main/resources/assets/botania/models/block/pool_fabulous.json similarity index 61% rename from src/main/resources/assets/botania/models/block/default_pool.json rename to src/main/resources/assets/botania/models/block/pool_fabulous.json index bbb969142..79e6422f8 100644 --- a/src/main/resources/assets/botania/models/block/default_pool.json +++ b/src/main/resources/assets/botania/models/block/pool_fabulous.json @@ -1,12 +1,12 @@ { "parent": "botania:block/shapes/pool", "textures": { - "all": "botania:model/pool" + "all": "botania:blocks/livingrock0" }, "overrides": [{ "predicate": { "botania:full": 1 }, - "model": "botania:block/default_pool_full" + "model": "botania:block/pool_fabulous_full" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_fabulous_full.json b/src/main/resources/assets/botania/models/block/pool_fabulous_full.json new file mode 100644 index 000000000..cd1e09a90 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pool_fabulous_full.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/pool_full", + "textures": { + "all": "botania:blocks/livingrock0", + "liquid": "botania:blocks/mana_water" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pump.json b/src/main/resources/assets/botania/models/block/pump.json deleted file mode 100644 index 23dd3429c..000000000 --- a/src/main/resources/assets/botania/models/block/pump.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "textures": { - "axle_sides": "botania:model/pump_axle_sides", - "axle_top_bottom": "botania:model/pump_axle_top_bottom", - "end": "botania:model/pump_end", - "sheath": "botania:model/pump_sheath" - }, - "elements": [ - { - "name": "EndNorth", - "from": [ 4.0, 0.0, 0.0 ], - "to": [ 12.0, 8.0, 1.0 ], - "faces": { - "north": { "texture": "#end", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "south": { "texture": "#end", "uv": [ 8.0, 0.0, 16.0, 8.0 ] }, - "east": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, - "west": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, - "up": { "texture": "#end", "uv": [ 6.0, 9.0, 14.0, 10.0 ] }, - "down": { "texture": "#end", "uv": [ 6.0, 11.0, 14.0, 12.0 ] } - } - }, - { - "name": "EndSouth", - "from": [ 4.0, 0.0, 15.0 ], - "to": [ 12.0, 8.0, 16.0 ], - "faces": { - "south": { "texture": "#end", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "north": { "texture": "#end", "uv": [ 8.0, 0.0, 16.0, 8.0 ] }, - "east": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, - "west": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, - "up": { "texture": "#end", "uv": [ 6.0, 9.0, 14.0, 10.0 ] }, - "down": { "texture": "#end", "uv": [ 6.0, 11.0, 14.0, 12.0 ] } - } - }, - { - "name": "Axle", - "from": [ 6.0, 2.0, 1.0 ], - "to": [ 10.0, 6.0, 15.0 ], - "faces": { - "east": { "texture": "#axle_sides", "uv": [ 1.0, 0.0, 15.0, 4.0 ] }, - "west": { "texture": "#axle_sides", "uv": [ 1.0, 5.0, 15.0, 9.0 ] }, - "down": { "texture": "#axle_top_bottom", "uv": [ 4.0, 1.0, 8.0, 15.0 ] }, - "up": { "texture": "#axle_top_bottom", "uv": [ 8.0, 1.0, 12.0, 15.0 ] } - } - }, - { - "name": "PinkTop", - "from": [ 4.0, 7.0, 11.0 ], - "to": [ 12.0, 8.0, 15.0 ], - "faces": { - "north": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 2.0 ] }, - "east": { "texture": "#sheath", "uv": [ 6.0, 5.0, 10.0, 6.0 ] }, - "west": { "texture": "#sheath", "uv": [ 6.0, 6.0, 10.0, 7.0 ] }, - "up": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 5.0 ] }, - "down": { "texture": "#sheath", "uv": [ 7.0, 1.0, 15.0, 5.0 ] } - } - }, - { - "name": "PinkBottom", - "from": [ 4.0, 0.0, 11.0 ], - "to": [ 12.0, 1.0, 15.0 ], - "faces": { - "north": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 2.0 ] }, - "east": { "texture": "#sheath", "uv": [ 6.0, 7.0, 10.0, 8.0 ] }, - "west": { "texture": "#sheath", "uv": [ 6.0, 8.0, 10.0, 9.0 ] }, - "up": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 5.0 ] }, - "down": { "texture": "#sheath", "uv": [ 7.0, 1.0, 15.0, 5.0 ] } - } - }, - { - "name": "PinkWest", - "from": [ 4.0, 1.0, 11.0 ], - "to": [ 5.0, 7.0, 15.0 ], - "faces": { - "north": { "texture": "#sheath", "uv": [ 6.0, 1.0, 7.0, 7.0 ] }, - "east": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] }, - "west": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] } - } - }, - { - "name": "PinkEast", - "from": [ 11.0, 1.0, 11.0 ], - "to": [ 12.0, 7.0, 15.0 ], - "faces": { - "north": { "texture": "#sheath", "uv": [ 6.0, 1.0, 7.0, 7.0 ] }, - "east": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] }, - "west": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pump_head.json b/src/main/resources/assets/botania/models/block/pump_head.json deleted file mode 100644 index 7e2907726..000000000 --- a/src/main/resources/assets/botania/models/block/pump_head.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "textures": { - "all": "botania:model/pump_head" - }, - "elements": [ - { - "name": "BlueTop", - "from": [ 5.0, 6.0, 1.0 ], - "to": [ 11.0, 7.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 3.0, 5.0, 9.0, 6.0 ] }, - "east": { "texture": "#all", "uv": [ 5.0, 8.0, 11.0, 7.0 ] }, - "south": { "texture": "#all", "uv": [ 3.0, 5.0, 9.0, 6.0 ] }, - "west": { "texture": "#all", "uv": [ 5.0, 8.0, 11.0, 7.0 ] }, - "up": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 0.0, 13.0, 6.0 ] } - } - }, - { - "name": "BlueBottom", - "from": [ 5.0, 1.0, 1.0 ], - "to": [ 11.0, 2.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 3.0, 5.0, 9.0, 6.0 ] }, - "east": { "texture": "#all", "uv": [ 5.0, 8.0, 11.0, 7.0 ] }, - "south": { "texture": "#all", "uv": [ 3.0, 5.0, 9.0, 6.0 ] }, - "west": { "texture": "#all", "uv": [ 5.0, 8.0, 11.0, 7.0 ] }, - "up": { "texture": "#all", "uv": [ 7.0, 0.0, 13.0, 6.0 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] } - } - }, - { - "name": "BlueWest", - "from": [ 5.0, 2.0, 1.0 ], - "to": [ 6.0, 6.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 3.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] }, - "south": { "texture": "#all", "uv": [ 3.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] } - } - }, - { - "name": "BlueEast", - "from": [ 10.0, 2.0, 1.0 ], - "to": [ 11.0, 6.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 3.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] }, - "south": { "texture": "#all", "uv": [ 3.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/runic_altar.json b/src/main/resources/assets/botania/models/block/runic_altar.json index e32069056..53f344137 100644 --- a/src/main/resources/assets/botania/models/block/runic_altar.json +++ b/src/main/resources/assets/botania/models/block/runic_altar.json @@ -1,8 +1,49 @@ { - "parent": "botania:block/shapes/twelve_high_bottom_top", - "textures": { - "top": "botania:blocks/runealtar1", - "side": "botania:blocks/runealtar2", - "bottom": "botania:blocks/runealtar0" - } + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "minecraft:block/block", + "textures": { + "bottom": "botania:blocks/runic_altar_0", + "up": "botania:blocks/runic_altar_1", + "side": "botania:blocks/runic_altar_2", + "particle": "botania:blocks/livingrock0" + }, + "elements": [ + { + "__comment": "top", + "from": [ 0, 6, 0 ], + "to": [ 16, 12, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "bottom" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#up" }, + "north": { "uv": [ 0, 4, 16, 10 ], "texture": "#side" }, + "south": { "uv": [ 0, 4, 16, 10 ], "texture": "#side" }, + "west": { "uv": [ 0, 4, 16, 10 ], "texture": "#side" }, + "east": { "uv": [ 0, 4, 16, 10 ], "texture": "#side" } + } + }, + { + "__comment": "center", + "from": [ 4, 4, 4 ], + "to": [ 12, 6, 12 ], + "faces": { + "north": { "uv": [ 4, 10, 12, 12 ], "texture": "#side" }, + "south": { "uv": [ 4, 10, 12, 12 ], "texture": "#side" }, + "west": { "uv": [ 4, 10, 12, 12 ], "texture": "#side" }, + "east": { "uv": [ 4, 10, 12, 12 ], "texture": "#side" } + } + }, + { + "__comment": "bottom", + "from": [ 2, 0, 2 ], + "to": [ 14, 4, 14 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 14 ], "texture": "bottom" }, + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "bottom" }, + "north": { "uv": [ 2, 12, 14, 16 ], "texture": "#side" }, + "south": { "uv": [ 2, 12, 14, 16 ], "texture": "#side" }, + "west": { "uv": [ 2, 12, 14, 16 ], "texture": "#side" }, + "east": { "uv": [ 2, 12, 14, 16 ], "texture": "#side" } + } + } + ] } diff --git a/src/main/resources/assets/botania/models/block/shapes/drum.json b/src/main/resources/assets/botania/models/block/shapes/drum.json index 7968b80e7..e52ba3599 100644 --- a/src/main/resources/assets/botania/models/block/shapes/drum.json +++ b/src/main/resources/assets/botania/models/block/shapes/drum.json @@ -1,19 +1,21 @@ { - "parent": "minecraft:block/block", - "textures": { - "particle": "#side" - }, - "elements": [{ - "name": "Drum", - "from": [ 3.0, 0.0, 3.0 ], - "to": [ 13.0, 14.0, 13.0 ], - "faces": { - "north": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, - "south": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, - "west": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, - "east": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, - "up": { "texture": "#top", "uv": [ 3, 3, 12, 12 ] }, - "down": { "texture": "#top", "uv": [ 3, 3, 12, 12 ], "cullface": "down" } - } - }] + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "minecraft:block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 3, 1, 3 ], + "to": [ 13, 15, 13 ], + "faces": { + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#top"}, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 1, 13, 15 ], "texture": "#side" }, + "south": { "uv": [ 3, 1, 13, 15 ], "texture": "#side" }, + "west": { "uv": [ 3, 1, 13, 15 ], "texture": "#side" }, + "east": { "uv": [ 3, 1, 13, 15 ], "texture": "#side" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json b/src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json index e3eedb76c..40f94312a 100644 --- a/src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json +++ b/src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json @@ -1,138 +1,117 @@ { - "__comment": "The texture is split apart to facilitate efficient use of the atlas. Sorry for the clutter!", - "parent": "minecraft:block/block", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, -1, 0], - "scale":[ 0.55, 0.55, 0.55 ] - } - }, - "elements": [ - { - "name": "gobletBase", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "west": { "texture": "#gobletbaseside", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "south": { "texture": "#gobletbaseside", "uv": [ 0.0, 3.0, 16.0, 5.0 ] }, - "east": { "texture": "#gobletbaseside", "uv": [ 0.0, 6.0, 16.0, 8.0 ] }, - "north": { "texture": "#gobletbaseside", "uv": [ 0.0, 9.0, 16.0, 11.0 ] }, - "up": { "texture": "#gobletbasetop", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#gobletbasebottom", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "down" } - } - }, - { - "name": "gobletBase2", - "from": [ 1.0, 2.0, 1.0 ], - "to": [ 15.0, 3.0, 15.0 ], - "faces": { - "west": { "texture": "#gobletbase2side", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "south": { "texture": "#gobletbase2side", "uv": [ 1.0, 2.0, 15.0, 3.0 ] }, - "east": { "texture": "#gobletbase2side", "uv": [ 1.0, 4.0, 15.0, 5.0 ] }, - "north": { "texture": "#gobletbase2side", "uv": [ 1.0, 6.0, 15.0, 7.0 ] }, - "up": { "texture": "#gobletbase2top", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "gobletBase3", - "from": [ 2.0, 3.0, 2.0 ], - "to": [ 14.0, 4.0, 14.0 ], - "faces": { - "west": { "texture": "#gobletbase3side", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#gobletbase3side", "uv": [ 2.0, 2.0, 14.0, 3.0 ] }, - "east": { "texture": "#gobletbase3side", "uv": [ 2.0, 4.0, 14.0, 5.0 ] }, - "north": { "texture": "#gobletbase3side", "uv": [ 2.0, 6.0, 14.0, 7.0 ] }, - "up": { "texture": "#gobletbase3top", "uv": [ 2.0, 2.0, 14.0, 14.0 ] } - } - }, - { - "name": "gobletStand", - "from": [ 5.0, 4.0, 5.0 ], - "to": [ 11.0, 12.0, 11.0 ], - "faces": { - "west": { "texture": "#gobletstandside", "uv": [ 2.0, 0.0, 14.0, 9.0 ] }, - "south": { "texture": "#gobletstandside", "uv": [ 2.0, 0.0, 14.0, 9.0 ] }, - "east": { "texture": "#gobletstandside", "uv": [ 2.0, 9.0, 14.0, 16.0 ] }, - "north": { "texture": "#gobletstandside", "uv": [ 2.0, 9.0, 14.0, 16.0 ] } - } - }, - { - "name": "kelkBase", - "from": [ 4.0, 12.0, 4.0 ], - "to": [ 12.0, 13.0, 12.0 ], - "faces": { - "west": { "texture": "#kelkbaseside", "uv": [ 4.0, 0.0, 12.0, 1.0 ] }, - "south": { "texture": "#kelkbaseside", "uv": [ 4.0, 2.0, 12.0, 3.0 ] }, - "east": { "texture": "#kelkbaseside", "uv": [ 4.0, 4.0, 12.0, 5.0 ] }, - "north": { "texture": "#kelkbaseside", "uv": [ 4.0, 6.0, 12.0, 7.0 ] }, - "down": { "texture": "#kelkbasetopbottom", "uv": [ 9.0, 4.0, 16.0, 12.0 ] } - } - }, - { - "name": "kelkBase2", - "from": [ 3.0, 13.0, 3.0 ], - "to": [ 13.0, 14.0, 13.0 ], - "faces": { - "west": { "texture": "#kelkbase2side", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, - "south": { "texture": "#kelkbase2side", "uv": [ 3.0, 2.0, 13.0, 3.0 ] }, - "east": { "texture": "#kelkbase2side", "uv": [ 3.0, 4.0, 13.0, 5.0 ] }, - "north": { "texture": "#kelkbase2side", "uv": [ 3.0, 6.0, 13.0, 7.0 ] }, - "up": { "texture": "#kelkbase2top", "uv": [ 3.0, 3.0, 13.0, 13.0 ] }, - "down": { "texture": "#kelkbase2bottom", "uv": [ 3.0, 3.0, 13.0, 13.0 ] } - } - }, - { - "name": "kelkWallNorth", - "from": [ 3.0, 14.0, 2.0 ], - "to": [ 13.0, 20.0, 3.0 ], - "faces": { - "west": { "texture": "#kelkwall", "uv": [ 0.0, 1.0, 1.0, 7.0 ] }, - "north": { "texture": "#kelkwall", "uv": [ 1.0, 1.0, 11.0, 7.0 ] }, - "south": { "texture": "#kelkwall", "uv": [ 1.0, 9.0, 11.0, 15.0 ] }, - "east": { "texture": "#kelkwall", "uv": [ 11.0, 9.0, 12.0, 15.0 ] }, - "up": { "texture": "#kelkwall", "uv": [ 1.0, 0.0, 11.0, 1.0 ] }, - "down": { "texture": "#kelkwall", "uv": [ 1.0, 8.0, 11.0, 9.0 ] } - } - }, - { - "name": "kelkWallSouth", - "from": [ 3.0, 14.0, 13.0 ], - "to": [ 13.0, 20.0, 14.0 ], - "faces": { - "west": { "texture": "#kelkwall", "uv": [ 0.0, 1.0, 1.0, 7.0 ] }, - "north": { "texture": "#kelkwall", "uv": [ 1.0, 1.0, 11.0, 7.0 ] }, - "south": { "texture": "#kelkwall", "uv": [ 1.0, 9.0, 11.0, 15.0 ] }, - "east": { "texture": "#kelkwall", "uv": [ 11.0, 9.0, 12.0, 15.0 ] }, - "up": { "texture": "#kelkwall", "uv": [ 1.0, 0.0, 11.0, 1.0 ] }, - "down": { "texture": "#kelkwall", "uv": [ 1.0, 8.0, 11.0, 9.0 ] } - } - }, - { - "name": "kelkWallWest", - "from": [ 2.0, 14.0, 3.0 ], - "to": [ 3.0, 20.0, 13.0 ], - "faces": { - "north": { "texture": "#kelkwall", "uv": [ 0.0, 1.0, 1.0, 7.0 ] }, - "west": { "texture": "#kelkwall", "uv": [ 1.0, 1.0, 11.0, 7.0 ] }, - "east": { "texture": "#kelkwall", "uv": [ 1.0, 9.0, 11.0, 15.0 ] }, - "south": { "texture": "#kelkwall", "uv": [ 11.0, 9.0, 12.0, 15.0 ] }, - "up": { "texture": "#kelkwall", "uv": [ 13.0, 0.0, 14.0, 11.0 ] }, - "down": { "texture": "#kelkwall", "uv": [ 14.0, 0.0, 15.0, 11.0 ] } - } - }, - { - "name": "kelkWallEast", - "from": [ 13.0, 14.0, 3.0 ], - "to": [ 14.0, 20.0, 13.0 ], - "faces": { - "north": { "texture": "#kelkwall", "uv": [ 0.0, 1.0, 1.0, 7.0 ] }, - "west": { "texture": "#kelkwall", "uv": [ 1.0, 1.0, 11.0, 7.0 ] }, - "east": { "texture": "#kelkwall", "uv": [ 1.0, 9.0, 11.0, 15.0 ] }, - "south": { "texture": "#kelkwall", "uv": [ 11.0, 9.0, 12.0, 15.0 ] }, - "up": { "texture": "#kelkwall", "uv": [ 13.0, 0.0, 14.0, 11.0 ] }, - "down": { "texture": "#kelkwall", "uv": [ 14.0, 0.0, 15.0, 11.0 ] } - } - } - ] + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "minecraft:block/block", + "elements": [ + { + "comment": "baseBottom", + "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#top_bottom" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top_bottom" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#side" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#side" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#side" } + } + }, + { + "comment": "baseTop", + "from": [ 2, 2, 2 ], + "to": [ 14, 4, 14 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#top_bottom" }, + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#top_bottom" }, + "north": { "uv": [ 2, 12, 14, 14 ], "texture": "#side" }, + "south": { "uv": [ 2, 12, 14, 14 ], "texture": "#side" }, + "west": { "uv": [ 2, 12, 14, 14 ], "texture": "#side" }, + "east": { "uv": [ 2, 12, 14, 14 ], "texture": "#side" } + } + }, + { + "comment": "pillar", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top_bottom" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top_bottom" }, + "north": { "uv": [ 4, 4, 12, 12 ], "texture": "#side" }, + "south": { "uv": [ 4, 4, 12, 12 ], "texture": "#side" }, + "west": { "uv": [ 4, 4, 12, 12 ], "texture": "#side" }, + "east": { "uv": [ 4, 4, 12, 12 ], "texture": "#side" } + } + }, + { + "comment": "baseGoblet", + "from": [ 2, 12, 2 ], + "to": [ 14, 14, 14 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#top_bottom" }, + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#top_bottom" }, + "north": { "uv": [ 2, 2, 14, 4 ], "texture": "#side" }, + "south": { "uv": [ 2, 2, 14, 4 ], "texture": "#side" }, + "west": { "uv": [ 2, 2, 14, 4 ], "texture": "#side" }, + "east": { "uv": [ 2, 2, 14, 4 ], "texture": "#side" } + } + }, + { + "comment": "sideSouth", + "from": [ 2, 14, 13 ], + "to": [ 14, 20, 14 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 3 ], "texture": "#top_bottom" }, + "up": { "uv": [ 2, 13, 14, 14 ], "texture": "#top_bottom" }, + "north": { "uv": [ 2, 10, 14, 16 ], "texture": "#goblet" }, + "south": { "uv": [ 2, 10, 14, 16 ], "texture": "#goblet" }, + "west": { "uv": [ 13, 10, 14, 16 ], "texture": "#goblet" }, + "east": { "uv": [ 2, 10, 3, 16 ], "texture": "#goblet" } + } + }, + { + "comment": "sideNorth", + "from": [ 2, 14, 2 ], + "to": [ 14, 20, 3 ], + "faces": { + "down": { "uv": [ 2, 13, 14, 14 ], "texture": "#top_bottom" }, + "up": { "uv": [ 2, 2, 14, 3 ], "texture": "#top_bottom" }, + "north": { "uv": [ 2, 10, 14, 16 ], "texture": "#goblet" }, + "south": { "uv": [ 2, 10, 14, 16 ], "texture": "#goblet" }, + "west": { "uv": [ 2, 10, 3, 16 ], "texture": "#goblet" }, + "east": { "uv": [ 13, 10, 14, 16 ], "texture": "#goblet" } + } + }, + { + "comment": "sideWest", + "from": [ 2, 14, 3 ], + "to": [ 3, 20, 13 ], + "faces": { + "down": { "uv": [ 2, 3, 3, 13 ], "texture": "#top_bottom" }, + "up": { "uv": [ 2, 3, 3, 13 ], "texture": "#top_bottom" }, + "north": { "uv": [ 13, 0, 14, 2 ], "texture": "#goblet" }, + "south": { "uv": [ 2, 0, 3, 2 ], "texture": "#goblet" }, + "west": { "uv": [ 3, 10, 13, 16 ], "texture": "#goblet" }, + "east": { "uv": [ 3, 10, 13, 16 ], "texture": "#goblet" } + } + }, + { + "comment": "sideEast", + "from": [ 13, 14, 3 ], + "to": [ 14, 20, 13 ], + "faces": { + "down": { "uv": [ 13, 3, 14, 13 ], "texture": "#top_bottom" }, + "up": { "uv": [ 13, 3, 14, 13 ], "texture": "top_bottom" }, + "north": { "uv": [ 2, 0, 3, 2 ], "texture": "#goblet" }, + "south": { "uv": [ 13, 0, 14, 2 ], "texture": "#goblet" }, + "west": { "uv": [ 3, 10, 13, 16 ], "texture": "#goblet" }, + "east": { "uv": [ 3, 10, 13, 16 ], "texture": "#goblet" } + } + } + ], + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, -0.55, 0 ], + "scale": [ 0.55, 0.55, 0.55 ] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shapes/pool.json b/src/main/resources/assets/botania/models/block/shapes/pool.json index 0a8f0619c..91c7bcd8e 100644 --- a/src/main/resources/assets/botania/models/block/shapes/pool.json +++ b/src/main/resources/assets/botania/models/block/shapes/pool.json @@ -1,69 +1,74 @@ { - "parent": "minecraft:block/block", - "textures": { - "particle": "botania:blocks/livingrock0" - }, - "elements": [ - { - "name": "Base", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 1.0, 16.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 4.0, 4.0, 4.25 ], "tintindex": 0 }, - "north": { "texture": "#all", "uv": [ 4.0, 4.0, 8.0, 4.25 ], "tintindex": 0 }, - "east": { "texture": "#all", "uv": [ 8.0, 4.0, 12.0, 4.25 ], "tintindex": 0 }, - "south": { "texture": "#all", "uv": [ 12.0, 4.0, 16.0, 4.25 ], "tintindex": 0 }, - "up": { "texture": "#all", "uv": [ 4.0, 0.0, 8.0, 4.0 ], "tintindex": 0 }, - "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "tintindex": 0, "cullface": "down" } - } - }, - { - "name": "SideSouth", - "from": [ 0.0, 1.0, 15.0 ], - "to": [ 16.0, 8.0, 16.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "tintindex": 0, "cullface": "west" }, - "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "tintindex": 0 }, - "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "tintindex": 0, "cullface": "east" }, - "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "tintindex": 0, "cullface": "south" }, - "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ], "tintindex": 0 }, - "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ], "tintindex": 0 } - } - }, - { - "name": "SideNorth", - "from": [ 0.0, 1.0, 0.0 ], - "to": [ 16.0, 8.0, 1.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "tintindex": 0, "cullface": "west" }, - "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "tintindex": 0, "cullface": "north" }, - "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "tintindex": 0, "cullface": "east" }, - "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "tintindex": 0 }, - "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ], "tintindex": 0 }, - "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ], "tintindex": 0 } - } - }, - { - "name": "SideWest", - "from": [ 0.0, 1.0, 1.0 ], - "to": [ 1.0, 8.0, 15.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "tintindex": 0, "cullface": "west" }, - "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "tintindex": 0 }, - "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ], "tintindex": 0 }, - "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ], "tintindex": 0 } - } - }, - { - "name": "SideEast", - "from": [ 15.0, 1.0, 1.0 ], - "to": [ 16.0, 8.0, 15.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "tintindex": 0 }, - "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "tintindex": 0, "cullface": "east" }, - "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ], "tintindex": 0 }, - "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ], "tintindex": 0 } - } - } - ] + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "minecraft:block/block", + "textures": { + "particle": "botania:blocks/livingrock0" + }, + "elements": [ + { + "name": "base", + "from": [ 0, 0, 0 ], + "to": [ 16, 1, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "north": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "south": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "west": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "east": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 } + } + }, + { + "name": "sideSouth", + "from": [ 0, 1, 15 ], + "to": [ 16, 8, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 1 ], "texture": "#all", "tintindex": 0 }, + "up": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "north": { "uv": [ 0, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "south": { "uv": [ 0, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "west": { "uv": [ 15, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "east": { "uv": [ 0, 8, 1, 15 ], "texture": "#all", "tintindex": 0 } + } + }, + { + "name": "sideNorth", + "from": [ 0, 1, 0 ], + "to": [ 16, 8, 1 ], + "faces": { + "down": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 16, 1 ], "texture": "#all", "tintindex": 0 }, + "north": { "uv": [ 0, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "south": { "uv": [ 0, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "west": { "uv": [ 0, 8, 1, 15 ], "texture": "#all", "tintindex": 0 }, + "east": { "uv": [ 15, 8, 16, 15 ], "texture": "#all", "tintindex": 0 } + } + }, + { + "name": "sideWest", + "from": [ 15, 1, 1 ], + "to": [ 16, 8, 15 ], + "faces": { + "down": { "uv": [ 15, 1, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "up": { "uv": [ 15, 1, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "north": { "uv": [ 0, 8, 1, 15 ], "texture": "#all", "tintindex": 0 }, + "south": { "uv": [ 15, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "west": { "uv": [ 1, 8, 15, 15 ], "texture": "#all", "tintindex": 0 }, + "east": { "uv": [ 1, 8, 15, 15 ], "texture": "#all", "tintindex": 0 } + } + }, + { + "name": "sideEast", + "from": [ 0, 1, 1 ], + "to": [ 1, 8, 15 ], + "faces": { + "down": { "uv": [ 0, 1, 1, 15 ], "texture": "#all", "tintindex": 0 }, + "up": { "uv": [ 0, 1, 1, 15 ], "texture": "#all", "tintindex": 0 }, + "north": { "uv": [ 15, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "south": { "uv": [ 0, 8, 1, 15 ], "texture": "#all", "tintindex": 0 }, + "west": { "uv": [ 1, 8, 15, 15 ], "texture": "#all", "tintindex": 0 }, + "east": { "uv": [ 1, 8, 15, 15 ], "texture": "#all", "tintindex": 0 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shapes/pool_full.json b/src/main/resources/assets/botania/models/block/shapes/pool_full.json index 6342e2f6d..9270c34df 100644 --- a/src/main/resources/assets/botania/models/block/shapes/pool_full.json +++ b/src/main/resources/assets/botania/models/block/shapes/pool_full.json @@ -1,77 +1,82 @@ { - "parent": "minecraft:block/block", - "textures": { - "particle": "#all" - }, - "elements": [ - { - "name": "Base", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 1.0, 16.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 4.0, 4.0, 4.25 ], "tintindex": 0 }, - "north": { "texture": "#all", "uv": [ 4.0, 4.0, 8.0, 4.25 ], "tintindex": 0 }, - "east": { "texture": "#all", "uv": [ 8.0, 4.0, 12.0, 4.25 ], "tintindex": 0 }, - "south": { "texture": "#all", "uv": [ 12.0, 4.0, 16.0, 4.25 ], "tintindex": 0 }, - "up": { "texture": "#all", "uv": [ 4.0, 0.0, 8.0, 4.0 ], "tintindex": 0 }, - "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "tintindex": 0, "cullface": "down" } - } - }, - { - "name": "SideSouth", - "from": [ 0.0, 1.0, 15.0 ], - "to": [ 16.0, 8.0, 16.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "tintindex": 0, "cullface": "west" }, - "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "tintindex": 0 }, - "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "tintindex": 0, "cullface": "east" }, - "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "tintindex": 0, "cullface": "south" }, - "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ], "tintindex": 0 }, - "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ], "tintindex": 0 } - } - }, - { - "name": "SideNorth", - "from": [ 0.0, 1.0, 0.0 ], - "to": [ 16.0, 8.0, 1.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "tintindex": 0, "cullface": "west" }, - "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "tintindex": 0, "cullface": "north" }, - "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "tintindex": 0, "cullface": "east" }, - "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "tintindex": 0 }, - "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ], "tintindex": 0 }, - "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ], "tintindex": 0 } - } - }, - { - "name": "SideWest", - "from": [ 0.0, 1.0, 1.0 ], - "to": [ 1.0, 8.0, 15.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "tintindex": 0, "cullface": "west" }, - "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "tintindex": 0 }, - "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ], "tintindex": 0 }, - "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ], "tintindex": 0 } - } - }, - { - "name": "SideEast", - "from": [ 15.0, 1.0, 1.0 ], - "to": [ 16.0, 8.0, 15.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "tintindex": 0 }, - "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "tintindex": 0, "cullface": "east" }, - "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ], "tintindex": 0 }, - "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ], "tintindex": 0 } - } - }, - { - "name": "Liquid", - "from": [ 1.0, 7.0, 1.0 ], - "to": [ 15.0, 7.0, 15.0 ], - "faces": { - "up": { "texture": "#liquid", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - } - ] + "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "minecraft:block/block", + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "base", + "from": [ 0, 0, 0 ], + "to": [ 16, 1, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "north": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "south": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "west": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "east": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 } + } + }, + { + "name": "sideSouth", + "from": [ 0, 1, 15 ], + "to": [ 16, 8, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 1 ], "texture": "#all", "tintindex": 0 }, + "up": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "north": { "uv": [ 0, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "south": { "uv": [ 0, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "west": { "uv": [ 15, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "east": { "uv": [ 0, 8, 1, 15 ], "texture": "#all", "tintindex": 0 } + } + }, + { + "name": "sideNorth", + "from": [ 0, 1, 0 ], + "to": [ 16, 8, 1 ], + "faces": { + "down": { "uv": [ 0, 15, 16, 16 ], "texture": "#all", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 16, 1 ], "texture": "#all", "tintindex": 0 }, + "north": { "uv": [ 0, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "south": { "uv": [ 0, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "west": { "uv": [ 0, 8, 1, 15 ], "texture": "#all", "tintindex": 0 }, + "east": { "uv": [ 15, 8, 16, 15 ], "texture": "#all", "tintindex": 0 } + } + }, + { + "name": "sideWest", + "from": [ 15, 1, 1 ], + "to": [ 16, 8, 15 ], + "faces": { + "down": { "uv": [ 15, 1, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "up": { "uv": [ 15, 1, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "north": { "uv": [ 0, 8, 1, 15 ], "texture": "#all", "tintindex": 0 }, + "south": { "uv": [ 15, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "west": { "uv": [ 1, 8, 15, 15 ], "texture": "#all", "tintindex": 0 }, + "east": { "uv": [ 1, 8, 15, 15 ], "texture": "#all", "tintindex": 0 } + } + }, + { + "name": "sideEast", + "from": [ 0, 1, 1 ], + "to": [ 1, 8, 15 ], + "faces": { + "down": { "uv": [ 0, 1, 1, 15 ], "texture": "#all", "tintindex": 0 }, + "up": { "uv": [ 0, 1, 1, 15 ], "texture": "#all", "tintindex": 0 }, + "north": { "uv": [ 15, 8, 16, 15 ], "texture": "#all", "tintindex": 0 }, + "south": { "uv": [ 0, 8, 1, 15 ], "texture": "#all", "tintindex": 0 }, + "west": { "uv": [ 1, 8, 15, 15 ], "texture": "#all", "tintindex": 0 }, + "east": { "uv": [ 1, 8, 15, 15 ], "texture": "#all", "tintindex": 0 } + } + }, + { + "name": "liquid", + "from": [ 1, 7, 1 ], + "to": [ 15, 7.001, 15 ], + "faces": { + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#liquid" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json b/src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json index 20f9257d0..39bfce351 100644 --- a/src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json +++ b/src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json @@ -1,20 +1,21 @@ { - "parent": "minecraft:block/block", - "textures": { - "particle": "#side" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 3, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, - "north": { "uv": [ 0, 13, 16, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 13, 16, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 13, 16, 16 ], "texture": "#side", "cullface": "west" }, - "east": { "uv": [ 0, 13, 16, 16 ], "texture": "#side", "cullface": "east" } - } - } - ] + "__comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "minecraft:block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 3, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#up" }, + "north": { "uv": [ 0, 13, 16, 16 ], "texture": "#side" }, + "south": { "uv": [ 0, 13, 16, 16 ], "texture": "#side" }, + "west": { "uv": [ 0, 13, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 13, 16, 16 ], "texture": "#side" } + } + } + ] } diff --git a/src/main/resources/assets/botania/models/block/shapes/twelve_high_bottom_top.json b/src/main/resources/assets/botania/models/block/shapes/twelve_high_bottom_top.json deleted file mode 100644 index d27a32522..000000000 --- a/src/main/resources/assets/botania/models/block/shapes/twelve_high_bottom_top.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "particle": "#top" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 12, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, - "north": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "west" }, - "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "east" } - } - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/spark_tinkerer.json b/src/main/resources/assets/botania/models/block/spark_tinkerer.json index 58a89a43e..df0f1120a 100644 --- a/src/main/resources/assets/botania/models/block/spark_tinkerer.json +++ b/src/main/resources/assets/botania/models/block/spark_tinkerer.json @@ -1,8 +1,8 @@ { - "parent": "botania:block/shapes/three_high_bottom_top", - "textures": { - "bottom": "botania:blocks/sparkchanger0", - "top": "botania:blocks/sparkchanger1", - "side": "botania:blocks/sparkchanger2" - } -} \ No newline at end of file + "parent": "botania:block/shapes/three_high_bottom_top", + "textures": { + "bottom": "botania:blocks/spark_tinkerer_0", + "up": "botania:blocks/spark_tinkerer_1", + "side": "botania:blocks/spark_tinkerer_2" + } +} diff --git a/src/main/resources/assets/botania/models/block/elven_spreader.json b/src/main/resources/assets/botania/models/block/spreader_elven.json similarity index 100% rename from src/main/resources/assets/botania/models/block/elven_spreader.json rename to src/main/resources/assets/botania/models/block/spreader_elven.json diff --git a/src/main/resources/assets/botania/models/block/gaia_spreader.json b/src/main/resources/assets/botania/models/block/spreader_gaia.json similarity index 74% rename from src/main/resources/assets/botania/models/block/gaia_spreader.json rename to src/main/resources/assets/botania/models/block/spreader_gaia.json index 705ca1e5e..c6fcbfe41 100644 --- a/src/main/resources/assets/botania/models/block/gaia_spreader.json +++ b/src/main/resources/assets/botania/models/block/spreader_gaia.json @@ -3,6 +3,6 @@ "textures": { "inside": "botania:model/spreader_item/gaia_inside", "side": "botania:model/spreader_item/gaia_side", - "material": "botania:blocks/dreamwood0" + "material": "botania:model/spreader_item/gaia_material" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_spreader.json b/src/main/resources/assets/botania/models/block/spreader_mana.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mana_spreader.json rename to src/main/resources/assets/botania/models/block/spreader_mana.json diff --git a/src/main/resources/assets/botania/models/block/redstone_spreader.json b/src/main/resources/assets/botania/models/block/spreader_redstone.json similarity index 74% rename from src/main/resources/assets/botania/models/block/redstone_spreader.json rename to src/main/resources/assets/botania/models/block/spreader_redstone.json index 15e48655c..5a6b20bbc 100644 --- a/src/main/resources/assets/botania/models/block/redstone_spreader.json +++ b/src/main/resources/assets/botania/models/block/spreader_redstone.json @@ -3,6 +3,6 @@ "textures": { "inside": "botania:model/spreader_item/redstone_inside", "side": "botania:model/spreader_item/redstone_side", - "material": "botania:model/spreader_item/redstone_material" + "material": "botania:blocks/livingwood0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/terra_plate.json b/src/main/resources/assets/botania/models/block/terra_plate.json index 894810b23..66bb2348c 100644 --- a/src/main/resources/assets/botania/models/block/terra_plate.json +++ b/src/main/resources/assets/botania/models/block/terra_plate.json @@ -1,8 +1,8 @@ { - "parent": "botania:block/shapes/three_high_bottom_top", - "textures": { - "bottom": "botania:blocks/terraplate0", - "top": "botania:blocks/terraplate1", - "side": "botania:blocks/terraplate2" - } -} \ No newline at end of file + "parent": "botania:block/shapes/three_high_bottom_top", + "textures": { + "bottom": "botania:blocks/terra_plate_0", + "up": "botania:blocks/terra_plate_1", + "side": "botania:blocks/terra_plate_2" + } +} diff --git a/src/main/resources/assets/botania/models/block/tiny_potato.json b/src/main/resources/assets/botania/models/block/tiny_potato.json index 9d9996032..353bfcb1a 100644 --- a/src/main/resources/assets/botania/models/block/tiny_potato.json +++ b/src/main/resources/assets/botania/models/block/tiny_potato.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/block", "textures": { - "all": "botania:model/tinypotatocopy", - "particle": "botania:model/tinypotatocopy" + "all": "botania:model/tiny_potato", + "particle": "botania:model/tiny_potato" }, "elements": [ { @@ -15,7 +15,7 @@ "east": { "texture": "#all", "uv": [ 8.0, 4.0, 12.0, 10.0 ] }, "south": { "texture": "#all", "uv": [ 12.0, 4.0, 16.0, 10.0 ] }, "up": { "texture": "#all", "uv": [ 4.0, 0.0, 8.0, 4.0 ] }, - "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "cullface": "down" } + "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ] } } } ] diff --git a/src/main/resources/assets/botania/models/item/astrolabe.json b/src/main/resources/assets/botania/models/item/astrolabe.json index 75a5d0663..e509c753a 100644 --- a/src/main/resources/assets/botania/models/item/astrolabe.json +++ b/src/main/resources/assets/botania/models/item/astrolabe.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botania:items/astrolabe" + "layer0": "botania:items/tool_astrolabe" } } diff --git a/src/main/resources/assets/botania/models/item/auraring.json b/src/main/resources/assets/botania/models/item/auraring.json index 7da24b58d..bfd9467af 100644 --- a/src/main/resources/assets/botania/models/item/auraring.json +++ b/src/main/resources/assets/botania/models/item/auraring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/auraring" + "layer0": "botania:items/ring_aura_lesser" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/auraringgreater.json b/src/main/resources/assets/botania/models/item/auraringgreater.json index b1b2a0d9d..54b7ec88d 100644 --- a/src/main/resources/assets/botania/models/item/auraringgreater.json +++ b/src/main/resources/assets/botania/models/item/auraringgreater.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/auraringgreater" + "layer0": "botania:items/ring_aura_greater" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/autocraftinghalo.json b/src/main/resources/assets/botania/models/item/autocraftinghalo.json index 13910ca71..ae153bb3b 100644 --- a/src/main/resources/assets/botania/models/item/autocraftinghalo.json +++ b/src/main/resources/assets/botania/models/item/autocraftinghalo.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/autocraftinghalo" + "layer0": "botania:items/halo_autocrafting" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/balancecloak.json b/src/main/resources/assets/botania/models/item/balancecloak.json index e7eb66572..681091be6 100644 --- a/src/main/resources/assets/botania/models/item/balancecloak.json +++ b/src/main/resources/assets/botania/models/item/balancecloak.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/balancecloak" + "layer0": "botania:items/cloak_balance" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/baublebox.json b/src/main/resources/assets/botania/models/item/baublebox.json index 5ec94d128..e6503e42a 100644 --- a/src/main/resources/assets/botania/models/item/baublebox.json +++ b/src/main/resources/assets/botania/models/item/baublebox.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/baublebox" + "layer0": "botania:items/container_bauble_closed" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackholetalisman0.json b/src/main/resources/assets/botania/models/item/blackholetalisman0.json index 469ce54dd..2fdfa1eb1 100644 --- a/src/main/resources/assets/botania/models/item/blackholetalisman0.json +++ b/src/main/resources/assets/botania/models/item/blackholetalisman0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/blackholetalisman0" + "layer0": "botania:items/talisman_black_hole" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackholetalisman1.json b/src/main/resources/assets/botania/models/item/blackholetalisman1.json index fbdafb62d..74c6e040f 100644 --- a/src/main/resources/assets/botania/models/item/blackholetalisman1.json +++ b/src/main/resources/assets/botania/models/item/blackholetalisman1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/blackholetalisman1" + "layer0": "botania:items/talisman_black_hole_activated" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blacklotus0.json b/src/main/resources/assets/botania/models/item/blacklotus0.json index bfdcd3673..8a2f8c8e2 100644 --- a/src/main/resources/assets/botania/models/item/blacklotus0.json +++ b/src/main/resources/assets/botania/models/item/blacklotus0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/blacklotus" + "layer0": "botania:items/black_lotus" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blacklotus1.json b/src/main/resources/assets/botania/models/item/blacklotus1.json index 0bc7ee409..950f0d490 100644 --- a/src/main/resources/assets/botania/models/item/blacklotus1.json +++ b/src/main/resources/assets/botania/models/item/blacklotus1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/blacklotus" + "layer0": "botania:items/black_lotus_intense" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bloodpendant.json b/src/main/resources/assets/botania/models/item/bloodpendant.json index f63fd66c1..32af4db29 100644 --- a/src/main/resources/assets/botania/models/item/bloodpendant.json +++ b/src/main/resources/assets/botania/models/item/bloodpendant.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/bloodpendant0", - "layer1": "botania:items/bloodpendant1" + "layer0": "botania:items/pendant_blood", + "layer1": "botania:items/pendant_blood_overlay" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cloudpendant.json b/src/main/resources/assets/botania/models/item/cloudpendant.json index a30696a7d..e8044e853 100644 --- a/src/main/resources/assets/botania/models/item/cloudpendant.json +++ b/src/main/resources/assets/botania/models/item/cloudpendant.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botania:items/cloudpendant" + "layer0": "botania:items/pendant_cloud" } } diff --git a/src/main/resources/assets/botania/models/item/cobblerod.json b/src/main/resources/assets/botania/models/item/cobblerod.json index 2bd116443..a9fbb081e 100644 --- a/src/main/resources/assets/botania/models/item/cobblerod.json +++ b/src/main/resources/assets/botania/models/item/cobblerod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/cobblerod" + "layer0": "botania:items/rod_cobble" } } diff --git a/src/main/resources/assets/botania/models/item/corporeaspark0.json b/src/main/resources/assets/botania/models/item/corporeaspark0.json index 457c6e28c..444696361 100644 --- a/src/main/resources/assets/botania/models/item/corporeaspark0.json +++ b/src/main/resources/assets/botania/models/item/corporeaspark0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/corporeaspark0" + "layer0": "botania:items/spark_corporea" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporeaspark1.json b/src/main/resources/assets/botania/models/item/corporeaspark1.json index 3eb7533d8..ada9f317e 100644 --- a/src/main/resources/assets/botania/models/item/corporeaspark1.json +++ b/src/main/resources/assets/botania/models/item/corporeaspark1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/corporeaspark2" + "layer0": "botania:items/spark_corporea_master" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/craftinghalo.json b/src/main/resources/assets/botania/models/item/craftinghalo.json index 1ad4d0a11..531c56ce9 100644 --- a/src/main/resources/assets/botania/models/item/craftinghalo.json +++ b/src/main/resources/assets/botania/models/item/craftinghalo.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftinghalo" + "layer0": "botania:items/halo_crafting" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalbow.json b/src/main/resources/assets/botania/models/item/crystalbow.json index b18df708c..6ce07d08f 100644 --- a/src/main/resources/assets/botania/models/item/crystalbow.json +++ b/src/main/resources/assets/botania/models/item/crystalbow.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/crystalbow0" + "layer0": "botania:items/bow_crystal" }, "display": { "thirdperson_righthand": { diff --git a/src/main/resources/assets/botania/models/item/crystalbow_pulling_1.json b/src/main/resources/assets/botania/models/item/crystalbow_pulling_1.json index e3671b355..968b50bf5 100644 --- a/src/main/resources/assets/botania/models/item/crystalbow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/crystalbow_pulling_1.json @@ -1,6 +1,6 @@ { "parent": "botania:item/crystalbow", "textures": { - "layer0": "botania:items/crystalbow1" + "layer0": "botania:items/bow_crystal_pulling_1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalbow_pulling_2.json b/src/main/resources/assets/botania/models/item/crystalbow_pulling_2.json index 36b89e937..bdbb1d2b1 100644 --- a/src/main/resources/assets/botania/models/item/crystalbow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/crystalbow_pulling_2.json @@ -1,6 +1,6 @@ { "parent": "botania:item/crystalbow", "textures": { - "layer0": "botania:items/crystalbow2" + "layer0": "botania:items/bow_crystal_pulling_2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalbow_pulling_3.json b/src/main/resources/assets/botania/models/item/crystalbow_pulling_3.json index c1c361ab2..b69971d9a 100644 --- a/src/main/resources/assets/botania/models/item/crystalbow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/crystalbow_pulling_3.json @@ -1,6 +1,6 @@ { "parent": "botania:item/crystalbow", "textures": { - "layer0": "botania:items/crystalbow3" + "layer0": "botania:items/bow_crystal_pulling_3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalbow_pulling_4.json b/src/main/resources/assets/botania/models/item/crystalbow_pulling_4.json index 6e624c2e5..4c0e83942 100644 --- a/src/main/resources/assets/botania/models/item/crystalbow_pulling_4.json +++ b/src/main/resources/assets/botania/models/item/crystalbow_pulling_4.json @@ -1,6 +1,6 @@ { "parent": "botania:item/crystalbow", "textures": { - "layer0": "botania:items/crystalbow4" + "layer0": "botania:items/bow_crystal_pulling_4" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalbow_pulling_5.json b/src/main/resources/assets/botania/models/item/crystalbow_pulling_5.json index a3a404994..4753965d9 100644 --- a/src/main/resources/assets/botania/models/item/crystalbow_pulling_5.json +++ b/src/main/resources/assets/botania/models/item/crystalbow_pulling_5.json @@ -1,6 +1,6 @@ { "parent": "botania:item/crystalbow", "textures": { - "layer0": "botania:items/crystalbow5" + "layer0": "botania:items/bow_crystal_pulling_5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dammitreddit.json b/src/main/resources/assets/botania/models/item/dammitreddit.json index 42ef9e45c..d6f6d417b 100644 --- a/src/main/resources/assets/botania/models/item/dammitreddit.json +++ b/src/main/resources/assets/botania/models/item/dammitreddit.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/dammitreddit" + "layer0": "botania:items/special_dammitreddit" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infinitefruitboot.json b/src/main/resources/assets/botania/models/item/dasboot.json similarity index 100% rename from src/main/resources/assets/botania/models/item/infinitefruitboot.json rename to src/main/resources/assets/botania/models/item/dasboot.json diff --git a/src/main/resources/assets/botania/models/item/dirtrod.json b/src/main/resources/assets/botania/models/item/dirtrod.json index 137842f46..61bf3ec9d 100644 --- a/src/main/resources/assets/botania/models/item/dirtrod.json +++ b/src/main/resources/assets/botania/models/item/dirtrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/dirtrod" + "layer0": "botania:items/rod_dirt" } } diff --git a/src/main/resources/assets/botania/models/item/divacharm.json b/src/main/resources/assets/botania/models/item/divacharm.json index 3d1b17fab..af4bd2126 100644 --- a/src/main/resources/assets/botania/models/item/divacharm.json +++ b/src/main/resources/assets/botania/models/item/divacharm.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/divacharm" + "layer0": "botania:items/charm_diva" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/diviningrod.json b/src/main/resources/assets/botania/models/item/diviningrod.json index df42fcaf4..f45313f51 100644 --- a/src/main/resources/assets/botania/models/item/diviningrod.json +++ b/src/main/resources/assets/botania/models/item/diviningrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/diviningrod" + "layer0": "botania:items/rod_divining" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dodgering.json b/src/main/resources/assets/botania/models/item/dodgering.json index e9076fbda..844be4293 100644 --- a/src/main/resources/assets/botania/models/item/dodgering.json +++ b/src/main/resources/assets/botania/models/item/dodgering.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/dodgering" + "layer0": "botania:items/ring_dodge" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwoodtwig.json b/src/main/resources/assets/botania/models/item/dreamwoodtwig.json index a32354d60..38c92ad3d 100644 --- a/src/main/resources/assets/botania/models/item/dreamwoodtwig.json +++ b/src/main/resources/assets/botania/models/item/dreamwoodtwig.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/dreamwoodtwig" + "layer0": "botania:items/twig_dreamwood" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementium.json b/src/main/resources/assets/botania/models/item/elementium.json index cb7932dd9..8662fb1af 100644 --- a/src/main/resources/assets/botania/models/item/elementium.json +++ b/src/main/resources/assets/botania/models/item/elementium.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementium" + "layer0": "botania:items/elementium_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumaxe.json b/src/main/resources/assets/botania/models/item/elementiumaxe.json index 62d8a3178..fa9cf1462 100644 --- a/src/main/resources/assets/botania/models/item/elementiumaxe.json +++ b/src/main/resources/assets/botania/models/item/elementiumaxe.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/elementiumaxe" + "layer0": "botania:items/elementium_axe" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumboots.json b/src/main/resources/assets/botania/models/item/elementiumboots.json index 9c776e941..7d6a8d3f4 100644 --- a/src/main/resources/assets/botania/models/item/elementiumboots.json +++ b/src/main/resources/assets/botania/models/item/elementiumboots.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementiumboots" + "layer0": "botania:items/elementium_boots" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumchest.json b/src/main/resources/assets/botania/models/item/elementiumchest.json index fff53f0ac..d78042580 100644 --- a/src/main/resources/assets/botania/models/item/elementiumchest.json +++ b/src/main/resources/assets/botania/models/item/elementiumchest.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementiumchest" + "layer0": "botania:items/elementium_chestplate" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumhelm.json b/src/main/resources/assets/botania/models/item/elementiumhelm.json index a0060fa61..df4ed392e 100644 --- a/src/main/resources/assets/botania/models/item/elementiumhelm.json +++ b/src/main/resources/assets/botania/models/item/elementiumhelm.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementiumhelm" + "layer0": "botania:items/elementium_helmet" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumhelmreveal.json b/src/main/resources/assets/botania/models/item/elementiumhelmreveal.json index 69c6d5035..ac73560da 100644 --- a/src/main/resources/assets/botania/models/item/elementiumhelmreveal.json +++ b/src/main/resources/assets/botania/models/item/elementiumhelmreveal.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementiumhelmreveal" + "layer0": "botania:items/elementium_helmet_reveal" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumlegs.json b/src/main/resources/assets/botania/models/item/elementiumlegs.json index deb3776cc..408de3bf5 100644 --- a/src/main/resources/assets/botania/models/item/elementiumlegs.json +++ b/src/main/resources/assets/botania/models/item/elementiumlegs.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementiumlegs" + "layer0": "botania:items/elementium_leggings" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumnugget.json b/src/main/resources/assets/botania/models/item/elementiumnugget.json index ba4ab115e..b0f93bde5 100644 --- a/src/main/resources/assets/botania/models/item/elementiumnugget.json +++ b/src/main/resources/assets/botania/models/item/elementiumnugget.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementiumnugget" + "layer0": "botania:items/elementium_nugget" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumpick.json b/src/main/resources/assets/botania/models/item/elementiumpick.json index 77cebf6cf..ae5fce4a2 100644 --- a/src/main/resources/assets/botania/models/item/elementiumpick.json +++ b/src/main/resources/assets/botania/models/item/elementiumpick.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/elementiumpick" + "layer0": "botania:items/elementium_pickaxe" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumshears.json b/src/main/resources/assets/botania/models/item/elementiumshears.json index ccb33ea82..8c946bd27 100644 --- a/src/main/resources/assets/botania/models/item/elementiumshears.json +++ b/src/main/resources/assets/botania/models/item/elementiumshears.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/elementiumshears" + "layer0": "botania:items/elementium_shears" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/elementiumshovel.json b/src/main/resources/assets/botania/models/item/elementiumshovel.json index 0810f92ee..865250508 100644 --- a/src/main/resources/assets/botania/models/item/elementiumshovel.json +++ b/src/main/resources/assets/botania/models/item/elementiumshovel.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/elementiumshovel" + "layer0": "botania:items/elementium_shovel" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumsword.json b/src/main/resources/assets/botania/models/item/elementiumsword.json index 625ea03a2..48c0d1f88 100644 --- a/src/main/resources/assets/botania/models/item/elementiumsword.json +++ b/src/main/resources/assets/botania/models/item/elementiumsword.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/elementiumsword" + "layer0": "botania:items/elementium_sword" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderairbottle.json b/src/main/resources/assets/botania/models/item/enderairbottle.json index e204f4ad8..fbdb5af65 100644 --- a/src/main/resources/assets/botania/models/item/enderairbottle.json +++ b/src/main/resources/assets/botania/models/item/enderairbottle.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/enderairbottle" + "layer0": "botania:items/bottle_ender_air" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderdagger.json b/src/main/resources/assets/botania/models/item/enderdagger.json index 706277a0c..4c1550712 100644 --- a/src/main/resources/assets/botania/models/item/enderdagger.json +++ b/src/main/resources/assets/botania/models/item/enderdagger.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/enderdagger0", - "layer1": "botania:items/enderdagger1" + "layer0": "botania:items/ender_dagger", + "layer1": "botania:items/ender_dagger_overlay" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderhand.json b/src/main/resources/assets/botania/models/item/enderhand.json index 00676ef5e..df6a5c078 100644 --- a/src/main/resources/assets/botania/models/item/enderhand.json +++ b/src/main/resources/assets/botania/models/item/enderhand.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/enderhand" + "layer0": "botania:items/ender_hand" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/exchangerod.json b/src/main/resources/assets/botania/models/item/exchangerod.json index 8b4600523..d4456eb46 100644 --- a/src/main/resources/assets/botania/models/item/exchangerod.json +++ b/src/main/resources/assets/botania/models/item/exchangerod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/exchangerod" + "layer0": "botania:items/rod_exchange" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fertilizer.json b/src/main/resources/assets/botania/models/item/fertilizer.json index 7091df8f2..b077c1979 100644 --- a/src/main/resources/assets/botania/models/item/fertilizer.json +++ b/src/main/resources/assets/botania/models/item/fertilizer.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/fertilizer" + "layer0": "botania:items/floral_fertilizer" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/firerod.json b/src/main/resources/assets/botania/models/item/firerod.json index 047fbd2ce..3d012edf6 100644 --- a/src/main/resources/assets/botania/models/item/firerod.json +++ b/src/main/resources/assets/botania/models/item/firerod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/firerod" + "layer0": "botania:items/rod_fire" } } diff --git a/src/main/resources/assets/botania/models/item/flighttiara.json b/src/main/resources/assets/botania/models/item/flighttiara.json index a30b7ee36..b62effab4 100644 --- a/src/main/resources/assets/botania/models/item/flighttiara.json +++ b/src/main/resources/assets/botania/models/item/flighttiara.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/flighttiara0" + "layer0": "botania:items/headpiece_tiara_flight" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flowerbag.json b/src/main/resources/assets/botania/models/item/flowerbag.json index 761acb1b3..5c067c522 100644 --- a/src/main/resources/assets/botania/models/item/flowerbag.json +++ b/src/main/resources/assets/botania/models/item/flowerbag.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/flowerbag" + "layer0": "botania:items/container_flower" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flugeleye.json b/src/main/resources/assets/botania/models/item/flugeleye.json index fd9669967..49d41f88c 100644 --- a/src/main/resources/assets/botania/models/item/flugeleye.json +++ b/src/main/resources/assets/botania/models/item/flugeleye.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/flugeleye" + "layer0": "botania:items/relic_flugel_eye" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gaiaingot.json b/src/main/resources/assets/botania/models/item/gaiaingot.json index c2522ed0f..a75abf4d8 100644 --- a/src/main/resources/assets/botania/models/item/gaiaingot.json +++ b/src/main/resources/assets/botania/models/item/gaiaingot.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/gaiaingot" + "layer0": "botania:items/gaia_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/glasspick.json b/src/main/resources/assets/botania/models/item/glasspick.json index e3b279e49..99d411363 100644 --- a/src/main/resources/assets/botania/models/item/glasspick.json +++ b/src/main/resources/assets/botania/models/item/glasspick.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/glasspick" + "layer0": "botania:items/glass_pickaxe" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/goddesscharm.json b/src/main/resources/assets/botania/models/item/goddesscharm.json index 55d3fb9d7..ba47a4230 100644 --- a/src/main/resources/assets/botania/models/item/goddesscharm.json +++ b/src/main/resources/assets/botania/models/item/goddesscharm.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botania:items/goddesscharm" + "layer0": "botania:items/charm_goddess" } } diff --git a/src/main/resources/assets/botania/models/item/grasshorn0.json b/src/main/resources/assets/botania/models/item/grasshorn0.json index 76c0c36e1..ba60472e7 100644 --- a/src/main/resources/assets/botania/models/item/grasshorn0.json +++ b/src/main/resources/assets/botania/models/item/grasshorn0.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/grasshorn0" + "layer0": "botania:items/horn_grass" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/grasshorn1.json b/src/main/resources/assets/botania/models/item/grasshorn1.json index 3974d69a6..c5a83d0af 100644 --- a/src/main/resources/assets/botania/models/item/grasshorn1.json +++ b/src/main/resources/assets/botania/models/item/grasshorn1.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/grasshorn1" + "layer0": "botania:items/horn_leaves" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/grasshorn2.json b/src/main/resources/assets/botania/models/item/grasshorn2.json index e0bf57177..55a41229c 100644 --- a/src/main/resources/assets/botania/models/item/grasshorn2.json +++ b/src/main/resources/assets/botania/models/item/grasshorn2.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/grasshorn2" + "layer0": "botania:items/horn_snow" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/gravityrod.json b/src/main/resources/assets/botania/models/item/gravityrod.json index 2ebd5fc85..c8d0b8661 100644 --- a/src/main/resources/assets/botania/models/item/gravityrod.json +++ b/src/main/resources/assets/botania/models/item/gravityrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/gravityrod" + "layer0": "botania:items/rod_gravity" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/holycloak.json b/src/main/resources/assets/botania/models/item/holycloak.json index 44e62373a..49828add9 100644 --- a/src/main/resources/assets/botania/models/item/holycloak.json +++ b/src/main/resources/assets/botania/models/item/holycloak.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/holycloak" + "layer0": "botania:items/cloak_holy" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/icependant.json b/src/main/resources/assets/botania/models/item/icependant.json index 8718b3f45..a7a3ac5c0 100644 --- a/src/main/resources/assets/botania/models/item/icependant.json +++ b/src/main/resources/assets/botania/models/item/icependant.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/icependant" + "layer0": "botania:items/pendant_ice" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/incensestick.json b/src/main/resources/assets/botania/models/item/incensestick.json index 20731f364..62d3b9fcd 100644 --- a/src/main/resources/assets/botania/models/item/incensestick.json +++ b/src/main/resources/assets/botania/models/item/incensestick.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/incensestick0", - "layer1": "botania:items/incensestick1" + "layer0": "botania:items/stick_incense", + "layer1": "botania:items/stick_incense_overlay" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infinitefruit.json b/src/main/resources/assets/botania/models/item/infinitefruit.json index 57ac5c8ff..f53acea76 100644 --- a/src/main/resources/assets/botania/models/item/infinitefruit.json +++ b/src/main/resources/assets/botania/models/item/infinitefruit.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/infinitefruit" + "layer0": "botania:items/relic_infinite_fruit" }, "overrides": [{ "predicate": { "botania:boot": 1 }, - "model": "botania:item/infinitefruitboot" + "model": "botania:item/dasboot" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/invisibilitycloak.json b/src/main/resources/assets/botania/models/item/invisibilitycloak.json index 02bf33b78..487f0a4b8 100644 --- a/src/main/resources/assets/botania/models/item/invisibilitycloak.json +++ b/src/main/resources/assets/botania/models/item/invisibilitycloak.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/invisibilitycloak" + "layer0": "botania:items/cloak_invisibility" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemfinder.json b/src/main/resources/assets/botania/models/item/itemfinder.json index fcfe858e4..43f9a6150 100644 --- a/src/main/resources/assets/botania/models/item/itemfinder.json +++ b/src/main/resources/assets/botania/models/item/itemfinder.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/itemfinder" + "layer0": "botania:items/headpiece_itemfinder" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/keepivy.json b/src/main/resources/assets/botania/models/item/keepivy.json index 523f6bb2b..7dda13b51 100644 --- a/src/main/resources/assets/botania/models/item/keepivy.json +++ b/src/main/resources/assets/botania/models/item/keepivy.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/keepivy" + "layer0": "botania:items/ivy_keep" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/kingkey.json b/src/main/resources/assets/botania/models/item/kingkey.json index edf697fc4..a887d4778 100644 --- a/src/main/resources/assets/botania/models/item/kingkey.json +++ b/src/main/resources/assets/botania/models/item/kingkey.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/kingkey" + "layer0": "botania:items/relic_king_key" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/knockbackbelt.json b/src/main/resources/assets/botania/models/item/knockbackbelt.json index 1747de2d7..5eea00b18 100644 --- a/src/main/resources/assets/botania/models/item/knockbackbelt.json +++ b/src/main/resources/assets/botania/models/item/knockbackbelt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/knockbackbelt" + "layer0": "botania:items/belt_knockback" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/laputashard.json b/src/main/resources/assets/botania/models/item/laputashard.json index 7c024d830..2a9f4ead9 100644 --- a/src/main/resources/assets/botania/models/item/laputashard.json +++ b/src/main/resources/assets/botania/models/item/laputashard.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/laputashard" + "layer0": "botania:items/shard_laputa" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lavapendant.json b/src/main/resources/assets/botania/models/item/lavapendant.json index dc9b7fb51..e2f3a69a9 100644 --- a/src/main/resources/assets/botania/models/item/lavapendant.json +++ b/src/main/resources/assets/botania/models/item/lavapendant.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lavapendant" + "layer0": "botania:items/pendant_lava" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lexicon_default.json b/src/main/resources/assets/botania/models/item/lexicon_default.json index 6758a056a..0d822dd2c 100644 --- a/src/main/resources/assets/botania/models/item/lexicon_default.json +++ b/src/main/resources/assets/botania/models/item/lexicon_default.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lexicon0" + "layer0": "botania:items/lexicon_default" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lexicon_elven.json b/src/main/resources/assets/botania/models/item/lexicon_elven.json index 5bf142c54..62213940d 100644 --- a/src/main/resources/assets/botania/models/item/lexicon_elven.json +++ b/src/main/resources/assets/botania/models/item/lexicon_elven.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lexicon1" + "layer0": "botania:items/lexicon_elven" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lifeessence.json b/src/main/resources/assets/botania/models/item/lifeessence.json index 5eb82d609..65181ef78 100644 --- a/src/main/resources/assets/botania/models/item/lifeessence.json +++ b/src/main/resources/assets/botania/models/item/lifeessence.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lifeessence" + "layer0": "botania:items/life_essence" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingroot.json b/src/main/resources/assets/botania/models/item/livingroot.json index ebc9bfdbd..d08b1da62 100644 --- a/src/main/resources/assets/botania/models/item/livingroot.json +++ b/src/main/resources/assets/botania/models/item/livingroot.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/root" + "layer0": "botania:items/root_living" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodbow.json b/src/main/resources/assets/botania/models/item/livingwoodbow.json index b7d548208..3df231cb1 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodbow.json +++ b/src/main/resources/assets/botania/models/item/livingwoodbow.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/livingwoodbow0" + "layer0": "botania:items/bow_livingwood" }, "display": { "thirdperson_righthand": { diff --git a/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_1.json b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_1.json index 16da6cd0e..17b3e9fc3 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_1.json @@ -1,6 +1,6 @@ { "parent": "botania:item/livingwoodbow", "textures": { - "layer0": "botania:items/livingwoodbow1" + "layer0": "botania:items/bow_livingwood_pulling_1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_2.json b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_2.json index d03705b2b..bb572143f 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_2.json @@ -1,6 +1,6 @@ { "parent": "botania:item/livingwoodbow", "textures": { - "layer0": "botania:items/livingwoodbow2" + "layer0": "botania:items/bow_livingwood_pulling_2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_3.json b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_3.json index 0b0665f93..09c51db68 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_3.json @@ -1,6 +1,6 @@ { "parent": "botania:item/livingwoodbow", "textures": { - "layer0": "botania:items/livingwoodbow3" + "layer0": "botania:items/bow_livingwood_pulling_3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodtwig.json b/src/main/resources/assets/botania/models/item/livingwoodtwig.json index db4b34fc3..71fd92b37 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodtwig.json +++ b/src/main/resources/assets/botania/models/item/livingwoodtwig.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/livingwoodtwig" + "layer0": "botania:items/twig_livingwood" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lokiring.json b/src/main/resources/assets/botania/models/item/lokiring.json index c25d5e3d9..56d0b3fcb 100644 --- a/src/main/resources/assets/botania/models/item/lokiring.json +++ b/src/main/resources/assets/botania/models/item/lokiring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lokiring" + "layer0": "botania:items/relic_ring_loki" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetring.json b/src/main/resources/assets/botania/models/item/magnetring.json index 196988b50..fdad2aa36 100644 --- a/src/main/resources/assets/botania/models/item/magnetring.json +++ b/src/main/resources/assets/botania/models/item/magnetring.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/magnetring1" + "layer0": "botania:items/ring_magnet_lesser" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/magnetringgreater.json b/src/main/resources/assets/botania/models/item/magnetringgreater.json index 18470ee10..71a44c0b7 100644 --- a/src/main/resources/assets/botania/models/item/magnetringgreater.json +++ b/src/main/resources/assets/botania/models/item/magnetringgreater.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/magnetringgreater1" + "layer0": "botania:items/ring_magnet_greater" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/magnetringgreateron.json b/src/main/resources/assets/botania/models/item/magnetringgreateron.json index 6417dfc96..d1d3b657c 100644 --- a/src/main/resources/assets/botania/models/item/magnetringgreateron.json +++ b/src/main/resources/assets/botania/models/item/magnetringgreateron.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/magnetringgreater0" + "layer0": "botania:items/ring_magnet_greater_activated" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetringon.json b/src/main/resources/assets/botania/models/item/magnetringon.json index 344481dd2..5fa959b85 100644 --- a/src/main/resources/assets/botania/models/item/magnetringon.json +++ b/src/main/resources/assets/botania/models/item/magnetringon.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/magnetring0" + "layer0": "botania:items/ring_magnet_lesser_activated" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle0.json b/src/main/resources/assets/botania/models/item/manabottle0.json index a2f440a46..b667b0314 100644 --- a/src/main/resources/assets/botania/models/item/manabottle0.json +++ b/src/main/resources/assets/botania/models/item/manabottle0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manabottle0" + "layer0": "botania:items/bottle_mana_0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle1.json b/src/main/resources/assets/botania/models/item/manabottle1.json index 198f565d9..a18c0a3f2 100644 --- a/src/main/resources/assets/botania/models/item/manabottle1.json +++ b/src/main/resources/assets/botania/models/item/manabottle1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manabottle1" + "layer0": "botania:items/bottle_mana_1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle2.json b/src/main/resources/assets/botania/models/item/manabottle2.json index 1912efabb..5f8bd5c48 100644 --- a/src/main/resources/assets/botania/models/item/manabottle2.json +++ b/src/main/resources/assets/botania/models/item/manabottle2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manabottle2" + "layer0": "botania:items/bottle_mana_2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle3.json b/src/main/resources/assets/botania/models/item/manabottle3.json index b65ab4339..d6ec42ede 100644 --- a/src/main/resources/assets/botania/models/item/manabottle3.json +++ b/src/main/resources/assets/botania/models/item/manabottle3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manabottle3" + "layer0": "botania:items/bottle_mana_3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle4.json b/src/main/resources/assets/botania/models/item/manabottle4.json index 1c62d4c74..8df651229 100644 --- a/src/main/resources/assets/botania/models/item/manabottle4.json +++ b/src/main/resources/assets/botania/models/item/manabottle4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manabottle4" + "layer0": "botania:items/bottle_mana_4" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle5.json b/src/main/resources/assets/botania/models/item/manabottle5.json index aa936e9ec..1de02d5db 100644 --- a/src/main/resources/assets/botania/models/item/manabottle5.json +++ b/src/main/resources/assets/botania/models/item/manabottle5.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manabottle5" + "layer0": "botania:items/bottle_mana_5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manacookie.json b/src/main/resources/assets/botania/models/item/manacookie.json index 8aea1098d..56b4d5e9c 100644 --- a/src/main/resources/assets/botania/models/item/manacookie.json +++ b/src/main/resources/assets/botania/models/item/manacookie.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manacookie" + "layer0": "botania:items/mana_cookie" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/manadiamond.json b/src/main/resources/assets/botania/models/item/manadiamond.json index d99e09175..597df2861 100644 --- a/src/main/resources/assets/botania/models/item/manadiamond.json +++ b/src/main/resources/assets/botania/models/item/manadiamond.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manadiamond" + "layer0": "botania:items/mana_diamond" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manadiamondchunk.json b/src/main/resources/assets/botania/models/item/manadiamondchunk.json index f73dfe965..ef37bea6a 100644 --- a/src/main/resources/assets/botania/models/item/manadiamondchunk.json +++ b/src/main/resources/assets/botania/models/item/manadiamondchunk.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manadiamondchunk" + "layer0": "botania:items/mana_diamond_chunk" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manainkwell.json b/src/main/resources/assets/botania/models/item/manainkwell.json index a97c1f31c..ad07c356b 100644 --- a/src/main/resources/assets/botania/models/item/manainkwell.json +++ b/src/main/resources/assets/botania/models/item/manainkwell.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manainkwell" + "layer0": "botania:items/mana_ink_well" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manamirror.json b/src/main/resources/assets/botania/models/item/manamirror.json index 14608ccec..eb3a186c2 100644 --- a/src/main/resources/assets/botania/models/item/manamirror.json +++ b/src/main/resources/assets/botania/models/item/manamirror.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manamirror0", - "layer1": "botania:items/manamirror1" + "layer0": "botania:items/mana_mirror", + "layer1": "botania:items/mana_mirror_overlay" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manapearl.json b/src/main/resources/assets/botania/models/item/manapearl.json index 0fc9a1254..dfe88bf01 100644 --- a/src/main/resources/assets/botania/models/item/manapearl.json +++ b/src/main/resources/assets/botania/models/item/manapearl.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manapearl" + "layer0": "botania:items/mana_pearl" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manapearlshard.json b/src/main/resources/assets/botania/models/item/manapearlshard.json index 31fd95546..715338847 100644 --- a/src/main/resources/assets/botania/models/item/manapearlshard.json +++ b/src/main/resources/assets/botania/models/item/manapearlshard.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manapearlshard" + "layer0": "botania:items/mana_pearl_shard" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manapowder.json b/src/main/resources/assets/botania/models/item/manapowder.json index 1740b510a..60bb3e760 100644 --- a/src/main/resources/assets/botania/models/item/manapowder.json +++ b/src/main/resources/assets/botania/models/item/manapowder.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manapowder" + "layer0": "botania:items/mana_powder" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaring.json b/src/main/resources/assets/botania/models/item/manaring.json index 0c5f78381..ec541dcea 100644 --- a/src/main/resources/assets/botania/models/item/manaring.json +++ b/src/main/resources/assets/botania/models/item/manaring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaring" + "layer0": "botania:items/ring_mana_lesser" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaringgreater.json b/src/main/resources/assets/botania/models/item/manaringgreater.json index 7e221456d..fc21a3fb7 100644 --- a/src/main/resources/assets/botania/models/item/manaringgreater.json +++ b/src/main/resources/assets/botania/models/item/manaringgreater.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaringgreater" + "layer0": "botania:items/ring_mana_greater" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteel.json b/src/main/resources/assets/botania/models/item/manasteel.json index 3858eb0d8..9b4895de4 100644 --- a/src/main/resources/assets/botania/models/item/manasteel.json +++ b/src/main/resources/assets/botania/models/item/manasteel.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manasteel" + "layer0": "botania:items/manasteel_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelaxe.json b/src/main/resources/assets/botania/models/item/manasteelaxe.json index 7da075ce2..80259eedd 100644 --- a/src/main/resources/assets/botania/models/item/manasteelaxe.json +++ b/src/main/resources/assets/botania/models/item/manasteelaxe.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/manasteelaxe" + "layer0": "botania:items/manasteel_axe" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelboots.json b/src/main/resources/assets/botania/models/item/manasteelboots.json index b8868aa99..32288b970 100644 --- a/src/main/resources/assets/botania/models/item/manasteelboots.json +++ b/src/main/resources/assets/botania/models/item/manasteelboots.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manasteelboots" + "layer0": "botania:items/manasteel_boots" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelchest.json b/src/main/resources/assets/botania/models/item/manasteelchest.json index 4eb327468..d47377565 100644 --- a/src/main/resources/assets/botania/models/item/manasteelchest.json +++ b/src/main/resources/assets/botania/models/item/manasteelchest.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manasteelchest" + "layer0": "botania:items/manasteel_chestplate" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelhelm.json b/src/main/resources/assets/botania/models/item/manasteelhelm.json index f013363fb..cee060af4 100644 --- a/src/main/resources/assets/botania/models/item/manasteelhelm.json +++ b/src/main/resources/assets/botania/models/item/manasteelhelm.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manasteelhelm" + "layer0": "botania:items/manasteel_helmet" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelhelmreveal.json b/src/main/resources/assets/botania/models/item/manasteelhelmreveal.json index 9ce034522..26575aab3 100644 --- a/src/main/resources/assets/botania/models/item/manasteelhelmreveal.json +++ b/src/main/resources/assets/botania/models/item/manasteelhelmreveal.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manasteelhelmreveal" + "layer0": "botania:items/manasteel_helmet_reveal" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteellegs.json b/src/main/resources/assets/botania/models/item/manasteellegs.json index f19521d3f..7c24c68d8 100644 --- a/src/main/resources/assets/botania/models/item/manasteellegs.json +++ b/src/main/resources/assets/botania/models/item/manasteellegs.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manasteellegs" + "layer0": "botania:items/manasteel_leggings" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelnugget.json b/src/main/resources/assets/botania/models/item/manasteelnugget.json index 51d8a8a2e..e5cffb3f9 100644 --- a/src/main/resources/assets/botania/models/item/manasteelnugget.json +++ b/src/main/resources/assets/botania/models/item/manasteelnugget.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manasteelnugget" + "layer0": "botania:items/manasteel_nugget" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelpick.json b/src/main/resources/assets/botania/models/item/manasteelpick.json index f65fbead8..7d80bacac 100644 --- a/src/main/resources/assets/botania/models/item/manasteelpick.json +++ b/src/main/resources/assets/botania/models/item/manasteelpick.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/manasteelpick" + "layer0": "botania:items/manasteel_pickaxe" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelshears.json b/src/main/resources/assets/botania/models/item/manasteelshears.json index 43ad3c08c..88c685c36 100644 --- a/src/main/resources/assets/botania/models/item/manasteelshears.json +++ b/src/main/resources/assets/botania/models/item/manasteelshears.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/manasteelshears" + "layer0": "botania:items/manasteel_shears" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelshovel.json b/src/main/resources/assets/botania/models/item/manasteelshovel.json index a3208cc0a..17b4272f3 100644 --- a/src/main/resources/assets/botania/models/item/manasteelshovel.json +++ b/src/main/resources/assets/botania/models/item/manasteelshovel.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/manasteelshovel" + "layer0": "botania:items/manasteel_shovel" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelsword.json b/src/main/resources/assets/botania/models/item/manasteelsword.json index a30b7e567..5d4444cc1 100644 --- a/src/main/resources/assets/botania/models/item/manasteelsword.json +++ b/src/main/resources/assets/botania/models/item/manasteelsword.json @@ -2,7 +2,7 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/manasteelsword" + "layer0": "botania:items/manasteel_sword" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/manastring.json b/src/main/resources/assets/botania/models/item/manastring.json index f63bb4bff..efe46c4f1 100644 --- a/src/main/resources/assets/botania/models/item/manastring.json +++ b/src/main/resources/assets/botania/models/item/manastring.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manastring" + "layer0": "botania:items/mana_string" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manatablet.json b/src/main/resources/assets/botania/models/item/manatablet.json index 4e9ea65be..cb2f41908 100644 --- a/src/main/resources/assets/botania/models/item/manatablet.json +++ b/src/main/resources/assets/botania/models/item/manatablet.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manatablet0", - "layer1": "botania:items/manatablet1" + "layer0": "botania:items/mana_tablet", + "layer1": "botania:items/mana_tablet_overlay" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveboots.json b/src/main/resources/assets/botania/models/item/manaweaveboots.json index 0be235782..9ab3a1bf7 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveboots.json +++ b/src/main/resources/assets/botania/models/item/manaweaveboots.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweaveboots" + "layer0": "botania:items/manaweave_boots" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/manaweavebootsholiday.json b/src/main/resources/assets/botania/models/item/manaweavebootsholiday.json index 23c552478..631d3f6c0 100644 --- a/src/main/resources/assets/botania/models/item/manaweavebootsholiday.json +++ b/src/main/resources/assets/botania/models/item/manaweavebootsholiday.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweavebootsholiday" + "layer0": "botania:items/manaweave_boots_holiday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweavechest.json b/src/main/resources/assets/botania/models/item/manaweavechest.json index cba5dce8f..202e9dd46 100644 --- a/src/main/resources/assets/botania/models/item/manaweavechest.json +++ b/src/main/resources/assets/botania/models/item/manaweavechest.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweavechest" + "layer0": "botania:items/manaweave_chestplate" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/manaweavechestholiday.json b/src/main/resources/assets/botania/models/item/manaweavechestholiday.json index 47041eb16..dc978854c 100644 --- a/src/main/resources/assets/botania/models/item/manaweavechestholiday.json +++ b/src/main/resources/assets/botania/models/item/manaweavechestholiday.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweavechestholiday" + "layer0": "botania:items/manaweave_chestplate_holiday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweavecloth.json b/src/main/resources/assets/botania/models/item/manaweavecloth.json index 116b8e720..ea40bd1b9 100644 --- a/src/main/resources/assets/botania/models/item/manaweavecloth.json +++ b/src/main/resources/assets/botania/models/item/manaweavecloth.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweavecloth" + "layer0": "botania:items/manaweave_cloth" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweavehelm.json b/src/main/resources/assets/botania/models/item/manaweavehelm.json index 82067fa44..07bf47907 100644 --- a/src/main/resources/assets/botania/models/item/manaweavehelm.json +++ b/src/main/resources/assets/botania/models/item/manaweavehelm.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweavehelm" + "layer0": "botania:items/manaweave_helmet" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/manaweavehelmholiday.json b/src/main/resources/assets/botania/models/item/manaweavehelmholiday.json index cd956073a..2b0628822 100644 --- a/src/main/resources/assets/botania/models/item/manaweavehelmholiday.json +++ b/src/main/resources/assets/botania/models/item/manaweavehelmholiday.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweavehelmholiday" + "layer0": "botania:items/manaweave_helmet_holiday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweavelegs.json b/src/main/resources/assets/botania/models/item/manaweavelegs.json index 196e1ccae..0e7cd1817 100644 --- a/src/main/resources/assets/botania/models/item/manaweavelegs.json +++ b/src/main/resources/assets/botania/models/item/manaweavelegs.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweavelegs" + "layer0": "botania:items/manaweave_leggings" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/manaweavelegsholiday.json b/src/main/resources/assets/botania/models/item/manaweavelegsholiday.json index 963ed0317..1816bb4dc 100644 --- a/src/main/resources/assets/botania/models/item/manaweavelegsholiday.json +++ b/src/main/resources/assets/botania/models/item/manaweavelegsholiday.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweavelegsholiday" + "layer0": "botania:items/manaweave_leggings_holiday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/miningring.json b/src/main/resources/assets/botania/models/item/miningring.json index cb9b1d6ec..0692723c7 100644 --- a/src/main/resources/assets/botania/models/item/miningring.json +++ b/src/main/resources/assets/botania/models/item/miningring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/miningring" + "layer0": "botania:items/ring_mine" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/missilerod.json b/src/main/resources/assets/botania/models/item/missilerod.json index 53e95312d..e28b41587 100644 --- a/src/main/resources/assets/botania/models/item/missilerod.json +++ b/src/main/resources/assets/botania/models/item/missilerod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/missilerod" + "layer0": "botania:items/rod_missile" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/monocle.json b/src/main/resources/assets/botania/models/item/monocle.json index ae2ad5129..5c1a5d258 100644 --- a/src/main/resources/assets/botania/models/item/monocle.json +++ b/src/main/resources/assets/botania/models/item/monocle.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/monocle" + "layer0": "botania:items/charm_monocle" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/obediencestick.json b/src/main/resources/assets/botania/models/item/obediencestick.json index d14b15526..789ca454f 100644 --- a/src/main/resources/assets/botania/models/item/obediencestick.json +++ b/src/main/resources/assets/botania/models/item/obediencestick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/obediencestick" + "layer0": "botania:items/stick_obedience" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/odinring.json b/src/main/resources/assets/botania/models/item/odinring.json index ea24049bf..185583587 100644 --- a/src/main/resources/assets/botania/models/item/odinring.json +++ b/src/main/resources/assets/botania/models/item/odinring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/odinring" + "layer0": "botania:items/relic_ring_odin" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/openbucket.json b/src/main/resources/assets/botania/models/item/openbucket.json index f3a464a67..2d11698c1 100644 --- a/src/main/resources/assets/botania/models/item/openbucket.json +++ b/src/main/resources/assets/botania/models/item/openbucket.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/openbucket" + "layer0": "botania:items/bucket_infinite" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/overgrowthseed.json b/src/main/resources/assets/botania/models/item/overgrowthseed.json index 0420e47e5..70c05027b 100644 --- a/src/main/resources/assets/botania/models/item/overgrowthseed.json +++ b/src/main/resources/assets/botania/models/item/overgrowthseed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/overgrowthseed" + "layer0": "botania:items/seed_overgrowth" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pestleandmortar.json b/src/main/resources/assets/botania/models/item/pestleandmortar.json index f8178b028..f97319415 100644 --- a/src/main/resources/assets/botania/models/item/pestleandmortar.json +++ b/src/main/resources/assets/botania/models/item/pestleandmortar.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/pestleandmortar" + "layer0": "botania:items/pestle_mortar" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/phantomink.json b/src/main/resources/assets/botania/models/item/phantomink.json index cf86da17c..a6a8c284d 100644 --- a/src/main/resources/assets/botania/models/item/phantomink.json +++ b/src/main/resources/assets/botania/models/item/phantomink.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/phantomink" + "layer0": "botania:items/phantom_ink" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixiedust.json b/src/main/resources/assets/botania/models/item/pixiedust.json index ea3a5a52d..a8ccc737a 100644 --- a/src/main/resources/assets/botania/models/item/pixiedust.json +++ b/src/main/resources/assets/botania/models/item/pixiedust.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/pixiedust" + "layer0": "botania:items/pixie_dust" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixiering.json b/src/main/resources/assets/botania/models/item/pixiering.json index 1c5dd604f..acd586947 100644 --- a/src/main/resources/assets/botania/models/item/pixiering.json +++ b/src/main/resources/assets/botania/models/item/pixiering.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/pixiering" + "layer0": "botania:items/ring_pixie" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/poolminecart.json b/src/main/resources/assets/botania/models/item/poolminecart.json index b10c67768..a04b35244 100644 --- a/src/main/resources/assets/botania/models/item/poolminecart.json +++ b/src/main/resources/assets/botania/models/item/poolminecart.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/poolminecart" + "layer0": "botania:items/minecart_pool" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz0.json b/src/main/resources/assets/botania/models/item/quartz0.json index 689b6cdf9..1ff96a655 100644 --- a/src/main/resources/assets/botania/models/item/quartz0.json +++ b/src/main/resources/assets/botania/models/item/quartz0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/quartz0" + "layer0": "botania:items/quartz_smokey" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz1.json b/src/main/resources/assets/botania/models/item/quartz1.json index e59a6acca..98f08df09 100644 --- a/src/main/resources/assets/botania/models/item/quartz1.json +++ b/src/main/resources/assets/botania/models/item/quartz1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/quartz1" + "layer0": "botania:items/quartz_mana" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz2.json b/src/main/resources/assets/botania/models/item/quartz2.json index 30d9c075a..5a1008d20 100644 --- a/src/main/resources/assets/botania/models/item/quartz2.json +++ b/src/main/resources/assets/botania/models/item/quartz2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/quartz2" + "layer0": "botania:items/quartz_blaze" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz3.json b/src/main/resources/assets/botania/models/item/quartz3.json index 6fbe138e6..9a7b7d4d2 100644 --- a/src/main/resources/assets/botania/models/item/quartz3.json +++ b/src/main/resources/assets/botania/models/item/quartz3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/quartz3" + "layer0": "botania:items/quartz_lavender" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz4.json b/src/main/resources/assets/botania/models/item/quartz4.json index 16b58d8df..45b386ef3 100644 --- a/src/main/resources/assets/botania/models/item/quartz4.json +++ b/src/main/resources/assets/botania/models/item/quartz4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/quartz4" + "layer0": "botania:items/quartz_red" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz5.json b/src/main/resources/assets/botania/models/item/quartz5.json index 2d3885d12..2cb086371 100644 --- a/src/main/resources/assets/botania/models/item/quartz5.json +++ b/src/main/resources/assets/botania/models/item/quartz5.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/quartz5" + "layer0": "botania:items/quartz_elven" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz6.json b/src/main/resources/assets/botania/models/item/quartz6.json index 4fbc29335..817baa062 100644 --- a/src/main/resources/assets/botania/models/item/quartz6.json +++ b/src/main/resources/assets/botania/models/item/quartz6.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/quartz6" + "layer0": "botania:items/quartz_sunny" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rainbowrod.json b/src/main/resources/assets/botania/models/item/rainbowrod.json index 77f64532a..d0c9bf9c0 100644 --- a/src/main/resources/assets/botania/models/item/rainbowrod.json +++ b/src/main/resources/assets/botania/models/item/rainbowrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/rainbowrod" + "layer0": "botania:items/rod_rainbow" } } diff --git a/src/main/resources/assets/botania/models/item/reachring.json b/src/main/resources/assets/botania/models/item/reachring.json index a39b29aba..b51204f83 100644 --- a/src/main/resources/assets/botania/models/item/reachring.json +++ b/src/main/resources/assets/botania/models/item/reachring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/reachring" + "layer0": "botania:items/ring_reach" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/recordgaia1.json b/src/main/resources/assets/botania/models/item/recordgaia1.json index 618a16bd4..476b307dd 100644 --- a/src/main/resources/assets/botania/models/item/recordgaia1.json +++ b/src/main/resources/assets/botania/models/item/recordgaia1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/recordgaia1" + "layer0": "botania:items/record_gaia_one" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/recordgaia2.json b/src/main/resources/assets/botania/models/item/recordgaia2.json index e77b42b1e..0fe0838b6 100644 --- a/src/main/resources/assets/botania/models/item/recordgaia2.json +++ b/src/main/resources/assets/botania/models/item/recordgaia2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/recordgaia2" + "layer0": "botania:items/record_gaia_two" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redstoneroot.json b/src/main/resources/assets/botania/models/item/redstoneroot.json index c73b57526..8a0dfcbfb 100644 --- a/src/main/resources/assets/botania/models/item/redstoneroot.json +++ b/src/main/resources/assets/botania/models/item/redstoneroot.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/redstoneroot" + "layer0": "botania:items/root_redstone" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redstring.json b/src/main/resources/assets/botania/models/item/redstring.json index dd27dab74..ac92a1670 100644 --- a/src/main/resources/assets/botania/models/item/redstring.json +++ b/src/main/resources/assets/botania/models/item/redstring.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/redstring" + "layer0": "botania:items/red_string" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/regenivy.json b/src/main/resources/assets/botania/models/item/regenivy.json deleted file mode 100644 index 2ce55277e..000000000 --- a/src/main/resources/assets/botania/models/item/regenivy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/regenivy" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sextant.json b/src/main/resources/assets/botania/models/item/sextant.json index 80c3d2644..38319a70c 100644 --- a/src/main/resources/assets/botania/models/item/sextant.json +++ b/src/main/resources/assets/botania/models/item/sextant.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/sextant" + "layer0": "botania:items/tool_sextant" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/skydirtrod.json b/src/main/resources/assets/botania/models/item/skydirtrod.json index 0bf96af7e..406457b97 100644 --- a/src/main/resources/assets/botania/models/item/skydirtrod.json +++ b/src/main/resources/assets/botania/models/item/skydirtrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/skydirtrod" + "layer0": "botania:items/rod_dirt_air" } } diff --git a/src/main/resources/assets/botania/models/item/slimebottle0.json b/src/main/resources/assets/botania/models/item/slimebottle0.json index dbd8110a0..4459b0cc5 100644 --- a/src/main/resources/assets/botania/models/item/slimebottle0.json +++ b/src/main/resources/assets/botania/models/item/slimebottle0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/slimebottle0" + "layer0": "botania:items/bottle_slime" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/slimebottle1.json b/src/main/resources/assets/botania/models/item/slimebottle1.json index 37adf68dc..52bd3d295 100644 --- a/src/main/resources/assets/botania/models/item/slimebottle1.json +++ b/src/main/resources/assets/botania/models/item/slimebottle1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/slimebottle1" + "layer0": "botania:items/bottle_slime_activated" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/smeltrod.json b/src/main/resources/assets/botania/models/item/smeltrod.json index 77d195188..61f3aef43 100644 --- a/src/main/resources/assets/botania/models/item/smeltrod.json +++ b/src/main/resources/assets/botania/models/item/smeltrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/smeltrod" + "layer0": "botania:items/rod_smelt" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spark.json b/src/main/resources/assets/botania/models/item/spark.json index 677a38a9c..1a8499161 100644 --- a/src/main/resources/assets/botania/models/item/spark.json +++ b/src/main/resources/assets/botania/models/item/spark.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/spark0" + "layer0": "botania:items/spark" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade0.json b/src/main/resources/assets/botania/models/item/sparkupgrade0.json index 7638ff08f..57612017e 100644 --- a/src/main/resources/assets/botania/models/item/sparkupgrade0.json +++ b/src/main/resources/assets/botania/models/item/sparkupgrade0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/sparkupgrade0" + "layer0": "botania:items/spark_upgrade_0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade1.json b/src/main/resources/assets/botania/models/item/sparkupgrade1.json index 06a7e57f4..00346d1d0 100644 --- a/src/main/resources/assets/botania/models/item/sparkupgrade1.json +++ b/src/main/resources/assets/botania/models/item/sparkupgrade1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/sparkupgrade1" + "layer0": "botania:items/spark_upgrade_1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade2.json b/src/main/resources/assets/botania/models/item/sparkupgrade2.json index 7fc9e2126..93680d8a1 100644 --- a/src/main/resources/assets/botania/models/item/sparkupgrade2.json +++ b/src/main/resources/assets/botania/models/item/sparkupgrade2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/sparkupgrade2" + "layer0": "botania:items/spark_upgrade_2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade3.json b/src/main/resources/assets/botania/models/item/sparkupgrade3.json index d67eb9369..d62bc6273 100644 --- a/src/main/resources/assets/botania/models/item/sparkupgrade3.json +++ b/src/main/resources/assets/botania/models/item/sparkupgrade3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/sparkupgrade3" + "layer0": "botania:items/spark_upgrade_3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spawnermover.json b/src/main/resources/assets/botania/models/item/spawnermover.json index e6c7f0641..7d7b88a3d 100644 --- a/src/main/resources/assets/botania/models/item/spawnermover.json +++ b/src/main/resources/assets/botania/models/item/spawnermover.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/spawnermover0" + "layer0": "botania:items/spawner_mover" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/spawnermoverfull.json b/src/main/resources/assets/botania/models/item/spawnermoverfull.json index 0f150c1e9..195cbc672 100644 --- a/src/main/resources/assets/botania/models/item/spawnermoverfull.json +++ b/src/main/resources/assets/botania/models/item/spawnermoverfull.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/spawnermover1" + "layer0": "botania:items/spawner_mover_full" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/speedupbelt.json b/src/main/resources/assets/botania/models/item/speedupbelt.json index 92e42f7d2..62cd17acd 100644 --- a/src/main/resources/assets/botania/models/item/speedupbelt.json +++ b/src/main/resources/assets/botania/models/item/speedupbelt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/speedupbelt" + "layer0": "botania:items/belt_speed" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spellcloth.json b/src/main/resources/assets/botania/models/item/spellcloth.json index f75fbb1ce..89c8b5e5f 100644 --- a/src/main/resources/assets/botania/models/item/spellcloth.json +++ b/src/main/resources/assets/botania/models/item/spellcloth.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/spellcloth" + "layer0": "botania:items/spell_cloth" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/starsword.json b/src/main/resources/assets/botania/models/item/starsword.json index 59b76ee90..4cc8a69bb 100644 --- a/src/main/resources/assets/botania/models/item/starsword.json +++ b/src/main/resources/assets/botania/models/item/starsword.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/starsword" + "layer0": "botania:items/sword_star" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/supercloudpendant.json b/src/main/resources/assets/botania/models/item/supercloudpendant.json index 34291650a..1cf849de3 100644 --- a/src/main/resources/assets/botania/models/item/supercloudpendant.json +++ b/src/main/resources/assets/botania/models/item/supercloudpendant.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botania:items/supercloudpendant" + "layer0": "botania:items/pendant_cloud_super" } } diff --git a/src/main/resources/assets/botania/models/item/superlavapendant.json b/src/main/resources/assets/botania/models/item/superlavapendant.json index 5bbe65acf..e39954ec2 100644 --- a/src/main/resources/assets/botania/models/item/superlavapendant.json +++ b/src/main/resources/assets/botania/models/item/superlavapendant.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/superlavapendant" + "layer0": "botania:items/pendant_lava_super" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/supertravelbelt.json b/src/main/resources/assets/botania/models/item/supertravelbelt.json index d1eef311c..bebaac127 100644 --- a/src/main/resources/assets/botania/models/item/supertravelbelt.json +++ b/src/main/resources/assets/botania/models/item/supertravelbelt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/supertravelbelt" + "layer0": "botania:items/belt_travel_super" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/swapring.json b/src/main/resources/assets/botania/models/item/swapring.json index 9ae99edcc..877fc3e6c 100644 --- a/src/main/resources/assets/botania/models/item/swapring.json +++ b/src/main/resources/assets/botania/models/item/swapring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/swapring" + "layer0": "botania:items/ring_swap" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/temperancestone0.json b/src/main/resources/assets/botania/models/item/temperancestone0.json index 860d81455..cbb7f505b 100644 --- a/src/main/resources/assets/botania/models/item/temperancestone0.json +++ b/src/main/resources/assets/botania/models/item/temperancestone0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/temperancestone0" + "layer0": "botania:items/stone_temperance" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/temperancestone1.json b/src/main/resources/assets/botania/models/item/temperancestone1.json index 4e7256080..8f2d27a7a 100644 --- a/src/main/resources/assets/botania/models/item/temperancestone1.json +++ b/src/main/resources/assets/botania/models/item/temperancestone1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/temperancestone1" + "layer0": "botania:items/stone_temperance_activated" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraaxe.json b/src/main/resources/assets/botania/models/item/terraaxe.json index 389cdc6e4..c3026258e 100644 --- a/src/main/resources/assets/botania/models/item/terraaxe.json +++ b/src/main/resources/assets/botania/models/item/terraaxe.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/terraaxe1" + "layer0": "botania:items/terrasteel_axe" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/terraaxeon.json b/src/main/resources/assets/botania/models/item/terraaxeon.json index 1058562bb..b76da571c 100644 --- a/src/main/resources/assets/botania/models/item/terraaxeon.json +++ b/src/main/resources/assets/botania/models/item/terraaxeon.json @@ -1,6 +1,6 @@ { "parent": "botania:item/terraaxe", "textures": { - "layer0": "botania:items/terraaxe0" + "layer0": "botania:items/terrasteel_axe_activated" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraformrod.json b/src/main/resources/assets/botania/models/item/terraformrod.json index 1ccea3f94..0e47a8842 100644 --- a/src/main/resources/assets/botania/models/item/terraformrod.json +++ b/src/main/resources/assets/botania/models/item/terraformrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/terraformrod" + "layer0": "botania:items/rod_terraform" } } diff --git a/src/main/resources/assets/botania/models/item/terrapick.json b/src/main/resources/assets/botania/models/item/terrapick.json index 3df18f803..9f59c66e0 100644 --- a/src/main/resources/assets/botania/models/item/terrapick.json +++ b/src/main/resources/assets/botania/models/item/terrapick.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/terrapick0" + "layer0": "botania:items/terrasteel_pickaxe" }, "overrides": [ { diff --git a/src/main/resources/assets/botania/models/item/terrapickenabled.json b/src/main/resources/assets/botania/models/item/terrapickenabled.json index de9cce431..6e29f1c7e 100644 --- a/src/main/resources/assets/botania/models/item/terrapickenabled.json +++ b/src/main/resources/assets/botania/models/item/terrapickenabled.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/terrapick0", - "layer1": "botania:items/terrapick1" + "layer0": "botania:items/terrasteel_pickaxe", + "layer1": "botania:items/terrasteel_pickaxe_overlay" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrapicktipped.json b/src/main/resources/assets/botania/models/item/terrapicktipped.json index 3623a8e31..e23995cf0 100644 --- a/src/main/resources/assets/botania/models/item/terrapicktipped.json +++ b/src/main/resources/assets/botania/models/item/terrapicktipped.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/terrapick2" + "layer0": "botania:items/terrasteel_pickaxe_tipped" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrapicktippedenabled.json b/src/main/resources/assets/botania/models/item/terrapicktippedenabled.json index 4665e1aa2..ce4484100 100644 --- a/src/main/resources/assets/botania/models/item/terrapicktippedenabled.json +++ b/src/main/resources/assets/botania/models/item/terrapicktippedenabled.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/terrapick2", - "layer1": "botania:items/terrapick1" + "layer0": "botania:items/terrasteel_pickaxe_tipped", + "layer1": "botania:items/terrasteel_pickaxe_overlay" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteel.json b/src/main/resources/assets/botania/models/item/terrasteel.json index 7612428d5..69e1b274c 100644 --- a/src/main/resources/assets/botania/models/item/terrasteel.json +++ b/src/main/resources/assets/botania/models/item/terrasteel.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/terrasteel" + "layer0": "botania:items/terrasteel_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelboots.json b/src/main/resources/assets/botania/models/item/terrasteelboots.json index 427bbb02a..7bd561ad7 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelboots.json +++ b/src/main/resources/assets/botania/models/item/terrasteelboots.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/terrasteelboots" + "layer0": "botania:items/terrasteel_boots" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelchest.json b/src/main/resources/assets/botania/models/item/terrasteelchest.json index a0fac2da6..d058aeb87 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelchest.json +++ b/src/main/resources/assets/botania/models/item/terrasteelchest.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/terrasteelchest" + "layer0": "botania:items/terrasteel_chestplate" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelhelm.json b/src/main/resources/assets/botania/models/item/terrasteelhelm.json index abbd803ab..1351bb608 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelhelm.json +++ b/src/main/resources/assets/botania/models/item/terrasteelhelm.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/terrasteelhelm" + "layer0": "botania:items/terrasteel_helmet" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelhelmreveal.json b/src/main/resources/assets/botania/models/item/terrasteelhelmreveal.json index 2dd1b6a1e..72cb31cd0 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelhelmreveal.json +++ b/src/main/resources/assets/botania/models/item/terrasteelhelmreveal.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/terrasteelhelmreveal" + "layer0": "botania:items/terrasteel_helmet_reveal" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteellegs.json b/src/main/resources/assets/botania/models/item/terrasteellegs.json index 94f7f3725..eaea92a7d 100644 --- a/src/main/resources/assets/botania/models/item/terrasteellegs.json +++ b/src/main/resources/assets/botania/models/item/terrasteellegs.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/terrasteellegs" + "layer0": "botania:items/terrasteel_leggings" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelnugget.json b/src/main/resources/assets/botania/models/item/terrasteelnugget.json index 678c1353f..f70aed327 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelnugget.json +++ b/src/main/resources/assets/botania/models/item/terrasteelnugget.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/terrasteelnugget" + "layer0": "botania:items/terrasteel_nugget" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasword.json b/src/main/resources/assets/botania/models/item/terrasword.json index e95fa3aab..8d1cc10e9 100644 --- a/src/main/resources/assets/botania/models/item/terrasword.json +++ b/src/main/resources/assets/botania/models/item/terrasword.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/terrasword" + "layer0": "botania:items/terrasteel_sword" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thorring.json b/src/main/resources/assets/botania/models/item/thorring.json index b887ce98a..bb61408f7 100644 --- a/src/main/resources/assets/botania/models/item/thorring.json +++ b/src/main/resources/assets/botania/models/item/thorring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/thorring" + "layer0": "botania:items/relic_ring_thor" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thundersword.json b/src/main/resources/assets/botania/models/item/thundersword.json index 7a149ee6e..5f84f5f1f 100644 --- a/src/main/resources/assets/botania/models/item/thundersword.json +++ b/src/main/resources/assets/botania/models/item/thundersword.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/thundersword" + "layer0": "botania:items/sword_thunder" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tinyplanet.json b/src/main/resources/assets/botania/models/item/tinyplanet.json index d0a8fcba1..f56f4fb94 100644 --- a/src/main/resources/assets/botania/models/item/tinyplanet.json +++ b/src/main/resources/assets/botania/models/item/tinyplanet.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/tinyplanet" + "layer0": "botania:items/charm_tiny_planet" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tornadorod.json b/src/main/resources/assets/botania/models/item/tornadorod.json index e8685173b..5f39cbf28 100644 --- a/src/main/resources/assets/botania/models/item/tornadorod.json +++ b/src/main/resources/assets/botania/models/item/tornadorod.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/tornadorod0" + "layer0": "botania:items/rod_tornado" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/tornadorod_flying.json b/src/main/resources/assets/botania/models/item/tornadorod_flying.json index bc3217080..9a6c574b9 100644 --- a/src/main/resources/assets/botania/models/item/tornadorod_flying.json +++ b/src/main/resources/assets/botania/models/item/tornadorod_flying.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/tornadorod1" + "layer0": "botania:items/rod_tornado_activated" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/totalbiscuit.json b/src/main/resources/assets/botania/models/item/totalbiscuit.json index a532dc9fd..aca92e9c5 100644 --- a/src/main/resources/assets/botania/models/item/totalbiscuit.json +++ b/src/main/resources/assets/botania/models/item/totalbiscuit.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/totalbiscuit" + "layer0": "botania:items/special_totalbiscuit" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/travelbelt.json b/src/main/resources/assets/botania/models/item/travelbelt.json index e9abfdb26..3f0be007d 100644 --- a/src/main/resources/assets/botania/models/item/travelbelt.json +++ b/src/main/resources/assets/botania/models/item/travelbelt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/travelbelt" + "layer0": "botania:items/belt_travel" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/twigwand.json b/src/main/resources/assets/botania/models/item/twigwand.json index da964e7cd..acfe29228 100644 --- a/src/main/resources/assets/botania/models/item/twigwand.json +++ b/src/main/resources/assets/botania/models/item/twigwand.json @@ -1,9 +1,9 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/twigwand0", - "layer1": "botania:items/twigwand1", - "layer2": "botania:items/twigwand2" + "layer0": "botania:items/wand_twig", + "layer1": "botania:items/wand_petal_top", + "layer2": "botania:items/wand_petal_bottom" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/twigwand_bind.json b/src/main/resources/assets/botania/models/item/twigwand_bind.json index 2353af5f1..f3f731e8a 100644 --- a/src/main/resources/assets/botania/models/item/twigwand_bind.json +++ b/src/main/resources/assets/botania/models/item/twigwand_bind.json @@ -1,9 +1,9 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/twigwand0", - "layer1": "botania:items/twigwand1", - "layer2": "botania:items/twigwand2", - "layer3": "botania:items/twigwand3" + "layer0": "botania:items/wand_twig", + "layer1": "botania:items/wand_petal_top", + "layer2": "botania:items/wand_petal_bottom", + "layer3": "botania:items/wand_bind" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/unholycloak.json b/src/main/resources/assets/botania/models/item/unholycloak.json index b8801b976..c774cf162 100644 --- a/src/main/resources/assets/botania/models/item/unholycloak.json +++ b/src/main/resources/assets/botania/models/item/unholycloak.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/unholycloak" + "layer0": "botania:items/cloak_unholy" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vineball.json b/src/main/resources/assets/botania/models/item/vineball.json index d1448ea5a..9ab1e1bd4 100644 --- a/src/main/resources/assets/botania/models/item/vineball.json +++ b/src/main/resources/assets/botania/models/item/vineball.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/vineball" + "layer0": "botania:items/vine_ball" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/virus0.json b/src/main/resources/assets/botania/models/item/virus0.json index 039a4e305..940d1ccc6 100644 --- a/src/main/resources/assets/botania/models/item/virus0.json +++ b/src/main/resources/assets/botania/models/item/virus0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/virus0" + "layer0": "botania:items/virus_zombie" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/virus1.json b/src/main/resources/assets/botania/models/item/virus1.json index 15359f35e..b3fd6f577 100644 --- a/src/main/resources/assets/botania/models/item/virus1.json +++ b/src/main/resources/assets/botania/models/item/virus1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/virus1" + "layer0": "botania:items/virus_skeleton" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vuvuzela.json b/src/main/resources/assets/botania/models/item/vuvuzela.json index 20f0310d8..bc9b756eb 100644 --- a/src/main/resources/assets/botania/models/item/vuvuzela.json +++ b/src/main/resources/assets/botania/models/item/vuvuzela.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/vuvuzela" + "layer0": "botania:items/special_vuvuzela" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterbowl.json b/src/main/resources/assets/botania/models/item/waterbowl.json new file mode 100644 index 000000000..1bcbb312f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/waterbowl.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/generated" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterring.json b/src/main/resources/assets/botania/models/item/waterring.json index 9ac0e18c6..796fa9d54 100644 --- a/src/main/resources/assets/botania/models/item/waterring.json +++ b/src/main/resources/assets/botania/models/item/waterring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/waterring" + "layer0": "botania:items/ring_swim" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterrod.json b/src/main/resources/assets/botania/models/item/waterrod.json index c63b4d931..33d3b2a36 100644 --- a/src/main/resources/assets/botania/models/item/waterrod.json +++ b/src/main/resources/assets/botania/models/item/waterrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/waterrod" + "layer0": "botania:items/rod_water" } } diff --git a/src/main/resources/assets/botania/models/item/worldseed.json b/src/main/resources/assets/botania/models/item/worldseed.json index 86a9a267e..edf1ac5c7 100644 --- a/src/main/resources/assets/botania/models/item/worldseed.json +++ b/src/main/resources/assets/botania/models/item/worldseed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/worldseed" + "layer0": "botania:items/seed_world" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/shader/mana_pool.frag b/src/main/resources/assets/botania/shader/mana_pool.frag index 349c626fc..1ed8a074b 100644 --- a/src/main/resources/assets/botania/shader/mana_pool.frag +++ b/src/main/resources/assets/botania/shader/mana_pool.frag @@ -8,7 +8,7 @@ void main() { vec4 color = texture2D(bgl_RenderedTexture, texcoord); float c = sin(time / 80.0 + sin(texcoord.x / 5 + (texcoord.y - cos(time / 300.0) * 0.25) / ((1 - sin(time / 200.0) / 10.0) * 5)) * sin(time / 600.0) * 1000) * 0.5 + 0.5; - float g = c * 0.2 + 0.1; - float b = 1 - c * 0.2 - 0.2; + float g = 1 - c * 0.2 - 0.2; + float b = 1 - c * 0.2; gl_FragColor = vec4(0, g, b, color.a); } \ No newline at end of file diff --git a/src/main/resources/assets/botania/shader/pylon_glow.frag b/src/main/resources/assets/botania/shader/pylon_glow.frag index bdcca8680..45a161283 100644 --- a/src/main/resources/assets/botania/shader/pylon_glow.frag +++ b/src/main/resources/assets/botania/shader/pylon_glow.frag @@ -12,8 +12,8 @@ void main() { for(int j = -3; j < 3; j++) color += texture2D(bgl_RenderedTexture, texcoord + vec2(j, i)); - float brightness = sin(time / 20.0) * 0.5 + 0.5 + 0.15; - float alpha = sin(time / 30.0) * 0.5 + 0.5 + 0.35; + float brightness = sin(time / 20.0) * 0.5 + 0.15; + float alpha = sin(time / 30.0) * 0.5 + 0.35; gl_FragColor = vec4((color * color * 0.0005 * brightness + texture2D(bgl_RenderedTexture, texcoord)).rgb, alpha * gl_Color.a); } diff --git a/src/main/resources/assets/botania/textures/blocks/agricarnation.png b/src/main/resources/assets/botania/textures/blocks/agricarnation.png index c118ef182..0ce462b0c 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/agricarnation.png and b/src/main/resources/assets/botania/textures/blocks/agricarnation.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/agricarnationchibi.png b/src/main/resources/assets/botania/textures/blocks/agricarnationchibi.png index d4257d99a..4723e397e 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/agricarnationchibi.png and b/src/main/resources/assets/botania/textures/blocks/agricarnationchibi.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alchemycatalyst0.png b/src/main/resources/assets/botania/textures/blocks/alchemycatalyst0.png index be6c65011..3419f515d 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/alchemycatalyst0.png and b/src/main/resources/assets/botania/textures/blocks/alchemycatalyst0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimportal0.png b/src/main/resources/assets/botania/textures/blocks/alfheimportal0.png index 4f55b2f7d..f1f4a97e7 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/alfheimportal0.png and b/src/main/resources/assets/botania/textures/blocks/alfheimportal0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimportal1.png b/src/main/resources/assets/botania/textures/blocks/alfheimportal1.png index 5cf70ffaa..81a7fd898 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/alfheimportal1.png and b/src/main/resources/assets/botania/textures/blocks/alfheimportal1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/arcanerose.png b/src/main/resources/assets/botania/textures/blocks/arcanerose.png index 15efb9c24..8fad9f734 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/arcanerose.png and b/src/main/resources/assets/botania/textures/blocks/arcanerose.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/bellethorn.png b/src/main/resources/assets/botania/textures/blocks/bellethorn.png index 533024d01..f51b86524 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/bellethorn.png and b/src/main/resources/assets/botania/textures/blocks/bellethorn.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/bellethornchibi.png b/src/main/resources/assets/botania/textures/blocks/bellethornchibi.png index fa61195a0..91f79e5c3 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/bellethornchibi.png and b/src/main/resources/assets/botania/textures/blocks/bellethornchibi.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crystalcube_base.png b/src/main/resources/assets/botania/textures/blocks/crystalcube_base.png new file mode 100644 index 000000000..ccad7575b Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crystalcube_base.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crystalcube_cloth.png b/src/main/resources/assets/botania/textures/blocks/crystalcube_cloth.png new file mode 100644 index 000000000..7474ee593 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crystalcube_cloth.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/crystalcube_cube.png b/src/main/resources/assets/botania/textures/blocks/crystalcube_cube.png new file mode 100644 index 000000000..4f13f0d66 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/crystalcube_cube.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/daffomill.png b/src/main/resources/assets/botania/textures/blocks/daffomill.png index 61266b990..e27926d7a 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/daffomill.png and b/src/main/resources/assets/botania/textures/blocks/daffomill.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/distributor0.png b/src/main/resources/assets/botania/textures/blocks/distributor0.png deleted file mode 100644 index 0beb5e5ea..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/distributor0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/distributor1.png b/src/main/resources/assets/botania/textures/blocks/distributor1.png deleted file mode 100644 index 103e7439c..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/distributor1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/dreadthorn.png b/src/main/resources/assets/botania/textures/blocks/dreadthorn.png index 222971438..9a74f779e 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/dreadthorn.png and b/src/main/resources/assets/botania/textures/blocks/dreadthorn.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/drum_0.png b/src/main/resources/assets/botania/textures/blocks/drum_0.png new file mode 100644 index 000000000..8c4fd239e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/drum_0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/drum_1.png b/src/main/resources/assets/botania/textures/blocks/drum_1.png new file mode 100644 index 000000000..b0cba976e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/drum_1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/drum_2.png b/src/main/resources/assets/botania/textures/blocks/drum_2.png new file mode 100644 index 000000000..757b5894e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/drum_2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/drum_3.png b/src/main/resources/assets/botania/textures/blocks/drum_3.png new file mode 100644 index 000000000..900ba12b1 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/drum_3.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/enchantedsoil0.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/enchantedsoil0.png.mcmeta index d440d2def..35c86731c 100644 --- a/src/main/resources/assets/botania/textures/blocks/enchantedsoil0.png.mcmeta +++ b/src/main/resources/assets/botania/textures/blocks/enchantedsoil0.png.mcmeta @@ -1,6 +1,7 @@ { "animation": { - "frametime": 40, + "frametime": 80, + "interpolate": true, "frames": [ 0, 1, diff --git a/src/main/resources/assets/botania/textures/blocks/enchantedsoil1.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/enchantedsoil1.png.mcmeta index 6d057dae6..2ea07a0d0 100644 --- a/src/main/resources/assets/botania/textures/blocks/enchantedsoil1.png.mcmeta +++ b/src/main/resources/assets/botania/textures/blocks/enchantedsoil1.png.mcmeta @@ -1,6 +1,7 @@ { "animation": { - "frametime": 40, + "frametime": 80, + "interpolate": true, "frames": [ 0, 1, diff --git a/src/main/resources/assets/botania/textures/blocks/endoflame.png b/src/main/resources/assets/botania/textures/blocks/endoflame.png index 4c006b4fb..b439d6cd2 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/endoflame.png and b/src/main/resources/assets/botania/textures/blocks/endoflame.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/exoflame.png b/src/main/resources/assets/botania/textures/blocks/exoflame.png index 50934de0f..f3e6d2f34 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/exoflame.png and b/src/main/resources/assets/botania/textures/blocks/exoflame.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/fallenkanade.png b/src/main/resources/assets/botania/textures/blocks/fallenkanade.png index b1ae10330..129ad6284 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/fallenkanade.png and b/src/main/resources/assets/botania/textures/blocks/fallenkanade.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/forestdrum0.png b/src/main/resources/assets/botania/textures/blocks/forestdrum0.png deleted file mode 100644 index a7883840e..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/forestdrum0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/forestdrum1.png b/src/main/resources/assets/botania/textures/blocks/forestdrum1.png deleted file mode 100644 index be2a5f154..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/forestdrum1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/forestdrum2.png b/src/main/resources/assets/botania/textures/blocks/forestdrum2.png deleted file mode 100644 index 3296ab30a..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/forestdrum2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/forestdrum3.png b/src/main/resources/assets/botania/textures/blocks/forestdrum3.png deleted file mode 100644 index a1647a527..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/forestdrum3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/forestdrum4.png b/src/main/resources/assets/botania/textures/blocks/forestdrum4.png deleted file mode 100644 index 3296ab30a..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/forestdrum4.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/forestdrum5.png b/src/main/resources/assets/botania/textures/blocks/forestdrum5.png deleted file mode 100644 index 2c81a005d..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/forestdrum5.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/foresteye0.png b/src/main/resources/assets/botania/textures/blocks/foresteye0.png index f790ef790..9cd5ab626 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/foresteye0.png and b/src/main/resources/assets/botania/textures/blocks/foresteye0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/foresteye1.png b/src/main/resources/assets/botania/textures/blocks/foresteye1.png index e4071486a..51ac3e615 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/foresteye1.png and b/src/main/resources/assets/botania/textures/blocks/foresteye1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/foresteye2.png b/src/main/resources/assets/botania/textures/blocks/foresteye2.png index f56a72c09..4461e1b7c 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/foresteye2.png and b/src/main/resources/assets/botania/textures/blocks/foresteye2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/foresteye2.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/foresteye2.png.mcmeta index ba4778917..688c7c130 100644 --- a/src/main/resources/assets/botania/textures/blocks/foresteye2.png.mcmeta +++ b/src/main/resources/assets/botania/textures/blocks/foresteye2.png.mcmeta @@ -1,5 +1,6 @@ { "animation": { + "frametime":2, "frames": [ { "index": 0, diff --git a/src/main/resources/assets/botania/textures/blocks/foresteye3.png b/src/main/resources/assets/botania/textures/blocks/foresteye3.png index f56a72c09..958b29840 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/foresteye3.png and b/src/main/resources/assets/botania/textures/blocks/foresteye3.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/foresteye3.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/foresteye3.png.mcmeta index 0564588e4..c64403479 100644 --- a/src/main/resources/assets/botania/textures/blocks/foresteye3.png.mcmeta +++ b/src/main/resources/assets/botania/textures/blocks/foresteye3.png.mcmeta @@ -1,9 +1,10 @@ { "animation": { + "frametime":2, "frames": [ { "index": 0, - "time": 10 + "time": 8 }, 1, 2, @@ -12,7 +13,7 @@ 5, { "index": 6, - "time": 30 + "time": 32 } ] } diff --git a/src/main/resources/assets/botania/textures/blocks/foresteye4.png b/src/main/resources/assets/botania/textures/blocks/foresteye4.png index f56a72c09..416276f6c 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/foresteye4.png and b/src/main/resources/assets/botania/textures/blocks/foresteye4.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/foresteye4.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/foresteye4.png.mcmeta index 78f0bfd6a..b2087ecf3 100644 --- a/src/main/resources/assets/botania/textures/blocks/foresteye4.png.mcmeta +++ b/src/main/resources/assets/botania/textures/blocks/foresteye4.png.mcmeta @@ -1,9 +1,10 @@ { "animation": { + "frametime":2, "frames": [ { "index": 0, - "time": 15 + "time": 16 }, 1, 2, @@ -12,7 +13,7 @@ 5, { "index": 6, - "time": 25 + "time": 24 } ] } diff --git a/src/main/resources/assets/botania/textures/blocks/foresteye5.png b/src/main/resources/assets/botania/textures/blocks/foresteye5.png index f56a72c09..b811a5a8c 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/foresteye5.png and b/src/main/resources/assets/botania/textures/blocks/foresteye5.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/foresteye5.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/foresteye5.png.mcmeta index 4ff0cfd54..2300f8983 100644 --- a/src/main/resources/assets/botania/textures/blocks/foresteye5.png.mcmeta +++ b/src/main/resources/assets/botania/textures/blocks/foresteye5.png.mcmeta @@ -1,9 +1,10 @@ { "animation": { + "frametime":2, "frames": [ { "index": 0, - "time": 5 + "time": 4 }, 1, 2, @@ -12,7 +13,7 @@ 5, { "index": 6, - "time": 35 + "time": 36 } ] } diff --git a/src/main/resources/assets/botania/textures/blocks/heiseidream.png b/src/main/resources/assets/botania/textures/blocks/heiseidream.png index 241c39227..e74ec2bf4 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/heiseidream.png and b/src/main/resources/assets/botania/textures/blocks/heiseidream.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/hopperhockchibi.png b/src/main/resources/assets/botania/textures/blocks/hopperhockchibi.png index ddf88ff36..a82bbd0eb 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/hopperhockchibi.png and b/src/main/resources/assets/botania/textures/blocks/hopperhockchibi.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightrelay0.png b/src/main/resources/assets/botania/textures/blocks/lightrelay0.png deleted file mode 100644 index 0e0a6d3a0..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/lightrelay0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightrelay1.png b/src/main/resources/assets/botania/textures/blocks/lightrelay1.png deleted file mode 100644 index 11e2d7a1e..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/lightrelay1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightrelay2.png b/src/main/resources/assets/botania/textures/blocks/lightrelay2.png deleted file mode 100644 index 2fd984202..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/lightrelay2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightrelay3.png b/src/main/resources/assets/botania/textures/blocks/lightrelay3.png deleted file mode 100644 index 8ec0ac54a..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/lightrelay3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightrelay4.png b/src/main/resources/assets/botania/textures/blocks/lightrelay4.png deleted file mode 100644 index 9a58157a0..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/lightrelay4.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightrelay5.png b/src/main/resources/assets/botania/textures/blocks/lightrelay5.png deleted file mode 100644 index c9f214428..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/lightrelay5.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightrelay6.png b/src/main/resources/assets/botania/textures/blocks/lightrelay6.png deleted file mode 100644 index 8790e7a6b..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/lightrelay6.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightrelay7.png b/src/main/resources/assets/botania/textures/blocks/lightrelay7.png deleted file mode 100644 index 233da1d60..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/lightrelay7.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/luminizer.png b/src/main/resources/assets/botania/textures/blocks/luminizer.png new file mode 100644 index 000000000..6f22e38b9 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/luminizer.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/luminizer_detector.png b/src/main/resources/assets/botania/textures/blocks/luminizer_detector.png new file mode 100644 index 000000000..0fb57dbad Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/luminizer_detector.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/luminizer_fork.png b/src/main/resources/assets/botania/textures/blocks/luminizer_fork.png new file mode 100644 index 000000000..42467b3d3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/luminizer_fork.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/luminizer_toggle.png b/src/main/resources/assets/botania/textures/blocks/luminizer_toggle.png new file mode 100644 index 000000000..9fc2f98b8 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/luminizer_toggle.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/mana_water.png b/src/main/resources/assets/botania/textures/blocks/mana_water.png new file mode 100644 index 000000000..2f7b6df9e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/mana_water.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/manawater.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/mana_water.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manawater.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/mana_water.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/manastar.png b/src/main/resources/assets/botania/textures/blocks/manastar.png index b5634d026..3d1f51751 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/manastar.png and b/src/main/resources/assets/botania/textures/blocks/manastar.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/manawater.png b/src/main/resources/assets/botania/textures/blocks/manawater.png deleted file mode 100644 index c7e90b073..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/manawater.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/pool_diluted.png b/src/main/resources/assets/botania/textures/blocks/pool_diluted.png new file mode 100644 index 000000000..57350df14 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/pool_diluted.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/pool_infinite.png b/src/main/resources/assets/botania/textures/blocks/pool_infinite.png new file mode 100644 index 000000000..36a8bd8e8 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/pool_infinite.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/prism0.png b/src/main/resources/assets/botania/textures/blocks/prism0.png index 44f488b7b..c5bcd85c7 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/prism0.png and b/src/main/resources/assets/botania/textures/blocks/prism0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/prism1.png b/src/main/resources/assets/botania/textures/blocks/prism1.png index 3acf98bdd..a429902f1 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/prism1.png and b/src/main/resources/assets/botania/textures/blocks/prism1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/pump0.png b/src/main/resources/assets/botania/textures/blocks/pump0.png deleted file mode 100644 index 84cf723e3..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/pump0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/pump1.png b/src/main/resources/assets/botania/textures/blocks/pump1.png deleted file mode 100644 index 5e27c9d07..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/pump1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/pump2.png b/src/main/resources/assets/botania/textures/blocks/pump2.png deleted file mode 100644 index 212dfc720..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/pump2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/pump3.png b/src/main/resources/assets/botania/textures/blocks/pump3.png deleted file mode 100644 index c8a5ce47b..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/pump3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/pump4.png b/src/main/resources/assets/botania/textures/blocks/pump4.png deleted file mode 100644 index 89df43d7d..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/pump4.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/pump_head_sheat.png b/src/main/resources/assets/botania/textures/blocks/pump_head_sheat.png new file mode 100644 index 000000000..54e50267e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/pump_head_sheat.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/pump_structure.png b/src/main/resources/assets/botania/textures/blocks/pump_structure.png new file mode 100644 index 000000000..39f24aae2 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/pump_structure.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/rafflowsia.png b/src/main/resources/assets/botania/textures/blocks/rafflowsia.png index ccc0e7e50..425182a69 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/rafflowsia.png and b/src/main/resources/assets/botania/textures/blocks/rafflowsia.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/rannuncarpus.png b/src/main/resources/assets/botania/textures/blocks/rannuncarpus.png index d37115abe..098a240fa 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/rannuncarpus.png and b/src/main/resources/assets/botania/textures/blocks/rannuncarpus.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/rannuncarpuschibi.png b/src/main/resources/assets/botania/textures/blocks/rannuncarpuschibi.png index 3892ab146..639603c11 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/rannuncarpuschibi.png and b/src/main/resources/assets/botania/textures/blocks/rannuncarpuschibi.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/redstringcomparator.png b/src/main/resources/assets/botania/textures/blocks/redstringcomparator.png index 018595f5a..f788005b1 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringcomparator.png and b/src/main/resources/assets/botania/textures/blocks/redstringcomparator.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/redstringcontainer.png b/src/main/resources/assets/botania/textures/blocks/redstringcontainer.png index 9c165ba2e..c258d5b74 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringcontainer.png and b/src/main/resources/assets/botania/textures/blocks/redstringcontainer.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/redstringrelay.png b/src/main/resources/assets/botania/textures/blocks/redstringrelay.png index cf456817b..00ca36782 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringrelay.png and b/src/main/resources/assets/botania/textures/blocks/redstringrelay.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/runealtar0.png b/src/main/resources/assets/botania/textures/blocks/runealtar0.png deleted file mode 100644 index f5012e364..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/runealtar0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/runealtar1.png b/src/main/resources/assets/botania/textures/blocks/runealtar1.png deleted file mode 100644 index 95085335c..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/runealtar1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/runealtar2.png b/src/main/resources/assets/botania/textures/blocks/runealtar2.png deleted file mode 100644 index 7e4c55475..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/runealtar2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/runic_altar_0.png b/src/main/resources/assets/botania/textures/blocks/runic_altar_0.png new file mode 100644 index 000000000..62243865e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/runic_altar_0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/runic_altar_1.png b/src/main/resources/assets/botania/textures/blocks/runic_altar_1.png new file mode 100644 index 000000000..7216d884e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/runic_altar_1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/runic_altar_2.png b/src/main/resources/assets/botania/textures/blocks/runic_altar_2.png new file mode 100644 index 000000000..059afeddb Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/runic_altar_2.png 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 new file mode 100644 index 000000000..a890bbd53 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_1.png b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_1.png new file mode 100644 index 000000000..15b165606 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_2.png b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_2.png new file mode 100644 index 000000000..0ea9b5596 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/sparkchanger0.png b/src/main/resources/assets/botania/textures/blocks/sparkchanger0.png deleted file mode 100644 index 9a16cc86f..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/sparkchanger0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/sparkchanger1.png b/src/main/resources/assets/botania/textures/blocks/sparkchanger1.png deleted file mode 100644 index 5ae01079e..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/sparkchanger1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/sparkchanger2.png b/src/main/resources/assets/botania/textures/blocks/sparkchanger2.png deleted file mode 100644 index 8e6173a14..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/sparkchanger2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/spectrolus.png b/src/main/resources/assets/botania/textures/blocks/spectrolus.png index 814620767..5f720a205 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/spectrolus.png and b/src/main/resources/assets/botania/textures/blocks/spectrolus.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/splitter.png b/src/main/resources/assets/botania/textures/blocks/splitter.png new file mode 100644 index 000000000..4293acfc4 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/splitter.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/starfield0.png b/src/main/resources/assets/botania/textures/blocks/starfield0.png index 056c33436..dde841def 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/starfield0.png and b/src/main/resources/assets/botania/textures/blocks/starfield0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/starfield1.png b/src/main/resources/assets/botania/textures/blocks/starfield1.png index 72a5ed85e..581971f30 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/starfield1.png and b/src/main/resources/assets/botania/textures/blocks/starfield1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/starfield2.png b/src/main/resources/assets/botania/textures/blocks/starfield2.png index 52d28798b..405f131bc 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/starfield2.png and b/src/main/resources/assets/botania/textures/blocks/starfield2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/terra_plate_0.png b/src/main/resources/assets/botania/textures/blocks/terra_plate_0.png new file mode 100644 index 000000000..5af25ecbe Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/terra_plate_0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/terra_plate_1.png b/src/main/resources/assets/botania/textures/blocks/terra_plate_1.png new file mode 100644 index 000000000..25fea22a9 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/terra_plate_1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/terra_plate_2.png b/src/main/resources/assets/botania/textures/blocks/terra_plate_2.png new file mode 100644 index 000000000..18fd1dc60 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/terra_plate_2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/terraplate0.png b/src/main/resources/assets/botania/textures/blocks/terraplate0.png deleted file mode 100644 index 52035fdf1..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/terraplate0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/terraplate1.png b/src/main/resources/assets/botania/textures/blocks/terraplate1.png deleted file mode 100644 index 145e73d29..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/terraplate1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/terraplate2.png b/src/main/resources/assets/botania/textures/blocks/terraplate2.png deleted file mode 100644 index 2bb1cd7d0..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/terraplate2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/thermalily.png b/src/main/resources/assets/botania/textures/blocks/thermalily.png index 85d6fdde9..4c0f559cd 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/thermalily.png and b/src/main/resources/assets/botania/textures/blocks/thermalily.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/tigerseye.png b/src/main/resources/assets/botania/textures/blocks/tigerseye.png index 7d957b298..257e9f958 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/tigerseye.png and b/src/main/resources/assets/botania/textures/blocks/tigerseye.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/tinyplanetblock.png b/src/main/resources/assets/botania/textures/blocks/tinyplanetblock.png index 12fde2302..25967fec5 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/tinyplanetblock.png and b/src/main/resources/assets/botania/textures/blocks/tinyplanetblock.png differ diff --git a/src/main/resources/assets/botania/textures/gui/baublebox.png b/src/main/resources/assets/botania/textures/gui/baublebox.png index 2220c4d8e..ffe463406 100644 Binary files a/src/main/resources/assets/botania/textures/gui/baublebox.png and b/src/main/resources/assets/botania/textures/gui/baublebox.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/devices.png b/src/main/resources/assets/botania/textures/gui/categories/devices.png index e95185fd1..67cf6cef2 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/devices.png and b/src/main/resources/assets/botania/textures/gui/categories/devices.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/mana.png b/src/main/resources/assets/botania/textures/gui/categories/mana.png index 43c0ad99d..0055c966d 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/mana.png and b/src/main/resources/assets/botania/textures/gui/categories/mana.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/misc.png b/src/main/resources/assets/botania/textures/gui/categories/misc.png index 263dba90f..68f77a04a 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/misc.png and b/src/main/resources/assets/botania/textures/gui/categories/misc.png differ diff --git a/src/main/resources/assets/botania/textures/items/astrolabe.png b/src/main/resources/assets/botania/textures/items/astrolabe.png deleted file mode 100644 index 7ddac474d..000000000 Binary files a/src/main/resources/assets/botania/textures/items/astrolabe.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/auraring.png b/src/main/resources/assets/botania/textures/items/auraring.png deleted file mode 100644 index 7f0d90ad8..000000000 Binary files a/src/main/resources/assets/botania/textures/items/auraring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/auraringgreater.png b/src/main/resources/assets/botania/textures/items/auraringgreater.png deleted file mode 100644 index 60538aeb2..000000000 Binary files a/src/main/resources/assets/botania/textures/items/auraringgreater.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/baublebox.png b/src/main/resources/assets/botania/textures/items/baublebox.png deleted file mode 100644 index 9b061d2e0..000000000 Binary files a/src/main/resources/assets/botania/textures/items/baublebox.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/knockbackbelt.png b/src/main/resources/assets/botania/textures/items/belt_knockback.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/knockbackbelt.png rename to src/main/resources/assets/botania/textures/items/belt_knockback.png diff --git a/src/main/resources/assets/botania/textures/items/speedupbelt.png b/src/main/resources/assets/botania/textures/items/belt_speed.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/speedupbelt.png rename to src/main/resources/assets/botania/textures/items/belt_speed.png diff --git a/src/main/resources/assets/botania/textures/items/travelbelt.png b/src/main/resources/assets/botania/textures/items/belt_travel.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/travelbelt.png rename to src/main/resources/assets/botania/textures/items/belt_travel.png diff --git a/src/main/resources/assets/botania/textures/items/supertravelbelt.png b/src/main/resources/assets/botania/textures/items/belt_travel_super.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/supertravelbelt.png rename to src/main/resources/assets/botania/textures/items/belt_travel_super.png diff --git a/src/main/resources/assets/botania/textures/items/black_lotus.png b/src/main/resources/assets/botania/textures/items/black_lotus.png new file mode 100644 index 000000000..77c20901f Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/black_lotus.png differ diff --git a/src/main/resources/assets/botania/textures/items/black_lotus_intense.png b/src/main/resources/assets/botania/textures/items/black_lotus_intense.png new file mode 100644 index 000000000..2dffd717c Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/black_lotus_intense.png differ diff --git a/src/main/resources/assets/botania/textures/items/blackholetalisman0.png b/src/main/resources/assets/botania/textures/items/blackholetalisman0.png deleted file mode 100644 index c6060ae38..000000000 Binary files a/src/main/resources/assets/botania/textures/items/blackholetalisman0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/blackholetalisman1.png b/src/main/resources/assets/botania/textures/items/blackholetalisman1.png deleted file mode 100644 index 919ac5122..000000000 Binary files a/src/main/resources/assets/botania/textures/items/blackholetalisman1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/blacklotus.png b/src/main/resources/assets/botania/textures/items/blacklotus.png deleted file mode 100644 index 9978cbc75..000000000 Binary files a/src/main/resources/assets/botania/textures/items/blacklotus.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/enderairbottle.png b/src/main/resources/assets/botania/textures/items/bottle_ender_air.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/enderairbottle.png rename to src/main/resources/assets/botania/textures/items/bottle_ender_air.png diff --git a/src/main/resources/assets/botania/textures/items/manabottle0.png b/src/main/resources/assets/botania/textures/items/bottle_mana_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manabottle0.png rename to src/main/resources/assets/botania/textures/items/bottle_mana_0.png diff --git a/src/main/resources/assets/botania/textures/items/manabottle1.png b/src/main/resources/assets/botania/textures/items/bottle_mana_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manabottle1.png rename to src/main/resources/assets/botania/textures/items/bottle_mana_1.png diff --git a/src/main/resources/assets/botania/textures/items/manabottle2.png b/src/main/resources/assets/botania/textures/items/bottle_mana_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manabottle2.png rename to src/main/resources/assets/botania/textures/items/bottle_mana_2.png diff --git a/src/main/resources/assets/botania/textures/items/manabottle3.png b/src/main/resources/assets/botania/textures/items/bottle_mana_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manabottle3.png rename to src/main/resources/assets/botania/textures/items/bottle_mana_3.png diff --git a/src/main/resources/assets/botania/textures/items/manabottle4.png b/src/main/resources/assets/botania/textures/items/bottle_mana_4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manabottle4.png rename to src/main/resources/assets/botania/textures/items/bottle_mana_4.png diff --git a/src/main/resources/assets/botania/textures/items/manabottle5.png b/src/main/resources/assets/botania/textures/items/bottle_mana_5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manabottle5.png rename to src/main/resources/assets/botania/textures/items/bottle_mana_5.png diff --git a/src/main/resources/assets/botania/textures/items/slimebottle0.png b/src/main/resources/assets/botania/textures/items/bottle_slime.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/slimebottle0.png rename to src/main/resources/assets/botania/textures/items/bottle_slime.png diff --git a/src/main/resources/assets/botania/textures/items/slimebottle1.png b/src/main/resources/assets/botania/textures/items/bottle_slime_activated.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/slimebottle1.png rename to src/main/resources/assets/botania/textures/items/bottle_slime_activated.png diff --git a/src/main/resources/assets/botania/textures/items/slimebottle1.png.mcmeta b/src/main/resources/assets/botania/textures/items/bottle_slime_activated.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/slimebottle1.png.mcmeta rename to src/main/resources/assets/botania/textures/items/bottle_slime_activated.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/crystalbow0.png b/src/main/resources/assets/botania/textures/items/bow_crystal.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalbow0.png rename to src/main/resources/assets/botania/textures/items/bow_crystal.png diff --git a/src/main/resources/assets/botania/textures/items/crystalbow1.png b/src/main/resources/assets/botania/textures/items/bow_crystal_pulling_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalbow1.png rename to src/main/resources/assets/botania/textures/items/bow_crystal_pulling_1.png diff --git a/src/main/resources/assets/botania/textures/items/crystalbow2.png b/src/main/resources/assets/botania/textures/items/bow_crystal_pulling_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalbow2.png rename to src/main/resources/assets/botania/textures/items/bow_crystal_pulling_2.png diff --git a/src/main/resources/assets/botania/textures/items/crystalbow3.png b/src/main/resources/assets/botania/textures/items/bow_crystal_pulling_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalbow3.png rename to src/main/resources/assets/botania/textures/items/bow_crystal_pulling_3.png diff --git a/src/main/resources/assets/botania/textures/items/crystalbow4.png b/src/main/resources/assets/botania/textures/items/bow_crystal_pulling_4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalbow4.png rename to src/main/resources/assets/botania/textures/items/bow_crystal_pulling_4.png diff --git a/src/main/resources/assets/botania/textures/items/crystalbow5.png b/src/main/resources/assets/botania/textures/items/bow_crystal_pulling_5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalbow5.png rename to src/main/resources/assets/botania/textures/items/bow_crystal_pulling_5.png diff --git a/src/main/resources/assets/botania/textures/items/livingwoodbow0.png b/src/main/resources/assets/botania/textures/items/bow_livingwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/livingwoodbow0.png rename to src/main/resources/assets/botania/textures/items/bow_livingwood.png diff --git a/src/main/resources/assets/botania/textures/items/livingwoodbow1.png b/src/main/resources/assets/botania/textures/items/bow_livingwood_pulling_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/livingwoodbow1.png rename to src/main/resources/assets/botania/textures/items/bow_livingwood_pulling_1.png diff --git a/src/main/resources/assets/botania/textures/items/livingwoodbow2.png b/src/main/resources/assets/botania/textures/items/bow_livingwood_pulling_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/livingwoodbow2.png rename to src/main/resources/assets/botania/textures/items/bow_livingwood_pulling_2.png diff --git a/src/main/resources/assets/botania/textures/items/livingwoodbow3.png b/src/main/resources/assets/botania/textures/items/bow_livingwood_pulling_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/livingwoodbow3.png rename to src/main/resources/assets/botania/textures/items/bow_livingwood_pulling_3.png diff --git a/src/main/resources/assets/botania/textures/items/openbucket.png b/src/main/resources/assets/botania/textures/items/bucket_infinite.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/openbucket.png rename to src/main/resources/assets/botania/textures/items/bucket_infinite.png diff --git a/src/main/resources/assets/botania/textures/items/cacophonium.png b/src/main/resources/assets/botania/textures/items/cacophonium.png index 4418b50cc..aeef70a51 100644 Binary files a/src/main/resources/assets/botania/textures/items/cacophonium.png and b/src/main/resources/assets/botania/textures/items/cacophonium.png differ diff --git a/src/main/resources/assets/botania/textures/items/divacharm.png b/src/main/resources/assets/botania/textures/items/charm_diva.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/divacharm.png rename to src/main/resources/assets/botania/textures/items/charm_diva.png diff --git a/src/main/resources/assets/botania/textures/items/charm_goddess.png b/src/main/resources/assets/botania/textures/items/charm_goddess.png new file mode 100644 index 000000000..ac55d4508 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/charm_goddess.png differ diff --git a/src/main/resources/assets/botania/textures/items/monocle.png b/src/main/resources/assets/botania/textures/items/charm_monocle.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/monocle.png rename to src/main/resources/assets/botania/textures/items/charm_monocle.png diff --git a/src/main/resources/assets/botania/textures/items/tinyplanet.png b/src/main/resources/assets/botania/textures/items/charm_tiny_planet.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/tinyplanet.png rename to src/main/resources/assets/botania/textures/items/charm_tiny_planet.png diff --git a/src/main/resources/assets/botania/textures/items/balancecloak.png b/src/main/resources/assets/botania/textures/items/cloak_balance.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/balancecloak.png rename to src/main/resources/assets/botania/textures/items/cloak_balance.png diff --git a/src/main/resources/assets/botania/textures/items/holycloak.png b/src/main/resources/assets/botania/textures/items/cloak_holy.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/holycloak.png rename to src/main/resources/assets/botania/textures/items/cloak_holy.png diff --git a/src/main/resources/assets/botania/textures/items/cloak_invisibility.png b/src/main/resources/assets/botania/textures/items/cloak_invisibility.png new file mode 100644 index 000000000..ab4ef7b56 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/cloak_invisibility.png differ diff --git a/src/main/resources/assets/botania/textures/items/cloak_unholy.png b/src/main/resources/assets/botania/textures/items/cloak_unholy.png new file mode 100644 index 000000000..053f5348f Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/cloak_unholy.png differ diff --git a/src/main/resources/assets/botania/textures/items/container_bauble_closed.png b/src/main/resources/assets/botania/textures/items/container_bauble_closed.png new file mode 100644 index 000000000..75e0bf063 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/container_bauble_closed.png differ diff --git a/src/main/resources/assets/botania/textures/items/container_bauble_open.png b/src/main/resources/assets/botania/textures/items/container_bauble_open.png new file mode 100644 index 000000000..4d4fbc513 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/container_bauble_open.png differ diff --git a/src/main/resources/assets/botania/textures/items/container_flower.png b/src/main/resources/assets/botania/textures/items/container_flower.png new file mode 100644 index 000000000..74633fbfa Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/container_flower.png differ diff --git a/src/main/resources/assets/botania/textures/items/corporeaspark0.png b/src/main/resources/assets/botania/textures/items/corporeaspark0.png deleted file mode 100644 index bdcf0b046..000000000 Binary files a/src/main/resources/assets/botania/textures/items/corporeaspark0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/corporeaspark1.png b/src/main/resources/assets/botania/textures/items/corporeaspark1.png deleted file mode 100644 index a0ba2ec22..000000000 Binary files a/src/main/resources/assets/botania/textures/items/corporeaspark1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/corporeaspark1.png.mcmeta b/src/main/resources/assets/botania/textures/items/corporeaspark1.png.mcmeta deleted file mode 100644 index a706817a6..000000000 --- a/src/main/resources/assets/botania/textures/items/corporeaspark1.png.mcmeta +++ /dev/null @@ -1,23 +0,0 @@ -{ - "animation": { - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 6, - 5, - 4, - 3, - 2, - 1, - 0 - ] - }, - "texture": { - "blur": true - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/items/corporeaspark2.png b/src/main/resources/assets/botania/textures/items/corporeaspark2.png deleted file mode 100644 index 22f6d981d..000000000 Binary files a/src/main/resources/assets/botania/textures/items/corporeaspark2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/corporeaspark3.png b/src/main/resources/assets/botania/textures/items/corporeaspark3.png deleted file mode 100644 index 2d8a638b6..000000000 Binary files a/src/main/resources/assets/botania/textures/items/corporeaspark3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/corporeaspark3.png.mcmeta b/src/main/resources/assets/botania/textures/items/corporeaspark3.png.mcmeta deleted file mode 100644 index a706817a6..000000000 --- a/src/main/resources/assets/botania/textures/items/corporeaspark3.png.mcmeta +++ /dev/null @@ -1,23 +0,0 @@ -{ - "animation": { - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 6, - 5, - 4, - 3, - 2, - 1, - 0 - ] - }, - "texture": { - "blur": true - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/items/corporeasparkstar.png b/src/main/resources/assets/botania/textures/items/corporeasparkstar.png deleted file mode 100644 index bed85d2fc..000000000 Binary files a/src/main/resources/assets/botania/textures/items/corporeasparkstar.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/dice.png b/src/main/resources/assets/botania/textures/items/dice.png index 8389796a9..18d8a19eb 100644 Binary files a/src/main/resources/assets/botania/textures/items/dice.png and b/src/main/resources/assets/botania/textures/items/dice.png differ diff --git a/src/main/resources/assets/botania/textures/items/dirtrod.png b/src/main/resources/assets/botania/textures/items/dirtrod.png deleted file mode 100644 index f33075064..000000000 Binary files a/src/main/resources/assets/botania/textures/items/dirtrod.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/dirtrod.png.mcmeta b/src/main/resources/assets/botania/textures/items/dirtrod.png.mcmeta deleted file mode 100644 index 16a9732b2..000000000 --- a/src/main/resources/assets/botania/textures/items/dirtrod.png.mcmeta +++ /dev/null @@ -1,15 +0,0 @@ -{ - "animation": { - "frames": [ - { - "index": 0, - "time": 25 - }, - 1, - 2, - 3, - 4, - 5 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/items/dodgering.png b/src/main/resources/assets/botania/textures/items/dodgering.png deleted file mode 100644 index 0c73c9efb..000000000 Binary files a/src/main/resources/assets/botania/textures/items/dodgering.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/dragonstone.png b/src/main/resources/assets/botania/textures/items/dragonstone.png index 06e7e5522..92cbb4184 100644 Binary files a/src/main/resources/assets/botania/textures/items/dragonstone.png and b/src/main/resources/assets/botania/textures/items/dragonstone.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium.png b/src/main/resources/assets/botania/textures/items/elementium.png deleted file mode 100644 index df755c5ed..000000000 Binary files a/src/main/resources/assets/botania/textures/items/elementium.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_axe.png b/src/main/resources/assets/botania/textures/items/elementium_axe.png new file mode 100644 index 000000000..c43a335d9 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/elementium_axe.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumboots.png b/src/main/resources/assets/botania/textures/items/elementium_boots.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumboots.png rename to src/main/resources/assets/botania/textures/items/elementium_boots.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumchest.png b/src/main/resources/assets/botania/textures/items/elementium_chestplate.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumchest.png rename to src/main/resources/assets/botania/textures/items/elementium_chestplate.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumhelm.png b/src/main/resources/assets/botania/textures/items/elementium_helmet.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumhelm.png rename to src/main/resources/assets/botania/textures/items/elementium_helmet.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumhelmreveal.png b/src/main/resources/assets/botania/textures/items/elementium_helmet_reveal.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumhelmreveal.png rename to src/main/resources/assets/botania/textures/items/elementium_helmet_reveal.png diff --git a/src/main/resources/assets/botania/textures/items/elementium_ingot.png b/src/main/resources/assets/botania/textures/items/elementium_ingot.png new file mode 100644 index 000000000..dfa0fdeda Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/elementium_ingot.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumlegs.png b/src/main/resources/assets/botania/textures/items/elementium_leggings.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumlegs.png rename to src/main/resources/assets/botania/textures/items/elementium_leggings.png diff --git a/src/main/resources/assets/botania/textures/items/elementium_nugget.png b/src/main/resources/assets/botania/textures/items/elementium_nugget.png new file mode 100644 index 000000000..96ada1c04 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/elementium_nugget.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_pickaxe.png b/src/main/resources/assets/botania/textures/items/elementium_pickaxe.png new file mode 100644 index 000000000..471236905 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/elementium_pickaxe.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_shears.png b/src/main/resources/assets/botania/textures/items/elementium_shears.png new file mode 100644 index 000000000..307b623ad Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/elementium_shears.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_shovel.png b/src/main/resources/assets/botania/textures/items/elementium_shovel.png new file mode 100644 index 000000000..e405d8a08 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/elementium_shovel.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementium_sword.png b/src/main/resources/assets/botania/textures/items/elementium_sword.png new file mode 100644 index 000000000..449e435b3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/elementium_sword.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumaxe.png b/src/main/resources/assets/botania/textures/items/elementiumaxe.png deleted file mode 100644 index a003136fa..000000000 Binary files a/src/main/resources/assets/botania/textures/items/elementiumaxe.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumnugget.png b/src/main/resources/assets/botania/textures/items/elementiumnugget.png deleted file mode 100644 index faf2360dd..000000000 Binary files a/src/main/resources/assets/botania/textures/items/elementiumnugget.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumpick.png b/src/main/resources/assets/botania/textures/items/elementiumpick.png deleted file mode 100644 index cee48229e..000000000 Binary files a/src/main/resources/assets/botania/textures/items/elementiumpick.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumshears.png b/src/main/resources/assets/botania/textures/items/elementiumshears.png deleted file mode 100644 index 1df3957c8..000000000 Binary files a/src/main/resources/assets/botania/textures/items/elementiumshears.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumshovel.png b/src/main/resources/assets/botania/textures/items/elementiumshovel.png deleted file mode 100644 index cf6a1a6ae..000000000 Binary files a/src/main/resources/assets/botania/textures/items/elementiumshovel.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumsword.png b/src/main/resources/assets/botania/textures/items/elementiumsword.png deleted file mode 100644 index 1b02b59d8..000000000 Binary files a/src/main/resources/assets/botania/textures/items/elementiumsword.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/elucidator.png b/src/main/resources/assets/botania/textures/items/elucidator.png deleted file mode 100644 index 177761383..000000000 Binary files a/src/main/resources/assets/botania/textures/items/elucidator.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/enderdagger0.png b/src/main/resources/assets/botania/textures/items/ender_dagger.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/enderdagger0.png rename to src/main/resources/assets/botania/textures/items/ender_dagger.png diff --git a/src/main/resources/assets/botania/textures/items/enderdagger1.png b/src/main/resources/assets/botania/textures/items/ender_dagger_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/enderdagger1.png rename to src/main/resources/assets/botania/textures/items/ender_dagger_overlay.png diff --git a/src/main/resources/assets/botania/textures/items/ender_hand.png b/src/main/resources/assets/botania/textures/items/ender_hand.png new file mode 100644 index 000000000..c75ea8e68 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ender_hand.png differ diff --git a/src/main/resources/assets/botania/textures/items/enderhand.png b/src/main/resources/assets/botania/textures/items/enderhand.png deleted file mode 100644 index a06d4abcb..000000000 Binary files a/src/main/resources/assets/botania/textures/items/enderhand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/exchangerod.png b/src/main/resources/assets/botania/textures/items/exchangerod.png deleted file mode 100644 index 64d312245..000000000 Binary files a/src/main/resources/assets/botania/textures/items/exchangerod.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/flighttiara0.png b/src/main/resources/assets/botania/textures/items/flighttiara0.png deleted file mode 100644 index 51f1f6fb8..000000000 Binary files a/src/main/resources/assets/botania/textures/items/flighttiara0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/fertilizer.png b/src/main/resources/assets/botania/textures/items/floral_fertilizer.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/fertilizer.png rename to src/main/resources/assets/botania/textures/items/floral_fertilizer.png diff --git a/src/main/resources/assets/botania/textures/items/flowerbag.png b/src/main/resources/assets/botania/textures/items/flowerbag.png deleted file mode 100644 index c8ec1494c..000000000 Binary files a/src/main/resources/assets/botania/textures/items/flowerbag.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/gaiahead.png b/src/main/resources/assets/botania/textures/items/gaia_head.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gaiahead.png rename to src/main/resources/assets/botania/textures/items/gaia_head.png diff --git a/src/main/resources/assets/botania/textures/items/gaiahead.png.mcmeta b/src/main/resources/assets/botania/textures/items/gaia_head.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/gaiahead.png.mcmeta rename to src/main/resources/assets/botania/textures/items/gaia_head.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/gaiaingot.png b/src/main/resources/assets/botania/textures/items/gaia_ingot.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gaiaingot.png rename to src/main/resources/assets/botania/textures/items/gaia_ingot.png diff --git a/src/main/resources/assets/botania/textures/items/glasspick.png b/src/main/resources/assets/botania/textures/items/glass_pickaxe.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/glasspick.png rename to src/main/resources/assets/botania/textures/items/glass_pickaxe.png diff --git a/src/main/resources/assets/botania/textures/items/goddesscharm.png b/src/main/resources/assets/botania/textures/items/goddesscharm.png deleted file mode 100644 index 0ea86def1..000000000 Binary files a/src/main/resources/assets/botania/textures/items/goddesscharm.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/grasshorn0.png b/src/main/resources/assets/botania/textures/items/grasshorn0.png deleted file mode 100644 index cbbdf18e3..000000000 Binary files a/src/main/resources/assets/botania/textures/items/grasshorn0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/grasshorn1.png b/src/main/resources/assets/botania/textures/items/grasshorn1.png deleted file mode 100644 index 104e2bcea..000000000 Binary files a/src/main/resources/assets/botania/textures/items/grasshorn1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/grasshorn2.png b/src/main/resources/assets/botania/textures/items/grasshorn2.png deleted file mode 100644 index 654d1308d..000000000 Binary files a/src/main/resources/assets/botania/textures/items/grasshorn2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/autocraftinghalo.png b/src/main/resources/assets/botania/textures/items/halo_autocrafting.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/autocraftinghalo.png rename to src/main/resources/assets/botania/textures/items/halo_autocrafting.png diff --git a/src/main/resources/assets/botania/textures/items/craftinghalo.png b/src/main/resources/assets/botania/textures/items/halo_crafting.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftinghalo.png rename to src/main/resources/assets/botania/textures/items/halo_crafting.png diff --git a/src/main/resources/assets/botania/textures/items/itemfinder.png b/src/main/resources/assets/botania/textures/items/headpiece_itemfinder.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/itemfinder.png rename to src/main/resources/assets/botania/textures/items/headpiece_itemfinder.png diff --git a/src/main/resources/assets/botania/textures/items/headpiece_tiara_flight.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_flight.png new file mode 100644 index 000000000..35baeaff4 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/headpiece_tiara_flight.png differ diff --git a/src/main/resources/assets/botania/textures/items/grasshorn.png b/src/main/resources/assets/botania/textures/items/horn_grass.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grasshorn.png rename to src/main/resources/assets/botania/textures/items/horn_grass.png diff --git a/src/main/resources/assets/botania/textures/items/horn_leaves.png b/src/main/resources/assets/botania/textures/items/horn_leaves.png new file mode 100644 index 000000000..d496de10d Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/horn_leaves.png differ diff --git a/src/main/resources/assets/botania/textures/items/horn_snow.png b/src/main/resources/assets/botania/textures/items/horn_snow.png new file mode 100644 index 000000000..796cdaf2f Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/horn_snow.png differ diff --git a/src/main/resources/assets/botania/textures/items/invisibilitycloak.png b/src/main/resources/assets/botania/textures/items/invisibilitycloak.png deleted file mode 100644 index d7b11de85..000000000 Binary files a/src/main/resources/assets/botania/textures/items/invisibilitycloak.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/ivy_keep.png b/src/main/resources/assets/botania/textures/items/ivy_keep.png new file mode 100644 index 000000000..e2f332f33 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ivy_keep.png differ diff --git a/src/main/resources/assets/botania/textures/items/ivy_regen.png b/src/main/resources/assets/botania/textures/items/ivy_regen.png new file mode 100644 index 000000000..00cc6d9e1 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ivy_regen.png differ diff --git a/src/main/resources/assets/botania/textures/items/keepivy.png b/src/main/resources/assets/botania/textures/items/keepivy.png deleted file mode 100644 index ac482f536..000000000 Binary files a/src/main/resources/assets/botania/textures/items/keepivy.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/kingkey.png b/src/main/resources/assets/botania/textures/items/kingkey.png deleted file mode 100644 index 5d30ed483..000000000 Binary files a/src/main/resources/assets/botania/textures/items/kingkey.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/laputashard.png b/src/main/resources/assets/botania/textures/items/laputashard.png deleted file mode 100644 index 036b39ff0..000000000 Binary files a/src/main/resources/assets/botania/textures/items/laputashard.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/lexicon0.png b/src/main/resources/assets/botania/textures/items/lexicon0.png deleted file mode 100644 index 7c0e8e380..000000000 Binary files a/src/main/resources/assets/botania/textures/items/lexicon0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/lexicon_default.png b/src/main/resources/assets/botania/textures/items/lexicon_default.png new file mode 100644 index 000000000..d92622df5 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/lexicon_default.png differ diff --git a/src/main/resources/assets/botania/textures/items/lexicon_elven.png b/src/main/resources/assets/botania/textures/items/lexicon_elven.png new file mode 100644 index 000000000..58c8b774d Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/lexicon_elven.png differ diff --git a/src/main/resources/assets/botania/textures/items/lifeessence.png b/src/main/resources/assets/botania/textures/items/life_essence.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lifeessence.png rename to src/main/resources/assets/botania/textures/items/life_essence.png diff --git a/src/main/resources/assets/botania/textures/items/livingwoodtwig.png b/src/main/resources/assets/botania/textures/items/livingwoodtwig.png deleted file mode 100644 index e27492a7c..000000000 Binary files a/src/main/resources/assets/botania/textures/items/livingwoodtwig.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/lokiring.png b/src/main/resources/assets/botania/textures/items/lokiring.png deleted file mode 100644 index 0233518be..000000000 Binary files a/src/main/resources/assets/botania/textures/items/lokiring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/magnetring0.png b/src/main/resources/assets/botania/textures/items/magnetring0.png deleted file mode 100644 index 2972c0a70..000000000 Binary files a/src/main/resources/assets/botania/textures/items/magnetring0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/magnetring1.png b/src/main/resources/assets/botania/textures/items/magnetring1.png deleted file mode 100644 index ea08e5fe3..000000000 Binary files a/src/main/resources/assets/botania/textures/items/magnetring1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/magnetringgreater0.png b/src/main/resources/assets/botania/textures/items/magnetringgreater0.png deleted file mode 100644 index 34b6a4690..000000000 Binary files a/src/main/resources/assets/botania/textures/items/magnetringgreater0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/magnetringgreater1.png b/src/main/resources/assets/botania/textures/items/magnetringgreater1.png deleted file mode 100644 index a6719193f..000000000 Binary files a/src/main/resources/assets/botania/textures/items/magnetringgreater1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/manacookie.png b/src/main/resources/assets/botania/textures/items/mana_cookie.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manacookie.png rename to src/main/resources/assets/botania/textures/items/mana_cookie.png diff --git a/src/main/resources/assets/botania/textures/items/mana_diamond.png b/src/main/resources/assets/botania/textures/items/mana_diamond.png new file mode 100644 index 000000000..718aa1cb5 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/mana_diamond.png differ diff --git a/src/main/resources/assets/botania/textures/items/mana_diamond_chunk.png b/src/main/resources/assets/botania/textures/items/mana_diamond_chunk.png new file mode 100644 index 000000000..2de996150 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/mana_diamond_chunk.png differ diff --git a/src/main/resources/assets/botania/textures/items/manainkwell.png b/src/main/resources/assets/botania/textures/items/mana_ink_well.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manainkwell.png rename to src/main/resources/assets/botania/textures/items/mana_ink_well.png diff --git a/src/main/resources/assets/botania/textures/items/manainkwell.png.mcmeta b/src/main/resources/assets/botania/textures/items/mana_ink_well.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/manainkwell.png.mcmeta rename to src/main/resources/assets/botania/textures/items/mana_ink_well.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/manamirror0.png b/src/main/resources/assets/botania/textures/items/mana_mirror.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manamirror0.png rename to src/main/resources/assets/botania/textures/items/mana_mirror.png diff --git a/src/main/resources/assets/botania/textures/items/manamirror1.png b/src/main/resources/assets/botania/textures/items/mana_mirror_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manamirror1.png rename to src/main/resources/assets/botania/textures/items/mana_mirror_overlay.png diff --git a/src/main/resources/assets/botania/textures/items/mana_pearl.png b/src/main/resources/assets/botania/textures/items/mana_pearl.png new file mode 100644 index 000000000..ed546ea75 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/mana_pearl.png differ diff --git a/src/main/resources/assets/botania/textures/items/mana_pearl_shard.png b/src/main/resources/assets/botania/textures/items/mana_pearl_shard.png new file mode 100644 index 000000000..2eecfff32 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/mana_pearl_shard.png differ diff --git a/src/main/resources/assets/botania/textures/items/manapowder.png b/src/main/resources/assets/botania/textures/items/mana_powder.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manapowder.png rename to src/main/resources/assets/botania/textures/items/mana_powder.png diff --git a/src/main/resources/assets/botania/textures/items/manastring.png b/src/main/resources/assets/botania/textures/items/mana_string.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manastring.png rename to src/main/resources/assets/botania/textures/items/mana_string.png diff --git a/src/main/resources/assets/botania/textures/items/mana_tablet.png b/src/main/resources/assets/botania/textures/items/mana_tablet.png new file mode 100644 index 000000000..730b2a708 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/mana_tablet.png differ diff --git a/src/main/resources/assets/botania/textures/items/mana_tablet_overlay.png b/src/main/resources/assets/botania/textures/items/mana_tablet_overlay.png new file mode 100644 index 000000000..58d2e4b68 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/mana_tablet_overlay.png differ diff --git a/src/main/resources/assets/botania/textures/items/manadiamond.png b/src/main/resources/assets/botania/textures/items/manadiamond.png deleted file mode 100644 index c6071959d..000000000 Binary files a/src/main/resources/assets/botania/textures/items/manadiamond.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/manapearl.png b/src/main/resources/assets/botania/textures/items/manapearl.png deleted file mode 100644 index 2f0167e6c..000000000 Binary files a/src/main/resources/assets/botania/textures/items/manapearl.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/manapetal.png b/src/main/resources/assets/botania/textures/items/manapetal.png deleted file mode 100644 index ce0dfe4cf..000000000 Binary files a/src/main/resources/assets/botania/textures/items/manapetal.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/manaring.png b/src/main/resources/assets/botania/textures/items/manaring.png deleted file mode 100644 index fd7aef293..000000000 Binary files a/src/main/resources/assets/botania/textures/items/manaring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/manaringgreater.png b/src/main/resources/assets/botania/textures/items/manaringgreater.png deleted file mode 100644 index c43a0901c..000000000 Binary files a/src/main/resources/assets/botania/textures/items/manaringgreater.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/manasteelaxe.png b/src/main/resources/assets/botania/textures/items/manasteel_axe.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelaxe.png rename to src/main/resources/assets/botania/textures/items/manasteel_axe.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelboots.png b/src/main/resources/assets/botania/textures/items/manasteel_boots.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelboots.png rename to src/main/resources/assets/botania/textures/items/manasteel_boots.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelchest.png b/src/main/resources/assets/botania/textures/items/manasteel_chestplate.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelchest.png rename to src/main/resources/assets/botania/textures/items/manasteel_chestplate.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelhelm.png b/src/main/resources/assets/botania/textures/items/manasteel_helmet.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelhelm.png rename to src/main/resources/assets/botania/textures/items/manasteel_helmet.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelhelmreveal.png b/src/main/resources/assets/botania/textures/items/manasteel_helmet_reveal.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelhelmreveal.png rename to src/main/resources/assets/botania/textures/items/manasteel_helmet_reveal.png diff --git a/src/main/resources/assets/botania/textures/items/manasteel.png b/src/main/resources/assets/botania/textures/items/manasteel_ingot.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteel.png rename to src/main/resources/assets/botania/textures/items/manasteel_ingot.png diff --git a/src/main/resources/assets/botania/textures/items/manasteellegs.png b/src/main/resources/assets/botania/textures/items/manasteel_leggings.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteellegs.png rename to src/main/resources/assets/botania/textures/items/manasteel_leggings.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelnugget.png b/src/main/resources/assets/botania/textures/items/manasteel_nugget.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelnugget.png rename to src/main/resources/assets/botania/textures/items/manasteel_nugget.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelpick.png b/src/main/resources/assets/botania/textures/items/manasteel_pickaxe.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelpick.png rename to src/main/resources/assets/botania/textures/items/manasteel_pickaxe.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelshears.png b/src/main/resources/assets/botania/textures/items/manasteel_shears.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelshears.png rename to src/main/resources/assets/botania/textures/items/manasteel_shears.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelshovel.png b/src/main/resources/assets/botania/textures/items/manasteel_shovel.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelshovel.png rename to src/main/resources/assets/botania/textures/items/manasteel_shovel.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelsword.png b/src/main/resources/assets/botania/textures/items/manasteel_sword.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelsword.png rename to src/main/resources/assets/botania/textures/items/manasteel_sword.png diff --git a/src/main/resources/assets/botania/textures/items/manatablet0.png b/src/main/resources/assets/botania/textures/items/manatablet0.png deleted file mode 100644 index 8bd402503..000000000 Binary files a/src/main/resources/assets/botania/textures/items/manatablet0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/manatablet1.png b/src/main/resources/assets/botania/textures/items/manatablet1.png deleted file mode 100644 index d4eb76899..000000000 Binary files a/src/main/resources/assets/botania/textures/items/manatablet1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/manaweaveboots.png b/src/main/resources/assets/botania/textures/items/manaweave_boots.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweaveboots.png rename to src/main/resources/assets/botania/textures/items/manaweave_boots.png diff --git a/src/main/resources/assets/botania/textures/items/manaweavebootsholiday.png b/src/main/resources/assets/botania/textures/items/manaweave_boots_holiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweavebootsholiday.png rename to src/main/resources/assets/botania/textures/items/manaweave_boots_holiday.png diff --git a/src/main/resources/assets/botania/textures/items/manaweavechest.png b/src/main/resources/assets/botania/textures/items/manaweave_chestplate.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweavechest.png rename to src/main/resources/assets/botania/textures/items/manaweave_chestplate.png diff --git a/src/main/resources/assets/botania/textures/items/manaweavechestholiday.png b/src/main/resources/assets/botania/textures/items/manaweave_chestplate_holiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweavechestholiday.png rename to src/main/resources/assets/botania/textures/items/manaweave_chestplate_holiday.png diff --git a/src/main/resources/assets/botania/textures/items/manaweavecloth.png b/src/main/resources/assets/botania/textures/items/manaweave_cloth.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweavecloth.png rename to src/main/resources/assets/botania/textures/items/manaweave_cloth.png diff --git a/src/main/resources/assets/botania/textures/items/manaweavehelm.png b/src/main/resources/assets/botania/textures/items/manaweave_helmet.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweavehelm.png rename to src/main/resources/assets/botania/textures/items/manaweave_helmet.png diff --git a/src/main/resources/assets/botania/textures/items/manaweavehelmholiday.png b/src/main/resources/assets/botania/textures/items/manaweave_helmet_holiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweavehelmholiday.png rename to src/main/resources/assets/botania/textures/items/manaweave_helmet_holiday.png diff --git a/src/main/resources/assets/botania/textures/items/manaweavelegs.png b/src/main/resources/assets/botania/textures/items/manaweave_leggings.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweavelegs.png rename to src/main/resources/assets/botania/textures/items/manaweave_leggings.png diff --git a/src/main/resources/assets/botania/textures/items/manaweavelegsholiday.png b/src/main/resources/assets/botania/textures/items/manaweave_legings_holiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweavelegsholiday.png rename to src/main/resources/assets/botania/textures/items/manaweave_legings_holiday.png diff --git a/src/main/resources/assets/botania/textures/items/poolminecart.png b/src/main/resources/assets/botania/textures/items/minecart_pool.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/poolminecart.png rename to src/main/resources/assets/botania/textures/items/minecart_pool.png diff --git a/src/main/resources/assets/botania/textures/items/miningring.png b/src/main/resources/assets/botania/textures/items/miningring.png deleted file mode 100644 index f501e0f09..000000000 Binary files a/src/main/resources/assets/botania/textures/items/miningring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/nerfbat.png b/src/main/resources/assets/botania/textures/items/nerfbat.png deleted file mode 100644 index f556c00e9..000000000 Binary files a/src/main/resources/assets/botania/textures/items/nerfbat.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/obediencestick.png b/src/main/resources/assets/botania/textures/items/obediencestick.png deleted file mode 100644 index ecb16efc3..000000000 Binary files a/src/main/resources/assets/botania/textures/items/obediencestick.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/odinring.png b/src/main/resources/assets/botania/textures/items/odinring.png deleted file mode 100644 index 579331611..000000000 Binary files a/src/main/resources/assets/botania/textures/items/odinring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/overgrowthseed.png b/src/main/resources/assets/botania/textures/items/overgrowthseed.png deleted file mode 100644 index c2c04c55d..000000000 Binary files a/src/main/resources/assets/botania/textures/items/overgrowthseed.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/bloodpendant0.png b/src/main/resources/assets/botania/textures/items/pendant_blood.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/bloodpendant0.png rename to src/main/resources/assets/botania/textures/items/pendant_blood.png diff --git a/src/main/resources/assets/botania/textures/items/bloodpendant3.png b/src/main/resources/assets/botania/textures/items/pendant_blood_gem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/bloodpendant3.png rename to src/main/resources/assets/botania/textures/items/pendant_blood_gem.png diff --git a/src/main/resources/assets/botania/textures/items/bloodpendant1.png b/src/main/resources/assets/botania/textures/items/pendant_blood_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/bloodpendant1.png rename to src/main/resources/assets/botania/textures/items/pendant_blood_overlay.png diff --git a/src/main/resources/assets/botania/textures/items/bloodpendant2.png b/src/main/resources/assets/botania/textures/items/pendant_blood_support.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/bloodpendant2.png rename to src/main/resources/assets/botania/textures/items/pendant_blood_support.png diff --git a/src/main/resources/assets/botania/textures/items/cloudpendant.png b/src/main/resources/assets/botania/textures/items/pendant_cloud.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/cloudpendant.png rename to src/main/resources/assets/botania/textures/items/pendant_cloud.png diff --git a/src/main/resources/assets/botania/textures/items/cloudpendantgem.png b/src/main/resources/assets/botania/textures/items/pendant_cloud_gem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/cloudpendantgem.png rename to src/main/resources/assets/botania/textures/items/pendant_cloud_gem.png diff --git a/src/main/resources/assets/botania/textures/items/supercloudpendant.png b/src/main/resources/assets/botania/textures/items/pendant_cloud_super.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/supercloudpendant.png rename to src/main/resources/assets/botania/textures/items/pendant_cloud_super.png diff --git a/src/main/resources/assets/botania/textures/items/supercloudpendantgem.png b/src/main/resources/assets/botania/textures/items/pendant_cloud_super_gem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/supercloudpendantgem.png rename to src/main/resources/assets/botania/textures/items/pendant_cloud_super_gem.png diff --git a/src/main/resources/assets/botania/textures/items/icependant.png b/src/main/resources/assets/botania/textures/items/pendant_ice.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/icependant.png rename to src/main/resources/assets/botania/textures/items/pendant_ice.png diff --git a/src/main/resources/assets/botania/textures/items/icependantgem.png b/src/main/resources/assets/botania/textures/items/pendant_ice_gem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/icependantgem.png rename to src/main/resources/assets/botania/textures/items/pendant_ice_gem.png diff --git a/src/main/resources/assets/botania/textures/items/lavapendant.png b/src/main/resources/assets/botania/textures/items/pendant_lava.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lavapendant.png rename to src/main/resources/assets/botania/textures/items/pendant_lava.png diff --git a/src/main/resources/assets/botania/textures/items/lavapendantgem.png b/src/main/resources/assets/botania/textures/items/pendant_lava_gem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lavapendantgem.png rename to src/main/resources/assets/botania/textures/items/pendant_lava_gem.png diff --git a/src/main/resources/assets/botania/textures/items/superlavapendant.png b/src/main/resources/assets/botania/textures/items/pendant_lava_super.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/superlavapendant.png rename to src/main/resources/assets/botania/textures/items/pendant_lava_super.png diff --git a/src/main/resources/assets/botania/textures/items/superlavapendantgem.png b/src/main/resources/assets/botania/textures/items/pendant_lava_super_gem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/superlavapendantgem.png rename to src/main/resources/assets/botania/textures/items/pendant_lava_super_gem.png diff --git a/src/main/resources/assets/botania/textures/items/pestleandmortar.png b/src/main/resources/assets/botania/textures/items/pestle_mortar.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/pestleandmortar.png rename to src/main/resources/assets/botania/textures/items/pestle_mortar.png diff --git a/src/main/resources/assets/botania/textures/items/phantomink.png b/src/main/resources/assets/botania/textures/items/phantom_ink.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/phantomink.png rename to src/main/resources/assets/botania/textures/items/phantom_ink.png diff --git a/src/main/resources/assets/botania/textures/items/pinkinator.png b/src/main/resources/assets/botania/textures/items/pinkinator.png index b8c81a9d3..f84e38947 100644 Binary files a/src/main/resources/assets/botania/textures/items/pinkinator.png and b/src/main/resources/assets/botania/textures/items/pinkinator.png differ diff --git a/src/main/resources/assets/botania/textures/items/pixie_dust.png b/src/main/resources/assets/botania/textures/items/pixie_dust.png new file mode 100644 index 000000000..c1b7ed947 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/pixie_dust.png differ diff --git a/src/main/resources/assets/botania/textures/items/pixiedust.png b/src/main/resources/assets/botania/textures/items/pixiedust.png deleted file mode 100644 index e037e736e..000000000 Binary files a/src/main/resources/assets/botania/textures/items/pixiedust.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/pixiering.png b/src/main/resources/assets/botania/textures/items/pixiering.png deleted file mode 100644 index fcfc198b3..000000000 Binary files a/src/main/resources/assets/botania/textures/items/pixiering.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/quartz2.png b/src/main/resources/assets/botania/textures/items/quartz_blaze.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/quartz2.png rename to src/main/resources/assets/botania/textures/items/quartz_blaze.png diff --git a/src/main/resources/assets/botania/textures/items/quartz5.png b/src/main/resources/assets/botania/textures/items/quartz_elven.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/quartz5.png rename to src/main/resources/assets/botania/textures/items/quartz_elven.png diff --git a/src/main/resources/assets/botania/textures/items/quartz3.png b/src/main/resources/assets/botania/textures/items/quartz_lavender.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/quartz3.png rename to src/main/resources/assets/botania/textures/items/quartz_lavender.png diff --git a/src/main/resources/assets/botania/textures/items/quartz1.png b/src/main/resources/assets/botania/textures/items/quartz_mana.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/quartz1.png rename to src/main/resources/assets/botania/textures/items/quartz_mana.png diff --git a/src/main/resources/assets/botania/textures/items/quartz4.png b/src/main/resources/assets/botania/textures/items/quartz_red.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/quartz4.png rename to src/main/resources/assets/botania/textures/items/quartz_red.png diff --git a/src/main/resources/assets/botania/textures/items/quartz0.png b/src/main/resources/assets/botania/textures/items/quartz_smokey.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/quartz0.png rename to src/main/resources/assets/botania/textures/items/quartz_smokey.png diff --git a/src/main/resources/assets/botania/textures/items/quartz6.png b/src/main/resources/assets/botania/textures/items/quartz_sunny.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/quartz6.png rename to src/main/resources/assets/botania/textures/items/quartz_sunny.png diff --git a/src/main/resources/assets/botania/textures/items/reachring.png b/src/main/resources/assets/botania/textures/items/reachring.png deleted file mode 100644 index 7300b7297..000000000 Binary files a/src/main/resources/assets/botania/textures/items/reachring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/recordgaia1.png b/src/main/resources/assets/botania/textures/items/record_gaia_one.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/recordgaia1.png rename to src/main/resources/assets/botania/textures/items/record_gaia_one.png diff --git a/src/main/resources/assets/botania/textures/items/recordgaia2.png b/src/main/resources/assets/botania/textures/items/record_gaia_two.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/recordgaia2.png rename to src/main/resources/assets/botania/textures/items/record_gaia_two.png diff --git a/src/main/resources/assets/botania/textures/items/red_string.png b/src/main/resources/assets/botania/textures/items/red_string.png new file mode 100644 index 000000000..b2089b1cf Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/red_string.png differ diff --git a/src/main/resources/assets/botania/textures/items/redstring.png b/src/main/resources/assets/botania/textures/items/redstring.png deleted file mode 100644 index ee48596b7..000000000 Binary files a/src/main/resources/assets/botania/textures/items/redstring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/regenivy.png b/src/main/resources/assets/botania/textures/items/regenivy.png deleted file mode 100644 index 3987067f8..000000000 Binary files a/src/main/resources/assets/botania/textures/items/regenivy.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/flugeleye.png b/src/main/resources/assets/botania/textures/items/relic_flugel_eye.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flugeleye.png rename to src/main/resources/assets/botania/textures/items/relic_flugel_eye.png diff --git a/src/main/resources/assets/botania/textures/items/infinitefruit.png b/src/main/resources/assets/botania/textures/items/relic_infinite_fruit.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/infinitefruit.png rename to src/main/resources/assets/botania/textures/items/relic_infinite_fruit.png diff --git a/src/main/resources/assets/botania/textures/items/relic_king_key.png b/src/main/resources/assets/botania/textures/items/relic_king_key.png new file mode 100644 index 000000000..575f8f9bf Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/relic_king_key.png differ diff --git a/src/main/resources/assets/botania/textures/items/relic_ring_loki.png b/src/main/resources/assets/botania/textures/items/relic_ring_loki.png new file mode 100644 index 000000000..3efd7f4c8 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/relic_ring_loki.png differ diff --git a/src/main/resources/assets/botania/textures/items/relic_ring_odin.png b/src/main/resources/assets/botania/textures/items/relic_ring_odin.png new file mode 100644 index 000000000..7a7a3d557 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/relic_ring_odin.png differ diff --git a/src/main/resources/assets/botania/textures/items/relic_ring_thor.png b/src/main/resources/assets/botania/textures/items/relic_ring_thor.png new file mode 100644 index 000000000..2deefa289 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/relic_ring_thor.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_aura_greater.png b/src/main/resources/assets/botania/textures/items/ring_aura_greater.png new file mode 100644 index 000000000..009e9550e Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_aura_greater.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_aura_lesser.png b/src/main/resources/assets/botania/textures/items/ring_aura_lesser.png new file mode 100644 index 000000000..8728fc03a Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_aura_lesser.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_dodge.png b/src/main/resources/assets/botania/textures/items/ring_dodge.png new file mode 100644 index 000000000..dc7ddcc89 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_dodge.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_magnet_greater.png b/src/main/resources/assets/botania/textures/items/ring_magnet_greater.png new file mode 100644 index 000000000..a38a933c7 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_magnet_greater.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_magnet_greater_activated.png b/src/main/resources/assets/botania/textures/items/ring_magnet_greater_activated.png new file mode 100644 index 000000000..8813f9547 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_magnet_greater_activated.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_magnet_lesser.png b/src/main/resources/assets/botania/textures/items/ring_magnet_lesser.png new file mode 100644 index 000000000..cdea4af5c Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_magnet_lesser.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_magnet_lesser_activated.png b/src/main/resources/assets/botania/textures/items/ring_magnet_lesser_activated.png new file mode 100644 index 000000000..6ed67e2fc Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_magnet_lesser_activated.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_mana_greater.png b/src/main/resources/assets/botania/textures/items/ring_mana_greater.png new file mode 100644 index 000000000..6dad32ff2 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_mana_greater.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_mana_lesser.png b/src/main/resources/assets/botania/textures/items/ring_mana_lesser.png new file mode 100644 index 000000000..bd2d881bb Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_mana_lesser.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_mine.png b/src/main/resources/assets/botania/textures/items/ring_mine.png new file mode 100644 index 000000000..9538ce98a Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_mine.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_pixie.png b/src/main/resources/assets/botania/textures/items/ring_pixie.png new file mode 100644 index 000000000..168569a76 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_pixie.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_reach.png b/src/main/resources/assets/botania/textures/items/ring_reach.png new file mode 100644 index 000000000..8cbcc26d1 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_reach.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_swap.png b/src/main/resources/assets/botania/textures/items/ring_swap.png new file mode 100644 index 000000000..fd80a3b7e Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_swap.png differ diff --git a/src/main/resources/assets/botania/textures/items/ring_swim.png b/src/main/resources/assets/botania/textures/items/ring_swim.png new file mode 100644 index 000000000..75a4bdb87 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/ring_swim.png differ diff --git a/src/main/resources/assets/botania/textures/items/cobblerod.png b/src/main/resources/assets/botania/textures/items/rod_cobble.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/cobblerod.png rename to src/main/resources/assets/botania/textures/items/rod_cobble.png diff --git a/src/main/resources/assets/botania/textures/items/cobblerod.png.mcmeta b/src/main/resources/assets/botania/textures/items/rod_cobble.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/cobblerod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/rod_cobble.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/rod_dirt.png b/src/main/resources/assets/botania/textures/items/rod_dirt.png new file mode 100644 index 000000000..4f2b8d985 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/rod_dirt.png differ diff --git a/src/main/resources/assets/botania/textures/items/rod_dirt_air.png b/src/main/resources/assets/botania/textures/items/rod_dirt_air.png new file mode 100644 index 000000000..33a0dce1e Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/rod_dirt_air.png differ diff --git a/src/main/resources/assets/botania/textures/items/skydirtrod.png.mcmeta b/src/main/resources/assets/botania/textures/items/rod_dirt_air.png.mcmeta similarity index 50% rename from src/main/resources/assets/botania/textures/items/skydirtrod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/rod_dirt_air.png.mcmeta index 16a9732b2..f54521f46 100644 --- a/src/main/resources/assets/botania/textures/items/skydirtrod.png.mcmeta +++ b/src/main/resources/assets/botania/textures/items/rod_dirt_air.png.mcmeta @@ -1,10 +1,8 @@ { "animation": { + "frametime": 4, "frames": [ - { - "index": 0, - "time": 25 - }, + 0, 1, 2, 3, diff --git a/src/main/resources/assets/botania/textures/items/diviningrod.png b/src/main/resources/assets/botania/textures/items/rod_divining.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/diviningrod.png rename to src/main/resources/assets/botania/textures/items/rod_divining.png diff --git a/src/main/resources/assets/botania/textures/items/rod_exchange.png b/src/main/resources/assets/botania/textures/items/rod_exchange.png new file mode 100644 index 000000000..edba614b8 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/rod_exchange.png differ diff --git a/src/main/resources/assets/botania/textures/items/exchangerod.png.mcmeta b/src/main/resources/assets/botania/textures/items/rod_exchange.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/exchangerod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/rod_exchange.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/firerod.png b/src/main/resources/assets/botania/textures/items/rod_fire.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/firerod.png rename to src/main/resources/assets/botania/textures/items/rod_fire.png diff --git a/src/main/resources/assets/botania/textures/items/firerod.png.mcmeta b/src/main/resources/assets/botania/textures/items/rod_fire.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/firerod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/rod_fire.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/gravityrod.png b/src/main/resources/assets/botania/textures/items/rod_gravity.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gravityrod.png rename to src/main/resources/assets/botania/textures/items/rod_gravity.png diff --git a/src/main/resources/assets/botania/textures/items/gravityrod.png.mcmeta b/src/main/resources/assets/botania/textures/items/rod_gravity.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/gravityrod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/rod_gravity.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/missilerod.png b/src/main/resources/assets/botania/textures/items/rod_missile.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/missilerod.png rename to src/main/resources/assets/botania/textures/items/rod_missile.png diff --git a/src/main/resources/assets/botania/textures/items/rainbowrod.png b/src/main/resources/assets/botania/textures/items/rod_rainbow.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/rainbowrod.png rename to src/main/resources/assets/botania/textures/items/rod_rainbow.png diff --git a/src/main/resources/assets/botania/textures/items/smeltrod.png b/src/main/resources/assets/botania/textures/items/rod_smelt.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/smeltrod.png rename to src/main/resources/assets/botania/textures/items/rod_smelt.png diff --git a/src/main/resources/assets/botania/textures/items/smeltrod.png.mcmeta b/src/main/resources/assets/botania/textures/items/rod_smelt.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/smeltrod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/rod_smelt.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/terraformrod.png b/src/main/resources/assets/botania/textures/items/rod_terraform.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraformrod.png rename to src/main/resources/assets/botania/textures/items/rod_terraform.png diff --git a/src/main/resources/assets/botania/textures/items/tornadorod0.png b/src/main/resources/assets/botania/textures/items/rod_tornado.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/tornadorod0.png rename to src/main/resources/assets/botania/textures/items/rod_tornado.png diff --git a/src/main/resources/assets/botania/textures/items/tornadorod1.png b/src/main/resources/assets/botania/textures/items/rod_tornado_activated.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/tornadorod1.png rename to src/main/resources/assets/botania/textures/items/rod_tornado_activated.png diff --git a/src/main/resources/assets/botania/textures/items/tornadorod1.png.mcmeta b/src/main/resources/assets/botania/textures/items/rod_tornado_activated.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/tornadorod1.png.mcmeta rename to src/main/resources/assets/botania/textures/items/rod_tornado_activated.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/waterrod.png b/src/main/resources/assets/botania/textures/items/rod_water.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/waterrod.png rename to src/main/resources/assets/botania/textures/items/rod_water.png diff --git a/src/main/resources/assets/botania/textures/items/root.png b/src/main/resources/assets/botania/textures/items/root_living.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/root.png rename to src/main/resources/assets/botania/textures/items/root_living.png diff --git a/src/main/resources/assets/botania/textures/items/redstoneroot.png b/src/main/resources/assets/botania/textures/items/root_redstone.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/redstoneroot.png rename to src/main/resources/assets/botania/textures/items/root_redstone.png diff --git a/src/main/resources/assets/botania/textures/items/rune0.png b/src/main/resources/assets/botania/textures/items/rune0.png index 0bc406618..a65da622a 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune0.png and b/src/main/resources/assets/botania/textures/items/rune0.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune1.png b/src/main/resources/assets/botania/textures/items/rune1.png index 480e6d7c5..17507f102 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune1.png and b/src/main/resources/assets/botania/textures/items/rune1.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune10.png b/src/main/resources/assets/botania/textures/items/rune10.png index be5b9a5cf..d8b49ef85 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune10.png and b/src/main/resources/assets/botania/textures/items/rune10.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune11.png b/src/main/resources/assets/botania/textures/items/rune11.png index 90bd71c59..6c42b9fae 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune11.png and b/src/main/resources/assets/botania/textures/items/rune11.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune12.png b/src/main/resources/assets/botania/textures/items/rune12.png index e5babc5d8..54f078e5a 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune12.png and b/src/main/resources/assets/botania/textures/items/rune12.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune13.png b/src/main/resources/assets/botania/textures/items/rune13.png index 9f0725b32..cb7769553 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune13.png and b/src/main/resources/assets/botania/textures/items/rune13.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune14.png b/src/main/resources/assets/botania/textures/items/rune14.png index 0363d07df..2281e167c 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune14.png and b/src/main/resources/assets/botania/textures/items/rune14.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune15.png b/src/main/resources/assets/botania/textures/items/rune15.png index 1856470d5..058aca876 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune15.png and b/src/main/resources/assets/botania/textures/items/rune15.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune2.png b/src/main/resources/assets/botania/textures/items/rune2.png index 135844376..39f77c1ed 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune2.png and b/src/main/resources/assets/botania/textures/items/rune2.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune3.png b/src/main/resources/assets/botania/textures/items/rune3.png index f798c9976..53cb53bf0 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune3.png and b/src/main/resources/assets/botania/textures/items/rune3.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune4.png b/src/main/resources/assets/botania/textures/items/rune4.png index 6dbefb2b6..0a2f064ef 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune4.png and b/src/main/resources/assets/botania/textures/items/rune4.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune5.png b/src/main/resources/assets/botania/textures/items/rune5.png index fc676a6cf..9b4abfa4c 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune5.png and b/src/main/resources/assets/botania/textures/items/rune5.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune6.png b/src/main/resources/assets/botania/textures/items/rune6.png index 0b4908e86..9e40e07fe 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune6.png and b/src/main/resources/assets/botania/textures/items/rune6.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune7.png b/src/main/resources/assets/botania/textures/items/rune7.png index f263b5609..ae83f2fd6 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune7.png and b/src/main/resources/assets/botania/textures/items/rune7.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune8.png b/src/main/resources/assets/botania/textures/items/rune8.png index d5a2ec3fb..d477b81be 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune8.png and b/src/main/resources/assets/botania/textures/items/rune8.png differ diff --git a/src/main/resources/assets/botania/textures/items/rune9.png b/src/main/resources/assets/botania/textures/items/rune9.png index 1e336acc2..f6e4e3921 100644 Binary files a/src/main/resources/assets/botania/textures/items/rune9.png and b/src/main/resources/assets/botania/textures/items/rune9.png differ diff --git a/src/main/resources/assets/botania/textures/items/seed_overgrowth.png b/src/main/resources/assets/botania/textures/items/seed_overgrowth.png new file mode 100644 index 000000000..ce65bd31c Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/seed_overgrowth.png differ diff --git a/src/main/resources/assets/botania/textures/items/overgrowthseed.png.mcmeta b/src/main/resources/assets/botania/textures/items/seed_overgrowth.png.mcmeta similarity index 88% rename from src/main/resources/assets/botania/textures/items/overgrowthseed.png.mcmeta rename to src/main/resources/assets/botania/textures/items/seed_overgrowth.png.mcmeta index cd373fe5c..ba00a4c15 100644 --- a/src/main/resources/assets/botania/textures/items/overgrowthseed.png.mcmeta +++ b/src/main/resources/assets/botania/textures/items/seed_overgrowth.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 8, + "frametime": 4, "frames": [ { "index": 0, @@ -8,7 +8,7 @@ }, { "index": 1, - "time": 16 + "time": 8 }, { "index": 2, @@ -16,20 +16,20 @@ }, { "index": 1, - "time": 16 + "time": 8 }, 0, { "index": 1, - "time": 8 + "time": 4 }, { "index": 2, - "time": 10 + "time": 8 }, { "index": 1, - "time": 8 + "time": 4 }, 0, 3, diff --git a/src/main/resources/assets/botania/textures/items/worldseed.png b/src/main/resources/assets/botania/textures/items/seed_world.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/worldseed.png rename to src/main/resources/assets/botania/textures/items/seed_world.png diff --git a/src/main/resources/assets/botania/textures/items/shard_laputa.png b/src/main/resources/assets/botania/textures/items/shard_laputa.png new file mode 100644 index 000000000..37727af3e Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/shard_laputa.png differ diff --git a/src/main/resources/assets/botania/textures/items/signal_flare.png b/src/main/resources/assets/botania/textures/items/signal_flare.png new file mode 100644 index 000000000..9d00d8a81 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/signal_flare.png differ diff --git a/src/main/resources/assets/botania/textures/items/signal_flare_overlay.png b/src/main/resources/assets/botania/textures/items/signal_flare_overlay.png new file mode 100644 index 000000000..9e6b28683 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/signal_flare_overlay.png differ diff --git a/src/main/resources/assets/botania/textures/items/signalflare0.png b/src/main/resources/assets/botania/textures/items/signalflare0.png deleted file mode 100644 index 4e1343de4..000000000 Binary files a/src/main/resources/assets/botania/textures/items/signalflare0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/signalflare1.png b/src/main/resources/assets/botania/textures/items/signalflare1.png deleted file mode 100644 index 044cba674..000000000 Binary files a/src/main/resources/assets/botania/textures/items/signalflare1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/skydirtrod.png b/src/main/resources/assets/botania/textures/items/skydirtrod.png deleted file mode 100644 index b260af874..000000000 Binary files a/src/main/resources/assets/botania/textures/items/skydirtrod.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/slingshot.png b/src/main/resources/assets/botania/textures/items/slingshot.png index 4c9729dbd..9d95c0af6 100644 Binary files a/src/main/resources/assets/botania/textures/items/slingshot.png and b/src/main/resources/assets/botania/textures/items/slingshot.png differ diff --git a/src/main/resources/assets/botania/textures/items/spark.png b/src/main/resources/assets/botania/textures/items/spark.png new file mode 100644 index 000000000..90413df4f Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark.png differ diff --git a/src/main/resources/assets/botania/textures/items/corporeaspark0.png.mcmeta b/src/main/resources/assets/botania/textures/items/spark.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaspark0.png.mcmeta rename to src/main/resources/assets/botania/textures/items/spark.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/spark0.png b/src/main/resources/assets/botania/textures/items/spark0.png deleted file mode 100644 index fe0d76bd0..000000000 Binary files a/src/main/resources/assets/botania/textures/items/spark0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/spark1.png b/src/main/resources/assets/botania/textures/items/spark1.png deleted file mode 100644 index d78ae3c7b..000000000 Binary files a/src/main/resources/assets/botania/textures/items/spark1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/spark1.png.mcmeta b/src/main/resources/assets/botania/textures/items/spark1.png.mcmeta deleted file mode 100644 index a706817a6..000000000 --- a/src/main/resources/assets/botania/textures/items/spark1.png.mcmeta +++ /dev/null @@ -1,23 +0,0 @@ -{ - "animation": { - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 6, - 5, - 4, - 3, - 2, - 1, - 0 - ] - }, - "texture": { - "blur": true - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/items/spark_corporea.png b/src/main/resources/assets/botania/textures/items/spark_corporea.png new file mode 100644 index 000000000..0da56845d Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_corporea.png differ diff --git a/src/main/resources/assets/botania/textures/items/corporeaspark2.png.mcmeta b/src/main/resources/assets/botania/textures/items/spark_corporea.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaspark2.png.mcmeta rename to src/main/resources/assets/botania/textures/items/spark_corporea.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/spark_corporea_master.png b/src/main/resources/assets/botania/textures/items/spark_corporea_master.png new file mode 100644 index 000000000..50736f817 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_corporea_master.png differ diff --git a/src/main/resources/assets/botania/textures/items/spark0.png.mcmeta b/src/main/resources/assets/botania/textures/items/spark_corporea_master.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/spark0.png.mcmeta rename to src/main/resources/assets/botania/textures/items/spark_corporea_master.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/spark_corporea_star.png b/src/main/resources/assets/botania/textures/items/spark_corporea_star.png new file mode 100644 index 000000000..1011faa04 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_corporea_star.png differ diff --git a/src/main/resources/assets/botania/textures/items/spark_upgrade_0.png b/src/main/resources/assets/botania/textures/items/spark_upgrade_0.png new file mode 100644 index 000000000..61c70e56e Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_upgrade_0.png differ diff --git a/src/main/resources/assets/botania/textures/items/spark_upgrade_1.png b/src/main/resources/assets/botania/textures/items/spark_upgrade_1.png new file mode 100644 index 000000000..65505a438 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_upgrade_1.png differ diff --git a/src/main/resources/assets/botania/textures/items/spark_upgrade_2.png b/src/main/resources/assets/botania/textures/items/spark_upgrade_2.png new file mode 100644 index 000000000..8dd81de18 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_upgrade_2.png differ diff --git a/src/main/resources/assets/botania/textures/items/spark_upgrade_3.png b/src/main/resources/assets/botania/textures/items/spark_upgrade_3.png new file mode 100644 index 000000000..e9a639365 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_upgrade_3.png differ diff --git a/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_0.png b/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_0.png new file mode 100644 index 000000000..672d8e5f5 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_0.png differ diff --git a/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_1.png b/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_1.png new file mode 100644 index 000000000..f74a15861 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_1.png differ diff --git a/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_2.png b/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_2.png new file mode 100644 index 000000000..289387ba5 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_2.png differ diff --git a/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_3.png b/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_3.png new file mode 100644 index 000000000..66d81c279 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/spark_upgrade_rune_3.png differ diff --git a/src/main/resources/assets/botania/textures/items/sparkupgrade0.png b/src/main/resources/assets/botania/textures/items/sparkupgrade0.png deleted file mode 100644 index 1f48d4539..000000000 Binary files a/src/main/resources/assets/botania/textures/items/sparkupgrade0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/sparkupgrade1.png b/src/main/resources/assets/botania/textures/items/sparkupgrade1.png deleted file mode 100644 index ba6ca58db..000000000 Binary files a/src/main/resources/assets/botania/textures/items/sparkupgrade1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/sparkupgrade2.png b/src/main/resources/assets/botania/textures/items/sparkupgrade2.png deleted file mode 100644 index 0995912bf..000000000 Binary files a/src/main/resources/assets/botania/textures/items/sparkupgrade2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/sparkupgrade3.png b/src/main/resources/assets/botania/textures/items/sparkupgrade3.png deleted file mode 100644 index 7b5d0cfa2..000000000 Binary files a/src/main/resources/assets/botania/textures/items/sparkupgrade3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/sparkupgradel0.png b/src/main/resources/assets/botania/textures/items/sparkupgradel0.png deleted file mode 100644 index 9540f6f3f..000000000 Binary files a/src/main/resources/assets/botania/textures/items/sparkupgradel0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/sparkupgradel1.png b/src/main/resources/assets/botania/textures/items/sparkupgradel1.png deleted file mode 100644 index f7d12bf9f..000000000 Binary files a/src/main/resources/assets/botania/textures/items/sparkupgradel1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/sparkupgradel2.png b/src/main/resources/assets/botania/textures/items/sparkupgradel2.png deleted file mode 100644 index 7b1d4de69..000000000 Binary files a/src/main/resources/assets/botania/textures/items/sparkupgradel2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/sparkupgradel3.png b/src/main/resources/assets/botania/textures/items/sparkupgradel3.png deleted file mode 100644 index 124a0dc50..000000000 Binary files a/src/main/resources/assets/botania/textures/items/sparkupgradel3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/spawnermover0.png b/src/main/resources/assets/botania/textures/items/spawner_mover.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/spawnermover0.png rename to src/main/resources/assets/botania/textures/items/spawner_mover.png diff --git a/src/main/resources/assets/botania/textures/items/spawnermover1.png b/src/main/resources/assets/botania/textures/items/spawner_mover_full.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/spawnermover1.png rename to src/main/resources/assets/botania/textures/items/spawner_mover_full.png diff --git a/src/main/resources/assets/botania/textures/items/dammitreddit.png b/src/main/resources/assets/botania/textures/items/special_dammitreddit.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/dammitreddit.png rename to src/main/resources/assets/botania/textures/items/special_dammitreddit.png diff --git a/src/main/resources/assets/botania/textures/items/dasboot.png b/src/main/resources/assets/botania/textures/items/special_dasboot.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/dasboot.png rename to src/main/resources/assets/botania/textures/items/special_dasboot.png diff --git a/src/main/resources/assets/botania/textures/items/special_elucidator.png b/src/main/resources/assets/botania/textures/items/special_elucidator.png new file mode 100644 index 000000000..925a1666b Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/special_elucidator.png differ diff --git a/src/main/resources/assets/botania/textures/items/special_nerfbat.png b/src/main/resources/assets/botania/textures/items/special_nerfbat.png new file mode 100644 index 000000000..80bb09d4b Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/special_nerfbat.png differ diff --git a/src/main/resources/assets/botania/textures/items/totalbiscuit.png b/src/main/resources/assets/botania/textures/items/special_totalbiscuit.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/totalbiscuit.png rename to src/main/resources/assets/botania/textures/items/special_totalbiscuit.png diff --git a/src/main/resources/assets/botania/textures/items/vuvuzela.png b/src/main/resources/assets/botania/textures/items/special_vuvuzela.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/vuvuzela.png rename to src/main/resources/assets/botania/textures/items/special_vuvuzela.png diff --git a/src/main/resources/assets/botania/textures/items/spellcloth.png b/src/main/resources/assets/botania/textures/items/spell_cloth.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/spellcloth.png rename to src/main/resources/assets/botania/textures/items/spell_cloth.png diff --git a/src/main/resources/assets/botania/textures/items/incensestick0.png b/src/main/resources/assets/botania/textures/items/stick_incense.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/incensestick0.png rename to src/main/resources/assets/botania/textures/items/stick_incense.png diff --git a/src/main/resources/assets/botania/textures/items/incensestick1.png b/src/main/resources/assets/botania/textures/items/stick_incense_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/incensestick1.png rename to src/main/resources/assets/botania/textures/items/stick_incense_overlay.png diff --git a/src/main/resources/assets/botania/textures/items/stick_obedience.png b/src/main/resources/assets/botania/textures/items/stick_obedience.png new file mode 100644 index 000000000..c6f72ce5c Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/stick_obedience.png differ diff --git a/src/main/resources/assets/botania/textures/items/temperancestone0.png b/src/main/resources/assets/botania/textures/items/stone_temperance.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/temperancestone0.png rename to src/main/resources/assets/botania/textures/items/stone_temperance.png diff --git a/src/main/resources/assets/botania/textures/items/temperancestone1.png b/src/main/resources/assets/botania/textures/items/stone_temperance_activated.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/temperancestone1.png rename to src/main/resources/assets/botania/textures/items/stone_temperance_activated.png diff --git a/src/main/resources/assets/botania/textures/items/swapring.png b/src/main/resources/assets/botania/textures/items/swapring.png deleted file mode 100644 index de6fdd837..000000000 Binary files a/src/main/resources/assets/botania/textures/items/swapring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/starsword.png b/src/main/resources/assets/botania/textures/items/sword_star.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/starsword.png rename to src/main/resources/assets/botania/textures/items/sword_star.png diff --git a/src/main/resources/assets/botania/textures/items/thundersword.png b/src/main/resources/assets/botania/textures/items/sword_thunder.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thundersword.png rename to src/main/resources/assets/botania/textures/items/sword_thunder.png diff --git a/src/main/resources/assets/botania/textures/items/talisman_black_hole.png b/src/main/resources/assets/botania/textures/items/talisman_black_hole.png new file mode 100644 index 000000000..f8e1ae2f9 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/talisman_black_hole.png differ diff --git a/src/main/resources/assets/botania/textures/items/talisman_black_hole_activated.png b/src/main/resources/assets/botania/textures/items/talisman_black_hole_activated.png new file mode 100644 index 000000000..e4f01b8f8 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/talisman_black_hole_activated.png differ diff --git a/src/main/resources/assets/botania/textures/items/terraaxe1.png b/src/main/resources/assets/botania/textures/items/terrasteel_axe.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraaxe1.png rename to src/main/resources/assets/botania/textures/items/terrasteel_axe.png diff --git a/src/main/resources/assets/botania/textures/items/terraaxe0.png b/src/main/resources/assets/botania/textures/items/terrasteel_axe_activated.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraaxe0.png rename to src/main/resources/assets/botania/textures/items/terrasteel_axe_activated.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelboots.png b/src/main/resources/assets/botania/textures/items/terrasteel_boots.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelboots.png rename to src/main/resources/assets/botania/textures/items/terrasteel_boots.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelchest.png b/src/main/resources/assets/botania/textures/items/terrasteel_chestplate.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelchest.png rename to src/main/resources/assets/botania/textures/items/terrasteel_chestplate.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelhelm.png b/src/main/resources/assets/botania/textures/items/terrasteel_helmet.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelhelm.png rename to src/main/resources/assets/botania/textures/items/terrasteel_helmet.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelhelmreveal.png b/src/main/resources/assets/botania/textures/items/terrasteel_helmet_reveal.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelhelmreveal.png rename to src/main/resources/assets/botania/textures/items/terrasteel_helmet_reveal.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteel.png b/src/main/resources/assets/botania/textures/items/terrasteel_ingot.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteel.png rename to src/main/resources/assets/botania/textures/items/terrasteel_ingot.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteellegs.png b/src/main/resources/assets/botania/textures/items/terrasteel_leggings.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteellegs.png rename to src/main/resources/assets/botania/textures/items/terrasteel_leggings.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelnugget.png b/src/main/resources/assets/botania/textures/items/terrasteel_nugget.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelnugget.png rename to src/main/resources/assets/botania/textures/items/terrasteel_nugget.png diff --git a/src/main/resources/assets/botania/textures/items/terrapick0.png b/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrapick0.png rename to src/main/resources/assets/botania/textures/items/terrasteel_pickaxe.png diff --git a/src/main/resources/assets/botania/textures/items/terrapick1.png b/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrapick1.png rename to src/main/resources/assets/botania/textures/items/terrasteel_pickaxe_overlay.png diff --git a/src/main/resources/assets/botania/textures/items/terrapick2.png b/src/main/resources/assets/botania/textures/items/terrasteel_pickaxe_tipped.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrapick2.png rename to src/main/resources/assets/botania/textures/items/terrasteel_pickaxe_tipped.png diff --git a/src/main/resources/assets/botania/textures/items/terrasword.png b/src/main/resources/assets/botania/textures/items/terrasteel_sword.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasword.png rename to src/main/resources/assets/botania/textures/items/terrasteel_sword.png diff --git a/src/main/resources/assets/botania/textures/items/thorring.png b/src/main/resources/assets/botania/textures/items/thorring.png deleted file mode 100644 index 639c1894c..000000000 Binary files a/src/main/resources/assets/botania/textures/items/thorring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/tool_astrolabe.png b/src/main/resources/assets/botania/textures/items/tool_astrolabe.png new file mode 100644 index 000000000..9175d373b Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/tool_astrolabe.png differ diff --git a/src/main/resources/assets/botania/textures/items/sextant.png b/src/main/resources/assets/botania/textures/items/tool_sextant.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/sextant.png rename to src/main/resources/assets/botania/textures/items/tool_sextant.png diff --git a/src/main/resources/assets/botania/textures/items/dreamwoodtwig.png b/src/main/resources/assets/botania/textures/items/twig_dreamwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/dreamwoodtwig.png rename to src/main/resources/assets/botania/textures/items/twig_dreamwood.png diff --git a/src/main/resources/assets/botania/textures/items/twig_livingwood.png b/src/main/resources/assets/botania/textures/items/twig_livingwood.png new file mode 100644 index 000000000..e6f6518f5 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/twig_livingwood.png differ diff --git a/src/main/resources/assets/botania/textures/items/twigwand0.png b/src/main/resources/assets/botania/textures/items/twigwand0.png deleted file mode 100644 index b95363de7..000000000 Binary files a/src/main/resources/assets/botania/textures/items/twigwand0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/twigwand1.png b/src/main/resources/assets/botania/textures/items/twigwand1.png deleted file mode 100644 index 4068a9061..000000000 Binary files a/src/main/resources/assets/botania/textures/items/twigwand1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/twigwand2.png b/src/main/resources/assets/botania/textures/items/twigwand2.png deleted file mode 100644 index 4fc7690ab..000000000 Binary files a/src/main/resources/assets/botania/textures/items/twigwand2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/twigwand3.png b/src/main/resources/assets/botania/textures/items/twigwand3.png deleted file mode 100644 index fa5dfe8e8..000000000 Binary files a/src/main/resources/assets/botania/textures/items/twigwand3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/unholycloak.png b/src/main/resources/assets/botania/textures/items/unholycloak.png deleted file mode 100644 index 420e41360..000000000 Binary files a/src/main/resources/assets/botania/textures/items/unholycloak.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/unused/aesirring.png b/src/main/resources/assets/botania/textures/items/unused/aesirring.png deleted file mode 100644 index 4977e695d..000000000 Binary files a/src/main/resources/assets/botania/textures/items/unused/aesirring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/vineball.png b/src/main/resources/assets/botania/textures/items/vine_ball.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/vineball.png rename to src/main/resources/assets/botania/textures/items/vine_ball.png diff --git a/src/main/resources/assets/botania/textures/items/virus1.png b/src/main/resources/assets/botania/textures/items/virus_skeleton.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/virus1.png rename to src/main/resources/assets/botania/textures/items/virus_skeleton.png diff --git a/src/main/resources/assets/botania/textures/items/virus0.png b/src/main/resources/assets/botania/textures/items/virus_zombie.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/virus0.png rename to src/main/resources/assets/botania/textures/items/virus_zombie.png diff --git a/src/main/resources/assets/botania/textures/items/wand_bind.png b/src/main/resources/assets/botania/textures/items/wand_bind.png new file mode 100644 index 000000000..3211d3edd Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/wand_bind.png differ diff --git a/src/main/resources/assets/botania/textures/items/wand_petal_bottom.png b/src/main/resources/assets/botania/textures/items/wand_petal_bottom.png new file mode 100644 index 000000000..4541672f8 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/wand_petal_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/items/wand_petal_top.png b/src/main/resources/assets/botania/textures/items/wand_petal_top.png new file mode 100644 index 000000000..fd59ec8e9 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/wand_petal_top.png differ diff --git a/src/main/resources/assets/botania/textures/items/wand_twig.png b/src/main/resources/assets/botania/textures/items/wand_twig.png new file mode 100644 index 000000000..700edb2f4 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/wand_twig.png differ diff --git a/src/main/resources/assets/botania/textures/items/waterbowl.png b/src/main/resources/assets/botania/textures/items/waterbowl.png deleted file mode 100644 index 925486c11..000000000 Binary files a/src/main/resources/assets/botania/textures/items/waterbowl.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/waterbowl_base.png b/src/main/resources/assets/botania/textures/items/waterbowl_base.png deleted file mode 100644 index 63d16ad6b..000000000 Binary files a/src/main/resources/assets/botania/textures/items/waterbowl_base.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/waterbowl_cover.png b/src/main/resources/assets/botania/textures/items/waterbowl_cover.png deleted file mode 100644 index 2bdfc5719..000000000 Binary files a/src/main/resources/assets/botania/textures/items/waterbowl_cover.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/waterbowl_fluid.png b/src/main/resources/assets/botania/textures/items/waterbowl_fluid.png deleted file mode 100644 index 524fb39be..000000000 Binary files a/src/main/resources/assets/botania/textures/items/waterbowl_fluid.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/waterring.png b/src/main/resources/assets/botania/textures/items/waterring.png deleted file mode 100644 index efc86e2a9..000000000 Binary files a/src/main/resources/assets/botania/textures/items/waterring.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/logo.psd b/src/main/resources/assets/botania/textures/logo.psd new file mode 100644 index 000000000..91959e48b Binary files /dev/null and b/src/main/resources/assets/botania/textures/logo.psd differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_bottom.png deleted file mode 100644 index a3a1d26ad..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_sides.png deleted file mode 100644 index e161b8a45..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_top.png deleted file mode 100644 index a3a1d26ad..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_bottom.png deleted file mode 100644 index 781548367..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_sides.png deleted file mode 100644 index f12545dff..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_top.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_top.png deleted file mode 100644 index 781548367..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_bottom.png deleted file mode 100644 index f5269c16b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_sides.png deleted file mode 100644 index ac1dd433c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_top.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_top.png deleted file mode 100644 index f5269c16b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletstand_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletstand_sides.png deleted file mode 100644 index 4bd0ec9be..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletstand_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletstand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletstand_top_bottom.png deleted file mode 100644 index 21357a3eb..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletstand_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_bottom.png deleted file mode 100644 index 082cf4c31..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_sides.png deleted file mode 100644 index 0b1c547a0..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_top.png deleted file mode 100644 index c1931da93..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkbase_sides.png deleted file mode 100644 index 82a9d99a6..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/kelkbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkbase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkbase_top_bottom.png deleted file mode 100644 index 163b2b90a..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/kelkbase_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkwall.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkwall.png deleted file mode 100644 index b87afe102..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/kelkwall.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/original.png b/src/main/resources/assets/botania/textures/model/altar/default/original.png deleted file mode 100644 index 8b5a0a406..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/original.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_bottom.png deleted file mode 100644 index 0bfb30a21..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_sides.png deleted file mode 100644 index bd2a1b41f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_top.png deleted file mode 100644 index 0bfb30a21..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_bottom.png deleted file mode 100644 index 77d979186..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_sides.png deleted file mode 100644 index 6a82cf041..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_top.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_top.png deleted file mode 100644 index 77d979186..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_bottom.png deleted file mode 100644 index 80dc4fb6d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_sides.png deleted file mode 100644 index 57c2fab9f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_top.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_top.png deleted file mode 100644 index 80dc4fb6d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletstand_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletstand_sides.png deleted file mode 100644 index 349184a72..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletstand_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletstand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletstand_top_bottom.png deleted file mode 100644 index 92eacd2f9..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletstand_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_bottom.png deleted file mode 100644 index 1d5931947..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_sides.png deleted file mode 100644 index aec15404f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_top.png deleted file mode 100644 index fdd88a496..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase_sides.png deleted file mode 100644 index 69dbb1739..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase_top_bottom.png deleted file mode 100644 index 6ff2f2b7c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkwall.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkwall.png deleted file mode 100644 index 045cde560..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/kelkwall.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/original.png b/src/main/resources/assets/botania/textures/model/altar/desert/original.png deleted file mode 100644 index 90b7d6834..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/original.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_bottom.png deleted file mode 100644 index ef040a6e5..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_sides.png deleted file mode 100644 index e9f84f761..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_top.png deleted file mode 100644 index ef040a6e5..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_bottom.png deleted file mode 100644 index 63362c09d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_sides.png deleted file mode 100644 index a759253ae..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_top.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_top.png deleted file mode 100644 index 63362c09d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_bottom.png deleted file mode 100644 index 14ee8ecee..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_sides.png deleted file mode 100644 index a694d4e6c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_top.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_top.png deleted file mode 100644 index 14ee8ecee..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletstand_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletstand_sides.png deleted file mode 100644 index fea3b0fa1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletstand_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletstand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletstand_top_bottom.png deleted file mode 100644 index e8c563d73..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletstand_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_bottom.png deleted file mode 100644 index f518b7cb3..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_sides.png deleted file mode 100644 index 6a33c2a9b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_top.png deleted file mode 100644 index 713c72f47..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase_sides.png deleted file mode 100644 index 3f50ca2e0..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase_top_bottom.png deleted file mode 100644 index c1515edee..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkwall.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkwall.png deleted file mode 100644 index 3b5ae72e0..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/kelkwall.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/original.png b/src/main/resources/assets/botania/textures/model/altar/forest/original.png deleted file mode 100644 index 03f1bccd4..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/original.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_bottom.png deleted file mode 100644 index 782cbc3e2..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_sides.png deleted file mode 100644 index 5b7dbe26b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_top.png deleted file mode 100644 index 782cbc3e2..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_bottom.png deleted file mode 100644 index 38a7c1336..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_sides.png deleted file mode 100644 index 1f1ab1231..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_top.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_top.png deleted file mode 100644 index 38a7c1336..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_bottom.png deleted file mode 100644 index 56df33233..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_sides.png deleted file mode 100644 index 0f8f20680..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_top.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_top.png deleted file mode 100644 index 56df33233..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletstand_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletstand_sides.png deleted file mode 100644 index a22955e82..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletstand_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletstand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletstand_top_bottom.png deleted file mode 100644 index 5ff259635..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletstand_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_bottom.png deleted file mode 100644 index ba056d16b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_sides.png deleted file mode 100644 index 5d4e4c119..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_top.png deleted file mode 100644 index bedad4224..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase_sides.png deleted file mode 100644 index f3aa7bd12..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase_top_bottom.png deleted file mode 100644 index 9d6b70707..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkwall.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkwall.png deleted file mode 100644 index 70068a94b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkwall.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/original.png b/src/main/resources/assets/botania/textures/model/altar/fungal/original.png deleted file mode 100644 index f3abecabe..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/original.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_bottom.png deleted file mode 100644 index e2a50fa93..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_sides.png deleted file mode 100644 index 1cddba7f4..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_top.png deleted file mode 100644 index e2a50fa93..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_bottom.png deleted file mode 100644 index 5d8960887..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_sides.png deleted file mode 100644 index d7b9822bd..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_top.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_top.png deleted file mode 100644 index 5d8960887..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_bottom.png deleted file mode 100644 index 632a386fd..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_sides.png deleted file mode 100644 index 8d00dd9f4..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_top.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_top.png deleted file mode 100644 index 632a386fd..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletstand_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletstand_sides.png deleted file mode 100644 index dc2f46652..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletstand_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletstand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletstand_top_bottom.png deleted file mode 100644 index 64a2337ae..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletstand_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_bottom.png deleted file mode 100644 index c16dd99cd..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_sides.png deleted file mode 100644 index c5ff9eb46..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_top.png deleted file mode 100644 index cb81263dd..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase_sides.png deleted file mode 100644 index b76623998..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase_top_bottom.png deleted file mode 100644 index 8f1a60724..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkwall.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkwall.png deleted file mode 100644 index be853b63b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkwall.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/original.png b/src/main/resources/assets/botania/textures/model/altar/mesa/original.png deleted file mode 100644 index c00ead7ef..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/original.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_bottom.png deleted file mode 100644 index a3a1d26ad..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_sides.png deleted file mode 100644 index 48b4e40c7..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_top.png deleted file mode 100644 index f9c6b8a2c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_bottom.png deleted file mode 100644 index 781548367..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_sides.png deleted file mode 100644 index 933da393b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_top.png deleted file mode 100644 index 1c6e8f41b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_bottom.png deleted file mode 100644 index f5269c16b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_sides.png deleted file mode 100644 index 457d7a0b1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_top.png deleted file mode 100644 index e6b90bfcf..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletstand_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletstand_sides.png deleted file mode 100644 index 3af8bd008..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletstand_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletstand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletstand_top_bottom.png deleted file mode 100644 index 21357a3eb..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletstand_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_bottom.png deleted file mode 100644 index e639cd0a4..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_sides.png deleted file mode 100644 index 876e03e40..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_top.png deleted file mode 100644 index c1931da93..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase_sides.png deleted file mode 100644 index 82a9d99a6..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase_top_bottom.png deleted file mode 100644 index 163b2b90a..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkwall.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkwall.png deleted file mode 100644 index 37a58cc15..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkwall.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/original.png b/src/main/resources/assets/botania/textures/model/altar/mossy/original.png deleted file mode 100644 index 3b77b8d6d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/original.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_bottom.png deleted file mode 100644 index d6b1f5dc1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_sides.png deleted file mode 100644 index 08162338d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_top.png deleted file mode 100644 index d6b1f5dc1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_bottom.png deleted file mode 100644 index 7b9245ee8..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_sides.png deleted file mode 100644 index a360e2bed..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_top.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_top.png deleted file mode 100644 index 7b9245ee8..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_bottom.png deleted file mode 100644 index a3b8f27a6..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_sides.png deleted file mode 100644 index 803419caa..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_top.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_top.png deleted file mode 100644 index a3b8f27a6..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletstand_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletstand_sides.png deleted file mode 100644 index 6c5ad7aa7..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletstand_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletstand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletstand_top_bottom.png deleted file mode 100644 index 1a139054e..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletstand_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_bottom.png deleted file mode 100644 index c61daae04..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_sides.png deleted file mode 100644 index 2e1b92b4c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_top.png deleted file mode 100644 index a975e4968..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase_sides.png deleted file mode 100644 index 060fda807..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase_top_bottom.png deleted file mode 100644 index 46df2612d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkwall.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkwall.png deleted file mode 100644 index 92c118019..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkwall.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/original.png b/src/main/resources/assets/botania/textures/model/altar/mountain/original.png deleted file mode 100644 index 66352777f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/original.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/note.txt b/src/main/resources/assets/botania/textures/model/altar/note.txt deleted file mode 100644 index bc8d4722b..000000000 --- a/src/main/resources/assets/botania/textures/model/altar/note.txt +++ /dev/null @@ -1,8 +0,0 @@ -Texture Artists: - -In all _side textures the sides are laid out in the order west, north, east, south -In all _top_bottom textures the quad on the left is the top, the one on the right is the bottom -In gobletStand_sides, the upper half is the west and north sides, left to right. The east and south sides are the bottom half. -In kelkWall, the two large quads are the large faces, the strips to the left or right are the small faces. - The strips on top of the large quads are the top/bottom textures of the N/S walls of the cup - The vertical strips on the right are the top/bottom textures of W/E walls of the cup diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_bottom.png deleted file mode 100644 index 0ddf97b05..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_sides.png deleted file mode 100644 index 8c7e2c91f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_top.png deleted file mode 100644 index 0ddf97b05..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_bottom.png deleted file mode 100644 index 19d508967..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_sides.png deleted file mode 100644 index f9cceb89c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_top.png deleted file mode 100644 index 19d508967..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_bottom.png deleted file mode 100644 index 7ac6eda60..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_sides.png deleted file mode 100644 index af1a49c66..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_top.png deleted file mode 100644 index 7ac6eda60..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletstand_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletstand_sides.png deleted file mode 100644 index baf537d1d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletstand_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletstand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletstand_top_bottom.png deleted file mode 100644 index 109da73cd..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletstand_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_bottom.png deleted file mode 100644 index ca15df11d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_sides.png deleted file mode 100644 index 5d1098856..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_top.png deleted file mode 100644 index 2c08a9f70..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase_sides.png deleted file mode 100644 index a9c5384b1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase_top_bottom.png deleted file mode 100644 index 134ae10ac..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkwall.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkwall.png deleted file mode 100644 index b938de383..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/kelkwall.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/original.png b/src/main/resources/assets/botania/textures/model/altar/plains/original.png deleted file mode 100644 index 717ef2305..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/original.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_bottom.png deleted file mode 100644 index 6c346c63d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_sides.png deleted file mode 100644 index ad5dce401..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_top.png deleted file mode 100644 index 6c346c63d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_bottom.png deleted file mode 100644 index 63c74a48e..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_sides.png deleted file mode 100644 index 1b1a604e3..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_top.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_top.png deleted file mode 100644 index 63c74a48e..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_bottom.png deleted file mode 100644 index bf1499ee1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_sides.png deleted file mode 100644 index 367ee59e8..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_top.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_top.png deleted file mode 100644 index bf1499ee1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletstand_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletstand_sides.png deleted file mode 100644 index 26d3997b3..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletstand_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletstand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletstand_top_bottom.png deleted file mode 100644 index 7d5cf0f1b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletstand_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_bottom.png deleted file mode 100644 index 57ccbf1ba..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_sides.png deleted file mode 100644 index 956e494e2..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_top.png deleted file mode 100644 index c39731a74..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase_sides.png deleted file mode 100644 index db14c3672..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase_top_bottom.png deleted file mode 100644 index a3de281be..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkwall.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkwall.png deleted file mode 100644 index 878aa80f9..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkwall.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/original.png b/src/main/resources/assets/botania/textures/model/altar/swamp/original.png deleted file mode 100644 index 883b2cc57..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/original.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_bottom.png deleted file mode 100644 index 9039054eb..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_sides.png deleted file mode 100644 index 4d2ddcbc9..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_top.png deleted file mode 100644 index 9039054eb..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_bottom.png deleted file mode 100644 index f773377ec..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_sides.png deleted file mode 100644 index 15bf7e395..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_top.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_top.png deleted file mode 100644 index f773377ec..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_bottom.png deleted file mode 100644 index b46e1388a..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_sides.png deleted file mode 100644 index e6552421c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_top.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_top.png deleted file mode 100644 index b46e1388a..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletstand_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletstand_sides.png deleted file mode 100644 index d54b52803..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletstand_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletstand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletstand_top_bottom.png deleted file mode 100644 index 767935f46..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletstand_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_bottom.png deleted file mode 100644 index 8a71f876b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_sides.png deleted file mode 100644 index 44caf5af1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_top.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_top.png deleted file mode 100644 index fb97e34bf..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase_sides.png deleted file mode 100644 index 492c908ad..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase_top_bottom.png deleted file mode 100644 index 69588475f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkwall.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkwall.png deleted file mode 100644 index fb6714a58..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkwall.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/original.png b/src/main/resources/assets/botania/textures/model/altar/taiga/original.png deleted file mode 100644 index 3d3a9332e..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/original.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/desert_goblet.png b/src/main/resources/assets/botania/textures/model/apothecary/desert_goblet.png new file mode 100644 index 000000000..dc6312fd1 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/desert_goblet.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/desert_side.png b/src/main/resources/assets/botania/textures/model/apothecary/desert_side.png new file mode 100644 index 000000000..2f3dcb62a Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/desert_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/desert_top_bottom.png b/src/main/resources/assets/botania/textures/model/apothecary/desert_top_bottom.png new file mode 100644 index 000000000..a37bfc5cf Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/desert_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/forest_goblet.png b/src/main/resources/assets/botania/textures/model/apothecary/forest_goblet.png new file mode 100644 index 000000000..e86a4315c Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/forest_goblet.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/forest_side.png b/src/main/resources/assets/botania/textures/model/apothecary/forest_side.png new file mode 100644 index 000000000..537530615 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/forest_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/forest_top_bottom.png b/src/main/resources/assets/botania/textures/model/apothecary/forest_top_bottom.png new file mode 100644 index 000000000..163d01491 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/forest_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/fungal_goblet.png b/src/main/resources/assets/botania/textures/model/apothecary/fungal_goblet.png new file mode 100644 index 000000000..600ceb97f Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/fungal_goblet.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/fungal_side.png b/src/main/resources/assets/botania/textures/model/apothecary/fungal_side.png new file mode 100644 index 000000000..5873941fb Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/fungal_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/fungal_top_bottom.png b/src/main/resources/assets/botania/textures/model/apothecary/fungal_top_bottom.png new file mode 100644 index 000000000..c180446fe Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/fungal_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mesa_goblet.png b/src/main/resources/assets/botania/textures/model/apothecary/mesa_goblet.png new file mode 100644 index 000000000..ce90ff5b8 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/mesa_goblet.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mesa_side.png b/src/main/resources/assets/botania/textures/model/apothecary/mesa_side.png new file mode 100644 index 000000000..70bfee811 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/mesa_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mesa_top_bottom.png b/src/main/resources/assets/botania/textures/model/apothecary/mesa_top_bottom.png new file mode 100644 index 000000000..fac128ffa Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/mesa_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mossy_goblet.png b/src/main/resources/assets/botania/textures/model/apothecary/mossy_goblet.png new file mode 100644 index 000000000..d0d636e94 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/mossy_goblet.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mossy_side.png b/src/main/resources/assets/botania/textures/model/apothecary/mossy_side.png new file mode 100644 index 000000000..059e78528 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/mossy_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mossy_top_bottom.png b/src/main/resources/assets/botania/textures/model/apothecary/mossy_top_bottom.png new file mode 100644 index 000000000..264545dae Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/mossy_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mountain_goblet.png b/src/main/resources/assets/botania/textures/model/apothecary/mountain_goblet.png new file mode 100644 index 000000000..0b20ea0ef Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/mountain_goblet.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mountain_side.png b/src/main/resources/assets/botania/textures/model/apothecary/mountain_side.png new file mode 100644 index 000000000..dbe36d9bc Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/mountain_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mountain_top_bottom.png b/src/main/resources/assets/botania/textures/model/apothecary/mountain_top_bottom.png new file mode 100644 index 000000000..e8a19fd6b Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/mountain_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/plains_goblet.png b/src/main/resources/assets/botania/textures/model/apothecary/plains_goblet.png new file mode 100644 index 000000000..d41df0493 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/plains_goblet.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/plains_side.png b/src/main/resources/assets/botania/textures/model/apothecary/plains_side.png new file mode 100644 index 000000000..ef143d3f3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/plains_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/plains_top_bottom.png b/src/main/resources/assets/botania/textures/model/apothecary/plains_top_bottom.png new file mode 100644 index 000000000..1c819d801 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/plains_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/stone_goblet.png b/src/main/resources/assets/botania/textures/model/apothecary/stone_goblet.png new file mode 100644 index 000000000..4c8d22563 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/stone_goblet.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/stone_side.png b/src/main/resources/assets/botania/textures/model/apothecary/stone_side.png new file mode 100644 index 000000000..4acdb0df9 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/stone_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/stone_top_bottom.png b/src/main/resources/assets/botania/textures/model/apothecary/stone_top_bottom.png new file mode 100644 index 000000000..fcfe01d2f Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/stone_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/swamp_goblet.png b/src/main/resources/assets/botania/textures/model/apothecary/swamp_goblet.png new file mode 100644 index 000000000..fda3d0da8 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/swamp_goblet.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/swamp_side.png b/src/main/resources/assets/botania/textures/model/apothecary/swamp_side.png new file mode 100644 index 000000000..855f96825 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/swamp_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/swamp_top_bottom.png b/src/main/resources/assets/botania/textures/model/apothecary/swamp_top_bottom.png new file mode 100644 index 000000000..c64e11f73 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/swamp_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/taiga_goblet.png b/src/main/resources/assets/botania/textures/model/apothecary/taiga_goblet.png new file mode 100644 index 000000000..e0d7f9748 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/taiga_goblet.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/taiga_side.png b/src/main/resources/assets/botania/textures/model/apothecary/taiga_side.png new file mode 100644 index 000000000..48a1d0a80 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/taiga_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/apothecary/taiga_top_bottom.png b/src/main/resources/assets/botania/textures/model/apothecary/taiga_top_bottom.png new file mode 100644 index 000000000..1365be5c1 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/apothecary/taiga_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/avatar.png b/src/main/resources/assets/botania/textures/model/avatar.png index 0c8fde637..9a2088374 100644 Binary files a/src/main/resources/assets/botania/textures/model/avatar.png and b/src/main/resources/assets/botania/textures/model/avatar.png differ diff --git a/src/main/resources/assets/botania/textures/model/avatar_dirt.png b/src/main/resources/assets/botania/textures/model/avatar_dirt.png new file mode 100644 index 000000000..669b302f5 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/avatar_dirt.png differ diff --git a/src/main/resources/assets/botania/textures/model/avatar_divining.png b/src/main/resources/assets/botania/textures/model/avatar_divining.png new file mode 100644 index 000000000..1dc157ff6 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/avatar_divining.png differ diff --git a/src/main/resources/assets/botania/textures/model/avatar_fire.png b/src/main/resources/assets/botania/textures/model/avatar_fire.png new file mode 100644 index 000000000..d8a5a54a9 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/avatar_fire.png differ diff --git a/src/main/resources/assets/botania/textures/model/avatar_missile.png b/src/main/resources/assets/botania/textures/model/avatar_missile.png new file mode 100644 index 000000000..7ba27f413 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/avatar_missile.png differ diff --git a/src/main/resources/assets/botania/textures/model/avatar_rainbow.png b/src/main/resources/assets/botania/textures/model/avatar_rainbow.png new file mode 100644 index 000000000..e3d1b0fce Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/avatar_rainbow.png differ diff --git a/src/main/resources/assets/botania/textures/model/avatar_tornado.png b/src/main/resources/assets/botania/textures/model/avatar_tornado.png new file mode 100644 index 000000000..0efe2dbab Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/avatar_tornado.png differ diff --git a/src/main/resources/assets/botania/textures/model/avatardirt.png b/src/main/resources/assets/botania/textures/model/avatardirt.png deleted file mode 100644 index bdd9054a2..000000000 Binary files a/src/main/resources/assets/botania/textures/model/avatardirt.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/avatardivining.png b/src/main/resources/assets/botania/textures/model/avatardivining.png deleted file mode 100644 index 8fadf99aa..000000000 Binary files a/src/main/resources/assets/botania/textures/model/avatardivining.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/avatarfire.png b/src/main/resources/assets/botania/textures/model/avatarfire.png deleted file mode 100644 index 9494b7dd9..000000000 Binary files a/src/main/resources/assets/botania/textures/model/avatarfire.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/avatarmissile.png b/src/main/resources/assets/botania/textures/model/avatarmissile.png deleted file mode 100644 index 6a197cd8f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/avatarmissile.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/avatarrainbow.png b/src/main/resources/assets/botania/textures/model/avatarrainbow.png deleted file mode 100644 index 3ec92e222..000000000 Binary files a/src/main/resources/assets/botania/textures/model/avatarrainbow.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/avatartornado.png b/src/main/resources/assets/botania/textures/model/avatartornado.png deleted file mode 100644 index fba1061da..000000000 Binary files a/src/main/resources/assets/botania/textures/model/avatartornado.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/balancecloak.png b/src/main/resources/assets/botania/textures/model/balancecloak.png deleted file mode 100644 index e3c6adc27..000000000 Binary files a/src/main/resources/assets/botania/textures/model/balancecloak.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/bellows.png b/src/main/resources/assets/botania/textures/model/bellows.png index 015f90466..80c2a4a40 100644 Binary files a/src/main/resources/assets/botania/textures/model/bellows.png and b/src/main/resources/assets/botania/textures/model/bellows.png differ diff --git a/src/main/resources/assets/botania/textures/model/brewery.png b/src/main/resources/assets/botania/textures/model/brewery.png index 2e9a56442..412e00127 100644 Binary files a/src/main/resources/assets/botania/textures/model/brewery.png and b/src/main/resources/assets/botania/textures/model/brewery.png differ diff --git a/src/main/resources/assets/botania/textures/model/cloak_balance.png b/src/main/resources/assets/botania/textures/model/cloak_balance.png new file mode 100644 index 000000000..73b57a222 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/cloak_balance.png differ diff --git a/src/main/resources/assets/botania/textures/model/balancecloakglow.png b/src/main/resources/assets/botania/textures/model/cloak_balance_glow.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/balancecloakglow.png rename to src/main/resources/assets/botania/textures/model/cloak_balance_glow.png diff --git a/src/main/resources/assets/botania/textures/model/cloak_holy.png b/src/main/resources/assets/botania/textures/model/cloak_holy.png new file mode 100644 index 000000000..bfe6bac49 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/cloak_holy.png differ diff --git a/src/main/resources/assets/botania/textures/model/holycloakglow.png b/src/main/resources/assets/botania/textures/model/cloak_holy_glow.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/holycloakglow.png rename to src/main/resources/assets/botania/textures/model/cloak_holy_glow.png diff --git a/src/main/resources/assets/botania/textures/model/cloak_unholy.png b/src/main/resources/assets/botania/textures/model/cloak_unholy.png new file mode 100644 index 000000000..defad119c Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/cloak_unholy.png differ diff --git a/src/main/resources/assets/botania/textures/model/cloak_unholy_glow.png b/src/main/resources/assets/botania/textures/model/cloak_unholy_glow.png new file mode 100644 index 000000000..a09e5198b Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/cloak_unholy_glow.png differ diff --git a/src/main/resources/assets/botania/textures/model/crystalcube.png b/src/main/resources/assets/botania/textures/model/crystalcube.png deleted file mode 100644 index e1e5abc86..000000000 Binary files a/src/main/resources/assets/botania/textures/model/crystalcube.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/crystalcube_base_bottom.png b/src/main/resources/assets/botania/textures/model/crystalcube_base_bottom.png deleted file mode 100644 index dba1f2d4f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/crystalcube_base_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/crystalcube_base_sides.png b/src/main/resources/assets/botania/textures/model/crystalcube_base_sides.png deleted file mode 100644 index 16e7f03e7..000000000 Binary files a/src/main/resources/assets/botania/textures/model/crystalcube_base_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/crystalcube_base_top.png b/src/main/resources/assets/botania/textures/model/crystalcube_base_top.png deleted file mode 100644 index a35ddbecf..000000000 Binary files a/src/main/resources/assets/botania/textures/model/crystalcube_base_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/crystalcube_cube.png b/src/main/resources/assets/botania/textures/model/crystalcube_cube.png deleted file mode 100644 index 967fa8b5f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/crystalcube_cube.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/crystalcube_stand.png b/src/main/resources/assets/botania/textures/model/crystalcube_stand.png deleted file mode 100644 index 7c103b949..000000000 Binary files a/src/main/resources/assets/botania/textures/model/crystalcube_stand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/dilutedpool.png b/src/main/resources/assets/botania/textures/model/dilutedpool.png deleted file mode 100644 index 7eae61d14..000000000 Binary files a/src/main/resources/assets/botania/textures/model/dilutedpool.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/elementium0.png b/src/main/resources/assets/botania/textures/model/elementium_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/elementium0.png rename to src/main/resources/assets/botania/textures/model/elementium_0.png diff --git a/src/main/resources/assets/botania/textures/model/elementium1.png b/src/main/resources/assets/botania/textures/model/elementium_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/elementium1.png rename to src/main/resources/assets/botania/textures/model/elementium_1.png diff --git a/src/main/resources/assets/botania/textures/model/elementium2.png b/src/main/resources/assets/botania/textures/model/elementium_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/elementium2.png rename to src/main/resources/assets/botania/textures/model/elementium_2.png diff --git a/src/main/resources/assets/botania/textures/model/elementium_new.png b/src/main/resources/assets/botania/textures/model/elementium_new.png new file mode 100644 index 000000000..5780cef40 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/elementium_new.png differ diff --git a/src/main/resources/assets/botania/textures/model/elementiumnew.png b/src/main/resources/assets/botania/textures/model/elementiumnew.png deleted file mode 100644 index 53db632cc..000000000 Binary files a/src/main/resources/assets/botania/textures/model/elementiumnew.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/holycloak.png b/src/main/resources/assets/botania/textures/model/holycloak.png deleted file mode 100644 index 543746c6f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/holycloak.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/infinitepool.png b/src/main/resources/assets/botania/textures/model/infinitepool.png deleted file mode 100644 index 7030a3184..000000000 Binary files a/src/main/resources/assets/botania/textures/model/infinitepool.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/lexicon_default.png b/src/main/resources/assets/botania/textures/model/lexicon_default.png new file mode 100644 index 000000000..c9eec08eb Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/lexicon_default.png differ diff --git a/src/main/resources/assets/botania/textures/model/lexica0.png b/src/main/resources/assets/botania/textures/model/lexicon_elven.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/lexica0.png rename to src/main/resources/assets/botania/textures/model/lexicon_elven.png diff --git a/src/main/resources/assets/botania/textures/model/manasteel0.png b/src/main/resources/assets/botania/textures/model/manasteel_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manasteel0.png rename to src/main/resources/assets/botania/textures/model/manasteel_0.png diff --git a/src/main/resources/assets/botania/textures/model/manasteel1.png b/src/main/resources/assets/botania/textures/model/manasteel_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manasteel1.png rename to src/main/resources/assets/botania/textures/model/manasteel_1.png diff --git a/src/main/resources/assets/botania/textures/model/manasteel2.png b/src/main/resources/assets/botania/textures/model/manasteel_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manasteel2.png rename to src/main/resources/assets/botania/textures/model/manasteel_2.png diff --git a/src/main/resources/assets/botania/textures/model/manasteel_new.png b/src/main/resources/assets/botania/textures/model/manasteel_new.png new file mode 100644 index 000000000..81d2ceddb Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/manasteel_new.png differ diff --git a/src/main/resources/assets/botania/textures/model/manasteelnew.png b/src/main/resources/assets/botania/textures/model/manasteelnew.png deleted file mode 100644 index 59da92f7e..000000000 Binary files a/src/main/resources/assets/botania/textures/model/manasteelnew.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/manaweave0.png b/src/main/resources/assets/botania/textures/model/manaweave_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manaweave0.png rename to src/main/resources/assets/botania/textures/model/manaweave_0.png diff --git a/src/main/resources/assets/botania/textures/model/manaweave1.png b/src/main/resources/assets/botania/textures/model/manaweave_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manaweave1.png rename to src/main/resources/assets/botania/textures/model/manaweave_1.png diff --git a/src/main/resources/assets/botania/textures/model/manaweave_new.png b/src/main/resources/assets/botania/textures/model/manaweave_new.png new file mode 100644 index 000000000..38af0fd03 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/manaweave_new.png differ diff --git a/src/main/resources/assets/botania/textures/model/manaweavenew.png b/src/main/resources/assets/botania/textures/model/manaweavenew.png deleted file mode 100644 index bd1618fef..000000000 Binary files a/src/main/resources/assets/botania/textures/model/manaweavenew.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/manaweavenewholiday.png b/src/main/resources/assets/botania/textures/model/manaweavenewholiday.png index e156e6b0f..ee7586044 100644 Binary files a/src/main/resources/assets/botania/textures/model/manaweavenewholiday.png and b/src/main/resources/assets/botania/textures/model/manaweavenewholiday.png differ diff --git a/src/main/resources/assets/botania/textures/model/pixie.png b/src/main/resources/assets/botania/textures/model/pixie.png index dcfb31172..03176fdb7 100644 Binary files a/src/main/resources/assets/botania/textures/model/pixie.png and b/src/main/resources/assets/botania/textures/model/pixie.png differ diff --git a/src/main/resources/assets/botania/textures/model/pixie_halloween.png b/src/main/resources/assets/botania/textures/model/pixie_halloween.png index bd734e8a4..7db8d95dc 100644 Binary files a/src/main/resources/assets/botania/textures/model/pixie_halloween.png and b/src/main/resources/assets/botania/textures/model/pixie_halloween.png differ diff --git a/src/main/resources/assets/botania/textures/model/pool.png b/src/main/resources/assets/botania/textures/model/pool.png deleted file mode 100644 index 9db5bf16b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/pool.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/pump_axle_sides.png b/src/main/resources/assets/botania/textures/model/pump_axle_sides.png deleted file mode 100644 index 9f7dc4835..000000000 Binary files a/src/main/resources/assets/botania/textures/model/pump_axle_sides.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/pump_axle_top_bottom.png b/src/main/resources/assets/botania/textures/model/pump_axle_top_bottom.png deleted file mode 100644 index f0fa8ee5d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/pump_axle_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/pump_end.png b/src/main/resources/assets/botania/textures/model/pump_end.png deleted file mode 100644 index 772dfb411..000000000 Binary files a/src/main/resources/assets/botania/textures/model/pump_end.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/pump_head.png b/src/main/resources/assets/botania/textures/model/pump_head.png deleted file mode 100644 index f25511aea..000000000 Binary files a/src/main/resources/assets/botania/textures/model/pump_head.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/pump_sheath.png b/src/main/resources/assets/botania/textures/model/pump_sheath.png deleted file mode 100644 index 5edb72600..000000000 Binary files a/src/main/resources/assets/botania/textures/model/pump_sheath.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/pylon.png b/src/main/resources/assets/botania/textures/model/pylon.png deleted file mode 100644 index ef4a3ee82..000000000 Binary files a/src/main/resources/assets/botania/textures/model/pylon.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/pylon1.png b/src/main/resources/assets/botania/textures/model/pylon1.png deleted file mode 100644 index f9e80032b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/pylon1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/pylon2.png b/src/main/resources/assets/botania/textures/model/pylon2.png deleted file mode 100644 index 975634fc1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/pylon2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/pylon_0.png b/src/main/resources/assets/botania/textures/model/pylon_0.png new file mode 100644 index 000000000..84fe6663b Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/pylon_0.png differ diff --git a/src/main/resources/assets/botania/textures/model/pylon_1.png b/src/main/resources/assets/botania/textures/model/pylon_1.png new file mode 100644 index 000000000..f87552df3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/pylon_1.png differ diff --git a/src/main/resources/assets/botania/textures/model/pylon_2.png b/src/main/resources/assets/botania/textures/model/pylon_2.png new file mode 100644 index 000000000..8974c2fde Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/pylon_2.png differ diff --git a/src/main/resources/assets/botania/textures/model/pylon_gaia.png b/src/main/resources/assets/botania/textures/model/pylon_gaia.png new file mode 100644 index 000000000..ce53b8e0e Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/pylon_gaia.png differ diff --git a/src/main/resources/assets/botania/textures/model/pylon_mana.png b/src/main/resources/assets/botania/textures/model/pylon_mana.png new file mode 100644 index 000000000..278ebee15 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/pylon_mana.png differ diff --git a/src/main/resources/assets/botania/textures/model/pylon_natura.png b/src/main/resources/assets/botania/textures/model/pylon_natura.png new file mode 100644 index 000000000..c57966eaa Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/pylon_natura.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader.png b/src/main/resources/assets/botania/textures/model/spreader.png deleted file mode 100644 index a084b253c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/spreader.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_dreamwood.png b/src/main/resources/assets/botania/textures/model/spreader_dreamwood.png new file mode 100644 index 000000000..98e4e72d2 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_dreamwood.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_dreamwood_halloween.png b/src/main/resources/assets/botania/textures/model/spreader_dreamwood_halloween.png new file mode 100644 index 000000000..34de0f362 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_dreamwood_halloween.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_gaia.png b/src/main/resources/assets/botania/textures/model/spreader_gaia.png new file mode 100644 index 000000000..7c15314f7 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_gaia.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 new file mode 100644 index 000000000..63ead32da Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_gaia_halloween.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_halloween.png b/src/main/resources/assets/botania/textures/model/spreader_halloween.png deleted file mode 100644 index 79689f1c0..000000000 Binary files a/src/main/resources/assets/botania/textures/model/spreader_halloween.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png index df635c5cc..adf3ae5ed 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png and b/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/elven_side.png b/src/main/resources/assets/botania/textures/model/spreader_item/elven_side.png index ea286b623..3321274bb 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/elven_side.png and b/src/main/resources/assets/botania/textures/model/spreader_item/elven_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png index df635c5cc..3d3f5055c 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png and b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/gaia_material.png b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_material.png new file mode 100644 index 000000000..126a35981 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_material.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/gaia_side.png b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_side.png index ea286b623..c048644d5 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/gaia_side.png and b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png index 79dcd775b..c8765746a 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png and b/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/mana_side.png b/src/main/resources/assets/botania/textures/model/spreader_item/mana_side.png index a40186110..9de97c8b9 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/mana_side.png and b/src/main/resources/assets/botania/textures/model/spreader_item/mana_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png index ea9c2889a..5b3498b1a 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png and b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_side.png b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_side.png index 593f1b1c3..eadfa4095 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_side.png and b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_mana.png b/src/main/resources/assets/botania/textures/model/spreader_mana.png new file mode 100644 index 000000000..0d0d82e0f Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_mana.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_mana_halloween.png b/src/main/resources/assets/botania/textures/model/spreader_mana_halloween.png new file mode 100644 index 000000000..0d0d82e0f Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_mana_halloween.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_redstone.png b/src/main/resources/assets/botania/textures/model/spreader_redstone.png new file mode 100644 index 000000000..4756642b5 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_redstone.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_redstone_halloween.png b/src/main/resources/assets/botania/textures/model/spreader_redstone_halloween.png new file mode 100644 index 000000000..4756642b5 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_redstone_halloween.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreaderdreamwood.png b/src/main/resources/assets/botania/textures/model/spreaderdreamwood.png deleted file mode 100644 index 030ece5d3..000000000 Binary files a/src/main/resources/assets/botania/textures/model/spreaderdreamwood.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/spreaderdreamwood_halloween.png b/src/main/resources/assets/botania/textures/model/spreaderdreamwood_halloween.png deleted file mode 100644 index 7b707e5fd..000000000 Binary files a/src/main/resources/assets/botania/textures/model/spreaderdreamwood_halloween.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/spreaderredstone.png b/src/main/resources/assets/botania/textures/model/spreaderredstone.png deleted file mode 100644 index 1cf46ea51..000000000 Binary files a/src/main/resources/assets/botania/textures/model/spreaderredstone.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/spreaderredstone_halloween.png b/src/main/resources/assets/botania/textures/model/spreaderredstone_halloween.png deleted file mode 100644 index 17d38e450..000000000 Binary files a/src/main/resources/assets/botania/textures/model/spreaderredstone_halloween.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/terrasteel0.png b/src/main/resources/assets/botania/textures/model/terrasteel_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/terrasteel0.png rename to src/main/resources/assets/botania/textures/model/terrasteel_0.png diff --git a/src/main/resources/assets/botania/textures/model/terrasteel1.png b/src/main/resources/assets/botania/textures/model/terrasteel_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/terrasteel1.png rename to src/main/resources/assets/botania/textures/model/terrasteel_1.png diff --git a/src/main/resources/assets/botania/textures/model/terrasteel2.png b/src/main/resources/assets/botania/textures/model/terrasteel_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/terrasteel2.png rename to src/main/resources/assets/botania/textures/model/terrasteel_2.png diff --git a/src/main/resources/assets/botania/textures/model/terrasteel_new.png b/src/main/resources/assets/botania/textures/model/terrasteel_new.png new file mode 100644 index 000000000..2c0701048 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/terrasteel_new.png differ diff --git a/src/main/resources/assets/botania/textures/model/terrasteelnew.png b/src/main/resources/assets/botania/textures/model/terrasteelnew.png deleted file mode 100644 index 45f985ff9..000000000 Binary files a/src/main/resources/assets/botania/textures/model/terrasteelnew.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/teruterubozu.png b/src/main/resources/assets/botania/textures/model/teruterubozu.png index 4a7b1abbe..ca690bdb3 100644 Binary files a/src/main/resources/assets/botania/textures/model/teruterubozu.png and b/src/main/resources/assets/botania/textures/model/teruterubozu.png differ diff --git a/src/main/resources/assets/botania/textures/model/tiny_potato.png b/src/main/resources/assets/botania/textures/model/tiny_potato.png new file mode 100644 index 000000000..836c8622b Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/tiny_potato.png differ diff --git a/src/main/resources/assets/botania/textures/model/tiny_potato_gray.png b/src/main/resources/assets/botania/textures/model/tiny_potato_gray.png new file mode 100644 index 000000000..85392eddb Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/tiny_potato_gray.png differ diff --git a/src/main/resources/assets/botania/textures/model/tiny_potato_halloween.png b/src/main/resources/assets/botania/textures/model/tiny_potato_halloween.png new file mode 100644 index 000000000..e7b83379f Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/tiny_potato_halloween.png differ diff --git a/src/main/resources/assets/botania/textures/model/unholycloak.png b/src/main/resources/assets/botania/textures/model/unholycloak.png deleted file mode 100644 index 7387e1465..000000000 Binary files a/src/main/resources/assets/botania/textures/model/unholycloak.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/unholycloakglow.png b/src/main/resources/assets/botania/textures/model/unholycloakglow.png deleted file mode 100644 index a98082364..000000000 Binary files a/src/main/resources/assets/botania/textures/model/unholycloakglow.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/unused/pylonold.png b/src/main/resources/assets/botania/textures/model/unused/pylonold.png deleted file mode 100644 index d5ff8f5f9..000000000 Binary files a/src/main/resources/assets/botania/textures/model/unused/pylonold.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/unused/pylonold1.png b/src/main/resources/assets/botania/textures/model/unused/pylonold1.png deleted file mode 100644 index 0a3480c9b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/unused/pylonold1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/unused/pylonold2.png b/src/main/resources/assets/botania/textures/model/unused/pylonold2.png deleted file mode 100644 index 1dd6693bd..000000000 Binary files a/src/main/resources/assets/botania/textures/model/unused/pylonold2.png and /dev/null differ