mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 20:52:42 +00:00
Farming station can utilize shears
* Farming stations will use shears if available and there are enough sapling in store * Otherwise they will break the leaves with the axe * Third tool slot was added for the shears * Old inventories will be adapted automagically * GUI texture is still missing Added GUI texture * GUI texture with third slot for shears * Fixed slot positioning Fixed transparency
This commit is contained in:
1 parent
bb822b9988
commit
a79ae8b0d3
4 files changed
+94
-45
No files matched your search
@@ -17,8 +17,10 @@ public class FarmStationContainer extends AbstractMachineContainer {
|
||||
protected void addMachineSlots(InventoryPlayer playerInv) {
|
||||
|
||||
Point[] points = new Point[] {
|
||||
new Point(53, 12),
|
||||
new Point(71, 12),
|
||||
new Point(44, 12),
|
||||
new Point(62, 12),
|
||||
new Point(80, 12),
|
||||
|
||||
new Point(53, 37),
|
||||
new Point(71, 37),
|
||||
new Point(53, 55),
|
||||
@@ -42,7 +44,7 @@ public class FarmStationContainer extends AbstractMachineContainer {
|
||||
|
||||
@Override
|
||||
public int getSlotStackLimit() {
|
||||
if(slot > 1 && slot < 6) {
|
||||
if(slot > 2 && slot < 7) {
|
||||
int tier = ((TileFarmStation)tileEntity).tier;
|
||||
return (int) (16 * Math.pow(2, tier));
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemShears;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
@@ -35,7 +36,7 @@ import crazypants.util.Lang;
|
||||
public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
|
||||
public enum ToolType {
|
||||
HOE {
|
||||
HOE {
|
||||
@Override
|
||||
boolean match(ItemStack item) {
|
||||
for (ItemStack stack : Config.farmHoes) {
|
||||
@@ -46,10 +47,14 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
AXE { boolean match(ItemStack item) { return item.getItem().getHarvestLevel(item, "axe") >= 0; }},
|
||||
TREETAP { boolean match(ItemStack item) { return item.getItem().getClass() == RubberTreeFarmerIC2.treeTap;}};
|
||||
|
||||
|
||||
AXE { @Override
|
||||
boolean match(ItemStack item) { return item.getItem().getHarvestLevel(item, "axe") >= 0; }},
|
||||
TREETAP { @Override
|
||||
boolean match(ItemStack item) { return item.getItem().getClass() == RubberTreeFarmerIC2.treeTap; }},
|
||||
SHEARS { @Override
|
||||
boolean match(ItemStack item) { return item.getItem() instanceof ItemShears; }};
|
||||
|
||||
public final boolean itemMatches(ItemStack item) {
|
||||
if (item == null) {
|
||||
return false;
|
||||
@@ -73,20 +78,20 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static final String NOTIFICATION_NO_HOE = "noHoe";
|
||||
public static final String NOTIFICATION_NO_AXE = "noAxe";
|
||||
public static final String NOTIFICATION_NO_SEEDS = "noSeeds";
|
||||
|
||||
|
||||
private BlockCoord lastScanned;
|
||||
private EntityPlayerMP farmerJoe;
|
||||
|
||||
private static final int minToolSlot = 0;
|
||||
private static final int maxToolSlot = 1;
|
||||
private static final int maxToolSlot = 2;
|
||||
|
||||
public static final int minSupSlot = maxToolSlot + 1;
|
||||
public static final int maxSupSlot = minSupSlot + 4;
|
||||
|
||||
|
||||
private final BitSet lockedSlots = new BitSet();
|
||||
|
||||
private final int upgradeBonusSize = 2;
|
||||
@@ -99,8 +104,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
public boolean sendNotification = false;
|
||||
|
||||
public TileFarmStation() {
|
||||
super(new SlotDefinition(6, 4, 1));
|
||||
setCapacitor(Capacitors.BASIC_CAPACITOR);
|
||||
super(new SlotDefinition(7, 4, 1));
|
||||
setCapacitor(Capacitors.BASIC_CAPACITOR);
|
||||
}
|
||||
|
||||
public int getFarmSize() {
|
||||
@@ -166,6 +171,10 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
return hasTool(ToolType.AXE);
|
||||
}
|
||||
|
||||
public boolean hasShears() {
|
||||
return hasTool(ToolType.SHEARS);
|
||||
}
|
||||
|
||||
public int getAxeLootingValue() {
|
||||
ItemStack tool = getTool(ToolType.AXE);
|
||||
if(tool == null) {
|
||||
@@ -182,6 +191,10 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
damageTool(ToolType.HOE, null, bc, i);
|
||||
}
|
||||
|
||||
public void damageShears(Block blk, BlockCoord bc) {
|
||||
damageTool(ToolType.SHEARS, blk, bc, 1);
|
||||
}
|
||||
|
||||
public boolean hasTool(ToolType type){
|
||||
return getTool(type) != null;
|
||||
}
|
||||
@@ -207,14 +220,14 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
return;
|
||||
}
|
||||
boolean canDamage = canDamage(tool);
|
||||
if(type == ToolType.AXE) {
|
||||
tool.getItem().onBlockDestroyed(tool, worldObj, blk, bc.x, bc.y, bc.z, farmerJoe);
|
||||
if(type == ToolType.AXE) {
|
||||
tool.getItem().onBlockDestroyed(tool, worldObj, blk, bc.x, bc.y, bc.z, farmerJoe);
|
||||
} else if(type == ToolType.HOE) {
|
||||
int origDamage = tool.getItemDamage();
|
||||
tool.getItem().onItemUse(tool, farmerJoe, worldObj, bc.x, bc.y, bc.z, 1, 0.5f, 0.5f, 0.5f);
|
||||
if(origDamage == tool.getItemDamage() && canDamage) {
|
||||
tool.damageItem(1, farmerJoe);
|
||||
}
|
||||
}
|
||||
} else if(canDamage) {
|
||||
tool.damageItem(1, farmerJoe);
|
||||
}
|
||||
@@ -223,9 +236,9 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
destroyTool(type);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private boolean canDamage(ItemStack stack) {
|
||||
return stack != null && stack.isItemStackDamageable() && stack.getItem().isDamageable();
|
||||
return stack != null && stack.isItemStackDamageable() && stack.getItem().isDamageable();
|
||||
}
|
||||
|
||||
private void destroyTool(ToolType type) {
|
||||
@@ -265,7 +278,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
return block.isAir(worldObj, bc.x, bc.y, bc.z) || block.isReplaceable(worldObj, bc.x, bc.y, bc.z);
|
||||
}
|
||||
|
||||
public void setNotification(String unloc) {
|
||||
public void setNotification(String unloc) {
|
||||
String newNote = Lang.localize("farm.note." + unloc);
|
||||
if(!newNote.equals(notification)) {
|
||||
notification = newNote;
|
||||
@@ -283,7 +296,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
public boolean hasNotification() {
|
||||
return !"".equals(notification);
|
||||
}
|
||||
|
||||
|
||||
private void sendNotification() {
|
||||
PacketHandler.INSTANCE.sendToAll(new PacketUpdateNotification(this, notification));
|
||||
}
|
||||
@@ -294,7 +307,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
return false;
|
||||
}
|
||||
if(i <= maxToolSlot) {
|
||||
if (ToolType.isTool(stack)) {
|
||||
if (ToolType.isTool(stack)) {
|
||||
int otherSlot = i == minToolSlot ? maxToolSlot : minToolSlot;
|
||||
if (inventory[otherSlot] == null) {
|
||||
return true;
|
||||
@@ -319,23 +332,23 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
protected boolean canTick(boolean redstoneChecksPassed) {
|
||||
if(worldObj.getTotalWorldTime() % 2 != 0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if(getEnergyStored() < getPowerUsePerTick()) {
|
||||
setNotification("noPower");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if(redstoneChecksPassed) {
|
||||
usePower();
|
||||
}
|
||||
}
|
||||
int curScaled = getProgressScaled(16);
|
||||
if(curScaled != lastProgressScaled) {
|
||||
sendTaskProgressPacket();
|
||||
lastProgressScaled = curScaled;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -344,8 +357,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
if (sendNotification && worldObj.getTotalWorldTime() % 20 == 0) {
|
||||
sendNotification = false;
|
||||
sendNotification();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(!hasPower() && Config.farmActionEnergyUseRF > 0 && Config.farmAxeActionEnergyUseRF > 0) {
|
||||
setNotification("noPower");
|
||||
return;
|
||||
@@ -371,7 +384,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
if(farmerJoe == null) {
|
||||
farmerJoe = new FakeFarmPlayer(MinecraftServer.getServer().worldServerForDimension(worldObj.provider.dimensionId));
|
||||
}
|
||||
|
||||
|
||||
if(isOpen(bc)) {
|
||||
FarmersCommune.instance.prepareBlock(this, bc, block, meta);
|
||||
block = worldObj.getBlock(bc.x, bc.y, bc.z);
|
||||
@@ -381,7 +394,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
setNotification("outputFull");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if(!hasPower() && Config.farmActionEnergyUseRF > 0 && Config.farmAxeActionEnergyUseRF > 0) {
|
||||
setNotification("noPower");
|
||||
return;
|
||||
@@ -422,6 +435,12 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
return inv != null && (inv.stackSize > 1 || !isSlotLocked(slot)) && inv.isItemEqual(seeds);
|
||||
}
|
||||
|
||||
public boolean needSeeds(BlockCoord bc) {
|
||||
int slot = getSupplySlotForCoord(bc);
|
||||
ItemStack inv = inventory[slot];
|
||||
return (inv == null || (inv.stackSize < 8));
|
||||
}
|
||||
|
||||
public ItemStack takeSeedFromSupplies(ItemStack stack, BlockCoord forBlock) {
|
||||
return takeSeedFromSupplies(stack, forBlock, true);
|
||||
}
|
||||
@@ -437,10 +456,10 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
if (inv.stackSize <= 1 && isSlotLocked(slot)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
ItemStack result = inv.copy();
|
||||
result.stackSize = 1;
|
||||
|
||||
|
||||
inv = inv.copy();
|
||||
inv.stackSize--;
|
||||
if(inv.stackSize == 0) {
|
||||
@@ -546,7 +565,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
}
|
||||
return new BlockCoord(nextX, lastScanned.y, nextZ);
|
||||
}
|
||||
|
||||
|
||||
public void toggleLockedState(int slot) {
|
||||
if (worldObj.isRemote) {
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketFarmLockedSlot(this, slot));
|
||||
@@ -583,7 +602,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
super.setCapacitor(capacitorType);
|
||||
tier = capacitorType.ordinal();
|
||||
currentTask = createTask();
|
||||
|
||||
|
||||
int ppt = getPowerUsePerTick();
|
||||
switch (capacitorType.ordinal()) {
|
||||
case 1:
|
||||
@@ -598,7 +617,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
}
|
||||
if(getEnergyStored() > getMaxEnergyStored()) {
|
||||
setEnergyStored(getMaxEnergyStored());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -624,6 +643,13 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
for (int i : nbtRoot.getIntArray("lockedSlots")) {
|
||||
lockedSlots.set(i);
|
||||
}
|
||||
int slotLayoutVersion = nbtRoot.getInteger("slotLayoutVersion");
|
||||
if (slotLayoutVersion < 1) {
|
||||
for (int i = 9; i >= 2; i--) {
|
||||
inventory[i+1] = inventory[i];
|
||||
}
|
||||
inventory[2] = null;
|
||||
}
|
||||
}
|
||||
|
||||
IPoweredTask createTask() {
|
||||
@@ -646,6 +672,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
}
|
||||
nbtRoot.setIntArray("lockedSlots", locked);
|
||||
}
|
||||
nbtRoot.setInteger("slotLayoutVersion", 1);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -12,6 +12,7 @@ import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.IPlantable;
|
||||
import net.minecraftforge.common.IShearable;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import crazypants.enderio.config.Config;
|
||||
import crazypants.enderio.machine.farm.TileFarmStation;
|
||||
@@ -111,31 +112,50 @@ public class TreeFarmer implements IFarmerJoe {
|
||||
Collections.sort(res.harvestedBlocks, comp);
|
||||
|
||||
List<BlockCoord> actualHarvests = new ArrayList<BlockCoord>();
|
||||
|
||||
boolean needSeeds = farm.needSeeds(bc); // avoid calling these in a loop
|
||||
boolean hasSheards = farm.hasShears();
|
||||
|
||||
for (int i = 0; i < res.harvestedBlocks.size() && farm.hasAxe(); i++) {
|
||||
BlockCoord coord = res.harvestedBlocks.get(i);
|
||||
Block blk = farm.getBlock(coord);
|
||||
|
||||
ArrayList<ItemStack> drops = blk.getDrops(farm.getWorldObj(), bc.x, bc.y, bc.z, farm.getBlockMeta(coord), farm.getAxeLootingValue());
|
||||
ArrayList<ItemStack> drops;
|
||||
boolean wasSheared = false;
|
||||
boolean wasAxed = false;
|
||||
boolean wasWood = isWood(blk);
|
||||
|
||||
if (blk instanceof IShearable && hasSheards && !needSeeds) {
|
||||
drops = ((IShearable)blk).onSheared(null, farm.getWorldObj(), bc.x, bc.y, bc.z, 0);
|
||||
wasSheared = true;
|
||||
} else {
|
||||
drops = blk.getDrops(farm.getWorldObj(), bc.x, bc.y, bc.z, farm.getBlockMeta(coord), farm.getAxeLootingValue());
|
||||
wasAxed = true;
|
||||
}
|
||||
|
||||
if(drops != null) {
|
||||
for (ItemStack drop : drops) {
|
||||
res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy()));
|
||||
}
|
||||
}
|
||||
boolean isWood = true;
|
||||
if(!isWood(blk)) { //leaves
|
||||
isWood = Config.farmAxeDamageOnLeafBreak;
|
||||
|
||||
if (wasAxed && !wasWood) {
|
||||
wasAxed = Config.farmAxeDamageOnLeafBreak;
|
||||
int leaveMeta = farm.getBlockMeta(coord);
|
||||
if(TreeHarvestUtil.canDropApples(blk, leaveMeta)) {
|
||||
if(farm.getWorldObj().rand.nextInt(200) == 0) {
|
||||
res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, new ItemStack(Items.apple)));
|
||||
}
|
||||
}
|
||||
}
|
||||
farm.actionPerformed(isWood);
|
||||
if(isWood) {
|
||||
farm.damageAxe(blk, coord);
|
||||
}
|
||||
}
|
||||
|
||||
farm.actionPerformed(wasWood || wasSheared);
|
||||
if(wasAxed) {
|
||||
farm.damageAxe(blk, coord);
|
||||
} else if (wasSheared) {
|
||||
farm.damageShears(blk, coord);
|
||||
}
|
||||
|
||||
farm.getWorldObj().setBlockToAir(coord.x, coord.y, coord.z);
|
||||
actualHarvests.add(coord);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user