From 9870d60d98850b45d34cf90d79cc00dca0ffa3fb Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Mon, 15 Feb 2016 22:43:49 -0800 Subject: [PATCH] STOP BOOPING MORVY Fixes #67 --- src/main/java/fox/spiteful/avaritia/ClientProxy.java | 4 ++-- src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java | 4 ++-- .../java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index 515e81e..563ee78 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -13,7 +13,7 @@ import fox.spiteful.avaritia.render.CosmicItemRenderer; import fox.spiteful.avaritia.render.FancyHaloRenderer; import fox.spiteful.avaritia.render.FracturedOreRenderer; import fox.spiteful.avaritia.render.LudicrousRenderEvents; -import fox.spiteful.avaritia.render.MorvInABoxRenderer; +//import fox.spiteful.avaritia.render.MorvInABoxRenderer; import fox.spiteful.avaritia.render.RenderGapingVoid; import fox.spiteful.avaritia.render.RenderHeavenArrow; import fox.spiteful.avaritia.render.ShaderHelper; @@ -58,7 +58,7 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(LudicrousItems.fractured_ore, new FracturedOreRenderer()); - MinecraftForgeClient.registerItemRenderer(LudicrousItems.morv_in_a_box, new MorvInABoxRenderer()); + //MinecraftForgeClient.registerItemRenderer(LudicrousItems.morv_in_a_box, new MorvInABoxRenderer()); CompatClient.comprettify(); diff --git a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java index c9b257e..d63ea67 100644 --- a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java +++ b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java @@ -50,7 +50,7 @@ public class LudicrousItems { public static Item endest_pearl; public static Item fractured_ore; public static Item matter_cluster; - public static Item morv_in_a_box; + //public static Item morv_in_a_box; public static Item infinity_pickaxe; public static Item infinity_sword; @@ -95,7 +95,7 @@ public class LudicrousItems { infinity_bow = register(new ItemBowInfinity(), "Infinity_Bow"); infinity_shovel = register(new ItemShovelInfinity(), "Infinity_Shovel"); infinity_axe = register(new ItemAxeInfinity(), "Infinity_Axe"); - morv_in_a_box = register(new ItemMorvInABox(), "MorvInABox"); + //morv_in_a_box = register(new ItemMorvInABox(), "MorvInABox"); MinecraftForge.EVENT_BUS.register(new ItemArmorInfinity.abilityHandler()); } diff --git a/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java b/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java index 73d0caa..dcecfac 100644 --- a/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java @@ -1,6 +1,6 @@ package fox.spiteful.avaritia.render; -import java.util.Map; +/*import java.util.Map; import java.util.UUID; import org.lwjgl.opengl.GL11; @@ -274,3 +274,4 @@ public class MorvInABoxRenderer implements IItemRenderer { } } } +*/ \ No newline at end of file