tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Added Mekanism universal cable conversion recipe

Browse source
This commit is contained in:
Calclavia 2013-09-07 23:24:48 +08:00
parent 2305c7ed47
commit e2a1b5c08a
22 changed files with 43 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Modding-Library

@ -1 +1 @@
Subproject commit 04df3282ba2aa9eeea58d15050bf75a4ce996080
Subproject commit aad8f5868dc5181f030929d491535eac0a0e54b7

5
src/resonantinduction/ResonantInduction.java
View file

@ -272,5 +272,10 @@ public class ResonantInduction
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(blockWire, 1, EnumWireMaterial.IRON.ordinal()), Items.getItem("ironCableItem")));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(blockWire, 2, EnumWireMaterial.SUPERCONDUCTOR.ordinal()), Items.getItem("glassFiberCableItem")));
}
if (Loader.isModLoaded("Mekanism"))
{
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(blockWire, 1, EnumWireMaterial.COPPER.ordinal()), "universalCable"));
}
}
}

2
src/resonantinduction/base/BlockBase.java
View file

@ -20,7 +20,7 @@ public class BlockBase extends Block
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), Material.piston);
this.setCreativeTab(TabRI.INSTANCE);
this.setUnlocalizedName(ResonantInduction.PREFIX + name);
this.func_111022_d(ResonantInduction.PREFIX + name);
this.setTextureName(ResonantInduction.PREFIX + name);
this.setHardness(1f);
}
}

2
src/resonantinduction/base/ItemBase.java
View file

@ -17,6 +17,6 @@ public class ItemBase extends Item
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, name, id).getInt(id));
this.setCreativeTab(TabRI.INSTANCE);
this.setUnlocalizedName(ResonantInduction.PREFIX + name);
this.func_111206_d(ResonantInduction.PREFIX + name);
this.setTextureName(ResonantInduction.PREFIX + name);
}
}

2
src/resonantinduction/battery/BlockBattery.java
View file

@ -30,7 +30,7 @@ public class BlockBattery extends BlockBase implements ITileEntityProvider
public BlockBattery(int id)
{
super("battery", id);
this.func_111022_d(ResonantInduction.PREFIX + "machine");
this.setTextureName(ResonantInduction.PREFIX + "machine");
}
@Override

2
src/resonantinduction/battery/ItemCapacitor.java
View file

@ -23,7 +23,7 @@ public class ItemCapacitor extends ItemUniversalElectric implements ICapacitor
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "capacitor", id).getInt(id));
this.setCreativeTab(TabRI.INSTANCE);
this.setUnlocalizedName(ResonantInduction.PREFIX + "capacitor");
this.func_111206_d(ResonantInduction.PREFIX + "capacitor");
this.setTextureName(ResonantInduction.PREFIX + "capacitor");
this.setMaxStackSize(1);
this.setMaxDamage(100);
}

5
src/resonantinduction/battery/ItemInfiniteCapacitor.java
View file

@ -12,9 +12,6 @@ import net.minecraftforge.common.Configuration;
import resonantinduction.ResonantInduction;
import resonantinduction.TabRI;
import universalelectricity.compatibility.ItemUniversalElectric;
import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
import universalelectricity.core.item.ElectricItemHelper;
/**
* Stores power.
@ -29,7 +26,7 @@ public class ItemInfiniteCapacitor extends ItemUniversalElectric
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "infiniteCapacitor", id).getInt(id));
this.setCreativeTab(TabRI.INSTANCE);
this.setUnlocalizedName(ResonantInduction.PREFIX + "infiniteCapacitor");
this.func_111206_d(ResonantInduction.PREFIX + "capacitor");
this.setTextureName(ResonantInduction.PREFIX + "capacitor");
this.setMaxStackSize(1);
this.setMaxDamage(100);
}

2
src/resonantinduction/contractor/BlockEMContractor.java
View file

@ -20,7 +20,7 @@ public class BlockEMContractor extends BlockBase implements ITileEntityProvider
public BlockEMContractor(int id)
{
super("contractor", id);
this.func_111022_d(ResonantInduction.PREFIX + "machine");
this.setTextureName(ResonantInduction.PREFIX + "machine");
}
@SideOnly(Side.CLIENT)

4
src/resonantinduction/fx/FXElectricBolt.java
View file

@ -296,7 +296,7 @@ public class FXElectricBolt extends EntityFX
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(TEXTURE);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTURE);
/**
* Render the actual bolts.
*/
@ -369,7 +369,7 @@ public class FXElectricBolt extends EntityFX
GL11.glDepthMask(true);
GL11.glPopMatrix();
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(PARTICLE_RESOURCE);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(PARTICLE_RESOURCE);
tessellator.startDrawingQuads();
}

