Merge branch 'experimental' from GTNH into mergeGTNH (based on BLOODASP)

# Conflicts:
# build.properties
# src/main/java/gregtech/GT_Mod.java
# src/main/java/gregtech/api/enums/ItemList.java
# src/main/java/gregtech/api/enums/Materials.java
# src/main/java/gregtech/api/enums/Textures.java
# src/main/java/gregtech/api/enums/Tier.java
# src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
# src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/util/GT_ModHandler.java
# src/main/java/gregtech/api/util/GT_Recipe.java
# src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
# src/main/java/gregtech/api/util/GT_Utility.java
# src/main/java/gregtech/common/GT_Client.java
# src/main/java/gregtech/common/GT_Pollution.java
# src/main/java/gregtech/common/GT_Proxy.java
# src/main/java/gregtech/common/GT_RecipeAdder.java
# src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
# src/main/java/gregtech/common/GT_Worldgenerator.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Block_Machines.java
# src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Item_Machines.java
# src/main/java/gregtech/common/blocks/GT_Item_Ores.java
# src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
# src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
# src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
# src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
# src/main/java/gregtech/common/gui/GT_Container_Regulator.java
# src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
# src/main/java/gregtech/common/items/armor/ArmorData.java
# src/main/java/gregtech/common/items/armor/GuiElectricArmor1.java
# src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
# src/main/java/gregtech/common/items/armor/Values.java
# src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java
# src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
# src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
# src/main/java/gregtech/loaders/load/GT_FuelLoader.java
# src/main/java/gregtech/loaders/misc/GT_Achievements.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustTiny.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemExquisite.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemFlawless.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate3.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate4.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate5.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadBuzzSaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadChainsaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadDrill.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadFile.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadWrench.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire01.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire02.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire16.java
# src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
# src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
# src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
# src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
# src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
# src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png

1 files changed, 132 insertions, 132 deletions

diff --git a/src/main/java/gregtech/common/GT_DummyWorld.java b/src/main/java/gregtech/common/GT_DummyWorld.java
index f542730b3e..b2c15c6a0d 100644
--- a/src/main/java/gregtech/common/GT_DummyWorld.java
+++ b/src/main/java/gregtech/common/GT_DummyWorld.java
@@ -1,132 +1,132 @@
-package gregtech.common;

-

-import net.minecraft.block.Block;

-import net.minecraft.entity.Entity;

-import net.minecraft.init.Blocks;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.profiler.Profiler;

-import net.minecraft.world.World;

-import net.minecraft.world.WorldProvider;

-import net.minecraft.world.WorldSettings;

-import net.minecraft.world.biome.BiomeGenBase;

-import net.minecraft.world.chunk.IChunkProvider;

-import net.minecraft.world.chunk.storage.IChunkLoader;

-import net.minecraft.world.storage.IPlayerFileData;

-import net.minecraft.world.storage.ISaveHandler;

-import net.minecraft.world.storage.WorldInfo;

-

-import java.io.File;

-

-public class GT_DummyWorld

-        extends World {

-    public GT_IteratorRandom mRandom = new GT_IteratorRandom();

-    public ItemStack mLastSetBlock = null;

-

-    public GT_DummyWorld(ISaveHandler par1iSaveHandler, String par2Str, WorldProvider par3WorldProvider, WorldSettings par4WorldSettings, Profiler par5Profiler) {

-        super(par1iSaveHandler, par2Str, par4WorldSettings, par3WorldProvider, par5Profiler);

-        this.rand = this.mRandom;

-    }

-

-    public GT_DummyWorld() {

-        this(new ISaveHandler() {

-                 public void saveWorldInfoWithPlayer(WorldInfo var1, NBTTagCompound var2) {

-                 }

-

-                 public void saveWorldInfo(WorldInfo var1) {

-                 }

-

-                 public WorldInfo loadWorldInfo() {

-                     return null;

-                 }

-

-                 public IPlayerFileData getSaveHandler() {

-                     return null;

-                 }

-

-                 public File getMapFileFromName(String var1) {

-                     return null;

-                 }

-

-                 public IChunkLoader getChunkLoader(WorldProvider var1) {

-                     return null;

-                 }

-

-                 public void flush() {

-                 }

-

-                 public void checkSessionLock() {

-                 }

-

-                 public String getWorldDirectoryName() {

-                     return null;

-                 }

-

-                 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());

-    }

-

-    protected IChunkProvider createChunkProvider() {

-        return null;

-    }

-

-    public Entity getEntityByID(int aEntityID) {

-        return null;

-    }

-

-    public boolean setBlock(int aX, int aY, int aZ, Block aBlock, int aMeta, int aFlags) {

-        this.mLastSetBlock = new ItemStack(aBlock, 1, aMeta);

-        return true;

-    }

-

-    public float getSunBrightnessFactor(float p_72967_1_) {

-        return 1.0F;

-    }

-

-    public BiomeGenBase getBiomeGenForCoords(int aX, int aZ) {

-        if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) {

-            return BiomeGenBase.plains;

-        }

-        return BiomeGenBase.ocean;

-    }

-

-    public int getFullBlockLightValue(int aX, int aY, int aZ) {

-        return 10;

-    }

-

-    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;

-        }

