diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 27481689f..3411030a0 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -206,7 +206,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData private boolean smeltItem(EntityItem item) { - ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(item.getEntityItem()); + ItemStack result = FurnaceRecipes.instance().getSmeltingResult(item.getEntityItem()); if(result != null) { @@ -231,7 +231,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData return false; } - ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(block.getStack(worldObj)); + ItemStack result = FurnaceRecipes.instance().getSmeltingResult(block.getStack(worldObj)); if(result != null) { diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 86fd9f5d0..a15860274 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -330,7 +330,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine return false; } else { - ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(inventory[28]); + ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(inventory[28]); if(itemstack == null) return false; if(inventory[30] == null) return true; if(!inventory[30].isItemEqual(itemstack)) return false; @@ -343,7 +343,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { if(canSmelt()) { - ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(inventory[28]); + ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(inventory[28]); if(inventory[30] == null) { diff --git a/src/main/java/mekanism/common/integration/CCPeripheral.java b/src/main/java/mekanism/common/integration/CCPeripheral.java index 335c5668a..72a806b57 100644 --- a/src/main/java/mekanism/common/integration/CCPeripheral.java +++ b/src/main/java/mekanism/common/integration/CCPeripheral.java @@ -7,6 +7,7 @@ import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.api.peripheral.IPeripheralProvider; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -70,7 +71,7 @@ public class CCPeripheral implements IPeripheral @Override public IPeripheral getPeripheral(World world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); + TileEntity te = world.getTileEntity(new BlockPos(x, y, z)); if(te != null && te instanceof IComputerIntegration) { diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index f2a1108bb..9d6741903 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -10,7 +10,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.Resource; -import mekanism.common.multipart.TransmitterType; +//import mekanism.common.multipart.TransmitterType; import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; import net.minecraft.init.Items; @@ -27,8 +27,6 @@ import java.util.Map; */ public final class MekanismHooks { - private Class BuildCraftEnergy; - public boolean IC2Loaded = false; public boolean RailcraftLoaded = false; public boolean CoFHCoreLoaded = false; @@ -156,6 +154,7 @@ public final class MekanismHooks energyP2P = "add-p2p-attunement-ic2-power"; } +/* for(TransmitterType type : TransmitterType.values()) { if(type.getTransmission().equals(TransmissionType.ITEM)) @@ -175,8 +174,9 @@ public final class MekanismHooks FMLInterModComms.sendMessage("appliedenergistics2",energyP2P,new ItemStack(MekanismItems.PartTransmitter, 1, type.ordinal())); continue; } - + } +*/ } } diff --git a/src/main/java/mekanism/common/integration/OCDriver.java b/src/main/java/mekanism/common/integration/OCDriver.java index 48df6d765..903d94592 100644 --- a/src/main/java/mekanism/common/integration/OCDriver.java +++ b/src/main/java/mekanism/common/integration/OCDriver.java @@ -9,6 +9,7 @@ import li.cil.oc.api.network.Visibility; import li.cil.oc.api.prefab.DriverTileEntity; import li.cil.oc.api.prefab.ManagedEnvironment; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import java.util.Arrays; @@ -28,7 +29,7 @@ public class OCDriver extends DriverTileEntity @Override public ManagedEnvironment createEnvironment(World world, int x, int y, int z) { - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); if(tile instanceof IComputerIntegration) { diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index ab04d5313..1787c2a7a 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -248,11 +248,11 @@ public final class OreDictManager } catch(Exception e) {} try { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.SILVER.ordinal()), StackUtils.size(OreDictionary.getOres("ingotSilver").get(0), 1), 0.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.SILVER.ordinal()), StackUtils.size(OreDictionary.getOres("ingotSilver").get(0), 1), 0.0F); } catch(Exception e) {} try { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.LEAD.ordinal()), StackUtils.size(OreDictionary.getOres("ingotLead").get(0), 1), 0.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.LEAD.ordinal()), StackUtils.size(OreDictionary.getOres("ingotLead").get(0), 1), 0.0F); } catch(Exception e) {} try { @@ -345,11 +345,11 @@ public final class OreDictManager tempCrafting.setInventorySlotContents(i, null); } - ArrayList registeredOres = OreDictionary.getOres("logWood"); + List registeredOres = OreDictionary.getOres("logWood"); for(int i = 0; i < registeredOres.size(); i++) { - ItemStack logEntry = (ItemStack)registeredOres.get(i); + ItemStack logEntry = registeredOres.get(i); if(logEntry.getItemDamage() == OreDictionary.WILDCARD_VALUE) { diff --git a/src/main/java/mekanism/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index 8c8b08a16..6a5e55d4d 100644 --- a/src/main/java/mekanism/common/integration/WailaDataProvider.java +++ b/src/main/java/mekanism/common/integration/WailaDataProvider.java @@ -63,11 +63,11 @@ public class WailaDataProvider implements IWailaDataProvider else if(tile instanceof TileEntityBoundingBlock) { TileEntityBoundingBlock bound = (TileEntityBoundingBlock)tile; - Coord4D coord = new Coord4D(bound.mainX, bound.mainY, bound.mainZ, tile.getWorldObj().provider.getDimensionId()); + Coord4D coord = new Coord4D(bound.getPos(), tile.getWorld().provider.getDimensionId()); - if(bound.receivedCoords && coord.getTileEntity(tile.getWorldObj()) instanceof IInventory) + if(bound.receivedCoords && coord.getTileEntity(tile.getWorld()) instanceof IInventory) { - currenttip.set(0, EnumColor.WHITE + ((IInventory)coord.getTileEntity(tile.getWorldObj())).getName()); + currenttip.set(0, EnumColor.WHITE + ((IInventory)coord.getTileEntity(tile.getWorld())).getName()); } } diff --git a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java index c12dcb6a0..32281ff90 100644 --- a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java @@ -44,7 +44,7 @@ public class InventoryElectricChest extends InventoryBasic } @Override - public void openInventory() + public void openInventory(EntityPlayer player) { read(); @@ -55,7 +55,7 @@ public class InventoryElectricChest extends InventoryBasic } @Override - public void closeInventory() + public void closeInventory(EntityPlayer player) { write();