diff --git a/StevenDimDoors/mod_pocketDim/core/LinkTypes.java b/StevenDimDoors/mod_pocketDim/core/LinkTypes.java index 5e64aff..cce9f9c 100644 --- a/StevenDimDoors/mod_pocketDim/core/LinkTypes.java +++ b/StevenDimDoors/mod_pocketDim/core/LinkTypes.java @@ -5,17 +5,17 @@ public class LinkTypes private LinkTypes() { } public static final int ENUM_MIN = 0; - public static final int ENUM_MAX = 8; + public static final int ENUM_MAX = 7; public static final int CLIENT_SIDE = -1337; + // WARNING: Don't modify these values carelessly or you'll risk breaking links in existing worlds! public static final int NORMAL = 0; - public static final int LIMBO = 1; - public static final int POCKET = 2; - public static final int DUNGEON = 3; - public static final int RANDOM = 4; - public static final int DUNGEON_EXIT = 5; - public static final int SAFE_EXIT = 6; - public static final int UNSAFE_EXIT = 7; - public static final int RANDOM_DUNGEON = 8; + public static final int POCKET = 1; + public static final int DUNGEON = 2; + public static final int RANDOM = 3; + public static final int DUNGEON_EXIT = 4; + public static final int SAFE_EXIT = 5; + public static final int UNSAFE_EXIT = 6; + public static final int RANDOM_DUNGEON = 7; } diff --git a/StevenDimDoors/mod_pocketDim/core/PocketManager.java b/StevenDimDoors/mod_pocketDim/core/PocketManager.java index a03a7b9..a6365f7 100644 --- a/StevenDimDoors/mod_pocketDim/core/PocketManager.java +++ b/StevenDimDoors/mod_pocketDim/core/PocketManager.java @@ -6,15 +6,11 @@ import java.io.File; import java.io.IOException; import java.util.HashMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.helpers.Compactor; import StevenDimDoors.mod_pocketDim.helpers.DeleteFolder; -import StevenDimDoors.mod_pocketDim.tileentities.TileEntityRift; import StevenDimDoors.mod_pocketDim.util.Point4D; import StevenDimDoors.mod_pocketDim.watcher.ClientDimData; import StevenDimDoors.mod_pocketDim.watcher.IUpdateSource; @@ -286,29 +282,6 @@ public class PocketManager } } - public static boolean removeRift(World world, int x, int y, int z, int range, EntityPlayer player, ItemStack item) - { - //Function called by rift tile entities and the rift remover to find and spread between rifts. - //Does not actually unregister the rift data, see deleteRift for that. - - NewDimData dimension = getDimensionData(world); - DimLink nearest = dimension.findNearestRift(world, range, x, y, z); - - if (nearest != null) - { - Point4D location = nearest.source(); - TileEntity tileEntity = world.getBlockTileEntity(location.getX(), location.getY(), location.getZ()); - if (tileEntity != null) - { - TileEntityRift riftEntity = (TileEntityRift) tileEntity; - riftEntity.shouldClose = true; - item.damageItem(1, player); - return true; - } - } - return false; - } - public static NewDimData registerDimension(World world) { return registerDimension(world.provider.dimensionId, null, false, false);