diff options
3 files changed, 9 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java index 58c0f6f498..f655c2d2bf 100644 --- a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java +++ b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java @@ -16,7 +16,7 @@ import java.util.Iterator; public class GT_Container_Teleporter extends GT_ContainerMetaTile_Machine { - //public int mEgg = 0; + public int mEgg = 0; public int mTargetD = 0; public int mTargetZ = 0; public int mTargetY = 0; @@ -119,7 +119,7 @@ public class GT_Container_Teleporter this.mTargetY = ((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).mTargetY; this.mTargetZ = ((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).mTargetZ; this.mTargetD = ((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).mTargetD; - //this.mEgg = (((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).hasDimensionalTeleportCapability() ? 1 : 0); + this.mEgg = (((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).hasDimensionalTeleportCapability() ? 1 : 0); Iterator var2 = this.crafters.iterator(); while (var2.hasNext()) { @@ -132,7 +132,7 @@ public class GT_Container_Teleporter var1.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16); var1.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF); var1.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16); - //var1.sendProgressBarUpdate(this, 108, 1); + var1.sendProgressBarUpdate(this, 108, this.mEgg); } } @@ -164,8 +164,8 @@ public class GT_Container_Teleporter case 107: this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16); break; - //case 108: - // this.mEgg = par2; + case 108: + this.mEgg = par2; } } } diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java index 095e1b66e0..5f89f60e49 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java @@ -19,10 +19,10 @@ public class GT_GUIContainer_Teleporter this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetX), 46, 16, 16448255); this.fontRendererObj.drawString("Y: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetY), 46, 24, 16448255); this.fontRendererObj.drawString("Z: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetZ), 46, 32, 16448255); - //if (((GT_Container_Teleporter) this.mContainer).mEgg > 0) { + if (((GT_Container_Teleporter) this.mContainer).mEgg > 0) { this.fontRendererObj.drawString("Dim: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetD), 46, 40, 16448255); this.fontRendererObj.drawString("Dim Valid: " + (GT_Utility.isRealDimension(((GT_Container_Teleporter) this.mContainer).mTargetD) ? "Yes":"No"), 46, 48, 16448255); - //} + } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java index e8b7f90e3d..954377830e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java @@ -215,6 +215,8 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank { } } } + + public boolean hasDimensionalTeleportCapability() {return true;} public boolean isDimensionalTeleportAvailable() { return (this.mDebug) || ((GT_Utility.isRealDimension(this.mTargetD)) && (GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId))); |