-        return Blocks.air;

-    }

-

-    public int getBlockMetadata(int aX, int aY, int aZ) {

-        return 0;

-    }

-

-    public boolean canBlockSeeTheSky(int aX, int aY, int aZ) {

-        if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) {

-            return aY > 64;

-        }

-        return true;

-    }

-

-    protected int func_152379_p() {

-        return 0;

-    }

-}

+package gregtech.common;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldSettings;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.chunk.storage.IChunkLoader;
+import net.minecraft.world.storage.IPlayerFileData;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.WorldInfo;
+
+import java.io.File;
+
+public class GT_DummyWorld
+        extends World {
+    public GT_IteratorRandom mRandom = new GT_IteratorRandom();
+    public ItemStack mLastSetBlock = null;
+
+    public GT_DummyWorld(ISaveHandler par1iSaveHandler, String par2Str, WorldProvider par3WorldProvider, WorldSettings par4WorldSettings, Profiler par5Profiler) {
+        super(par1iSaveHandler, par2Str, par4WorldSettings, par3WorldProvider, par5Profiler);
+        this.rand = this.mRandom;
+    }
+
+    public GT_DummyWorld() {
+        this(new ISaveHandler() {
+                 public void saveWorldInfoWithPlayer(WorldInfo var1, NBTTagCompound var2) {
+                 }
+
+                 public void saveWorldInfo(WorldInfo var1) {
+                 }
+
+                 public WorldInfo loadWorldInfo() {
+                     return null;
+                 }
+
+                 public IPlayerFileData getSaveHandler() {
+                     return null;
+                 }
+
+                 public File getMapFileFromName(String var1) {
+                     return null;
+                 }
+
+                 public IChunkLoader getChunkLoader(WorldProvider var1) {
+                     return null;
+                 }
+
+                 public void flush() {
+                 }
+
+                 public void checkSessionLock() {
+                 }
+
+                 public String getWorldDirectoryName() {
+                     return null;
+                 }
+
+                 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());
+    }
+
+    protected IChunkProvider createChunkProvider() {
+        return null;
+    }
+
+    public Entity getEntityByID(int aEntityID) {
+        return null;
+    }
+
+    public boolean setBlock(int aX, int aY, int aZ, Block aBlock, int aMeta, int aFlags) {
+        this.mLastSetBlock = new ItemStack(aBlock, 1, aMeta);
+        return true;
+    }
+
+    public float getSunBrightnessFactor(float p_72967_1_) {
+        return 1.0F;
+    }
+
+    public BiomeGenBase getBiomeGenForCoords(int aX, int aZ) {
+        if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) {
+            return BiomeGenBase.plains;
+        }
+        return BiomeGenBase.ocean;
+    }
+
+    public int getFullBlockLightValue(int aX, int aY, int aZ) {
+        return 10;
+    }
+
+    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;
+        }
+        return Blocks.air;
+    }
+
+    public int getBlockMetadata(int aX, int aY, int aZ) {
+        return 0;
+    }
+
+    public boolean canBlockSeeTheSky(int aX, int aY, int aZ) {
+        if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) {
+            return aY > 64;
+        }
+        return true;
+    }
+
+    protected int func_152379_p() {
+        return 0;
+    }
+}