lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finished TileEntities

Browse source
This commit is contained in:
Arcaratus 2015-07-30 10:21:53 -04:00
parent cfed9f5ab3
commit b2f7ec6030
36 changed files with 183 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAlchemicCalcinator.java → src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAlchemicalCalcinator.java
View file

@ -20,19 +20,16 @@ import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class TEAlchemicCalcinator extends TEReagentConduit implements IInventory, IUpdatePlayerListBox
public class TEAlchemicalCalcinator extends TEReagentConduit implements IInventory, IUpdatePlayerListBox
{
protected ItemStack[] inv;
protected ReagentContainer bufferTank = new ReagentContainer(Reagent.REAGENT_SIZE * 2);
protected int bufferTransferRate = 20;
private int lpPerTick = 10;
private int ticksPerReagent = 200;
private int progress;
public int progress;
public TEAlchemicCalcinator()
public TEAlchemicalCalcinator()
{
super(1, Reagent.REAGENT_SIZE * 4);
this.inv = new ItemStack[2];
@ -56,7 +53,7 @@ public class TEAlchemicCalcinator extends TEReagentConduit implements IInventory
for (int i = 0; i < tagList.tagCount(); i++)
{
NBTTagCompound savedTag = (NBTTagCompound) tagList.getCompoundTagAt(i);
NBTTagCompound savedTag = tagList.getCompoundTagAt(i);
if (savedTag.getBoolean("Empty"))
{
@ -85,7 +82,6 @@ public class TEAlchemicCalcinator extends TEReagentConduit implements IInventory
for (int i = 0; i < inv.length; i++)
{
ItemStack stack = inv[i];
NBTTagCompound savedTag = new NBTTagCompound();
if (inv[i] != null)
@ -128,7 +124,10 @@ public class TEAlchemicCalcinator extends TEReagentConduit implements IInventory
public void tickProgress()
{
int lpPerTick = 10;
int ticksPerReagent = 200;
ItemStack reagentItemStack = this.getStackInSlot(1);
if (reagentItemStack == null)
{
progress = 0;
@ -165,7 +164,7 @@ public class TEAlchemicCalcinator extends TEReagentConduit implements IInventory
SpellHelper.sendIndexedParticleToAllAround(worldObj, pos, 20, worldObj.provider.getDimensionId(), 1, pos);
}
if (progress >= this.ticksPerReagent)
if (progress >= ticksPerReagent)
{
progress = 0;
this.bufferTank.fill(possibleReagent, true);
@ -200,7 +199,7 @@ public class TEAlchemicCalcinator extends TEReagentConduit implements IInventory
for (int i = 0; i < invTagList.tagCount(); i++)
{
NBTTagCompound savedTag = (NBTTagCompound) invTagList.getCompoundTagAt(i);
NBTTagCompound savedTag = invTagList.getCompoundTagAt(i);
if (savedTag.getBoolean("Empty"))
{
@ -235,7 +234,6 @@ public class TEAlchemicCalcinator extends TEReagentConduit implements IInventory
for (int i = 0; i < inv.length; i++)
{
ItemStack stack = inv[i];
NBTTagCompound savedTag = new NBTTagCompound();
if (inv[i] != null)
@ -342,14 +340,10 @@ public class TEAlchemicCalcinator extends TEReagentConduit implements IInventory
}
@Override
public void openInventory(EntityPlayer player)
{
}
public void openInventory(EntityPlayer player) {}
@Override
public void closeInventory(EntityPlayer player)
{
}
public void closeInventory(EntityPlayer player) {}
@Override
public String getName()
@ -381,32 +375,26 @@ public class TEAlchemicCalcinator extends TEReagentConduit implements IInventory
}
@Override
public IChatComponent getDisplayName() {
// TODO Auto-generated method stub
public IChatComponent getDisplayName()
{
return null;
}
@Override
public int getField(int id) {
// TODO Auto-generated method stub
public int getField(int id)
{
return 0;
}
@Override
public void setField(int id, int value) {
// TODO Auto-generated method stub
}
public void setField(int id, int value) {}
@Override
public int getFieldCount() {
// TODO Auto-generated method stub
public int getFieldCount()
{
return 0;
}
@Override
public void clear() {
// TODO Auto-generated method stub
}
public void clear() {}
}

21
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java
View file

@ -106,11 +106,6 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
return filledAmount;
}
public int getRSPowerOutput()
{
return 5;
}
public void addToDemonBloodDuration(int dur)
{
@ -509,8 +504,8 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
if(worldObj.getWorldTime() % Math.max(20 - this.accelerationUpgrades, 1) == 0)
{
int syphonMax = (int) (20 * this.dislocationMultiplier);
int fluidInputted = 0;
int fluidOutputted = 0;
int fluidInputted;
int fluidOutputted;
fluidInputted = Math.min(syphonMax, -this.fluid.amount + capacity);
fluidInputted = Math.min(this.fluidInput.amount, fluidInputted);
this.fluid.amount += fluidInputted;
@ -688,9 +683,9 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
}
}
FluidStack flMain = new FluidStack(fluidData[0], fluidData[1]);
FluidStack flIn = new FluidStack(fluidData[2], fluidData[3]);
FluidStack flOut = new FluidStack(fluidData[4], fluidData[5]);
FluidStack flMain = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, fluidData[1]); //First parameter was fluidData[0] --Checking to see if this will cause issues or not
FluidStack flIn = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, fluidData[3]); //" "
FluidStack flOut = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, fluidData[5]); //" "
this.setMainFluid(flMain);
this.setInputFluid(flIn);
@ -901,7 +896,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
sortList[1] = 0;
} else
{
sortList[0] = this.fluid.fluidID;
sortList[0] = this.fluid.getFluidID();
sortList[1] = this.fluid.amount;
}
@ -911,7 +906,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
sortList[3] = 0;
} else
{
sortList[2] = this.fluidInput.fluidID;
sortList[2] = this.fluidInput.getFluidID();
sortList[3] = this.fluidInput.amount;
}
@ -921,7 +916,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
sortList[5] = 0;
} else
{
sortList[4] = this.fluidOutput.fluidID;
sortList[4] = this.fluidOutput.getFluidID();
sortList[5] = this.fluidOutput.amount;
}

4
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBellJar.java
View file

@ -14,9 +14,9 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.util.Constants;
public class TEBellJar extends TEReagentConduit
public class TEBelljar extends TEReagentConduit
{
public TEBellJar()
public TEBelljar()
{
super(1, 16000);
this.maxConnextions = 1;

20
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java → src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEChemistrySet.java
View file

@ -23,7 +23,7 @@ import WayofTime.alchemicalWizardry.common.alchemy.ICombinationalCatalyst;
import WayofTime.alchemicalWizardry.common.items.potion.AlchemyFlask;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class TEWritingTable extends TEInventory implements ISidedInventory, IUpdatePlayerListBox
public class TEChemistrySet extends TEInventory implements ISidedInventory, IUpdatePlayerListBox
{
public static final int sizeInv = 7;
@ -32,7 +32,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory, IUpd
private int accelerationTime;
public TEWritingTable()
public TEChemistrySet()
{
super(sizeInv);
}
@ -180,13 +180,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory, IUpd
public boolean containsCombinationCatalyst()
{
if (getCombinationCatalystPosition() != -1)
{
return true;
} else
{
return false;
}
return getCombinationCatalystPosition() != -1;
}
public int getCombinationCatalystPosition()
@ -742,10 +736,10 @@ public class TEWritingTable extends TEInventory implements ISidedInventory, IUpd
{
switch(facing)
{
case DOWN:
return new int[]{6};
default:
return new int[]{0, 1, 2, 3, 4, 5};
case DOWN:
return new int[]{6};
default:
return new int[]{0, 1, 2, 3, 4, 5};
}
}

2
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEConduit.java
View file

@ -20,6 +20,6 @@ public class TEConduit extends TESpellBlock
@Override
protected void applySpellChange(SpellParadigm parad)
{
return;
}
}

2
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TECrucible.java
View file

@ -266,7 +266,7 @@ public class TECrucible extends TEInventory implements IUpdatePlayerListBox
@Override
public boolean isItemValidForSlot(int slot, ItemStack stack)
{
return stack != null ? stack.getItem() instanceof IIncense : false;
return stack != null && stack.getItem() instanceof IIncense;
}
public int getRSPowerOutput()

11
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEMasterStone.java
View file

@ -56,7 +56,7 @@ public class TEMasterStone extends TileEntity implements IMasterRitualStone, IUp
public TEMasterStone()
{
tanks = new ReagentContainer[]{new ReagentContainer(1000), new ReagentContainer(1000), new ReagentContainer(1000)};
this.attunedTankMap = new HashMap();
this.attunedTankMap = new HashMap<Reagent, Integer>();
isActive = false;
owner = "";
@ -454,9 +454,8 @@ public class TEMasterStone extends TileEntity implements IMasterRitualStone, IUp
public AxisAlignedBB getRenderBoundingBox()
{
double renderExtention = 1.0d;
AxisAlignedBB bb = new AxisAlignedBB(pos.add(-renderExtention, -renderExtention, -renderExtention), pos.add(1 + renderExtention, 1 + renderExtention, 1 + renderExtention));
return bb;
double renderExtension = 1.0d;
return new AxisAlignedBB(pos.add(-renderExtension, -renderExtension, -renderExtension), pos.add(1 + renderExtension, 1 + renderExtension, 1 + renderExtension));
}
/* ISegmentedReagentHandler */
@ -484,7 +483,7 @@ public class TEMasterStone extends TileEntity implements IMasterRitualStone, IUp
ReagentStack remainingStack = resource.copy();
remainingStack.amount = maxFill - totalFill;
boolean doesReagentMatch = tanks[i].getReagent() == null ? false : tanks[i].getReagent().isReagentEqual(remainingStack);
boolean doesReagentMatch = tanks[i].getReagent() != null && tanks[i].getReagent().isReagentEqual(remainingStack);
if (doesReagentMatch)
{
@ -637,7 +636,7 @@ public class TEMasterStone extends TileEntity implements IMasterRitualStone, IUp
return;
}
this.attunedTankMap.put(reagent, new Integer(total));
this.attunedTankMap.put(reagent, total);
}
@Override

4
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEMimicBlock.java
View file

@ -58,7 +58,7 @@ public class TEMimicBlock extends TileEntity implements IUpdatePlayerListBox
for (int i = 0; i < tagList.tagCount(); i++)
{
NBTTagCompound tag = (NBTTagCompound) tagList.getCompoundTagAt(i);
NBTTagCompound tag = tagList.getCompoundTagAt(i);
int slot = tag.getByte("Slot");
if (slot >= 0 && slot < inv.length)
@ -79,8 +79,6 @@ public class TEMimicBlock extends TileEntity implements IUpdatePlayerListBox
for (int i = 0; i < inv.length; i++)
{
ItemStack stack = inv[i];
if (inv[i] != null)
{
NBTTagCompound tag = new NBTTagCompound();

1
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPedestal.java
View file

@ -135,5 +135,4 @@ public class TEPedestal extends TEInventory
SpellHelper.sendIndexedParticleToAllAround(worldObj, pos, 20, worldObj.provider.getDimensionId(), 2, pos);
}
}
}

2
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java
View file

@ -36,7 +36,7 @@ public class TEPlinth extends TEInventory implements IUpdatePlayerListBox
private int progressInterval;
private int progress;
public static List<PlinthComponent> pedestalPositions = new ArrayList();
public static List<PlinthComponent> pedestalPositions = new ArrayList<PlinthComponent>();
public TEPlinth()
{

28
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEReagentConduit.java
View file

@ -17,7 +17,6 @@ import net.minecraft.server.gui.IUpdatePlayerListBox;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -55,9 +54,9 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
{
super(numberOfTanks, size);
destinationList = new LinkedList();
reagentTargetList = new HashMap();
reagentTankDesignationList = new HashMap();
destinationList = new LinkedList<ColourAndCoords>();
reagentTargetList = new HashMap<Reagent, List<Int3>>();
reagentTankDesignationList = new HashMap<Reagent, Integer>();
}
public Int3 getColour()
@ -164,7 +163,7 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
NBTTagList tagList = tag.getTagList("destinationList", Constants.NBT.TAG_COMPOUND);
destinationList = new LinkedList();
destinationList = new LinkedList<ColourAndCoords>();
for (int i = 0; i < tagList.tagCount(); i++)
{
@ -173,7 +172,7 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
destinationList.add(ColourAndCoords.readFromNBT(savedTag));
}
reagentTargetList = new HashMap();
reagentTargetList = new HashMap<Reagent, List<Int3>>();
NBTTagList reagentTagList = tag.getTagList("reagentTargetList", Constants.NBT.TAG_COMPOUND);
@ -183,7 +182,7 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
Reagent reagent = ReagentRegistry.getReagentForKey(savedTag.getString("reagent"));
List<Int3> coordList = new LinkedList();
List<Int3> coordList = new LinkedList<Int3>();
NBTTagList coordinateList = savedTag.getTagList("coordinateList", Constants.NBT.TAG_COMPOUND);
@ -195,7 +194,7 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
reagentTargetList.put(reagent, coordList);
}
reagentTankDesignationList = new HashMap();
reagentTankDesignationList = new HashMap<Reagent, Integer>();
NBTTagList tankDesignationList = tag.getTagList("tankDesignationList", Constants.NBT.TAG_COMPOUND);
@ -203,7 +202,7 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
{
NBTTagCompound savedTag = tankDesignationList.getCompoundTagAt(i);
this.reagentTankDesignationList.put(ReagentRegistry.getReagentForKey(savedTag.getString("reagent")), new Integer(savedTag.getInteger("integer")));
this.reagentTankDesignationList.put(ReagentRegistry.getReagentForKey(savedTag.getString("reagent")), savedTag.getInteger("integer"));
}
}
@ -211,7 +210,7 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
{
NBTTagList tagList = tag.getTagList("destinationList", Constants.NBT.TAG_COMPOUND);
destinationList = new LinkedList();
destinationList = new LinkedList<ColourAndCoords>();
for (int i = 0; i < tagList.tagCount(); i++)
{
@ -315,7 +314,6 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
int amount = Math.min(((IReagentHandler) tile).fill(EnumFacing.UP, maxDrainAmount, false), amountLeft);
if (amount > 0)
{
amountLeft -= amount;
totalTransfered += amount;
ReagentStack stack = this.drain(EnumFacing.UP, new ReagentStack(entry.getKey(), amount), true);
@ -342,13 +340,11 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
}
}
@SideOnly(Side.CLIENT)
public void sendPlayerStuffs()
{
Minecraft mc = Minecraft.getMinecraft();
EntityPlayer player = mc.thePlayer;
World world = mc.theWorld;
if (SpellHelper.canPlayerSeeAlchemy(player))
{
for (ColourAndCoords colourSet : this.destinationList)
@ -387,7 +383,7 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
public List<ColourAndCoords> compileListForReagentTargets(Map<Reagent, List<Int3>> map)
{
List<ColourAndCoords> list = new LinkedList();
List<ColourAndCoords> list = new LinkedList<ColourAndCoords>();
for (Entry<Reagent, List<Int3>> entry : map.entrySet())
{
@ -475,7 +471,7 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
List<Int3> coordList = this.reagentTargetList.get(reagent);
if (coordList == null)
{
List<Int3> newCoordList = new LinkedList();
List<Int3> newCoordList = new LinkedList<Int3>();
newCoordList.add(newCoord);
this.reagentTargetList.put(reagent, newCoordList);
} else
@ -486,7 +482,7 @@ public class TEReagentConduit extends TileSegmentedReagentHandler implements IUp
return true;
} else
{
List<Int3> newCoordList = new LinkedList();
List<Int3> newCoordList = new LinkedList<Int3>();
newCoordList.add(newCoord);
this.reagentTargetList.put(reagent, newCoordList);

3
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESchematicSaver.java
View file

@ -7,7 +7,6 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
@ -21,7 +20,7 @@ public class TESchematicSaver extends TileEntity
{
public Block targetBlock = ModBlocks.largeBloodStoneBrick;
public void rightClickBlock(EntityPlayer player, int side)
public void rightClickBlock()
{
BuildingSchematic schematic = new BuildingSchematic();

3
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellBlock.java
View file

@ -24,9 +24,6 @@ public abstract class TESpellBlock extends TEOrientable implements ISpellTile
public TESpellBlock getTileAtOutput()
{
EnumFacing output = this.getOutputDirection();
int xOffset = output.getFrontOffsetX();
int yOffset = output.getFrontOffsetY();
int zOffset = output.getFrontOffsetZ();
TileEntity tile = worldObj.getTileEntity(pos.add(output.getDirectionVec()));

10
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java
View file

@ -31,10 +31,7 @@ public class TESpellParadigmBlock extends TESpellBlock implements ISpellParadigm
}
@Override
protected void applySpellChange(SpellParadigm parad)
{
}
protected void applySpellChange(SpellParadigm parad) {}
public boolean canInputRecieve()
{
@ -68,10 +65,7 @@ public class TESpellParadigmBlock extends TESpellBlock implements ISpellParadigm
}
@Override
public void setInputDirection(EnumFacing direction)
{
}
public void setInputDirection(EnumFacing direction) {}
@Override
public EnumFacing getInputDirection()

4
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEHomHeart.java → src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellTable.java
View file

@ -9,9 +9,9 @@ import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.spell.simple.HomSpell;
import WayofTime.alchemicalWizardry.common.spell.simple.HomSpellRegistry;
public class TEHomHeart extends TileEntity
public class TESpellTable extends TileEntity
{
public boolean canCastSpell(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
public boolean canCastSpell()
{
return true;
}

6
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TETeleposer.java
View file

@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.tileEntity;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -14,7 +15,6 @@ import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.NewPacketHandler;
import WayofTime.alchemicalWizardry.common.block.BlockTeleposer;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.items.TelepositionFocus;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
@ -127,7 +127,7 @@ public class TETeleposer extends TEInventory implements IUpdatePlayerListBox
entityCount++;
}
if (EnergyItems.canSyphonInContainer(focus, damage * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) + damage * entityCount))
if (SoulNetworkHandler.canSyphonInContainer(focus, damage * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) + damage * entityCount))
{
for (int k = 0; k <= (focusLevel * 2 - 2); k++)
for (int i = -(focusLevel - 1); i <= (focusLevel - 1); i++)
@ -148,7 +148,7 @@ public class TETeleposer extends TEInventory implements IUpdatePlayerListBox
entityCount = 0;
}
EnergyItems.syphonWhileInContainer(focus, damage * transportCount + damage * entityCount);
SoulNetworkHandler.syphonFromNetworkWhileInContainer(focus, damage * transportCount + damage * entityCount);
//Teleport
if (worldF.equals(worldObj))

6
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/container/ContainerWritingTable.java
View file

@ -1,7 +1,7 @@
package WayofTime.alchemicalWizardry.common.tileEntity.container;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import WayofTime.alchemicalWizardry.common.tileEntity.TEChemistrySet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack;
public class ContainerWritingTable extends Container
{
protected TEWritingTable tileEntity;
protected TEChemistrySet tileEntity;
public ContainerWritingTable(InventoryPlayer inventoryPlayer, TEWritingTable te)
public ContainerWritingTable(InventoryPlayer inventoryPlayer, TEChemistrySet te)
{
tileEntity = te;
addSlotToContainer(new Slot(tileEntity, 0, 152, 110));

10
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/gui/GuiHandler.java
View file

@ -10,7 +10,7 @@ import WayofTime.alchemicalWizardry.common.items.sigil.holding.ContainerHolding;
import WayofTime.alchemicalWizardry.common.items.sigil.holding.GuiHolding;
import WayofTime.alchemicalWizardry.common.items.sigil.holding.InventoryHolding;
import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import WayofTime.alchemicalWizardry.common.tileEntity.TEChemistrySet;
import WayofTime.alchemicalWizardry.common.tileEntity.container.ContainerTeleposer;
import WayofTime.alchemicalWizardry.common.tileEntity.container.ContainerWritingTable;
@ -28,9 +28,9 @@ public class GuiHandler implements IGuiHandler
case 0:
tileEntity = world.getTileEntity(pos);
if (tileEntity instanceof TEWritingTable)
if (tileEntity instanceof TEChemistrySet)
{
return new ContainerWritingTable(player.inventory, (TEWritingTable) tileEntity);
return new ContainerWritingTable(player.inventory, (TEChemistrySet) tileEntity);
}
case 1:
@ -62,9 +62,9 @@ public class GuiHandler implements IGuiHandler
case 0:
tileEntity = world.getTileEntity(pos);
if (tileEntity instanceof TEWritingTable)
if (tileEntity instanceof TEChemistrySet)
{
return new GuiWritingTable(player.inventory, (TEWritingTable) tileEntity);
return new GuiWritingTable(player.inventory, (TEChemistrySet) tileEntity);
}
break;

4
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/gui/GuiWritingTable.java
View file

@ -7,12 +7,12 @@ import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import WayofTime.alchemicalWizardry.common.tileEntity.TEChemistrySet;
import WayofTime.alchemicalWizardry.common.tileEntity.container.ContainerWritingTable;
public class GuiWritingTable extends GuiContainer
{
public GuiWritingTable(InventoryPlayer inventoryPlayer, TEWritingTable tileEntity)
public GuiWritingTable(InventoryPlayer inventoryPlayer, TEChemistrySet tileEntity)
{
super(new ContainerWritingTable(inventoryPlayer, tileEntity));
xSize = 176;