upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 00:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reversion upgrade implementation

Browse Source
This commit is contained in:
tterrag1098 committed 2015-06-02 00:46:23 -04:00
1 parent d64a379b41
commit ed5162104e
3 files changed
+43 -99
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java
+36 -92
View File
@@ -2,8 +2,6 @@ package com.cricketcraft.chisel.block.tileentity;
import java.util.List;
import com.cricketcraft.chisel.api.carving.CarvingUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
@@ -112,7 +110,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory
@Override
public void updateEntity() {
ItemStack base = inventory[BASE], target = inventory[TARGET], output = inventory[OUTPUT];
ItemStack base = inventory[BASE], target = getTarget(), output = inventory[OUTPUT];
if (!worldObj.isRemote && hasChisel() && base != null && target != null) {
if (canBeMadeFrom(base, target)) {
@@ -137,8 +135,9 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory
return;
}
// result will always be a copy of the target, of course
// result will always be a copy of the target
ItemStack chiseled = target.copy();
// if we have the stack upgrade, boost the stack size to the max possible, otherwise just one
chiseled.stackSize = hasUpgrade(Upgrade.STACK) ? canBeMade : 1;
@@ -152,66 +151,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory
slotChanged(OUTPUT);
}
chiselItem(chiseled.stackSize);
// remove what we made from the stack
base.stackSize -= chiseled.stackSize;
if (base.stackSize <= 0) {
setInventorySlotContents(BASE, null); // clear out 0 size itemstacks
}
}
} else if (worldObj.getTotalWorldTime() % 10 == 0) {
progress++;
}
}
} else if(!worldObj.isRemote && hasChisel() && base != null && hasUpgrade(Upgrade.REVERSION)){
if(Carving.chisel.getItemsForChiseling(base) != null){
if (progress >= (hasUpgrade(Upgrade.SPEED) ? FAST_SPEED : SLOW_SPEED)) {
// reset progress
progress = 0;
// the max possible for this craft
int canBeMade = base.getMaxStackSize();
// if there are items in the output, they count towards the max we can make
if (output != null) {
canBeMade -= output.stackSize;
}
// can't make more than we have
canBeMade = Math.min(base.stackSize, canBeMade);
// if we can't make any, forget it
if (canBeMade <= 0) {
return;
}
ItemStack chiseled;
if(Carving.chisel.getItemsForChiseling(inventory[TARGET]).get(0) != null){
// result will always be a copy of the target, of course
chiseled = inventory[TARGET].copy();
// if we have the stack upgrade, boost the stack size to the max possible, otherwise just one
chiseled.stackSize = hasUpgrade(Upgrade.STACK) ? canBeMade : 1;
} else {
// result will always be a copy of the target, of course
chiseled = base.copy();
// if we have the stack upgrade, boost the stack size to the max possible, otherwise just one
chiseled.stackSize = hasUpgrade(Upgrade.STACK) ? canBeMade : 1;
}
if (canChisel(chiseled)) {
// if our output is empty, just use the current result
if (output == null) {
setInventorySlotContents(OUTPUT, chiseled);
} else {
// otherwise just add our result to the existing stack
inventory[OUTPUT].stackSize += chiseled.stackSize;
slotChanged(OUTPUT);
}
chiselItem(chiseled.stackSize);
chiselItem(chiseled.stackSize, target);
// remove what we made from the stack
base.stackSize -= chiseled.stackSize;
@@ -227,7 +167,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory
if (chiseling) {
chiselRot += rotAmnt;
if (chiselRot >= maxRot) {
chiselItem(0);
chiselItem(0, getTarget());
}
} else {
chiselRot = Math.max(chiselRot - rotAmnt, 0);
@@ -235,6 +175,15 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory
}
}
private ItemStack getTarget() {
if (inventory[BASE] != null && hasUpgrade(Upgrade.REVERSION)) {
// if we have a reversion upgrade, use that for the target
return Carving.chisel.getItemsForChiseling(inventory[BASE]).get(0);
} else {
return inventory[TARGET];
}
}
// lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target
private boolean canBeMadeFrom(ItemStack from, ItemStack to) {
List<ItemStack> results = Carving.chisel.getItemsForChiseling(from);
@@ -251,17 +200,18 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory
if (inventory[OUTPUT] == null) {
return true;
}
// need to check NBT as well as item
if (toMerge.isItemEqual(inventory[OUTPUT]) && ItemStack.areItemStackTagsEqual(toMerge, inventory[OUTPUT])) {
// we only care about metadata if the item has subtypes
return !toMerge.getHasSubtypes() || toMerge.getItemDamage() == inventory[OUTPUT].getItemDamage();
if (!toMerge.isItemEqual(inventory[OUTPUT]) || !ItemStack.areItemStackTagsEqual(toMerge, inventory[OUTPUT])) {
return false;
}
if(inventory[TARGET] == null){
return ((IChiselItem)inventory[CHISEL].getItem()).canChisel(worldObj, inventory[CHISEL], General.getVariation(inventory[BASE]));
} else {
return ((IChiselItem)inventory[CHISEL].getItem()).canChisel(worldObj, inventory[CHISEL], General.getVariation(inventory[TARGET]));
// we only care about metadata if the item has subtypes
if (toMerge.getHasSubtypes() && toMerge.getItemDamage() != inventory[OUTPUT].getItemDamage()) {
return false;
}
return ((IChiselItem) inventory[CHISEL].getItem()).canChisel(worldObj, inventory[CHISEL], General.getVariation(getTarget()));
}
private boolean hasChisel() {
@@ -269,30 +219,17 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory
}
/** Calls IChiselItem#onChisel() and sends the chisel packet for sound/animation */
private void chiselItem(int chiseled) {
private void chiselItem(int chiseled, ItemStack target) {
if (!worldObj.isRemote) {
boolean breakChisel = false;
if(inventory[TARGET] == null){
if (((IChiselItem) inventory[CHISEL].getItem()).onChisel(worldObj, inventory[CHISEL], CarvingUtils.getDefaultVariationFor(Block.getBlockFromItem(inventory[TARGET].getItem()), inventory[TARGET].getItemDamage(), General.getVariation(inventory[TARGET]).getOrder()))) {
inventory[CHISEL].setItemDamage(inventory[CHISEL].getItemDamage() + 1);
if (inventory[CHISEL].getItemDamage() >= inventory[CHISEL].getMaxDamage()) {
setInventorySlotContents(CHISEL, null);
breakChisel = true;
}
if (((IChiselItem) inventory[CHISEL].getItem()).onChisel(worldObj, inventory[CHISEL], General.getVariation(target))) {
inventory[CHISEL].setItemDamage(inventory[CHISEL].getItemDamage() + 1);
if (inventory[CHISEL].getItemDamage() >= inventory[CHISEL].getMaxDamage()) {
setInventorySlotContents(CHISEL, null);
breakChisel = true;
}
PacketHandler.INSTANCE.sendToDimension(new MessageAutoChisel(this, chiseled, true, breakChisel), worldObj.provider.dimensionId);
} else {
if (((IChiselItem) inventory[CHISEL].getItem()).onChisel(worldObj, inventory[CHISEL], General.getVariation(inventory[TARGET]))) {
inventory[CHISEL].setItemDamage(inventory[CHISEL].getItemDamage() + 1);
if (inventory[CHISEL].getItemDamage() >= inventory[CHISEL].getMaxDamage()) {
setInventorySlotContents(CHISEL, null);
breakChisel = true;
}
}
PacketHandler.INSTANCE.sendToDimension(new MessageAutoChisel(this, chiseled, true, breakChisel), worldObj.provider.dimensionId);
}
PacketHandler.INSTANCE.sendToDimension(new MessageAutoChisel(this, chiseled, true, breakChisel), worldObj.provider.dimensionId);
} else {
if (breakChisel) {
worldObj.playSound(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "random.break", 0.8F, 0.8F + worldObj.rand.nextFloat() * 0.4F, false);
@@ -445,6 +382,13 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory
if (slot == BASE && lastBase != null) {
ghostItem.setEntityItemStack(lastBase.copy());
return ghostItem;
} else if (slot == TARGET) {
ItemStack target = getTarget();
if (target != null) {
ghostItem.setEntityItemStack(target);
return ghostItem;
}
return null;
} else if (inventory[slot] == null) {
return null;
} else {
src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java
+7 -7
View File
@@ -25,10 +25,10 @@ public class ContainerAutoChisel extends Container {
addSlot(tileEntityAutoChisel, 1, 78, 52);
addSlot(tileEntityAutoChisel, 2, 103, 15);
addSlot(tileEntityAutoChisel, 3, 8, 62);
addSlot(tileEntityAutoChisel, 4, 151, 5);
addSlot(tileEntityAutoChisel, 5, 151, 25);
addSlot(tileEntityAutoChisel, 6, 151, 45);
addSlot(tileEntityAutoChisel, 7, 151, 65);
addSlot(tileEntityAutoChisel, 4, 152, 5);
addSlot(tileEntityAutoChisel, 5, 152, 25);
addSlot(tileEntityAutoChisel, 6, 152, 45);
addSlot(tileEntityAutoChisel, 7, 152, 65);
bindPlayerInventory(player);
}
@@ -70,12 +70,12 @@ public class ContainerAutoChisel extends Container {
itemStack = itemStack1.copy();
// if we are in the auto chisel
if (slotNumber <= 6) {
if (!this.mergeItemStack(itemStack1, 7, 42, false)) {
if (slotNumber <= 7) {
if (!this.mergeItemStack(itemStack1, 8, 42, false)) {
return null;
}
// otherwise just put it in one of the machine slots
} else if (!this.mergeItemStack(itemStack1, 0, 7, false)) {
} else if (!this.mergeItemStack(itemStack1, 0, 8, false)) {
return null;
}