diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-09-14 13:47:51 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-09-14 13:47:51 +1000 |
| commit | 678a32be304bcffe457cf869ba6c5d57bdc1b2e1 (patch) | |
| tree | 1db1454a7f2dcb3453370cea0ca995ec9188a9d2 /src/Java/gtPlusPlus/core/tileentities/machines | |
| parent | 84cce1bba9a1091f2428ebee464cbfdf57491def (diff) | |
| download | GT5-Unofficial-678a32be304bcffe457cf869ba6c5d57bdc1b2e1.tar.gz GT5-Unofficial-678a32be304bcffe457cf869ba6c5d57bdc1b2e1.tar.bz2 GT5-Unofficial-678a32be304bcffe457cf869ba6c5d57bdc1b2e1.zip | |
$ Fixed the XP Convertor.
% Rewrote base tile entity system.
% Added hashCode() to Pair.java.
% Changed some calculations on Materials.
% Made Rocket Engines produce heavy pollution.
Diffstat (limited to 'src/Java/gtPlusPlus/core/tileentities/machines')
| -rw-r--r-- | src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java | 7 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java index a97447420a..8ba43bb197 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java +++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java @@ -35,6 +35,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI private int mRecipeTimeRemaining = -1; public TileEntityModularityTable() { + super(16); this.inventoryGrid = new InventoryModularMain(); this.inventoryOutputs = new InventoryModularOutput(); this.mTempRecipeStorage = new InventoryModularOutput(); @@ -363,7 +364,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI @Override public String getInventoryName() { - return this.hasCustomInventoryName() ? this.customName : "container.fishrap"; + return this.hasCustomInventoryName() ? this.customName : "container.fishtrap"; } @Override @@ -372,7 +373,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI } @Override - public boolean onPreTick() { + public boolean onPreTick(long aTick) { //Check for active recipe if (this.mRecipeTimeRemaining > -1 || (this.mTempRecipeStorage != null) && (this.mTempRecipeStorage.getRecipeTime() > -1)){ if ((this.mTempRecipeStorage != null) && this.mTempRecipeStorage.getRecipeTime() > -1){ @@ -393,7 +394,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI } @Override - public boolean onPostTick() { + public boolean onPostTick(long aTick) { if (mRecipeTimeRemaining == 0){ this.inventoryOutputs.setInventorySlotContents(2, this.getPendingOutputItem()); clearRecipeData(); diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java index d766d0d02e..ad7ec3d0b3 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java +++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java @@ -18,6 +18,7 @@ public class TileEntityTradeTable extends TileEntityBase { private Container_TradeTable container; public TileEntityTradeTable(){ + super(2); this.inventoryGrid = new InventoryTradeMain();//number of slots - without product slot this.inventoryOutputs = new InventoryTradeOutput();//number of slots - without product slot } |