2
src/resonantinduction/gui/GuiBattery.java
View file

@ -44,7 +44,7 @@ public class GuiBattery extends GuiContainer
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouseY)
{
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
int guiWidth = (width - xSize) / 2;
int guiHeight = (height - ySize) / 2;

2
src/resonantinduction/gui/GuiMultimeter.java
View file

@ -93,7 +93,7 @@ public class GuiMultimeter extends GuiContainer
this.containerWidth = (this.width - this.xSize) / 2;
this.containerHeight = (this.height - this.ySize) / 2;
this.mc.renderEngine.func_110577_a(TEXTURE);
this.mc.renderEngine.bindTexture(TEXTURE);
GL11.glColor4f(1, 1, 1, 1);
this.drawTexturedModalRect(this.containerWidth, this.containerHeight, 0, 0, this.xSize, this.ySize);

2
src/resonantinduction/multimeter/BlockMultimeter.java
View file

@ -29,7 +29,7 @@ public class BlockMultimeter extends BlockBase implements ITileEntityProvider
public BlockMultimeter(int id)
{
super("multimeter", id);
this.func_111022_d(ResonantInduction.PREFIX + "machine");
this.setTextureName(ResonantInduction.PREFIX + "machine");
}
@Override

8
src/resonantinduction/render/BlockRenderingHandler.java
View file

@ -37,7 +37,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
GL11.glTranslated(0.5, 1.5, 0.5);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(RenderTesla.TEXTURE_BOTTOM);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderTesla.TEXTURE_BOTTOM);
RenderTesla.MODEL_BOTTOM.render(0.0625f);
GL11.glPopMatrix();
}
@ -46,7 +46,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
GL11.glTranslated(0.5, 1.5, 0.5);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(RenderEMContractor.TEXTURE);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderEMContractor.TEXTURE);
RenderEMContractor.MODEL.render(0.0625f);
GL11.glPopMatrix();
}
@ -55,7 +55,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
GL11.glTranslated(0.5, 1.42, 0.5);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(RenderBattery.TEXTURE);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderBattery.TEXTURE);
RenderBattery.MODEL.render(0.0625f);
GL11.glPopMatrix();
}
@ -64,7 +64,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
GL11.glRotatef(180, 0, 1, 0);
GL11.glTranslated(0, -1, -0.7);
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(RenderMultimeter.TEXTURE);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderMultimeter.TEXTURE);
RenderMultimeter.MODEL.render(0.0625f);
GL11.glPopMatrix();
}

21
src/resonantinduction/render/RenderBattery.java
View file

@ -56,11 +56,11 @@ public class RenderBattery extends TileEntitySpecialRenderer
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
if (((TileEntityBattery) t).structure.isMultiblock)
{
this.func_110628_a(TEXTURE_MULTI);
this.bindTexture(TEXTURE_MULTI);
}
else
{
this.func_110628_a(TEXTURE);
this.bindTexture(TEXTURE);
}
MODEL.render(0.0625f);
@ -189,9 +189,9 @@ public class RenderBattery extends TileEntitySpecialRenderer
if (icon == null)
{
TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K();
ResourceLocation resourcelocation = texturemanager.func_130087_a(entityItem.getEntityItem().getItemSpriteNumber());
icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno");
TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();
ResourceLocation resourcelocation = texturemanager.getResourceLocation(entityItem.getEntityItem().getItemSpriteNumber());
icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno");
}
float f4 = icon.getMinU();
@ -231,15 +231,15 @@ public class RenderBattery extends TileEntitySpecialRenderer
if (itemstack.getItemSpriteNumber() == 0)
{
this.func_110776_a(TextureMap.field_110575_b);
this.bindTexture(TextureMap.locationBlocksTexture);
}
else
{
this.func_110776_a(TextureMap.field_110576_c);
this.bindTexture(TextureMap.locationItemsTexture);
}
GL11.glColor4f(1, 1, 1, 1.0F);
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, icon.getOriginX(), icon.getOriginY(), f12);
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, icon.getIconWidth(), icon.getIconHeight(), f12);
}
GL11.glPopMatrix();
@ -247,9 +247,10 @@ public class RenderBattery extends TileEntitySpecialRenderer
}
protected void func_110776_a(ResourceLocation par1ResourceLocation)
@Override
protected void bindTexture(ResourceLocation par1ResourceLocation)
{
this.renderManager.renderEngine.func_110577_a(par1ResourceLocation);
this.renderManager.renderEngine.bindTexture(par1ResourceLocation);
}
public byte getMiniItemCount(ItemStack stack)

