aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-04-30 12:34:17 -0700
committerJason Mitchell <mitchej@gmail.com>2023-04-30 12:34:17 -0700
commit9a24648436bbff7c8764b6ab527c69e0e9ab4845 (patch)
tree08f03230ef056753e20773fa942b1be057494ad4 /src/main
parente7ccb5f6316a9b6c78b55a3ec3ffb8ba59173835 (diff)
downloadGT5-Unofficial-9a24648436bbff7c8764b6ab527c69e0e9ab4845.tar.gz
GT5-Unofficial-9a24648436bbff7c8764b6ab527c69e0e9ab4845.tar.bz2
GT5-Unofficial-9a24648436bbff7c8764b6ab527c69e0e9ab4845.zip
ForgeDirection
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/client/ClientProxy.java7
-rw-r--r--src/main/java/client/gui/Gui_ItemProxyEndpoint.java4
-rw-r--r--src/main/java/client/gui/Gui_ItemProxySource.java4
-rw-r--r--src/main/java/client/gui/KT_UITextures.java4
-rw-r--r--src/main/java/client/renderer/TESR_BeamTransmitter.java4
-rw-r--r--src/main/java/client/renderer/TESR_SECapacitor.java4
-rw-r--r--src/main/java/client/renderer/TESR_SETether.java4
-rw-r--r--src/main/java/common/Blocks.java4
-rw-r--r--src/main/java/common/CommonProxy.java7
-rw-r--r--src/main/java/common/Recipes.java14
-rw-r--r--src/main/java/common/Researches.java3
-rw-r--r--src/main/java/common/TileEntities.java1
-rw-r--r--src/main/java/common/blocks/Block_BeamTransmitter.java4
-rw-r--r--src/main/java/common/blocks/Block_ControlRod.java3
-rw-r--r--src/main/java/common/blocks/Block_GDCUnit.java3
-rw-r--r--src/main/java/common/blocks/Block_IchorJar.java15
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyCable.java6
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyEndpoint.java6
-rw-r--r--src/main/java/common/blocks/Block_ItemProxySource.java6
-rw-r--r--src/main/java/common/blocks/Block_ReactorChamber_OFF.java3
-rw-r--r--src/main/java/common/blocks/Block_ReactorChamber_ON.java3
-rw-r--r--src/main/java/common/blocks/Block_SpaceElevator.java1
-rw-r--r--src/main/java/common/blocks/Block_SpaceElevatorTether.java1
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageField.java3
-rw-r--r--src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java15
-rw-r--r--src/main/java/common/blocks/Block_YSZUnit.java3
-rw-r--r--src/main/java/common/container/Container_ModularNuclearReactor.java2
-rw-r--r--src/main/java/common/items/ErrorItem.java3
-rw-r--r--src/main/java/common/items/MetaItem_CraftingComponent.java3
-rw-r--r--src/main/java/common/items/MetaItem_ReactorComponent.java3
-rw-r--r--src/main/java/common/recipeLoaders/AlloySmelter.java3
-rw-r--r--src/main/java/common/recipeLoaders/Assembler.java3
-rw-r--r--src/main/java/common/recipeLoaders/ChemicalReactor.java3
-rw-r--r--src/main/java/common/recipeLoaders/Crafting.java3
-rw-r--r--src/main/java/common/recipeLoaders/FormingPress.java3
-rw-r--r--src/main/java/common/recipeLoaders/Mixer.java3
-rw-r--r--src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java15
-rw-r--r--src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java10
-rw-r--r--src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java7
-rw-r--r--src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java7
-rw-r--r--src/main/java/common/tileentities/GTMTE_SpaceElevator.java19
-rw-r--r--src/main/java/common/tileentities/GTMTE_TFFT.java11
-rw-r--r--src/main/java/common/tileentities/GTMTE_TFFTHatch.java8
-rw-r--r--src/main/java/kekztech/GuiHandler.java6
-rw-r--r--src/main/java/kekztech/Items.java4
45 files changed, 114 insertions, 134 deletions
diff --git a/src/main/java/client/ClientProxy.java b/src/main/java/client/ClientProxy.java
index 18def75a9e..58a30cd14d 100644
--- a/src/main/java/client/ClientProxy.java
+++ b/src/main/java/client/ClientProxy.java
@@ -1,14 +1,13 @@
package client;
-import client.renderer.TESR_BeamTransmitter;
-import client.renderer.TESR_SECapacitor;
-import client.renderer.TESR_SETether;
-
import common.CommonProxy;
import common.tileentities.TE_BeamTransmitter;
import common.tileentities.TE_SpaceElevatorCapacitor;
import common.tileentities.TE_SpaceElevatorTether;
+import client.renderer.TESR_BeamTransmitter;
+import client.renderer.TESR_SECapacitor;
+import client.renderer.TESR_SETether;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
diff --git a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java
index 2a673f16db..d98417f686 100644
--- a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java
+++ b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java
@@ -1,7 +1,5 @@
package client.gui;
-import kekztech.KekzCore;
-
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
@@ -15,6 +13,8 @@ import org.lwjgl.opengl.GL11;
import common.container.Container_ItemProxyEndpoint;
+import kekztech.KekzCore;
+
public class Gui_ItemProxyEndpoint extends GuiContainer {
private final ResourceLocation texture = new ResourceLocation(
diff --git a/src/main/java/client/gui/Gui_ItemProxySource.java b/src/main/java/client/gui/Gui_ItemProxySource.java
index 1c1b0171e6..8618ff828f 100644
--- a/src/main/java/client/gui/Gui_ItemProxySource.java
+++ b/src/main/java/client/gui/Gui_ItemProxySource.java
@@ -1,7 +1,5 @@
package client.gui;
-import kekztech.KekzCore;
-
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
@@ -15,6 +13,8 @@ import org.lwjgl.opengl.GL11;
import common.container.Container_ItemProxySource;
+import kekztech.KekzCore;
+
public class Gui_ItemProxySource extends GuiContainer {
private final ResourceLocation texture = new ResourceLocation(KekzCore.MODID, "textures/gui/ItemTech4by4.png");
diff --git a/src/main/java/client/gui/KT_UITextures.java b/src/main/java/client/gui/KT_UITextures.java
index ffca0b6813..5e7cf2981a 100644
--- a/src/main/java/client/gui/KT_UITextures.java
+++ b/src/main/java/client/gui/KT_UITextures.java
@@ -1,9 +1,9 @@
package client.gui;
-import kekztech.KekzCore;
-
import com.gtnewhorizons.modularui.api.drawable.UITexture;
+import kekztech.KekzCore;
+
public class KT_UITextures {
public static final UITexture OVERLAY_BUTTON_WIRELESS_ON = UITexture
diff --git a/src/main/java/client/renderer/TESR_BeamTransmitter.java b/src/main/java/client/renderer/TESR_BeamTransmitter.java
index 0028c53476..e6e31f80d5 100644
--- a/src/main/java/client/renderer/TESR_BeamTransmitter.java
+++ b/src/main/java/client/renderer/TESR_BeamTransmitter.java
@@ -1,7 +1,5 @@
package client.renderer;
-import kekztech.KekzCore;
-
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -13,6 +11,8 @@ import org.lwjgl.opengl.GL11;
import common.tileentities.TE_BeamTransmitter;
+import kekztech.KekzCore;
+
public class TESR_BeamTransmitter extends TileEntitySpecialRenderer {
private static final ResourceLocation beamTexture = new ResourceLocation(
diff --git a/src/main/java/client/renderer/TESR_SECapacitor.java b/src/main/java/client/renderer/TESR_SECapacitor.java
index c4aed65e3d..0da33dee66 100644
--- a/src/main/java/client/renderer/TESR_SECapacitor.java
+++ b/src/main/java/client/renderer/TESR_SECapacitor.java
@@ -1,7 +1,5 @@
package client.renderer;
-import kekztech.KekzCore;
-
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
@@ -9,6 +7,8 @@ import net.minecraft.util.ResourceLocation;
import common.tileentities.TE_SpaceElevatorCapacitor;
+import kekztech.KekzCore;
+
public class TESR_SECapacitor extends TileEntitySpecialRenderer {
private static final ResourceLocation capSide = new ResourceLocation(
diff --git a/src/main/java/client/renderer/TESR_SETether.java b/src/main/java/client/renderer/TESR_SETether.java
index 18672b21c9..5d5c0581c1 100644
--- a/src/main/java/client/renderer/TESR_SETether.java
+++ b/src/main/java/client/renderer/TESR_SETether.java
@@ -1,7 +1,5 @@
package client.renderer;
-import kekztech.KekzCore;
-
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -10,6 +8,8 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
+import kekztech.KekzCore;
+
public class TESR_SETether extends TileEntitySpecialRenderer {
private static final ResourceLocation tetherBeamTexture = new ResourceLocation(
diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
index 3fccd0604c..f43482b909 100644
--- a/src/main/java/common/Blocks.java
+++ b/src/main/java/common/Blocks.java
@@ -1,7 +1,5 @@
package common;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import common.blocks.Block_GDCUnit;
@@ -12,6 +10,8 @@ import common.blocks.Block_TFFTStorageField;
import common.blocks.Block_ThaumiumReinforcedJar;
import common.blocks.Block_YSZUnit;
+import kekztech.KekzCore;
+
public class Blocks {
public static Block yszUnit;
diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java
index f04e7052c5..3af1fd1671 100644
--- a/src/main/java/common/CommonProxy.java
+++ b/src/main/java/common/CommonProxy.java
@@ -1,9 +1,5 @@
package common;
-import kekztech.GuiHandler;
-import kekztech.Items;
-import kekztech.KekzCore;
-
import common.items.ErrorItem;
import common.items.MetaItem_CraftingComponent;
import common.items.MetaItem_ReactorComponent;
@@ -14,6 +10,9 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import gregtech.api.GregTech_API;
+import kekztech.GuiHandler;
+import kekztech.Items;
+import kekztech.KekzCore;
public class CommonProxy {
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 21149e1406..97a053f938 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -4,16 +4,8 @@ import static gregtech.api.enums.Mods.ThaumicTinkerer;
import java.util.HashMap;
-import kekztech.KekzCore;
-
import net.minecraft.item.ItemStack;
-import thaumcraft.api.ItemApi;
-import thaumcraft.api.ThaumcraftApi;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.crafting.InfusionRecipe;
-
import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.LuVTierEnhancer;
import common.recipeLoaders.AlloySmelter;
import common.recipeLoaders.Assembler;
@@ -30,6 +22,12 @@ import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
+import kekztech.KekzCore;
+import thaumcraft.api.ItemApi;
+import thaumcraft.api.ThaumcraftApi;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.crafting.InfusionRecipe;
public class Recipes {
diff --git a/src/main/java/common/Researches.java b/src/main/java/common/Researches.java
index 76f47bdd9d..853b9dba6b 100644
--- a/src/main/java/common/Researches.java
+++ b/src/main/java/common/Researches.java
@@ -1,9 +1,8 @@
package common;
-import kekztech.KekzCore;
-
import net.minecraft.item.ItemStack;
+import kekztech.KekzCore;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.research.ResearchItem;
diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java
index 9925e7aa27..9ad4fdb99f 100644
--- a/src/main/java/common/TileEntities.java
+++ b/src/main/java/common/TileEntities.java
@@ -10,6 +10,7 @@ import common.tileentities.TE_IchorJar;
import common.tileentities.TE_IchorVoidJar;
import common.tileentities.TE_ThaumiumReinforcedJar;
import common.tileentities.TE_ThaumiumReinforcedVoidJar;
+
import cpw.mods.fml.common.registry.GameRegistry;
public class TileEntities {
diff --git a/src/main/java/common/blocks/Block_BeamTransmitter.java b/src/main/java/common/blocks/Block_BeamTransmitter.java
index 9ed0233322..48bedd3b7f 100644
--- a/src/main/java/common/blocks/Block_BeamTransmitter.java
+++ b/src/main/java/common/blocks/Block_BeamTransmitter.java
@@ -1,7 +1,5 @@
package common.blocks;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
@@ -9,7 +7,9 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import common.tileentities.TE_BeamTransmitter;
+
import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
public class Block_BeamTransmitter extends Block {
diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java
index 3cbd544d50..7c86c9910f 100644
--- a/src/main/java/common/blocks/Block_ControlRod.java
+++ b/src/main/java/common/blocks/Block_ControlRod.java
@@ -1,12 +1,11 @@
package common.blocks;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
public class Block_ControlRod extends BaseGTUpdateableBlock {
diff --git a/src/main/java/common/blocks/Block_GDCUnit.java b/src/main/java/common/blocks/Block_GDCUnit.java
index ebf2714d61..27bc95759d 100644
--- a/src/main/java/common/blocks/Block_GDCUnit.java
+++ b/src/main/java/common/blocks/Block_GDCUnit.java
@@ -1,12 +1,11 @@
package common.blocks;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
public class Block_GDCUnit extends BaseGTUpdateableBlock {
diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
index 2328458d2d..7a8596eb0d 100644
--- a/src/main/java/common/blocks/Block_IchorJar.java
+++ b/src/main/java/common/blocks/Block_IchorJar.java
@@ -15,14 +15,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.common.blocks.BlockJar;
-import thaumcraft.common.config.ConfigBlocks;
-import thaumcraft.common.config.ConfigItems;
-import thaumcraft.common.items.ItemEssence;
-import thaumcraft.common.tiles.TileJarFillable;
-
import common.itemBlocks.IB_IchorJar;
import common.tileentities.TE_IchorJar;
import common.tileentities.TE_IchorVoidJar;
@@ -30,6 +22,13 @@ import common.tileentities.TE_IchorVoidJar;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.common.blocks.BlockJar;
+import thaumcraft.common.config.ConfigBlocks;
+import thaumcraft.common.config.ConfigItems;
+import thaumcraft.common.items.ItemEssence;
+import thaumcraft.common.tiles.TileJarFillable;
public class Block_IchorJar extends BlockJar {
diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java
index bd8511d41e..cf9307dde0 100644
--- a/src/main/java/common/blocks/Block_ItemProxyCable.java
+++ b/src/main/java/common/blocks/Block_ItemProxyCable.java
@@ -1,21 +1,19 @@
package common.blocks;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
-import client.renderer.ConduitRenderer;
-
import common.itemBlocks.IB_ItemProxyCable;
import common.tileentities.TE_ItemProxyCable;
+import client.renderer.ConduitRenderer;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import kekztech.KekzCore;
public class Block_ItemProxyCable extends Block {
diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
index 41ae802b8e..5f60eba040 100644
--- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
+++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
@@ -1,8 +1,5 @@
package common.blocks;
-import kekztech.GuiHandler;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
@@ -12,7 +9,10 @@ import net.minecraft.world.World;
import common.itemBlocks.IB_ItemProxyEndpoint;
import common.tileentities.TE_ItemProxyEndpoint;
+
import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.GuiHandler;
+import kekztech.KekzCore;
public class Block_ItemProxyEndpoint extends Block {
diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java
index 65e9d6b0ef..7ab34ade52 100644
--- a/src/main/java/common/blocks/Block_ItemProxySource.java
+++ b/src/main/java/common/blocks/Block_ItemProxySource.java
@@ -1,8 +1,5 @@
package common.blocks;
-import kekztech.GuiHandler;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
@@ -12,7 +9,10 @@ import net.minecraft.world.World;
import common.itemBlocks.IB_ItemProxySource;
import common.tileentities.TE_ItemProxySource;
+
import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.GuiHandler;
+import kekztech.KekzCore;
public class Block_ItemProxySource extends Block {
diff --git a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
index 937483eec2..3c8b29c3cc 100644
--- a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
+++ b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
@@ -1,12 +1,11 @@
package common.blocks;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
public class Block_ReactorChamber_OFF extends BaseGTUpdateableBlock {
diff --git a/src/main/java/common/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java
index a140c1f1d7..7a894561ae 100644
--- a/src/main/java/common/blocks/Block_ReactorChamber_ON.java
+++ b/src/main/java/common/blocks/Block_ReactorChamber_ON.java
@@ -1,12 +1,11 @@
package common.blocks;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
public class Block_ReactorChamber_ON extends BaseGTUpdateableBlock {
diff --git a/src/main/java/common/blocks/Block_SpaceElevator.java b/src/main/java/common/blocks/Block_SpaceElevator.java
index 286735767a..2f491db0a4 100644
--- a/src/main/java/common/blocks/Block_SpaceElevator.java
+++ b/src/main/java/common/blocks/Block_SpaceElevator.java
@@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import common.itemBlocks.IB_SpaceElevator;
+
import cpw.mods.fml.common.registry.GameRegistry;
public class Block_SpaceElevator extends BaseGTUpdateableBlock {
diff --git a/src/main/java/common/blocks/Block_SpaceElevatorTether.java b/src/main/java/common/blocks/Block_SpaceElevatorTether.java
index e7d8a2e6c1..c6ed0f54b0 100644
--- a/src/main/java/common/blocks/Block_SpaceElevatorTether.java
+++ b/src/main/java/common/blocks/Block_SpaceElevatorTether.java
@@ -9,6 +9,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import common.tileentities.TE_SpaceElevatorTether;
+
import cpw.mods.fml.common.registry.GameRegistry;
public class Block_SpaceElevatorTether extends BaseGTUpdateableBlock {
diff --git a/src/main/java/common/blocks/Block_TFFTStorageField.java b/src/main/java/common/blocks/Block_TFFTStorageField.java
index e36f15b4c6..46ecd8ee62 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageField.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageField.java
@@ -2,8 +2,6 @@ package common.blocks;
import java.util.List;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,6 +20,7 @@ import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
+import kekztech.KekzCore;
public class Block_TFFTStorageField extends BaseGTUpdateableBlock {
diff --git a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
index 53026e1ac3..e089e2a1c2 100644
--- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
+++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
@@ -15,14 +15,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.common.blocks.BlockJar;
-import thaumcraft.common.config.ConfigBlocks;
-import thaumcraft.common.config.ConfigItems;
-import thaumcraft.common.items.ItemEssence;
-import thaumcraft.common.tiles.TileJarFillable;
-
import common.itemBlocks.IB_ThaumiumReinforcedJar;
import common.tileentities.TE_ThaumiumReinforcedJar;
import common.tileentities.TE_ThaumiumReinforcedVoidJar;
@@ -30,6 +22,13 @@ import common.tileentities.TE_ThaumiumReinforcedVoidJar;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.common.blocks.BlockJar;
+import thaumcraft.common.config.ConfigBlocks;
+import thaumcraft.common.config.ConfigItems;
+import thaumcraft.common.items.ItemEssence;
+import thaumcraft.common.tiles.TileJarFillable;
public class Block_ThaumiumReinforcedJar extends BlockJar {
diff --git a/src/main/java/common/blocks/Block_YSZUnit.java b/src/main/java/common/blocks/Block_YSZUnit.java
index b94c9c53d7..312d3250a4 100644
--- a/src/main/java/common/blocks/Block_YSZUnit.java
+++ b/src/main/java/common/blocks/Block_YSZUnit.java
@@ -1,12 +1,11 @@
package common.blocks;
-import kekztech.KekzCore;
-
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
public class Block_YSZUnit extends BaseGTUpdateableBlock {
diff --git a/src/main/java/common/container/Container_ModularNuclearReactor.java b/src/main/java/common/container/Container_ModularNuclearReactor.java
index 5596e88261..d3a06a2f61 100644
--- a/src/main/java/common/container/Container_ModularNuclearReactor.java
+++ b/src/main/java/common/container/Container_ModularNuclearReactor.java
@@ -5,8 +5,8 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
-import reactor.ButtonSlot;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import reactor.ButtonSlot;
public class Container_ModularNuclearReactor extends Container {
diff --git a/src/main/java/common/items/ErrorItem.java b/src/main/java/common/items/ErrorItem.java
index 6558ababb4..997686a114 100644
--- a/src/main/java/common/items/ErrorItem.java
+++ b/src/main/java/common/items/ErrorItem.java
@@ -2,8 +2,6 @@ package common.items;
import java.util.List;
-import kekztech.KekzCore;
-
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -11,6 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
public class ErrorItem extends Item {
diff --git a/src/main/java/common/items/MetaItem_CraftingComponent.java b/src/main/java/common/items/MetaItem_CraftingComponent.java
index 96368a5be0..3b5d9238b1 100644
--- a/src/main/java/common/items/MetaItem_CraftingComponent.java
+++ b/src/main/java/common/items/MetaItem_CraftingComponent.java
@@ -2,8 +2,6 @@ package common.items;
import java.util.List;
-import kekztech.KekzCore;
-
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,6 +10,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
public class MetaItem_CraftingComponent extends Item {
diff --git a/src/main/java/common/items/MetaItem_ReactorComponent.java b/src/main/java/common/items/MetaItem_ReactorComponent.java
index 11955a1d34..45e3a17798 100644
--- a/src/main/java/common/items/MetaItem_ReactorComponent.java
+++ b/src/main/java/common/items/MetaItem_ReactorComponent.java
@@ -2,8 +2,6 @@ package common.items;
import java.util.List;
-import kekztech.KekzCore;
-
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -15,6 +13,7 @@ import net.minecraft.util.IIcon;
import org.lwjgl.input.Keyboard;
+import kekztech.KekzCore;
import reactor.items.CoolantCell;
import reactor.items.FuelRod;
import reactor.items.HeatExchanger;
diff --git a/src/main/java/common/recipeLoaders/AlloySmelter.java b/src/main/java/common/recipeLoaders/AlloySmelter.java
index 86af24d4a4..33bf414767 100644
--- a/src/main/java/common/recipeLoaders/AlloySmelter.java
+++ b/src/main/java/common/recipeLoaders/AlloySmelter.java
@@ -4,13 +4,12 @@ import static gregtech.api.enums.Mods.BartWorks;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import kekztech.Items;
-
import common.items.MetaItem_CraftingComponent;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.TierEU;
+import kekztech.Items;
public class AlloySmelter implements Runnable {
diff --git a/src/main/java/common/recipeLoaders/Assembler.java b/src/main/java/common/recipeLoaders/Assembler.java
index f831ceca1c..5e91988d11 100644
--- a/src/main/java/common/recipeLoaders/Assembler.java
+++ b/src/main/java/common/recipeLoaders/Assembler.java
@@ -4,8 +4,6 @@ import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import kekztech.Items;
-
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
@@ -18,6 +16,7 @@ import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
+import kekztech.Items;
public class Assembler implements Runnable {
diff --git a/src/main/java/common/recipeLoaders/ChemicalReactor.java b/src/main/java/common/recipeLoaders/ChemicalReactor.java
index 8d8a4a61b7..8e2e1862f5 100644
--- a/src/main/java/common/recipeLoaders/ChemicalReactor.java
+++ b/src/main/java/common/recipeLoaders/ChemicalReactor.java
@@ -3,14 +3,13 @@ package common.recipeLoaders;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
-import kekztech.Items;
-
import common.items.MetaItem_CraftingComponent;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_Utility;
+import kekztech.Items;
public class ChemicalReactor implements Runnable {
diff --git a/src/main/java/common/recipeLoaders/Crafting.java b/src/main/java/common/recipeLoaders/Crafting.java
index b481605204..8fb6cf3c95 100644
--- a/src/main/java/common/recipeLoaders/Crafting.java
+++ b/src/main/java/common/recipeLoaders/Crafting.java
@@ -2,8 +2,6 @@ package common.recipeLoaders;
import net.minecraft.item.ItemStack;
-import util.Util;
-
import common.Blocks;
import common.TileEntities;
@@ -13,6 +11,7 @@ import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
+import util.Util;
public class Crafting implements Runnable {
diff --git a/src/main/java/common/recipeLoaders/FormingPress.java b/src/main/java/common/recipeLoaders/FormingPress.java
index b53a68da27..6979ec8b12 100644
--- a/src/main/java/common/recipeLoaders/FormingPress.java
+++ b/src/main/java/common/recipeLoaders/FormingPress.java
@@ -3,13 +3,12 @@ package common.recipeLoaders;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPressRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import kekztech.Items;
-
import common.items.MetaItem_CraftingComponent;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.TierEU;
+import kekztech.Items;
public class FormingPress implements Runnable {
diff --git a/src/main/java/common/recipeLoaders/Mixer.java b/src/main/java/common/recipeLoaders/Mixer.java
index a3a9d6d3e6..14861385ef 100644
--- a/src/main/java/common/recipeLoaders/Mixer.java
+++ b/src/main/java/common/recipeLoaders/Mixer.java
@@ -3,8 +3,6 @@ package common.recipeLoaders;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import kekztech.Items;
-
import net.minecraft.item.ItemStack;
import common.items.ErrorItem;
@@ -16,6 +14,7 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
+import kekztech.Items;
public class Mixer implements Runnable {
diff --git a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
index fae8066c2d..6fc0f988f0 100644
--- a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
+++ b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
@@ -48,8 +48,6 @@ import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
-import client.gui.KT_UITextures;
-
import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoTunnel;
@@ -73,6 +71,7 @@ import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
import common.Blocks;
+import client.gui.KT_UITextures;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures.BlockIcons;
@@ -517,11 +516,11 @@ public class GTMTE_LapotronicSuperCapacitor
}
@Override
- public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
- boolean aActive, boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side,
+ ForgeDirection forgeDirectionacing, int colorIndex, boolean aActive, boolean aRedstone) {
ITexture[] sTexture = new ITexture[] {
TextureFactory.of(BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)) };
- if (aSide == aFacing && aActive) {
+ if (side == forgeDirectionacing && aActive) {
sTexture = new ITexture[] { TextureFactory
.of(BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW, Dyes.getModulation(-1, Dyes._NULL.mRGBa)) };
}
@@ -816,8 +815,8 @@ public class GTMTE_LapotronicSuperCapacitor
IGregTechTileEntity tBMTE = this.getBaseMetaTileEntity();
- tBMTE.injectEnergyUnits((byte) ForgeDirection.UNKNOWN.ordinal(), inputLastTick, 1L);
- tBMTE.drainEnergyUnits((byte) ForgeDirection.UNKNOWN.ordinal(), outputLastTick, 1L);
+ tBMTE.injectEnergyUnits(ForgeDirection.UNKNOWN, inputLastTick, 1L);
+ tBMTE.drainEnergyUnits(ForgeDirection.UNKNOWN, outputLastTick, 1L);
// Add I/O values to Queues
if (energyInputValues.size() > DURATION_AVERAGE_TICKS) {
@@ -1054,7 +1053,7 @@ public class GTMTE_LapotronicSuperCapacitor
}
@Override
- public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
if (canUseWireless()) {
wireless_mode = !wireless_mode;
GT_Utility.sendChatToPlayer(aPlayer, "Wireless network mode " + (wireless_mode ? "enabled." : "disabled."));
diff --git a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
index 428913a029..1875a097e5 100644
--- a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
+++ b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
@@ -67,9 +67,9 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas
}
@Override
- public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
- final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
- return aSide == aFacing
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side,
+ final ForgeDirection facing, final int colorIndex, final boolean aActive, final boolean aRedstone) {
+ return side == facing
? new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID),
new GT_RenderedTexture(
aActive ? Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE
@@ -101,8 +101,8 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas
@Override
public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) {
// Figure out the vector for the direction the back face of the controller is facing
- final int dirX = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX;
- final int dirZ = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ;
+ final int dirX = thisController.getBackFacing().offsetX;
+ final int dirZ = thisController.getBackFacing().offsetZ;
int minCasingAmount = 100;
boolean checklist = true; // if this is still true at the end, machine is good to go :)
diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
index a17694b579..394594d0ef 100644
--- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
@@ -16,6 +16,7 @@ import java.util.Collection;
import java.util.Iterator;
import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
@@ -103,9 +104,9 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_EnhancedMultiBlockBas
}
@Override
- public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
- final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
- if (aSide == aFacing) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side,
+ final ForgeDirection facing, final int colorIndex, final boolean aActive, final boolean aRedstone) {
+ if (side == facing) {
if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID),
TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE).extFacing().build(),
TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW).extFacing().glow()
diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
index baaef17858..aea029ddc2 100644
--- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
@@ -16,6 +16,7 @@ import java.util.Collection;
import java.util.Iterator;
import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@@ -105,9 +106,9 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_EnhancedMultiBlockBas
}
@Override
- public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
- final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
- if (aSide == aFacing) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side,
+ final ForgeDirection facing, final int colorIndex, final boolean aActive, final boolean aRedstone) {
+ if (side == facing) {
if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID),
TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE).extFacing().build(),
TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW).extFacing().glow()
diff --git a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java
index 1a5eb0fd99..421a2e2760 100644
--- a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java
+++ b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java
@@ -9,9 +9,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.util.ForgeDirection;
-import util.Vector3i;
-import util.Vector3ic;
-
import common.Blocks;
import gregtech.api.enums.Dyes;
@@ -21,6 +18,8 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
import gregtech.api.objects.GT_RenderedTexture;
+import util.Vector3i;
+import util.Vector3ic;
public class GTMTE_SpaceElevator extends GT_MetaTileEntity_MultiBlockBase {
@@ -78,12 +77,12 @@ public class GTMTE_SpaceElevator extends GT_MetaTileEntity_MultiBlockBase {
}
@Override
- public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
- boolean aActive, boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
+ int colorIndex, boolean aActive, boolean aRedstone) {
ITexture[] sTexture = new ITexture[] { new GT_RenderedTexture(
Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
Dyes.getModulation(-1, Dyes._NULL.mRGBa)) };
- if (aSide == aFacing && aActive) {
+ if (side == facing && aActive) {
sTexture = new ITexture[] { new GT_RenderedTexture(
Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW,
Dyes.getModulation(-1, Dyes._NULL.mRGBa)) };
@@ -120,15 +119,15 @@ public class GTMTE_SpaceElevator extends GT_MetaTileEntity_MultiBlockBase {
@Override
public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) {
// Make sure the controller is either facing up or down
- if (thisController.getFrontFacing() > 1) {
+ if (thisController.getFrontFacing().offsetY != 0) {
return false;
}
// Figure out the vector for the direction the back face of the controller is facing
final Vector3ic forgeDirection = new Vector3i(
- ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX,
- ForgeDirection.getOrientation(thisController.getBackFacing()).offsetY,
- ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ);
+ thisController.getBackFacing().offsetX,
+ thisController.getBackFacing().offsetY,
+ thisController.getBackFacing().offsetZ);
boolean formationChecklist = true;
int minCasingAmount = 320;
int firstCoilMeta = -1;
diff --git a/src/main/java/common/tileentities/GTMTE_TFFT.java b/src/main/java/common/tileentities/GTMTE_TFFT.java
index 3c679bd514..97d4321ce9 100644
--- a/src/main/java/common/tileentities/GTMTE_TFFT.java
+++ b/src/main/java/common/tileentities/GTMTE_TFFT.java
@@ -26,6 +26,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
@@ -281,9 +282,9 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase<GTMTE_T
}
@Override
- public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
- boolean aActive, boolean aRedstone) {
- if (aSide == aFacing) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
+ int colorIndex, boolean aActive, boolean aRedstone) {
+ if (side == facing) {
if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID_1),
TextureFactory.builder().addIcon(TEXTURE_TFFT_ACTIVE).extFacing().build(),
TextureFactory.builder().addIcon(TEXTURE_TFFT_ACTIVE_GLOW).extFacing().glow().build() };
@@ -563,8 +564,8 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase<GTMTE_T
}
@Override
- public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
- super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
+ public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ);
this.setDoVoidExcess(!doVoidExcess);
GT_Utility.sendChatToPlayer(aPlayer, "Auto-voiding " + (this.doVoidExcess ? "enabled" : "disabled"));
}
diff --git a/src/main/java/common/tileentities/GTMTE_TFFTHatch.java b/src/main/java/common/tileentities/GTMTE_TFFTHatch.java
index 414eb4a7fb..945f99ea2e 100644
--- a/src/main/java/common/tileentities/GTMTE_TFFTHatch.java
+++ b/src/main/java/common/tileentities/GTMTE_TFFTHatch.java
@@ -72,14 +72,14 @@ public class GTMTE_TFFTHatch extends GT_MetaTileEntity_Hatch implements IMEMonit
}
@Override
- public boolean isFacingValid(byte aFacing) {
+ public boolean isFacingValid(ForgeDirection facing) {
return true;
}
@Override
- public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
- boolean aActive, boolean aRedstone) {
- return super.getTexture(aBaseMetaTileEntity, aSide, aFacing, aColorIndex, aActive, aRedstone);
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
+ int colorIndex, boolean aActive, boolean aRedstone) {
+ return super.getTexture(aBaseMetaTileEntity, side, facing, colorIndex, aActive, aRedstone);
}
@Override
diff --git a/src/main/java/kekztech/GuiHandler.java b/src/main/java/kekztech/GuiHandler.java
index 8e16da8f37..9708b89d24 100644
--- a/src/main/java/kekztech/GuiHandler.java
+++ b/src/main/java/kekztech/GuiHandler.java
@@ -4,11 +4,11 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
-import client.gui.Gui_ItemProxyEndpoint;
-import client.gui.Gui_ItemProxySource;
-
import common.container.Container_ItemProxyEndpoint;
import common.container.Container_ItemProxySource;
+
+import client.gui.Gui_ItemProxyEndpoint;
+import client.gui.Gui_ItemProxySource;
import cpw.mods.fml.common.network.IGuiHandler;
public class GuiHandler implements IGuiHandler {
diff --git a/src/main/java/kekztech/Items.java b/src/main/java/kekztech/Items.java
index defec1c9b7..e1243820b4 100644
--- a/src/main/java/kekztech/Items.java
+++ b/src/main/java/kekztech/Items.java
@@ -5,11 +5,11 @@ import java.util.Arrays;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
-import util.Util;
-
import common.items.MetaItem_CraftingComponent;
import common.items.MetaItem_ReactorComponent;
+import util.Util;
+
public enum Items {
/*