diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2016-05-23 08:42:20 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-05-23 08:42:20 +1000 |
commit | 12ced6d3ea25823190453b4db9b7b905cc759a69 (patch) | |
tree | 2b4c847096b1083b3c9a8c12bf9534817131970f | |
parent | b1c08c2131c5c58e81ba9a6ae10e3738ae7025b4 (diff) | |
download | GT5-Unofficial-12ced6d3ea25823190453b4db9b7b905cc759a69.tar.gz GT5-Unofficial-12ced6d3ea25823190453b4db9b7b905cc759a69.tar.bz2 GT5-Unofficial-12ced6d3ea25823190453b4db9b7b905cc759a69.zip |
Fixed Casing Block creative tab registration.
Swapped textures.
Removing uptime from the next commit forward. (Think it causes weird issues, due to bad code merging)
4 files changed, 8 insertions, 8 deletions
diff --git a/src/Java/miscutil/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/miscutil/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java index 8aa77d75ba..aad32dd093 100644 --- a/src/Java/miscutil/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java +++ b/src/Java/miscutil/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java @@ -9,7 +9,7 @@ public interface IGregtech_RecipeAdder { * * @param aInput1 = first Input (not null, and respects StackSize) * @param aInputb = second Input (can be null, and respects StackSize) - * @param aOutput1 = Output of the Creosote (not null, and respects StackSize) + * @param aFluidOutput = Output of the Creosote (not null, and respects StackSize) * @param aFluidInput = fluid Input (can be null, and respects StackSize) * @param aOutput = Output of the Coal/coke (can be null, and respects StackSize) * @param aDuration = Duration (must be >= 0) diff --git a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java index 8af461f1e0..ef0cd3c62e 100644 --- a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java +++ b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java @@ -57,13 +57,13 @@ extends GregtechMetaCasingBlocksAbstract { } @Override - public IIcon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int aSide, int aMeta) { //Texture ID's. case 0 == ID[56] if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { - case 0: //Centrifuge + case 0: //Centrifuge return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); case 1: //Coke Oven Frame - return Textures.BlockIcons.MACHINE_CASING_GEARBOX_STEEL.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon(); case 2: //Coke Oven Casing Tier 1 return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon(); case 3: //Coke Oven Casing Tier 2 diff --git a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java index 4080db753a..d4ac2a03c3 100644 --- a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java +++ b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java @@ -1,8 +1,8 @@ package miscutil.gregtech.common.blocks; import gregtech.api.GregTech_API; -import gregtech.api.items.GT_Generic_Block; import gregtech.api.util.GT_LanguageManager; +import gregtech.common.blocks.GT_Block_Casings_Abstract; import java.util.Random; @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public abstract class GregtechMetaCasingBlocksAbstract - extends GT_Generic_Block { + extends GT_Block_Casings_Abstract { public GregtechMetaCasingBlocksAbstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) { super(aItemClass, aName, aMaterial); setStepSound(soundTypeMetal); diff --git a/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java b/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java index 6a00a34069..fce63c2e5d 100644 --- a/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java +++ b/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java @@ -55,9 +55,9 @@ public class GregtechMetaTileEntityIndustrialCokeOven @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[47], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER)}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[57], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER)}; } - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[47]}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[57]}; } @Override |