mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 12:19:55 +00:00
Crafter can now be configured to buffer either single items or item stacks
This commit is contained in:
1 parent
99e1fac73b
commit
98bb502ac8
7 files changed
+116
-4
No files matched your search
@@ -27,6 +27,7 @@ Changes
|
||||
- Halved the skull drop chance when mobs killed by a 'fake player', such as killer joe (can be changed in the config)
|
||||
- Added Soul Bound enchantment ID to the config
|
||||
- Dark Steel Pick will now apply the obsidian efficiency boost on all hard blocks (can be changed in the config)
|
||||
- Crafter can now be configured to buffer either single items or item stacks
|
||||
|
||||
Bugs
|
||||
- #1268 Capacitor bank not honoring input redstone settings
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 46 KiB |
@@ -115,6 +115,9 @@ public final class IconEIO {
|
||||
|
||||
public static final IconEIO FILTER = new IconEIO(203, 31);
|
||||
|
||||
public static final IconEIO ITEM_SINGLE = new IconEIO(220, 32);
|
||||
public static final IconEIO ITEM_STACK = new IconEIO(220, 48);
|
||||
|
||||
private static final int TEX_SIZE = 256;
|
||||
private static final double PIX_SIZE = 1d / TEX_SIZE;
|
||||
|
||||
|
||||
@@ -3,13 +3,18 @@ package crazypants.enderio.machine.crafter;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import crazypants.enderio.GuiHandler;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.AbstractMachineBlock;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
|
||||
public class BlockCrafter extends AbstractMachineBlock<TileCrafter> {
|
||||
|
||||
public static BlockCrafter create() {
|
||||
|
||||
PacketHandler.INSTANCE.registerMessage(PacketBufferSize.class, PacketBufferSize.class, PacketHandler.nextID(), Side.SERVER);
|
||||
|
||||
BlockCrafter res = new BlockCrafter();
|
||||
res.init();
|
||||
return res;
|
||||
|
||||
@@ -2,23 +2,51 @@ package crazypants.enderio.machine.crafter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import crazypants.enderio.config.Config;
|
||||
import crazypants.enderio.gui.IconEIO;
|
||||
import crazypants.enderio.gui.ToggleButtonEIO;
|
||||
import crazypants.enderio.machine.GuiMachineBase;
|
||||
import crazypants.enderio.machine.power.PowerDisplayUtil;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.render.RenderUtil;
|
||||
|
||||
public class GuiCrafter extends GuiMachineBase {
|
||||
|
||||
private TileCrafter entity;
|
||||
|
||||
private ToggleButtonEIO bufferSizeB;
|
||||
|
||||
public GuiCrafter(InventoryPlayer par1InventoryPlayer, TileCrafter te) {
|
||||
super(te, new ContainerCrafter(par1InventoryPlayer, te));
|
||||
this.entity = te;
|
||||
entity = te;
|
||||
xSize = getXSize();
|
||||
|
||||
int x = getXSize() - 5 - 16;
|
||||
int y = 43;
|
||||
bufferSizeB = new ToggleButtonEIO(this, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK);
|
||||
bufferSizeB.setSelectedToolTip("Buffering item stacks");
|
||||
bufferSizeB.setUnselectedToolTip("Buffering single items");
|
||||
bufferSizeB.setSelected(te.isBufferStacks());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initGui() {
|
||||
super.initGui();
|
||||
bufferSizeB.onGuiInit();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void actionPerformed(GuiButton b) {
|
||||
super.actionPerformed(b);
|
||||
if(b == bufferSizeB) {
|
||||
entity.setBufferStacks(bufferSizeB.isSelected());
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketBufferSize(entity));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -31,6 +59,7 @@ public class GuiCrafter extends GuiMachineBase {
|
||||
return 219;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getPowerU() {
|
||||
return 220;
|
||||
}
|
||||
@@ -40,6 +69,7 @@ public class GuiCrafter extends GuiMachineBase {
|
||||
return 9;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void updatePowerBarTooltip(List<String> text) {
|
||||
text.add(PowerDisplayUtil.formatPower(Config.crafterRfPerCraft) + " " + PowerDisplayUtil.abrevation()
|
||||
+ " Per Craft");
|
||||
@@ -53,7 +83,7 @@ public class GuiCrafter extends GuiMachineBase {
|
||||
int sx = (width - xSize) / 2;
|
||||
int sy = (height - ySize) / 2;
|
||||
|
||||
drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize);
|
||||
drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize);
|
||||
|
||||
super.drawGuiContainerBackgroundLayer(par1, par2, par3);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
package crazypants.enderio.machine.crafter;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import crazypants.enderio.network.MessageTileEntity;
|
||||
|
||||
public class PacketBufferSize extends MessageTileEntity<TileCrafter> implements IMessageHandler<PacketBufferSize, IMessage> {
|
||||
|
||||
boolean bufferStacks;
|
||||
|
||||
public PacketBufferSize() {
|
||||
}
|
||||
|
||||
public PacketBufferSize(TileCrafter tile) {
|
||||
super(tile);
|
||||
bufferStacks = tile.isBufferStacks();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
super.toBytes(buf);
|
||||
buf.writeBoolean(bufferStacks);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
super.fromBytes(buf);
|
||||
bufferStacks = buf.readBoolean();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMessage onMessage(PacketBufferSize message, MessageContext ctx) {
|
||||
TileCrafter te = message.getTileEntity(ctx.getServerHandler().playerEntity.worldObj);
|
||||
if(te != null) {
|
||||
te.setBufferStacks(message.bufferStacks);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -26,6 +26,10 @@ public class TileCrafter extends AbstractMachineEntity {
|
||||
|
||||
private ICapacitor capacitor;
|
||||
|
||||
private boolean bufferStacks = true;
|
||||
|
||||
private long ticksSinceLastCraft = 0;
|
||||
|
||||
public TileCrafter() {
|
||||
super(new SlotDefinition(9, 1));
|
||||
containerItems = new ArrayList<ItemStack>();
|
||||
@@ -71,13 +75,15 @@ public class TileCrafter extends AbstractMachineEntity {
|
||||
|
||||
@Override
|
||||
protected boolean processTasks(boolean redstoneCheckPassed) {
|
||||
ticksSinceLastCraft++;
|
||||
if(!redstoneCheckPassed || !craftingGrid.hasValidRecipe() || !canMergeOutput() || !hasRequiredPower()) {
|
||||
return false;
|
||||
}
|
||||
int ticksPerCraft = getTicksPerCraft(capacitorType);
|
||||
if(worldObj.getTotalWorldTime() % ticksPerCraft != 0) {
|
||||
if(ticksSinceLastCraft <= ticksPerCraft) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
ticksSinceLastCraft = 0;
|
||||
|
||||
// process buffered container items
|
||||
if(!containerItems.isEmpty()) {
|
||||
@@ -109,6 +115,7 @@ public class TileCrafter extends AbstractMachineEntity {
|
||||
return getEnergyStored() >= Config.crafterRfPerCraft;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPowerUsePerTick() {
|
||||
return getPowerUsePerTick(capacitorType);
|
||||
}
|
||||
@@ -201,11 +208,30 @@ public class TileCrafter extends AbstractMachineEntity {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getInventoryStackLimit() {
|
||||
return bufferStacks ? 64 : 1;
|
||||
}
|
||||
|
||||
public boolean isBufferStacks() {
|
||||
return bufferStacks;
|
||||
}
|
||||
|
||||
public void setBufferStacks(boolean bufferStacks) {
|
||||
this.bufferStacks = bufferStacks;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readCommon(NBTTagCompound nbtRoot) {
|
||||
super.readCommon(nbtRoot);
|
||||
NBTTagCompound craftRoot = nbtRoot.getCompoundTag("craftingGrid");
|
||||
craftingGrid.readFromNBT(craftRoot);
|
||||
|
||||
if(nbtRoot.hasKey("bufferStacks")) {
|
||||
bufferStacks = nbtRoot.getBoolean("bufferStacks");
|
||||
} else {
|
||||
bufferStacks = true;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -214,6 +240,8 @@ public class TileCrafter extends AbstractMachineEntity {
|
||||
NBTTagCompound craftingRoot = new NBTTagCompound();
|
||||
craftingGrid.writeToNBT(craftingRoot);
|
||||
nbtRoot.setTag("craftingGrid", craftingRoot);
|
||||
|
||||
nbtRoot.setBoolean("bufferStacks", bufferStacks);
|
||||
}
|
||||
|
||||
public void updateCraftingOutput() {
|
||||
|
||||
Reference in new issue
Block a user