Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update naming to MC 1.4

Browse source
This commit is contained in:
pahimar 2012-10-21 22:39:43 -04:00
parent 8957e6ae34
commit cfb4d74002
7 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
ee3_common/ee3/common/container/ContainerCalcinator.java
View file

@ -48,76 +48,76 @@ public class ContainerCalcinator extends Container {
}
// TODO Write our own version - this is taken from ContainerFurnace
public ItemStack transferStackInSlot(int par1)
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2)
{
ItemStack var2 = null;
Slot var3 = (Slot)this.inventorySlots.get(par1);
ItemStack var3 = null;
Slot var4 = (Slot)this.inventorySlots.get(par2);
if (var3 != null && var3.getHasStack())
if (var4 != null && var4.getHasStack())
{
ItemStack var4 = var3.getStack();
var2 = var4.copy();
ItemStack var5 = var4.getStack();
var3 = var5.copy();
if (par1 == 2)
if (par2 == 2)
{
if (!this.mergeItemStack(var4, 3, 39, true))
if (!this.mergeItemStack(var5, 3, 39, true))
{
return null;
}
var3.onSlotChange(var4, var2);
var4.onSlotChange(var5, var3);
}
else if (par1 != 1 && par1 != 0)
else if (par2 != 1 && par2 != 0)
{
if (FurnaceRecipes.smelting().getSmeltingResult(var4) != null)
if (FurnaceRecipes.smelting().getSmeltingResult(var5) != null)
{
if (!this.mergeItemStack(var4, 0, 1, false))
if (!this.mergeItemStack(var5, 0, 1, false))
{
return null;
}
}
else if (TileEntityFurnace.isItemFuel(var4))
else if (TileEntityFurnace.isItemFuel(var5))
{
if (!this.mergeItemStack(var4, 1, 2, false))
if (!this.mergeItemStack(var5, 1, 2, false))
{
return null;
}
}
else if (par1 >= 3 && par1 < 30)
else if (par2 >= 3 && par2 < 30)
{
if (!this.mergeItemStack(var4, 30, 39, false))
if (!this.mergeItemStack(var5, 30, 39, false))
{
return null;
}
}
else if (par1 >= 30 && par1 < 39 && !this.mergeItemStack(var4, 3, 30, false))
else if (par2 >= 30 && par2 < 39 && !this.mergeItemStack(var5, 3, 30, false))
{
return null;
}
}
else if (!this.mergeItemStack(var4, 3, 39, false))
else if (!this.mergeItemStack(var5, 3, 39, false))
{
return null;
}
if (var4.stackSize == 0)
if (var5.stackSize == 0)
{
var3.putStack((ItemStack)null);
var4.putStack((ItemStack)null);
}
else
{
var3.onSlotChanged();
var4.onSlotChanged();
}
if (var4.stackSize == var2.stackSize)
if (var5.stackSize == var3.stackSize)
{
return null;
}
var3.onPickupFromSlot(var4);
var4.func_82870_a(par1EntityPlayer, var5);
}
return var2;
return var3;
}
}

4
ee3_common/ee3/common/core/handlers/EquivalencyHandler.java
View file

@ -65,7 +65,7 @@ public class EquivalencyHandler {
while (i < equivalencyList.size()) {
currentList = equivalencyList.get(i);
for (ItemStack currentStack : currentList) {
if (checkStack.isStackEqual(currentStack)) {
if (ItemStack.areItemStacksEqual(checkStack, currentStack)) {
return new Integer(i);
}
}
@ -100,7 +100,7 @@ public class EquivalencyHandler {
for (ArrayList<ItemStack> list : equivalencyList) {
for (ItemStack currentStack : list) {
if (checkStack.isStackEqual(currentStack)) {
if (ItemStack.areItemStacksEqual(checkStack, currentStack)) {
return list;
}
}

4
ee3_common/ee3/common/core/handlers/PacketHandler.java
View file

@ -3,7 +3,7 @@ package ee3.common.core.handlers;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import net.minecraft.src.NetworkManager;
import net.minecraft.src.INetworkManager;
import net.minecraft.src.Packet250CustomPayload;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.Player;
@ -28,7 +28,7 @@ public class PacketHandler implements IPacketHandler {
* @param player The Player associated with the packet
*/
@Override
public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player) {
public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) {
// Build a PacketEE object from the data contained within the Packet250CustomPayload packet
PacketEE packetEE = PacketTypeHandler.buildPacket(packet.data);

2
ee3_common/ee3/common/core/handlers/PlayerDestroyItemHandler.java
View file

@ -8,7 +8,7 @@ public class PlayerDestroyItemHandler {
@ForgeSubscribe
public void onPlayerDestroyItemEvent(PlayerDestroyItemEvent event) {
// TODO Come back and actually do what I want here
System.out.println(event.original.getItemNameandInformation());
System.out.println(event.original.func_82833_r());
}
}

4
ee3_common/ee3/common/network/PacketEE.java
View file

@ -5,7 +5,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import cpw.mods.fml.common.network.Player;
import net.minecraft.src.NetworkManager;
import net.minecraft.src.INetworkManager;
public class PacketEE {
@ -43,7 +43,7 @@ public class PacketEE {
public void writeData(DataOutputStream dos) throws IOException { }
public void execute(NetworkManager network, Player player) { }
public void execute(INetworkManager network, Player player) { }
public void setKey(int key) { }
}

4
ee3_common/ee3/common/network/PacketKeyPressed.java
View file

@ -11,7 +11,7 @@ import ee3.common.lib.ItemIds;
import ee3.common.lib.Reference;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.NetworkManager;
import net.minecraft.src.INetworkManager;
import net.minecraft.src.Packet250CustomPayload;
public class PacketKeyPressed extends PacketEE {
@ -40,7 +40,7 @@ public class PacketKeyPressed extends PacketEE {
this.key = key;
}
public void execute(NetworkManager manager, Player player) {
public void execute(INetworkManager manager, Player player) {
EntityPlayer thePlayer = (EntityPlayer) player;
if ((this.key.equals(Reference.KEYBINDING_EXTRA)) && (thePlayer.getCurrentEquippedItem().getItem().shiftedIndex == ItemIds.MINIUM_STONE)) {

4
ee3_common/ee3/common/network/PacketTileUpdate.java
View file

@ -6,7 +6,7 @@ import java.io.IOException;
import cpw.mods.fml.common.network.Player;
import net.minecraft.src.NetworkManager;
import net.minecraft.src.INetworkManager;
import net.minecraftforge.common.ForgeDirection;
public class PacketTileUpdate extends PacketEE {
@ -62,7 +62,7 @@ public class PacketTileUpdate extends PacketEE {
this.player = data.readUTF();
}
public void execute(NetworkManager manager, Player player) {
public void execute(INetworkManager manager, Player player) {
// TODO: Stuff here
}