4
src/resonantinduction/render/RenderEMContractor.java
View file

@ -53,11 +53,11 @@ public class RenderEMContractor extends TileEntitySpecialRenderer
if (((TileEntityEMContractor) t).suck)
{
this.func_110628_a(TEXTURE);
this.bindTexture(TEXTURE);
}
else
{
this.func_110628_a(TEXTURE_PUSH);
this.bindTexture(TEXTURE_PUSH);
}
if (((TileEntityEMContractor) t).canFunction() && !ResonantInduction.proxy.isPaused())

2
src/resonantinduction/render/RenderMultimeter.java
View file

@ -64,7 +64,7 @@ public class RenderMultimeter extends TileEntitySpecialRenderer
break;
}
this.func_110628_a(TEXTURE);
this.bindTexture(TEXTURE);
MODEL.render(0.0625f);
GL11.glPopMatrix();

6
src/resonantinduction/render/RenderTesla.java
View file

@ -40,15 +40,15 @@ public class RenderTesla extends TileEntitySpecialRenderer
switch (t.getBlockMetadata())
{
default:
this.func_110628_a(TEXTURE_BOTTOM);
this.bindTexture(TEXTURE_BOTTOM);
MODEL_BOTTOM.render(0.0625f);
break;
case 1:
this.func_110628_a(TEXTURE_MIDDLE);
this.bindTexture(TEXTURE_MIDDLE);
MODEL_MIDDLE.render(0.0625f);
break;
case 2:
this.func_110628_a(TEXTURE_TOP);
this.bindTexture(TEXTURE_TOP);
MODEL_TOP.render(0.0625f);
break;
}

4
src/resonantinduction/render/RenderWire.java
View file

@ -40,7 +40,7 @@ public class RenderWire extends TileEntitySpecialRenderer
EnumWireMaterial material = tileEntity.getMaterial();
// Texture file
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(WIRE_TEXTURE);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(WIRE_TEXTURE);
GL11.glColor4d(material.color.x, material.color.y, material.color.z, 1);
tileEntity.adjacentConnections = null;
@ -84,7 +84,7 @@ public class RenderWire extends TileEntitySpecialRenderer
if (tileEntity.isInsulated)
{
// Texture file
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(INSULATION_TEXTURE);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(INSULATION_TEXTURE);
Vector3 insulationColor = ResonantInduction.DYE_COLORS[tileEntity.dyeID];
GL11.glColor4d(insulationColor.x, insulationColor.y, insulationColor.z, 1);

2
src/resonantinduction/tesla/BlockTesla.java
View file

@ -26,7 +26,7 @@ public class BlockTesla extends BlockBase implements ITileEntityProvider
public BlockTesla(int id)
{
super("tesla", id);
this.func_111022_d(ResonantInduction.PREFIX + "machine");
this.setTextureName(ResonantInduction.PREFIX + "machine");
}
@Override

2
src/resonantinduction/wire/BlockWire.java
View file

@ -34,7 +34,7 @@ public class BlockWire extends BlockConductor
this.setBlockBounds(0.3f, 0.3f, 0.3f, 0.7f, 0.7f, 0.7f);
this.setCreativeTab(CreativeTabs.tabRedstone);
Block.setBurnProperties(this.blockID, 30, 60);
this.func_111022_d(ResonantInduction.PREFIX + "wire");
this.setTextureName(ResonantInduction.PREFIX + "wire");
this.setCreativeTab(TabRI.INSTANCE);
}

2
src/resonantinduction/wire/EnumWireMaterial.java
View file

@ -12,7 +12,7 @@ import universalelectricity.core.vector.Vector3;
public enum EnumWireMaterial
{
COPPER(12.5f, 3, 2, new Vector3(132, 73, 33)), TIN(10, 2, 0.5f, new Vector3(215, 205, 181)),
COPPER(12.5f, 3, 2, new Vector3(132, 73, 33)), TIN(13, 2, 0.5f, new Vector3(215, 205, 181)),
IRON(0.1f, 2, 4, new Vector3(97, 102, 105)),
ALUMINUM(0.025f, 6, 0.15f, new Vector3(97, 102, 105)),
SILVER(0.005f, 1, 2, new Vector3(176, 175, 171)),

2
src/resonantinduction/wire/TileEntityTickWire.java
View file

@ -9,10 +9,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.ResonantInduction;
import universalelectricity.core.block.IElectrical;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
/**
* A version of the wire that has furnace interaction.