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

removed some classes/updated some stuff

Browse source
This commit is contained in:
Rseifert 2012-07-13 17:36:01 -04:00
parent be1391391d
commit 07f231fb72
26 changed files with 201 additions and 1343 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

264
minecraft/net/minecraft/src/Utility/BlockTotum.java
View file

@ -1,264 +0,0 @@
package net.minecraft.src.Utility;
import java.util.ArrayList;
import java.util.Random;
import net.minecraft.client.Minecraft;
import net.minecraft.src.*;
import net.minecraft.src.forge.*;
import net.minecraft.src.universalelectricity.*;
import net.minecraft.src.universalelectricity.components.UniversalComponents;
public class BlockTotum extends UEBlockMachine implements ITextureProvider
{
private Random furnaceRand = new Random();
private static boolean keepFurnaceInventory = true;
public BlockTotum(int par1)
{
super("machine", par1, Material.iron);
this.setRequiresSelfNotify();
}
@Override
protected int damageDropped(int metadata)
{
return metadata;
}
@Override
public int getBlockTexture(IBlockAccess par1iBlockAccess, int x, int y, int z, int side)
{
TileEntity tileEntity = par1iBlockAccess.getBlockTileEntity(x, y, z);
int metadata = par1iBlockAccess.getBlockMetadata(x, y, z);
if (side == 1)
{
switch(metadata)
{
case 0: return 1;
case 1: return 3;
case 2: return 18;
case 3: return 5;
}
}
//If it is the front side
if(side == ((TileEntityTotum)tileEntity).getDirection())
{
switch(metadata)
{
case 1: return 3;
case 3: return 3;
}
}
//If it is the back side
else if(side == UniversalElectricity.getOrientationFromSide(((TileEntityTotum)tileEntity).getDirection(), (byte)2))
{
switch(metadata)
{
case 0: return 19;
case 1: return 6;
case 2: return 17;
case 3: return 3;
}
}
switch(metadata)
{
case 1: return 4;
case 2: return 16;
case 3: return 2;
}
return 0;
}
@Override
public int getBlockTextureFromSideAndMetadata(int side, int metadata)
{
if (side == 1)
{
switch(metadata)
{
case 0: return 1;
case 1: return 3;
case 2: return 18;
case 3: return 5;
}
}
else
{
//If it is the front side
if(side == 3)
{
switch(metadata)
{
case 0: return 19;
case 1: return 6;
case 2: return 17;
case 3: return 3;
}
}
//If it is the back side
else if(side == 2)
{
switch(metadata)
{
case 0: return this.blockIndexInTexture + 2;
case 1: return this.blockIndexInTexture + 3;
case 2: return this.blockIndexInTexture + 2;
}
}
switch(metadata)
{
case 1: return 4;
case 2: return 16;
case 3: return 2;
}
}
return 0;
}
public boolean blockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer)
{
int metadata = par1World.getBlockMetadata(par2, par3, par4);
/**
* Check if the player is holding a wrench or an electric item. If so, do not open the GUI.
*/
if(par5EntityPlayer.inventory.getCurrentItem() != null)
{
if(par5EntityPlayer.inventory.getCurrentItem().itemID == UniversalComponents.ItemWrench.shiftedIndex)
{
if(onUseWrench(par1World, par2, par3, par4, par5EntityPlayer))
{
par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this.blockID);
return true;
}
}
else if(par5EntityPlayer.inventory.getCurrentItem().getItem() instanceof UEElectricItem)
{
if(onUseElectricItem(par1World, par2, par3, par4, par5EntityPlayer))
{
return true;
}
}
}
return machineActivated(par1World, par2, par3, par4, par5EntityPlayer);
}
public boolean onUseElectricItem(World par1World, int par2, int par3,
int par4, EntityPlayer par5EntityPlayer) {
// TODO Auto-generated method stub
return false;
}
public boolean onUseWrench(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer)
{
TileEntityTotum tileEntity = (TileEntityTotum)par1World.getBlockTileEntity(par2, par3, par4);
//Reorient the block
switch(tileEntity.getDirection())
{
case 2: tileEntity.setDirection((byte)5); break;
case 5: tileEntity.setDirection((byte)3); break;
case 3: tileEntity.setDirection((byte)4); break;
case 4: tileEntity.setDirection((byte)2); break;
}
return true;
}
/**
* Called upon block activation (left or right click on the block.). The three integers represent x,y,z of the
* block.
*/
public boolean machineActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer)
{
if (par1World.isRemote)
{
return true;
}
else
{
TileEntity blockEntity = (TileEntity)par1World.getBlockTileEntity(x, y, z);
if (blockEntity != null)
{
if(blockEntity instanceof TileEntityHealer)
{
TileEntity var6 = (TileEntityHealer)par1World.getBlockTileEntity(x, y, z);
ModLoader.openGUI(par5EntityPlayer, new GUIHealer(par5EntityPlayer.inventory, (TileEntityHealer) var6 )); ;
}
}
return true;
}
}
@Override
public TileEntity getBlockEntity(int meta)
{
switch(meta)
{
case 0: return new TileEntityHealer();
}
return null;
}
/**
* Called when the block is placed in the world.
*/
@Override
public void onBlockPlacedBy(World par1World, int x, int y, int z, EntityLiving par5EntityLiving)
{
int angle = MathHelper.floor_double((par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
int metadata = par1World.getBlockMetadata(x, y, z);
TileEntityTotum tileEntity = (TileEntityTotum)par1World.getBlockTileEntity(x, y, z);
if(metadata == 0)
{
switch (angle)
{
case 0: tileEntity.setDirection((byte)5); break;
case 1: tileEntity.setDirection((byte)3); break;
case 2: tileEntity.setDirection((byte)4); break;
case 3: tileEntity.setDirection((byte)2); break;
}
}
else
{
switch (angle)
{
case 0: tileEntity.setDirection((byte)3); break;
case 1: tileEntity.setDirection((byte)4); break;
case 2: tileEntity.setDirection((byte)2); break;
case 3: tileEntity.setDirection((byte)5); break;
}
}
}
/**
* Called whenever the block is removed.
*/
@Override
public TileEntity getBlockEntity() {
// TODO Auto-generated method stub
return null;
}
@Override
public String getTextureFile() {
// TODO Auto-generated method stub
return "/eui/blocks.png";
}
@Override
public boolean isOpaqueCube()
{
return false;
}
public int getRenderType()
{
return UniversalComponents.MachineRenderType;
}
}

40
minecraft/net/minecraft/src/Utility/ContainerBoost.java
View file

@ -1,40 +0,0 @@
package net.minecraft.src.Utility;
import net.minecraft.src.*;
public class ContainerBoost extends Container
{
private TileEntityBoost tileEntity;
public ContainerBoost(InventoryPlayer par1InventoryPlayer, TileEntityBoost tileEntity2)
{
this.tileEntity = tileEntity2;
int var3;
for (var3 = 0; var3 < 3; ++var3)
{
for (int var4 = 0; var4 < 9; ++var4)
{
this.addSlot(new Slot(par1InventoryPlayer, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18));
}
}
for (var3 = 0; var3 < 9; ++var3)
{
this.addSlot(new Slot(par1InventoryPlayer, var3, 8 + var3 * 18, 142));
}
}
public boolean canInteractWith(EntityPlayer par1EntityPlayer)
{
return this.tileEntity.isUseableByPlayer(par1EntityPlayer);
}
/**
* Called to transfer a stack from one inventory to the other eg. when shift clicking.
*/
public ItemStack transferStackInSlot(int par1)
{
return null;
}
}

40
minecraft/net/minecraft/src/Utility/ContainerHealer.java
View file

@ -1,40 +0,0 @@
package net.minecraft.src.Utility;
import net.minecraft.src.*;
public class ContainerHealer extends Container
{
private TileEntityHealer tileEntity;
public ContainerHealer(InventoryPlayer par1InventoryPlayer, TileEntityHealer tileEntity)
{
this.tileEntity = tileEntity;
int var3;
for (var3 = 0; var3 < 3; ++var3)
{
for (int var4 = 0; var4 < 9; ++var4)
{
this.addSlot(new Slot(par1InventoryPlayer, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18));
}
}
for (var3 = 0; var3 < 9; ++var3)
{
this.addSlot(new Slot(par1InventoryPlayer, var3, 8 + var3 * 18, 142));
}
}
public boolean canInteractWith(EntityPlayer par1EntityPlayer)
{
return this.tileEntity.isUseableByPlayer(par1EntityPlayer);
}
/**
* Called to transfer a stack from one inventory to the other eg. when shift clicking.
*/
public ItemStack transferStackInSlot(int par1)
{
return null;
}
}

54
minecraft/net/minecraft/src/Utility/GUIBoost.java
View file

@ -1,54 +0,0 @@
package net.minecraft.src.Utility;
import org.lwjgl.opengl.GL11;
import java.math.*;
import java.lang.Integer;
import net.minecraft.src.*;
import net.minecraft.src.universalelectricity.UniversalElectricity;
import net.minecraft.src.universalelectricity.components.ContainerCoalGenerator;
import net.minecraft.src.universalelectricity.components.TileEntityCoalGenerator;
public class GUIBoost extends GuiContainer
{
private TileEntityBoost tileEntity;
private int containerWidth;
private int containerHeight;
public GUIBoost(InventoryPlayer par1InventoryPlayer, TileEntityBoost tileEntity)
{
super(new ContainerBoost(par1InventoryPlayer, tileEntity));
this.tileEntity = tileEntity;
}
/**
* Draw the foreground layer for the GuiContainer (everything in front of the items)
*/
protected void drawGuiContainerForegroundLayer()
{
this.fontRenderer.drawString("Doc-o-Matic", 55, 6, 4210752);
this.fontRenderer.drawString("MeterReadings", 90, 33, 4210752);
String displayText = "";
String displayText2 = "";
String displayText3 = "";
displayText2 = "Energy" + "-" + tileEntity.eStored;
displayText3 = "Effects" + "-" + tileEntity.hStored;
this.fontRenderer.drawString(displayText, (int)(105-displayText.length()*1), 45, 4210752);
this.fontRenderer.drawString(displayText2, (int)(105-displayText.length()*1), 55, 4210752);
this.fontRenderer.drawString(displayText3, (int)(105-displayText.length()*1), 65, 4210752);
this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
}
/**
* Draw the background layer for the GuiContainer (everything behind the items)
*/
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
int var4 = this.mc.renderEngine.getTexture("/eui/SteamGUI.png");
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.renderEngine.bindTexture(var4);
containerWidth = (this.width - this.xSize) / 2;
containerHeight = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(containerWidth, containerHeight, 0, 0, this.xSize, this.ySize);
}
}

