From ed2bbe226a8b6003de907f1ca5093511d72973d4 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Wed, 23 Dec 2015 01:15:43 +0100
Subject: [PATCH] Revert

---
 .../java/ellpeck/actuallyadditions/proxy/ClientProxy.java | 8 --------
 src/main/java/ellpeck/actuallyadditions/proxy/IProxy.java | 3 ---
 .../java/ellpeck/actuallyadditions/proxy/ServerProxy.java | 7 -------
 .../java/ellpeck/actuallyadditions/util/WorldPos.java     | 4 ++--
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java
index 5707cac99..33a2f5bd8 100644
--- a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java
+++ b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java
@@ -30,8 +30,6 @@ import ellpeck.actuallyadditions.util.playerdata.PersistentClientData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
-import net.minecraftforge.common.DimensionManager;
 
 import java.io.File;
 import java.util.Calendar;
@@ -95,12 +93,6 @@ public class ClientProxy implements IProxy{
         SpecialRenderInit.init();
     }
 
-    @Override
-    public World getWorld(int worldID){
-        World world = DimensionManager.getWorld(worldID);
-        return world == null ? Minecraft.getMinecraft().theWorld : world;
-    }
-
     private static void registerRenderer(Class<? extends TileEntity> tileClass, RenderTileEntity tileRender, int renderID){
         ClientRegistry.bindTileEntitySpecialRenderer(tileClass, tileRender);
         RenderingRegistry.registerBlockHandler(new RenderInventory(tileRender, renderID));
diff --git a/src/main/java/ellpeck/actuallyadditions/proxy/IProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/IProxy.java
index 15928263e..b71f8fda4 100644
--- a/src/main/java/ellpeck/actuallyadditions/proxy/IProxy.java
+++ b/src/main/java/ellpeck/actuallyadditions/proxy/IProxy.java
@@ -13,7 +13,6 @@ package ellpeck.actuallyadditions.proxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import net.minecraft.world.World;
 
 public interface IProxy{
 
@@ -22,6 +21,4 @@ public interface IProxy{
     void init(FMLInitializationEvent event);
 
     void postInit(FMLPostInitializationEvent event);
-
-    World getWorld(int worldID);
 }
diff --git a/src/main/java/ellpeck/actuallyadditions/proxy/ServerProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/ServerProxy.java
index de0810e30..5d1b2f181 100644
--- a/src/main/java/ellpeck/actuallyadditions/proxy/ServerProxy.java
+++ b/src/main/java/ellpeck/actuallyadditions/proxy/ServerProxy.java
@@ -14,8 +14,6 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import ellpeck.actuallyadditions.util.ModUtil;
-import net.minecraft.world.World;
-import net.minecraftforge.common.DimensionManager;
 
 @SuppressWarnings("unused")
 public class ServerProxy implements IProxy{
@@ -34,9 +32,4 @@ public class ServerProxy implements IProxy{
     public void postInit(FMLPostInitializationEvent event){
         ModUtil.LOGGER.info("PostInitializing ServerProxy...");
     }
-
-    @Override
-    public World getWorld(int worldID){
-        return DimensionManager.getWorld(worldID);
-    }
 }
diff --git a/src/main/java/ellpeck/actuallyadditions/util/WorldPos.java b/src/main/java/ellpeck/actuallyadditions/util/WorldPos.java
index 59d4a4672..23a1e53d6 100644
--- a/src/main/java/ellpeck/actuallyadditions/util/WorldPos.java
+++ b/src/main/java/ellpeck/actuallyadditions/util/WorldPos.java
@@ -10,13 +10,13 @@
 
 package ellpeck.actuallyadditions.util;
 
-import ellpeck.actuallyadditions.ActuallyAdditions;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
 
 public class WorldPos{
 
@@ -45,7 +45,7 @@ public class WorldPos{
     }
 
     public World getWorld(){
-        return ActuallyAdditions.proxy.getWorld(this.worldID);
+        return DimensionManager.getWorld(this.worldID);
     }
 
     public Material getMaterial(){