diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2016-04-22 17:59:17 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-04-22 17:59:17 +1000 |
commit | b33cfd02d8a367af0ba9a6689a0507440f44d07c (patch) | |
tree | e3832c9427e2f89f0ebc13bcb9c20de8c2328587 /src/Java/miscutil/gregtech | |
parent | 1b722c6d3941371c6b1ef90b60775539ffaff06c (diff) | |
download | GT5-Unofficial-b33cfd02d8a367af0ba9a6689a0507440f44d07c.tar.gz GT5-Unofficial-b33cfd02d8a367af0ba9a6689a0507440f44d07c.tar.bz2 GT5-Unofficial-b33cfd02d8a367af0ba9a6689a0507440f44d07c.zip |
Refactoring like a champion.
Diffstat (limited to 'src/Java/miscutil/gregtech')
-rw-r--r-- | src/Java/miscutil/gregtech/api/energy/IC2ElectricItem.java (renamed from src/Java/miscutil/gregtech/energy/IC2ElectricItem.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/energy/IC2ElectricItemManager.java (renamed from src/Java/miscutil/gregtech/energy/IC2ElectricItemManager.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java (renamed from src/Java/miscutil/gregtech/enums/AddExtraOreDict.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java (renamed from src/Java/miscutil/gregtech/enums/ExtraOreDictNames.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/enums/GregtechItemList.java (renamed from src/Java/miscutil/gregtech/enums/GregtechItemList.java) | 9 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/enums/GregtechTextures.java | 127 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/gui/CONTAINER_IronBlastFurnace.java (renamed from src/Java/miscutil/gregtech/gui/CONTAINER_IronBlastFurnace.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/gui/CONTAINER_SafeBlock.java (renamed from src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java) | 4 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/gui/CONTAINER_SteamCondenser.java (renamed from src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java) | 4 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/gui/GUI_IronBlastFurnace.java (renamed from src/Java/miscutil/gregtech/gui/GUI_IronBlastFurnace.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/gui/GUI_SafeBlock.java (renamed from src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/gui/GUI_SteamCondenser.java (renamed from src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/init/InitGregtech.java (renamed from src/Java/miscutil/gregtech/init/InitGregtech.java) | 10 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/init/machines/GregtechCobbleGenerator.java (renamed from src/Java/miscutil/gregtech/init/machines/GregtechCobbleGenerator.java) | 6 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/init/machines/GregtechConduits.java (renamed from src/Java/miscutil/gregtech/init/machines/GregtechConduits.java) | 4 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java (renamed from src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java) | 10 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java | 27 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/init/machines/GregtechSafeBlock.java (renamed from src/Java/miscutil/gregtech/init/machines/GregtechSafeBlock.java) | 6 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/init/machines/GregtechSteamCondenser.java (renamed from src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java) | 8 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/interfaces/GregtechItemContainer.java (renamed from src/Java/miscutil/gregtech/interfaces/GregtechItemContainer.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCasingBlocks.java) | 25 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java) | 8 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java) | 4 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaSafeBlock.java) | 8 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaTileEntityIronBlastFurnace.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntityIronBlastFurnace.java) | 6 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaBoilerBase.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaTileEntity.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechSteelBoiler.java (renamed from src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechSteelBoiler.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/util/IMessage.java (renamed from src/Java/miscutil/gregtech/util/IMessage.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/api/util/VanillaChatCommandSender.java (renamed from src/Java/miscutil/gregtech/util/VanillaChatCommandSender.java) | 2 | ||||
-rw-r--r-- | src/Java/miscutil/gregtech/common/machines/multi/GT_MetaTileEntity_LargeIndustrialCentrifuge.java | 198 |
34 files changed, 427 insertions, 71 deletions
diff --git a/src/Java/miscutil/gregtech/energy/IC2ElectricItem.java b/src/Java/miscutil/gregtech/api/energy/IC2ElectricItem.java index 1e8ecd563a..eae47b9910 100644 --- a/src/Java/miscutil/gregtech/energy/IC2ElectricItem.java +++ b/src/Java/miscutil/gregtech/api/energy/IC2ElectricItem.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.energy; +package miscutil.gregtech.api.energy; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/Java/miscutil/gregtech/energy/IC2ElectricItemManager.java b/src/Java/miscutil/gregtech/api/energy/IC2ElectricItemManager.java index 8607d2109b..4b2fcb2fec 100644 --- a/src/Java/miscutil/gregtech/energy/IC2ElectricItemManager.java +++ b/src/Java/miscutil/gregtech/api/energy/IC2ElectricItemManager.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.energy; +package miscutil.gregtech.api.energy; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java b/src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java index 171bdda533..dff0483470 100644 --- a/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java +++ b/src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.enums; +package miscutil.gregtech.api.enums; import gregtech.loaders.preload.GT_Loader_OreDictionary; diff --git a/src/Java/miscutil/gregtech/enums/ExtraOreDictNames.java b/src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java index 192cc898ca..8ca492c9dd 100644 --- a/src/Java/miscutil/gregtech/enums/ExtraOreDictNames.java +++ b/src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.enums; +package miscutil.gregtech.api.enums; /** * diff --git a/src/Java/miscutil/gregtech/enums/GregtechItemList.java b/src/Java/miscutil/gregtech/api/enums/GregtechItemList.java index f64dfda734..1a95d49441 100644 --- a/src/Java/miscutil/gregtech/enums/GregtechItemList.java +++ b/src/Java/miscutil/gregtech/api/enums/GregtechItemList.java @@ -1,10 +1,10 @@ -package miscutil.gregtech.enums; +package miscutil.gregtech.api.enums; import static gregtech.api.enums.GT_Values.W; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import miscutil.gregtech.interfaces.GregtechItemContainer; +import miscutil.gregtech.api.interfaces.GregtechItemContainer; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -46,7 +46,10 @@ public enum GregtechItemList implements GregtechItemContainer { Machine_Iron_BlastFurnace, Casing_IronPlatedBricks, //Machine Casings - Casing_Shielding; + Casing_Shielding, Casing_Centrifuge1, Casing_Centrifuge2, + + //Large Centrifuge + Industrial_Centrifuge; public static final GregtechItemList[] DYE_ONLY_ITEMS = { diff --git a/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java b/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java new file mode 100644 index 0000000000..40c3cb7f4e --- /dev/null +++ b/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java @@ -0,0 +1,127 @@ +package miscutil.gregtech.api.enums; + +import static gregtech.api.enums.GT_Values.RES_PATH_BLOCK; +import gregtech.api.GregTech_API; +import gregtech.api.interfaces.IIconContainer; +import gregtech.api.interfaces.ITexture; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; + +public class GregtechTextures { + public enum BlockIcons implements IIconContainer, Runnable { + + + LARGECENTRIFUGE_TI1, LARGECENTRIFUGE_TI2, LARGECENTRIFUGE_TI3, LARGECENTRIFUGE_TI4, LARGECENTRIFUGE_TI5, + LARGECENTRIFUGE_TI6, LARGECENTRIFUGE_TI7, LARGECENTRIFUGE_TI8, LARGECENTRIFUGE_TI9, + LARGECENTRIFUGE_TI_ACTIVE1, LARGECENTRIFUGE_TI_ACTIVE2, LARGECENTRIFUGE_TI_ACTIVE3, LARGECENTRIFUGE_TI_ACTIVE4, + LARGECENTRIFUGE_TI_ACTIVE5, LARGECENTRIFUGE_TI_ACTIVE6, LARGECENTRIFUGE_TI_ACTIVE7, LARGECENTRIFUGE_TI_ACTIVE8, LARGECENTRIFUGE_TI_ACTIVE9, + + LARGECENTRIFUGE_TU1, LARGECENTRIFUGE_TU2, LARGECENTRIFUGE_TU3, LARGECENTRIFUGE_TU4, LARGECENTRIFUGE_TU5, + LARGECENTRIFUGE_TU6, LARGECENTRIFUGE_TU7, LARGECENTRIFUGE_TU8, LARGECENTRIFUGE_TU9, + LARGECENTRIFUGE_TU_ACTIVE1, LARGECENTRIFUGE_TU_ACTIVE2, LARGECENTRIFUGE_TU_ACTIVE3, LARGECENTRIFUGE_TU_ACTIVE4, LARGECENTRIFUGE_TU_ACTIVE5, + LARGECENTRIFUGE_TU_ACTIVE6, LARGECENTRIFUGE_TU_ACTIVE7, LARGECENTRIFUGE_TU_ACTIVE8, LARGECENTRIFUGE_TU_ACTIVE9; + + public static final IIconContainer[] + + CENTRIFUGE1 = new IIconContainer[]{ + LARGECENTRIFUGE_TI1, + LARGECENTRIFUGE_TI2, + LARGECENTRIFUGE_TI3, + LARGECENTRIFUGE_TI4, + LARGECENTRIFUGE_TI5, + LARGECENTRIFUGE_TI6, + LARGECENTRIFUGE_TI7, + LARGECENTRIFUGE_TI8, + LARGECENTRIFUGE_TI9 + }, + CENTRIFUGE_ACTIVE1 = new IIconContainer[]{ + LARGECENTRIFUGE_TI_ACTIVE1, + LARGECENTRIFUGE_TI_ACTIVE2, + LARGECENTRIFUGE_TI_ACTIVE3, + LARGECENTRIFUGE_TI_ACTIVE4, + LARGECENTRIFUGE_TI_ACTIVE5, + LARGECENTRIFUGE_TI_ACTIVE6, + LARGECENTRIFUGE_TI_ACTIVE7, + LARGECENTRIFUGE_TI_ACTIVE8, + LARGECENTRIFUGE_TI_ACTIVE9 + }, + CENTRIFUGE2 = new IIconContainer[]{ + LARGECENTRIFUGE_TU1, + LARGECENTRIFUGE_TU2, + LARGECENTRIFUGE_TU3, + LARGECENTRIFUGE_TU4, + LARGECENTRIFUGE_TU5, + LARGECENTRIFUGE_TU6, + LARGECENTRIFUGE_TU7, + LARGECENTRIFUGE_TU8, + LARGECENTRIFUGE_TU9 + }, + CENTRIFUGE_ACTIVE2 = new IIconContainer[]{ + LARGECENTRIFUGE_TU_ACTIVE1, + LARGECENTRIFUGE_TU_ACTIVE2, + LARGECENTRIFUGE_TU_ACTIVE3, + LARGECENTRIFUGE_TU_ACTIVE4, + LARGECENTRIFUGE_TU_ACTIVE5, + LARGECENTRIFUGE_TU_ACTIVE6, + LARGECENTRIFUGE_TU_ACTIVE7, + LARGECENTRIFUGE_TU_ACTIVE8, + LARGECENTRIFUGE_TU_ACTIVE9 + }; + + public static ITexture[] + GT_CASING_BLOCKS = new ITexture[64]; + + protected IIcon mIcon; + + @Override + public IIcon getIcon() { + return mIcon; + } + + @Override + public IIcon getOverlayIcon() { + return null; + } + + @Override + public void run() { + mIcon = GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + "iconsets/" + this); + } + + @Override + public ResourceLocation getTextureFile() { + return TextureMap.locationBlocksTexture; + } + + public static class CustomIcon implements IIconContainer, Runnable { + protected IIcon mIcon; + protected String mIconName; + + public CustomIcon(String aIconName) { + mIconName = aIconName; + GregTech_API.sGTBlockIconload.add(this); + } + + @Override + public IIcon getIcon() { + return mIcon; + } + + @Override + public IIcon getOverlayIcon() { + return null; + } + + @Override + public void run() { + mIcon = GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + mIconName); + } + + @Override + public ResourceLocation getTextureFile() { + return TextureMap.locationBlocksTexture; + } + } +}} + diff --git a/src/Java/miscutil/gregtech/gui/CONTAINER_IronBlastFurnace.java b/src/Java/miscutil/gregtech/api/gui/CONTAINER_IronBlastFurnace.java index a094f764cc..3015e43f2a 100644 --- a/src/Java/miscutil/gregtech/gui/CONTAINER_IronBlastFurnace.java +++ b/src/Java/miscutil/gregtech/api/gui/CONTAINER_IronBlastFurnace.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.gui; +package miscutil.gregtech.api.gui; import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.gui.GT_Slot_Output; diff --git a/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java b/src/Java/miscutil/gregtech/api/gui/CONTAINER_SafeBlock.java index 4d7b94db0e..a805585a49 100644 --- a/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java +++ b/src/Java/miscutil/gregtech/api/gui/CONTAINER_SafeBlock.java @@ -1,10 +1,10 @@ -package miscutil.gregtech.gui; +package miscutil.gregtech.api.gui; import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.gui.GT_Slot_Holo; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import miscutil.core.util.PlayerCache; -import miscutil.gregtech.metatileentity.implementations.GregtechMetaSafeBlock; +import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; diff --git a/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java b/src/Java/miscutil/gregtech/api/gui/CONTAINER_SteamCondenser.java index 26715d0801..9a283b8de3 100644 --- a/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java +++ b/src/Java/miscutil/gregtech/api/gui/CONTAINER_SteamCondenser.java @@ -1,11 +1,11 @@ -package miscutil.gregtech.gui; +package miscutil.gregtech.api.gui; import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import java.util.Iterator; -import miscutil.gregtech.metatileentity.implementations.base.GregtechMetaBoilerBase; +import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaBoilerBase; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; diff --git a/src/Java/miscutil/gregtech/gui/GUI_IronBlastFurnace.java b/src/Java/miscutil/gregtech/api/gui/GUI_IronBlastFurnace.java index 6ed6b3c907..6f8c42cbaa 100644 --- a/src/Java/miscutil/gregtech/gui/GUI_IronBlastFurnace.java +++ b/src/Java/miscutil/gregtech/api/gui/GUI_IronBlastFurnace.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.gui; +package miscutil.gregtech.api.gui; import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; diff --git a/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java b/src/Java/miscutil/gregtech/api/gui/GUI_SafeBlock.java index fea5c1bfc1..165e4cb6ea 100644 --- a/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java +++ b/src/Java/miscutil/gregtech/api/gui/GUI_SafeBlock.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.gui; +package miscutil.gregtech.api.gui; import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; diff --git a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java b/src/Java/miscutil/gregtech/api/gui/GUI_SteamCondenser.java index 0b57023286..1c125e86fd 100644 --- a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java +++ b/src/Java/miscutil/gregtech/api/gui/GUI_SteamCondenser.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.gui; +package miscutil.gregtech.api.gui; import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; diff --git a/src/Java/miscutil/gregtech/init/InitGregtech.java b/src/Java/miscutil/gregtech/api/init/InitGregtech.java index a6b6277e9d..1507405f0c 100644 --- a/src/Java/miscutil/gregtech/init/InitGregtech.java +++ b/src/Java/miscutil/gregtech/api/init/InitGregtech.java @@ -1,11 +1,11 @@ -package miscutil.gregtech.init; +package miscutil.gregtech.api.init; import static miscutil.core.lib.LoadedMods.Gregtech; import miscutil.core.util.Utils; -import miscutil.gregtech.init.machines.GregtechConduits; -import miscutil.gregtech.init.machines.GregtechEnergyBuffer; -import miscutil.gregtech.init.machines.GregtechSafeBlock; -import miscutil.gregtech.init.machines.GregtechSteamCondenser; +import miscutil.gregtech.api.init.machines.GregtechConduits; +import miscutil.gregtech.api.init.machines.GregtechEnergyBuffer; +import miscutil.gregtech.api.init.machines.GregtechSafeBlock; +import miscutil.gregtech.api.init.machines.GregtechSteamCondenser; public class InitGregtech { diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechCobbleGenerator.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechCobbleGenerator.java index 306f4f45f1..3b6d0834a1 100644 --- a/src/Java/miscutil/gregtech/init/machines/GregtechCobbleGenerator.java +++ b/src/Java/miscutil/gregtech/api/init/machines/GregtechCobbleGenerator.java @@ -1,12 +1,12 @@ -package miscutil.gregtech.init.machines; +package miscutil.gregtech.api.init.machines; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OreDictNames; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; -import miscutil.gregtech.enums.GregtechItemList; -import miscutil.gregtech.metatileentity.implementations.base.GregtechSteelBoiler; +import miscutil.gregtech.api.enums.GregtechItemList; +import miscutil.gregtech.api.metatileentity.implementations.base.GregtechSteelBoiler; import cpw.mods.fml.common.FMLLog; public class GregtechCobbleGenerator diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechConduits.java index 4763d325d6..318ff5f882 100644 --- a/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java +++ b/src/Java/miscutil/gregtech/api/init/machines/GregtechConduits.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.init.machines; +package miscutil.gregtech.api.init.machines; import static miscutil.core.lib.LoadedMods.Gregtech; import gregtech.api.enums.GT_Values; @@ -7,7 +7,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.gregtech.metatileentity.implementations.GregtechMetaPipeEntity_Cable; +import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable; public class GregtechConduits { /** diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java index ab96340365..c54e9f9d76 100644 --- a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java +++ b/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java @@ -1,14 +1,14 @@ -package miscutil.gregtech.init.machines; +package miscutil.gregtech.api.init.machines; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import miscutil.core.util.Utils; -import miscutil.gregtech.enums.ExtraOreDictNames; -import miscutil.gregtech.enums.GregtechItemList; -import miscutil.gregtech.metatileentity.implementations.GregtechMetaCreativeEnergyBuffer; -import miscutil.gregtech.metatileentity.implementations.GregtechMetaEnergyBuffer; +import miscutil.gregtech.api.enums.ExtraOreDictNames; +import miscutil.gregtech.api.enums.GregtechItemList; +import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCreativeEnergyBuffer; +import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer; public class GregtechEnergyBuffer { diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java new file mode 100644 index 0000000000..c6abfa8642 --- /dev/null +++ b/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java @@ -0,0 +1,27 @@ +package miscutil.gregtech.api.init.machines; + +import miscutil.core.util.Utils; +import miscutil.gregtech.api.enums.GregtechItemList; +import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCondensor; + +public class GregtechIndustrialCentrifuge +{ + + + + public static void run() + { + if (miscutil.core.lib.LoadedMods.Gregtech){ + Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); + run1(); + } + + } + + private static void run1() + { + //Industrial Centrifuge Multiblock + GregtechItemList.Industrial_Centrifuge.set(new GregtechMetaCondensor(790, "industrialcentrifuge.controller.tier.single", "Steam Condensor").getStackForm(1L)); + + } +} diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechSafeBlock.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechSafeBlock.java index b38417f1df..f580d5da3a 100644 --- a/src/Java/miscutil/gregtech/init/machines/GregtechSafeBlock.java +++ b/src/Java/miscutil/gregtech/api/init/machines/GregtechSafeBlock.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.init.machines; +package miscutil.gregtech.api.init.machines; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -6,8 +6,8 @@ import gregtech.api.enums.OreDictNames; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import miscutil.core.util.Utils; -import miscutil.gregtech.enums.GregtechItemList; -import miscutil.gregtech.metatileentity.implementations.GregtechMetaSafeBlock; +import miscutil.gregtech.api.enums.GregtechItemList; +import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; public class GregtechSafeBlock { diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechSteamCondenser.java index 11af61a95b..ea7b8b0219 100644 --- a/src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java +++ b/src/Java/miscutil/gregtech/api/init/machines/GregtechSteamCondenser.java @@ -1,9 +1,9 @@ -package miscutil.gregtech.init.machines; +package miscutil.gregtech.api.init.machines; import miscutil.core.util.Utils; -import miscutil.gregtech.enums.GregtechItemList; -import miscutil.gregtech.metatileentity.implementations.GregtechMetaCondensor; -import miscutil.gregtech.metatileentity.implementations.GregtechMetaTileEntityIronBlastFurnace; +import miscutil.gregtech.api.enums.GregtechItemList; +import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCondensor; +import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaTileEntityIronBlastFurnace; public class GregtechSteamCondenser { diff --git a/src/Java/miscutil/gregtech/interfaces/GregtechItemContainer.java b/src/Java/miscutil/gregtech/api/interfaces/GregtechItemContainer.java index e871c19fcf..2f613006b7 100644 --- a/src/Java/miscutil/gregtech/interfaces/GregtechItemContainer.java +++ b/src/Java/miscutil/gregtech/api/interfaces/GregtechItemContainer.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.interfaces; +package miscutil.gregtech.api.interfaces; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCasingBlocks.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java index 72e084b747..e2587fffef 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCasingBlocks.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations; +package miscutil.gregtech.api.metatileentity.implementations; import gregtech.api.enums.Textures; import gregtech.api.objects.GT_CopiedBlockTexture; @@ -6,7 +6,8 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.common.blocks.GT_Block_Casings_Abstract; import gregtech.common.blocks.GT_Item_Casings1; import gregtech.common.blocks.GT_Material_Casings; -import miscutil.gregtech.enums.GregtechItemList; +import miscutil.gregtech.api.enums.GregtechItemList; +import miscutil.gregtech.api.enums.GregtechTextures; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -16,10 +17,10 @@ extends GT_Block_Casings_Abstract { public GregtechMetaCasingBlocks() { super(GT_Item_Casings1.class, "miscutils.blockcasings", GT_Material_Casings.INSTANCE); for (byte i = 0; i < 16; i = (byte) (i + 1)) { - Textures.BlockIcons.CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i); + GregtechTextures.BlockIcons.GT_CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i); } - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "UNUSED"); - //GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "LV Machine Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Centrifuge Anti-Vibration Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Centrifuge Casing"); //GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing"); //GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "HV Machine Casing"); //GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "EV Machine Casing"); @@ -34,9 +35,9 @@ extends GT_Block_Casings_Abstract { //GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block"); //GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block"); //GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block"); - GregtechItemList.Casing_Shielding.set(new ItemStack(this, 1, 0)); - /* ItemList.Casing_LV.set(new ItemStack(this, 1, 1)); - ItemList.Casing_MV.set(new ItemStack(this, 1, 2)); + GregtechItemList.Casing_Centrifuge1.set(new ItemStack(this, 1, 0)); + GregtechItemList.Casing_Centrifuge2.set(new ItemStack(this, 1, 1)); + /*ItemList.Casing_MV.set(new ItemStack(this, 1, 2)); ItemList.Casing_HV.set(new ItemStack(this, 1, 3)); ItemList.Casing_EV.set(new ItemStack(this, 1, 4)); ItemList.Casing_IV.set(new ItemStack(this, 1, 5)); @@ -55,10 +56,10 @@ extends GT_Block_Casings_Abstract { public IIcon getIcon(int aSide, int aMeta) { if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { - case 1: - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); - case 10: - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + case 1: + return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); + case 2: + return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); case 11: return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon(); case 12: diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java index 95e12a5ed9..b05e863241 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations; +package miscutil.gregtech.api.metatileentity.implementations; import gregtech.api.enums.Dyes; import gregtech.api.enums.Textures; @@ -8,9 +8,9 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import miscutil.core.util.Utils; -import miscutil.gregtech.gui.CONTAINER_SteamCondenser; -import miscutil.gregtech.gui.GUI_SteamCondenser; -import miscutil.gregtech.metatileentity.implementations.base.GregtechMetaBoilerBase; +import miscutil.gregtech.api.gui.CONTAINER_SteamCondenser; +import miscutil.gregtech.api.gui.GUI_SteamCondenser; +import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaBoilerBase; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java index a176aab00f..0509b0f8e9 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations; +package miscutil.gregtech.api.metatileentity.implementations; import static gregtech.api.enums.GT_Values.V; import gregtech.api.enums.Textures; diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java index 7d6a8b61bd..57c88c0cd3 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations; +package miscutil.gregtech.api.metatileentity.implementations; import static gregtech.api.enums.GT_Values.V; import gregtech.api.enums.Textures; @@ -24,7 +24,7 @@ import java.util.List; import miscutil.core.handler.GuiHandler; import miscutil.core.util.Utils; import miscutil.core.waila.IWailaInfoProvider; -import miscutil.gregtech.metatileentity.implementations.base.GregtechMetaTileEntity; +import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java index 11aa483a15..bc9408319e 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations; +package miscutil.gregtech.api.metatileentity.implementations; import static gregtech.api.enums.GT_Values.VN; import gregtech.api.GregTech_API; diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaSafeBlock.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java index 3ddea2a5b7..b45c698c97 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaSafeBlock.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations; +package miscutil.gregtech.api.metatileentity.implementations; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -6,9 +6,9 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; -import miscutil.gregtech.gui.CONTAINER_SafeBlock; -import miscutil.gregtech.gui.GUI_SafeBlock; -import miscutil.gregtech.metatileentity.implementations.base.GregtechMetaSafeBlockBase; +import miscutil.gregtech.api.gui.CONTAINER_SafeBlock; +import miscutil.gregtech.api.gui.GUI_SafeBlock; +import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaSafeBlockBase; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.EnumChatFormatting; diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntityIronBlastFurnace.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaTileEntityIronBlastFurnace.java index 684f53a007..bcc2030755 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntityIronBlastFurnace.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaTileEntityIronBlastFurnace.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations; +package miscutil.gregtech.api.metatileentity.implementations; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; @@ -12,8 +12,8 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import miscutil.core.block.ModBlocks; -import miscutil.gregtech.gui.CONTAINER_IronBlastFurnace; -import miscutil.gregtech.gui.GUI_IronBlastFurnace; +import miscutil.gregtech.api.gui.CONTAINER_IronBlastFurnace; +import miscutil.gregtech.api.gui.GUI_IronBlastFurnace; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaBoilerBase.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java index 553740d28a..12e807bc34 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaBoilerBase.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations.base; +package miscutil.gregtech.api.metatileentity.implementations.base; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java index 7e6eb1d9cf..6914e2d9d4 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations.base; +package miscutil.gregtech.api.metatileentity.implementations.base; import static gregtech.api.enums.GT_Values.V; import gregtech.api.enums.Textures; diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaTileEntity.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java index bc3d2f4967..de9a98c644 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaTileEntity.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations.base; +package miscutil.gregtech.api.metatileentity.implementations.base; import static gregtech.api.enums.GT_Values.GT; import gregtech.api.interfaces.ITexture; diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechSteelBoiler.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechSteelBoiler.java index 511cb0e8df..0a6920c794 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechSteelBoiler.java +++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechSteelBoiler.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.metatileentity.implementations.base; +package miscutil.gregtech.api.metatileentity.implementations.base; import gregtech.api.enums.Dyes; import gregtech.api.enums.Materials; diff --git a/src/Java/miscutil/gregtech/util/IMessage.java b/src/Java/miscutil/gregtech/api/util/IMessage.java index 8891e2adde..4a1fa2d684 100644 --- a/src/Java/miscutil/gregtech/util/IMessage.java +++ b/src/Java/miscutil/gregtech/api/util/IMessage.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.util; +package miscutil.gregtech.api.util; import net.minecraft.client.Minecraft; import net.minecraft.util.ChatComponentText; diff --git a/src/Java/miscutil/gregtech/util/VanillaChatCommandSender.java b/src/Java/miscutil/gregtech/api/util/VanillaChatCommandSender.java index ee77211b21..1971c79aeb 100644 --- a/src/Java/miscutil/gregtech/util/VanillaChatCommandSender.java +++ b/src/Java/miscutil/gregtech/api/util/VanillaChatCommandSender.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.util; +package miscutil.gregtech.api.util; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.IChatComponent; diff --git a/src/Java/miscutil/gregtech/common/machines/multi/GT_MetaTileEntity_LargeIndustrialCentrifuge.java b/src/Java/miscutil/gregtech/common/machines/multi/GT_MetaTileEntity_LargeIndustrialCentrifuge.java new file mode 100644 index 0000000000..7df371c8b0 --- /dev/null +++ b/src/Java/miscutil/gregtech/common/machines/multi/GT_MetaTileEntity_LargeIndustrialCentrifuge.java @@ -0,0 +1,198 @@ +package miscutil.gregtech.common.machines.multi; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.Textures; +import gregtech.api.gui.GT_GUIContainer_MultiMachine; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import miscutil.gregtech.api.enums.GregtechTextures; +import net.minecraft.block.Block; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; + +public class GT_MetaTileEntity_LargeIndustrialCentrifuge + extends GT_MetaTileEntity_MultiBlockBase { + private static boolean controller; + + public GT_MetaTileEntity_LargeIndustrialCentrifuge(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public GT_MetaTileEntity_LargeIndustrialCentrifuge(String aName) { + super(aName); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_LargeIndustrialCentrifuge(this.mName); + } + + @Override + public String[] getDescription() { + return new String[]{"Controller Block for the Distillation Tower", + "Size: 3x3x3 (Hollow)", + "Controller (front middle)", + "1x Input Hatch (Bottom)", + "5x Output Hatch (one each height level besides botton)", + "1x Output Bus (Botton)", + "1x Energy Hatch (Anywhere)", + "1x Maintenance Hatch (Anywhere)", + "Centrifuge Casings for the rest (26 at least!)"}; + } + + @Override + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + if (aSide == aFacing) { + return new ITexture[]{GregtechTextures.BlockIcons.GT_CASING_BLOCKS[2], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER)}; + } + return new ITexture[]{GregtechTextures.BlockIcons.GT_CASING_BLOCKS[2]}; + } + + @Override + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "VacuumFreezer.png"); + } + + @Override + public GT_Recipe.GT_Recipe_Map getRecipeMap() { + return GT_Recipe.GT_Recipe_Map.sDistillationRecipes; + } + + @Override + public boolean isCorrectMachinePart(ItemStack aStack) { + return true; + } + + @Override + public boolean isFacingValid(byte aFacing) { + return aFacing > 1; + } + + @Override + public boolean checkRecipe(ItemStack aStack) { + + long tVoltage = getMaxInputVoltage(); + byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + if (this.mInputHatches.size() > 0 && this.mInputHatches.get(0) != null && this.mInputHatches.get(0).mFluid != null && this.mInputHatches.get(0).mFluid.amount > 0) { + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], new FluidStack[]{this.mInputHatches.get(0).mFluid}, new ItemStack[]{}); + if (tRecipe != null) { + if (tRecipe.isRecipeInputEqual(true, new FluidStack[]{this.mInputHatches.get(0).mFluid}, new ItemStack[]{})) { + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; + if (tRecipe.mEUt <= 16) { + this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + this.mMaxProgresstime = (tRecipe.mDuration / (1 << tTier - 1)); + } else { + this.mEUt = tRecipe.mEUt; + this.mMaxProgresstime = tRecipe.mDuration; + while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { + this.mEUt *= 4; + this.mMaxProgresstime /= 2; + } + } + if (this.mEUt > 0) { + this.mEUt = (-this.mEUt); + } + this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); + this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)}; + this.mOutputFluids = tRecipe.mFluidOutputs; + updateSlots(); + return true; + } + } + } + + return false; + } + + @Override + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; + int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; + if (!aBaseMetaTileEntity.getAirOffset(xDir, 1, zDir)) { + return false; + } + int tAmount = 0; + controller = false; + for (int i = -1; i < 2; i++) { + for (int j = -1; j < 2; j++) { + for (int h = 0; h < 6; h++) { + if (!(i == 0 && j == 0 && (h > 0 && h < 5)))//((h > 0)&&(h<5)) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0))) + { + IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); + if ((!addMaintenanceToMachineList(tTileEntity, 49)) && (!addInputToMachineList(tTileEntity, 49)) && (!addOutputToMachineList(tTileEntity, 49)) && (!addEnergyInputToMachineList(tTileEntity, 49)) && (!ignoreController(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j)))) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings4) { + return false; + } + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 1) { + return false; + } + tAmount++; + } + } + } + } + } + if (this.mInputHatches.size() != 1 || this.mOutputBusses.size() != 1 || this.mInputBusses.size() != 0 || this.mOutputHatches.size() != 5) { + return false; + } + int height = this.getBaseMetaTileEntity().getYCoord(); + if (this.mInputHatches.get(0).getBaseMetaTileEntity().getYCoord() != height || this.mOutputBusses.get(0).getBaseMetaTileEntity().getYCoord() != height) { + return false; + } + GT_MetaTileEntity_Hatch_Output[] tmpHatches = new GT_MetaTileEntity_Hatch_Output[5]; + for (int i = 0; i < this.mOutputHatches.size(); i++) { + int hatchNumber = this.mOutputHatches.get(i).getBaseMetaTileEntity().getYCoord() - 1 - height; + if (tmpHatches[hatchNumber] == null) { + tmpHatches[hatchNumber] = this.mOutputHatches.get(i); + } else { + return false; + } + } + this.mOutputHatches.clear(); + for (int i = 0; i < tmpHatches.length; i++) { + this.mOutputHatches.add(tmpHatches[i]); + } + return tAmount >= 26; + } + + public boolean ignoreController(Block tTileEntity) { + if (!controller && tTileEntity == GregTech_API.sBlockMachines) { + return true; + } + return false; + } + + @Override + public int getMaxEfficiency(ItemStack aStack) { + return 10000; + } + + @Override + public int getPollutionPerTick(ItemStack aStack) { + return 0; + } + + @Override + public int getDamageToComponent(ItemStack aStack) { + return 0; + } + + @Override + public int getAmountOfOutputs() { + return 1; + } + + @Override + public boolean explodesOnComponentBreak(ItemStack aStack) { + return false; + } +}
\ No newline at end of file |