Merge pull request #525 from alkcorp/DevTop

+ 6 Months of work, let's get the ball rolling.

3 files changed, 227 insertions, 20 deletions

diff --git a/src/Java/gtPlusPlus/core/client/model/ModelBatKing.java b/src/Java/gtPlusPlus/core/client/model/ModelBatKing.java
new file mode 100644
index 0000000000..ac64dee26a
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/client/model/ModelBatKing.java
@@ -0,0 +1,120 @@
+package gtPlusPlus.core.client.model;
+
+import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.entity.monster.EntityBatKing;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.EntityBat;
+import net.minecraft.util.MathHelper;
+
+@SideOnly(Side.CLIENT)
+public class ModelBatKing extends ModelBase
+{
+    private ModelRenderer batHead;
+    /** The body box of the bat model. */
+    private ModelRenderer batBody;
+    /** The inner right wing box of the bat model. */
+    private ModelRenderer batRightWing;
+    /** The inner left wing box of the bat model. */
+    private ModelRenderer batLeftWing;
+    /** The outer right wing box of the bat model. */
+    private ModelRenderer batOuterRightWing;
+    /** The outer left wing box of the bat model. */
+    private ModelRenderer batOuterLeftWing;
+
+    public ModelBatKing()
+    {
+        this.textureWidth = 64;
+        this.textureHeight = 64;
+        
+        this.batHead = new ModelRenderer(this, 0, 0);
+        this.batHead.addBox(-3.0F, -3.0F, -3.0F, 6, 6, 6);
+        ModelRenderer modelrenderer = new ModelRenderer(this, 24, 0);
+        modelrenderer.addBox(-4.0F, -6.0F, -2.0F, 3, 4, 1);
+        this.batHead.addChild(modelrenderer);
+        ModelRenderer modelrenderer1 = new ModelRenderer(this, 24, 0);
+        modelrenderer1.mirror = true;
+        modelrenderer1.addBox(1.0F, -6.0F, -2.0F, 3, 4, 1);
+        this.batHead.addChild(modelrenderer1);
+        this.batBody = new ModelRenderer(this, 0, 16);
+        this.batBody.addBox(-3.0F, 4.0F, -3.0F, 6, 12, 6);
+        this.batBody.setTextureOffset(0, 34).addBox(-5.0F, 16.0F, 0.0F, 10, 6, 1);
+        this.batRightWing = new ModelRenderer(this, 42, 0);
+        this.batRightWing.addBox(-12.0F, 1.0F, 1.5F, 10, 16, 1);
+        this.batOuterRightWing = new ModelRenderer(this, 24, 16);
+        this.batOuterRightWing.setRotationPoint(-12.0F, 1.0F, 1.5F);
+        this.batOuterRightWing.addBox(-8.0F, 1.0F, 0.0F, 8, 12, 1);
+        this.batLeftWing = new ModelRenderer(this, 42, 0);
+        this.batLeftWing.mirror = true;
+        this.batLeftWing.addBox(2.0F, 1.0F, 1.5F, 10, 16, 1);
+        this.batOuterLeftWing = new ModelRenderer(this, 24, 16);
+        this.batOuterLeftWing.mirror = true;
+        this.batOuterLeftWing.setRotationPoint(12.0F, 1.0F, 1.5F);
+        this.batOuterLeftWing.addBox(0.0F, 1.0F, 0.0F, 8, 12, 1);
+        this.batBody.addChild(this.batRightWing);
+        this.batBody.addChild(this.batLeftWing);
+        this.batRightWing.addChild(this.batOuterRightWing);
+        this.batLeftWing.addChild(this.batOuterLeftWing);
+    }
+
+    /**
+     * not actually sure this is size, is not used as of now, but the model would be recreated if the value changed and
+     * it seems a good match for a bats size
+     */
+    public int getBatSize()
+    {
+        return 72;
+    }
+
+    /**
+     * Sets the models various rotation angles then renders the model.
+     */
+    public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+    {
+        EntityBatKing entitybat = (EntityBatKing)p_78088_1_;
+        float f6;
+
+        if (entitybat.getIsBatHanging())
+        {
+            f6 = (180F / (float)Math.PI);
+            this.batHead.rotateAngleX = p_78088_6_ / (180F / (float)Math.PI);
+            this.batHead.rotateAngleY = (float)Math.PI - p_78088_5_ / (180F / (float)Math.PI);
+            this.batHead.rotateAngleZ = (float)Math.PI;
+            this.batHead.setRotationPoint(0.0F, -2.0F, 0.0F);
+            this.batRightWing.setRotationPoint(-3.0F, 0.0F, 3.0F);
+            this.batLeftWing.setRotationPoint(3.0F, 0.0F, 3.0F);
+            this.batBody.rotateAngleX = (float)Math.PI;
+            this.batRightWing.rotateAngleX = -0.15707964F;
+            this.batRightWing.rotateAngleY = -((float)Math.PI * 2F / 5F);
+            this.batOuterRightWing.rotateAngleY = -1.7278761F;
+            this.batLeftWing.rotateAngleX = this.batRightWing.rotateAngleX;
+            this.batLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY;
+            this.batOuterLeftWing.rotateAngleY = -this.batOuterRightWing.rotateAngleY;
+        }
+        else
+        {
+            f6 = (180F / (float)Math.PI);
+            this.batHead.rotateAngleX = p_78088_6_ / (180F / (float)Math.PI);
+            this.batHead.rotateAngleY = p_78088_5_ / (180F / (float)Math.PI);
+            this.batHead.rotateAngleZ = 0.0F;
+            this.batHead.setRotationPoint(0.0F, 0.0F, 0.0F);
+            this.batRightWing.setRotationPoint(0.0F, 0.0F, 0.0F);
+            this.batLeftWing.setRotationPoint(0.0F, 0.0F, 0.0F);
+            this.batBody.rotateAngleX = ((float)Math.PI / 4F) + MathHelper.cos(p_78088_4_ * 0.1F) * 0.15F;
+            this.batBody.rotateAngleY = 0.0F;
+            this.batRightWing.rotateAngleY = MathHelper.cos(p_78088_4_ * 1.3F) * (float)Math.PI * 0.25F;
+            this.batLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY;
+            this.batOuterRightWing.rotateAngleY = this.batRightWing.rotateAngleY * 0.5F;
+            this.batOuterLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY * 0.5F;
+        }
+
+
+        GL11.glScalef(4, 4, 4);
+        this.batHead.render(p_78088_7_);
+        this.batBody.render(p_78088_7_);
+    }
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java b/src/Java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java
new file mode 100644
index 0000000000..f40357495a
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java
@@ -0,0 +1,85 @@
+package gtPlusPlus.core.client.renderer;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.client.IItemRenderer;
+
+import org.lwjgl.opengl.GL11;
+
+
+/**
+ * Easy way of rendering an item which should look like a block.
+ * Borrowed.
+ * 
+ * @author King Lemming
+ * 
+ */
+public class CustomItemBlockRenderer implements IItemRenderer {
+
+	public static CustomItemBlockRenderer instance = new CustomItemBlockRenderer();
+
+	@Override
+	public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+		return true;
+	}
+
+	@Override
+	public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
+		return true;
+	}
+
+	@Override
+	public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
+
+		double offset = -0.5;
+		if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
+			offset = 0;
+		} else if (type == ItemRenderType.ENTITY) {
+			GL11.glScalef(0.5F, 0.5F, 0.5F);
+		}
+		renderItemAsBlock((RenderBlocks) data[0], item, offset, offset, offset);
+	}
+	
+	public static void renderItemAsBlock(RenderBlocks renderer, ItemStack item, double translateX, double translateY, double translateZ) {
+
+		renderTextureAsBlock(renderer, item.getIconIndex(), translateX, translateY, translateZ);
+	}
+
+	public static void renderTextureAsBlock(RenderBlocks renderer, IIcon texture, double translateX, double translateY, double translateZ) {
+
+		Tessellator tessellator = Tessellator.instance;
+		Block block = Blocks.stone;
+
+		if (texture == null) {
+			return;
+		}
+		renderer.setRenderBoundsFromBlock(block);
+		GL11.glTranslated(translateX, translateY, translateZ);
+		tessellator.startDrawingQuads();
+
+		tessellator.setNormal(0.0F, -1.0F, 0.0F);
+		renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.setNormal(0.0F, 1.0F, 0.0F);
+		renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.setNormal(0.0F, 0.0F, -1.0F);
+		renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.setNormal(0.0F, 0.0F, 1.0F);
+		renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.setNormal(-1.0F, 0.0F, 0.0F);
+		renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.setNormal(1.0F, 0.0F, 0.0F);
+		renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.draw();
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderBatKing.java b/src/Java/gtPlusPlus/core/client/renderer/RenderBatKing.java
index fb260eedeb..000badb80f 100644
--- a/src/Java/gtPlusPlus/core/client/renderer/RenderBatKing.java
+++ b/src/Java/gtPlusPlus/core/client/renderer/RenderBatKing.java
@@ -1,21 +1,23 @@
 package gtPlusPlus.core.client.renderer;
 
+import org.lwjgl.opengl.GL11;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.model.ModelBat;
+import gtPlusPlus.core.client.model.ModelBatKing;
+import gtPlusPlus.core.entity.monster.EntityBatKing;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.client.renderer.entity.RenderLiving;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.passive.EntityBat;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
 
 @SideOnly(Side.CLIENT)
 public class RenderBatKing extends RenderLiving {
 	
-	private static final ResourceLocation batTextures = new ResourceLocation("textures/entity/bat.png");
+	private static final ResourceLocation batTextures = new ResourceLocation(CORE.MODID+":"+"textures/entity/batKing.png");
 
 	/**
 	 * not actually sure this is size, is not used as of now, but the model would be
@@ -24,8 +26,8 @@ public class RenderBatKing extends RenderLiving {
 	private int renderedBatSize;
 
 	public RenderBatKing() {
-		super(new ModelBat(), 1F);
-		this.renderedBatSize = ((ModelBat) this.mainModel).getBatSize();
+		super(new ModelBatKing(), 0.7F);
+		this.renderedBatSize = (((ModelBatKing) this.mainModel).getBatSize());
 	}
 
 	/**
@@ -36,13 +38,13 @@ public class RenderBatKing extends RenderLiving {
 	 * func_76986_a(T entity, double d, double d1, double d2, float f, float f1).
 	 * But JAD is pre 1.5 so doesn't do that.
 	 */
-	public void doRender(EntityBat p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+	public void doRender(EntityBatKing p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
 			float p_76986_8_, float p_76986_9_) {
-		int i = ((ModelBat) this.mainModel).getBatSize();
+		int i = ((ModelBatKing) this.mainModel).getBatSize();
 
 		if (i != this.renderedBatSize) {
 			this.renderedBatSize = i;
-			this.mainModel = new ModelBat();
+			this.mainModel = new ModelBatKing();
 		}
 
 		super.doRender((EntityLiving) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
@@ -52,7 +54,7 @@ public class RenderBatKing extends RenderLiving {
 	 * Returns the location of an entity's texture. Doesn't seem to be called unless
 	 * you call Render.bindEntityTexture.
 	 */
-	protected ResourceLocation getEntityTexture(EntityBat p_110775_1_) {
+	protected ResourceLocation getEntityTexture(EntityBatKing p_110775_1_) {
 		return batTextures;
 	}
 
@@ -60,18 +62,18 @@ public class RenderBatKing extends RenderLiving {
 	 * Allows the render to do any OpenGL state modifications necessary before the
 	 * model is rendered. Args: entityLiving, partialTickTime
 	 */
-	protected void preRenderCallback(EntityBat p_77041_1_, float p_77041_2_) {
+	protected void preRenderCallback(EntityBatKing p_77041_1_, float p_77041_2_) {
 		GL11.glScalef(0.35F, 0.35F, 0.35F);
 	}
 
 	/**
 	 * Sets a simple glTranslate on a LivingEntity.
 	 */
-	protected void renderLivingAt(EntityBat p_77039_1_, double p_77039_2_, double p_77039_4_, double p_77039_6_) {
+	protected void renderLivingAt(EntityBatKing p_77039_1_, double p_77039_2_, double p_77039_4_, double p_77039_6_) {
 		super.renderLivingAt(p_77039_1_, p_77039_2_, p_77039_4_, p_77039_6_);
 	}
 
-	protected void rotateCorpse(EntityBat p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_) {
+	protected void rotateCorpse(EntityBatKing p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_) {
 		if (!p_77043_1_.getIsBatHanging()) {
 			GL11.glTranslatef(0.0F, MathHelper.cos(p_77043_2_ * 0.3F) * 0.1F, 0.0F);
 		} else {
@@ -91,7 +93,7 @@ public class RenderBatKing extends RenderLiving {
 	 */
 	public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
 			float p_76986_8_, float p_76986_9_) {
-		this.doRender((EntityBat) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+		this.doRender((EntityBatKing) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
 	}
 
 	/**
@@ -99,11 +101,11 @@ public class RenderBatKing extends RenderLiving {
 	 * model is rendered. Args: entityLiving, partialTickTime
 	 */
 	protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_) {
-		this.preRenderCallback((EntityBat) p_77041_1_, p_77041_2_);
+		this.preRenderCallback((EntityBatKing) p_77041_1_, p_77041_2_);
 	}
 
 	protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_) {
-		this.rotateCorpse((EntityBat) p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
+		this.rotateCorpse((EntityBatKing) p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
 	}
 
 	/**
@@ -111,7 +113,7 @@ public class RenderBatKing extends RenderLiving {
 	 */
 	protected void renderLivingAt(EntityLivingBase p_77039_1_, double p_77039_2_, double p_77039_4_,
 			double p_77039_6_) {
-		this.renderLivingAt((EntityBat) p_77039_1_, p_77039_2_, p_77039_4_, p_77039_6_);
+		this.renderLivingAt((EntityBatKing) p_77039_1_, p_77039_2_, p_77039_4_, p_77039_6_);
 	}
 
 	/**
@@ -124,7 +126,7 @@ public class RenderBatKing extends RenderLiving {
 	 */
 	public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
 			float p_76986_8_, float p_76986_9_) {
-		this.doRender((EntityBat) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+		this.doRender((EntityBatKing) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
 	}
 
 	/**
@@ -132,7 +134,7 @@ public class RenderBatKing extends RenderLiving {
 	 * you call Render.bindEntityTexture.
 	 */
 	protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
-		return this.getEntityTexture((EntityBat) p_110775_1_);
+		return this.getEntityTexture((EntityBatKing) p_110775_1_);
 	}
 
 	/**
@@ -145,6 +147,6 @@ public class RenderBatKing extends RenderLiving {
 	 */
 	public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
 			float p_76986_9_) {
-		this.doRender((EntityBat) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+		this.doRender((EntityBatKing) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
 	}
 }
\ No newline at end of file