54
minecraft/net/minecraft/src/Utility/GUIHealer.java
View file

@ -1,54 +0,0 @@
package net.minecraft.src.Utility;
import org.lwjgl.opengl.GL11;
import java.math.*;
import java.lang.Integer;
import net.minecraft.src.*;
import net.minecraft.src.universalelectricity.UniversalElectricity;
import net.minecraft.src.universalelectricity.components.ContainerCoalGenerator;
import net.minecraft.src.universalelectricity.components.TileEntityCoalGenerator;
public class GUIHealer extends GuiContainer
{
private TileEntityHealer tileEntity;
private int containerWidth;
private int containerHeight;
public GUIHealer(InventoryPlayer par1InventoryPlayer, TileEntityHealer tileEntity)
{
super(new ContainerHealer(par1InventoryPlayer, tileEntity));
this.tileEntity = tileEntity;
}
/**
* Draw the foreground layer for the GuiContainer (everything in front of the items)
*/
protected void drawGuiContainerForegroundLayer()
{
this.fontRenderer.drawString("Doc-o-Matic", 55, 6, 4210752);
this.fontRenderer.drawString("MeterReadings", 90, 33, 4210752);
String displayText = "";
String displayText2 = "";
String displayText3 = "";
displayText2 = "Energy" + "-" + tileEntity.eStored;
displayText3 = "heals" + "-" + tileEntity.hStored;
this.fontRenderer.drawString(displayText, (int)(105-displayText.length()*1), 45, 4210752);
this.fontRenderer.drawString(displayText2, (int)(105-displayText.length()*1), 55, 4210752);
this.fontRenderer.drawString(displayText3, (int)(105-displayText.length()*1), 65, 4210752);
this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
}
/**
* Draw the background layer for the GuiContainer (everything behind the items)
*/
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
int var4 = this.mc.renderEngine.getTexture("/eui/SteamGUI.png");
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.renderEngine.bindTexture(var4);
containerWidth = (this.width - this.xSize) / 2;
containerHeight = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(containerWidth, containerHeight, 0, 0, this.xSize, this.ySize);
}
}

47
minecraft/net/minecraft/src/Utility/ItemTotum.java
View file

@ -1,47 +0,0 @@
package net.minecraft.src.Utility;
import java.util.ArrayList;
import net.minecraft.src.*;
public class ItemTotum extends ItemBlock {
public ItemTotum(int id) {
super(id);
setMaxDamage(0);
setHasSubtypes(true);
}
public int getMetadata(int metadata)
{
return metadata;
}
public String getItemName()
{
return "Totum";
}
public int getPlacedBlockMetadata(int damage) {
return damage;
}
public String getItemNameIS(ItemStack par1ItemStack)
{
int var3 = par1ItemStack.getItemDamage();
switch(var3)
{
case 0: return "Healer";
case 1: return "Booster";
case 2: return "";
case 3: return "";
case 15: return "";
}
return this.getItemName();
}
public void addCreativeItems(ArrayList itemList) {
itemList.add(new ItemStack(this, 1,0));
itemList.add(new ItemStack(this, 1,1));
}
}

228
minecraft/net/minecraft/src/Utility/TileEntityBoost.java
View file

