aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2016-10-03 23:33:28 +1000
committerGitHub <noreply@github.com>2016-10-03 23:33:28 +1000
commite3f4a410ef0867359cab3ade72a20c3679aaad06 (patch)
tree2f008c251c080a216b0fcf3d03667f7233edceca /src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage
parent10aee9adf7a1ab793a05fd9327cec6fcc1b267d2 (diff)
parentbdb6fc4a5410d68cf517dbe90fa49cec45bbda5a (diff)
downloadGT5-Unofficial-e3f4a410ef0867359cab3ade72a20c3679aaad06.tar.gz
GT5-Unofficial-e3f4a410ef0867359cab3ade72a20c3679aaad06.tar.bz2
GT5-Unofficial-e3f4a410ef0867359cab3ade72a20c3679aaad06.zip
Merge pull request #19 from draknyte1/DesktopPC
+ Added some Buttons to the workbench (WIP) $ Workbench now uses the vanilla recipe handler. $ Fixed the tool slots on the Workbench accepting the wrong items in certain cases. + Added hundreds of new machine recipes for all of the materials, due to below. $ Rewrote recipe generation classes, things like plate bending and extrusion recipes now fall in line with GT tiering. + Added more functions to Materials.java, now you can get any item from them. (getDustSmall(5)) % Changed tool handling to better support older versions of Gregtech that don't allow Wrenchs to work as a BC/EIO wrench. % Moved more GT related content to HANDLER_GT. + Added a basic re-implementation of the Meta Tile Entity system for GT Machines, using my own blocks as a base. In a feeble attempt to store NBT data to Itemblocks on drop/break. % Changed lots of debug logging to only show in debug mode, if I missed anything, let me know.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
index 7a2e49492d..6bce3b9f67 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
@@ -16,10 +16,10 @@ public class GT_MetaTileEntity_TieredTank
extends GregtechMetaBasicTank {
protected FluidStack internalTank = getInternalStack();
- protected String fluidName = getFluidName();
- protected int fluidAmount = getInternalFluidAmount();
+ /*protected String fluidName = getFluidName();
+ protected int fluidAmount = getInternalFluidAmount();*/
- private String getFluidName(){
+ /*private String getFluidName(){
String x;
if (internalTank != null){
x = internalTank.getFluid().getName();
@@ -39,7 +39,7 @@ public class GT_MetaTileEntity_TieredTank
x = 0;
}
return x;
- }
+ }*/
public GT_MetaTileEntity_TieredTank(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, 3, "Stores " + ((int) (Math.pow(2, aTier) * 32000)) + "L of fluid");
@@ -89,8 +89,14 @@ public class GT_MetaTileEntity_TieredTank
@Override
public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
- if (aBaseMetaTileEntity.isClientSide()) return true;
+ Utils.LOG_INFO("Right Click on Block");
+ if (aBaseMetaTileEntity.isClientSide()){
+ Utils.LOG_INFO("MTE is ClientSide");
+ return true;
+ }
+ Utils.LOG_INFO("MTE is not ClientSide");
aBaseMetaTileEntity.openGUI(aPlayer);
+ Utils.LOG_INFO("MTE is now has an open GUI");
return true;
}