Merge pull request #3 from GTNewHorizons/experimental

gregtech-5.09.35.00

1 files changed, 22 insertions, 13 deletions

diff --git a/src/main/java/gregtech/common/GT_DummyWorld.java b/src/main/java/gregtech/common/GT_DummyWorld.java
index b2c15c6a0d..baab96510a 100644
--- a/src/main/java/gregtech/common/GT_DummyWorld.java
+++ b/src/main/java/gregtech/common/GT_DummyWorld.java
@@ -18,8 +18,7 @@ import net.minecraft.world.storage.WorldInfo;
 
 import java.io.File;
 
-public class GT_DummyWorld
-        extends World {
+public class GT_DummyWorld extends World {
     public GT_IteratorRandom mRandom = new GT_IteratorRandom();
     public ItemStack mLastSetBlock = null;
 
@@ -30,73 +29,78 @@ public class GT_DummyWorld
 
     public GT_DummyWorld() {
         this(new ISaveHandler() {
+                 @Override
                  public void saveWorldInfoWithPlayer(WorldInfo var1, NBTTagCompound var2) {
                  }
 
+                 @Override
                  public void saveWorldInfo(WorldInfo var1) {
                  }
 
+                 @Override
                  public WorldInfo loadWorldInfo() {
                      return null;
                  }
 
+                 @Override
                  public IPlayerFileData getSaveHandler() {
                      return null;
                  }
 
+                 @Override
                  public File getMapFileFromName(String var1) {
                      return null;
                  }
 
+                 @Override
                  public IChunkLoader getChunkLoader(WorldProvider var1) {
                      return null;
                  }
 
+                 @Override
                  public void flush() {
                  }
 
+                 @Override
                  public void checkSessionLock() {
                  }
 
+                 @Override
                  public String getWorldDirectoryName() {
                      return null;
                  }
 
+                 @Override
                  public File getWorldDirectory() {
                      return null;
                  }
              }, "DUMMY_DIMENSION", null,
-//				new WorldProvider(),
-//    
-//
-//
-//      new WorldSettings(new WorldInfo(new NBTTagCompound()))
-//      {
-//        public String getDimensionName()
-//        {
-//          return "DUMMY_DIMENSION";
-//        }
-//      }
+
                 new WorldSettings(new WorldInfo(new NBTTagCompound())), new Profiler());
     }
 
+    @Override
     protected IChunkProvider createChunkProvider() {
         return null;
     }
 
+    @Override
     public Entity getEntityByID(int aEntityID) {
         return null;
     }
 
+    @Override
     public boolean setBlock(int aX, int aY, int aZ, Block aBlock, int aMeta, int aFlags) {
         this.mLastSetBlock = new ItemStack(aBlock, 1, aMeta);
         return true;
     }
 
+    @Override
     public float getSunBrightnessFactor(float p_72967_1_) {
         return 1.0F;
     }
 
+    @Override
     public BiomeGenBase getBiomeGenForCoords(int aX, int aZ) {
         if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) {
             return BiomeGenBase.plains;
@@ -104,10 +108,12 @@ public class GT_DummyWorld
         return BiomeGenBase.ocean;
     }
 
+    @Override
     public int getFullBlockLightValue(int aX, int aY, int aZ) {
         return 10;
     }
 
+    @Override
     public Block getBlock(int aX, int aY, int aZ) {
         if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) {
             return aY == 64 ? Blocks.grass : Blocks.air;
@@ -115,10 +121,12 @@ public class GT_DummyWorld
         return Blocks.air;
     }
 
+    @Override
     public int getBlockMetadata(int aX, int aY, int aZ) {
         return 0;
     }
 
+    @Override
     public boolean canBlockSeeTheSky(int aX, int aY, int aZ) {
         if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) {
             return aY > 64;
@@ -126,6 +134,7 @@ public class GT_DummyWorld
         return true;
     }
 
+    @Override
     protected int func_152379_p() {
         return 0;
     }