lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update mappings + cleanup SoulSnare render

Browse source 
Removed some (seemingly) unnecessary code from RenderEntitySoulSnare
This commit is contained in:
Nick 2016-01-09 02:12:48 -08:00
parent 34e6350cbc
commit c50f15e124
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -5,7 +5,7 @@ mc_version=1.8.9
forge_version=latest forge_version=latest
curse_id=224791 curse_id=224791
mappings_version=snapshot_20151128 mappings_version=snapshot_20160109
jei_version=2.15.0.70 jei_version=2.15.0.70
waila_version=1.6.0-B3 waila_version=1.6.0-B3

2
src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java
View file

@ -105,7 +105,7 @@ public class RenderAltar extends TileEntitySpecialRenderer<TileAltar>
GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.scale(0.5F, 0.5F, 0.5F);
GlStateManager.pushAttrib(); GlStateManager.pushAttrib();
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
itemRenderer.func_181564_a(entityitem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED); itemRenderer.renderItem(entityitem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED);
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
GlStateManager.popAttrib(); GlStateManager.popAttrib();

16
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java
View file

@ -1,5 +1,7 @@
package WayofTime.bloodmagic.client.render.entity; 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.GlStateManager;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.Render;
@ -13,14 +15,11 @@ import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare;
public class RenderEntitySoulSnare extends Render<EntitySoulSnare> public class RenderEntitySoulSnare extends Render<EntitySoulSnare>
{ {
protected final Item field_177084_a; private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem();
private final RenderItem field_177083_e;
public RenderEntitySoulSnare(RenderManager renderManagerIn, Item p_i46137_2_, RenderItem p_i46137_3_) public RenderEntitySoulSnare(RenderManager renderManagerIn)
{ {
super(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) public void doRender(EntitySoulSnare entity, double x, double y, double z, float entityYaw, float partialTicks)
@ -32,17 +31,12 @@ public class RenderEntitySoulSnare extends Render<EntitySoulSnare>
GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
this.bindTexture(TextureMap.locationBlocksTexture); 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.disableRescaleNormal();
GlStateManager.popMatrix(); GlStateManager.popMatrix();
super.doRender(entity, x, y, z, entityYaw, partialTicks); 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) protected ResourceLocation getEntityTexture(EntitySoulSnare entity)
{ {
return TextureMap.locationBlocksTexture; return TextureMap.locationBlocksTexture;

4
src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java
View file

@ -1,17 +1,15 @@
package WayofTime.bloodmagic.client.render.entity; package WayofTime.bloodmagic.client.render.entity;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.IRenderFactory;
import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare;
import WayofTime.bloodmagic.registry.ModItems;
public class SoulSnareRenderFactory implements IRenderFactory<EntitySoulSnare> public class SoulSnareRenderFactory implements IRenderFactory<EntitySoulSnare>
{ {
@Override @Override
public Render<? super EntitySoulSnare> createRenderFor(RenderManager manager) public Render<? super EntitySoulSnare> createRenderFor(RenderManager manager)
{ {
return new RenderEntitySoulSnare(manager, ModItems.soulSnare, Minecraft.getMinecraft().getRenderItem()); return new RenderEntitySoulSnare(manager);
} }
} }