@ -1,228 +0,0 @@
package net.minecraft.src.Utility;
import net.minecraft.src.eui.TileEntityMachine;
import net.minecraft.src.eui.api.*;
import net.minecraft.src.forge.ForgeHooks;
import net.minecraft.src.*;
import net.minecraft.src.universalelectricity.*;
import net.minecraft.src.forge.ISidedInventory;
public class TileEntityBoost extends TileEntityTotum implements UEIConsumer, IInventory, ISidedInventory
{
//Maximum possible generation rate of watts in SECONDS
public UETileEntityConductor connectedWire = null;
/**
* The number of ticks that a fresh copy of the currently-burning item would keep the furnace burning for
*/
public int itemCookTime = 0;
public int eStored = 0;
public int hStored = 0;
public int tCount = 0;
/**
* The ItemStacks that hold the items currently being used in the battery box
*/
private ItemStack[] containingItems = new ItemStack[1];
/**
* Allows the entity to update its state. Overridden in most subclasses, e.g. the mob spawner uses this to count
* ticks and creates a new spawn inside its implementation.
*/
public void updateEntity()
{
if(eStored >= 1000 && hStored < 100)
{
eStored -= 1000;
hStored += 1;
}
if(hStored > 0 && tCount > 40)
{
if(this.containingItems[0] != null && this.containingItems[0].itemID == 373)
{
EntityPlayer player = this.worldObj.getClosestPlayer(xCoord, yCoord, zCoord, 4.0F);
if(player != null){
//player.addPotionEffect(par1PotionEffect);
hStored -= 1;
tCount = 0;
}
}
}
tCount++;
}
/**
* Reads a tile entity from NBT.
*/
public void readFromNBT(NBTTagCompound par1NBTTagCompound)
{
super.readFromNBT(par1NBTTagCompound);
this.itemCookTime = par1NBTTagCompound.getInteger("itemCookTime");
this.eStored = par1NBTTagCompound.getInteger("EU");
this.hStored = par1NBTTagCompound.getInteger("HP");
NBTTagList var2 = par1NBTTagCompound.getTagList("Items");
this.containingItems = new ItemStack[this.getSizeInventory()];
for (int var3 = 0; var3 < var2.tagCount(); ++var3)
{
NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
byte var5 = var4.getByte("Slot");
if (var5 >= 0 && var5 < this.containingItems.length)
{
this.containingItems[var5] = ItemStack.loadItemStackFromNBT(var4);
}
}
}
/**
* Writes a tile entity to NBT.
*/
public void writeToNBT(NBTTagCompound par1NBTTagCompound)
{
super.writeToNBT(par1NBTTagCompound);
par1NBTTagCompound.setInteger("itemCookTime", (int)this.itemCookTime);
par1NBTTagCompound.setInteger("EU", (int)this.eStored);
par1NBTTagCompound.setInteger("HP", (int)this.hStored);
NBTTagList var2 = new NBTTagList();
for (int var3 = 0; var3 < this.containingItems.length; ++var3)
{
if (this.containingItems[var3] != null)
{
NBTTagCompound var4 = new NBTTagCompound();
var4.setByte("Slot", (byte)var3);
this.containingItems[var3].writeToNBT(var4);
var2.appendTag(var4);
}
}
par1NBTTagCompound.setTag("Items", var2);
}
@Override
public int getStartInventorySide(int side)
{
if (side == 0)
{
return 1;
}
if (side == 1)
{
return 0;
}
return 2;
}
@Override
public int getSizeInventorySide(int side) { return getSizeInventory(); }
@Override
public int getSizeInventory() { return this.containingItems.length; }
@Override
public ItemStack getStackInSlot(int par1) { return this.containingItems[par1]; }
@Override
public ItemStack decrStackSize(int par1, int par2)
{
if (this.containingItems[par1] != null)
{
ItemStack var3;
if (this.containingItems[par1].stackSize <= par2)
{
var3 = this.containingItems[par1];
this.containingItems[par1] = null;
return var3;
}
else
{
var3 = this.containingItems[par1].splitStack(par2);
if (this.containingItems[par1].stackSize == 0)
{
this.containingItems[par1] = null;
}
return var3;
}
}
else
{
return null;
}
}
@Override
public ItemStack getStackInSlotOnClosing(int par1)
{
if (this.containingItems[par1] != null)
{
ItemStack var2 = this.containingItems[par1];
this.containingItems[par1] = null;
return var2;
}
else
{
return null;
}
}
@Override
public void setInventorySlotContents(int par1, ItemStack par2ItemStack)
{
this.containingItems[par1] = par2ItemStack;
if (par2ItemStack != null && par2ItemStack.stackSize > this.getInventoryStackLimit())
{
par2ItemStack.stackSize = this.getInventoryStackLimit();
}
}
@Override
public String getInvName() {
return "SteamGen";
}
@Override
public int getInventoryStackLimit()
{
return 64;
}
@Override
public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer)
{
return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double)this.xCoord + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord + 0.5D) <= 64.0D;
}
@Override
public void openChest() { }
@Override
public void closeChest() { }
@Override
public int getVolts() {
// TODO Auto-generated method stub
return 12000;
}
@Override
public int onReceiveElectricity(int watts, int voltage, byte side) {
if(this.eStored < this.getElectricityCapacity())
{
int rejectedElectricity = Math.max((this.eStored + watts) - this.getElectricityCapacity(), 0);
this.eStored += watts - rejectedElectricity;
return rejectedElectricity;
}
return watts;
}
@Override
public boolean canReceiveElectricity(byte side) {
if(side == 0)
{
return true;
}
return false;
}
@Override
public int getStoredElectricity() {
return eStored;
}
@Override
public int getElectricityCapacity() {
return 1000;
}
@Override
public void onDisable(int duration) {
// TODO Auto-generated method stub
}
@Override
public boolean isDisabled() {
// TODO Auto-generated method stub
return false;
}
}

228
minecraft/net/minecraft/src/Utility/TileEntityHealer.java
View file

