diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index ffcf20553..6ef1d250d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -22,7 +22,6 @@ import vazkii.botania.client.model.PlatformModel; import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; -import vazkii.botania.common.lib.LibMisc; public class MiscellaneousIcons { @@ -91,50 +90,50 @@ public class MiscellaneousIcons { new LexiconModel(new ModelResourceLocation("botania:lexicon_elven", "inventory"))); // Mana Blaster - ModelResourceLocation key = new ModelResourceLocation("botania:manaGun", "inventory"); + ModelResourceLocation key = new ModelResourceLocation("botania:managun", "inventory"); IBakedModel originalModel = evt.getModelRegistry().getObject(key); evt.getModelRegistry().putObject(key, new GunModel(originalModel)); - key = new ModelResourceLocation("botania:manaGunClip", "inventory"); + key = new ModelResourceLocation("botania:managunclip", "inventory"); originalModel = evt.getModelRegistry().getObject(key); evt.getModelRegistry().putObject(key, new GunModel(originalModel)); } @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre evt) { - alfPortalTex = IconHelper.forName(evt.getMap(), "alfheimPortalInside", "blocks"); - lightRelayWorldIcon = IconHelper.forName(evt.getMap(), "lightRelay1", "blocks"); - lightRelayWorldIconRed = IconHelper.forName(evt.getMap(), "lightRelay3", "blocks"); - lightRelayWorldIconGreen = IconHelper.forName(evt.getMap(), "lightRelay5", "blocks"); - lightRelayWorldIconPurple = IconHelper.forName(evt.getMap(), "lightRelay7", "blocks"); - alchemyCatalystOverlay = IconHelper.forName(evt.getMap(), "alchemyCatalyst3", "blocks"); - conjurationCatalystOverlay = IconHelper.forName(evt.getMap(), "conjurationCatalyst3", "blocks"); - enchanterOverlay = IconHelper.forName(evt.getMap(), "enchanterOverlay", "blocks"); - manaVoidOverlay = IconHelper.forName(evt.getMap(), "manaVoid1", "blocks"); + alfPortalTex = IconHelper.forName(evt.getMap(), "alfheim_portal_swirl", "blocks"); + lightRelayWorldIcon = IconHelper.forName(evt.getMap(), "luminizer", "blocks"); + lightRelayWorldIconRed = IconHelper.forName(evt.getMap(), "luminizer_detector", "blocks"); + lightRelayWorldIconGreen = IconHelper.forName(evt.getMap(), "luminizer_fork", "blocks"); + lightRelayWorldIconPurple = IconHelper.forName(evt.getMap(), "luminizer_toggle", "blocks"); + alchemyCatalystOverlay = IconHelper.forName(evt.getMap(), "alchemy_catalyst_overlay", "blocks"); + conjurationCatalystOverlay = IconHelper.forName(evt.getMap(), "conjuration_catalyst_overlay", "blocks"); + enchanterOverlay = IconHelper.forName(evt.getMap(), "enchanter_overlay", "blocks"); + manaVoidOverlay = IconHelper.forName(evt.getMap(), "mana_void_overlay", "blocks"); manaWater = IconHelper.forName(evt.getMap(), "mana_water", "blocks"); - terraPlateOverlay = IconHelper.forName(evt.getMap(), "terraPlateOverlay", "blocks"); - corporeaWorldIcon = IconHelper.forName(evt.getMap(), "corporeaSpark1", "items"); - corporeaWorldIconMaster = IconHelper.forName(evt.getMap(), "corporeaSpark3", "items"); - corporeaIconStar = IconHelper.forName(evt.getMap(), "corporeaSparkStar", "items"); - sparkWorldIcon = IconHelper.forName(evt.getMap(), "spark1", "items"); + terraPlateOverlay = IconHelper.forName(evt.getMap(), "terra_plate_overlay", "blocks"); + corporeaWorldIcon = IconHelper.forName(evt.getMap(), "spark_corporea", "items"); + corporeaWorldIconMaster = IconHelper.forName(evt.getMap(), "spark_corporea_master", "items"); + corporeaIconStar = IconHelper.forName(evt.getMap(), "spark_corporea_star", "items"); + sparkWorldIcon = IconHelper.forName(evt.getMap(), "spark", "items"); sparkUpgradeIcons = new TextureAtlasSprite[ItemSparkUpgrade.VARIANTS]; for(int i = 0; i < ItemSparkUpgrade.VARIANTS; i++) { - sparkUpgradeIcons[i] = IconHelper.forName(evt.getMap(), "sparkUpgradeL" + i, "items"); + sparkUpgradeIcons[i] = IconHelper.forName(evt.getMap(), "spark_upgrade_rune_" + i, "items"); } - tailIcon = IconHelper.forName(evt.getMap(), "tail", "items"); - phiFlowerIcon = IconHelper.forName(evt.getMap(), "phiFlower", "items"); - goldfishIcon = IconHelper.forName(evt.getMap(), "goldfish", "items"); + tailIcon = IconHelper.forName(evt.getMap(), "special_tail", "items"); + phiFlowerIcon = IconHelper.forName(evt.getMap(), "special_phiflower", "items"); + goldfishIcon = IconHelper.forName(evt.getMap(), "special_goldfish", "items"); nerfBatIcon = IconHelper.forName(evt.getMap(), "special_nerfbat", "items"); kingKeyWeaponIcons = new TextureAtlasSprite[ItemKingKey.WEAPON_TYPES]; for(int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) - kingKeyWeaponIcons[i] = IconHelper.forName(evt.getMap(), "gateWeapon" + i, "items"); + kingKeyWeaponIcons[i] = IconHelper.forName(evt.getMap(), "gate_weapon_" + i, "items"); thirdEyeLayers = new TextureAtlasSprite[3]; for(int i = 0; i < 3; i++) - thirdEyeLayers[i] = IconHelper.forName(evt.getMap(), "thirdEye" + i, "items"); + thirdEyeLayers[i] = IconHelper.forName(evt.getMap(), "third_eye_" + i, "items"); manaDetectorIcon = IconHelper.forName(evt.getMap(), "triggers/manaDetector", "items"); runeAltarTriggerIcon = IconHelper.forName(evt.getMap(), "triggers/runeAltarCanCraft", "items"); @@ -145,15 +144,15 @@ public class MiscellaneousIcons { tiaraWingIcons = new TextureAtlasSprite[ItemFlightTiara.WING_TYPES]; for (int i = 0; i < tiaraWingIcons.length; i++) { - tiaraWingIcons[i] = IconHelper.forName(evt.getMap(), "flightTiara" + (i + 1), "items"); + tiaraWingIcons[i] = IconHelper.forName(evt.getMap(), "headpiece_tiara_wing_" + i, "items"); } terrasteelHelmWillIcon = IconHelper.forName(evt.getMap(), "willFlame", "items"); - bloodPendantChain = IconHelper.forName(evt.getMap(), "bloodPendant2", "items"); - bloodPendantGem = IconHelper.forName(evt.getMap(), "bloodPendant3", "items"); + bloodPendantChain = IconHelper.forName(evt.getMap(), "pendant_blood_chain", "items"); + bloodPendantGem = IconHelper.forName(evt.getMap(), "pendant_blood_gem", "items"); snowflakePendantGem = IconHelper.forName(evt.getMap(), "pendant_ice_gem", "items"); - itemFinderGem = IconHelper.forName(evt.getMap(), "itemFinderGem", "items"); + itemFinderGem = IconHelper.forName(evt.getMap(), "headpiece_item_finder_gem", "items"); pyroclastGem = IconHelper.forName(evt.getMap(), "pendant_lava_gem", "items"); crimsonGem = IconHelper.forName(evt.getMap(), "pendant_lava_super_gem", "items"); cirrusGem = IconHelper.forName(evt.getMap(), "pendant_cloud_gem", "items"); 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 3ec211103..7be7a9594 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -10,6 +10,12 @@ */ package vazkii.botania.client.render.tile; +import java.util.Random; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -20,7 +26,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -34,10 +39,6 @@ import vazkii.botania.client.model.ModelPylonNatura; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePylon; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.Random; - public class RenderTilePylon extends TileEntitySpecialRenderer { private static final ResourceLocation MANA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_MANA); @@ -90,11 +91,16 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { double worldTime = (double) (ClientTickHandler.ticksInGame + pticks); worldTime += renderingItem ? 0 : new Random(pylon.getPos().hashCode()).nextInt(360); - + + /* GlStateManager.translate(d0 + 0.2 + (type == PylonVariant.NATURA ? -0.1 : 0), d1 + 0.05, d2 + 0.8 + (type == PylonVariant.NATURA ? 0.1 : 0)); float scale = type == PylonVariant.NATURA ? 0.8F : 0.6F; GlStateManager.scale(scale, 0.6F, scale); - + */ + + GlStateManager.translate(d0, d1 + 1.5, d2); + GlStateManager.scale(1.0F, -1.0F, -1.0F); + GlStateManager.pushMatrix(); GlStateManager.translate(0.5F, 0F, -0.5F); if(!renderingItem) @@ -134,7 +140,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { GlStateManager.translate(-0.05F, -0.1F, 0.05F); ShaderHelper.useShader(ShaderHelper.pylonGlow); - model.renderCrystal(); + //model.renderCrystal(); ShaderHelper.releaseShader(); GlStateManager.enableAlpha(); diff --git a/src/main/resources/assets/botania/models/block/alchemy_catalyst.json b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json index 00c05b068..2167065e6 100644 --- a/src/main/resources/assets/botania/models/block/alchemy_catalyst.json +++ b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/alchemycatalyst0", - "top": "botania:blocks/alchemycatalyst1", - "side": "botania:blocks/alchemycatalyst2" + "bottom": "botania:blocks/alchemy_catalyst_bottom", + "top": "botania:blocks/alchemy_catalyst_top", + "side": "botania:blocks/alchemy_catalyst_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/conjuration_catalyst.json b/src/main/resources/assets/botania/models/block/conjuration_catalyst.json index 47448031d..1f94f3c9b 100644 --- a/src/main/resources/assets/botania/models/block/conjuration_catalyst.json +++ b/src/main/resources/assets/botania/models/block/conjuration_catalyst.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/conjurationcatalyst0", - "top": "botania:blocks/conjurationcatalyst1", - "side": "botania:blocks/conjurationcatalyst2" + "bottom": "botania:blocks/conjuration_catalyst_bottom", + "top": "botania:blocks/conjuration_catalyst_top", + "side": "botania:blocks/conjuration_catalyst_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_fluxfield.json b/src/main/resources/assets/botania/models/block/mana_fluxfield.json index d47b333db..6e2875cbc 100644 --- a/src/main/resources/assets/botania/models/block/mana_fluxfield.json +++ b/src/main/resources/assets/botania/models/block/mana_fluxfield.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/rfgenerator" + "all": "botania:blocks/mana_fluxfield" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_void.json b/src/main/resources/assets/botania/models/block/mana_void.json index 7c67e6732..41c535269 100644 --- a/src/main/resources/assets/botania/models/block/mana_void.json +++ b/src/main/resources/assets/botania/models/block/mana_void.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manavoid0" + "all": "botania:blocks/mana_void" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_comparator.json b/src/main/resources/assets/botania/models/block/red_string_comparator.json index a3a4479da..b305428b9 100644 --- a/src/main/resources/assets/botania/models/block/red_string_comparator.json +++ b/src/main/resources/assets/botania/models/block/red_string_comparator.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redstringcomparator", - "front": "botania:blocks/redstringsender", - "side": "botania:blocks/redstringcomparator" + "top": "botania:blocks/red_string_comparator", + "front": "botania:blocks/red_string_sender", + "side": "botania:blocks/red_string_comparator" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_container.json b/src/main/resources/assets/botania/models/block/red_string_container.json index c15f416bf..b0f50fb90 100644 --- a/src/main/resources/assets/botania/models/block/red_string_container.json +++ b/src/main/resources/assets/botania/models/block/red_string_container.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redstringcontainer", - "front": "botania:blocks/redstringsender", - "side": "botania:blocks/redstringcontainer" + "top": "botania:blocks/red_string_container", + "front": "botania:blocks/red_string_sender", + "side": "botania:blocks/red_string_container" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_dispenser.json b/src/main/resources/assets/botania/models/block/red_string_dispenser.json index bc13dab7f..3f9e20f7b 100644 --- a/src/main/resources/assets/botania/models/block/red_string_dispenser.json +++ b/src/main/resources/assets/botania/models/block/red_string_dispenser.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redstringdispenser", - "front": "botania:blocks/redstringsender", - "side": "botania:blocks/redstringdispenser" + "top": "botania:blocks/red_string_dispenser", + "front": "botania:blocks/red_string_sender", + "side": "botania:blocks/red_string_dispenser" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_fertilizer.json b/src/main/resources/assets/botania/models/block/red_string_fertilizer.json index 994fcf8f3..14e47a8cf 100644 --- a/src/main/resources/assets/botania/models/block/red_string_fertilizer.json +++ b/src/main/resources/assets/botania/models/block/red_string_fertilizer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redstringfertilizer", - "front": "botania:blocks/redstringsender", - "side": "botania:blocks/redstringfertilizer" + "top": "botania:blocks/red_string_fertilizer", + "front": "botania:blocks/red_string_sender", + "side": "botania:blocks/red_string_fertilizer" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_interceptor.json b/src/main/resources/assets/botania/models/block/red_string_interceptor.json index 80c3d7a76..62977fcb1 100644 --- a/src/main/resources/assets/botania/models/block/red_string_interceptor.json +++ b/src/main/resources/assets/botania/models/block/red_string_interceptor.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redstringinterceptor", - "front": "botania:blocks/redstringsender", - "side": "botania:blocks/redstringinterceptor" + "top": "botania:blocks/red_string_interceptor", + "front": "botania:blocks/red_string_sender", + "side": "botania:blocks/red_string_interceptor" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_relay.json b/src/main/resources/assets/botania/models/block/red_string_relay.json index 212ee770d..a520cd0a4 100644 --- a/src/main/resources/assets/botania/models/block/red_string_relay.json +++ b/src/main/resources/assets/botania/models/block/red_string_relay.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redstringrelay", - "front": "botania:blocks/redstringsender", - "side": "botania:blocks/redstringrelay" + "top": "botania:blocks/red_string_relay", + "front": "botania:blocks/red_string_sender", + "side": "botania:blocks/red_string_relay" } } \ 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 43f9a6150..b58dd7e46 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/headpiece_itemfinder" + "layer0": "botania:items/headpiece_item_finder" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensbounce.json b/src/main/resources/assets/botania/models/item/lensbounce.json index 4378f7e7f..2ef9ff119 100644 --- a/src/main/resources/assets/botania/models/item/lensbounce.json +++ b/src/main/resources/assets/botania/models/item/lensbounce.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensbounce" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_bounce" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensdamage.json b/src/main/resources/assets/botania/models/item/lensdamage.json index 38820b593..f13d73d06 100644 --- a/src/main/resources/assets/botania/models/item/lensdamage.json +++ b/src/main/resources/assets/botania/models/item/lensdamage.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensdamage" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_damage" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensefficiency.json b/src/main/resources/assets/botania/models/item/lensefficiency.json index 0e6729d7e..3b6d52180 100644 --- a/src/main/resources/assets/botania/models/item/lensefficiency.json +++ b/src/main/resources/assets/botania/models/item/lensefficiency.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensefficiency" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_efficiency" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensexplosive.json b/src/main/resources/assets/botania/models/item/lensexplosive.json index d884f7908..8a4301d87 100644 --- a/src/main/resources/assets/botania/models/item/lensexplosive.json +++ b/src/main/resources/assets/botania/models/item/lensexplosive.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensexplosive" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_explosive" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensfire.json b/src/main/resources/assets/botania/models/item/lensfire.json index 2348ae544..f0d011226 100644 --- a/src/main/resources/assets/botania/models/item/lensfire.json +++ b/src/main/resources/assets/botania/models/item/lensfire.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensfire" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_fire" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensfirework.json b/src/main/resources/assets/botania/models/item/lensfirework.json index 93f168c0b..32cff0b16 100644 --- a/src/main/resources/assets/botania/models/item/lensfirework.json +++ b/src/main/resources/assets/botania/models/item/lensfirework.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensfirework" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_firework" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensflare.json b/src/main/resources/assets/botania/models/item/lensflare.json index 980d32062..5ef84c01e 100644 --- a/src/main/resources/assets/botania/models/item/lensflare.json +++ b/src/main/resources/assets/botania/models/item/lensflare.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensflare" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_flare" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensgravity.json b/src/main/resources/assets/botania/models/item/lensgravity.json index 5bf96e98d..3a2e039ac 100644 --- a/src/main/resources/assets/botania/models/item/lensgravity.json +++ b/src/main/resources/assets/botania/models/item/lensgravity.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensgravity" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_gravity" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensinfluence.json b/src/main/resources/assets/botania/models/item/lensinfluence.json index ffd4029e8..5e5565ae3 100644 --- a/src/main/resources/assets/botania/models/item/lensinfluence.json +++ b/src/main/resources/assets/botania/models/item/lensinfluence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensinfluence" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_influence" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenslight.json b/src/main/resources/assets/botania/models/item/lenslight.json index c486c60ae..7fdf39f89 100644 --- a/src/main/resources/assets/botania/models/item/lenslight.json +++ b/src/main/resources/assets/botania/models/item/lenslight.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lenslight" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_light" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensmagnet.json b/src/main/resources/assets/botania/models/item/lensmagnet.json index 2ff9465eb..9e4c99c1a 100644 --- a/src/main/resources/assets/botania/models/item/lensmagnet.json +++ b/src/main/resources/assets/botania/models/item/lensmagnet.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensmagnet" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_magnet" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensmessenger.json b/src/main/resources/assets/botania/models/item/lensmessenger.json index 191d3084c..c68eb4125 100644 --- a/src/main/resources/assets/botania/models/item/lensmessenger.json +++ b/src/main/resources/assets/botania/models/item/lensmessenger.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensmessenger" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_messenger" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensmine.json b/src/main/resources/assets/botania/models/item/lensmine.json index 6bfc5b5d8..aa1a12ef9 100644 --- a/src/main/resources/assets/botania/models/item/lensmine.json +++ b/src/main/resources/assets/botania/models/item/lensmine.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensmine" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_mine" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensnormal.json b/src/main/resources/assets/botania/models/item/lensnormal.json index 0f242e7cd..2b551ce8b 100644 --- a/src/main/resources/assets/botania/models/item/lensnormal.json +++ b/src/main/resources/assets/botania/models/item/lensnormal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensnormal" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_normal" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenspaint.json b/src/main/resources/assets/botania/models/item/lenspaint.json index 2b1b98ccc..990d5ffb3 100644 --- a/src/main/resources/assets/botania/models/item/lenspaint.json +++ b/src/main/resources/assets/botania/models/item/lenspaint.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lenspaint" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_paint" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensphantom.json b/src/main/resources/assets/botania/models/item/lensphantom.json index d5ffbf301..8693b81ae 100644 --- a/src/main/resources/assets/botania/models/item/lensphantom.json +++ b/src/main/resources/assets/botania/models/item/lensphantom.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensphantom" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_phantom" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenspiston.json b/src/main/resources/assets/botania/models/item/lenspiston.json index 381a4521e..eed9807c4 100644 --- a/src/main/resources/assets/botania/models/item/lenspiston.json +++ b/src/main/resources/assets/botania/models/item/lenspiston.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lenspiston" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_piston" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenspower.json b/src/main/resources/assets/botania/models/item/lenspower.json index 19d999568..320a9c022 100644 --- a/src/main/resources/assets/botania/models/item/lenspower.json +++ b/src/main/resources/assets/botania/models/item/lenspower.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lenspower" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_power" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensredirect.json b/src/main/resources/assets/botania/models/item/lensredirect.json index 26daf6d62..8dbae0d9b 100644 --- a/src/main/resources/assets/botania/models/item/lensredirect.json +++ b/src/main/resources/assets/botania/models/item/lensredirect.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensredirect" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_redirect" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensspeed.json b/src/main/resources/assets/botania/models/item/lensspeed.json index c868f4bec..9d5315634 100644 --- a/src/main/resources/assets/botania/models/item/lensspeed.json +++ b/src/main/resources/assets/botania/models/item/lensspeed.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensspeed" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_speed" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenstime.json b/src/main/resources/assets/botania/models/item/lenstime.json index ecafbdf3b..7a18dfe2e 100644 --- a/src/main/resources/assets/botania/models/item/lenstime.json +++ b/src/main/resources/assets/botania/models/item/lenstime.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lenstime" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_time" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenstripwire.json b/src/main/resources/assets/botania/models/item/lenstripwire.json index 55d997160..fc550fc1d 100644 --- a/src/main/resources/assets/botania/models/item/lenstripwire.json +++ b/src/main/resources/assets/botania/models/item/lenstripwire.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lenstripwire" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_tripwire" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenswarp.json b/src/main/resources/assets/botania/models/item/lenswarp.json index 8216f761d..0d493f828 100644 --- a/src/main/resources/assets/botania/models/item/lenswarp.json +++ b/src/main/resources/assets/botania/models/item/lenswarp.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lenswarp" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_warp" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensweight.json b/src/main/resources/assets/botania/models/item/lensweight.json index f4de36db0..afea664db 100644 --- a/src/main/resources/assets/botania/models/item/lensweight.json +++ b/src/main/resources/assets/botania/models/item/lensweight.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lensinside", - "layer1": "botania:items/lensweight" + "layer0": "botania:items/lens_inside", + "layer1": "botania:items/lens_weight" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thirdeye.json b/src/main/resources/assets/botania/models/item/thirdeye.json index e0314983e..785a5f8b5 100644 --- a/src/main/resources/assets/botania/models/item/thirdeye.json +++ b/src/main/resources/assets/botania/models/item/thirdeye.json @@ -1,8 +1,8 @@ { "parent": "item/generated", "textures": { - "layer0": "botania:items/thirdeye0", - "layer1": "botania:items/thirdeye1", - "layer2": "botania:items/thirdeye2" + "layer0": "botania:items/third_eye_0", + "layer1": "botania:items/third_eye_1", + "layer2": "botania:items/third_eye_2" } } diff --git a/src/main/resources/assets/botania/textures/blocks/alchemycatalyst0.png b/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alchemycatalyst0.png rename to src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_bottom.png diff --git a/src/main/resources/assets/botania/textures/blocks/alchemycatalyst3.png b/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alchemycatalyst3.png rename to src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_overlay.png diff --git a/src/main/resources/assets/botania/textures/blocks/alchemycatalyst2.png b/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alchemycatalyst2.png rename to src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/alchemycatalyst1.png b/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alchemycatalyst1.png rename to src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_top.png diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png b/src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png index 36acfdf82..a241d3e02 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png and b/src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/biomestone12.png b/src/main/resources/assets/botania/textures/blocks/biomestone12.png index 92e030511..71596c937 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/biomestone12.png and b/src/main/resources/assets/botania/textures/blocks/biomestone12.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/biomestone13.png b/src/main/resources/assets/botania/textures/blocks/biomestone13.png index 3b76296d8..79af06c73 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/biomestone13.png and b/src/main/resources/assets/botania/textures/blocks/biomestone13.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/biomestone8.png b/src/main/resources/assets/botania/textures/blocks/biomestone8.png index ffbf69714..a8256b531 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/biomestone8.png and b/src/main/resources/assets/botania/textures/blocks/biomestone8.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/conjurationcatalyst0.png b/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/conjurationcatalyst0.png rename to src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_bottom.png diff --git a/src/main/resources/assets/botania/textures/blocks/conjurationcatalyst3.png b/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/conjurationcatalyst3.png rename to src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_overlay.png diff --git a/src/main/resources/assets/botania/textures/blocks/conjurationcatalyst2.png b/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/conjurationcatalyst2.png rename to src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/conjurationcatalyst1.png b/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/conjurationcatalyst1.png rename to src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_top.png diff --git a/src/main/resources/assets/botania/textures/blocks/enchanter_overlay.png b/src/main/resources/assets/botania/textures/blocks/enchanter_overlay.png new file mode 100644 index 000000000..7f81e8aba Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/enchanter_overlay.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/enchanteroverlay.png b/src/main/resources/assets/botania/textures/blocks/enchanteroverlay.png deleted file mode 100644 index 84f51beb9..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/enchanteroverlay.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/flower5.png b/src/main/resources/assets/botania/textures/blocks/flower5.png index 0ae18ea3b..89879f349 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/flower5.png and b/src/main/resources/assets/botania/textures/blocks/flower5.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/flower5tall0.png b/src/main/resources/assets/botania/textures/blocks/flower5tall0.png index 338c2732e..58e902fe4 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/flower5tall0.png and b/src/main/resources/assets/botania/textures/blocks/flower5tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/flower5tall1.png b/src/main/resources/assets/botania/textures/blocks/flower5tall1.png index c62f66195..77c45aca9 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/flower5tall1.png and b/src/main/resources/assets/botania/textures/blocks/flower5tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/flowerglimmering5.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering5.png index af21c2607..8eaedc827 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/flowerglimmering5.png and b/src/main/resources/assets/botania/textures/blocks/flowerglimmering5.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/redstringrelay.png b/src/main/resources/assets/botania/textures/blocks/mana_fluxfield.png similarity index 88% rename from src/main/resources/assets/botania/textures/blocks/redstringrelay.png rename to src/main/resources/assets/botania/textures/blocks/mana_fluxfield.png index 00ca36782..db35d9318 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringrelay.png and b/src/main/resources/assets/botania/textures/blocks/mana_fluxfield.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/manavoid0.png b/src/main/resources/assets/botania/textures/blocks/mana_void.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manavoid0.png rename to src/main/resources/assets/botania/textures/blocks/mana_void.png diff --git a/src/main/resources/assets/botania/textures/blocks/manavoid1.png b/src/main/resources/assets/botania/textures/blocks/mana_void_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manavoid1.png rename to src/main/resources/assets/botania/textures/blocks/mana_void_overlay.png diff --git a/src/main/resources/assets/botania/textures/blocks/redstringcomparator.png b/src/main/resources/assets/botania/textures/blocks/red_string_comparator.png similarity index 88% rename from src/main/resources/assets/botania/textures/blocks/redstringcomparator.png rename to src/main/resources/assets/botania/textures/blocks/red_string_comparator.png index f788005b1..789f63d67 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringcomparator.png and b/src/main/resources/assets/botania/textures/blocks/red_string_comparator.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/redstringpattern.psd b/src/main/resources/assets/botania/textures/blocks/red_string_container.png similarity index 51% rename from src/main/resources/assets/botania/textures/blocks/redstringpattern.psd rename to src/main/resources/assets/botania/textures/blocks/red_string_container.png index 12d7b1942..fc2d887fb 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringpattern.psd and b/src/main/resources/assets/botania/textures/blocks/red_string_container.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/red_string_dispenser.png b/src/main/resources/assets/botania/textures/blocks/red_string_dispenser.png new file mode 100644 index 000000000..93fce8bfc Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/red_string_dispenser.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/red_string_fertilizer.png b/src/main/resources/assets/botania/textures/blocks/red_string_fertilizer.png new file mode 100644 index 000000000..b7a3e2946 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/red_string_fertilizer.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/red_string_interceptor.png b/src/main/resources/assets/botania/textures/blocks/red_string_interceptor.png new file mode 100644 index 000000000..13ef44c8a Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/red_string_interceptor.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/red_string_relay.png b/src/main/resources/assets/botania/textures/blocks/red_string_relay.png new file mode 100644 index 000000000..358b00239 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/red_string_relay.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/red_string_sender.png b/src/main/resources/assets/botania/textures/blocks/red_string_sender.png new file mode 100644 index 000000000..a72c3c99f Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/red_string_sender.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/redstringdispenser.png b/src/main/resources/assets/botania/textures/blocks/redstringdispenser.png deleted file mode 100644 index 926be9e4a..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringdispenser.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/redstringfertilizer.png b/src/main/resources/assets/botania/textures/blocks/redstringfertilizer.png deleted file mode 100644 index 922e5d80e..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringfertilizer.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/redstringinterceptor.png b/src/main/resources/assets/botania/textures/blocks/redstringinterceptor.png deleted file mode 100644 index 19e7a4dab..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringinterceptor.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/redstringsender.png b/src/main/resources/assets/botania/textures/blocks/redstringsender.png deleted file mode 100644 index f455e78c2..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringsender.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/rfgenerator.png b/src/main/resources/assets/botania/textures/blocks/rfgenerator.png deleted file mode 100644 index c2ea2e1f0..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/rfgenerator.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/redstringcontainer.png b/src/main/resources/assets/botania/textures/blocks/terra_plate_overlay.png similarity index 89% rename from src/main/resources/assets/botania/textures/blocks/redstringcontainer.png rename to src/main/resources/assets/botania/textures/blocks/terra_plate_overlay.png index c258d5b74..a95a9776b 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/redstringcontainer.png and b/src/main/resources/assets/botania/textures/blocks/terra_plate_overlay.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/terraplateoverlay.png b/src/main/resources/assets/botania/textures/blocks/terraplateoverlay.png deleted file mode 100644 index 5ab668922..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/terraplateoverlay.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/endalea.png b/src/main/resources/assets/botania/textures/blocks/unused/endalea.png deleted file mode 100644 index defd6e14c..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/endalea.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/manabeacon0.png b/src/main/resources/assets/botania/textures/blocks/unused/manabeacon0.png deleted file mode 100644 index c3173b591..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/manabeacon0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/manabeacon1.png b/src/main/resources/assets/botania/textures/blocks/unused/manabeacon1.png deleted file mode 100644 index b1da6eb2b..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/manabeacon1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/unstableblock.png b/src/main/resources/assets/botania/textures/blocks/unused/unstableblock.png deleted file mode 100644 index dd3236d39..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/unstableblock.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/cacophonium.png b/src/main/resources/assets/botania/textures/items/cacophonium.png index aeef70a51..947f84239 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/charm_diva.png b/src/main/resources/assets/botania/textures/items/charm_diva.png index 9ca3e0620..412955928 100644 Binary files a/src/main/resources/assets/botania/textures/items/charm_diva.png and b/src/main/resources/assets/botania/textures/items/charm_diva.png differ diff --git a/src/main/resources/assets/botania/textures/items/dye.png b/src/main/resources/assets/botania/textures/items/dye.png index 4d85c9f4b..7eaa2e182 100644 Binary files a/src/main/resources/assets/botania/textures/items/dye.png and b/src/main/resources/assets/botania/textures/items/dye.png differ diff --git a/src/main/resources/assets/botania/textures/items/gateweapon0.png b/src/main/resources/assets/botania/textures/items/gate_weapon_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon0.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_0.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon1.png b/src/main/resources/assets/botania/textures/items/gate_weapon_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon1.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_1.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon10.png b/src/main/resources/assets/botania/textures/items/gate_weapon_10.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon10.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_10.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon11.png b/src/main/resources/assets/botania/textures/items/gate_weapon_11.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon11.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_11.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon2.png b/src/main/resources/assets/botania/textures/items/gate_weapon_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon2.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_2.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon3.png b/src/main/resources/assets/botania/textures/items/gate_weapon_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon3.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_3.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon4.png b/src/main/resources/assets/botania/textures/items/gate_weapon_4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon4.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_4.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon5.png b/src/main/resources/assets/botania/textures/items/gate_weapon_5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon5.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_5.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon6.png b/src/main/resources/assets/botania/textures/items/gate_weapon_6.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon6.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_6.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon7.png b/src/main/resources/assets/botania/textures/items/gate_weapon_7.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon7.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_7.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon8.png b/src/main/resources/assets/botania/textures/items/gate_weapon_8.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon8.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_8.png diff --git a/src/main/resources/assets/botania/textures/items/gateweapon9.png b/src/main/resources/assets/botania/textures/items/gate_weapon_9.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateweapon9.png rename to src/main/resources/assets/botania/textures/items/gate_weapon_9.png diff --git a/src/main/resources/assets/botania/textures/items/headpiece_itemfinder.png b/src/main/resources/assets/botania/textures/items/headpiece_item_finder.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/headpiece_itemfinder.png rename to src/main/resources/assets/botania/textures/items/headpiece_item_finder.png diff --git a/src/main/resources/assets/botania/textures/items/itemfindergem.png b/src/main/resources/assets/botania/textures/items/headpiece_item_finder_gem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/itemfindergem.png rename to src/main/resources/assets/botania/textures/items/headpiece_item_finder_gem.png diff --git a/src/main/resources/assets/botania/textures/items/flighttiara1.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flighttiara1.png rename to src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_0.png diff --git a/src/main/resources/assets/botania/textures/items/flighttiara2.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flighttiara2.png rename to src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_2.png diff --git a/src/main/resources/assets/botania/textures/items/flighttiara3.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flighttiara3.png rename to src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_3.png diff --git a/src/main/resources/assets/botania/textures/items/flighttiara4.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flighttiara4.png rename to src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_4.png diff --git a/src/main/resources/assets/botania/textures/items/flighttiara5.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flighttiara5.png rename to src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_5.png diff --git a/src/main/resources/assets/botania/textures/items/flighttiara6.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_6.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flighttiara6.png rename to src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_6.png diff --git a/src/main/resources/assets/botania/textures/items/flighttiara7.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_7.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flighttiara7.png rename to src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_7.png diff --git a/src/main/resources/assets/botania/textures/items/flighttiara8.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_8.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flighttiara8.png rename to src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_8.png diff --git a/src/main/resources/assets/botania/textures/items/flighttiara9.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_9.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flighttiara9.png rename to src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_9.png diff --git a/src/main/resources/assets/botania/textures/items/flighttiara9.png.mcmeta b/src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_9.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/flighttiara9.png.mcmeta rename to src/main/resources/assets/botania/textures/items/headpiece_tiara_wing_9.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/lensbounce.png b/src/main/resources/assets/botania/textures/items/lens_bounce.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensbounce.png rename to src/main/resources/assets/botania/textures/items/lens_bounce.png diff --git a/src/main/resources/assets/botania/textures/items/lensdamage.png b/src/main/resources/assets/botania/textures/items/lens_damage.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensdamage.png rename to src/main/resources/assets/botania/textures/items/lens_damage.png diff --git a/src/main/resources/assets/botania/textures/items/lensefficiency.png b/src/main/resources/assets/botania/textures/items/lens_efficiency.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensefficiency.png rename to src/main/resources/assets/botania/textures/items/lens_efficiency.png diff --git a/src/main/resources/assets/botania/textures/items/lensexplosive.png b/src/main/resources/assets/botania/textures/items/lens_explosive.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensexplosive.png rename to src/main/resources/assets/botania/textures/items/lens_explosive.png diff --git a/src/main/resources/assets/botania/textures/items/lensfire.png b/src/main/resources/assets/botania/textures/items/lens_fire.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensfire.png rename to src/main/resources/assets/botania/textures/items/lens_fire.png diff --git a/src/main/resources/assets/botania/textures/items/lensfirework.png b/src/main/resources/assets/botania/textures/items/lens_firework.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensfirework.png rename to src/main/resources/assets/botania/textures/items/lens_firework.png diff --git a/src/main/resources/assets/botania/textures/items/lensflare.png b/src/main/resources/assets/botania/textures/items/lens_flare.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensflare.png rename to src/main/resources/assets/botania/textures/items/lens_flare.png diff --git a/src/main/resources/assets/botania/textures/items/lensgravity.png b/src/main/resources/assets/botania/textures/items/lens_gravity.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensgravity.png rename to src/main/resources/assets/botania/textures/items/lens_gravity.png diff --git a/src/main/resources/assets/botania/textures/items/lensinfluence.png b/src/main/resources/assets/botania/textures/items/lens_influence.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensinfluence.png rename to src/main/resources/assets/botania/textures/items/lens_influence.png diff --git a/src/main/resources/assets/botania/textures/items/lensinside.png b/src/main/resources/assets/botania/textures/items/lens_inside.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensinside.png rename to src/main/resources/assets/botania/textures/items/lens_inside.png diff --git a/src/main/resources/assets/botania/textures/items/lenslight.png b/src/main/resources/assets/botania/textures/items/lens_light.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lenslight.png rename to src/main/resources/assets/botania/textures/items/lens_light.png diff --git a/src/main/resources/assets/botania/textures/items/lensmagnet.png b/src/main/resources/assets/botania/textures/items/lens_magnet.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensmagnet.png rename to src/main/resources/assets/botania/textures/items/lens_magnet.png diff --git a/src/main/resources/assets/botania/textures/items/lensmessenger.png b/src/main/resources/assets/botania/textures/items/lens_messenger.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensmessenger.png rename to src/main/resources/assets/botania/textures/items/lens_messenger.png diff --git a/src/main/resources/assets/botania/textures/items/lensmine.png b/src/main/resources/assets/botania/textures/items/lens_mine.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensmine.png rename to src/main/resources/assets/botania/textures/items/lens_mine.png diff --git a/src/main/resources/assets/botania/textures/items/lensnormal.png b/src/main/resources/assets/botania/textures/items/lens_normal.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensnormal.png rename to src/main/resources/assets/botania/textures/items/lens_normal.png diff --git a/src/main/resources/assets/botania/textures/items/lenspaint.png b/src/main/resources/assets/botania/textures/items/lens_paint.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lenspaint.png rename to src/main/resources/assets/botania/textures/items/lens_paint.png diff --git a/src/main/resources/assets/botania/textures/items/lensphantom.png b/src/main/resources/assets/botania/textures/items/lens_phantom.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensphantom.png rename to src/main/resources/assets/botania/textures/items/lens_phantom.png diff --git a/src/main/resources/assets/botania/textures/items/lenspiston.png b/src/main/resources/assets/botania/textures/items/lens_piston.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lenspiston.png rename to src/main/resources/assets/botania/textures/items/lens_piston.png diff --git a/src/main/resources/assets/botania/textures/items/lenspower.png b/src/main/resources/assets/botania/textures/items/lens_power.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lenspower.png rename to src/main/resources/assets/botania/textures/items/lens_power.png diff --git a/src/main/resources/assets/botania/textures/items/lensredirect.png b/src/main/resources/assets/botania/textures/items/lens_redirect.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensredirect.png rename to src/main/resources/assets/botania/textures/items/lens_redirect.png diff --git a/src/main/resources/assets/botania/textures/items/lensspeed.png b/src/main/resources/assets/botania/textures/items/lens_speed.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensspeed.png rename to src/main/resources/assets/botania/textures/items/lens_speed.png diff --git a/src/main/resources/assets/botania/textures/items/lenstime.png b/src/main/resources/assets/botania/textures/items/lens_time.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lenstime.png rename to src/main/resources/assets/botania/textures/items/lens_time.png diff --git a/src/main/resources/assets/botania/textures/items/lenstripwire.png b/src/main/resources/assets/botania/textures/items/lens_tripwire.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lenstripwire.png rename to src/main/resources/assets/botania/textures/items/lens_tripwire.png diff --git a/src/main/resources/assets/botania/textures/items/lenswarp.png b/src/main/resources/assets/botania/textures/items/lens_warp.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lenswarp.png rename to src/main/resources/assets/botania/textures/items/lens_warp.png diff --git a/src/main/resources/assets/botania/textures/items/lensweight.png b/src/main/resources/assets/botania/textures/items/lens_weight.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensweight.png rename to src/main/resources/assets/botania/textures/items/lens_weight.png diff --git a/src/main/resources/assets/botania/textures/items/lookingglass.png b/src/main/resources/assets/botania/textures/items/lookingglass.png deleted file mode 100644 index 1ba3e7df0..000000000 Binary files a/src/main/resources/assets/botania/textures/items/lookingglass.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/pendant_blood_support.png b/src/main/resources/assets/botania/textures/items/pendant_blood_chain.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/pendant_blood_support.png rename to src/main/resources/assets/botania/textures/items/pendant_blood_chain.png diff --git a/src/main/resources/assets/botania/textures/items/pendant_lava.png b/src/main/resources/assets/botania/textures/items/pendant_lava.png index e14827601..dcf9b1119 100644 Binary files a/src/main/resources/assets/botania/textures/items/pendant_lava.png and b/src/main/resources/assets/botania/textures/items/pendant_lava.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 index 009e9550e..fd100cdde 100644 Binary files a/src/main/resources/assets/botania/textures/items/ring_aura_greater.png 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_magnet_greater.png b/src/main/resources/assets/botania/textures/items/ring_magnet_greater.png index a38a933c7..e04b882ca 100644 Binary files a/src/main/resources/assets/botania/textures/items/ring_magnet_greater.png 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 index 8813f9547..86df3afe5 100644 Binary files a/src/main/resources/assets/botania/textures/items/ring_magnet_greater_activated.png 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_mana_greater.png b/src/main/resources/assets/botania/textures/items/ring_mana_greater.png index 6dad32ff2..82b1a746f 100644 Binary files a/src/main/resources/assets/botania/textures/items/ring_mana_greater.png and b/src/main/resources/assets/botania/textures/items/ring_mana_greater.png differ diff --git a/src/main/resources/assets/botania/textures/items/rod_exchange.png b/src/main/resources/assets/botania/textures/items/rod_exchange.png index edba614b8..d30bc0c67 100644 Binary files a/src/main/resources/assets/botania/textures/items/rod_exchange.png and b/src/main/resources/assets/botania/textures/items/rod_exchange.png differ diff --git a/src/main/resources/assets/botania/textures/items/slingshot.png b/src/main/resources/assets/botania/textures/items/slingshot.png index 9d95c0af6..8f27add1b 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/goldfish.png b/src/main/resources/assets/botania/textures/items/special_goldfish.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/goldfish.png rename to src/main/resources/assets/botania/textures/items/special_goldfish.png diff --git a/src/main/resources/assets/botania/textures/items/phiflower.png b/src/main/resources/assets/botania/textures/items/special_phiflower.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/phiflower.png rename to src/main/resources/assets/botania/textures/items/special_phiflower.png diff --git a/src/main/resources/assets/botania/textures/items/tail.png b/src/main/resources/assets/botania/textures/items/special_tail.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/tail.png rename to src/main/resources/assets/botania/textures/items/special_tail.png diff --git a/src/main/resources/assets/botania/textures/items/thirdeye0.png b/src/main/resources/assets/botania/textures/items/third_eye_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thirdeye0.png rename to src/main/resources/assets/botania/textures/items/third_eye_0.png diff --git a/src/main/resources/assets/botania/textures/items/thirdeye1.png b/src/main/resources/assets/botania/textures/items/third_eye_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thirdeye1.png rename to src/main/resources/assets/botania/textures/items/third_eye_1.png diff --git a/src/main/resources/assets/botania/textures/items/thirdeye2.png b/src/main/resources/assets/botania/textures/items/third_eye_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thirdeye2.png rename to src/main/resources/assets/botania/textures/items/third_eye_2.png diff --git a/src/main/resources/assets/botania/textures/items/thirdeye2.png.mcmeta b/src/main/resources/assets/botania/textures/items/third_eye_2.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/thirdeye2.png.mcmeta rename to src/main/resources/assets/botania/textures/items/third_eye_2.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/unused/attachableabacus.png b/src/main/resources/assets/botania/textures/items/unused/attachableabacus.png deleted file mode 100644 index c2a90b89a..000000000 Binary files a/src/main/resources/assets/botania/textures/items/unused/attachableabacus.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/unused/goldenlaurel.png b/src/main/resources/assets/botania/textures/items/unused/goldenlaurel.png deleted file mode 100644 index 0ea5c39fb..000000000 Binary files a/src/main/resources/assets/botania/textures/items/unused/goldenlaurel.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/unused/heartazoth.png b/src/main/resources/assets/botania/textures/items/unused/heartazoth.png deleted file mode 100644 index 135d6e14d..000000000 Binary files a/src/main/resources/assets/botania/textures/items/unused/heartazoth.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/unused/heartazoth.png.mcmeta b/src/main/resources/assets/botania/textures/items/unused/heartazoth.png.mcmeta deleted file mode 100644 index a5e66c48d..000000000 --- a/src/main/resources/assets/botania/textures/items/unused/heartazoth.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "animation": { - "frames": [ - {"index": 0, "time": 16}, - 1, - 2 - ], - "frametime": 4 - } -} diff --git a/src/main/resources/assets/botania/textures/items/unused/terrorvisage.png b/src/main/resources/assets/botania/textures/items/unused/terrorvisage.png deleted file mode 100644 index b2758baaf..000000000 Binary files a/src/main/resources/assets/botania/textures/items/unused/terrorvisage.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 index c9eec08eb..f4ede4489 100644 Binary files a/src/main/resources/assets/botania/textures/model/lexicon_default.png and b/src/main/resources/assets/botania/textures/model/lexicon_default.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 index 836c8622b..d0d0dd3c2 100644 Binary files a/src/main/resources/assets/botania/textures/model/tiny_potato.png 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_halloween.png b/src/main/resources/assets/botania/textures/model/tiny_potato_halloween.png index e7b83379f..c0b6e083b 100644 Binary files a/src/main/resources/assets/botania/textures/model/tiny_potato_halloween.png and b/src/main/resources/assets/botania/textures/model/tiny_potato_halloween.png differ diff --git a/src/main/resources/assets/botania/textures/model/tiny_potato_small.png b/src/main/resources/assets/botania/textures/model/tiny_potato_small.png new file mode 100644 index 000000000..836c8622b Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/tiny_potato_small.png differ diff --git a/src/main/resources/assets/botania/textures/items/unused/cloaks.psd b/src/main/resources/assets/botania/textures/model/tiny_potato_small_gray.png similarity index 52% rename from src/main/resources/assets/botania/textures/items/unused/cloaks.psd rename to src/main/resources/assets/botania/textures/model/tiny_potato_small_gray.png index ae892ae80..de1212606 100644 Binary files a/src/main/resources/assets/botania/textures/items/unused/cloaks.psd and b/src/main/resources/assets/botania/textures/model/tiny_potato_small_gray.png differ diff --git a/src/main/resources/assets/botania/textures/model/tiny_potato_smallhalloween.png b/src/main/resources/assets/botania/textures/model/tiny_potato_smallhalloween.png new file mode 100644 index 000000000..e7b83379f Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/tiny_potato_smallhalloween.png differ diff --git a/src/main/resources/assets/botania/textures/model/tinypotato.png b/src/main/resources/assets/botania/textures/model/tinypotato.png deleted file mode 100644 index d9b987cd0..000000000 Binary files a/src/main/resources/assets/botania/textures/model/tinypotato.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/tinypotato_halloween.png b/src/main/resources/assets/botania/textures/model/tinypotato_halloween.png deleted file mode 100644 index 53f400846..000000000 Binary files a/src/main/resources/assets/botania/textures/model/tinypotato_halloween.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/tinypotatocopy.png b/src/main/resources/assets/botania/textures/model/tinypotatocopy.png deleted file mode 100644 index d0d0dd3c2..000000000 Binary files a/src/main/resources/assets/botania/textures/model/tinypotatocopy.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/tinypotatogray.png b/src/main/resources/assets/botania/textures/model/tinypotatogray.png deleted file mode 100644 index fdf113b33..000000000 Binary files a/src/main/resources/assets/botania/textures/model/tinypotatogray.png and /dev/null differ