From 6b80bc2d1cb91bc377a0e549bfffaf3fe7ae08c1 Mon Sep 17 00:00:00 2001 From: Blood Asp Date: Fri, 24 Apr 2015 23:47:25 +0200 Subject: Many bugfixes --- main/java/gregtech/api/objects/GT_FluidStack.java | 10 +- .../java/gregtech/common/blocks/GT_Block_Ores.java | 38 +- .../gregtech/common/blocks/GT_TileEntity_Ores.java | 2 +- .../multi/GT_MetaTileEntity_FusionComputer.java | 18 +- .../steam/GT_MetaTileEntity_Compressor_Bronze.java | 2 +- .../steam/GT_MetaTileEntity_Compressor_Steel.java | 2 +- .../steam/GT_MetaTileEntity_Extractor_Bronze.java | 2 +- .../steam/GT_MetaTileEntity_Extractor_Steel.java | 2 +- .../steam/GT_MetaTileEntity_Furnace_Bronze.java | 2 +- .../steam/GT_MetaTileEntity_Furnace_Steel.java | 2 +- .../steam/GT_MetaTileEntity_Macerator_Bronze.java | 248 +++++++------ .../steam/GT_MetaTileEntity_Macerator_Steel.java | 2 +- .../loaders/oreprocessing/ProcessingAll.java | 55 ++- .../loaders/oreprocessing/ProcessingArrows.java | 102 +++--- .../loaders/oreprocessing/ProcessingBattery.java | 62 ++-- .../loaders/oreprocessing/ProcessingBeans.java | 56 ++- .../loaders/oreprocessing/ProcessingBlock.java | 175 ++++----- .../loaders/oreprocessing/ProcessingBolt.java | 59 ++-- .../loaders/oreprocessing/ProcessingCell.java | 218 ++++++------ .../oreprocessing/ProcessingCellPlasma.java | 70 ++-- .../loaders/oreprocessing/ProcessingCircuit.java | 89 +++-- .../oreprocessing/ProcessingCompressed.java | 63 ++-- .../loaders/oreprocessing/ProcessingCrafting.java | 152 ++++---- .../loaders/oreprocessing/ProcessingCrop.java | 133 +++---- .../ProcessingCrushedCentrifuged.java | 59 ++-- .../oreprocessing/ProcessingCrushedPurified.java | 63 ++-- .../oreprocessing/ProcessingCrystallized.java | 61 ++-- .../loaders/oreprocessing/ProcessingDirty.java | 93 +++-- .../loaders/oreprocessing/ProcessingDust.java | 389 +++++++++------------ .../oreprocessing/ProcessingDustImpure.java | 163 ++++----- .../loaders/oreprocessing/ProcessingDustSmall.java | 83 +++-- .../loaders/oreprocessing/ProcessingDustTiny.java | 96 +++-- .../loaders/oreprocessing/ProcessingDye.java | 80 +++-- .../loaders/oreprocessing/ProcessingFoil.java | 53 ++- .../loaders/oreprocessing/ProcessingFood.java | 94 +++-- .../loaders/oreprocessing/ProcessingGear.java | 62 ++-- .../loaders/oreprocessing/ProcessingGearSmall.java | 58 ++- .../loaders/oreprocessing/ProcessingGem.java | 140 ++++---- .../oreprocessing/ProcessingGemChipped.java | 63 ++-- .../oreprocessing/ProcessingGemExquisite.java | 65 ++-- .../loaders/oreprocessing/ProcessingGemFlawed.java | 65 ++-- .../oreprocessing/ProcessingGemFlawless.java | 65 ++-- .../loaders/oreprocessing/ProcessingIngot1.java | 147 ++++---- .../loaders/oreprocessing/ProcessingIngot2.java | 64 ++-- .../loaders/oreprocessing/ProcessingIngot3.java | 64 ++-- .../loaders/oreprocessing/ProcessingIngot4.java | 61 ++-- .../loaders/oreprocessing/ProcessingIngot5.java | 61 ++-- .../loaders/oreprocessing/ProcessingIngotHot.java | 55 ++- .../loaders/oreprocessing/ProcessingItem.java | 158 ++++----- .../loaders/oreprocessing/ProcessingLeaves.java | 42 ++- .../loaders/oreprocessing/ProcessingLens.java | 62 ++-- .../loaders/oreprocessing/ProcessingLog.java | 196 +++++------ .../loaders/oreprocessing/ProcessingNugget.java | 80 ++--- .../loaders/oreprocessing/ProcessingOre.java | 273 +++++++-------- .../loaders/oreprocessing/ProcessingOrePoor.java | 94 +++-- .../oreprocessing/ProcessingOreSmelting.java | 111 +++--- .../loaders/oreprocessing/ProcessingPipeLarge.java | 62 ++-- .../oreprocessing/ProcessingPipeMedium.java | 62 ++-- .../oreprocessing/ProcessingPipeRestrictive.java | 60 ++-- .../loaders/oreprocessing/ProcessingPipeSmall.java | 62 ++-- .../loaders/oreprocessing/ProcessingPlank.java | 136 ++++--- .../loaders/oreprocessing/ProcessingPlate1.java | 174 ++++----- .../loaders/oreprocessing/ProcessingPlate2.java | 94 +++-- .../loaders/oreprocessing/ProcessingPlate3.java | 94 +++-- .../loaders/oreprocessing/ProcessingPlate4.java | 89 ++--- .../loaders/oreprocessing/ProcessingPlate5.java | 85 ++--- .../loaders/oreprocessing/ProcessingPlate9.java | 57 ++- .../oreprocessing/ProcessingPlateAlloy.java | 81 ++--- .../loaders/oreprocessing/ProcessingPure.java | 63 ++-- .../loaders/oreprocessing/ProcessingRecycling.java | 61 ++-- .../loaders/oreprocessing/ProcessingSand.java | 67 ++-- .../loaders/oreprocessing/ProcessingSaplings.java | 59 ++-- .../loaders/oreprocessing/ProcessingShaping.java | 267 ++++++-------- .../loaders/oreprocessing/ProcessingSlab.java | 59 ++-- .../loaders/oreprocessing/ProcessingStick.java | 68 ++-- .../loaders/oreprocessing/ProcessingStickLong.java | 65 ++-- .../loaders/oreprocessing/ProcessingStone.java | 160 ++++----- .../oreprocessing/ProcessingStoneCobble.java | 68 ++-- .../oreprocessing/ProcessingStoneVarious.java | 78 ++--- .../oreprocessing/ProcessingToolHeadArrow.java | 58 ++- .../oreprocessing/ProcessingToolHeadAxe.java | 52 ++- .../oreprocessing/ProcessingToolHeadBuzzSaw.java | 60 ++-- .../oreprocessing/ProcessingToolHeadChainsaw.java | 72 ++-- .../oreprocessing/ProcessingToolHeadDrill.java | 80 +++-- .../oreprocessing/ProcessingToolHeadFile.java | 62 ++-- .../oreprocessing/ProcessingToolHeadHammer.java | 95 +++-- .../oreprocessing/ProcessingToolHeadHoe.java | 52 ++- .../oreprocessing/ProcessingToolHeadPickaxe.java | 52 ++- .../oreprocessing/ProcessingToolHeadPlow.java | 52 ++- .../oreprocessing/ProcessingToolHeadSaw.java | 52 ++- .../oreprocessing/ProcessingToolHeadSense.java | 52 ++- .../oreprocessing/ProcessingToolHeadShovel.java | 52 ++- .../oreprocessing/ProcessingToolHeadSword.java | 52 ++- .../ProcessingToolHeadUniversalSpade.java | 54 ++- .../oreprocessing/ProcessingToolHeadWrench.java | 80 +++-- .../oreprocessing/ProcessingTransforming.java | 107 +++--- .../loaders/oreprocessing/ProcessingWax.java | 55 ++- .../loaders/oreprocessing/ProcessingWire01.java | 84 +++-- .../loaders/oreprocessing/ProcessingWire02.java | 65 ++-- .../loaders/oreprocessing/ProcessingWire04.java | 65 ++-- .../loaders/oreprocessing/ProcessingWire08.java | 65 ++-- .../loaders/oreprocessing/ProcessingWire12.java | 65 ++-- .../loaders/oreprocessing/ProcessingWire16.java | 58 ++- 103 files changed, 3854 insertions(+), 4542 deletions(-) diff --git a/main/java/gregtech/api/objects/GT_FluidStack.java b/main/java/gregtech/api/objects/GT_FluidStack.java index 96b1517e9b..12735101ca 100644 --- a/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/main/java/gregtech/api/objects/GT_FluidStack.java @@ -29,18 +29,18 @@ public class GT_FluidStack extends FluidStack { } public static void fixAllThoseFuckingFluidIDs() { - //for (GT_FluidStack tFluid : sAllFluidStacks) tFluid.fixFluidIDForFucksSake(); - //for (Map tMap : GregTech_API.sFluidMappings) try {GT_Utility.reMap(tMap);} catch(Throwable e) {e.printStackTrace(GT_Log.err);} + for (GT_FluidStack tFluid : sAllFluidStacks) tFluid.fixFluidIDForFucksSake(); + for (Map tMap : GregTech_API.sFluidMappings) try {GT_Utility.reMap(tMap);} catch(Throwable e) {e.printStackTrace(GT_Log.err);} } public void fixFluidIDForFucksSake() { - //int fluidID = this.getFluidID(); - //try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;} + int fluidID = this.getFluid().getID(); + try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;} } @Override public FluidStack copy() { - //fixFluidIDForFucksSake(); + fixFluidIDForFucksSake(); return new GT_FluidStack(this); } } \ No newline at end of file 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: */ diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java b/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java index 0098e1c7d9..ed312676b6 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java @@ -1,32 +1,25 @@ -/* 1: */ package gregtech.loaders.oreprocessing; -/* 2: */ -/* 3: */ import gregtech.api.enums.Materials; -/* 4: */ import gregtech.api.enums.OrePrefixes; -/* 5: */ import gregtech.api.interfaces.IOreRecipeRegistrator; -/* 6: */ import net.minecraft.item.Item; -/* 7: */ import net.minecraft.item.ItemBlock; -/* 8: */ import net.minecraft.item.ItemStack; -/* 9: */ -/* 10: */ public class ProcessingAll -/* 11: */ implements IOreRecipeRegistrator -/* 12: */ { -/* 13: */ public ProcessingAll() -/* 14: */ { -/* 15:12 */ for (OrePrefixes tPrefix : OrePrefixes.values()) { -/* 16:12 */ tPrefix.add(this); -/* 17: */ } -/* 18: */ } -/* 19: */ -/* 20: */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) -/* 21: */ { -/* 22:17 */ if (((aStack.getItem() instanceof ItemBlock)) && (aPrefix.mDefaultStackSize < aStack.getItem().getItemStackLimit(aStack))) { -/* 23:17 */ aStack.getItem().setMaxStackSize(aPrefix.mDefaultStackSize); -/* 24: */ } -/* 25: */ } -/* 26: */ } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.loaders.oreprocessing.ProcessingAll - * JD-Core Version: 0.7.0.1 +/* */ package gregtech.loaders.oreprocessing; +/* */ +/* */ import gregtech.api.enums.Materials; +/* */ import gregtech.api.enums.OrePrefixes; +/* */ import net.minecraft.item.Item; +/* */ import net.minecraft.item.ItemStack; +/* */ +/* */ public class ProcessingAll implements gregtech.api.interfaces.IOreRecipeRegistrator +/* */ { +/* */ public ProcessingAll() +/* */ { +/* 12 */ for (OrePrefixes tPrefix : OrePrefixes.values()) tPrefix.add(this); +/* */ } +/* */ +/* */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) +/* */ { +/* 17 */ if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock)) && (aPrefix.mDefaultStackSize < aStack.getItem().getItemStackLimit(aStack))) aStack.getItem().setMaxStackSize(aPrefix.mDefaultStackSize); +/* */ } +/* */ } + + +/* Location: F:\Torrent\minecraft\jdgui test\gregtech_1.7.10-5.07.07-dev.jar!\gregtech\loaders\oreprocessing\ProcessingAll.class + * Java compiler version: 6 (50.0) + * JD-Core Version: 0.7.1-SNAPSHOT-20140817 */ \ No newline at end of file diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java index 00d1d8762a..c2bcdb5b8c 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java @@ -1,55 +1,49 @@ -/* 1: */ package gregtech.loaders.oreprocessing; -/* 2: */ -/* 3: */ import gregtech.api.enchants.Enchantment_EnderDamage; -/* 4: */ import gregtech.api.enums.GT_Values; -/* 5: */ import gregtech.api.enums.Materials; -/* 6: */ import gregtech.api.enums.OrePrefixes; -/* 7: */ import gregtech.api.interfaces.IOreRecipeRegistrator; -/* 8: */ import gregtech.api.interfaces.internal.IGT_RecipeAdder; -/* 9: */ import gregtech.api.util.GT_Utility; -/* 10: */ import gregtech.api.util.GT_Utility.ItemNBT; -/* 11: */ import net.minecraft.enchantment.Enchantment; -/* 12: */ import net.minecraft.enchantment.EnchantmentHelper; -/* 13: */ import net.minecraft.item.ItemStack; -/* 14: */ -/* 15: */ public class ProcessingArrows -/* 16: */ implements IOreRecipeRegistrator -/* 17: */ { -/* 18: */ public ProcessingArrows() -/* 19: */ { -/* 20:17 */ for (OrePrefixes tPrefix : OrePrefixes.values()) { -/* 21:17 */ if (tPrefix.name().startsWith("arrowGt")) { -/* 22:17 */ tPrefix.add(this); -/* 23: */ } -/* 24: */ } -/* 25: */ } -/* 26: */ -/* 27: */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) -/* 28: */ { -/* 29:23 */ ItemStack tOutput = GT_Utility.copyAmount(1L, new Object[] { aStack });GT_Utility.updateItemStack(tOutput); -/* 30:24 */ GT_Utility.ItemNBT.addEnchantment(tOutput, Enchantment.smite, EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId, tOutput) + 3); -/* 31:25 */ GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), Materials.HolyWater.getFluid(25L), tOutput, null, null, null, 100, 2); -/* 32: */ -/* 33:27 */ tOutput = GT_Utility.copyAmount(1L, new Object[] { aStack });GT_Utility.updateItemStack(tOutput); -/* 34:28 */ GT_Utility.ItemNBT.addEnchantment(tOutput, Enchantment.fireAspect, EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 3); -/* 35:29 */ GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), Materials.FierySteel.getFluid(25L), tOutput, null, null, null, 100, 2); -/* 36: */ -/* 37:31 */ tOutput = GT_Utility.copyAmount(1L, new Object[] { aStack });GT_Utility.updateItemStack(tOutput); -/* 38:32 */ GT_Utility.ItemNBT.addEnchantment(tOutput, Enchantment.fireAspect, EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 1); -/* 39:33 */ GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), Materials.Blaze.getMolten(18L), tOutput, null, null, null, 100, 2); -/* 40: */ -/* 41:35 */ tOutput = GT_Utility.copyAmount(1L, new Object[] { aStack });GT_Utility.updateItemStack(tOutput); -/* 42:36 */ GT_Utility.ItemNBT.addEnchantment(tOutput, Enchantment.knockback, EnchantmentHelper.getEnchantmentLevel(Enchantment.knockback.effectId, tOutput) + 1); -/* 43:37 */ GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), Materials.Rubber.getMolten(18L), tOutput, null, null, null, 100, 2); -/* 44: */ -/* 45:39 */ tOutput = GT_Utility.copyAmount(1L, new Object[] { aStack });GT_Utility.updateItemStack(tOutput); -/* 46:40 */ GT_Utility.ItemNBT.addEnchantment(tOutput, Enchantment_EnderDamage.INSTANCE, EnchantmentHelper.getEnchantmentLevel(Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + 1); -/* 47:41 */ GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), Materials.Mercury.getFluid(25L), tOutput, null, null, null, 100, 2); -/* 48: */ } -/* 49: */ } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.loaders.oreprocessing.ProcessingArrows - * JD-Core Version: 0.7.0.1 +/* */ package gregtech.loaders.oreprocessing; +/* */ +/* */ import gregtech.api.enums.GT_Values; +/* */ import gregtech.api.enums.Materials; +/* */ import gregtech.api.enums.OrePrefixes; +/* */ import gregtech.api.interfaces.internal.IGT_RecipeAdder; +/* */ import gregtech.api.util.GT_Utility; +/* */ import gregtech.api.util.GT_Utility.ItemNBT; +/* */ import net.minecraft.enchantment.Enchantment; +/* */ import net.minecraft.enchantment.EnchantmentHelper; +/* */ import net.minecraft.item.ItemStack; +/* */ +/* */ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegistrator +/* */ { +/* */ public ProcessingArrows() +/* */ { +/* 17 */ for (OrePrefixes tPrefix : OrePrefixes.values()) if (tPrefix.name().startsWith("arrowGt")) { tPrefix.add(this); +/* */ } +/* */ } +/* */ +/* */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) +/* */ { +/* 23 */ ItemStack tOutput = GT_Utility.copyAmount(1L, new Object[] { aStack });GT_Utility.updateItemStack(tOutput); +/* 24 */ GT_Utility.ItemNBT.addEnchantment(tOutput, Enchantment.smite, EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId, tOutput) + 3); +/* 25 */ GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), Materials.HolyWater.getFluid(25L), tOutput, null, null, null, 100, 2); +/* */ +/* 27 */ tOutput = GT_Utility.copyAmount(1L, new Object[] { aStack });GT_Utility.updateItemStack(tOutput); +/* 28 */ GT_Utility.ItemNBT.addEnchantment(tOutput, Enchantment.fireAspect, EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 3); +/* 29 */ GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), Materials.FierySteel.getFluid(25L), tOutput, null, null, null, 100, 2); +/* */ +/* 31 */ tOutput = GT_Utility.copyAmount(1L, new Object[] { aStack });GT_Utility.updateItemStack(tOutput); +/* 32 */ GT_Utility.ItemNBT.addEnchantment(tOutput, Enchantment.fireAspect, EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 1); +/* 33 */ GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), Materials.Blaze.getMolten(18L), tOutput, null, null, null, 100, 2); +/* */ +/* 35 */ tOutput = GT_Utility.copyAmount(1L, new Object[] { aStack });GT_Utility.updateItemStack(tOutput); +/* 36 */ GT_Utility.ItemNBT.addEnchantment(tOutput, Enchantment.knockback, EnchantmentHelper.getEnchantmentLevel(Enchantment.knockback.effectId, tOutput) + 1); +/* 37 */ GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), Materials.Rubber.getMolten(18L), tOutput, null, null, null, 100, 2); +/* */ +/* 39 */ tOutput = GT_Utility.copyAmount(1L, new Object[] { aStack });GT_Utility.updateItemStack(tOutput); +/* 40 */ GT_Utility.ItemNBT.addEnchantment(tOutput, gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE, EnchantmentHelper.getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + 1); +/* 41 */ GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), Materials.Mercury.getFluid(25L), tOutput, null, null, null, 100, 2); +/* */ } +/* */ } + + +/* Location: F:\Torrent\minecraft\jdgui test\gregtech_1.7.10-5.07.07-dev.jar!\gregtech\loaders\oreprocessing\ProcessingArrows.class + * Java compiler version: 6 (50.0) + * JD-Core Version: 0.7.1-SNAPSHOT-20140817 */ \ No newline at end of file diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingBattery.java b/main/java/gregtech/loaders/oreprocessing/ProcessingBattery.java index 491fc8ed85..a00a887612 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingBattery.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingBattery.java @@ -1,33 +1,31 @@ -/* 1: */ package gregtech.loaders.oreprocessing; -/* 2: */ -/* 3: */ import gregtech.api.enums.GT_Values; -/* 4: */ import gregtech.api.enums.ItemList; -/* 5: */ import gregtech.api.enums.Materials; -/* 6: */ import gregtech.api.enums.OrePrefixes; -/* 7: */ import gregtech.api.interfaces.IOreRecipeRegistrator; -/* 8: */ import gregtech.api.interfaces.internal.IGT_RecipeAdder; -/* 9: */ import gregtech.api.util.GT_ModHandler; -/* 10: */ import gregtech.api.util.GT_Utility; -/* 11: */ import net.minecraft.item.ItemStack; -/* 12: */ -/* 13: */ public class ProcessingBattery -/* 14: */ implements IOreRecipeRegistrator -/* 15: */ { -/* 16: */ public ProcessingBattery() -/* 17: */ { -/* 18:16 */ OrePrefixes.battery.add(this); -/* 19: */ } -/* 20: */ -/* 21: */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) -/* 22: */ { -/* 23:21 */ if (aMaterial == Materials.Lithium) { -/* 24:22 */ GT_Values.RA.addAssemblerRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_ModHandler.getIC2Item("cropnalyzer", 1L, 32767), ItemList.Tool_Scanner.getAlmostBroken(1L, new Object[0]), 12800, 16); -/* 25: */ } -/* 26: */ } -/* 27: */ } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.loaders.oreprocessing.ProcessingBattery - * JD-Core Version: 0.7.0.1 +/* */ package gregtech.loaders.oreprocessing; +/* */ +/* */ import gregtech.api.enums.GT_Values; +/* */ import gregtech.api.enums.ItemList; +/* */ import gregtech.api.enums.Materials; +/* */ import gregtech.api.enums.OrePrefixes; +/* */ import gregtech.api.interfaces.internal.IGT_RecipeAdder; +/* */ import gregtech.api.util.GT_ModHandler; +/* */ import gregtech.api.util.GT_Utility; +/* */ import net.minecraft.item.ItemStack; +/* */ +/* */ public class ProcessingBattery implements gregtech.api.interfaces.IOreRecipeRegistrator +/* */ { +/* */ public ProcessingBattery() +/* */ { +/* 16 */ OrePrefixes.battery.add(this); +/* */ } +/* */ +/* */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) +/* */ { +/* 21 */ if (aMaterial == Materials.Lithium) { +/* 22 */ GT_Values.RA.addAssemblerRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_ModHandler.getIC2Item("cropnalyzer", 1L, 32767), ItemList.Tool_Scanner.getAlmostBroken(1L, new Object[0]), 12800, 16); +/* */ } +/* */ } +/* */ } + + +/* Location: F:\Torrent\minecraft\jdgui test\gregtech_1.7.10-5.07.07-dev.jar!\gregtech\loaders\oreprocessing\ProcessingBattery.class + * Java compiler version: 6 (50.0) + * JD-Core Version: 0.7.1-SNAPSHOT-20140817 */ \ No newline at end of file diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java index 0db3ea72f0..426d7bc0d0 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java @@ -1,31 +1,27 @@ -/* 1: */ package gregtech.loaders.oreprocessing; -/* 2: */ -/* 3: */ import gregtech.api.enums.Materials; -/* 4: */ import gregtech.api.enums.OrePrefixes; -/* 5: */ import gregtech.api.interfaces.IOreRecipeRegistrator; -/* 6: */ import gregtech.api.util.GT_ModHandler; -/* 7: */ import gregtech.api.util.GT_OreDictUnificator; -/* 8: */ import gregtech.api.util.GT_Utility; -/* 9: */ import net.minecraft.item.ItemStack; -/* 10: */ -/* 11: */ public class ProcessingBeans -/* 12: */ implements IOreRecipeRegistrator -/* 13: */ { -/* 14: */ public ProcessingBeans() -/* 15: */ { -/* 16:14 */ OrePrefixes.beans.add(this); -/* 17: */ } -/* 18: */ -/* 19: */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) -/* 20: */ { -/* 21:19 */ if (aOreDictName.equals("beansCocoa")) { -/* 22:19 */ GT_ModHandler.addPulverisationRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); -/* 23: */ } -/* 24: */ } -/* 25: */ } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.loaders.oreprocessing.ProcessingBeans - * JD-Core Version: 0.7.0.1 +/* */ package gregtech.loaders.oreprocessing; +/* */ +/* */ import gregtech.api.enums.Materials; +/* */ import gregtech.api.enums.OrePrefixes; +/* */ import gregtech.api.util.GT_ModHandler; +/* */ import gregtech.api.util.GT_OreDictUnificator; +/* */ import gregtech.api.util.GT_Utility; +/* */ import net.minecraft.item.ItemStack; +/* */ +/* */ public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegistrator +/* */ { +/* */ public ProcessingBeans() +/* */ { +/* 14 */ OrePrefixes.beans.add(this); +/* */ } +/* */ +/* */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) +/* */ { +/* 19 */ if (aOreDictName.equals("beansCocoa")) GT_ModHandler.addPulverisationRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); +/* */ } +/* */ } + + +/* Location: F:\Torrent\minecraft\jdgui test\gregtech_1.7.10-5.07.07-dev.jar!\gregtech\loaders\oreprocessing\ProcessingBeans.class + * Java compiler version: 6 (50.0) + * JD-Core Version: 0.7.1-SNAPSHOT-20140817 */ \ No newline at end of file diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 041899799a..9d01a4986d 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -1,103 +1,74 @@ -/* 1: */ package gregtech.loaders.oreprocessing; -/* 2: */ -/* 3: */ import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; -/* 4: */ import gregtech.api.enums.ConfigCategories.Recipes; -/* 5: */ import gregtech.api.enums.GT_Values; -/* 6: */ import gregtech.api.enums.ItemList; -/* 7: */ import gregtech.api.enums.Materials; -/* 8: */ import gregtech.api.enums.OrePrefixes; -/* 9: */ import gregtech.api.interfaces.IOreRecipeRegistrator; -/* 10: */ import gregtech.api.interfaces.internal.IGT_RecipeAdder; -/* 11: */ import gregtech.api.util.GT_Config; -/* 12: */ import gregtech.api.util.GT_ModHandler; -/* 13: */ import gregtech.api.util.GT_OreDictUnificator; -/* 14: */ import gregtech.api.util.GT_Utility; - -/* 15: */ import java.io.PrintStream; - -/* 16: */ import net.minecraft.item.ItemStack; -/* 17: */ -/* 18: */ public class ProcessingBlock -/* 19: */ implements IOreRecipeRegistrator -/* 20: */ { -/* 21: */ public ProcessingBlock() -/* 22: */ { -/* 23:19 */ OrePrefixes.block.add(this); -/* 24: */ } -/* 25: */ -/* 26: */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) -/* 27: */ { -/* 28:24 */ GT_Values.RA.addCutterRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), null, (int)Math.max(aMaterial.getMass() * 10L, 1L), 30); -/* 29: */ -/* 30:26 */ ItemStack tStack1 = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L);ItemStack tStack2 = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);ItemStack tStack3 = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L); -/* 31: */ -/* 32:28 */ GT_ModHandler.removeRecipe(new ItemStack[] { GT_Utility.copyAmount(1L, new Object[] { aStack }) }); -/* 33:30 */ if (tStack1 != null) { -/* 34:30 */ GT_ModHandler.removeRecipe(new ItemStack[] { tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1 }); -/* 35: */ } -/* 36:31 */ if (tStack2 != null) { -/* 37:31 */ GT_ModHandler.removeRecipe(new ItemStack[] { tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2 }); -/* 38: */ } -/* 39:32 */ if (tStack3 != null) { -/* 40:32 */ GT_ModHandler.removeRecipe(new ItemStack[] { tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3 }); -/* 41: */ } -/* 42:34 */ if (aMaterial.mStandardMoltenFluid != null) { -/* 43:34 */ GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Block.get(0L, new Object[0]), aMaterial.getMolten(1296L), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), 288, 8); -/* 44: */ } -/* 45:36 */ if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.storageblockcrafting, OrePrefixes.block.get(aMaterial).toString(), false)) -/* 46: */ { -/* 47:37 */ if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) { -/* 48:37 */ GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), new Object[] { "XXX", "XXX", "XXX", Character.valueOf('X'), OrePrefixes.dust.get(aMaterial) }); -/* 49: */ } -/* 50:38 */ if (tStack2 != null) { -/* 51:38 */ GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), new Object[] { "XXX", "XXX", "XXX", Character.valueOf('X'), OrePrefixes.gem.get(aMaterial) }); -/* 52: */ } -/* 53:39 */ if (tStack1 != null) { -/* 54:39 */ GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), new Object[] { "XXX", "XXX", "XXX", Character.valueOf('X'), OrePrefixes.ingot.get(aMaterial) }); -/* 55: */ } -/* 56: */ } -/* 57:42 */ if (tStack1 != null) { -/* 58:42 */ tStack1.stackSize = 9; -/* 59: */ } -/* 60:43 */ if (tStack2 != null) { -/* 61:43 */ tStack2.stackSize = 9; -/* 62: */ } -/* 63:44 */ if (tStack3 != null) { -/* 64:44 */ tStack3.stackSize = 9; -/* 65: */ } -/* 66:46 */ GT_Values.RA.addForgeHammerRecipe(aStack, tStack2, 100, 24); -/* 67:48 */ if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.storageblockdecrafting, OrePrefixes.block.get(aMaterial).toString(), tStack2 != null)) -/* 68: */ { -/* 69:49 */ if (tStack3 != null) { -/* 70:49 */ GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); -/* 71: */ } -/* 72:50 */ if (tStack2 != null) { -/* 73:50 */ GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) }); -/* 74: */ } -/* 75:51 */ if (tStack1 != null) { -/* 76:51 */ GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) }); -/* 77: */ } -/* 78: */ } -/* 79:54 */ switch (aMaterial.ordinal()) -/* 80: */ { -/* 81: */ case 1: -/* 82:56 */ System.err.println("'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block?"); -/* 83:57 */ break; -/* 84: */ case 2: -/* 85: */ case 3: -/* 86:59 */ GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), ItemList.Shape_Extruder_Rod.get(0L, new Object[0]), ItemList.IC2_ShaftIron.get(1L, new Object[0]), 640, 120); -/* 87:60 */ GT_Values.RA.addAssemblerRecipe(ItemList.IC2_Compressed_Coal_Ball.get(8L, new Object[0]), GT_Utility.copyAmount(1L, new Object[] { aStack }), ItemList.IC2_Compressed_Coal_Chunk.get(1L, new Object[0]), 400, 4); -/* 88:61 */ break; -/* 89: */ case 4: -/* 90:63 */ GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), ItemList.Shape_Extruder_Rod.get(0L, new Object[0]), ItemList.IC2_ShaftSteel.get(1L, new Object[0]), 1280, 120); -/* 91:64 */ GT_Values.RA.addAssemblerRecipe(ItemList.IC2_Compressed_Coal_Ball.get(8L, new Object[0]), GT_Utility.copyAmount(1L, new Object[] { aStack }), ItemList.IC2_Compressed_Coal_Chunk.get(1L, new Object[0]), 400, 4); -/* 92: */ } -/* 93: */ } -/* 94: */ } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.loaders.oreprocessing.ProcessingBlock - * JD-Core Version: 0.7.0.1 +/* */ package gregtech.loaders.oreprocessing; +/* */ +/* */ import gregtech.api.GregTech_API; +import gregtech.api.enums.ConfigCategories; +/* */ import gregtech.api.enums.ConfigCategories.Recipes; +/* */ import gregtech.api.enums.GT_Values; +/* */ import gregtech.api.enums.ItemList; +/* */ import gregtech.api.enums.Materials; +/* */ import gregtech.api.enums.OrePrefixes; +/* */ import gregtech.api.interfaces.internal.IGT_RecipeAdder; +/* */ import gregtech.api.util.GT_ModHandler; +/* */ import gregtech.api.util.GT_OreDictUnificator; +/* */ import gregtech.api.util.GT_Utility; +/* */ import net.minecraft.item.ItemStack; +/* */ +/* */ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegistrator +/* */ { +/* */ public ProcessingBlock() +/* */ { +/* 19 */ OrePrefixes.block.add(this); +/* */ } +/* */ +/* */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) +/* */ { +/* 24 */ GT_Values.RA.addCutterRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), null, (int)Math.max(aMaterial.getMass() * 10L, 1L), 30); +/* */ +/* 26 */ ItemStack tStack1 = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L);ItemStack tStack2 = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);ItemStack tStack3 = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L); +/* */ +/* 28 */ GT_ModHandler.removeRecipe(new ItemStack[] { GT_Utility.copyAmount(1L, new Object[] { aStack }) }); +/* */ +/* 30 */ if (tStack1 != null) GT_ModHandler.removeRecipe(new ItemStack[] { tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1 }); +/* 31 */ if (tStack2 != null) GT_ModHandler.removeRecipe(new ItemStack[] { tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2 }); +/* 32 */ if (tStack3 != null) { GT_ModHandler.removeRecipe(new ItemStack[] { tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3 }); +/* */ } +/* 34 */ if (aMaterial.mStandardMoltenFluid != null) { GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Block.get(0L, new Object[0]), aMaterial.getMolten(1296L), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), 288, 8); +/* */ } +/* 36 */ if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.storageblockcrafting, OrePrefixes.block.get(aMaterial).toString(), false)) { +/* 37 */ if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), new Object[] { "XXX", "XXX", "XXX", Character.valueOf('X'), OrePrefixes.dust.get(aMaterial) }); +/* 38 */ if (tStack2 != null) GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), new Object[] { "XXX", "XXX", "XXX", Character.valueOf('X'), OrePrefixes.gem.get(aMaterial) }); +/* 39 */ if (tStack1 != null) { GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), new Object[] { "XXX", "XXX", "XXX", Character.valueOf('X'), OrePrefixes.ingot.get(aMaterial) }); +/* */ } +/* */ } +/* 42 */ if (tStack1 != null) tStack1.stackSize = 9; +/* 43 */ if (tStack2 != null) tStack2.stackSize = 9; +/* 44 */ if (tStack3 != null) { tStack3.stackSize = 9; +/* */ } +/* 46 */ GT_Values.RA.addForgeHammerRecipe(aStack, tStack2, 100, 24); +/* */ +/* 48 */ if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.storageblockdecrafting, OrePrefixes.block.get(aMaterial).toString(), tStack2 != null)) { +/* 49 */ if (tStack3 != null) GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); +/* 50 */ if (tStack2 != null) GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) }); +/* 51 */ if (tStack1 != null) { GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) }); +/* */ } +/* */ } +/* 54 */ switch (aMaterial) { +/* */ case Mercury: +/* 56 */ System.err.println("'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block?"); +/* 57 */ break; +/* */ case Iron: case WroughtIron: +/* 59 */ GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), ItemList.Shape_Extruder_Rod.get(0L, new Object[0]), ItemList.IC2_ShaftIron.get(1L, new Object[0]), 640, 120); +/* 60 */ GT_Values.RA.addAssemblerRecipe(ItemList.IC2_Compressed_Coal_Ball.get(8L, new Object[0]), GT_Utility.copyAmount(1L, new Object[] { aStack }), ItemList.IC2_Compressed_Coal_Chunk.get(1L, new Object[0]), 400, 4); +/* 61 */ break; +/* */ case Steel: +/* 63 */ GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), ItemList.Shape_Extruder_Rod.get(0L, new Object[0]), ItemList.IC2_ShaftSteel.get(1L, new Object[0]), 1280, 120); +/* 64 */ GT_Values.RA.addAssemblerRecipe(ItemList.IC2_Compressed_Coal_Ball.get(8L, new Object[0]), GT_Utility.copyAmount(1L, new Object[] { aStack }), ItemList.IC2_Compressed_Coal_Chunk.get(1L, new Object[0]), 400, 4); +/* */ } +/* */ } +/* */ } + + +/* Location: F:\Torrent\minecraft\jdgui test\gregtech_1.7.10-5.07.07-dev.jar!\gregtech\loaders\oreprocessing\ProcessingBlock.class + * Java compiler version: 6 (50.0) + * JD-Core Version: 0.7.1-SNAPSHOT-20140817 */ \ No newline at end of file diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java index fba70c47ce..4c947704fb 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java @@ -1,33 +1,28 @@ -/* 1: */ package gregtech.loaders.oreprocessing; -/* 2: */ -/* 3: */ import gregtech.api.enums.GT_Values; -/* 4: */ import gregtech.api.enums.Materials; -/* 5: */ import gregtech.api.enums.OrePrefixes; -/* 6: */ import gregtech.api.enums.SubTag; -/* 7: */ import gregtech.api.interfaces.IOreRecipeRegistrator; -/* 8: */ import gregtech.api.interfaces.internal.IGT_RecipeAdder; -/* 9: */ import gregtech.api.util.GT_OreDictUnificator; -/* 10: */ import gregtech.api.util.GT_Utility; -/* 11: */ import net.minecraft.item.ItemStack; -/* 12: */ -/* 13: */ public class ProcessingBolt -/* 14: */ implements IOreRecipeRegistrator -/* 15: */ { -/* 16: */ public ProcessingBolt() -/* 17: */ { -/* 18:15 */ OrePrefixes.bolt.add(this); -/* 19: */ } -/* 20: */ -/* 21: */ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic