diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java index a1c7c6b..85ccafe 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -74,7 +74,10 @@ public class EventHookContainer RiftRegenerator.regenerateRiftsInAllWorlds(); } - this.playMusicForDim(event.world); + if(event.world!=null) + { + this.playMusicForDim(event.world); + } } @ForgeSubscribe diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/core/NewDimData.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/NewDimData.java index fa7c786..aa773bf 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/core/NewDimData.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/core/NewDimData.java @@ -372,19 +372,7 @@ public abstract class NewDimData public boolean deleteLink(int x, int y, int z) { Point4D location = new Point4D(x, y, z, id); - InnerDimLink target = linkMapping.remove(location); - if (target != null) - { - linkList.remove(target); - //Raise deletion event - //TODO why is source null here? - if(target.link!=null) - { - linkWatcher.onDeleted(target.link); - } - target.clear(); - } - return (target != null); + return this.deleteLink(this.getLink(location)); } public DimLink getLink(int x, int y, int z) diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java index 4bdd735..7dc1c64 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java @@ -73,9 +73,9 @@ public class TileEntityDimDoorGold extends TileEntityDimDoor implements IChunkLo break; } - for(int chunkX = -1; chunkX<2;chunkX++) + for(int chunkX = -2; chunkX<3;chunkX++) { - for(int chunkZ = -1; chunkZ<2;chunkZ++) + for(int chunkZ = -2; chunkZ<3;chunkZ++) { ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair((origin.getX()+xOffset >> 4)+chunkX, (origin.getZ()+zOffset >> 4)+chunkZ)); } diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java index 442d4e1..7a1b38a 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java @@ -175,7 +175,7 @@ public class TileEntityRift extends TileEntity private void closeRift() { NewDimData dimension = PocketManager.getDimensionData(worldObj); - if (count2 > 20 && count2 < 22) + if (count2 == 20) { ArrayList rifts= dimension.findRiftsInRange(worldObj, 6, xCoord, yCoord, zCoord); if (rifts.size()>0) diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith0.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith0.png new file mode 100644 index 0000000..afcb31d Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith0.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith1.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith1.png new file mode 100644 index 0000000..e22b321 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith1.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith10.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith10.png new file mode 100644 index 0000000..d5d398a Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith10.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith11.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith11.png new file mode 100644 index 0000000..89df625 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith11.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith12.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith12.png new file mode 100644 index 0000000..85eb0b0 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith12.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith13.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith13.png new file mode 100644 index 0000000..5724818 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith13.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith14.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith14.png new file mode 100644 index 0000000..93938fa Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith14.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith15.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith15.png new file mode 100644 index 0000000..1ccc663 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith15.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith16.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith16.png new file mode 100644 index 0000000..56be9da Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith16.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith17.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith17.png new file mode 100644 index 0000000..223a645 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith17.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith18.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith18.png new file mode 100644 index 0000000..00ba1d0 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith18.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith2.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith2.png new file mode 100644 index 0000000..7496197 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith2.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith3.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith3.png new file mode 100644 index 0000000..e40fe2a Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith3.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith4.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith4.png new file mode 100644 index 0000000..1296d62 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith4.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith5.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith5.png new file mode 100644 index 0000000..b38fcad Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith5.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith6.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith6.png new file mode 100644 index 0000000..3fdd3e5 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith6.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith7.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith7.png new file mode 100644 index 0000000..1505ead Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith7.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith8.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith8.png new file mode 100644 index 0000000..1505ead Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith8.png differ diff --git a/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith9.png b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith9.png new file mode 100644 index 0000000..08b63b8 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/mobs/oldMonolith/Monolith9.png differ