Bug fixes

Runemoro · Runemoro · commit 649bb9398b1b · 2017-12-26T05:47:46.000-05:00
diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimensionalDoor.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimensionalDoor.java
@@ -24,7 +24,9 @@ public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos
         if (result == EnumActionResult.SUCCESS) {
             if (!world.getBlockState(pos).getBlock().isReplaceable(world, pos)) pos = pos.offset(facing);
             IBlockState state = world.getBlockState(pos);
-            ((IRiftProvider<?>) state.getBlock()).handleRiftSetup(world, pos, state);
+            if (state.getBlock() instanceof IRiftProvider<?>) { // In case the door is placed on glass/leaves
+                ((IRiftProvider<?>) state.getBlock()).handleRiftSetup(world, pos, state);
+            }
         }
         return result;
     }
diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftRemover.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftRemover.java
@@ -25,6 +25,7 @@ public ItemRiftRemover() {
         setCreativeTab(DimDoors.DIM_DOORS_CREATIVE_TAB);
         setUnlocalizedName(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        maxStackSize = 1;
     }
 
     @Override
diff --git a/src/main/java/com/zixiken/dimdoors/shared/pockets/Pocket.java b/src/main/java/com/zixiken/dimdoors/shared/pockets/Pocket.java
@@ -160,7 +160,9 @@ public void linkPocketTo(RiftDestination linkTo) {
                 RiftDestination dest = wdest.getDestination();
                 if (dest instanceof PocketExitDestination) {
                     destIterator.remove();
+                    if (rift.isRegistered()) dest.unregister(rift);
                     destIterator.add(new WeightedRiftDestination(linkTo, wdest.getWeight(), wdest.getGroup(), dest));
+                    if (rift.isRegistered()) linkTo.register(rift);
                     if (rift instanceof TileEntityEntranceRift && !rift.isAlwaysDelete()) {
                         ((TileEntityEntranceRift) rift).setPlaceRiftOnBreak(true); // We modified the door's state
                     }
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/AvailableLinkDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/AvailableLinkDestination.java
@@ -6,6 +6,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
@@ -15,7 +16,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-@Getter @AllArgsConstructor @Builder(toBuilder = true)
+@Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class AvailableLinkDestination extends RiftDestination { // TODO
     private float newDungeonRiftProbability;
     private float depthPenalization; // TODO: these make the equation assymetric
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/EscapeDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/EscapeDestination.java
@@ -8,10 +8,11 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 
-@Getter @AllArgsConstructor @Builder(toBuilder = true)
+@Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class EscapeDestination extends RiftDestination {
     //public EscapeDestination() {}
 
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/GlobalDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/GlobalDestination.java
@@ -4,10 +4,11 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 
-@Getter @AllArgsConstructor @Builder(toBuilder = true)
+@Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class GlobalDestination extends RiftDestination { // TODO: location directly in nbt like minecraft?
     private Location loc;
 
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/LimboDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/LimboDestination.java
@@ -5,10 +5,11 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 
-@Getter @AllArgsConstructor @Builder(toBuilder = true)
+@Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class LimboDestination extends RiftDestination {
     //public LimboDestination() {}
 
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/LocalDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/LocalDestination.java
@@ -5,11 +5,12 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
 
-@Getter @AllArgsConstructor @Builder(toBuilder = true)
+@Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class LocalDestination extends RiftDestination { // TODO: use BlockPos
     private BlockPos pos;
 
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/NewPublicDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/NewPublicDestination.java
@@ -5,10 +5,11 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 
-@Getter @AllArgsConstructor @Builder(toBuilder = true)
+@Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class NewPublicDestination extends RiftDestination { // TODO: more config options such as non-default size, etc.
     //public NewPublicDestination() {}
 
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/PocketEntranceDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/PocketEntranceDestination.java
@@ -4,6 +4,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTBase;
@@ -13,7 +14,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-@Getter @AllArgsConstructor @Builder(toBuilder = true)
+@Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class PocketEntranceDestination extends RiftDestination {
     private float weight;
     @SuppressWarnings({"UnusedAssignment", "RedundantSuppression"}) @Builder.Default private List<WeightedRiftDestination> ifDestinations = new LinkedList<>(); // TODO addIfDestination method in builder
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/PocketExitDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/PocketExitDestination.java
@@ -4,11 +4,12 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 
-@Getter @AllArgsConstructor @Builder(toBuilder = true)
+@Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class PocketExitDestination extends RiftDestination {
     //public PocketExitDestination() {}
 
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/PrivatePocketExitDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/PrivatePocketExitDestination.java
@@ -12,11 +12,12 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 
-@Getter @AllArgsConstructor @Builder(toBuilder = true)
+@Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class PrivatePocketExitDestination extends RiftDestination { // TODO: merge into PocketExit or Escape?
     //public PrivatePocketExitDestination() {}
 
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/RelativeDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/RelativeDestination.java
@@ -5,11 +5,12 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.Vec3i;
 
-@Getter @AllArgsConstructor @Builder(toBuilder = true)
+@Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class RelativeDestination extends RiftDestination { // TODO: use Vec3i
     private Vec3i offset;
 
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/RiftDestination.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/RiftDestination.java
@@ -10,7 +10,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 
-@Getter @ToString @EqualsAndHashCode
+@Getter @EqualsAndHashCode @ToString
 public abstract class RiftDestination implements INBTStorable {
 
     /*private*/ public static final BiMap<String, Class<? extends RiftDestination>> destinationRegistry = HashBiMap.create(); // TODO: move to RiftDestinationRegistry
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/RiftRegistry.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/RiftRegistry.java
@@ -313,7 +313,7 @@ public static void addLink(Location from, Location to) {
         RiftRegistry registryFrom = getRegistry(from);
         RiftRegistry registryTo = getRegistry(to);
         registryFrom.rifts.get(from).destinations.add(to);
-        registryTo.rifts.get(to).destinations.add(from);
+        registryTo.rifts.get(to).sources.add(from);
         registryFrom.markDirty();
         registryTo.markDirty();
     }
@@ -322,7 +322,7 @@ public static void removeLink(Location from, Location to) {
         RiftRegistry registryFrom = getRegistry(from);
         RiftRegistry registryTo = getRegistry(to);
         registryFrom.rifts.get(from).destinations.remove(to);
-        registryTo.rifts.get(to).destinations.remove(from);
+        registryTo.rifts.get(to).sources.remove(from);
         registryFrom.markDirty();
         registryTo.markDirty();
     }
diff --git a/src/main/java/com/zixiken/dimdoors/shared/rifts/TileEntityRift.java b/src/main/java/com/zixiken/dimdoors/shared/rifts/TileEntityRift.java
@@ -158,10 +158,17 @@ public void addDestination(RiftDestination destination, float weight, int group)
         markDirty();
     }
 
-    public void removeDestination(int index) {
+    public void addDestination(RiftDestination destination, float weight, int group, RiftDestination oldDestination) {
         riftStateChanged = true;
-        RiftDestination dest = destinations.remove(index).getDestination();
-        if (isRegistered()) dest.unregister(this);
+        destinations.add(new WeightedRiftDestination(destination, weight, group, oldDestination));
+        if (isRegistered()) destination.register(this);
+        markDirty();
+    }
+
+    public void removeDestination(WeightedRiftDestination dest) {
+        riftStateChanged = true;
+        destinations.remove(dest);
+        if (isRegistered()) dest.getDestination().unregister(this);
         markDirty();
     }
 
@@ -196,8 +203,8 @@ public void makeDestinationPermanent(WeightedRiftDestination weightedDestination
         } else {
             newDest = new GlobalDestination(destLoc);
         }
-        destinations.remove(weightedDestination);
-        destinations.add(new WeightedRiftDestination(newDest, weightedDestination.getWeight(), weightedDestination.getGroup(), weightedDestination.getDestination()));
+        removeDestination(weightedDestination);
+        addDestination(newDest, weightedDestination.getWeight(), weightedDestination.getGroup(), weightedDestination.getDestination());
         markDirty();
     }
 
@@ -217,7 +224,7 @@ public void register() {
 
     public void unregister() {
         if (!isRegistered()) return;
-        RiftRegistry.removeRift(new Location(world, pos));
+        RiftRegistry.removeRift(new Location(world, pos)); // TODO: unregister destinations
         if (DimDoorDimensions.isPocketDimension(WorldUtils.getDim(world))) {
             PocketRegistry pocketRegistry = PocketRegistry.getForDim(WorldUtils.getDim(world));
             Pocket pocket = pocketRegistry.getPocketAt(pos);
@@ -246,10 +253,11 @@ public void destinationGone(Location loc) {
             WeightedRiftDestination wdest = wdestIterator.next();
             RiftDestination dest = wdest.getDestination();
             if (loc.equals(dest.getReferencedRift(getLocation()))) {
-                wdestIterator.remove();
+                wdestIterator.remove(); // TODO: unregister*
                 RiftDestination oldDest = wdest.getOldDestination();
                 if (oldDest != null) {
                     wdestIterator.add(new WeightedRiftDestination(oldDest, wdest.getWeight(), wdest.getGroup()));
+                    if (isRegistered()) oldDest.register(this);
                 }
             }
         }
@@ -262,7 +270,7 @@ public boolean teleport(Entity entity) {
 
         // Check that the rift has destinations
         if (destinations.size() == 0) {
-            if (entity instanceof EntityPlayer) DimDoors.chat((EntityPlayer) entity, "This rift has no destinations!");
+            DimDoors.chat(entity, "This rift has no destinations!");
             return false;
         }
 
@@ -290,7 +298,7 @@ public boolean teleport(Entity entity) {
                 return true;
             }
         } catch (Exception e) {
-            if (entity instanceof EntityPlayer) DimDoors.chat((EntityPlayer) entity, "There was an exception while teleporting!");
+            DimDoors.chat(entity, "There was an exception while teleporting!");
             DimDoors.log.error("Teleporting failed with the following exception: ", e);
         }
         return false;

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@ public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos`
`24`	`24`	`if (result == EnumActionResult.SUCCESS) {`
`25`	`25`	`if (!world.getBlockState(pos).getBlock().isReplaceable(world, pos)) pos = pos.offset(facing);`
`26`	`26`	`IBlockState state = world.getBlockState(pos);`
`27`		`- ((IRiftProvider<?>) state.getBlock()).handleRiftSetup(world, pos, state);`
	`27`	`+ if (state.getBlock() instanceof IRiftProvider<?>) { // In case the door is placed on glass/leaves`
	`28`	`+ ((IRiftProvider<?>) state.getBlock()).handleRiftSetup(world, pos, state);`
	`29`	`+ }`
`28`	`30`	`}`
`29`	`31`	`return result;`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public ItemRiftRemover() {`
`25`	`25`	`setCreativeTab(DimDoors.DIM_DOORS_CREATIVE_TAB);`
`26`	`26`	`setUnlocalizedName(ID);`
`27`	`27`	`setRegistryName(new ResourceLocation(DimDoors.MODID, ID));`
	`28`	`+ maxStackSize = 1;`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`@Override`