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

Massive rework of configs, items and blocks.

Browse source 
I redone where the items/blocsks are stored and how the configs are
handled to clean up it and give space. You can change the config line to
AWWayofTime if you want to keep the compatibility with old configs. Now
you reference the blocks from the ModBlocks and Items from the ModItems.
This commit is contained in:
Fenn 2014-01-17 21:05:38 +00:00
parent 8601e9faff
commit e3644f2d2b
304 changed files with 3941 additions and 5108 deletions
Download patch file Download diff file Expand all files Collapse all files

17
BM_src/WayofTime/alchemicalWizardry/common/renderer/block/RenderConduit.java
View file

@ -1,18 +1,15 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelConduit;
import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
public class RenderConduit extends TileEntitySpecialRenderer
{
public class RenderConduit extends TileEntitySpecialRenderer {
private ModelConduit modelConduit = new ModelConduit();
@Override
@ -34,7 +31,7 @@ public class RenderConduit extends TileEntitySpecialRenderer
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
//GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
//A reference to your Model file. Again, very important.
this.modelConduit.render((Entity)null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileConduit.getInputDirection(), tileConduit.getOutputDirection());
this.modelConduit.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileConduit.getInputDirection(), tileConduit.getOutputDirection());
//Tell it to stop rendering for both the PushMatrix's
GL11.glPopMatrix();
GL11.glPopMatrix();

28
BM_src/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java
View file

@ -1,5 +1,8 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelPedestal;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -10,22 +13,15 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelPedestal;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
import cpw.mods.fml.client.FMLClientHandler;
public class RenderPedestal extends TileEntitySpecialRenderer
{
public class RenderPedestal extends TileEntitySpecialRenderer {
private ModelPedestal modelPedestal = new ModelPedestal();
private final RenderItem customRenderItem;
public RenderPedestal()
{
customRenderItem = new RenderItem()
{
customRenderItem = new RenderItem() {
@Override
public boolean shouldBob()
{
@ -34,6 +30,7 @@ public class RenderPedestal extends TileEntitySpecialRenderer
};
customRenderItem.setRenderManager(RenderManager.instance);
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f)
{
@ -52,7 +49,7 @@ public class RenderPedestal extends TileEntitySpecialRenderer
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
//A reference to your Model file. Again, very important.
this.modelPedestal.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
this.modelPedestal.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
//Tell it to stop rendering for both the PushMatrix's
GL11.glPopMatrix();
GL11.glPopMatrix();
@ -61,7 +58,7 @@ public class RenderPedestal extends TileEntitySpecialRenderer
if (tileAltar.getStackInSlot(0) != null)
{
float scaleFactor = getGhostItemScaleFactor(tileAltar.getStackInSlot(0));
float rotationAngle = (float)(720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL);
float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL);
EntityItem ghostEntityItem = new EntityItem(tileAltar.worldObj);
ghostEntityItem.hoverStart = 0.0F;
ghostEntityItem.setEntityItemStack(tileAltar.getStackInSlot(0));
@ -71,8 +68,7 @@ public class RenderPedestal extends TileEntitySpecialRenderer
if (ghostEntityItem.getEntityItem().getItem() instanceof ItemBlock)
{
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.7F, (float) d2 + 0.5F);
}
else
} else
{
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.6F, (float) d2 + 0.5F);
}
@ -117,8 +113,7 @@ public class RenderPedestal extends TileEntitySpecialRenderer
default:
return 0.90F;
}
}
else
} else
{
switch (customRenderItem.getMiniItemCount(itemStack))
{
@ -197,8 +192,7 @@ public class RenderPedestal extends TileEntitySpecialRenderer
return;
}
}
}
else
} else
{
switch (forgeDirection)
{

26
BM_src/WayofTime/alchemicalWizardry/common/renderer/block/RenderPlinth.java
View file

@ -1,5 +1,8 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelPlinth;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -10,22 +13,15 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelPlinth;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
import cpw.mods.fml.client.FMLClientHandler;
public class RenderPlinth extends TileEntitySpecialRenderer
{
public class RenderPlinth extends TileEntitySpecialRenderer {
private ModelPlinth modelPlinth = new ModelPlinth();
private final RenderItem customRenderItem;
public RenderPlinth()
{
customRenderItem = new RenderItem()
{
customRenderItem = new RenderItem() {
@Override
public boolean shouldBob()
{
@ -34,6 +30,7 @@ public class RenderPlinth extends TileEntitySpecialRenderer
};
customRenderItem.setRenderManager(RenderManager.instance);
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f)
{
@ -52,7 +49,7 @@ public class RenderPlinth extends TileEntitySpecialRenderer
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
//A reference to your Model file. Again, very important.
this.modelPlinth.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
this.modelPlinth.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
//Tell it to stop rendering for both the PushMatrix's
GL11.glPopMatrix();
GL11.glPopMatrix();
@ -70,8 +67,7 @@ public class RenderPlinth extends TileEntitySpecialRenderer
if (ghostEntityItem.getEntityItem().getItem() instanceof ItemBlock)
{
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.7F, (float) d2 + 0.5F);
}
else
} else
{
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 10.4f / 16.0f, (float) d2 + 0.5F - 0.1875f);
}
@ -121,8 +117,7 @@ public class RenderPlinth extends TileEntitySpecialRenderer
default:
return 0.90F * scaleFactor / 2;
}
}
else
} else
{
switch (customRenderItem.getMiniItemCount(itemStack))
{
@ -201,8 +196,7 @@ public class RenderPlinth extends TileEntitySpecialRenderer
return;
}
}
}
else
} else
{
switch (forgeDirection)
{

28
BM_src/WayofTime/alchemicalWizardry/common/renderer/block/RenderWritingTable.java
View file

@ -1,5 +1,8 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelWritingTable;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -10,15 +13,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelWritingTable;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import cpw.mods.fml.client.FMLClientHandler;
public class RenderWritingTable extends TileEntitySpecialRenderer
{
public class RenderWritingTable extends TileEntitySpecialRenderer {
private ModelWritingTable modelWritingTable = new ModelWritingTable();
private final RenderItem customRenderItem;
// private final RenderItem customRenderItem1;
@ -29,8 +26,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer
public RenderWritingTable()
{
customRenderItem = new RenderItem()
{
customRenderItem = new RenderItem() {
@Override
public boolean shouldBob()
{
@ -39,6 +35,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer
};
customRenderItem.setRenderManager(RenderManager.instance);
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f)
{
@ -54,7 +51,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
//A reference to your Model file. Again, very important.
this.modelWritingTable.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
this.modelWritingTable.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
//Tell it to stop rendering for both the PushMatrix's
GL11.glPopMatrix();
GL11.glPopMatrix();
@ -66,7 +63,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer
if (tileAltar.getStackInSlot(i) != null)
{
float scaleFactor = getGhostItemScaleFactor(tileAltar.getStackInSlot(i));
float rotationAngle = (float)(720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL);
float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL);
EntityItem ghostEntityItem = new EntityItem(tileAltar.worldObj);
ghostEntityItem.hoverStart = 0.0F;
ghostEntityItem.setEntityItemStack(tileAltar.getStackInSlot(i));
@ -78,8 +75,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer
if (ghostEntityItem.getEntityItem().getItem() instanceof ItemBlock)
{
GL11.glTranslatef((float) d0 + 0.5F + displacementX, (float) d1 + displacementY + 0.7F, (float) d2 + 0.5F + displacementZ);
}
else
} else
{
GL11.glTranslatef((float) d0 + 0.5F + displacementX, (float) d1 + displacementY + 0.6F, (float) d2 + 0.5F + displacementZ);
}
@ -126,8 +122,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer
default:
return 0.90F * scaleFactor;
}
}
else
} else
{
switch (customRenderItem.getMiniItemCount(itemStack))
{
@ -278,8 +273,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer
return;
}
}
}
else
} else
{
switch (forgeDirection)
{

27
BM_src/WayofTime/alchemicalWizardry/common/renderer/block/TEAltarRenderer.java
View file

@ -1,5 +1,7 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelBloodAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -8,21 +10,15 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelBloodAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
public class TEAltarRenderer extends TileEntitySpecialRenderer
{
public class TEAltarRenderer extends TileEntitySpecialRenderer {
private ModelBloodAltar modelBloodAltar = new ModelBloodAltar();
private final RenderItem customRenderItem;
public TEAltarRenderer()
{
customRenderItem = new RenderItem()
{
customRenderItem = new RenderItem() {
@Override
public boolean shouldBob()
{
@ -35,8 +31,8 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f)
{
modelBloodAltar.renderBloodAltar((TEAltar)tileEntity, d0, d1, d2);
modelBloodAltar.renderBloodLevel((TEAltar)tileEntity, d0, d1, d2);
modelBloodAltar.renderBloodAltar((TEAltar) tileEntity, d0, d1, d2);
modelBloodAltar.renderBloodLevel((TEAltar) tileEntity, d0, d1, d2);
if (tileEntity instanceof TEAltar)
{
@ -51,7 +47,7 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer
if (tileAltar.getStackInSlot(0) != null)
{
float scaleFactor = getGhostItemScaleFactor(tileAltar.getStackInSlot(0));
float rotationAngle = (float)(720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL);
float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL);
EntityItem ghostEntityItem = new EntityItem(tileAltar.worldObj);
ghostEntityItem.hoverStart = 0.0F;
ghostEntityItem.setEntityItemStack(tileAltar.getStackInSlot(0));
@ -61,8 +57,7 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer
if (ghostEntityItem.getEntityItem().getItem() instanceof ItemBlock)
{
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.7F, (float) d2 + 0.5F);
}
else
} else
{
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.6F, (float) d2 + 0.5F);
}
@ -107,8 +102,7 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer
default:
return 0.90F;
}
}
else
} else
{
switch (customRenderItem.getMiniItemCount(itemStack))
{
@ -187,8 +181,7 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer
return;
}
}
}
else
} else
{
switch (forgeDirection)
{

16
BM_src/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAltarItemRenderer.java
View file

@ -1,22 +1,20 @@
package WayofTime.alchemicalWizardry.common.renderer.block.itemRender;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelBloodAltar;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
public class TEAltarItemRenderer implements IItemRenderer
{
public class TEAltarItemRenderer implements IItemRenderer {
private ModelBloodAltar modelBloodAltar;
public TEAltarItemRenderer()
{
modelBloodAltar = new ModelBloodAltar();
}
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)
{
@ -67,7 +65,7 @@ public class TEAltarItemRenderer implements IItemRenderer
GL11.glPushMatrix();
// Disable Lighting Calculations
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glTranslatef(x, y, z);
GL11.glTranslatef(x, y, z);
GL11.glScalef(scale, scale, scale);
GL11.glRotatef(180f, 0f, 1f, 0f);
//FMLClientHandler.instance().getClient().renderEngine.bindTexture("/mods/OBJTutorial/textures/models/TutBox.png");

14
BM_src/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEWritingTableItemRenderer.java
View file

@ -1,23 +1,21 @@
package WayofTime.alchemicalWizardry.common.renderer.block.itemRender;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelWritingTable;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelWritingTable;
import cpw.mods.fml.client.FMLClientHandler;
public class TEWritingTableItemRenderer implements IItemRenderer
{
public class TEWritingTableItemRenderer implements IItemRenderer {
private ModelWritingTable modelBloodAltar;
public TEWritingTableItemRenderer()
{
modelBloodAltar = new ModelWritingTable();
}
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)
{
@ -68,14 +66,14 @@ public class TEWritingTableItemRenderer implements IItemRenderer
GL11.glPushMatrix();
// Disable Lighting Calculations
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glTranslatef(x, y, z);
GL11.glTranslatef(x, y, z);
GL11.glScalef(scale, scale, scale);
GL11.glRotatef(180f, 0f, 1f, 0f);
//FMLClientHandler.instance().getClient().renderEngine.bindTexture("/mods/OBJTutorial/textures/models/TutBox.png");
ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/WritingTable.png");
//FMLClientHandler.instance().getClient().renderEngine.bindTexture("/mods/alchemicalwizardry/textures/models/altar.png");
FMLClientHandler.instance().getClient().renderEngine.bindTexture(test);
modelBloodAltar.render((Entity)null, 0, 0, 0, 0, 0, 0);
modelBloodAltar.render((Entity) null, 0, 0, 0, 0, 0, 0);
// Re-enable Lighting Calculations
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix();