From c0bef5cc24c18bb062122875d2fc830a8e3bc1e2 Mon Sep 17 00:00:00 2001 From: cp Date: Fri, 28 Feb 2014 20:46:26 +0800 Subject: [PATCH] Materials and capacitors ported. --- build.gradle | 2 - resources/assets/enderio/lang/en_US.lang | 2 +- .../java/crazypants/enderio/ClientProxy.java | 190 +++++++++--------- src/main/java/crazypants/enderio/EnderIO.java | 40 ++-- .../enderio/enderface/BlockEio.java | 6 +- .../enderio/material/BlockFusedQuartz.java | 100 ++++----- .../enderio/material/FusedQuartzRenderer.java | 64 +++--- .../enderio/material/ItemAlloy.java | 3 +- .../enderio/material/ItemCapacitor.java | 3 +- .../enderio/material/ItemFusedQuartz.java | 8 +- .../material/ItemFusedQuartzFrame.java | 93 +++++---- .../enderio/material/ItemMachinePart.java | 3 +- .../enderio/material/ItemMaterial.java | 3 +- .../enderio/material/ItemPowderIngot.java | 3 +- .../enderio/material/MachinePartRenderer.java | 4 +- .../enderio/material/MaterialRecipes.java | 117 +++++------ .../crazypants/enderio/power/Capacitors.java | 4 +- .../enderio/power/PowerHandlerUtil.java | 29 +-- .../enderio/power/PowerInterfaceBC.java | 16 +- .../render/ConnectedTextureRenderer.java | 6 + 20 files changed, 363 insertions(+), 333 deletions(-) diff --git a/build.gradle b/build.gradle index aa49f73b..2986d5f6 100644 --- a/build.gradle +++ b/build.gradle @@ -54,9 +54,7 @@ sourceSets { exclude '**/enderio/crafting/**' exclude '**/enderio/item/**' exclude '**/enderio/machine/**' - exclude '**/enderio/material/**' exclude '**/enderio/nei/**' - exclude '**/enderio/power/**' exclude '**/enderio/trigger/**' exclude '**/powercrystals/**' // exclude 'some exclusion' diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 7a33ac04..0716897f 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -49,7 +49,7 @@ enderio.vibrantCrystal.name=Vibrant Crystal //Quartz / Glass -enderio.blockFusedQuartz=Fused Quartz +tile.blockFusedQuartz.name=Fused Quartz enderio.blockFusedQuartz.fusedQuartz.name=Fused Quartz enderio.blockFusedQuartz.fusedGlass.name=Quite Clear Glass diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index a4afcbbd..8a8f384f 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -1,13 +1,5 @@ package crazypants.enderio; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import crazypants.enderio.enderface.EnderIoRenderer; -import crazypants.enderio.enderface.TileEnderIO; -import crazypants.enderio.teleport.TileTravelAnchor; -import crazypants.enderio.teleport.TravelController; -import crazypants.enderio.teleport.TravelEntitySpecialRenderer; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -15,6 +7,18 @@ import net.minecraft.item.Item; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.FMLCommonHandler; +import crazypants.enderio.enderface.EnderIoRenderer; +import crazypants.enderio.enderface.TileEnderIO; +import crazypants.enderio.material.BlockFusedQuartz; +import crazypants.enderio.material.FusedQuartzFrameRenderer; +import crazypants.enderio.material.FusedQuartzRenderer; +import crazypants.enderio.teleport.TileTravelAnchor; +import crazypants.enderio.teleport.TravelController; +import crazypants.enderio.teleport.TravelEntitySpecialRenderer; public class ClientProxy extends CommonProxy { @@ -30,22 +34,22 @@ public class ClientProxy extends CommonProxy { // @formatter:on static { -// AbstractMachineBlock.initIcon(); -// RedstoneConduit.initIcons(); -// InsulatedRedstoneConduit.initIcons(); -// RedstoneSwitch.initIcons(); -// PowerConduit.initIcons(); -// LiquidConduit.initIcons(); -// AdvancedLiquidConduit.initIcons(); -// ItemConduit.initIcons(); -// MeConduit.initIcons(); + // AbstractMachineBlock.initIcon(); + // RedstoneConduit.initIcons(); + // InsulatedRedstoneConduit.initIcons(); + // RedstoneSwitch.initIcons(); + // PowerConduit.initIcons(); + // LiquidConduit.initIcons(); + // AdvancedLiquidConduit.initIcons(); + // ItemConduit.initIcons(); + // MeConduit.initIcons(); } -// private List conduitRenderers = new ArrayList(); -// -// private DefaultConduitRenderer dcr = new DefaultConduitRenderer(); -// -// private ConduitBundleRenderer cbr; + // private List conduitRenderers = new ArrayList(); + // + // private DefaultConduitRenderer dcr = new DefaultConduitRenderer(); + // + // private ConduitBundleRenderer cbr; @Override public World getClientWorld() { @@ -57,13 +61,13 @@ public class ClientProxy extends CommonProxy { return Minecraft.getMinecraft().thePlayer; } -// public ConduitBundleRenderer getConduitBundleRenderer() { -// return cbr; -// } -// -// public void setCbr(ConduitBundleRenderer cbr) { -// this.cbr = cbr; -// } + // public ConduitBundleRenderer getConduitBundleRenderer() { + // return cbr; + // } + // + // public void setCbr(ConduitBundleRenderer cbr) { + // this.cbr = cbr; + // } @Override public void load() { @@ -71,88 +75,88 @@ public class ClientProxy extends CommonProxy { // Renderers -// BlockCustomFenceGateRenderer bcfgr = new BlockCustomFenceGateRenderer(); -// BlockCustomFenceGate.renderId = RenderingRegistry.getNextAvailableRenderId(); -// RenderingRegistry.registerBlockHandler(bcfgr); -// -// BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId(); -// RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer()); -// -// BlockElectricLight.renderId = RenderingRegistry.getNextAvailableRenderId(); -// RenderingRegistry.registerBlockHandler(new ElectricLightRenderer()); -// -// CapacitorBankRenderer capr = new CapacitorBankRenderer(); -// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapacitorBank), capr); -// -// BlockCapacitorBank.renderId = RenderingRegistry.getNextAvailableRenderId(); -// CapBankRenderer2 cbr2 = new CapBankRenderer2(); -// RenderingRegistry.registerBlockHandler(cbr2); -// -// FusedQuartzFrameRenderer fqfr = new FusedQuartzFrameRenderer(); -// MinecraftForgeClient.registerItemRenderer(EnderIO.itemFusedQuartzFrame, fqfr); -// -// ItemConduitRenderer itemConRenderer = new ItemConduitRenderer(); -// MinecraftForgeClient.registerItemRenderer(EnderIO.itemLiquidConduit, itemConRenderer); -// MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduit, itemConRenderer); -// MinecraftForgeClient.registerItemRenderer(EnderIO.itemRedstoneConduit, itemConRenderer); -// MinecraftForgeClient.registerItemRenderer(EnderIO.itemItemConduit, itemConRenderer); -// MinecraftForgeClient.registerItemRenderer(EnderIO.itemMeConduit, itemConRenderer); -// -// PaintedItemRenderer pir = new PaintedItemRenderer(); -// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomFence), pir); -// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomFenceGate), pir); -// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomWall), pir); -// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomStair), pir); + // BlockCustomFenceGateRenderer bcfgr = new BlockCustomFenceGateRenderer(); + // BlockCustomFenceGate.renderId = RenderingRegistry.getNextAvailableRenderId(); + // RenderingRegistry.registerBlockHandler(bcfgr); + // + BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer()); + // + // BlockElectricLight.renderId = RenderingRegistry.getNextAvailableRenderId(); + // RenderingRegistry.registerBlockHandler(new ElectricLightRenderer()); + // + // CapacitorBankRenderer capr = new CapacitorBankRenderer(); + // MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapacitorBank), capr); + // + // BlockCapacitorBank.renderId = RenderingRegistry.getNextAvailableRenderId(); + // CapBankRenderer2 cbr2 = new CapBankRenderer2(); + // RenderingRegistry.registerBlockHandler(cbr2); + // + FusedQuartzFrameRenderer fqfr = new FusedQuartzFrameRenderer(); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemFusedQuartzFrame, fqfr); + // + // ItemConduitRenderer itemConRenderer = new ItemConduitRenderer(); + // MinecraftForgeClient.registerItemRenderer(EnderIO.itemLiquidConduit, itemConRenderer); + // MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduit, itemConRenderer); + // MinecraftForgeClient.registerItemRenderer(EnderIO.itemRedstoneConduit, itemConRenderer); + // MinecraftForgeClient.registerItemRenderer(EnderIO.itemItemConduit, itemConRenderer); + // MinecraftForgeClient.registerItemRenderer(EnderIO.itemMeConduit, itemConRenderer); + // + // PaintedItemRenderer pir = new PaintedItemRenderer(); + // MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomFence), pir); + // MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomFenceGate), pir); + // MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomWall), pir); + // MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomStair), pir); //TODO:1.7 //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCustomSlab), pir); -// MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer()); -// MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer()); -// -// cbr = new ConduitBundleRenderer((float) Config.conduitScale); -// BlockConduitBundle.rendererId = RenderingRegistry.getNextAvailableRenderId(); -// RenderingRegistry.registerBlockHandler(cbr); -// ClientRegistry.bindTileEntitySpecialRenderer(TileConduitBundle.class, cbr); + // MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer()); + // MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer()); + // + // cbr = new ConduitBundleRenderer((float) Config.conduitScale); + // BlockConduitBundle.rendererId = RenderingRegistry.getNextAvailableRenderId(); + // RenderingRegistry.registerBlockHandler(cbr); + // ClientRegistry.bindTileEntitySpecialRenderer(TileConduitBundle.class, cbr); ClientRegistry.bindTileEntitySpecialRenderer(TileTravelAnchor.class, new TravelEntitySpecialRenderer()); -// conduitRenderers.add(RedstoneSwitchRenderer.getInstance()); -// conduitRenderers.add(new AdvancedLiquidConduitRenderer()); -// conduitRenderers.add(new LiquidConduitRenderer()); -// conduitRenderers.add(new PowerConduitRenderer()); -// conduitRenderers.add(new InsulatedRedstoneConduitRenderer()); -// conduitRenderers.add(new crazypants.enderio.conduit.item.ItemConduitRenderer()); + // conduitRenderers.add(RedstoneSwitchRenderer.getInstance()); + // conduitRenderers.add(new AdvancedLiquidConduitRenderer()); + // conduitRenderers.add(new LiquidConduitRenderer()); + // conduitRenderers.add(new PowerConduitRenderer()); + // conduitRenderers.add(new InsulatedRedstoneConduitRenderer()); + // conduitRenderers.add(new crazypants.enderio.conduit.item.ItemConduitRenderer()); EnderIoRenderer eior = new EnderIoRenderer(); ClientRegistry.bindTileEntitySpecialRenderer(TileEnderIO.class, eior); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderIo), eior); -// ClientRegistry.bindTileEntitySpecialRenderer(TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir)); -// -// HyperCubeRenderer hcr = new HyperCubeRenderer(); -// ClientRegistry.bindTileEntitySpecialRenderer(TileHyperCube.class, hcr); -// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockHyperCube), hcr); + // ClientRegistry.bindTileEntitySpecialRenderer(TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir)); + // + // HyperCubeRenderer hcr = new HyperCubeRenderer(); + // ClientRegistry.bindTileEntitySpecialRenderer(TileHyperCube.class, hcr); + // MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockHyperCube), hcr); -// new YetaWrenchOverlayRenderer(EnderIO.itemYetaWench); -// // Tick handler -// if(Config.useSneakMouseWheelYetaWrench) { -// MinecraftForge.EVENT_BUS.register(new YetaWrenchTickHandler()); -// } + // new YetaWrenchOverlayRenderer(EnderIO.itemYetaWench); + // // Tick handler + // if(Config.useSneakMouseWheelYetaWrench) { + // MinecraftForge.EVENT_BUS.register(new YetaWrenchTickHandler()); + // } MinecraftForge.EVENT_BUS.register(TravelController.instance); FMLCommonHandler.instance().bus().register(TravelController.instance); } -// @Override -// public ConduitRenderer getRendererForConduit(IConduit conduit) { -// for (ConduitRenderer renderer : conduitRenderers) { -// if(renderer.isRendererForConduit(conduit)) { -// return renderer; -// } -// } -// return dcr; -// } + // @Override + // public ConduitRenderer getRendererForConduit(IConduit conduit) { + // for (ConduitRenderer renderer : conduitRenderers) { + // if(renderer.isRendererForConduit(conduit)) { + // return renderer; + // } + // } + // return dcr; + // } @Override public double getReachDistanceForPlayer(EntityPlayer entityPlayer) { diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index dc8dcf5f..792aefba 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -13,6 +13,14 @@ import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; import crazypants.enderio.enderface.BlockEnderIO; import crazypants.enderio.enderface.ItemEnderface; +import crazypants.enderio.material.BlockFusedQuartz; +import crazypants.enderio.material.ItemAlloy; +import crazypants.enderio.material.ItemCapacitor; +import crazypants.enderio.material.ItemFusedQuartzFrame; +import crazypants.enderio.material.ItemMachinePart; +import crazypants.enderio.material.ItemMaterial; +import crazypants.enderio.material.ItemPowderIngot; +import crazypants.enderio.material.MaterialRecipes; import crazypants.enderio.network.PacketPipeline; import crazypants.enderio.network.PacketTileEntity; import crazypants.enderio.teleport.BlockTravelAnchor; @@ -33,13 +41,13 @@ public class EnderIO { public static GuiHandler guiHandler = new GuiHandler(); // Materials - // public static ItemCapacitor itemBasicCapacitor; - // public static ItemAlloy itemAlloy; - // public static BlockFusedQuartz blockFusedQuartz; - // public static ItemFusedQuartzFrame itemFusedQuartzFrame; - // public static ItemMachinePart itemMachinePart; - // public static ItemPowderIngot itemPowderIngot; - // public static ItemMaterial itemMaterial; + public static ItemCapacitor itemBasicCapacitor; + public static ItemAlloy itemAlloy; + public static BlockFusedQuartz blockFusedQuartz; + public static ItemFusedQuartzFrame itemFusedQuartzFrame; + public static ItemMachinePart itemMachinePart; + public static ItemPowderIngot itemPowderIngot; + public static ItemMaterial itemMaterial; // Enderface public static BlockEnderIO blockEnderIo; @@ -97,13 +105,13 @@ public class EnderIO { // ConduitGeometryUtil.setupBounds((float) Config.conduitScale); - // itemBasicCapacitor = ItemCapacitor.create(); - // itemAlloy = ItemAlloy.create(); - // blockFusedQuartz = BlockFusedQuartz.create(); - // itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); - // itemMachinePart = ItemMachinePart.create(); - // itemPowderIngot = ItemPowderIngot.create(); - // itemMaterial = ItemMaterial.create(); + itemBasicCapacitor = ItemCapacitor.create(); + itemAlloy = ItemAlloy.create(); + blockFusedQuartz = BlockFusedQuartz.create(); + itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); + itemMachinePart = ItemMachinePart.create(); + itemPowderIngot = ItemPowderIngot.create(); + itemMaterial = ItemMaterial.create(); blockEnderIo = BlockEnderIO.create(); itemEnderface = ItemEnderface.create(); @@ -147,7 +155,7 @@ public class EnderIO { // itemYetaWench = ItemYetaWrench.create(); // itemMJReader = ItemMJReader.create(); // - // MaterialRecipes.registerOresInDictionary(); + MaterialRecipes.registerOresInDictionary(); } @EventHandler @@ -188,7 +196,7 @@ public class EnderIO { // PacketHandler.instance.addPacketProcessor(new RedstoneModePacketProcessor()); // EnderfaceRecipes.addRecipes(); - // MaterialRecipes.addRecipes(); + MaterialRecipes.addRecipes(); // ConduitRecipes.addRecipes(); // MachineRecipes.addRecipes(); // ItemRecipes.addRecipes(); diff --git a/src/main/java/crazypants/enderio/enderface/BlockEio.java b/src/main/java/crazypants/enderio/enderface/BlockEio.java index b7346944..6cad372f 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEio.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEio.java @@ -15,7 +15,11 @@ public abstract class BlockEio extends Block { protected final String name; protected BlockEio(String name, Class teClass) { - super(Material.rock); + this(name, teClass, Material.rock); + } + + protected BlockEio(String name, Class teClass, Material mat) { + super(mat); this.teClass = teClass; this.name = name; setHardness(0.5F); diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index 7bf7e7df..ff336a89 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -3,28 +3,26 @@ package crazypants.enderio.material; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; +import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; -import crazypants.enderio.machine.painter.PainterUtil; -import crazypants.enderio.machine.painter.TileEntityCustomBlock; +import crazypants.enderio.enderface.BlockEio; import crazypants.util.Lang; -public class BlockFusedQuartz extends Block implements ITileEntityProvider { +public class BlockFusedQuartz extends BlockEio { public static int renderId; @@ -58,20 +56,20 @@ public class BlockFusedQuartz extends Block implements ITileEntityProvider { IIcon[] frameIcons; private BlockFusedQuartz() { - super(ModObject.blockFusedQuartz.id, Material.glass); - setHardness(0.5F); - setStepSound(Block.soundGlassFootstep); - setUnlocalizedName(ModObject.blockFusedQuartz.unlocalisedName); - setCreativeTab(EnderIOTab.tabEnderIO); + //TODO:1.7 no custom block class + //super(ModObject.blockFusedQuartz.unlocalisedName, TileEntityCustomBlock.class, Material.glass); + super(ModObject.blockFusedQuartz.unlocalisedName, null, Material.glass); + setStepSound(Block.soundTypeGlass); } - private void init() { + @Override + protected void init() { + super.init(); - GameRegistry.registerBlock(this, ItemFusedQuartz.class, ModObject.blockFusedQuartz.unlocalisedName); - LanguageRegistry.addName(this, ModObject.blockFusedQuartz.unlocalisedName); for (Type subtype : Type.values()) { String unlocalisedName = "blockFusedQuartz." + subtype.unlocalisedName; LanguageRegistry.instance().addStringLocalization(unlocalisedName, Lang.localize(unlocalisedName)); + } } @@ -103,7 +101,7 @@ public class BlockFusedQuartz extends Block implements ITileEntityProvider { } @Override - public int getLightOpacity(World world, int x, int y, int z) { + public int getLightOpacity(IBlockAccess world, int x, int y, int z) { return 0; } @@ -113,7 +111,7 @@ public class BlockFusedQuartz extends Block implements ITileEntityProvider { } @Override - public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < Type.values().length; ++j) { par3List.add(new ItemStack(par1, 1, j)); } @@ -121,12 +119,22 @@ public class BlockFusedQuartz extends Block implements ITileEntityProvider { @Override public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - int i1 = par1IBlockAccess.getBlockId(par2, par3, par4); - return i1 == this.blockID ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + Block i1 = par1IBlockAccess.getBlock(par2, par3, par4); + return i1 == this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); } @Override - public void registerIcons(IIconRegister IIconRegister) { + public boolean isBlockSolid(IBlockAccess p_149747_1_, int p_149747_2_, int p_149747_3_, int p_149747_4_, int p_149747_5_) { + return true; + } + + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public void registerBlockIcons(IIconRegister iIconRegister) { //This little oddity is so the standard rendering used for items and breaking effects //uses the item texture, while the custom renderer uses 'realBlockIcon' to render the 'non-frame' part of the block. Type[] ts = Type.values(); @@ -135,9 +143,9 @@ public class BlockFusedQuartz extends Block implements ITileEntityProvider { frameIcons = new IIcon[ts.length]; for (int i = 0; i < ts.length; i++) { - blockIcon[i] = IIconRegister.registerIcon(ts[i].blockIcon); - itemsIcons[i] = IIconRegister.registerIcon(ts[i].itemIcon); - frameIcons[i] = IIconRegister.registerIcon(ts[i].frameIcon); + blockIcon[i] = iIconRegister.registerIcon(ts[i].blockIcon); + itemsIcons[i] = iIconRegister.registerIcon(ts[i].itemIcon); + frameIcons[i] = iIconRegister.registerIcon(ts[i].frameIcon); } } @@ -158,39 +166,30 @@ public class BlockFusedQuartz extends Block implements ITileEntityProvider { return frameIcons[meta]; } - @Override - public TileEntity createNewTileEntity(World world) { - return null; - } - - @Override - public TileEntity createTileEntity(World world, int metadata) { - return new TileEntityCustomBlock(); - } - /** * Remove the tile entity too. */ @Override - public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityCustomBlock) { - TileEntityCustomBlock tef = (TileEntityCustomBlock) te; - - ItemStack itemStack = createItemStackForSourceBlock(world.getBlockMetadata(x, y, z), tef.getSourceBlockId(), tef.getSourceBlockMetadata()); - if(itemStack != null) { - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - } - } + //TODO:1.7 + // if(te instanceof TileEntityCustomBlock) { + // TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + // + // ItemStack itemStack = createItemStackForSourceBlock(world.getBlockMetadata(x, y, z), tef.getSourceBlockId(), tef.getSourceBlockMetadata()); + // if(itemStack != null) { + // float f = 0.7F; + // double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + // double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + // double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + // EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + // entityitem.delayBeforeCanPickup = 10; + // world.spawnEntityInWorld(entityitem); + // } + // } } @@ -201,8 +200,9 @@ public class BlockFusedQuartz extends Block implements ITileEntityProvider { if(sourceBlockId <= 0) { return null; } - ItemStack result = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, quartzBlockMeta); - PainterUtil.setSourceBlock(result, sourceBlockId, sourceBlockMetadata); + ItemStack result = new ItemStack(EnderIO.instance.itemFusedQuartzFrame, 1, quartzBlockMeta); + //TODO:1.7 + //PainterUtil.setSourceBlock(result, sourceBlockId, sourceBlockMetadata); return result; } diff --git a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java index d69054d3..4d4d1809 100644 --- a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java +++ b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java @@ -2,18 +2,14 @@ package crazypants.enderio.material; 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.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.painter.PainterUtil; -import crazypants.enderio.machine.painter.TileEntityCustomBlock; import crazypants.render.ConnectedTextureRenderer; -import crazypants.render.ConnectedTextureRenderer.DefaultTextureCallback; import crazypants.render.CustomCubeRenderer; import crazypants.render.RenderUtil; @@ -26,12 +22,12 @@ public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { renderer.setOverrideBlockTexture(EnderIO.blockFusedQuartz.getItemIcon(metadata)); - renderer.renderBlockAsItem(Block.glass, 0, 1); + renderer.renderBlockAsItem(Blocks.glass, 0, 1); renderer.clearOverrideBlockTexture(); } @Override - public boolean shouldRender3DInInventory() { + public boolean shouldRender3DInInventory(int modelId) { return true; } @@ -44,35 +40,39 @@ public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { public boolean renderWorldBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { int meta = blockAccess.getBlockMetadata(x, y, z); if((meta == 0 && renderPass != 0) || (meta == 1 && renderPass == 0)) { - TileEntityCustomBlock tecb = null; - TileEntity te = blockAccess.getTileEntity(x, y, z); - if(te instanceof TileEntityCustomBlock) { - tecb = (TileEntityCustomBlock) te; - } - renderFrame(blockAccess, x, y, z, tecb, false, meta); + //TODO:1.7 + // TileEntityCustomBlock tecb = null; + // TileEntity te = blockAccess.getTileEntity(x, y, z); + // if(te instanceof TileEntityCustomBlock) { + // tecb = (TileEntityCustomBlock) te; + // } + //renderFrame(blockAccess, x, y, z, tecb, false, meta); + renderFrame(blockAccess, x, y, z, null, false, meta); } return true; } public void renderFrameItem(ItemStack stack) { - RenderUtil.bindBlockTexture(); - Tessellator.instance.startDrawingQuads(); - TileEntityCustomBlock tecb = new TileEntityCustomBlock(); - tecb.setSourceBlockId(PainterUtil.getSourceBlockId(stack)); - tecb.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); - renderFrame(null, 0, 0, 0, tecb, true, stack.getItemDamage()); - Tessellator.instance.draw(); + //TODO:1.7 + // RenderUtil.bindBlockTexture(); + // Tessellator.instance.startDrawingQuads(); + // TileEntityCustomBlock tecb = new TileEntityCustomBlock(); + // tecb.setSourceBlockId(PainterUtil.getSourceBlockId(stack)); + // tecb.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + // renderFrame(null, 0, 0, 0, tecb, true, stack.getItemDamage()); + // Tessellator.instance.draw(); } - private void renderFrame(IBlockAccess blockAccess, int x, int y, int z, TileEntityCustomBlock tecb, boolean forceAllEdges, int meta) { + //private void renderFrame(IBlockAccess blockAccess, int x, int y, int z, TileEntityCustomBlock tecb, boolean forceAllEdges, int meta) { + private void renderFrame(IBlockAccess blockAccess, int x, int y, int z, Object tecb, boolean forceAllEdges, int meta) { if(blockAccess == null) { //No lighting IIcon texture = EnderIO.blockFusedQuartz.getItemIcon(meta); for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - if(tecb != null && tecb.getSourceBlockId() > 0) { - texture = tecb.getSourceBlock().getIcon(face.ordinal(), tecb.getSourceBlockMetadata()); - } + // if(tecb != null && tecb.getSourceBlockId() > 0) { + // texture = tecb.getSourceBlock().getIcon(face.ordinal(), tecb.getSourceBlockMetadata()); + // } RenderUtil.renderConnectedTextureFace(blockAccess, x, y, z, face, texture, forceAllEdges); } return; @@ -80,14 +80,14 @@ public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { CustomCubeRenderer.instance.setOverrideTexture(EnderIO.blockFusedQuartz.getIcon(0, meta)); - if(tecb != null && tecb.getSourceBlock() != null) { - connectedTextureRenderer.setEdgeTexureCallback(new DefaultTextureCallback(tecb.getSourceBlock(), tecb.getSourceBlockMetadata())); - CustomCubeRenderer.instance.renderBlock(blockAccess, EnderIO.blockFusedQuartz, x, y, z, - connectedTextureRenderer); - } else { - connectedTextureRenderer.setEdgeTexture(EnderIO.blockFusedQuartz.getDefaultFrameIcon(meta)); - CustomCubeRenderer.instance.renderBlock(blockAccess, EnderIO.blockFusedQuartz, x, y, z, connectedTextureRenderer); - } + // if(tecb != null && tecb.getSourceBlock() != null) { + // connectedTextureRenderer.setEdgeTexureCallback(new DefaultTextureCallback(tecb.getSourceBlock(), tecb.getSourceBlockMetadata())); + // CustomCubeRenderer.instance.renderBlock(blockAccess, EnderIO.blockFusedQuartz, x, y, z, + // connectedTextureRenderer); + // } else { + connectedTextureRenderer.setEdgeTexture(EnderIO.blockFusedQuartz.getDefaultFrameIcon(meta)); + CustomCubeRenderer.instance.renderBlock(blockAccess, EnderIO.blockFusedQuartz, x, y, z, connectedTextureRenderer); + // } CustomCubeRenderer.instance.setOverrideTexture(null); } diff --git a/src/main/java/crazypants/enderio/material/ItemAlloy.java b/src/main/java/crazypants/enderio/material/ItemAlloy.java index 4864fc9c..d766e295 100644 --- a/src/main/java/crazypants/enderio/material/ItemAlloy.java +++ b/src/main/java/crazypants/enderio/material/ItemAlloy.java @@ -26,7 +26,6 @@ public class ItemAlloy extends Item { } private ItemAlloy() { - super(ModObject.itemAlloy.id); setHasSubtypes(true); setMaxDamage(0); setCreativeTab(EnderIOTab.tabEnderIO); @@ -74,7 +73,7 @@ public class ItemAlloy extends Item { @Override @SuppressWarnings({ "rawtypes", "unchecked" }) - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < numItems; ++j) { par3List.add(new ItemStack(par1, 1, j)); } diff --git a/src/main/java/crazypants/enderio/material/ItemCapacitor.java b/src/main/java/crazypants/enderio/material/ItemCapacitor.java index 074630d9..5797b27b 100644 --- a/src/main/java/crazypants/enderio/material/ItemCapacitor.java +++ b/src/main/java/crazypants/enderio/material/ItemCapacitor.java @@ -29,7 +29,6 @@ public class ItemCapacitor extends Item implements ICapacitorItem { private final IIcon[] icons; protected ItemCapacitor() { - super(ModObject.itemBasicCapacitor.id); setCreativeTab(EnderIOTab.tabEnderIO); setUnlocalizedName(ModObject.itemBasicCapacitor.unlocalisedName); setHasSubtypes(true); @@ -64,7 +63,7 @@ public class ItemCapacitor extends Item implements ICapacitorItem { @Override @SuppressWarnings({ "rawtypes", "unchecked" }) - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < Capacitors.values().length; ++j) { par3List.add(new ItemStack(par1, 1, j)); } diff --git a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java index 9bf1daed..758a1a64 100644 --- a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java @@ -3,6 +3,7 @@ package crazypants.enderio.material; import java.util.List; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -13,8 +14,8 @@ import crazypants.enderio.material.BlockFusedQuartz.Type; public class ItemFusedQuartz extends ItemBlock { - public ItemFusedQuartz(int par1) { - super(par1); + public ItemFusedQuartz() { + super(EnderIO.blockFusedQuartz); this.setHasSubtypes(true); setCreativeTab(EnderIOTab.tabEnderIO); } @@ -29,6 +30,7 @@ public class ItemFusedQuartz extends ItemBlock { return par1; } + @Override public String getUnlocalizedName(ItemStack par1ItemStack) { int meta = par1ItemStack.getItemDamage(); meta = MathHelper.clamp_int(meta, 0, Type.values().length - 1); @@ -37,7 +39,7 @@ public class ItemFusedQuartz extends ItemBlock { @Override @SuppressWarnings({ "rawtypes", "unchecked" }) - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < Type.values().length; ++j) { par3List.add(new ItemStack(par1, 1, j)); } diff --git a/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java b/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java index c226303a..164e7c6e 100644 --- a/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java +++ b/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java @@ -1,8 +1,5 @@ package crazypants.enderio.material; -import java.util.Collections; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,14 +8,9 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.crafting.IEnderIoRecipe; -import crazypants.enderio.crafting.impl.EnderIoRecipe; -import crazypants.enderio.machine.MachineRecipeRegistry; -import crazypants.enderio.machine.painter.BasicPainterTemplate; -import crazypants.enderio.machine.painter.PainterUtil; -import crazypants.enderio.machine.painter.TileEntityCustomBlock; public class ItemFusedQuartzFrame extends Item { @@ -29,7 +21,6 @@ public class ItemFusedQuartzFrame extends Item { } protected ItemFusedQuartzFrame() { - super(ModObject.itemFusedQuartzFrame.id); setCreativeTab(EnderIOTab.tabEnderIO); setUnlocalizedName("enderio." + ModObject.itemFusedQuartzFrame.name()); setMaxStackSize(64); @@ -37,7 +28,8 @@ public class ItemFusedQuartzFrame extends Item { protected void init() { GameRegistry.registerItem(this, ModObject.itemFusedQuartzFrame.unlocalisedName); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new FramePainterRecipe()); + //TODO:1.7 + //MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new FramePainterRecipe()); } @Override @@ -48,20 +40,21 @@ public class ItemFusedQuartzFrame extends Item { public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - if(world.getBlockId(x, y, z) == ModObject.blockFusedQuartz.actualId) { - TileEntityCustomBlock tecb = (TileEntityCustomBlock) world.getTileEntity(x, y, z); - if(tecb == null) { - return false; - } - tecb.setSourceBlockId(PainterUtil.getSourceBlockId(itemStack)); - tecb.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(itemStack)); - world.markBlockForUpdate(x, y, z); - world.markBlockForRenderUpdate(x, y, z); - if(!world.isRemote) { - if(!player.capabilities.isCreativeMode) { - itemStack.stackSize--; - } - } + if(world.getBlock(x, y, z) == EnderIO.blockFusedQuartz) { + //TODO:1.7 + // TileEntityCustomBlock tecb = (TileEntityCustomBlock) world.getTileEntity(x, y, z); + // if(tecb == null) { + // return false; + // } + // tecb.setSourceBlockId(PainterUtil.getSourceBlockId(itemStack)); + // tecb.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(itemStack)); + // world.markBlockForUpdate(x, y, z); + // world.markBlockForRenderUpdate(x, y, z); + // if(!world.isRemote) { + // if(!player.capabilities.isCreativeMode) { + // itemStack.stackSize--; + // } + // } return true; } else { return false; @@ -74,24 +67,38 @@ public class ItemFusedQuartzFrame extends Item { return true; } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(item, par2EntityPlayer, list, par4); - list.add(PainterUtil.getTooltTipText(item)); - } + // @Override + // public String getUnlocalizedName(ItemStack par1ItemStack) { + // System.out.println("ItemFusedQuartzFrame.getUnlocalizedName: "); + // return "john"; + // } + // + // @Override + // public String getUnlocalizedName() { + // System.out.println("ItemFusedQuartzFrame.getUnlocalizedName: "); + // return super.getUnlocalizedName(); + // } - public static final class FramePainterRecipe extends BasicPainterTemplate { + //TODO:1.7 - public FramePainterRecipe() { - super(ModObject.itemFusedQuartzFrame.actualId); - } - - @Override - public List getAllRecipes() { - ItemStack is = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, 0); - IEnderIoRecipe recipe = new EnderIoRecipe(IEnderIoRecipe.PAINTER_ID, DEFAULT_ENERGY_PER_TASK, is, is); - return Collections.singletonList(recipe); - } - } + // @Override + // @SideOnly(Side.CLIENT) + // public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + // super.addInformation(item, par2EntityPlayer, list, par4); + // list.add(PainterUtil.getTooltTipText(item)); + // } + // + // public static final class FramePainterRecipe extends BasicPainterTemplate { + // + // public FramePainterRecipe() { + // super(ModObject.itemFusedQuartzFrame.actualId); + // } + // + // @Override + // public List getAllRecipes() { + // ItemStack is = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, 0); + // IEnderIoRecipe recipe = new EnderIoRecipe(IEnderIoRecipe.PAINTER_ID, DEFAULT_ENERGY_PER_TASK, is, is); + // return Collections.singletonList(recipe); + // } + // } } diff --git a/src/main/java/crazypants/enderio/material/ItemMachinePart.java b/src/main/java/crazypants/enderio/material/ItemMachinePart.java index 9f07737f..60c41f90 100644 --- a/src/main/java/crazypants/enderio/material/ItemMachinePart.java +++ b/src/main/java/crazypants/enderio/material/ItemMachinePart.java @@ -23,7 +23,6 @@ public class ItemMachinePart extends Item { } private ItemMachinePart() { - super(ModObject.itemMachinePart.id); setHasSubtypes(true); setMaxDamage(0); setCreativeTab(EnderIOTab.tabEnderIO); @@ -58,7 +57,7 @@ public class ItemMachinePart extends Item { @Override @SuppressWarnings({ "rawtypes", "unchecked" }) - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < MachinePart.values().length; ++j) { par3List.add(new ItemStack(par1, 1, j)); } diff --git a/src/main/java/crazypants/enderio/material/ItemMaterial.java b/src/main/java/crazypants/enderio/material/ItemMaterial.java index b335992b..5c48d5e7 100644 --- a/src/main/java/crazypants/enderio/material/ItemMaterial.java +++ b/src/main/java/crazypants/enderio/material/ItemMaterial.java @@ -23,7 +23,6 @@ public class ItemMaterial extends Item { } private ItemMaterial() { - super(ModObject.itemMaterial.id); setHasSubtypes(true); setMaxDamage(0); setCreativeTab(EnderIOTab.tabEnderIO); @@ -58,7 +57,7 @@ public class ItemMaterial extends Item { @Override @SuppressWarnings({ "rawtypes", "unchecked" }) - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < Material.values().length; ++j) { par3List.add(new ItemStack(par1, 1, j)); } diff --git a/src/main/java/crazypants/enderio/material/ItemPowderIngot.java b/src/main/java/crazypants/enderio/material/ItemPowderIngot.java index f8b5e5bd..0fc7563a 100644 --- a/src/main/java/crazypants/enderio/material/ItemPowderIngot.java +++ b/src/main/java/crazypants/enderio/material/ItemPowderIngot.java @@ -23,7 +23,6 @@ public class ItemPowderIngot extends Item { } private ItemPowderIngot() { - super(ModObject.itemPowderIngot.id); setHasSubtypes(true); setMaxDamage(0); setCreativeTab(EnderIOTab.tabEnderIO); @@ -58,7 +57,7 @@ public class ItemPowderIngot extends Item { @Override @SuppressWarnings({ "rawtypes", "unchecked" }) - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < PowderIngot.values().length; ++j) { par3List.add(new ItemStack(par1, 1, j)); } diff --git a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java index 8105d48f..2cd1b0f3 100644 --- a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java +++ b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java @@ -1,10 +1,10 @@ package crazypants.enderio.material; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; @@ -70,7 +70,7 @@ public class MachinePartRenderer implements IItemRenderer { private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { renderBlocks.setOverrideBlockTexture(EnderIO.itemMachinePart.getIconFromDamage(item.getItemDamage())); - renderBlocks.renderBlockAsItem(Block.stone, 0, 1.0F); + renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F); renderBlocks.clearOverrideBlockTexture(); } } diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 1d862e6e..b57e1a77 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -1,10 +1,9 @@ package crazypants.enderio.material; -import static crazypants.enderio.ModObject.itemBasicCapacitor; - import java.util.ArrayList; -import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; @@ -13,36 +12,36 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Config; -import crazypants.enderio.ModObject; +import crazypants.enderio.EnderIO; public class MaterialRecipes { public static void registerOresInDictionary() { //Ore Dictionary Registeration - OreDictionary.registerOre("dustCoal", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_COAL.ordinal())); - OreDictionary.registerOre("dustIron", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_IRON.ordinal())); - OreDictionary.registerOre("dustGold", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_GOLD.ordinal())); - OreDictionary.registerOre("dustCopper", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_COPPER.ordinal())); - OreDictionary.registerOre("dustTin", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_TIN.ordinal())); - OreDictionary.registerOre("dustEnderPearl", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_ENDER.ordinal())); - OreDictionary.registerOre("itemSilicon", new ItemStack(ModObject.itemMaterial.actualId, 1, Material.SILICON.ordinal())); - OreDictionary.registerOre("gearStone", new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.BASIC_GEAR.ordinal())); + OreDictionary.registerOre("dustCoal", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal())); + OreDictionary.registerOre("dustIron", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal())); + OreDictionary.registerOre("dustGold", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal())); + OreDictionary.registerOre("dustCopper", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal())); + OreDictionary.registerOre("dustTin", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal())); + OreDictionary.registerOre("dustEnderPearl", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal())); + OreDictionary.registerOre("itemSilicon", new ItemStack(EnderIO.itemPowderIngot, 1, Material.SILICON.ordinal())); + OreDictionary.registerOre("gearStone", new ItemStack(EnderIO.itemPowderIngot, 1, MachinePart.BASIC_GEAR.ordinal())); int oreId = OreDictionary.getOreID("glass"); ArrayList ingots = OreDictionary.getOres(oreId); if(ingots.isEmpty()) { - OreDictionary.registerOre("glass", Block.glass); + OreDictionary.registerOre("glass", Blocks.glass); } - ItemStack pureGlass = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, BlockFusedQuartz.Type.GLASS.ordinal()); + ItemStack pureGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()); OreDictionary.registerOre("glass", pureGlass); - OreDictionary.registerOre("glassHardened", new ItemStack(ModObject.blockFusedQuartz.actualId, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal())); + OreDictionary.registerOre("glassHardened", new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal())); //Glass stuff for compatability - GameRegistry.addShapedRecipe(new ItemStack(Block.thinGlass), " ", "eee", "eee", 'e', pureGlass); - GameRegistry.addShapelessRecipe(new ItemStack(Block.glass), pureGlass); - GameRegistry.addShapedRecipe(new ItemStack(Item.glassBottle), " ", "g g", " g ", 'g', pureGlass); + GameRegistry.addShapedRecipe(new ItemStack(Blocks.glass_pane), " ", "eee", "eee", 'e', pureGlass); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.glass), pureGlass); + GameRegistry.addShapedRecipe(new ItemStack(Items.glass_bottle), " ", "g g", " g ", 'g', pureGlass); - OreDictionary.registerOre("glass", Block.glass); + OreDictionary.registerOre("glass", Blocks.glass); } @@ -67,72 +66,74 @@ public class MaterialRecipes { public static void addRecipes() { //Common Ingredients - ItemStack conduitBinder = new ItemStack(ModObject.itemMaterial.actualId, 4, Material.CONDUIT_BINDER.ordinal()); - ItemStack basicGear = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.BASIC_GEAR.ordinal()); - ItemStack binderComposite = new ItemStack(ModObject.itemMaterial.actualId, 1, Material.BINDER_COMPOSITE.ordinal()); - ItemStack industrialBinder = new ItemStack(ModObject.itemMaterial.actualId, 1, Material.CONDUIT_BINDER.ordinal()); - ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 2); - ItemStack fusedQuartzFrame = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, 0); - ItemStack machineChassi = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.MACHINE_CHASSI.ordinal()); - ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 1); - ItemStack phasedGold = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_GOLD.ordinal()); - ItemStack phasedIron = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_IRON.ordinal()); - ItemStack electricalSteel = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ELECTRICAL_STEEL.ordinal()); + ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 4, Material.CONDUIT_BINDER.ordinal()); + ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); + ItemStack binderComposite = new ItemStack(EnderIO.itemMaterial, 1, Material.BINDER_COMPOSITE.ordinal()); + ItemStack industrialBinder = new ItemStack(EnderIO.itemMaterial, 1, Material.CONDUIT_BINDER.ordinal()); + + ItemStack fusedQuartzFrame = new ItemStack(EnderIO.itemFusedQuartzFrame, 1, 0); + ItemStack machineChassi = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); + + ItemStack phasedGold = new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()); + ItemStack phasedIron = new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal()); + ItemStack electricalSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()); //Conduit Binder ItemStack cbc = binderComposite.copy(); cbc.stackSize = 8; if(Config.useAlternateBinderRecipe) { - GameRegistry.addShapedRecipe(cbc, "gcg", "sgs", "gcg", 'g', Block.gravel, 's', Block.sand, 'c', Item.clay); + GameRegistry.addShapedRecipe(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', Blocks.sand, 'c', Items.clay_ball); } else { - GameRegistry.addShapedRecipe(cbc, "ggg", "scs", "ggg", 'g', Block.gravel, 's', Block.sand, 'c', Item.clay); + GameRegistry.addShapedRecipe(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', Blocks.sand, 'c', Items.clay_ball); } - FurnaceRecipes.smelting().addSmelting(binderComposite.itemID, binderComposite.getItemDamage(), conduitBinder, 0); + FurnaceRecipes.smelting().func_151394_a(binderComposite, conduitBinder, 0); //Nuggets - ItemStack phasedIronNugget = new ItemStack(ModObject.itemMaterial.actualId, 9, Material.PHASED_IRON_NUGGET.ordinal()); + ItemStack phasedIronNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.PHASED_IRON_NUGGET.ordinal()); GameRegistry.addShapelessRecipe(phasedIronNugget, phasedIron); phasedIronNugget = phasedIronNugget.copy(); phasedIronNugget.stackSize = 1; GameRegistry.addShapedRecipe(phasedIron, "eee", "eee", "eee", 'e', phasedIronNugget); - ItemStack vibrantNugget = new ItemStack(ModObject.itemMaterial.actualId, 9, Material.VIBRANT_NUGGET.ordinal()); + ItemStack vibrantNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.VIBRANT_NUGGET.ordinal()); GameRegistry.addShapelessRecipe(vibrantNugget, phasedGold); vibrantNugget = vibrantNugget.copy(); vibrantNugget.stackSize = 1; GameRegistry.addShapedRecipe(phasedGold, "eee", "eee", "eee", 'e', vibrantNugget); //Crystals - ItemStack pulsCry = new ItemStack(ModObject.itemMaterial.actualId, 1, Material.PULSATING_CYSTAL.ordinal()); - GameRegistry.addShapedRecipe(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', Item.diamond); + ItemStack pulsCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); + GameRegistry.addShapedRecipe(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', Items.diamond); - ItemStack vibCry = new ItemStack(ModObject.itemMaterial.actualId, 1, Material.VIBRANT_CYSTAL.ordinal()); - GameRegistry.addShapedRecipe(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', Item.emerald); + ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); + GameRegistry.addShapedRecipe(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', Items.emerald); //Smelting - FurnaceRecipes.smelting().addSmelting(ModObject.itemPowderIngot.actualId, PowderIngot.POWDER_IRON.ordinal(), new ItemStack(Item.ingotIron), 0); - FurnaceRecipes.smelting().addSmelting(ModObject.itemPowderIngot.actualId, PowderIngot.POWDER_GOLD.ordinal(), new ItemStack(Item.ingotGold), 0); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()), new ItemStack(Items.iron_ingot), 0); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()), new ItemStack(Items.gold_ingot), 0); //Ender Dusts - ItemStack enderDust = new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_ENDER.ordinal()); - GameRegistry.addShapedRecipe(new ItemStack(Item.enderPearl), "eee", "eee", "eee", 'e', enderDust); + ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); + GameRegistry.addShapedRecipe(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust); // Fused Quartz Frame GameRegistry.addRecipe(new ShapedOreRecipe(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood")); GameRegistry.addRecipe(new ShapedOreRecipe(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick")); // Machine Chassi - GameRegistry.addShapedRecipe(machineChassi, "fif", "i i", "fif", 'f', Block.fenceIron, 'i', Item.ingotIron); + GameRegistry.addShapedRecipe(machineChassi, "fif", "i i", "fif", 'f', Blocks.iron_bars, 'i', Items.iron_ingot); // Basic Gear - GameRegistry.addRecipe(new ShapedOreRecipe(basicGear, "scs", "c c", "scs", 's', "stickWood", 'c', Block.cobblestone)); - GameRegistry.addRecipe(new ShapedOreRecipe(basicGear, "scs", "c c", "scs", 's', "woodStick", 'c', Block.cobblestone)); + GameRegistry.addRecipe(new ShapedOreRecipe(basicGear, "scs", "c c", "scs", 's', "stickWood", 'c', Blocks.cobblestone)); + GameRegistry.addRecipe(new ShapedOreRecipe(basicGear, "scs", "c c", "scs", 's', "woodStick", 'c', Blocks.cobblestone)); - // Ender Capacitor + //Ender Capacitor + ItemStack enderCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 2); + ItemStack activatedCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 1); if(Config.useHardRecipes) { - GameRegistry.addShapedRecipe(enderCapacitor, "eee", "cgc", "eee", 'e', phasedGold, 'c', activatedCapacitor, 'g', Block.glowStone); + GameRegistry.addShapedRecipe(enderCapacitor, "eee", "cgc", "eee", 'e', phasedGold, 'c', activatedCapacitor, 'g', Blocks.glowstone); } else { - GameRegistry.addShapedRecipe(enderCapacitor, " e ", "cgc", " e ", 'e', phasedGold, 'c', activatedCapacitor, 'g', Block.glowStone); + GameRegistry.addShapedRecipe(enderCapacitor, " e ", "cgc", " e ", 'e', phasedGold, 'c', activatedCapacitor, 'g', Blocks.glowstone); } } @@ -141,32 +142,32 @@ public class MaterialRecipes { int oreId = OreDictionary.getOreID("ingotCopper"); ArrayList ingots = OreDictionary.getOres(oreId); if(!ingots.isEmpty()) { - FurnaceRecipes.smelting().addSmelting(ModObject.itemPowderIngot.actualId, PowderIngot.POWDER_COPPER.ordinal(), ingots.get(0), 0); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal()), ingots.get(0), 0); } oreId = OreDictionary.getOreID("ingotTin"); ingots = OreDictionary.getOres(oreId); if(!ingots.isEmpty()) { - FurnaceRecipes.smelting().addSmelting(ModObject.itemPowderIngot.actualId, PowderIngot.POWDER_TIN.ordinal(), ingots.get(0), 0); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal()), ingots.get(0), 0); } - ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0); + ItemStack capacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 0); ArrayList copperIngots = OreDictionary.getOres("ingotCopper"); Item gold; if(Config.useHardRecipes) { - gold = Item.ingotGold; + gold = Items.gold_ingot; } else { - gold = Item.goldNugget; + gold = Items.gold_nugget; } if(copperIngots != null && !copperIngots.isEmpty()) { - GameRegistry.addRecipe(new ShapedOreRecipe(capacitor, " gr", "gcg", "rg ", 'r', Item.redstone, 'g', gold, 'c', "ingotCopper")); + GameRegistry.addRecipe(new ShapedOreRecipe(capacitor, " gr", "gcg", "rg ", 'r', Items.redstone, 'g', gold, 'c', "ingotCopper")); } else { GameRegistry. - addShapedRecipe(capacitor, " gr", "gig", "rg ", 'r', Item.redstone, 'g', gold, 'i', Item.ingotIron); + addShapedRecipe(capacitor, " gr", "gig", "rg ", 'r', Items.redstone, 'g', gold, 'i', Items.iron_ingot); } int dustCoal = OreDictionary.getOreID("dustCoal"); - ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 1); - ItemStack electricalSteel = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ELECTRICAL_STEEL.ordinal()); + ItemStack activatedCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 1); + ItemStack electricalSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()); if(Config.useHardRecipes) { GameRegistry.addRecipe(new ShapedOreRecipe(activatedCapacitor, "eee", "cCc", "eee", 'e', electricalSteel, 'c', capacitor, 'C', "dustCoal")); } else { diff --git a/src/main/java/crazypants/enderio/power/Capacitors.java b/src/main/java/crazypants/enderio/power/Capacitors.java index f1a89bad..1bdca7e9 100644 --- a/src/main/java/crazypants/enderio/power/Capacitors.java +++ b/src/main/java/crazypants/enderio/power/Capacitors.java @@ -1,7 +1,7 @@ package crazypants.enderio.power; import net.minecraft.item.ItemStack; -import crazypants.enderio.ModObject; +import crazypants.enderio.EnderIO; public enum Capacitors { @@ -28,7 +28,7 @@ public enum Capacitors { } public ItemStack getItemStack() { - return new ItemStack(ModObject.itemBasicCapacitor.actualId, 1, ordinal()); + return new ItemStack(EnderIO.itemBasicCapacitor, 1, ordinal()); } } diff --git a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java index 1a0d9942..a23421aa 100644 --- a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java +++ b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java @@ -76,8 +76,8 @@ public class PowerHandlerUtil { return 0; } - float energyStored = pp.getEnergyStored(); - float canUse = quantity; + double energyStored = pp.getEnergyStored(); + double canUse = quantity; canUse = Math.min(canUse, pp.getMaxEnergyReceived()); // Don't overflow it canUse = Math.min(canUse, pp.getMaxEnergyStored() - energyStored); @@ -97,19 +97,18 @@ public class PowerHandlerUtil { ph.setEnergy(ph.getEnergyStored() + canUse); receptor.applyPerdition(); - return canUse; + return (float) canUse; } - public static int recieveRedstoneFlux(ForgeDirection from, PowerHandler powerHandler, int maxReceive, boolean simulate) { return recieveRedstoneFlux(from, powerHandler, maxReceive, simulate, false); } - + public static int recieveRedstoneFlux(ForgeDirection from, PowerHandler powerHandler, int maxReceive, boolean simulate, boolean tickPH) { int canRecieve = (int) getMaxEnergyRecievedMj(powerHandler, maxReceive / 10, from); if(!simulate) { if(tickPH) { - doBuildCraftEnergyTick(powerHandler, from); + doBuildCraftEnergyTick(powerHandler, from); } powerHandler.setEnergy(powerHandler.getEnergyStored() + canRecieve); } @@ -120,13 +119,13 @@ public class PowerHandlerUtil { if(ph == null) { return 0; } - float canRecieve = max; + double canRecieve = max; canRecieve = Math.min(canRecieve, ph.getMaxEnergyReceived()); canRecieve = Math.min(canRecieve, ph.getMaxEnergyStored() - ph.getEnergyStored()); if(canRecieve <= ph.getMinEnergyReceived()) { return 0; } - return canRecieve; + return (float) canRecieve; } public static void doBuildCraftEnergyTick(PowerHandler ph, ForgeDirection from) { @@ -137,7 +136,7 @@ public class PowerHandlerUtil { if(pp == null) { return; } - float stored = ph.getEnergyStored(); + double stored = ph.getEnergyStored(); pp.receiveEnergy(Type.PIPE, 0, from); ph.setEnergy(stored); } @@ -145,18 +144,24 @@ public class PowerHandlerUtil { private static class NullPerditionCalculator extends PerditionCalculator { @Override - public float applyPerdition(PowerHandler powerHandler, float current, long ticksPassed) { + public double applyPerdition(PowerHandler powerHandler, double current, long ticksPassed) { if(current <= 0) { return 0; } - float decAmount = 0.001f; - float res; + double decAmount = 0.001f; + double res; do { res = current - decAmount; decAmount *= 10; } while (res >= current && decAmount < PerditionCalculator.MIN_POWERLOSS); return res; } + + @Override + public double getTaxPercent() { + return 0; + } + } } diff --git a/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java b/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java index be99a298..e7b9d783 100644 --- a/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java +++ b/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java @@ -32,7 +32,7 @@ public class PowerInterfaceBC implements IPowerInterface { @Override public float getEnergyStored(ForgeDirection dir) { - float result = 0; + double result = 0; if(bcPower instanceof IInternalPowerReceptor) { result = ((IInternalPowerReceptor) bcPower).getPowerHandler().getEnergyStored(); } else if(bcPower != null && !(bcPower instanceof IPowerEmitter)) { @@ -41,12 +41,12 @@ public class PowerInterfaceBC implements IPowerInterface { result += pr.getEnergyStored(); } } - return result; + return (float) result; } @Override public float getMaxEnergyStored(ForgeDirection dir) { - float result = 0; + double result = 0; if(bcPower instanceof IInternalPowerReceptor) { result = ((IInternalPowerReceptor) bcPower).getPowerHandler().getMaxEnergyStored(); } else if(bcPower != null && !(bcPower instanceof IPowerEmitter)) { @@ -55,7 +55,7 @@ public class PowerInterfaceBC implements IPowerInterface { result += pr.getMaxEnergyStored(); } } - return result; + return (float) result; } @Override @@ -65,7 +65,7 @@ public class PowerInterfaceBC implements IPowerInterface { if(pr == null || pr.getType() == Type.ENGINE) { return 0; } - return pr.powerRequest(); + return (float) pr.powerRequest(); } return 0; @@ -78,7 +78,7 @@ public class PowerInterfaceBC implements IPowerInterface { if(pr == null) { return 0; } - return pr.getMinEnergyReceived(); + return (float) pr.getMinEnergyReceived(); } return 0; } @@ -96,8 +96,8 @@ public class PowerInterfaceBC implements IPowerInterface { if(pr == null) { return 0; } - float offer = Math.min(pr.powerRequest(), canOffer); - return pr.receiveEnergy(Type.PIPE, offer, opposite); + double offer = Math.min(pr.powerRequest(), canOffer); + return (float) pr.receiveEnergy(Type.PIPE, offer, opposite); } return 0; } diff --git a/src/main/java/crazypants/render/ConnectedTextureRenderer.java b/src/main/java/crazypants/render/ConnectedTextureRenderer.java index 74aa7e6e..b25d867b 100644 --- a/src/main/java/crazypants/render/ConnectedTextureRenderer.java +++ b/src/main/java/crazypants/render/ConnectedTextureRenderer.java @@ -227,6 +227,9 @@ public class ConnectedTextureRenderer implements IRenderFace { private void applyLighting(Vertex vert, Vector3d samplePoint, List litVertices) { Vertex closest = getClosestVertex(litVertices, samplePoint); + if(closest == null) { + return; + } vert.setBrightness(closest.brightness); Vector4f col = closest.getColor(); if(col != null) { @@ -262,6 +265,9 @@ public class ConnectedTextureRenderer implements IRenderFace { private void moveCorners(List vertices, ForgeDirection edge, float scaleFactor) { int[] indices = getClosest(edge, vertices); + if(indices[0] < 0) { + return; + } vertices.get(indices[0]).xyz.x -= scaleFactor * edge.offsetX; vertices.get(indices[1]).xyz.x -= scaleFactor * edge.offsetX; vertices.get(indices[0]).xyz.y -= scaleFactor * edge.offsetY;