@ -1,228 +0,0 @@
package net.minecraft.src.Utility;
import net.minecraft.src.eui.TileEntityMachine;
import net.minecraft.src.eui.api.*;
import net.minecraft.src.forge.ForgeHooks;
import net.minecraft.src.*;
import net.minecraft.src.universalelectricity.*;
import net.minecraft.src.forge.ISidedInventory;
public class TileEntityHealer extends TileEntityTotum implements UEIConsumer, IInventory, ISidedInventory
{
//Maximum possible generation rate of watts in SECONDS
public UETileEntityConductor connectedWire = null;
/**
* The number of ticks that a fresh copy of the currently-burning item would keep the furnace burning for
*/
public int itemCookTime = 0;
public int eStored = 0;
public int hStored = 0;
public int tCount = 0;
/**
* The ItemStacks that hold the items currently being used in the battery box
*/
private ItemStack[] containingItems = new ItemStack[1];
/**
* Allows the entity to update its state. Overridden in most subclasses, e.g. the mob spawner uses this to count
* ticks and creates a new spawn inside its implementation.
*/
public void updateEntity()
{
if(eStored >= 1000 && hStored < 100)
{
eStored -= 1000;
hStored += 1;
}
if(hStored > 0 && tCount > 40)
{
EntityPlayer player = this.worldObj.getClosestPlayer(xCoord, yCoord, zCoord, 4.0F);
if(player != null){
if(player.getHealth() < player.heartsHalvesLife)
{
System.out.println("hearts"+ player.getHealth());
System.out.println("heartsMax"+ player.heartsHalvesLife);
player.heal(1);
hStored -= 1;
tCount = 0;
}
}
}
tCount++;
}
/**
* Reads a tile entity from NBT.
*/
public void readFromNBT(NBTTagCompound par1NBTTagCompound)
{
super.readFromNBT(par1NBTTagCompound);
this.itemCookTime = par1NBTTagCompound.getInteger("itemCookTime");
this.eStored = par1NBTTagCompound.getInteger("EU");
this.hStored = par1NBTTagCompound.getInteger("HP");
NBTTagList var2 = par1NBTTagCompound.getTagList("Items");
this.containingItems = new ItemStack[this.getSizeInventory()];
for (int var3 = 0; var3 < var2.tagCount(); ++var3)
{
NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
byte var5 = var4.getByte("Slot");
if (var5 >= 0 && var5 < this.containingItems.length)
{
this.containingItems[var5] = ItemStack.loadItemStackFromNBT(var4);
}
}
}
/**
* Writes a tile entity to NBT.
*/
public void writeToNBT(NBTTagCompound par1NBTTagCompound)
{
super.writeToNBT(par1NBTTagCompound);
par1NBTTagCompound.setInteger("itemCookTime", (int)this.itemCookTime);
par1NBTTagCompound.setInteger("EU", (int)this.eStored);
par1NBTTagCompound.setInteger("HP", (int)this.hStored);
NBTTagList var2 = new NBTTagList();
for (int var3 = 0; var3 < this.containingItems.length; ++var3)
{
if (this.containingItems[var3] != null)
{
NBTTagCompound var4 = new NBTTagCompound();
var4.setByte("Slot", (byte)var3);
this.containingItems[var3].writeToNBT(var4);
var2.appendTag(var4);
}
}
par1NBTTagCompound.setTag("Items", var2);
}
@Override
public int getStartInventorySide(int side)
{
if (side == 0)
{
return 1;
}
if (side == 1)
{
return 0;
}
return 2;
}
@Override
public int getSizeInventorySide(int side) { return getSizeInventory(); }
@Override
public int getSizeInventory() { return this.containingItems.length; }
@Override
public ItemStack getStackInSlot(int par1) { return this.containingItems[par1]; }
@Override
public ItemStack decrStackSize(int par1, int par2)
{
if (this.containingItems[par1] != null)
{
ItemStack var3;
if (this.containingItems[par1].stackSize <= par2)
{
var3 = this.containingItems[par1];
this.containingItems[par1] = null;
return var3;
}
else
{
var3 = this.containingItems[par1].splitStack(par2);
if (this.containingItems[par1].stackSize == 0)
{
this.containingItems[par1] = null;
}
return var3;
}
}
else
{
return null;
}
}
@Override
public ItemStack getStackInSlotOnClosing(int par1)
{
if (this.containingItems[par1] != null)
{
ItemStack var2 = this.containingItems[par1];
this.containingItems[par1] = null;
return var2;
}
else
{
return null;
}
}
@Override
public void setInventorySlotContents(int par1, ItemStack par2ItemStack)
{
this.containingItems[par1] = par2ItemStack;
if (par2ItemStack != null && par2ItemStack.stackSize > this.getInventoryStackLimit())
{
par2ItemStack.stackSize = this.getInventoryStackLimit();
}
}
@Override
public String getInvName() {
return "SteamGen";
}
@Override
public int getInventoryStackLimit()
{
return 64;
}
@Override
public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer)
{
return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double)this.xCoord + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord + 0.5D) <= 64.0D;
}
@Override
public void openChest() { }
@Override
public void closeChest() { }
@Override
public int getVolts() {
// TODO Auto-generated method stub
return 12000;
}
@Override
public int onReceiveElectricity(int watts, int voltage, byte side) {
if(this.eStored < this.getElectricityCapacity())
{
int rejectedElectricity = Math.max((this.eStored + watts) - this.getElectricityCapacity(), 0);
this.eStored += watts - rejectedElectricity;
return rejectedElectricity;
}
return watts;
}
@Override
public boolean canReceiveElectricity(byte side) {
if(side == 0)
{
return true;
}
return false;
}
@Override
public int getStoredElectricity() {
return eStored;
}
@Override
public int getElectricityCapacity() {
return 1000;
}
@Override
public void onDisable(int duration) {
// TODO Auto-generated method stub
}
@Override
public boolean isDisabled() {
// TODO Auto-generated method stub
return false;
}
}

56
minecraft/net/minecraft/src/Utility/TileEntityTotum.java
View file

@ -1,56 +0,0 @@
package net.minecraft.src.Utility;
import net.minecraft.src.*;
import net.minecraft.src.forge.ITextureProvider;
import net.minecraft.src.universalelectricity.UEIRotatable;
import net.minecraft.src.universalelectricity.components.UniversalComponents;
public class TileEntityTotum extends TileEntity implements ITextureProvider,UEIRotatable {
private int facing;
public void writeToNBT(NBTTagCompound par1NBTTagCompound)
{
super.writeToNBT(par1NBTTagCompound);
par1NBTTagCompound.setInteger("facing", (int)this.facing);
}
public void readFromNBT(NBTTagCompound par1NBTTagCompound)
{
super.readFromNBT(par1NBTTagCompound);
this.facing = par1NBTTagCompound.getInteger("facing");
}
public TileEntity getSteamMachine(int i)
{
int x = this.xCoord;
int y = this.yCoord;
int z = this.zCoord;
switch(i){
case 0: y = y - 1;break;
case 1: y = y + 1;break;
case 2: z = z + 1;break;
case 3: z = z - 1;break;
case 4: x = x + 1;break;
case 5: x = x - 1;break;
}
TileEntity aEntity = worldObj.getBlockTileEntity(x, y, z);
if(aEntity instanceof TileEntityTotum)
{
return aEntity;
}
return null;
}
public byte getDirection() {
// TODO Auto-generated method stub
return (byte) this.facing;
}
public void setDirection(byte facingDirection) {
this.facing = facingDirection;
}
@Override
public String getTextureFile()
{
return "/eui/blocks.png";
}
}

