upstream/ThaumicHorizons
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicHorizons.git synced 2026-10-26 14:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

added dim to portal values

Browse Source
This commit is contained in:
KiloJoel committed 2021-01-17 23:44:13 +00:00
1 parent 3134edcc72
commit 3f54a201c7
3 files changed
+18 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/kentington/thaumichorizons/common/blocks/BlockPortalTH.java
+10 -1
View File
@@ -87,6 +87,7 @@ public class BlockPortalTH extends BlockBreakable
int targetX = 0;
int targetY = 0;
int targetZ = 0;
int targetDim = 0;
if (world.provider.dimensionId == ThaumicHorizons.dimensionPocketId) {
final int planeNum = (z + 128) / 256;
final int which = world.getBlockMetadata(x, y, z);
@@ -95,29 +96,37 @@ public class BlockPortalTH extends BlockBreakable
targetX = PocketPlaneData.planes.get(planeNum).portalA[0];
targetY = PocketPlaneData.planes.get(planeNum).portalA[1] - 2;
targetZ = PocketPlaneData.planes.get(planeNum).portalA[2];
if (PocketPlaneData.planes.get(planeNum).portalA.length > 3)
targetDim = PocketPlaneData.planes.get(planeNum).portalA[3];
break;
}
case 2: {
targetX = PocketPlaneData.planes.get(planeNum).portalB[0];
targetY = PocketPlaneData.planes.get(planeNum).portalB[1] - 2;
targetZ = PocketPlaneData.planes.get(planeNum).portalB[2];
if (PocketPlaneData.planes.get(planeNum).portalB.length > 3)
targetDim = PocketPlaneData.planes.get(planeNum).portalB[3];
break;
}
case 1: {
targetX = PocketPlaneData.planes.get(planeNum).portalC[0];
targetY = PocketPlaneData.planes.get(planeNum).portalC[1] - 2;
targetZ = PocketPlaneData.planes.get(planeNum).portalC[2];
if (PocketPlaneData.planes.get(planeNum).portalC.length > 3)
targetDim = PocketPlaneData.planes.get(planeNum).portalC[3];
break;
}
case 3: {
targetX = PocketPlaneData.planes.get(planeNum).portalD[0];
targetY = PocketPlaneData.planes.get(planeNum).portalD[1] - 2;
targetZ = PocketPlaneData.planes.get(planeNum).portalD[2];
if (PocketPlaneData.planes.get(planeNum).portalD.length == 4)
targetDim = PocketPlaneData.planes.get(planeNum).portalD[3];
break;
}
}
final MinecraftServer mServer = FMLCommonHandler.instance().getMinecraftServerInstance();
((EntityPlayerMP)player).mcServer.getConfigurationManager().transferPlayerToDimension((EntityPlayerMP)player, 0, (Teleporter)new GatewayTeleporter(mServer.worldServerForDimension(ThaumicHorizons.dimensionPocketId), targetX, targetY, targetZ, player.rotationYaw));
((EntityPlayerMP)player).mcServer.getConfigurationManager().transferPlayerToDimension((EntityPlayerMP)player, targetDim, (Teleporter)new GatewayTeleporter(mServer.worldServerForDimension(ThaumicHorizons.dimensionPocketId), targetX, targetY, targetZ, player.rotationYaw));
}
else {
int slotY = y;
src/main/java/com/kentington/thaumichorizons/common/lib/PocketPlaneData.java
+4 -4
View File
@@ -102,10 +102,10 @@ public class PocketPlaneData {
vortex.dimensionID = PocketPlaneData.planes.size();
vortex.createdDimension = true;
world.setTileEntity(xCenter, yCenter + 1, zCenter,vortex);
data.portalA = new int[3];
data.portalB = new int[3];
data.portalC = new int[3];
data.portalD = new int[3];
data.portalA = new int[4];
data.portalB = new int[4];
data.portalC = new int[4];
data.portalD = new int[4];
PocketPlaneData.planes.add(data);
PocketPlaneData.positions.put(pocketPlaneMAXID,Vec3.createVectorHelper((double) vortexX, (double) vortexY, (double) vortexZ));
//System.out.println("Finished with pocket plane generation!");
src/main/java/com/kentington/thaumichorizons/common/tiles/TileSlot.java
+4
View File
@@ -162,24 +162,28 @@ public class TileSlot extends TileThaumcraft
PocketPlaneData.planes.get(this.pocketID).portalA[0] = this.xCoord;
PocketPlaneData.planes.get(this.pocketID).portalA[1] = this.yCoord;
PocketPlaneData.planes.get(this.pocketID).portalA[2] = this.zCoord;
PocketPlaneData.planes.get(this.pocketID).portalA[3] = player.dimension;
break;
}
case 2: {
PocketPlaneData.planes.get(this.pocketID).portalB[0] = this.xCoord;
PocketPlaneData.planes.get(this.pocketID).portalB[1] = this.yCoord;
PocketPlaneData.planes.get(this.pocketID).portalB[2] = this.zCoord;
PocketPlaneData.planes.get(this.pocketID).portalB[3] = player.dimension;
break;
}
case 3: {
PocketPlaneData.planes.get(this.pocketID).portalC[0] = this.xCoord;
PocketPlaneData.planes.get(this.pocketID).portalC[1] = this.yCoord;
PocketPlaneData.planes.get(this.pocketID).portalC[2] = this.zCoord;
PocketPlaneData.planes.get(this.pocketID).portalC[3] = player.dimension;
break;
}
case 4: {
PocketPlaneData.planes.get(this.pocketID).portalD[0] = this.xCoord;
PocketPlaneData.planes.get(this.pocketID).portalD[1] = this.yCoord;
PocketPlaneData.planes.get(this.pocketID).portalD[2] = this.zCoord;
PocketPlaneData.planes.get(this.pocketID).portalD[3] = player.dimension;
break;
}
}