diff options
Diffstat (limited to 'main/java/gregtech/common')
11 files changed, 153 insertions, 167 deletions
diff --git a/main/java/gregtech/common/blocks/GT_Block_Ores.java b/main/java/gregtech/common/blocks/GT_Block_Ores.java index 5186456e40..19bf814a31 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Ores.java +++ b/main/java/gregtech/common/blocks/GT_Block_Ores.java @@ -96,35 +96,15 @@ /* 96: 83 */ FUCKING_LOCK = false;
/* 97: */ }
/* 98: */
-/* 99: */ public String getLocalizedName(Materials aMaterial)
-/* 100: */ {
-/* 101: 87 */ switch (aMaterial.ordinal())
-/* 102: */ {
-/* 103: */ case 1:
-/* 104: */ case 2:
-/* 105: */ case 3:
-/* 106: */ case 4:
-/* 107: */ case 5:
-/* 108: */ case 6:
-/* 109: */ case 7:
-/* 110: */ case 8:
-/* 111: 89 */ return aMaterial.mDefaultLocalName + " Infused Stone";
-/* 112: */ case 9:
-/* 113: */ case 10:
-/* 114: */ case 11:
-/* 115: */ case 12:
-/* 116: */ case 13:
-/* 117: */ case 14:
-/* 118: */ case 15:
-/* 119: */ case 16:
-/* 120: */ case 17:
-/* 121: */ case 18:
-/* 122: */ case 19:
-/* 123: */ case 20:
-/* 124: 91 */ return aMaterial.mDefaultLocalName;
-/* 125: */ }
-/* 126: 93 */ return aMaterial.mDefaultLocalName + OrePrefixes.ore.mLocalizedMaterialPost;
-/* 127: */ }
+/* 99: */ public String getLocalizedName(Materials aMaterial) {
+ /* 87 */ switch (aMaterial) {
+ /* */ case InfusedAir: case InfusedDull: case InfusedEarth: case InfusedEntropy: case InfusedFire: case InfusedOrder: case InfusedVis: case InfusedWater:
+ /* 89 */ return aMaterial.mDefaultLocalName + " Infused Stone";
+ /* */ case Vermiculite: case Bentonite: case Kaolinite: case Talc: case BasalticMineralSand: case GraniticMineralSand: case GlauconiteSand: case CassiteriteSand: case GarnetSand: case QuartzSand: case Pitchblende: case FullersEarth:
+ /* 91 */ return aMaterial.mDefaultLocalName;
+ /* */ }
+ /* 93 */ return aMaterial.mDefaultLocalName + OrePrefixes.ore.mLocalizedMaterialPost;
+ /* */ }
/* 128: */
/* 129: */ public boolean onBlockEventReceived(World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, int p_149696_5_, int p_149696_6_)
/* 130: */ {
diff --git a/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java index ded7e05d74..0338dadee0 100644 --- a/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java +++ b/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java @@ -240,7 +240,7 @@ import gregtech.api.enums.Textures; /* 237: */ {
/* 238:210 */ Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)];
/* 239:211 */ if ((aMaterial != null) && (this.mMetaData < 32000)) {
-/* 240:211 */ return new ITexture[] { mStoneTextures[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa) };
+/* 240:211 */ return new ITexture[] { mStoneTextures[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData/16000 ==0 ? OrePrefixes.ore.mTextureIndex:OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa) };
/* 241: */ }
/* 242:212 */ return new ITexture[] { mStoneTextures[0], new GT_RenderedTexture(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.ore.mTextureIndex]) };
/* 243: */ }
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 5e8cf38a8f..946cb78876 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -229,6 +229,12 @@ import net.minecraftforge.fluids.FluidStack; @Override public boolean isCorrectMachinePart(ItemStack aStack) {return true;} +public int overclock(int mEUt){ + if(tierOverclock()==1){return 1;} + if(tierOverclock()==2){return mEUt<32768? 2 : 1;} + return mEUt<32768?4:mEUt<65536?2:1; +} + @Override public boolean checkRecipe(ItemStack aStack) { if(this.mLastRecipe!=null){; @@ -238,8 +244,10 @@ public boolean checkRecipe(ItemStack aStack) { if(tInput2.mFluid!=null&& tInput2.mFluid!=null&&tInput2.mFluid.getFluid().getID()==this.mLastRecipe.mFluidInputs[1].getFluid().getID()&&tInput2.mFluid.amount>=this.mLastRecipe.mFluidInputs[1].amount&&getMaxInputVoltage()>=this.mLastRecipe.mEUt){ tInput.drain(this.mLastRecipe.mFluidInputs[0].amount, true); tInput2.drain(this.mLastRecipe.mFluidInputs[1].amount, true); - this.mEUt = -(this.mLastRecipe.mEUt*tierOverclock()); - this.mMaxProgresstime = this.mLastRecipe.mDuration/tierOverclock(); + + this.mEUt = -(this.mLastRecipe.mEUt*overclock(this.mLastRecipe.mEUt)); + this.mMaxProgresstime = this.mLastRecipe.mDuration/overclock(this.mLastRecipe.mEUt); + this.mEfficiencyIncrease = 10000; this.mOutputFluids = this.mLastRecipe.mFluidOutputs; turnCasingActive(true); @@ -263,8 +271,10 @@ public boolean checkRecipe(ItemStack aStack) { tInput.drain(tFluid.amount, true); tInput2.drain(tFluid2.amount, true); this.mLastRecipe=tRecipe; - this.mEUt = -(tRecipe.mEUt*tierOverclock()); - this.mMaxProgresstime = tRecipe.mDuration/tierOverclock(); + + this.mEUt = -(tRecipe.mEUt*overclock(this.mLastRecipe.mEUt)); + this.mMaxProgresstime = tRecipe.mDuration/overclock(this.mLastRecipe.mEUt); + this.mEfficiencyIncrease = 10000; this.mOutputFluids = tRecipe.mFluidOutputs; turnCasingActive(true); diff --git a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java index 0039631e18..9aed7547ec 100644 --- a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java +++ b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java @@ -53,7 +53,7 @@ import gregtech.api.enums.Textures; /* 50: */
/* 51: */ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
/* 52: */ {
-/* 53:47 */ if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {}
+ if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {return false;}
/* 54:47 */ return GT_ModHandler.getCompressorOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;
/* 55: */ }
/* 56: */
diff --git a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java index 20b27156f2..b331b596fd 100644 --- a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java +++ b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java @@ -53,7 +53,7 @@ import gregtech.api.enums.Textures; /* 50: */
/* 51: */ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
/* 52: */ {
-/* 53:47 */ if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {}
+ if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {return false;}
/* 54:47 */ return GT_ModHandler.getCompressorOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;
/* 55: */ }
/* 56: */
diff --git a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java index cb6d51cb62..9fe408e578 100644 --- a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java +++ b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java @@ -53,7 +53,7 @@ import gregtech.api.enums.Textures; /* 50: */
/* 51: */ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
/* 52: */ {
-/* 53:47 */ if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {}
+ if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {return false;}
/* 54:47 */ return GT_ModHandler.getExtractorOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;
/* 55: */ }
/* 56: */
diff --git a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java index 8c8151360e..c283890139 100644 --- a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java +++ b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java @@ -53,7 +53,7 @@ import gregtech.api.enums.Textures; /* 50: */
/* 51: */ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
/* 52: */ {
-/* 53:47 */ if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {}
+ if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {return false;}
/* 54:47 */ return GT_ModHandler.getExtractorOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;
/* 55: */ }
/* 56: */
diff --git a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java index 1a02c9f97b..be5749ed5f 100644 --- a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java +++ b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java @@ -53,7 +53,7 @@ import gregtech.api.enums.Textures; /* 50: */
/* 51: */ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
/* 52: */ {
-/* 53:47 */ if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {}
+ if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {return false;}
/* 54:47 */ return GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;
/* 55: */ }
/* 56: */
diff --git a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java index 22718d39ca..d8bddf4a71 100644 --- a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java +++ b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java @@ -53,7 +53,7 @@ import gregtech.api.enums.Textures; /* 50: */
/* 51: */ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
/* 52: */ {
-/* 53:47 */ if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {}
+ if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {return false;}
/* 54:47 */ return GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;
/* 55: */ }
/* 56: */
diff --git a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java index 2a1b0314cf..2647cf6eef 100644 --- a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java +++ b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java @@ -1,130 +1,126 @@ -/* 1: */ package gregtech.common.tileentities.machines.steam;
-/* 2: */
-/* 3: */ import gregtech.api.GregTech_API;
+package gregtech.common.tileentities.machines.steam;
+
+import static gregtech.api.enums.GT_Values.V;
+import gregtech.api.GregTech_API;
import gregtech.api.enums.Textures;
-/* 4: */ import gregtech.api.enums.Textures.BlockIcons;
-/* 5: */ import gregtech.api.gui.GT_GUIContainer_BasicMachine;
-/* 6: */ import gregtech.api.interfaces.ITexture;
-/* 7: */ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-/* 8: */ import gregtech.api.metatileentity.MetaTileEntity;
-/* 9: */ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
-/* 10: */ import gregtech.api.objects.GT_RenderedTexture;
-/* 11: */ import gregtech.api.util.GT_ModHandler;
-/* 12: */ import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.Textures.BlockIcons;
+import gregtech.api.gui.GT_GUIContainer_BasicMachine;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
-/* 13: */ import java.util.Map;
-/* 14: */ import java.util.Random;
+import java.util.Map;
+import java.util.Random;
-/* 15: */ import net.minecraft.entity.player.InventoryPlayer;
-/* 16: */ import net.minecraft.item.ItemStack;
-/* 17: */ import net.minecraft.world.World;
-/* 18: */
-/* 19: */ public class GT_MetaTileEntity_Macerator_Bronze
-/* 20: */ extends GT_MetaTileEntity_BasicMachine_Bronze
-/* 21: */ {
-/* 22: */ public GT_MetaTileEntity_Macerator_Bronze(int aID, String aName, String aNameRegional)
-/* 23: */ {
-/* 24: 21 */ super(aID, aName, aNameRegional, "Macerating your Ores", 1, 1, false);
-/* 25: */ }
-/* 26: */
-/* 27: */ public GT_MetaTileEntity_Macerator_Bronze(String aName, String aDescription, ITexture[][][] aTextures)
-/* 28: */ {
-/* 29: 25 */ super(aName, aDescription, aTextures, 1, 1, false);
-/* 30: */ }
-/* 31: */
-/* 32: */ public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)
-/* 33: */ {
-/* 34: 30 */ return new GT_GUIContainer_BasicMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "BronzeMacerator.png", "ic2.macerator");
-/* 35: */ }
-/* 36: */
-/* 37: */ public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
-/* 38: */ {
-/* 39: 35 */ return new GT_MetaTileEntity_Macerator_Bronze(this.mName, this.mDescription, this.mTextures);
-/* 40: */ }
-/* 41: */
-/* 42: */ public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick)
-/* 43: */ {
-/* 44: 40 */ super.onPreTick(aBaseMetaTileEntity, aTick);
-/* 45: 41 */ if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive()) && (aBaseMetaTileEntity.getFrontFacing() != 1) && (aBaseMetaTileEntity.getCoverIDAtSide((byte)1) == 0) && (!aBaseMetaTileEntity.getOpacityAtSide((byte)1)))
-/* 46: */ {
-/* 47: 42 */ Random tRandom = aBaseMetaTileEntity.getWorld().rand;
-/* 48: 43 */ aBaseMetaTileEntity.getWorld().spawnParticle("smoke", aBaseMetaTileEntity.getXCoord() + 0.8F - tRandom.nextFloat() * 0.6F, aBaseMetaTileEntity.getYCoord() + 0.9F + tRandom.nextFloat() * 0.2F, aBaseMetaTileEntity.getZCoord() + 0.8F - tRandom.nextFloat() * 0.6F, 0.0D, 0.0D, 0.0D);
-/* 49: */ }
-/* 50: */ }
-/* 51: */
-/* 52: */ public int checkRecipe()
-/* 53: */ {
-/* 54: 49 */ if (null != (this.mOutputItems[0] = GT_ModHandler.getMaceratorOutput(getInputAt(0), true, getOutputAt(0))))
-/* 55: */ {
-/* 56: 50 */ this.mEUt = 2;
-/* 57: 51 */ this.mMaxProgresstime = 800;
-/* 58: 52 */ return 2;
-/* 59: */ }
-/* 60: 54 */ return 0;
-/* 61: */ }
-/* 62: */
-/* 63: */ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
-/* 64: */ {
-/* 65: 59 */ if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {}
-/* 66: 59 */ return GT_ModHandler.getMaceratorOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;
-/* 67: */ }
-/* 68: */
-/* 69: */ public void startSoundLoop(byte aIndex, double aX, double aY, double aZ)
-/* 70: */ {
-/* 71: 64 */ super.startSoundLoop(aIndex, aX, aY, aZ);
-/* 72: 65 */ if (aIndex == 1) {
-/* 73: 65 */ GT_Utility.doSoundAtClient((String)GregTech_API.sSoundList.get(Integer.valueOf(201)), 10, 1.0F, aX, aY, aZ);
-/* 74: */ }
-/* 75: */ }
-/* 76: */
-/* 77: */ public void startProcess()
-/* 78: */ {
-/* 79: 70 */ sendLoopStart((byte)1);
-/* 80: */ }
-/* 81: */
-/* 82: */ public ITexture[] getSideFacingActive(byte aColor)
-/* 83: */ {
-/* 84: 75 */ return new ITexture[] { super.getSideFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE) };
-/* 85: */ }
-/* 86: */
-/* 87: */ public ITexture[] getSideFacingInactive(byte aColor)
-/* 88: */ {
-/* 89: 80 */ return new ITexture[] { super.getSideFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_STEAM_MACERATOR) };
-/* 90: */ }
-/* 91: */
-/* 92: */ public ITexture[] getFrontFacingActive(byte aColor)
-/* 93: */ {
-/* 94: 85 */ return new ITexture[] { super.getFrontFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE) };
-/* 95: */ }
-/* 96: */
-/* 97: */ public ITexture[] getFrontFacingInactive(byte aColor)
-/* 98: */ {
-/* 99: 90 */ return new ITexture[] { super.getFrontFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_MACERATOR) };
-/* 100: */ }
-/* 101: */
-/* 102: */ public ITexture[] getTopFacingActive(byte aColor)
-/* 103: */ {
-/* 104: 95 */ return new ITexture[] { super.getTopFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE) };
-/* 105: */ }
-/* 106: */
-/* 107: */ public ITexture[] getTopFacingInactive(byte aColor)
-/* 108: */ {
-/* 109:100 */ return new ITexture[] { super.getTopFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR) };
-/* 110: */ }
-/* 111: */
-/* 112: */ public ITexture[] getBottomFacingActive(byte aColor)
-/* 113: */ {
-/* 114:105 */ return new ITexture[] { super.getBottomFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE) };
-/* 115: */ }
-/* 116: */
-/* 117: */ public ITexture[] getBottomFacingInactive(byte aColor)
-/* 118: */ {
-/* 119:110 */ return new ITexture[] { super.getBottomFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_MACERATOR) };
-/* 120: */ }
-/* 121: */ }
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidStack;
-
-/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar
- * Qualified Name: gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Macerator_Bronze
- * JD-Core Version: 0.7.0.1
- */
\ No newline at end of file +public class GT_MetaTileEntity_Macerator_Bronze
+ extends GT_MetaTileEntity_BasicMachine_Bronze
+{
+ public GT_MetaTileEntity_Macerator_Bronze(int aID, String aName, String aNameRegional)
+ {
+ super(aID, aName, aNameRegional, "Macerating your Ores", 1, 1, false);
+ }
+
+ public GT_MetaTileEntity_Macerator_Bronze(String aName, String aDescription, ITexture[][][] aTextures)
+ {
+ super(aName, aDescription, aTextures, 1, 1, false);
+ }
+
+ public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)
+ {
+ return new GT_GUIContainer_BasicMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "BronzeMacerator.png", "ic2.macerator");
+ }
+
+ public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+ {
+ return new GT_MetaTileEntity_Macerator_Bronze(this.mName, this.mDescription, this.mTextures);
+ }
+
+ public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick)
+ {
+ super.onPreTick(aBaseMetaTileEntity, aTick);
+ if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive()) && (aBaseMetaTileEntity.getFrontFacing() != 1) && (aBaseMetaTileEntity.getCoverIDAtSide((byte)1) == 0) && (!aBaseMetaTileEntity.getOpacityAtSide((byte)1)))
+ {
+ Random tRandom = aBaseMetaTileEntity.getWorld().rand;
+ aBaseMetaTileEntity.getWorld().spawnParticle("smoke", aBaseMetaTileEntity.getXCoord() + 0.8F - tRandom.nextFloat() * 0.6F, aBaseMetaTileEntity.getYCoord() + 0.9F + tRandom.nextFloat() * 0.2F, aBaseMetaTileEntity.getZCoord() + 0.8F - tRandom.nextFloat() * 0.6F, 0.0D, 0.0D, 0.0D);
+ }
+ }
+
+ public int checkRecipe()
+ {
+ if (null != (this.mOutputItems[0] = GT_ModHandler.getMaceratorOutput(getInputAt(0), true, getOutputAt(0))))
+ {
+ this.mEUt = 2;
+ this.mMaxProgresstime = 800;
+ return 2;
+ }
+ return 0;
+ }
+
+ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
+ {
+ if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {return false;}
+ return GT_ModHandler.getMaceratorOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;
+ }
+
+ public void startSoundLoop(byte aIndex, double aX, double aY, double aZ)
+ {
+ super.startSoundLoop(aIndex, aX, aY, aZ);
+ if (aIndex == 1) {
+ GT_Utility.doSoundAtClient((String)GregTech_API.sSoundList.get(Integer.valueOf(201)), 10, 1.0F, aX, aY, aZ);
+ }
+ }
+
+ public void startProcess()
+ {
+ sendLoopStart((byte)1);
+ }
+
+ public ITexture[] getSideFacingActive(byte aColor)
+ {
+ return new ITexture[] { super.getSideFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE) };
+ }
+
+ public ITexture[] getSideFacingInactive(byte aColor)
+ {
+ return new ITexture[] { super.getSideFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_STEAM_MACERATOR) };
+ }
+
+ public ITexture[] getFrontFacingActive(byte aColor)
+ {
+ return new ITexture[] { super.getFrontFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE) };
+ }
+
+ public ITexture[] getFrontFacingInactive(byte aColor)
+ {
+ return new ITexture[] { super.getFrontFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_MACERATOR) };
+ }
+
+ public ITexture[] getTopFacingActive(byte aColor)
+ {
+ return new ITexture[] { super.getTopFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE) };
+ }
+
+ public ITexture[] getTopFacingInactive(byte aColor)
+ {
+ return new ITexture[] { super.getTopFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR) };
+ }
+
+ public ITexture[] getBottomFacingActive(byte aColor)
+ {
+ return new ITexture[] { super.getBottomFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE) };
+ }
+
+ public ITexture[] getBottomFacingInactive(byte aColor)
+ {
+ return new ITexture[] { super.getBottomFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_MACERATOR) };
+ }
+}
diff --git a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java index 5316c1e089..54c1257b23 100644 --- a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java +++ b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java @@ -65,7 +65,7 @@ import gregtech.api.enums.Textures; /* 62: */
/* 63: */ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
/* 64: */ {
-/* 65: 59 */ if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {}
+ if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {return false;}
/* 66: 59 */ return GT_ModHandler.getMaceratorOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;
/* 67: */ }
/* 68: */
|