22
minecraft/net/minecraft/src/eui/BlockMachine.java
View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Random;
import net.minecraft.client.Minecraft;
import net.minecraft.src.*;
import net.minecraft.src.basiccomponents.*;
import net.minecraft.src.eui.boiler.*;
import net.minecraft.src.eui.burner.GUIFireBox;
import net.minecraft.src.eui.burner.TileEntityFireBox;
@ -11,14 +12,9 @@ import net.minecraft.src.eui.grinder.*;
import net.minecraft.src.eui.turbine.GUIGenerator;
import net.minecraft.src.eui.turbine.TileEntityGenerator;
import net.minecraft.src.forge.*;
import net.minecraft.src.universalelectricity.UEBlockMachine;
import net.minecraft.src.universalelectricity.UEElectricItem;
import net.minecraft.src.universalelectricity.UERenderBlocks;
import net.minecraft.src.universalelectricity.UniversalElectricity;
import net.minecraft.src.universalelectricity.components.TileEntityCoalGenerator;
import net.minecraft.src.universalelectricity.components.UniversalComponents;
import net.minecraft.src.universalelectricity.*;
public class BlockMachine extends UEBlockMachine implements ITextureProvider
public class BlockMachine extends net.minecraft.src.universalelectricity.extend.BlockMachine implements ITextureProvider
{
private Random furnaceRand = new Random();
@ -178,7 +174,7 @@ public class BlockMachine extends UEBlockMachine implements ITextureProvider
*/
if(par5EntityPlayer.inventory.getCurrentItem() != null)
{
if(par5EntityPlayer.inventory.getCurrentItem().itemID == UniversalComponents.ItemWrench.shiftedIndex)
if(par5EntityPlayer.inventory.getCurrentItem().itemID == BasicComponents.ItemWrench.shiftedIndex)
{
if(onUseWrench(par1World, par2, par3, par4, par5EntityPlayer))
{
@ -186,7 +182,7 @@ public class BlockMachine extends UEBlockMachine implements ITextureProvider
return true;
}
}
else if(par5EntityPlayer.inventory.getCurrentItem().getItem() instanceof UEElectricItem)
else if(par5EntityPlayer.inventory.getCurrentItem().getItem() instanceof net.minecraft.src.universalelectricity.extend.ItemElectric)
{
if(onUseElectricItem(par1World, par2, par3, par4, par5EntityPlayer))
{
@ -370,10 +366,10 @@ public class BlockMachine extends UEBlockMachine implements ITextureProvider
{
return false;
}
public int getRenderType()
{
return UniversalComponents.MachineRenderType;
}
public int getRenderType()
{
return 0;
}
public void addCreativeItems(ArrayList itemList) {
itemList.add(new ItemStack(this, 1,0));

43
minecraft/net/minecraft/src/eui/TileEntityCondenser.java
View file

@ -1,10 +1,9 @@
package net.minecraft.src.eui;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.eui.pipes.api.ILiquidProducer;
import net.minecraft.src.universalelectricity.UEIConsumer;
import net.minecraft.src.pipes.api.ILiquidProducer;
public class TileEntityCondenser extends TileEntityMachine implements ILiquidProducer,UEIConsumer {
public class TileEntityCondenser extends TileEntityMachine implements ILiquidProducer {
int tickCount = 0;
int waterStored = 0;
int energyStored = 0;
@ -16,7 +15,7 @@ public class TileEntityCondenser extends TileEntityMachine implements ILiquidPro
waterStored -= tradeW;
return tradeW;
}**/
return 5;
return 1;
}
public void writeToNBT(NBTTagCompound par1NBTTagCompound)
{
@ -42,42 +41,6 @@ public class TileEntityCondenser extends TileEntityMachine implements ILiquidPro
tickCount++;
}
@Override
public int onReceiveElectricity(int watts, int voltage, byte side) {
int rejectedElectricity = Math.max((this.waterStored + watts) - this.getElectricityCapacity(), 0);
this.energyStored += watts - rejectedElectricity;
return rejectedElectricity;
}
@Override
public boolean canReceiveElectricity(byte side) {
// TODO Auto-generated method stub
return true;
}
@Override
public int getStoredElectricity() {
// TODO Auto-generated method stub
return this.energyStored;
}
@Override
public int getElectricityCapacity() {
// TODO Auto-generated method stub
return 1000;
}
@Override
public int getVolts() {
// TODO Auto-generated method stub
return 240;
}
@Override
public void onDisable(int duration) {
// TODO Auto-generated method stub
}
@Override
public boolean isDisabled() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean canProduceLiquid(int type, byte side) {
if(type == 1)
{

18
minecraft/net/minecraft/src/eui/TileEntityMachine.java
View file

@ -2,10 +2,10 @@ package net.minecraft.src.eui;
import net.minecraft.src.*;
import net.minecraft.src.forge.ITextureProvider;
import net.minecraft.src.universalelectricity.UEIRotatable;
import net.minecraft.src.universalelectricity.components.UniversalComponents;
import net.minecraft.src.universalelectricity.electricity.TileEntityElectricUnit;
import net.minecraft.src.universalelectricity.extend.IRotatable;
public class TileEntityMachine extends TileEntity implements ITextureProvider, UEIRotatable
public class TileEntityMachine extends TileEntityElectricUnit implements ITextureProvider, IRotatable
{
private byte facing;
@ -62,4 +62,16 @@ public class TileEntityMachine extends TileEntity implements ITextureProvider, U
super.readFromNBT(par1NBTTagCompound);
this.facing = par1NBTTagCompound.getByte("facing");
}
@Override
public float electricityRequest() {
// TODO Auto-generated method stub
return 0;
}
@Override
public boolean canReceiveFromSide(byte side) {
// TODO Auto-generated method stub
return false;
}
}

55
minecraft/net/minecraft/src/eui/TileEntityNuller.java
View file

@ -1,49 +1,28 @@
package net.minecraft.src.eui;
import net.minecraft.src.universalelectricity.UEIConsumer;
import net.minecraft.src.universalelectricity.electricity.IElectricUnit;
public class TileEntityNuller extends TileEntityMachine implements UEIConsumer {
@Override
public int onReceiveElectricity(int watts, int voltage, byte side) {
// TODO Auto-generated method stub
return 0;
public class TileEntityNuller extends TileEntityMachine implements IElectricUnit {
public float electricityRequest()
{
return 100;
}
@Override
public boolean canReceiveElectricity(byte side) {
// TODO Auto-generated method stub
public boolean canReceiveFromSide(byte side)
{
return true;
}
@Override
public int getStoredElectricity() {
// TODO Auto-generated method stub
return 0;
public float getVoltage()
{
return 1000;
}
@Override
public int getElectricityCapacity() {
// TODO Auto-generated method stub
return 100000;
public int getTickInterval()
{
return 1;
}
@Override
public int getVolts() {
// TODO Auto-generated method stub
return 100000000;
public boolean canConnect(byte side)
{
return true;
}
@Override
public void onDisable(int duration) {
// TODO Auto-generated method stub
}
@Override
public boolean isDisabled() {
// TODO Auto-generated method stub
return false;
}
}

4
minecraft/net/minecraft/src/eui/boiler/TileEntityBoiler.java
View file

@ -4,10 +4,10 @@ import net.minecraft.src.eui.BlockMachine;
import net.minecraft.src.eui.TileEntityMachine;
import net.minecraft.src.eui.api.*;
import net.minecraft.src.eui.burner.TileEntityFireBox;
import net.minecraft.src.eui.pipes.api.ILiquidConsumer;
import net.minecraft.src.eui.pipes.api.ILiquidProducer;
import net.minecraft.src.forge.ForgeHooks;
import net.minecraft.src.forge.ISidedInventory;
import net.minecraft.src.pipes.api.ILiquidConsumer;
import net.minecraft.src.pipes.api.ILiquidProducer;
import net.minecraft.src.universalelectricity.UniversalElectricity;
public class TileEntityBoiler extends TileEntityMachine implements IInventory, ISidedInventory,ILiquidProducer, ILiquidConsumer

61
minecraft/net/minecraft/src/eui/grinder/TileEntityGrinder.java
View file

@ -1,11 +1,11 @@
package net.minecraft.src.eui.grinder;
import net.minecraft.src.*;
import net.minecraft.src.universalelectricity.UEIConsumer;
import net.minecraft.src.universalelectricity.electricity.IElectricUnit;
import net.minecraft.src.eui.TileEntityMachine;
import net.minecraft.src.forge.ForgeHooks;
import net.minecraft.src.forge.ISidedInventory;
public class TileEntityGrinder extends TileEntityMachine implements IInventory, ISidedInventory, UEIConsumer
public class TileEntityGrinder extends TileEntityMachine implements IElectricUnit, IInventory
{
/**
@ -324,60 +324,14 @@ public class TileEntityGrinder extends TileEntityMachine implements IInventory,
public void openChest() {}
public void closeChest() {}
@Override
public int getStartInventorySide(int side)
{
if (side == 0) return 1;
if (side == 1) return 0;
return 2;
}
@Override
public int getSizeInventorySide(int side)
{
return 1;
}
@Override
public int onReceiveElectricity(int watts, int voltage, byte side) {
//can store 1 min of energy too do work
if(this.energyStore <= 1000)
{
if(!(this.energyStore + watts > 1000))
{
this.energyStore = this.energyStore + watts;
return 0;
}
else
{
int varB = watts - this.energyStore;
int eGain = (varB * varB) / 2;
this.energyStore = this.energyStore + eGain;
return (watts - eGain);
}
}
return watts;
}
@Override
public int getStoredElectricity() {
// TODO what is acutal returned
return this.energyStore;
}
@Override
public int getElectricityCapacity() {
// TODO Auto-generated method stub
return 1000;
}
@Override
public boolean canReceiveElectricity(byte side) {
public boolean canReceiveFromSide(byte side) {
// TODO Auto-generated method stub
return true;
}
@Override
public int getVolts() {
public float getVoltage() {
// TODO Auto-generated method stub
return 120;
}
@ -393,6 +347,11 @@ public class TileEntityGrinder extends TileEntityMachine implements IInventory,
// TODO Auto-generated method stub
return false;
}
public float electricityRequest()
{
return Math.max(this.energyStore - 100,0);
}
}

5
minecraft/net/minecraft/src/eui/robotics/BlockComp.java Normal file
View file

@ -0,0 +1,5 @@
package net.minecraft.src.eui.robotics;
public class BlockComp {
}

5
minecraft/net/minecraft/src/eui/robotics/BlockRail.java Normal file
View file

@ -0,0 +1,5 @@
package net.minecraft.src.eui.robotics;
public class BlockRail {
}

12
minecraft/net/minecraft/src/eui/robotics/EntityDigger.java Normal file
View file

@ -0,0 +1,12 @@
package net.minecraft.src.eui.robotics;
import net.minecraft.src.World;
public class EntityDigger extends EntityRobot {
public EntityDigger(World par1World) {
super(par1World);
// TODO Auto-generated constructor stub
}
}

28
minecraft/net/minecraft/src/eui/robotics/EntityRobot.java Normal file
View file

@ -0,0 +1,28 @@
package net.minecraft.src.eui.robotics;
import net.minecraft.src.*;
public class EntityRobot extends Entity {
public EntityRobot(World par1World) {
super(par1World);
}
public boolean isActive()
{
return false;
}
@Override
protected void entityInit() {
// TODO Auto-generated method stub
}
@Override
protected void readEntityFromNBT(NBTTagCompound var1) {
// TODO Auto-generated method stub
}
@Override
protected void writeEntityToNBT(NBTTagCompound var1) {
// TODO Auto-generated method stub
}
}

12
minecraft/net/minecraft/src/eui/robotics/Entitycollector.java Normal file
View file

@ -0,0 +1,12 @@
package net.minecraft.src.eui.robotics;
import net.minecraft.src.World;
public class Entitycollector extends EntityRobot {
public Entitycollector(World par1World) {
super(par1World);
// TODO Auto-generated constructor stub
}
}

5
minecraft/net/minecraft/src/eui/robotics/TileEntityComp.java Normal file
View file

@ -0,0 +1,5 @@
package net.minecraft.src.eui.robotics;
public class TileEntityComp {
}

4
minecraft/net/minecraft/src/eui/turbine/GUIGenerator.java
View file

@ -5,8 +5,6 @@ import java.math.*;
import java.lang.Integer;
import net.minecraft.src.*;
import net.minecraft.src.universalelectricity.UniversalElectricity;
import net.minecraft.src.universalelectricity.components.ContainerCoalGenerator;
import net.minecraft.src.universalelectricity.components.TileEntityCoalGenerator;
public class GUIGenerator extends GuiContainer
{
@ -31,7 +29,7 @@ import net.minecraft.src.universalelectricity.components.TileEntityCoalGenerator
String displayText = "";
String displayText2 = "";
String displayText3 = "";
if(tileEntity.connectedWire == null)
if(tileEntity.connectedElectricUnit == null)
{
displayText = "Not Connected";
}

129
minecraft/net/minecraft/src/eui/turbine/TileEntityGenerator.java
View file

@ -1,14 +1,18 @@
package net.minecraft.src.eui.turbine;
import net.minecraft.src.eui.TileEntityMachine;
import net.minecraft.src.eui.api.*;
import net.minecraft.src.eui.pipes.api.ILiquidConsumer;
import net.minecraft.src.eui.pipes.api.ILiquidProducer;
import net.minecraft.src.forge.ForgeHooks;
import net.minecraft.src.*;
import net.minecraft.src.pipes.api.ILiquidConsumer;
import net.minecraft.src.pipes.api.ILiquidProducer;
import net.minecraft.src.universalelectricity.*;
import net.minecraft.src.universalelectricity.electricity.ElectricityManager;
import net.minecraft.src.universalelectricity.electricity.IElectricUnit;
import net.minecraft.src.universalelectricity.extend.BlockConductor;
import net.minecraft.src.universalelectricity.extend.TileEntityConductor;
import net.minecraft.src.forge.ISidedInventory;
public class TileEntityGenerator extends TileEntityMachine implements UEIProducer,ILiquidConsumer,ILiquidProducer, IInventory, ISidedInventory
public class TileEntityGenerator extends TileEntityMachine implements IElectricUnit,ILiquidConsumer,ILiquidProducer, IInventory, ISidedInventory
{
//Maximum possible generation rate of watts in SECONDS
public int maxGenerateRate = 1000;
@ -17,7 +21,7 @@ public class TileEntityGenerator extends TileEntityMachine implements UEIProduce
public int steamConsumed = 0;
//Current generation rate based on hull heat. In TICKS.
public float generateRate = 0;
public UETileEntityConductor connectedWire = null;
//public TileEntityConductor connectedWire = null;
/**
* The number of ticks that a fresh copy of the currently-burning item would keep the furnace burning for
*/
@ -26,20 +30,9 @@ public class TileEntityGenerator extends TileEntityMachine implements UEIProduce
* The ItemStacks that hold the items currently being used in the battery box
*/
private ItemStack[] containingItems = new ItemStack[1];
public TileEntityConductor connectedElectricUnit = null;
@Override
public int onProduceElectricity(int maxWatts, int voltage, byte side)
{
//Only produce electricity on the back side.
if(canProduceElectricity(side) && maxWatts > 0)
{
return Math.min(maxWatts, (int)generateRate);
}
return 0;
}
@Override
public boolean canProduceElectricity(byte side)
public boolean canConnect(byte side)
{
return true;
}
@ -48,30 +41,50 @@ public class TileEntityGenerator extends TileEntityMachine implements UEIProduce
* Allows the entity to update its state. Overridden in most subclasses, e.g. the mob spawner uses this to count
* ticks and creates a new spawn inside its implementation.
*/
public void updateEntity()
public void onUpdate(float watts, float voltage, byte side)
{ if(!this.worldObj.isRemote)
{
//Check nearby blocks and see if the conductor is full. If so, then it is connected
TileEntity tileEntity = UEBlockConductor.getUEUnit(this.worldObj, this.xCoord, this.yCoord, this.zCoord, UniversalElectricity.getOrientationFromSide(this.getDirection(), (byte)2));
super.onUpdate(watts, voltage, side);
if(tileEntity instanceof UETileEntityConductor)
//Check nearby blocks and see if the conductor is full. If so, then it is connected
TileEntity tileEntity = UniversalElectricity.getUEUnitFromSide(this.worldObj, new Vector3(this.xCoord, this.yCoord, this.zCoord), UniversalElectricity.getOrientationFromSide((byte)this.getBlockMetadata(), (byte)3));
if(tileEntity instanceof TileEntityConductor)
{
if(((UETileEntityConductor)tileEntity).closestConsumer != null)
if(ElectricityManager.electricityRequired(((TileEntityConductor)tileEntity).connectionID) > 0)
{
this.connectedWire = (UETileEntityConductor)tileEntity;
this.connectedElectricUnit = (TileEntityConductor)tileEntity;
}
else
{
this.connectedWire = null;
}
{
this.connectedElectricUnit = null;
}
}
else
{
this.connectedWire = null;
this.connectedElectricUnit = null;
}
if (!this.worldObj.isRemote)
{
//The top slot is for recharging items. Check if the item is a electric item. If so, recharge it.
if(!this.isDisabled())
{
//Adds time to runTime by consuming steam
if(this.itemCookTime <= 0)
{
if(steamStored > 0)
{
--steamStored;
++steamConsumed;
if(steamConsumed == mod_EUIndustry.steamOutBoiler)
{
++waterStored;
steamConsumed = 0;
}
itemCookTime += 65;
}
}
//Empties water from tank to buckets
if (this.containingItems[0] != null)
{
if(this.containingItems[0].getItem().shiftedIndex == Item.bucketEmpty.shiftedIndex)
@ -83,36 +96,29 @@ public class TileEntityGenerator extends TileEntityMachine implements UEIProduce
}
}
}
}
//Starts generating electricity if the device is heated up
if (this.itemCookTime > 0)
{
this.itemCookTime --;
if(this.connectedWire != null && this.connectedWire.getStoredElectricity() < this.connectedWire.getElectricityCapacity())
{
this.generateRate = (float)Math.min(this.generateRate+Math.min((this.generateRate)*0.01+0.015, 0.05F), this.maxGenerateRate/20);
}
}
else
{
if(steamStored > 0)
{
--steamStored;
++steamConsumed;
if(steamConsumed == mod_EUIndustry.steamOutBoiler)
{
++waterStored;
steamConsumed = 0;
}
itemCookTime = itemCookTime + 65;
}
//Starts generating electricity if the device is heated up
if (this.itemCookTime > 0)
{
this.itemCookTime --;
if(this.connectedElectricUnit != null)
{
this.generateRate = (float)Math.min(this.generateRate+Math.min((this.generateRate)*0.001+0.0015, 0.05F), this.maxGenerateRate/20);
}
}
if(this.connectedElectricUnit == null || this.itemCookTime <= 0)
{
this.generateRate = (float)Math.max(this.generateRate-0.05, 0);
}
if(this.generateRate > 1)
{
ElectricityManager.produceElectricity(this.connectedElectricUnit, this.generateRate*this.getTickInterval(), this.getVoltage());
}
}
if(this.connectedWire == null || this.itemCookTime <= 0)
{
this.generateRate = (float)Math.max(this.generateRate-0.05, 0);
}
}
}
/**
* Reads a tile entity from NBT.
@ -248,11 +254,6 @@ public class TileEntityGenerator extends TileEntityMachine implements UEIProduce
public void openChest() { }
@Override
public void closeChest() { }
@Override
public int getVolts() {
// TODO Auto-generated method stub
return 120;
}
@Override
public void onDisable(int duration) {

83
minecraft/net/minecraft/src/mod_BasicPipes.java
View file

@ -1,83 +0,0 @@
package net.minecraft.src;
import net.minecraft.client.Minecraft;
import net.minecraft.src.eui.pipes.RenderPipe;
import net.minecraft.src.forge.*;
import net.minecraft.src.universalelectricity.*;
import net.minecraft.src.universalelectricity.components.UniversalComponents;
import java.util.ArrayList;
import java.util.Map;
import java.io.*;
public class mod_BasicPipes extends NetworkMod {
static Configuration config = new Configuration((new File(Minecraft.getMinecraftDir(), "config/EUIndustry/BasicPipes.cfg")));
public static int pipeID = configurationProperties();
private static int partID;
private static int ppipeID;
public static Block pipe = new net.minecraft.src.eui.pipes.BlockPipe(pipeID).setBlockName("pipe");
public static Item parts = new net.minecraft.src.eui.pipes.ItemParts(partID);
public static Item itemPipes = new net.minecraft.src.eui.pipes.ItemPipe(ppipeID);
public static Item gauge = new net.minecraft.src.eui.pipes.ItemGuage(ppipeID+1);
@Override
public String getVersion() {
// TODO change version on each update ;/
return "0.0.1";
}
public static int configurationProperties()
{
config.load();
pipeID = Integer.parseInt(config.getOrCreateIntProperty("PipeBlock", Configuration.CATEGORY_BLOCK, 155).value);
partID = Integer.parseInt(config.getOrCreateIntProperty("parts", Configuration.CATEGORY_ITEM, 23022).value);
ppipeID = Integer.parseInt(config.getOrCreateIntProperty("pipes", Configuration.CATEGORY_ITEM, 23023).value);
config.save();
return pipeID;
}
@Override
public void load() {
//register
UniversalElectricity.registerAddon(this, "0.3.1");
MinecraftForgeClient.preloadTexture("/eui/Items.png");
ModLoader.registerBlock(pipe);
ModLoader.registerTileEntity(net.minecraft.src.eui.pipes.TileEntityPipe.class, "pipe", new RenderPipe());
//Names
ModLoader.addName((new ItemStack(gauge, 1, 0)), "guage");
ModLoader.addName((new ItemStack(itemPipes, 1, 0)), "SteamPipe");
ModLoader.addName((new ItemStack(itemPipes, 1, 1)), "WaterPipe");
ModLoader.addName((new ItemStack(itemPipes, 1, 2)), "LavaPipe");
ModLoader.addName((new ItemStack(itemPipes, 1, 3)), "OilPipe");
ModLoader.addName((new ItemStack(itemPipes, 1, 4)), "FuelPipe");
ModLoader.addName((new ItemStack(itemPipes, 1, 5)), "AirPipe");
ModLoader.addName((new ItemStack(parts, 1, 0)), "BronzeTube");
ModLoader.addName((new ItemStack(parts, 1, 1)), "IronTube");
ModLoader.addName((new ItemStack(parts, 1, 2)), "LeatherSeal");
ModLoader.addName((new ItemStack(parts, 1, 3)), "ObsidianTube");
ModLoader.addName((new ItemStack(parts, 1, 4)), "SlimeSeal");
//Blocks
ModLoader.addRecipe(new ItemStack(parts, 2,0), new Object[] { "@@@", '@',
UniversalComponents.ItemBronzeIngot});
ModLoader.addRecipe(new ItemStack(parts, 2,1), new Object[] { "@@@", '@',
Block.obsidian});
ModLoader.addRecipe(new ItemStack(parts, 2,2), new Object[] { "@@","@@", '@',
Item.leather});
ModLoader.addRecipe(new ItemStack(parts, 2,3), new Object[] { "@@@", '@',
Item.ingotIron});
ModLoader.addShapelessRecipe(new ItemStack(parts, 1,4), new Object[] { new ItemStack(parts, 1,2),new ItemStack(Item.slimeBall, 1)});
//crafting parts
/**
* case 0: return "steam";
case 1: return "water";
case 2: return "lava";
case 3: return "oil";
case 4: return "fuel";
case 5: return "air";
*/
ModLoader.addShapelessRecipe(new ItemStack(itemPipes, 1,0), new Object[] { new ItemStack(parts, 1,0),new ItemStack(parts, 1,2)});
ModLoader.addShapelessRecipe(new ItemStack(itemPipes, 1,1), new Object[] { new ItemStack(parts, 1,0),new ItemStack(parts, 1,2),new ItemStack(Item.dyePowder, 1,4)});
ModLoader.addShapelessRecipe(new ItemStack(itemPipes, 1,2), new Object[] { new ItemStack(parts, 1,1)});
ModLoader.addShapelessRecipe(new ItemStack(itemPipes, 1,3), new Object[] { new ItemStack(parts, 1,3),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,0)});
ModLoader.addShapelessRecipe(new ItemStack(itemPipes, 1,4), new Object[] { new ItemStack(parts, 1,3),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,11)});
}
}

24
minecraft/net/minecraft/src/mod_EUIndustry.java
View file

@ -1,9 +1,9 @@
package net.minecraft.src;
import net.minecraft.client.Minecraft;
import net.minecraft.src.basiccomponents.BasicComponents;
import net.minecraft.src.eui.*;
import net.minecraft.src.forge.*;
import net.minecraft.src.universalelectricity.*;
import net.minecraft.src.universalelectricity.components.UniversalComponents;
import java.util.ArrayList;
import java.util.Map;
@ -47,7 +47,7 @@ public class mod_EUIndustry extends NetworkMod {
@Override
public void load() {
//register
UniversalElectricity.registerAddon(this, "0.3.1");
UniversalElectricity.registerAddon(this, "0.4.3");
MinecraftForgeClient.preloadTexture("/eui/Blocks.png");
MinecraftForgeClient.preloadTexture("/eui/Items.png");
//Blocks
@ -60,12 +60,12 @@ public class mod_EUIndustry extends NetworkMod {
ModLoader.addName((new ItemStack(machine, 1, 3)), "SteamGen");
ModLoader.addName((new ItemStack(machine, 1, 14)), "WaterCondenser");
ModLoader.addName((new ItemStack(machine, 1, 15)), "EUVampire");
ModLoader.registerTileEntity(net.minecraft.src.eui.grinder.TileEntityGrinder.class, "grinder",new UEBlockRenderer());
ModLoader.registerTileEntity(net.minecraft.src.eui.boiler.TileEntityBoiler.class, "boiler",new UEBlockRenderer());
ModLoader.registerTileEntity(net.minecraft.src.eui.burner.TileEntityFireBox.class, "fireBox",new UEBlockRenderer());
ModLoader.registerTileEntity(net.minecraft.src.eui.turbine.TileEntityGenerator.class, "generator",new UEBlockRenderer());
ModLoader.registerTileEntity(net.minecraft.src.eui.TileEntityCondenser.class, "waterPump",new UEBlockRenderer());
ModLoader.registerTileEntity(net.minecraft.src.eui.TileEntityNuller.class, "EUNuller",new UEBlockRenderer());
ModLoader.registerTileEntity(net.minecraft.src.eui.grinder.TileEntityGrinder.class, "grinder");
ModLoader.registerTileEntity(net.minecraft.src.eui.boiler.TileEntityBoiler.class, "boiler");
ModLoader.registerTileEntity(net.minecraft.src.eui.burner.TileEntityFireBox.class, "fireBox");
ModLoader.registerTileEntity(net.minecraft.src.eui.turbine.TileEntityGenerator.class, "generator");
ModLoader.registerTileEntity(net.minecraft.src.eui.TileEntityCondenser.class, "waterPump");
ModLoader.registerTileEntity(net.minecraft.src.eui.TileEntityNuller.class, "EUNuller");
//Items
ModLoader.addName((new ItemStack(coalNugget, 1, 0)), "CoalNuggets");
ModLoader.addName((new ItemStack(coalNugget, 1, 1)), "CoalPellets");
@ -74,10 +74,10 @@ public class mod_EUIndustry extends NetworkMod {
//Crafting
ModLoader.addRecipe(new ItemStack(machine, 1, 0), new Object [] {"@S@", "SCW", "@S@",
'S',UniversalComponents.ItemSteelIngot,
'@',new ItemStack(UniversalComponents.ItemSteelPlate),
'C',new ItemStack(UniversalComponents.ItemCircuit,1,1),
'W',UniversalComponents.ItemCopperWire});
'S',BasicComponents.ItemSteelIngot,
'@',new ItemStack(BasicComponents.ItemSteelPlate),
'C',new ItemStack(BasicComponents.ItemCircuit,1,1),
'W',BasicComponents.ItemCopperWire});
/**ModLoader.addRecipe(new ItemStack(machine, 1, 1), new Object [] {"@T@", "OVO", "@T@",
'T',new ItemStack(parts, 1,1),
'@',new ItemStack(UniversalComponents.ItemSteelPlate),

23
minecraft/net/minecraft/src/mod_UtilityBlocks.java
View file

@ -1,23 +0,0 @@
package net.minecraft.src;
import net.minecraft.src.forge.*;
import net.minecraft.src.universalelectricity.UEBlockRenderer;
import net.minecraft.src.universalelectricity.UniversalElectricity;
import net.minecraft.src.universalelectricity.components.UniversalComponents;
public class mod_UtilityBlocks extends NetworkMod {
public static Block totum = new net.minecraft.src.Utility.BlockTotum(210).setBlockName("totum");
@Override
public String getVersion() {
// TODO change each update
return "V0.0.1";
}
@Override
public void load() {
UniversalElectricity.registerAddon(this, "0.3.1");
ModLoader.registerBlock(totum,net.minecraft.src.eui.ItemMachine.class);
ModLoader.registerTileEntity(net.minecraft.src.Utility.TileEntityHealer.class, "healer", new UEBlockRenderer());
ModLoader.addShapelessRecipe(new ItemStack(totum, 1,0), new Object[] { new ItemStack(Block.dirt,1)});
}
}