Finished Monoliths

This commit is contained in:
Waterpicker 2017-04-30 00:47:59 -05:00
parent 62749b8ef8
commit 6de21888db
2 changed files with 17 additions and 13 deletions

View file

@ -8,10 +8,13 @@ import com.zixiken.dimdoors.shared.tileentities.TileEntityDimDoor;
import com.zixiken.dimdoors.shared.tileentities.TileEntityRift; import com.zixiken.dimdoors.shared.tileentities.TileEntityRift;
import com.zixiken.dimdoors.shared.tileentities.TileEntityTransTrapdoor; import com.zixiken.dimdoors.shared.tileentities.TileEntityTransTrapdoor;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.WorldServer; import net.minecraft.world.WorldServer;
import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.client.registry.IRenderFactory;
import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@ -39,7 +42,13 @@ public class DDProxyClient extends DDProxyCommon {
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDimDoor.class, new RenderDimDoor()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDimDoor.class, new RenderDimDoor());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTransTrapdoor.class, new RenderTransTrapdoor()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTransTrapdoor.class, new RenderTransTrapdoor());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRift.class, new RenderRift()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRift.class, new RenderRift());
RenderingRegistry.registerEntityRenderingHandler(MobMonolith.class, new RenderMobObelisk(.5F)); RenderingRegistry.registerEntityRenderingHandler(MobMonolith.class, new IRenderFactory<MobMonolith>()
{
@Override
public Render<? super MobMonolith> createRenderFor(RenderManager manager) {
return new RenderMobObelisk(manager, 0.5f);
}
});
} }
@Override @Override

View file

@ -19,7 +19,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class RenderMobObelisk extends RenderLiving { public class RenderMobObelisk extends RenderLiving<MobMonolith> {
protected ModelMobObelisk obeliskModel; protected ModelMobObelisk obeliskModel;
protected static final List<ResourceLocation> monolith_textures = Arrays.asList( protected static final List<ResourceLocation> monolith_textures = Arrays.asList(
@ -43,16 +43,15 @@ public class RenderMobObelisk extends RenderLiving {
new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith17.png"), new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith17.png"),
new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith18.png")); new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith18.png"));
public RenderMobObelisk(float f) { public RenderMobObelisk(RenderManager manager, float f) {
super(Minecraft.getMinecraft().getRenderManager(), new ModelMobObelisk(), f); super(manager, new ModelMobObelisk(), f);
this.obeliskModel = (ModelMobObelisk)this.mainModel; this.obeliskModel = (ModelMobObelisk)this.mainModel;
} }
@Override @Override
public void doRender(EntityLiving entity, double x, double y, double z, float par8, float par9) { public void doRender(MobMonolith monolith, double x, double y, double z, float par8, float par9) {
final float minScaling = 0; final float minScaling = 0;
final float maxScaling = 0.1f; final float maxScaling = 0.1f;
MobMonolith monolith = ((MobMonolith) entity);
float aggroScaling = 0; float aggroScaling = 0;
if (monolith.isDangerous()) { if (monolith.isDangerous()) {
@ -69,11 +68,11 @@ public class RenderMobObelisk extends RenderLiving {
double zJitter = aggroScaling * Math.sin(1.3f * time) * Math.sin(0.7f * time); double zJitter = aggroScaling * Math.sin(1.3f * time) * Math.sin(0.7f * time);
// Render with jitter // Render with jitter
this.render(entity, x + xJitter, y + yJitter, z + zJitter, par8, par9); this.render(monolith, x + xJitter, y + yJitter, z + zJitter, par8, par9);
//this.renderLeash(entity, x, y, z, par8, par9); //this.renderLeash(entity, x, y, z, par8, par9);
} }
public void render(EntityLiving par1EntityLivingBase, double x, double y, double z, float par8, float par9) public void render(MobMonolith par1EntityLivingBase, double x, double y, double z, float par8, float par9)
{ {
if (MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Pre(par1EntityLivingBase, this, x, y, z))) return; if (MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Pre(par1EntityLivingBase, this, x, y, z))) return;
GL11.glPushMatrix(); GL11.glPushMatrix();
@ -124,11 +123,7 @@ public class RenderMobObelisk extends RenderLiving {
} }
@Override @Override
protected ResourceLocation getEntityTexture(Entity entity) { protected ResourceLocation getEntityTexture(MobMonolith monolith) {
MobMonolith monolith = (MobMonolith) entity;
System.out.println("Monolith isn't null. " + monolith.getTextureState());
return monolith_textures.get(monolith.getTextureState()); //return new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith" + monolith.getTextureState() + ".png"); return monolith_textures.get(monolith.getTextureState()); //return new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith" + monolith.getTextureState() + ".png");
} }
} }