From c50f15e124165cdbf85b33fc5de9c0bf5bad676e Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 9 Jan 2016 02:12:48 -0800 Subject: [PATCH] Update mappings + cleanup SoulSnare render Removed some (seemingly) unnecessary code from RenderEntitySoulSnare --- gradle.properties | 2 +- .../bloodmagic/client/render/RenderAltar.java | 2 +- .../render/entity/RenderEntitySoulSnare.java | 16 +++++----------- .../render/entity/SoulSnareRenderFactory.java | 4 +--- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 63261fa4..9299430e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ mc_version=1.8.9 forge_version=latest curse_id=224791 -mappings_version=snapshot_20151128 +mappings_version=snapshot_20160109 jei_version=2.15.0.70 waila_version=1.6.0-B3 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java index cfa1dc0d..2093c4d2 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java @@ -105,7 +105,7 @@ public class RenderAltar extends TileEntitySpecialRenderer GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.pushAttrib(); RenderHelper.enableStandardItemLighting(); - itemRenderer.func_181564_a(entityitem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED); + itemRenderer.renderItem(entityitem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED); RenderHelper.disableStandardItemLighting(); GlStateManager.popAttrib(); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java index 1724df93..43b2f96d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.client.render.entity; +import WayofTime.bloodmagic.registry.ModItems; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.Render; @@ -13,14 +15,11 @@ import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; public class RenderEntitySoulSnare extends Render { - protected final Item field_177084_a; - private final RenderItem field_177083_e; + private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); - public RenderEntitySoulSnare(RenderManager renderManagerIn, Item p_i46137_2_, RenderItem p_i46137_3_) + public RenderEntitySoulSnare(RenderManager renderManagerIn) { super(renderManagerIn); - this.field_177084_a = p_i46137_2_; - this.field_177083_e = p_i46137_3_; } public void doRender(EntitySoulSnare entity, double x, double y, double z, float entityYaw, float partialTicks) @@ -32,17 +31,12 @@ public class RenderEntitySoulSnare extends Render GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); this.bindTexture(TextureMap.locationBlocksTexture); - this.field_177083_e.func_181564_a(this.func_177082_d(entity), ItemCameraTransforms.TransformType.GROUND); + this.renderItem.renderItem(new ItemStack(ModItems.soulSnare), ItemCameraTransforms.TransformType.GROUND); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); super.doRender(entity, x, y, z, entityYaw, partialTicks); } - public ItemStack func_177082_d(EntitySoulSnare entityIn) - { - return new ItemStack(this.field_177084_a, 1, 0); - } - protected ResourceLocation getEntityTexture(EntitySoulSnare entity) { return TextureMap.locationBlocksTexture; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java index a40adb76..d125e906 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java @@ -1,17 +1,15 @@ package WayofTime.bloodmagic.client.render.entity; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraftforge.fml.client.registry.IRenderFactory; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.registry.ModItems; public class SoulSnareRenderFactory implements IRenderFactory { @Override public Render createRenderFor(RenderManager manager) { - return new RenderEntitySoulSnare(manager, ModItems.soulSnare, Minecraft.getMinecraft().getRenderItem()); + return new RenderEntitySoulSnare(manager); } }