Converted the rest of the SAGMillRecipes_Core.xml to use named items/blocks instead of itemID.

This commit is contained in:
cp committed 2014-04-10 21:09:40 +08:00
1 parent 9e61e156b7
commit ee4c5e6bbf
5 files changed
+60 -112

No files matched your search

@@ -36,6 +36,8 @@ import crazypants.enderio.conduit.render.DefaultConduitRenderer;
import crazypants.enderio.conduit.render.ItemConduitRenderer;
import crazypants.enderio.enderface.EnderIoRenderer;
import crazypants.enderio.enderface.TileEnderIO;
import crazypants.enderio.farm.BlockFarmStation;
import crazypants.enderio.farm.FarmingStationRenderer;
import crazypants.enderio.item.PoweredItemRenderer;
import crazypants.enderio.item.YetaWrenchOverlayRenderer;
import crazypants.enderio.item.YetaWrenchTickHandler;
@@ -120,6 +122,9 @@ public class ClientProxy extends CommonProxy {
BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer());
BlockFarmStation.renderId = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(new FarmingStationRenderer());
BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId();
CombustionGeneratorRenderer cr = new CombustionGeneratorRenderer();
RenderingRegistry.registerBlockHandler(cr);
@@ -2,7 +2,6 @@ package crazypants.enderio.machine.generator;
import java.util.Random;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -23,9 +22,6 @@ public class BlockCombustionGenerator extends AbstractMachineBlock<TileCombustio
public static int renderId;
// protected IIcon frontOn;
// protected IIcon frontOff;
public static BlockCombustionGenerator create() {
BlockCombustionGenerator gen = new BlockCombustionGenerator();
gen.init();
@@ -36,13 +32,6 @@ public class BlockCombustionGenerator extends AbstractMachineBlock<TileCombustio
super(ModObject.blockCombustionGenerator, TileCombustionGenerator.class);
}
@Override
public void registerBlockIcons(IIconRegister iIconRegister) {
super.registerBlockIcons(iIconRegister);
// frontOn = iIconRegister.registerIcon("enderio:combustionGenFrontOn");
// frontOff = iIconRegister.registerIcon("enderio:combustionGenFront");
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) {
@@ -115,19 +104,6 @@ public class BlockCombustionGenerator extends AbstractMachineBlock<TileCombustio
return iconBuffer[0][2];
}
// public IIcon getFrontOn() {
// return frontOn;
// }
//
// public IIcon getFrontOff() {
// return frontOff;
// }
@Override
public String getTopIconKey(boolean active) {
return super.getTopIconKey(active);
}
@Override
public String getMachineFrontIconKey(boolean active) {
if(active) {
@@ -25,10 +25,7 @@ public class GuiStirlingGenerator extends GuiMachineBase {
this.entity = te;
}
/**
* Draw the background layer for the GuiContainer (everything behind the
* items)
*/
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -45,19 +42,19 @@ public class GuiStirlingGenerator extends GuiMachineBase {
}
super.drawGuiContainerBackgroundLayer(par1, par2, par3);
FontRenderer fr = getFontRenderer();
int y = guiTop + fr.FONT_HEIGHT / 2 + 3;
double output = 0;
if(entity.isActive()) {
output = entity.getPowerPerTick();
}
String txt = Lang.localize("stirlingGenerator.output") + " " + PowerDisplayUtil.formatPower(output) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr();
String txt = Lang.localize("stirlingGenerator.output") + " " + PowerDisplayUtil.formatPower(output) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr();
int sw = fr.getStringWidth(txt);
fr.drawStringWithShadow(txt, guiLeft + xSize / 2 - sw / 2, y, ColorUtil.getRGB(Color.WHITE));
txt = Lang.localize("stirlingGenerator.burnRate") + " " + (1/entity.getBurnTimeMultiplier());
txt = Lang.localize("stirlingGenerator.burnRate") + " " + (1/entity.getBurnTimeMultiplier());
sw = fr.getStringWidth(txt);
y += fr.FONT_HEIGHT + 3;
fr.drawStringWithShadow(txt, guiLeft + xSize / 2 - sw / 2, y, ColorUtil.getRGB(Color.WHITE));
@@ -181,7 +181,7 @@ public final class CubeRenderer {
float cm = brightnessPerSide[ForgeDirection.NORTH.ordinal()];
tessellator.setColorOpaque_F(cm, cm, cm);
}
tex = faceTextures[0];
minU = tex.getMinU();
maxU = tex.getMaxU();
@@ -224,7 +224,7 @@ public final class CubeRenderer {
tessellator.setNormal(0, -1, 0);
if(brightnessPerSide != null) {
float cm = brightnessPerSide[ForgeDirection.UP.ordinal()];
float cm = brightnessPerSide[ForgeDirection.DOWN.ordinal()];
tessellator.setColorOpaque_F(cm, cm, cm);
}
tex = faceTextures[3];