aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-02-08 23:08:38 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-02-08 23:08:38 +1000
commita9c1cbd0288f630fc273a7a10b10a68dbcd3b134 (patch)
tree95b24b34cea03766d40355285d48d0f59bddfcbf /src/Java/gtPlusPlus/xmod
parent03bcdb88d8c71fcb7c61817722e11882d0fb1a62 (diff)
downloadGT5-Unofficial-a9c1cbd0288f630fc273a7a10b10a68dbcd3b134.tar.gz
GT5-Unofficial-a9c1cbd0288f630fc273a7a10b10a68dbcd3b134.tar.bz2
GT5-Unofficial-a9c1cbd0288f630fc273a7a10b10a68dbcd3b134.zip
+ Added recipe for Fishing Port and Aquatic Casings.
+ Added Fishing Port config option.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java19
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java3
2 files changed, 13 insertions, 9 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
index df8f40e633..7bdc5ae2f2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
@@ -210,12 +210,14 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredM
short mSize = (short) mChunkLoaderManagerMap.size();
this.mChunkLoaderMapID = mSize;
if (this != null && this.getBaseMetaTileEntity() != null) {
- if (!isRegistered()) {
- BlockPos thisPos = new BlockPos(this.xCoord, this.yCoord, this.zCoord, this.getBaseMetaTileEntity().getWorld().provider.dimensionId);
- Triplet<Integer, GregtechMetaTileEntityChunkLoader, DimChunkPos> loaderData = new Triplet<Integer, GregtechMetaTileEntityChunkLoader, DimChunkPos>((int) this.mChunkLoaderMapID, this, new DimChunkPos(this.getBaseMetaTileEntity().getWorld(), thisPos));
- mChunkLoaderManagerMap.put(thisPos, loaderData);
- Logger.INFO("[Chunk Loader] Registered Chunk loader ["+this.mChunkLoaderMapID+"]"+thisPos.getLocationString());
- //mChunkLoaders.put(new BlockPos(this.xCoord, this.yCoord, this.zCoord, this.getBaseMetaTileEntity().getWorld().provider.dimensionId),this);
+ if (!isRegistered()) {
+ if (this.xCoord != 0 && this.yCoord != 0 && this.zCoord != 0) {
+ BlockPos thisPos = new BlockPos(this.xCoord, this.yCoord, this.zCoord, this.getBaseMetaTileEntity().getWorld().provider.dimensionId);
+ Triplet<Integer, GregtechMetaTileEntityChunkLoader, DimChunkPos> loaderData = new Triplet<Integer, GregtechMetaTileEntityChunkLoader, DimChunkPos>((int) this.mChunkLoaderMapID, this, new DimChunkPos(this.getBaseMetaTileEntity().getWorld(), thisPos));
+ mChunkLoaderManagerMap.put(thisPos, loaderData);
+ Logger.INFO("[Chunk Loader] Registered Chunk loader ["+this.mChunkLoaderMapID+"]"+thisPos.getLocationString());
+ //mChunkLoaders.put(new BlockPos(this.xCoord, this.yCoord, this.zCoord, this.getBaseMetaTileEntity().getWorld().provider.dimensionId),this);
+ }
}
}
}
@@ -341,7 +343,7 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredM
if (!hasTicket)
chunks = null;
else {
- if (this.mTier == 3) {
+ /*if (this.mTier == 3) {
chunks = ChunkManager.getInstance().getChunksAround(this.getBaseMetaTileEntity().getXCoord() >> 4, this.getBaseMetaTileEntity().getZCoord() >> 4, ANCHOR_RADIUS);
}
else if (this.mTier == 4) {
@@ -349,7 +351,8 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredM
}
else if (this.mTier == 5) {
chunks = ChunkManager.getInstance().getChunksAround(this.getBaseMetaTileEntity().getXCoord() >> 4 >> 4 >> 4, ((this.getBaseMetaTileEntity().getZCoord() >> 4) >> 4) >> 4, ANCHOR_RADIUS);
- }
+ } */
+ chunks = ChunkManager.getInstance().getChunksAround(this.getBaseMetaTileEntity().getXCoord() >> 4, this.getBaseMetaTileEntity().getZCoord() >> 4, ANCHOR_RADIUS);
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java
index b9e4fc2880..0c3dcf0903 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java
@@ -74,9 +74,10 @@ extends GregtechMeta_MultiBlockBase {
"Controller (front centered)",
"1x Output Bus (Any casing)",
"1x Input Bus (Any casing)",
- "1x Input Hatch (Any casing)",
+ "1x Input Hatch (Any casing, fill with water)",
"1x Maintenance Hatch (Any casing)",
"1x Energy Hatch (Any casing)",
+ "Aquatic Casings for the rest",
CORE.GT_Tooltip
};
}