Fix lots of vanilla teleportation-related bugs

Author: Runemoro

build.gradle

@@ -74,12 +74,13 @@ minecraft {
     replace '${version}', fullVersion
     makeObfSourceJar = false
     //noinspection GroovyUnusedAssignment
-    def args = [ // TODO: https://github.com/SpongePowered/Mixin/issues/140
+    def args = [
             "-Dfml.noGrab=false",
             "-Dfml.coreMods.load=org.dimdev.vanillafix.VanillaFixCoreMod",
             "-Dmixin.env.compatLevel=JAVA_8",
-            //"-Dmixin.debug.verbose=true",
-            //"-Dmixin.debug.export=true",
+            "-Dmixin.debug=true",
+            "-Dmixin.debug.verbose=true",
+            "-Dmixin.debug.export=true",
             "-Dmixin.checks.interfaces=true"
     ]
 }

src/main/java/org/dimdev/ddutils/schem/Schematic.java

@@ -393,8 +393,6 @@ private void setBlocks(World world, int xBase, int yBase, int zBase) {
         long setTime = 0;
         long relightTime = 0;
         // CubicChunks makes cubic worlds implement ICubicWorld
-        // Just "world instanceof ICubicWorld" would throw a class not found error
-        //noinspection InstanceofIncompatibleInterface
         if (cubicChunks && ((ICubicWorld) world).isCubicWorld()) {
             DimDoors.log.info("Setting cube blockstates");
             ICubicWorld cubicWorld = (ICubicWorld) world;

src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalTrapdoor.java

@@ -1,6 +1,5 @@
 package org.dimdev.dimdoors.shared.blocks;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.BlockTrapDoor;
 import net.minecraft.block.ITileEntityProvider;

src/main/java/org/dimdev/dimdoors/shared/items/ItemRecord.java renamed to src/main/java/org/dimdev/dimdoors/shared/items/ItemModRecord.java

@@ -1,10 +1,11 @@
 package org.dimdev.dimdoors.shared.items;
 
+import net.minecraft.item.ItemRecord;
 import net.minecraft.util.SoundEvent;
 import org.dimdev.dimdoors.DimDoors;
 
-public class ItemRecord extends net.minecraft.item.ItemRecord {
-    protected ItemRecord(String recordName, SoundEvent soundIn) {
+public class ItemModRecord extends ItemRecord {
+    protected ItemModRecord(String recordName, SoundEvent soundIn) {
         super(recordName, soundIn);
         setRegistryName(DimDoors.MODID, "record_" + recordName);
         setUnlocalizedName("record");

src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java

@@ -5,7 +5,6 @@
 import org.dimdev.dimdoors.DimDoors;
 import org.dimdev.dimdoors.client.TileEntityFloatingRiftRenderer;
 import org.dimdev.dimdoors.shared.ModConfig;
-import org.dimdev.dimdoors.shared.tileentities.TileEntityFloatingRift;
 import org.dimdev.ddutils.Location;
 import org.dimdev.ddutils.TeleportUtils;
 import net.minecraft.client.util.ITooltipFlag;

src/main/java/org/dimdev/dimdoors/shared/items/ModItems.java

@@ -53,7 +53,7 @@ public final class ModItems {
     public static final ItemDimensionalTrapdoorWood WOOD_DIMENSIONAL_TRAPDOOR = new ItemDimensionalTrapdoorWood();
 
     // Records
-    public static final ItemRecord CREEPY_RECORD = new ItemRecord("creepy", CREEPY);
+    public static final ItemModRecord CREEPY_RECORD = new ItemModRecord("creepy", CREEPY);
 
     @SubscribeEvent
     public static void registerItems(RegistryEvent.Register<Item> event) {

src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityEntranceRift.java

@@ -22,7 +22,6 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
 import org.dimdev.dimdoors.shared.blocks.BlockDimensionalDoor;
-import org.dimdev.dimdoors.shared.blocks.ModBlocks;
 
 import java.util.Random;
 

src/main/java/org/dimdev/vanillafix/mixins/MixinNetHandlerPlayServer.java

@@ -143,7 +143,6 @@ dimdoors.general.depthSpreadFactor=Depth Spread Factor
 dimdoors.general.depthSpreadFactor.tooltip=The scale of the dispersion when escaping from a pocket or limbo, in blocks/depth. It is important to remember that by default, limbo is treated as depth 50.
 dimdoors.general.riftCloseSpeed=Rift Close Speed
 dimdoors.general.riftCloseSpeed.tooltip=The speed at which rifts close when using the rift remover, in units of rift size per tick.
-dimdoors.general.closeDoorBehind.tooltip=When true, Dimensional Doors will automatically close when the player enters their portal.
 dimdoors.general.teleportOffset=Teleport Offset
 dimdoors.general.teleportOffset.tooltip=Distance in blocks to teleport the player in front of the dimensional door.
 dimdoors.general.riftBoundingBoxInCreative=Rift Bounding Box in Creative
@@ -201,4 +200,4 @@ dimdoors.graphics.showRiftCore.tooltip=Set this to true to always show rifts' co
 dimdoors.graphics.riftSize=Rift Size
 dimdoors.graphics.riftSize.tooltip=Multiplier affecting how large rifts should be rendered, 1 being the default size.
 dimdoors.graphics.riftJitter=Rift Jitter
-dimdoors.graphics.riftSize.tooltip=Multiplier affecting how much rifts should jitter, 1 being the default size.
+dimdoors.graphics.riftJitter.tooltip=Multiplier affecting how much rifts should jitter, 1 being the default size.

src/main/resources/assets/dimdoors/lang/en_US.lang

@@ -109,8 +109,8 @@ dimdoors.general=Options Généralles
 dimdoors.general.tooltip=Options de configuration généralles pour le mod
 dimdoors.general.baseDimensionID=Numéro de dimension de base
 dimdoors.general.baseDimensionID.tooltip=Le numéro de la première dimension de Portes dimensionelles. Les autres dimensions utiliseront des numéros consécutifs. Il est fortement recommendé de laisser cette option à sa valeur par défaut.
-dimdoors.general.useStatusBar.name=Messages dans la barre d'état
-dimdoors.general.useStatusBar.comment=Utiliser la barre d'état pour envoyer des messages plutôt que la boîte de discussion.
+dimdoors.general.useStatusBar=Messages dans la barre d'état
+dimdoors.general.useStatusBar.tooltip=Utiliser la barre d'état pour envoyer des messages plutôt que la boîte de discussion.
 dimdoors.pockets=Options sur les dimensions de poche
 dimdoors.pockets.tooltip=Options qui déterminent l'espacement et la grandeur maximalle des dimensions de poche dans la dimension qui les contient
 dimdoors.world=Options de génération de monde