aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-11-28 16:18:16 +1000
committerAlkalus <draknyte1@hotmail.com>2017-11-28 16:18:16 +1000
commit6bf6499f68796e77ee76d523e5dc706e08d51288 (patch)
tree5b13fa4f9c1e5e08690337b9bb6f21dbaca62c43 /src/Java/gtPlusPlus/xmod/gregtech/common
parent652faa496015f7d70a1e4f1837d37558a82e4c14 (diff)
downloadGT5-Unofficial-6bf6499f68796e77ee76d523e5dc706e08d51288.tar.gz
GT5-Unofficial-6bf6499f68796e77ee76d523e5dc706e08d51288.tar.bz2
GT5-Unofficial-6bf6499f68796e77ee76d523e5dc706e08d51288.zip
$ Fixed Thermal Centrifuge Structure check.
$ Moved all SubscribeEvents to it's own handler function. % Adjusted tooltips of the Thermal Plant and the Wash Plant to reflect their actual dimensions.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java11
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java2
2 files changed, 5 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
index 2ffa242fc2..7826e9fcfe 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
@@ -8,15 +8,12 @@ import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import net.minecraft.block.Block;
@@ -44,7 +41,7 @@ extends GregtechMeta_MultiBlockBase {
return new String[]{
"Controller Block for the Industrial Thermal Centrifuge",
"60% faster than using single block machines of the same voltage",
- "Size: 3x2x3 [WxLxH] (Hollow)", "Controller (front centered)",
+ "Size: 3x2x3 [WxHxL]", "Controller (front centered)",
"1x Input Bus (Any casing)",
"1x Output Bus (Any casing)",
"1x Maintenance Hatch (Any casing)",
@@ -143,8 +140,8 @@ extends GregtechMeta_MultiBlockBase {
int tAmount = 0;
for (int i = -1; i < 2; ++i) {
for (int j = -1; j < 2; ++j) {
- for (int h = -1; h < 1; ++h) {
- if ((h != 0) || ((((xDir + i != 0) || (zDir + j != 0))) && (((i != 0) || (j != 0))))) {
+ for (int h = -1; h < 0; ++h) {
+ //if ((h != 0) || ((((xDir + i != 0) || (zDir + j != 0))) && (((i != 0) || (j != 0))))) {
IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h,
zDir + j);
if (!addToMachineList(tTileEntity)) {
@@ -157,7 +154,7 @@ extends GregtechMeta_MultiBlockBase {
}
++tAmount;
}
- }
+ //}
}
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
index 9b7927c5ad..3309010054 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
@@ -48,7 +48,7 @@ extends GregtechMeta_MultiBlockBase {
return new String[]{
"Controller Block for the Industrial Ore Washing Plant",
"80% faster than using single block machines of the same voltage",
- "Size: 7x2x5 [WxHxL] (open)",
+ "Size: 7x3x5 [WxHxL] (open)",
"X X",
"X X",
"XXXXX",