diff --git a/resources/assets/enderio/models/ZombieJar.png b/resources/assets/enderio/models/ZombieJar.png index c4dc70ae..c5cf77d8 100644 Binary files a/resources/assets/enderio/models/ZombieJar.png and b/resources/assets/enderio/models/ZombieJar.png differ diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 87c9736d..b5f0220e 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -50,6 +50,10 @@ public class MachineRecipes { ItemStack comGen = new ItemStack(EnderIO.blockCombustionGenerator, 1, 0); GameRegistry.addShapedRecipe(comGen, "eee", "rmr", "gcg", 'e', electricSteel, 'r', EnderIO.blockReservoir, 'm', machineChassi, 'g', basicGear,'c', capacitor); + //ZombieGen + ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0); + GameRegistry.addShapedRecipe(zg, "eee", "qzq", "qcq", 'e', electricSteel, 'q', fusedQuartz, 'z', new ItemStack(Items.skull, 1, 2),'c', capacitor); + //Crafter ItemStack crafter = new ItemStack(EnderIO.blockCrafter, 1, 0); GameRegistry.addShapedRecipe(crafter, "iti", "imi", "ici", 'i', Items.iron_ingot, 't', Blocks.crafting_table, 'm', machineChassi, 'c', capacitor); diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java index eafe578c..58d15804 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -6,6 +6,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -33,7 +34,7 @@ public class BlockZombieGenerator extends AbstractMachineBlock fuelTank.getCapacity() * 0.9f; + return true; } - + private boolean transmitEnergy() { if(storedEnergy <= 0) { return false; @@ -215,8 +216,8 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower if(resource == null || resource.getFluid() == null || !canFill(from, resource.getFluid())) { return 0; } - tanksDirty = true; - return fuelTank.fill(resource, doFill); + tanksDirty = true; + return fuelTank.fill(resource, doFill); } @Override @@ -243,17 +244,17 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower public FluidTankInfo[] getTankInfo(ForgeDirection from) { return new FluidTankInfo[] { fuelTank.getInfo() }; } - + @Override public void readCustomNBT(NBTTagCompound nbtRoot) { super.readCustomNBT(nbtRoot); - active = nbtRoot.getBoolean("active"); + active = nbtRoot.getBoolean("active"); } @Override public void readCommon(NBTTagCompound nbtRoot) { super.readCommon(nbtRoot); - + if(nbtRoot.hasKey("fuelTank")) { NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("fuelTank"); if(tankRoot != null) { @@ -269,18 +270,18 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower @Override public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); + super.writeCommon(nbtRoot); if(fuelTank.getFluidAmount() > 0) { NBTTagCompound tankRoot = new NBTTagCompound(); fuelTank.writeToNBT(tankRoot); nbtRoot.setTag("fuelTank", tankRoot); - } + } } @Override public void writeCustomNBT(NBTTagCompound nbtRoot) { super.writeCustomNBT(nbtRoot); - nbtRoot.setBoolean("active", active); + nbtRoot.setBoolean("active", active); } }