fixes #43 and fixes #48

This commit is contained in:
modmuss50 2015-06-25 07:55:29 +01:00
parent 7ba9cad072
commit f9a99feee0
3 changed files with 7 additions and 7 deletions

View file

@ -90,4 +90,9 @@ public abstract class ModPart extends TileEntity implements IModPart {
public void setWorldObj(World p_145834_1_) { public void setWorldObj(World p_145834_1_) {
super.setWorldObj(p_145834_1_); super.setWorldObj(p_145834_1_);
} }
@Override
public String getItemTextureName() {
return "";
}
} }

View file

@ -1,6 +1,5 @@
package techreborn.partSystem.parts; package techreborn.partSystem.parts;
import ic2.api.energy.event.EnergyTileLoadEvent;
import ic2.api.energy.event.EnergyTileUnloadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent;
import ic2.api.energy.tile.IEnergyConductor; import ic2.api.energy.tile.IEnergyConductor;
import ic2.api.energy.tile.IEnergyTile; import ic2.api.energy.tile.IEnergyTile;

View file

@ -180,7 +180,7 @@ public class TileMatterFabricator extends TileMachineBase implements IWrenchable
energy.updateEntity(); energy.updateEntity();
if (!super.worldObj.isRemote) { if (!super.worldObj.isRemote) {
for (int i = 0; i < 5; i++) { for (int i = 0; i < 6; i++) {
ItemStack stack = inventory.getStackInSlot(i); ItemStack stack = inventory.getStackInSlot(i);
if (this.amplifier < 100000 && stack != null) { if (this.amplifier < 100000 && stack != null) {
int amp = (int) ((long) (getValue(stack) / 32)); int amp = (int) ((long) (getValue(stack) / 32));
@ -192,8 +192,6 @@ public class TileMatterFabricator extends TileMachineBase implements IWrenchable
} }
} }
if (this.amplifier > 0) { if (this.amplifier > 0) {
if (this.amplifier > this.energy.getEnergyStored()) { if (this.amplifier > this.energy.getEnergyStored()) {
this.progresstime += this.energy.getEnergyStored(); this.progresstime += this.energy.getEnergyStored();
@ -211,8 +209,6 @@ public class TileMatterFabricator extends TileMachineBase implements IWrenchable
} }
if (this.progresstime > this.maxProgresstime() && this.spaceForOutput()) { if (this.progresstime > this.maxProgresstime() && this.spaceForOutput()) {
this.progresstime -= this.maxProgresstime(); this.progresstime -= this.maxProgresstime();
this.addOutputProducts(); this.addOutputProducts();