Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #2828, fix #2822

Browse source
This commit is contained in:
Adrian 2015-06-21 18:07:24 +02:00
parent a2abe40d91
commit 94c2a24b12
5 changed files with 61 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
buildcraft_resources/changelog/7.0.12
View file

@ -6,5 +6,8 @@ Additions:
Bugs fixed:
* [#2828] Filler crash without Transport (asie)
* [#2822] Stamper eats items that should not used up (asie)
* [#2820] CME in map generation (asie)
* Zone planner maps not generating (asie)

2
common/buildcraft/BuildCraftCore.java
View file

@ -542,6 +542,8 @@ public class BuildCraftCore extends BuildCraftMod {
if (event.map.getTextureType() == 1) {
iconProvider = new CoreIconProvider();
iconProvider.registerIcons(event.map);
StatementManager.registerIcons(event.map);
} else if (event.map.getTextureType() == 0) {
BuildCraftCore.redLaserTexture = event.map.registerIcon("buildcraftcore:laserBox/blockRedLaser");
BuildCraftCore.blueLaserTexture = event.map.registerIcon("buildcraftcore:laserBox/blockBlueLaser");

5
common/buildcraft/core/lib/gui/ContainerDummy.java
View file

@ -2,10 +2,15 @@ package buildcraft.core.lib.gui;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
public class ContainerDummy extends Container {
@Override
public boolean canInteractWith(EntityPlayer player) {
return false;
}
@Override
public void onCraftMatrixChanged(IInventory p_75130_1_) {
}
}

86
common/buildcraft/silicon/TileStampingTable.java
View file

@ -3,6 +3,7 @@ package buildcraft.silicon;
import java.lang.ref.WeakReference;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.inventory.SlotCrafting;
@ -46,19 +47,64 @@ public class TileStampingTable extends TileLaserTableBase implements IHasWork, I
return CoreProxy.proxy.getBuildCraftPlayer((WorldServer) worldObj, xCoord, yCoord + 1, zCoord);
}
private void handleLeftoverItems(IInventory items) {
for (int i = 0; i < items.getSizeInventory(); i++) {
if (items.getStackInSlot(i) != null) {
ItemStack output = items.getStackInSlot(i);
if (output.stackSize <= 0) {
items.setInventorySlotContents(i, null);
continue;
}
boolean inserted = false;
for (int j = 2; j <= 4; j++) {
ItemStack target = getStackInSlot(j);
if (target == null || target.stackSize <= 0) {
setInventorySlotContents(j, output);
inserted = true;
break;
} else {
output.stackSize -= StackHelper.mergeStacks(output, target, true);
if (output.stackSize == 0) {
inserted = true;
break;
}
}
}
if (!inserted) {
if (output.stackSize > 0) {
output.stackSize -= Utils.addToRandomInventoryAround(worldObj, xCoord, yCoord, zCoord, output);
if (output.stackSize > 0) {
InvUtils.dropItems(worldObj, output, xCoord, yCoord + 1, zCoord);
}
}
}
items.setInventorySlotContents(i, null);
}
}
}
@Override
public void updateEntity() {
super.updateEntity();
if (getEnergy() >= getRequiredEnergy()) {
if (getEnergy() >= getRequiredEnergy() && getEnergy() > 0) {
ItemStack input = this.getStackInSlot(0);
if (input == null) {
return;
}
EntityPlayer internalPlayer = getInternalPlayer().get();
if (craftSlot == null) {
craftSlot = new SlotCrafting(getInternalPlayer().get(), crafting, this, 1, 0, 0);
craftSlot = new SlotCrafting(internalPlayer, crafting, this, 1, 0, 0);
}
if (input.getItem() instanceof ItemPackage) {
@ -99,39 +145,9 @@ public class TileStampingTable extends TileLaserTableBase implements IHasWork, I
addEnergy(-getRequiredEnergy());
craftSlot.onPickupFromSlot(getInternalPlayer().get(), result);
ItemStack[] playerInv = getInternalPlayer().get().inventory.mainInventory;
for (int i = 0; i < playerInv.length; i++) {
if (playerInv[i] != null) {
ItemStack output = playerInv[i];
for (int j = 2; j <= 4; j++) {
ItemStack target = getStackInSlot(j);
if (target == null) {
setInventorySlotContents(j, output);
playerInv[i] = null;
break;
} else {
output.stackSize -= StackHelper.mergeStacks(output, input, true);
if (output.stackSize == 0) {
break;
}
}
}
if (output.stackSize > 0) {
output.stackSize -= Utils.addToRandomInventoryAround(worldObj, xCoord, yCoord, zCoord, output);
}
if (output.stackSize > 0) {
InvUtils.dropItems(worldObj, output, xCoord, yCoord + 1, zCoord);
}
playerInv[i] = null;
}
}
craftSlot.onPickupFromSlot(internalPlayer, result);
handleLeftoverItems(crafting);
handleLeftoverItems(internalPlayer.inventory);
if (resultInto == null) {
setInventorySlotContents(1, result);

2
common/buildcraft/transport/gates/ItemGate.java
View file

@ -244,8 +244,6 @@ public class ItemGate extends ItemBuildCraft implements IPipePluggableItem {
for (IGateExpansion expansion : GateExpansions.getExpansions()) {
expansion.registerItemOverlay(iconRegister);
}
StatementManager.registerIcons(iconRegister);
}
@Override