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 6ef1d250d..64e25aa01 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -106,8 +106,8 @@ public class MiscellaneousIcons { 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"); + alchemyCatalystOverlay = IconHelper.forName(evt.getMap(), "catalyst_alchemy_overlay", "blocks"); + conjurationCatalystOverlay = IconHelper.forName(evt.getMap(), "catalyst_conjuration_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"); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 98ebe1431..f94165c8d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -80,7 +80,8 @@ public class RenderLexicon { Minecraft mc = Minecraft.getMinecraft(); GlStateManager.pushMatrix(); - mc.renderEngine.bindTexture(elvenTexture); + GlStateManager.color(1F, 1F, 1F); + mc.renderEngine.bindTexture(((ItemLexicon) ModItems.lexicon).isElvenItem(stack) ? elvenTexture : texture); float opening; float pageFlip; @@ -91,8 +92,8 @@ public class RenderLexicon { else ticks -= partialTicks; } - GlStateManager.translate(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - 0.01F * ticks); - GlStateManager.rotate(87.5F + ticks * (side == EnumHandSide.RIGHT ? 5 : 10), 0F, 1F, 0F); + GlStateManager.translate(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - (side == EnumHandSide.RIGHT ? 0.035F : 0.01F) * ticks); + GlStateManager.rotate(87.5F + ticks * (side == EnumHandSide.RIGHT ? 8 : 12), 0F, 1F, 0F); GlStateManager.rotate(ticks * 2.85F, 0F, 0F, 1F); opening = ticks / 12F; @@ -106,8 +107,8 @@ public class RenderLexicon { if(ticks < 3) { FontRenderer font = Minecraft.getMinecraft().fontRenderer; GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.3F, -0.21F, -0.07F); - GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); + GlStateManager.translate(-0.30F, -0.24F, -0.07F); + GlStateManager.scale(0.0030F, 0.0030F, -0.0030F); String title = ItemLexicon.getTitle(stack); @@ -123,11 +124,11 @@ public class RenderLexicon { String quoteStr = QUOTES[quote]; - GlStateManager.translate(-5F, 3F, 0F); + GlStateManager.translate(-5F, 15F, 0F); PageText.renderText(0, 0, 140, 100, 0, false, 0x79ff92, quoteStr); GlStateManager.color(1F, 1F, 1F); - GlStateManager.translate(2F, 98F, 0F); + GlStateManager.translate(8F, 110F, 0F); font.drawString(I18n.format("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 10F, 0F); @@ -137,7 +138,7 @@ public class RenderLexicon { String authorTitle = I18n.format("botaniamisc.lexiconcover2"); int len = font.getStringWidth(authorTitle); - font.drawString(authorTitle, 62 - len / 2, 0, 0xD69700); + font.drawString(authorTitle, 58 - len / 2, -8, 0xD69700); } GlStateManager.popMatrix(); @@ -148,7 +149,7 @@ public class RenderLexicon { private static void transformSideFirstPerson(EnumHandSide p_187459_1_, float p_187459_2_) { int i = p_187459_1_ == EnumHandSide.RIGHT ? 1 : -1; - GlStateManager.translate(i * 0.56F, -0.52F + p_187459_2_ * -0.6F, -0.72F); + GlStateManager.translate(i * 0.56F, -0.44F + p_187459_2_ * -0.8F, -0.72F); } // Copy with modification - ItemRenderer.transformFirstPerson @@ -157,9 +158,9 @@ public class RenderLexicon { { int i = p_187453_1_ == EnumHandSide.RIGHT ? 1 : -1; // Botania - added - GlStateManager.translate(p_187453_1_ == EnumHandSide.RIGHT ? 0.5F : 0.3F, -0.25F, 0.2F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.rotate(12F, 0F, 0F, -1F); + GlStateManager.translate(p_187453_1_ == EnumHandSide.RIGHT ? 0.2F : 0.52F, -0.125F, p_187453_1_ == EnumHandSide.RIGHT ? 0.6F : 0.25F); + GlStateManager.rotate(p_187453_1_ == EnumHandSide.RIGHT ? 60F : 120F, 0F, 1F, 0F); + GlStateManager.rotate(30F, 0F, 0F, -1F); // End add float f = MathHelper.sin(p_187453_2_ * p_187453_2_ * (float)Math.PI); GlStateManager.rotate(i * (45.0F + f * -20.0F), 0.0F, 1.0F, 0.0F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 7e7910782..b11bc6087 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -93,8 +93,10 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); stack.getItem(); GlStateManager.pushMatrix(); - GlStateManager.translate(-0.0F, -1F, -0.4375F); - GlStateManager.scale(0.8F, 0.8F, 0.8F); + GlStateManager.translate(0.0F, -1F, -0.4675F); + GlStateManager.rotate(180, 0, 0, 1); + GlStateManager.rotate(180, 1, 0, 0); + GlStateManager.scale(1.0F, 1.0F, 1.0F); Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index bec8f45af..544b219fb 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -33,7 +33,7 @@ import javax.annotation.Nonnull; public class BlockSpawnerClaw extends BlockMod implements ILexiconable { - private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 1/16.0, 0.875); + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 0.125, 0.875); public BlockSpawnerClaw() { super(Material.IRON, LibBlockNames.SPAWNER_CLAW); diff --git a/src/main/resources/assets/botania/blockstates/alchemycatalyst.json b/src/main/resources/assets/botania/blockstates/alchemycatalyst.json index 1eed16194..19b7b5e27 100644 --- a/src/main/resources/assets/botania/blockstates/alchemycatalyst.json +++ b/src/main/resources/assets/botania/blockstates/alchemycatalyst.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:alchemy_catalyst" } + "normal": { "model": "botania:catalyst_alchemy" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/conjurationcatalyst.json b/src/main/resources/assets/botania/blockstates/conjurationcatalyst.json index 359b5d17a..173c88ad3 100644 --- a/src/main/resources/assets/botania/blockstates/conjurationcatalyst.json +++ b/src/main/resources/assets/botania/blockstates/conjurationcatalyst.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:conjuration_catalyst" } + "normal": { "model": "botania:catalyst_conjuration" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/alchemy_catalyst.json b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json deleted file mode 100644 index 2167065e6..000000000 --- a/src/main/resources/assets/botania/models/block/alchemy_catalyst.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "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/catalyst_alchemy.json b/src/main/resources/assets/botania/models/block/catalyst_alchemy.json new file mode 100644 index 000000000..d329d8588 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/catalyst_alchemy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/catalyst_alchemy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/catalyst_conjuration.json b/src/main/resources/assets/botania/models/block/catalyst_conjuration.json new file mode 100644 index 000000000..524f87ef3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/catalyst_conjuration.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/catalyst_conjuration" + } +} \ 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 deleted file mode 100644 index 1f94f3c9b..000000000 --- a/src/main/resources/assets/botania/models/block/conjuration_catalyst.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "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/turntable.json b/src/main/resources/assets/botania/models/block/turntable.json index 636e11069..6b7d3a62b 100644 --- a/src/main/resources/assets/botania/models/block/turntable.json +++ b/src/main/resources/assets/botania/models/block/turntable.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/spreader_turntable", + "bottom": "botania:blocks/spreader_turntable_bottom", "top": "botania:blocks/spreader_turntable_top", "side": "botania:blocks/spreader_turntable" } 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 62213940d..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/lexicon_elven" + "layer0": "botania:items/lexicon_default" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_bottom.png b/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_bottom.png deleted file mode 100644 index fce1873df..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_overlay.png b/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_overlay.png deleted file mode 100644 index 230e99803..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_side.png b/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_side.png deleted file mode 100644 index 1eb383913..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_side.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_top.png b/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_top.png deleted file mode 100644 index 94d0acc0e..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/alchemy_catalyst_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/catalyst_alchemy.png b/src/main/resources/assets/botania/textures/blocks/catalyst_alchemy.png new file mode 100644 index 000000000..3bae9117e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/catalyst_alchemy.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/catalyst_alchemy_overlay.png b/src/main/resources/assets/botania/textures/blocks/catalyst_alchemy_overlay.png new file mode 100644 index 000000000..3b9d059fb Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/catalyst_alchemy_overlay.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/catalyst_conjuration.png b/src/main/resources/assets/botania/textures/blocks/catalyst_conjuration.png new file mode 100644 index 000000000..e4a0393c3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/catalyst_conjuration.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/catalyst_conjuration_overlay.png b/src/main/resources/assets/botania/textures/blocks/catalyst_conjuration_overlay.png new file mode 100644 index 000000000..0abcb31bc Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/catalyst_conjuration_overlay.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_bottom.png b/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_bottom.png deleted file mode 100644 index ca01d9f14..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_overlay.png b/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_overlay.png deleted file mode 100644 index cf2677c26..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_side.png b/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_side.png deleted file mode 100644 index a6c04f6f3..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_side.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_top.png b/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_top.png deleted file mode 100644 index bfcda51a0..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/conjuration_catalyst_top.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/flower_func_hopperhock.png b/src/main/resources/assets/botania/textures/blocks/flower_func_hopperhock.png index 34d9144f8..1bc547907 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/flower_func_hopperhock.png and b/src/main/resources/assets/botania/textures/blocks/flower_func_hopperhock.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/rail_ghost.png b/src/main/resources/assets/botania/textures/blocks/rail_ghost.png index e9b096fe3..68704337a 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/rail_ghost.png and b/src/main/resources/assets/botania/textures/blocks/rail_ghost.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/spreader_turntable.png b/src/main/resources/assets/botania/textures/blocks/spreader_turntable.png index 9d7c045f2..2b5c1a73f 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/spreader_turntable.png and b/src/main/resources/assets/botania/textures/blocks/spreader_turntable.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/spreader_turntable_bottom.png b/src/main/resources/assets/botania/textures/blocks/spreader_turntable_bottom.png new file mode 100644 index 000000000..063a52c6f Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/spreader_turntable_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/spreader_turntable_top.png b/src/main/resources/assets/botania/textures/blocks/spreader_turntable_top.png index 18bc4d0f3..33bc5f4c0 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/spreader_turntable_top.png and b/src/main/resources/assets/botania/textures/blocks/spreader_turntable_top.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 d5c252c6e..3e91da92d 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/alfhomancy.png b/src/main/resources/assets/botania/textures/gui/categories/alfhomancy.png index 4ad688e3c..58128e123 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/alfhomancy.png and b/src/main/resources/assets/botania/textures/gui/categories/alfhomancy.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/basics.png b/src/main/resources/assets/botania/textures/gui/categories/basics.png index 9e5de494d..da2d5d2b6 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/basics.png and b/src/main/resources/assets/botania/textures/gui/categories/basics.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/baubles.png b/src/main/resources/assets/botania/textures/gui/categories/baubles.png index 6cf2a724e..e0273d9ed 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/baubles.png and b/src/main/resources/assets/botania/textures/gui/categories/baubles.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/ender.png b/src/main/resources/assets/botania/textures/gui/categories/ender.png index 6f146dbf6..fc07a036e 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/ender.png and b/src/main/resources/assets/botania/textures/gui/categories/ender.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/functionalflowers.png b/src/main/resources/assets/botania/textures/gui/categories/functionalflowers.png index 1d8c38a9a..e3bc7ae66 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/functionalflowers.png and b/src/main/resources/assets/botania/textures/gui/categories/functionalflowers.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/generationflowers.png b/src/main/resources/assets/botania/textures/gui/categories/generationflowers.png index 41e19f7f5..f2d7c2921 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/generationflowers.png and b/src/main/resources/assets/botania/textures/gui/categories/generationflowers.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/index.png b/src/main/resources/assets/botania/textures/gui/categories/index.png index f1591093e..9eca4e2bf 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/index.png and b/src/main/resources/assets/botania/textures/gui/categories/index.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/tools.png b/src/main/resources/assets/botania/textures/gui/categories/tools.png index ca7e49308..78e4ef6bf 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/tools.png and b/src/main/resources/assets/botania/textures/gui/categories/tools.png differ diff --git a/src/main/resources/assets/botania/textures/gui/lexicon.png b/src/main/resources/assets/botania/textures/gui/lexicon.png index 712d76513..7f19aac1d 100644 Binary files a/src/main/resources/assets/botania/textures/gui/lexicon.png and b/src/main/resources/assets/botania/textures/gui/lexicon.png differ diff --git a/src/main/resources/assets/botania/textures/items/bottle_slime.png b/src/main/resources/assets/botania/textures/items/bottle_slime.png index f52358bf1..db39f0285 100644 Binary files a/src/main/resources/assets/botania/textures/items/bottle_slime.png and b/src/main/resources/assets/botania/textures/items/bottle_slime.png differ diff --git a/src/main/resources/assets/botania/textures/items/bottle_slime_activated.png b/src/main/resources/assets/botania/textures/items/bottle_slime_activated.png index d189d1d8e..2211842a4 100644 Binary files a/src/main/resources/assets/botania/textures/items/bottle_slime_activated.png and b/src/main/resources/assets/botania/textures/items/bottle_slime_activated.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 index ea06f2fcc..9a201638c 100644 Binary files a/src/main/resources/assets/botania/textures/items/container_bauble_closed.png 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 index 97586a51f..497d4e7cf 100644 Binary files a/src/main/resources/assets/botania/textures/items/container_bauble_open.png 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 index 0a20b911a..9d6ce2a79 100644 Binary files a/src/main/resources/assets/botania/textures/items/container_flower.png and b/src/main/resources/assets/botania/textures/items/container_flower.png differ diff --git a/src/main/resources/assets/botania/textures/items/dragonstone.png b/src/main/resources/assets/botania/textures/items/dragonstone.png index b9ef0516d..9b4c4488a 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/headpiece_tiara_flight.png b/src/main/resources/assets/botania/textures/items/headpiece_tiara_flight.png index ccdd9e7d9..140a21365 100644 Binary files a/src/main/resources/assets/botania/textures/items/headpiece_tiara_flight.png and b/src/main/resources/assets/botania/textures/items/headpiece_tiara_flight.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens.png b/src/main/resources/assets/botania/textures/items/lens.png index 7808e8f8a..00bbca64c 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens.png and b/src/main/resources/assets/botania/textures/items/lens.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_bounce.png b/src/main/resources/assets/botania/textures/items/lens_bounce.png index b7768f905..8c057e7be 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_bounce.png and b/src/main/resources/assets/botania/textures/items/lens_bounce.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_damage.png b/src/main/resources/assets/botania/textures/items/lens_damage.png index 192b10390..71b7c115c 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_damage.png and b/src/main/resources/assets/botania/textures/items/lens_damage.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_efficiency.png b/src/main/resources/assets/botania/textures/items/lens_efficiency.png index ac86bb479..8198fe13c 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_efficiency.png and b/src/main/resources/assets/botania/textures/items/lens_efficiency.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_explosive.png b/src/main/resources/assets/botania/textures/items/lens_explosive.png index 2b9446f04..a503152b5 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_explosive.png and b/src/main/resources/assets/botania/textures/items/lens_explosive.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_fire.png b/src/main/resources/assets/botania/textures/items/lens_fire.png index 8ab5a04c9..8c18677a8 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_fire.png and b/src/main/resources/assets/botania/textures/items/lens_fire.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_firework.png b/src/main/resources/assets/botania/textures/items/lens_firework.png index 1fe5b7a1d..090868ec7 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_firework.png and b/src/main/resources/assets/botania/textures/items/lens_firework.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_flare.png b/src/main/resources/assets/botania/textures/items/lens_flare.png index 3ce1b1771..09a72b484 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_flare.png and b/src/main/resources/assets/botania/textures/items/lens_flare.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_gravity.png b/src/main/resources/assets/botania/textures/items/lens_gravity.png index a4248c221..beaa90f58 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_gravity.png and b/src/main/resources/assets/botania/textures/items/lens_gravity.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_influence.png b/src/main/resources/assets/botania/textures/items/lens_influence.png index 38f7a21f1..ae4217596 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_influence.png and b/src/main/resources/assets/botania/textures/items/lens_influence.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_light.png b/src/main/resources/assets/botania/textures/items/lens_light.png index f8aeadb17..3f4672b89 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_light.png and b/src/main/resources/assets/botania/textures/items/lens_light.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_magnet.png b/src/main/resources/assets/botania/textures/items/lens_magnet.png index d3d33c55f..772f13ac3 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_magnet.png and b/src/main/resources/assets/botania/textures/items/lens_magnet.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_messenger.png b/src/main/resources/assets/botania/textures/items/lens_messenger.png index c70488828..69fdee714 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_messenger.png and b/src/main/resources/assets/botania/textures/items/lens_messenger.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_mine.png b/src/main/resources/assets/botania/textures/items/lens_mine.png index 78fe9554c..0727ea77f 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_mine.png and b/src/main/resources/assets/botania/textures/items/lens_mine.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_normal.png b/src/main/resources/assets/botania/textures/items/lens_normal.png index 3ad906b67..8c71aea33 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_normal.png and b/src/main/resources/assets/botania/textures/items/lens_normal.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_paint.png b/src/main/resources/assets/botania/textures/items/lens_paint.png index c6a097d08..38fc22ed6 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_paint.png and b/src/main/resources/assets/botania/textures/items/lens_paint.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_phantom.png b/src/main/resources/assets/botania/textures/items/lens_phantom.png index 11ec9697a..7f630d6d0 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_phantom.png and b/src/main/resources/assets/botania/textures/items/lens_phantom.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_piston.png b/src/main/resources/assets/botania/textures/items/lens_piston.png index 100704a69..3f5585e6b 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_piston.png and b/src/main/resources/assets/botania/textures/items/lens_piston.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_power.png b/src/main/resources/assets/botania/textures/items/lens_power.png index 05a2a6e67..3a7463149 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_power.png and b/src/main/resources/assets/botania/textures/items/lens_power.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_redirect.png b/src/main/resources/assets/botania/textures/items/lens_redirect.png index e9d00db40..60e9d655e 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_redirect.png and b/src/main/resources/assets/botania/textures/items/lens_redirect.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_speed.png b/src/main/resources/assets/botania/textures/items/lens_speed.png index fedff43a1..bba2b321b 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_speed.png and b/src/main/resources/assets/botania/textures/items/lens_speed.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_time.png b/src/main/resources/assets/botania/textures/items/lens_time.png index 091b75f9e..ded26f3a8 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_time.png and b/src/main/resources/assets/botania/textures/items/lens_time.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_tripwire.png b/src/main/resources/assets/botania/textures/items/lens_tripwire.png index 7fe3c1419..f373ea6e4 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_tripwire.png and b/src/main/resources/assets/botania/textures/items/lens_tripwire.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_warp.png b/src/main/resources/assets/botania/textures/items/lens_warp.png index dd33e0677..da2a1deeb 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_warp.png and b/src/main/resources/assets/botania/textures/items/lens_warp.png differ diff --git a/src/main/resources/assets/botania/textures/items/lens_weight.png b/src/main/resources/assets/botania/textures/items/lens_weight.png index 179a58b89..e9df0ed44 100644 Binary files a/src/main/resources/assets/botania/textures/items/lens_weight.png and b/src/main/resources/assets/botania/textures/items/lens_weight.png 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 index 481840d7a..08183eae6 100644 Binary files a/src/main/resources/assets/botania/textures/items/lexicon_default.png 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 index be6d30d88..57f99ef89 100644 Binary files a/src/main/resources/assets/botania/textures/items/lexicon_elven.png and b/src/main/resources/assets/botania/textures/items/lexicon_elven.png differ diff --git a/src/main/resources/assets/botania/textures/items/life_essence.png b/src/main/resources/assets/botania/textures/items/life_essence.png index d6f4f4c24..6d7428964 100644 Binary files a/src/main/resources/assets/botania/textures/items/life_essence.png and b/src/main/resources/assets/botania/textures/items/life_essence.png differ diff --git a/src/main/resources/assets/botania/textures/items/pebble.png b/src/main/resources/assets/botania/textures/items/pebble.png index 71be8f9d4..3c6333220 100644 Binary files a/src/main/resources/assets/botania/textures/items/pebble.png and b/src/main/resources/assets/botania/textures/items/pebble.png differ diff --git a/src/main/resources/assets/botania/textures/items/tool_sextant.png b/src/main/resources/assets/botania/textures/items/tool_sextant.png index 6ad16ffbf..c611c59ca 100644 Binary files a/src/main/resources/assets/botania/textures/items/tool_sextant.png and b/src/main/resources/assets/botania/textures/items/tool_sextant.png 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 a80ba1948..a6e724cb4 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/lexicon_elven.png b/src/main/resources/assets/botania/textures/model/lexicon_elven.png index 77a89243e..50f9c031c 100644 Binary files a/src/main/resources/assets/botania/textures/model/lexicon_elven.png and b/src/main/resources/assets/botania/textures/model/lexicon_elven.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 deleted file mode 100644 index 348d6446a..000000000 Binary files a/src/main/resources/assets/botania/textures/model/tiny_potato_small.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/tiny_potato_small_gray.png b/src/main/resources/assets/botania/textures/model/tiny_potato_small_gray.png deleted file mode 100644 index e55812f2e..000000000 Binary files a/src/main/resources/assets/botania/textures/model/tiny_potato_small_gray.png and /dev/null 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 deleted file mode 100644 index 628620690..000000000 Binary files a/src/main/resources/assets/botania/textures/model/tiny_potato_smallhalloween.png and /dev/null differ