diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')
3 files changed, 25 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java index 15bd666b53..05abaa00da 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java @@ -10,6 +10,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.ToolDictNames; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.objects.ItemData; import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_Log; @@ -42,6 +43,9 @@ import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class Meta_GT_Proxy { + + //Store Some MetaTileEntity Data here, why not? + public static final IMetaTileEntity[] METATILEENTITIES = new IMetaTileEntity[GregTech_API.MAXIMUM_METATILE_IDS]; //Silly Vars private static final Collection<String> mIgnoredItems = new HashSet<String>(Arrays.asList(new String[]{"itemGhastTear", "itemFlint", "itemClay", "itemBucketSaltWater", diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java index b78980f3e3..7d6c3caec7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java @@ -77,9 +77,9 @@ public class GregtechMetaTileEntityMultiTank private long getMaximumTankStorage(){ int multiplier = getStorageMultiplier(); - Utils.LOG_INFO("x = "+multiplier+" * 96000"); + Utils.LOG_WARNING("x = "+multiplier+" * 96000"); long tempTankStorageMax = (96000*multiplier); - Utils.LOG_INFO("x = "+tempTankStorageMax); + Utils.LOG_WARNING("x = "+tempTankStorageMax); if (tempTankStorageMax <= 0){ return 96000; } @@ -207,7 +207,7 @@ public class GregtechMetaTileEntityMultiTank int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) { - Utils.LOG_INFO("Must be hollow."); + Utils.LOG_WARNING("Must be hollow."); return false; } int tAmount = 0; @@ -219,20 +219,20 @@ public class GregtechMetaTileEntityMultiTank if ((!addMaintenanceToMachineList(tTileEntity, 17)) && (!addInputToMachineList(tTileEntity, 17)) && (!addOutputToMachineList(tTileEntity, 17)) && (!addEnergyInputToMachineList(tTileEntity, 17))) { if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) { if (h < 3){ - Utils.LOG_INFO("Casing Expected."); + Utils.LOG_WARNING("Casing Expected."); return false; } else if (h >= 3){ - //Utils.LOG_INFO("Your Multitank can be 20 blocks tall."); + //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); } } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 11) { if (h < 3){ - Utils.LOG_INFO("Wrong Meta."); + Utils.LOG_WARNING("Wrong Meta."); return false; } else if (h >= 3){ - //Utils.LOG_INFO("Your Multitank can be 20 blocks tall."); + //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); } } if (h < 3){ @@ -240,10 +240,10 @@ public class GregtechMetaTileEntityMultiTank } else if (h >= 3){ if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) == Blocks.air || aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getUnlocalizedName().contains("residual")){ - Utils.LOG_INFO("Found air"); + Utils.LOG_WARNING("Found air"); } else { - Utils.LOG_INFO("Layer "+(h+2)+" is complete. Adding "+(64000*9)+"L storage to the tank."); + Utils.LOG_WARNING("Layer "+(h+2)+" is complete. Adding "+(64000*9)+"L storage to the tank."); tAmount++; } } @@ -253,7 +253,7 @@ public class GregtechMetaTileEntityMultiTank } } multiblockCasingCount = (short) tAmount; - Utils.LOG_INFO("Your Multitank can be 20 blocks tall."); + Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); Utils.LOG_INFO("Casings Count: "+tAmount+" Valid Multiblock: "+(tAmount >= 16)+" Tank Storage Capacity:"+getMaximumTankStorage()+"L"); return tAmount >= 16; } 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; } |