nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

push from laptop

Browse Source
This commit is contained in:
KitsuShadow
2015-07-30 07:00:22 -04:00
parent a1d3b54d6f
commit 899bbb1b5e
176 changed files with 8135 additions and 2371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
eclipse/.metadata/.plugins/org.eclipse.core.resources/.history/4/c0ed259e8035001516d3c8651c025231
View File

@@ -1,64 +0,0 @@
package com.kitsu.medievalcraft.renderer.blocks;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
import org.lwjgl.opengl.GL11;
import com.kitsu.medievalcraft.entity.EntityModelArrow;
public class RenderModelArrow extends Render
{
//private static final ResourceLocation arrowTextures = new ResourceLocation("textures/entity/arrow.png");
private static final ResourceLocation arrowTextures = new ResourceLocation("kitsumedievalcraft:textures/items/itemModelArrow.png");
public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/ModelArrow.obj");
public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/modelarrow.png");
public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE);
public void doRender(EntityModelArrow p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
{
GL11.glPushMatrix();
GL11.glScalef(1.0F, 1.0F, 1.0F);
GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_ );
GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE);
model.renderAll();
GL11.glPopMatrix();
}
protected ResourceLocation getEntityTexture(EntityModelArrow p_110775_1_)
{
return arrowTextures;
}
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity p_110775_1_)
{
return this.getEntityTexture((EntityModelArrow)p_110775_1_);
}
/**
* Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
* handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
* (Render<T extends Entity) and this method has signature public void 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(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
{
//System.out.println("doRender Ran");
this.doRender((EntityModelArrow)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
}

147
eclipse/.metadata/.plugins/org.eclipse.core.resources/.history/7/802ac96c98360015124ac31324bc701a Normal file
View File

@@ -0,0 +1,147 @@
package com.kitsu.medievalcraft.renderer.itemrenderer.weapons;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
import org.lwjgl.opengl.GL11;
public class IRBattleAxe implements IItemRenderer {
public static final ResourceLocation LONGSWORD = new ResourceLocation("kitsumedievalcraft:models/Battleaxev3.obj");
public static final ResourceLocation blade = new ResourceLocation("kitsumedievalcraft:models/Battleaxe.png");
public static final ResourceLocation blade1 = new ResourceLocation("kitsumedievalcraft:models/Battleaxe1.png");
public IModelCustom model = AdvancedModelLoader.loadModel(LONGSWORD);
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
switch(type) {
case EQUIPPED: {
return true;
}
case EQUIPPED_FIRST_PERSON: {
return true;
}
case INVENTORY: {
return true;
}
case ENTITY: {
return true;
}
default: return false;
}
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item,
ItemRendererHelper helper) {
switch(type) {
case EQUIPPED: {
return false;
}
case EQUIPPED_FIRST_PERSON: {
return false;
}
case INVENTORY: {
return false;
}
case ENTITY: {
return (helper == ItemRendererHelper.ENTITY_BOBBING ||
helper == ItemRendererHelper.ENTITY_ROTATION ||
helper == ItemRendererHelper.BLOCK_3D);
}
default: return false;
}
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
switch(type) {
case EQUIPPED: {
GL11.glPushMatrix();
GL11.glScalef(0.25F, 0.25F, 0.25F);
//ANGLE, X ROTATE, Y ROTATE, Z ROTATE
//GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(45F, 0.0F, 0.0F, 1.0F);
//GL11.glRotated(90, 1.0, 0.0, 0.0);
GL11.glTranslatef(2.8F, 0.2F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
//Minecraft.getMinecraft().renderEngine.bindTexture(blade1);
model.renderAll();
GL11.glPopMatrix();
} break;
case EQUIPPED_FIRST_PERSON: {
GL11.glPushMatrix();
GL11.glScalef(0.3F, 0.4F, 0.3F);
//ANGLE, X ROTATE, Y ROTATE, Z ROTATE
GL11.glRotatef(40F, 0.0F, 0.0F, 1.0F);
//GL11.glRotated(-85, 1.0, 0.0, 0.0);
//GL11.glRotated(50, 0.0F, 0.0F, 1.0F);
//GL11.glRotated(3, 0.0F, 1.0F, 0.0F);
//GL11.glTranslatef(0.9F, -0.9F, 0.9F);
GL11.glTranslatef(2.0F, -1.6F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
//Minecraft.getMinecraft().renderEngine.bindTexture(blade1);
model.renderAll();
GL11.glPopMatrix();
} break;
case INVENTORY: {
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glScalef(2.3F, 2.3F, 2.3F);
GL11.glTranslatef(1.8F, 5.25F, 0.0F);
GL11.glRotatef(135, 0.0F, 0.0F, -1.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
model.renderAll();
GL11.glPopMatrix();
} break;
case ENTITY: {
GL11.glPushMatrix();
GL11.glScalef(0.5F, 0.5F, 0.5F);
GL11.glTranslatef(0.0F, 1.0F, 0.0F);
//GL11.glRotatef(180, 0.0F, 0.0F, 1.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
model.renderAll();
GL11.glPopMatrix();
} break;
default:
break;
}
}
}

64
eclipse/.metadata/.plugins/org.eclipse.core.resources/.history/77/8063b6af8035001516d3c8651c025231
View File

@@ -1,64 +0,0 @@
package com.kitsu.medievalcraft.renderer.blocks;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
import org.lwjgl.opengl.GL11;
import com.kitsu.medievalcraft.entity.EntityModelArrow;
public class RenderModelArrow extends Render
{
//private static final ResourceLocation arrowTextures = new ResourceLocation("textures/entity/arrow.png");
private static final ResourceLocation arrowTextures = new ResourceLocation("kitsumedievalcraft:textures/items/itemModelArrow.png");
public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/ModelArrow.obj");
//public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/modelarrow.png");
public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE);
public void doRender(EntityModelArrow p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
{
GL11.glPushMatrix();
GL11.glScalef(1.0F, 1.0F, 1.0F);
GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_ );
GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE);
model.renderAll();
GL11.glPopMatrix();
}
protected ResourceLocation getEntityTexture(EntityModelArrow p_110775_1_)
{
return arrowTextures;
}
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity p_110775_1_)
{
return this.getEntityTexture((EntityModelArrow)p_110775_1_);
}
/**
* Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
* handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
* (Render<T extends Entity) and this method has signature public void 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(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
{
//System.out.println("doRender Ran");
this.doRender((EntityModelArrow)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
}

144
eclipse/.metadata/.plugins/org.eclipse.core.resources/.history/ca/70c57ffb95360015124ac31324bc701a Normal file
View File

@@ -0,0 +1,144 @@
package com.kitsu.medievalcraft.renderer.itemrenderer.weapons;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
import org.lwjgl.opengl.GL11;
public class IRBattleAxe implements IItemRenderer {
public static final ResourceLocation LONGSWORD = new ResourceLocation("kitsumedievalcraft:models/Battleaxev3.obj");
public static final ResourceLocation blade = new ResourceLocation("kitsumedievalcraft:models/Battleaxe.png");
public IModelCustom model = AdvancedModelLoader.loadModel(LONGSWORD);
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
switch(type) {
case EQUIPPED: {
return true;
}
case EQUIPPED_FIRST_PERSON: {
return true;
}
case INVENTORY: {
return true;
}
case ENTITY: {
return true;
}
default: return false;
}
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item,
ItemRendererHelper helper) {
switch(type) {
case EQUIPPED: {
return false;
}
case EQUIPPED_FIRST_PERSON: {
return false;
}
case INVENTORY: {
return false;
}
case ENTITY: {
return (helper == ItemRendererHelper.ENTITY_BOBBING ||
helper == ItemRendererHelper.ENTITY_ROTATION ||
helper == ItemRendererHelper.BLOCK_3D);
}
default: return false;
}
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
switch(type) {
case EQUIPPED: {
GL11.glPushMatrix();
GL11.glScalef(0.25F, 0.25F, 0.25F);
//ANGLE, X ROTATE, Y ROTATE, Z ROTATE
//GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(45F, 0.0F, 0.0F, 1.0F);
//GL11.glRotated(90, 1.0, 0.0, 0.0);
GL11.glTranslatef(2.8F, 0.2F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
model.renderAll();
GL11.glPopMatrix();
} break;
case EQUIPPED_FIRST_PERSON: {
GL11.glPushMatrix();
GL11.glScalef(0.3F, 0.4F, 0.3F);
//ANGLE, X ROTATE, Y ROTATE, Z ROTATE
GL11.glRotatef(40F, 0.0F, 0.0F, 1.0F);
//GL11.glRotated(-85, 1.0, 0.0, 0.0);
//GL11.glRotated(50, 0.0F, 0.0F, 1.0F);
//GL11.glRotated(3, 0.0F, 1.0F, 0.0F);
//GL11.glTranslatef(0.9F, -0.9F, 0.9F);
GL11.glTranslatef(2.0F, -1.6F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
model.renderAll();
GL11.glPopMatrix();
} break;
case INVENTORY: {
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glScalef(2.3F, 2.3F, 2.3F);
GL11.glTranslatef(1.8F, 5.25F, 0.0F);
GL11.glRotatef(135, 0.0F, 0.0F, -1.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
model.renderAll();
GL11.glPopMatrix();
} break;
case ENTITY: {
GL11.glPushMatrix();
GL11.glScalef(0.5F, 0.5F, 0.5F);
GL11.glTranslatef(0.0F, 1.0F, 0.0F);
//GL11.glRotatef(180, 0.0F, 0.0F, 1.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
model.renderAll();
GL11.glPopMatrix();
} break;
default:
break;
}
}
}

147
eclipse/.metadata/.plugins/org.eclipse.core.resources/.history/e1/a0d7fbaf96360015124ac31324bc701a Normal file
View File

@@ -0,0 +1,147 @@
package com.kitsu.medievalcraft.renderer.itemrenderer.weapons;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
import org.lwjgl.opengl.GL11;
public class IRBattleAxe implements IItemRenderer {
public static final ResourceLocation LONGSWORD = new ResourceLocation("kitsumedievalcraft:models/Battleaxev3.obj");
public static final ResourceLocation blade = new ResourceLocation("kitsumedievalcraft:models/Battleaxe.png");
public static final ResourceLocation blade1 = new ResourceLocation("kitsumedievalcraft:models/Battleaxe1.png");
public IModelCustom model = AdvancedModelLoader.loadModel(LONGSWORD);
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
switch(type) {
case EQUIPPED: {
return true;
}
case EQUIPPED_FIRST_PERSON: {
return true;
}
case INVENTORY: {
return true;
}
case ENTITY: {
return true;
}
default: return false;
}
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item,
ItemRendererHelper helper) {
switch(type) {
case EQUIPPED: {
return false;
}
case EQUIPPED_FIRST_PERSON: {
return false;
}
case INVENTORY: {
return false;
}
case ENTITY: {
return (helper == ItemRendererHelper.ENTITY_BOBBING ||
helper == ItemRendererHelper.ENTITY_ROTATION ||
helper == ItemRendererHelper.BLOCK_3D);
}
default: return false;
}
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
switch(type) {
case EQUIPPED: {
GL11.glPushMatrix();
GL11.glScalef(0.25F, 0.25F, 0.25F);
//ANGLE, X ROTATE, Y ROTATE, Z ROTATE
//GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(45F, 0.0F, 0.0F, 1.0F);
//GL11.glRotated(90, 1.0, 0.0, 0.0);
GL11.glTranslatef(2.8F, 0.2F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
Minecraft.getMinecraft().renderEngine.bindTexture(blade1);
model.renderAll();
GL11.glPopMatrix();
} break;
case EQUIPPED_FIRST_PERSON: {
GL11.glPushMatrix();
GL11.glScalef(0.3F, 0.4F, 0.3F);
//ANGLE, X ROTATE, Y ROTATE, Z ROTATE
GL11.glRotatef(40F, 0.0F, 0.0F, 1.0F);
//GL11.glRotated(-85, 1.0, 0.0, 0.0);
//GL11.glRotated(50, 0.0F, 0.0F, 1.0F);
//GL11.glRotated(3, 0.0F, 1.0F, 0.0F);
//GL11.glTranslatef(0.9F, -0.9F, 0.9F);
GL11.glTranslatef(2.0F, -1.6F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
Minecraft.getMinecraft().renderEngine.bindTexture(blade1);
model.renderAll();
GL11.glPopMatrix();
} break;
case INVENTORY: {
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glScalef(2.3F, 2.3F, 2.3F);
GL11.glTranslatef(1.8F, 5.25F, 0.0F);
GL11.glRotatef(135, 0.0F, 0.0F, -1.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
model.renderAll();
GL11.glPopMatrix();
} break;
case ENTITY: {
GL11.glPushMatrix();
GL11.glScalef(0.5F, 0.5F, 0.5F);
GL11.glTranslatef(0.0F, 1.0F, 0.0F);
//GL11.glRotatef(180, 0.0F, 0.0F, 1.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(blade);
model.renderAll();
GL11.glPopMatrix();
} break;
default:
break;
}
}
}

BIN
eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.location
View File

Binary file not shown.

BIN
eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/81/b8/87/3d/7a/history.index
View File

Binary file not shown.

BIN
eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/81/b8/87/3d/d6/d7/history.index Normal file
View File

Binary file not shown.

BIN
eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location
View File

Binary file not shown.

BIN
eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.markers
View File

Binary file not shown.

BIN
eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/org.eclipse.jdt.core/state.dat
View File

Binary file not shown.

BIN
eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
View File

Binary file not shown.

BIN
eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
View File

Binary file not shown.

BIN
eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
View File

Binary file not shown.