From 4ce32c98285dbfa69dd7fa14fc190fb8b55faad6 Mon Sep 17 00:00:00 2001
From: Waterpicker <Waterpickerenternity@gmail.com>
Date: Mon, 23 Jan 2017 19:58:42 -0600
Subject: [PATCH] Server and client are seperate.

---
 .../java/com/zixiken/dimdoors/DDProxyCommon.java    |  4 ----
 .../com/zixiken/dimdoors/client/DDProxyClient.java  | 13 +++++++++++++
 .../com/zixiken/dimdoors/shared/TeleportHelper.java |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zixiken/dimdoors/DDProxyCommon.java b/src/main/java/com/zixiken/dimdoors/DDProxyCommon.java
index 2714a980..a252ea6e 100644
--- a/src/main/java/com/zixiken/dimdoors/DDProxyCommon.java
+++ b/src/main/java/com/zixiken/dimdoors/DDProxyCommon.java
@@ -24,9 +24,6 @@ public abstract class DDProxyCommon implements IDDProxy {
         ModBlocks.registerBlocks();
         ModItems.registerItems();
 
-        ModelManager.registerModelVariants();
-        ModelManager.addCustomStateMappers();
-
         GameRegistry.registerTileEntity(TileEntityDimDoor.class, "TileEntityDimDoor");
         GameRegistry.registerTileEntity(TileEntityRift.class, "TileEntityRift");
         GameRegistry.registerTileEntity(TileEntityTransTrapdoor.class, "TileEntityDimHatch");
@@ -36,7 +33,6 @@ public abstract class DDProxyCommon implements IDDProxy {
     @Override
     public void onInitialization(FMLInitializationEvent event) {
         CraftingManager.registerRecipes();
-        ModelManager.registerModels();
     }
 
     public void updateDoorTE(BlockDimDoorBase door, World world, BlockPos pos) {
diff --git a/src/main/java/com/zixiken/dimdoors/client/DDProxyClient.java b/src/main/java/com/zixiken/dimdoors/client/DDProxyClient.java
index 91cdf4b0..010e9096 100644
--- a/src/main/java/com/zixiken/dimdoors/client/DDProxyClient.java
+++ b/src/main/java/com/zixiken/dimdoors/client/DDProxyClient.java
@@ -1,6 +1,8 @@
 package com.zixiken.dimdoors.client;
 
+import com.zixiken.dimdoors.CraftingManager;
 import com.zixiken.dimdoors.DDProxyCommon;
+import com.zixiken.dimdoors.ModelManager;
 import com.zixiken.dimdoors.tileentities.TileEntityDimDoor;
 import com.zixiken.dimdoors.tileentities.TileEntityRift;
 import com.zixiken.dimdoors.tileentities.TileEntityTransTrapdoor;
@@ -9,6 +11,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 @SuppressWarnings({"MethodCallSideOnly", "NewExpressionSideOnly"})
@@ -17,9 +20,19 @@ public class DDProxyClient extends DDProxyCommon {
     @Override
     public void onPreInitialization(FMLPreInitializationEvent event) {
         super.onPreInitialization(event);
+
+        ModelManager.registerModelVariants();
+        ModelManager.addCustomStateMappers();
+
         registerRenderers();
     }
 
+    @Override
+    public void onInitialization(FMLInitializationEvent event) {
+        super.onInitialization(event);
+        ModelManager.registerModels();
+    }
+
     public void registerRenderers() {
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDimDoor.class, new RenderDimDoor());
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTransTrapdoor.class, new RenderTransTrapdoor());
diff --git a/src/main/java/com/zixiken/dimdoors/shared/TeleportHelper.java b/src/main/java/com/zixiken/dimdoors/shared/TeleportHelper.java
index 9b816069..8d4925cd 100644
--- a/src/main/java/com/zixiken/dimdoors/shared/TeleportHelper.java
+++ b/src/main/java/com/zixiken/dimdoors/shared/TeleportHelper.java
@@ -25,7 +25,7 @@ public class TeleportHelper extends Teleporter {
     }
 
     public static boolean teleport(Entity entity, Location newLocation) {
-        if (entity instanceof EntityPlayerSP) {
+        if (DimDoors.isClient()) {
             //DimDoors.log(TeleportHelper.class, "Not teleporting, because EntityPlayerSP.");
             return false;
         }