From db1a9e4a7fc67a1650ca08e5d6cfd1921d354b5d Mon Sep 17 00:00:00 2001
From: Jason Mitchell <mitchej@gmail.com>
Date: Sun, 17 Jan 2021 20:21:01 -0800
Subject: Remove a bunch of commented out code, small formatting adjustments

---
 src/main/java/gregtech/common/GT_DummyWorld.java | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'src/main/java/gregtech/common/GT_DummyWorld.java')

diff --git a/src/main/java/gregtech/common/GT_DummyWorld.java b/src/main/java/gregtech/common/GT_DummyWorld.java
index b2c15c6a0d..914600b590 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;
 
@@ -66,17 +65,7 @@ public class GT_DummyWorld
                      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());
     }
 
-- 
cgit 


From a4e104881944bbc03eddeacb24a6b7bd94cc53ce Mon Sep 17 00:00:00 2001
From: Léa Gris <lea.gris@noiraude.net>
Date: Mon, 24 May 2021 15:37:22 +0200
Subject: feat(glow): iconset machines glow support

- Add glow support for all sides and states of iconset machines (same as with basicmachines).

Automated code cleanup with IDEA of:
- Optiimise all imports (remove unused, sort)
- Reorder all modifiers to the canonical preferred order (as stated in the Java Language Specification)
- Add all missing @Override annotations
---
 src/main/java/gregtech/common/GT_DummyWorld.java | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/main/java/gregtech/common/GT_DummyWorld.java')

diff --git a/src/main/java/gregtech/common/GT_DummyWorld.java b/src/main/java/gregtech/common/GT_DummyWorld.java
index 914600b590..baab96510a 100644
--- a/src/main/java/gregtech/common/GT_DummyWorld.java
+++ b/src/main/java/gregtech/common/GT_DummyWorld.java
@@ -29,38 +29,48 @@ public class GT_DummyWorld extends World {
 
     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;
                  }
@@ -69,23 +79,28 @@ public class GT_DummyWorld extends World {
                 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;
@@ -93,10 +108,12 @@ public class GT_DummyWorld extends World {
         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;
@@ -104,10 +121,12 @@ public class GT_DummyWorld extends World {
         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;
@@ -115,6 +134,7 @@ public class GT_DummyWorld extends World {
         return true;
     }
 
+    @Override
     protected int func_152379_p() {
         return 0;
     }
-- 
cgit