aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/api
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-09-01 14:24:32 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-09-01 14:24:32 +1000
commit64bb2d7847ddb4eb9fba868f2b27ccd2c9582a00 (patch)
tree095ad534f7a1957902ae68b7521dcc3ea5a1b349 /src/Java/gtPlusPlus/api
parentdb20475a5973d588a9ef9e52feb22da0f4b92205 (diff)
downloadGT5-Unofficial-64bb2d7847ddb4eb9fba868f2b27ccd2c9582a00.tar.gz
GT5-Unofficial-64bb2d7847ddb4eb9fba868f2b27ccd2c9582a00.tar.bz2
GT5-Unofficial-64bb2d7847ddb4eb9fba868f2b27ccd2c9582a00.zip
$ Reworked the Chunk loaders.
> Maybe they work now?
Diffstat (limited to 'src/Java/gtPlusPlus/api')
-rw-r--r--src/Java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java13
-rw-r--r--src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java6
2 files changed, 16 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java b/src/Java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java
new file mode 100644
index 0000000000..fa59c58d9f
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java
@@ -0,0 +1,13 @@
+package gtPlusPlus.api.interfaces;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public interface IGregtechPacketEntity {
+
+ public void writePacketData(DataOutputStream data) throws IOException;
+
+ public void readPacketData(DataInputStream data) throws IOException;
+
+}
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java b/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java
index b0975dcca7..826f0c5106 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java
@@ -344,8 +344,8 @@ public class ChunkManager implements LoadingCallback, OrderedLoadingCallback, Fo
if (H != null) {
ForgeChunkManager.releaseTicket(H);
}
- f.forceChunkLoading(ticket);
- printAnchor("Force Chunk Loading. Chunk Loader has ID of "+f.getLoaderID()+". ",x,y,z);
+ f.forceChunkLoading(f.getBaseMetaTileEntity(), ticket);
+ printAnchor("Force Chunk Loading. Chunk Loader has ID of "+f.getUUID().toString()+". ",x,y,z);
}
else {
Logger.INFO("Tile Entity is null.");
@@ -445,7 +445,7 @@ public class ChunkManager implements LoadingCallback, OrderedLoadingCallback, Fo
for (Triplet<Integer, GregtechMetaTileEntityChunkLoader, DimChunkPos> j : mChunkLoaderManagerMap.values()) {
Ticket T;
Chunk C;
- T = j.getValue_2().getTicketFromForge();
+ T = j.getValue_2().getTicketFromForge(j.getValue_2().getBaseMetaTileEntity());
C = j.getValue_3().getChunk();
ForgeChunkManager.forceChunk(T, C.getChunkCoordIntPair());
Logger.INFO("[Chunk Loader] Trying to force load a chunk that holds a chunkloader. [Timer]");