From a1504799f44ba2debdfef06317f24e7f9c1129d6 Mon Sep 17 00:00:00 2001 From: aerospark Date: Tue, 23 Jun 2015 15:29:05 -0700 Subject: strip linenumbers --- main/java/gregtech/common/GT_Client.java | 16 +- main/java/gregtech/common/GT_DummyWorld.java | 290 ++-- main/java/gregtech/common/GT_IteratorRandom.java | 36 +- .../gregtech/common/GT_MinableOreGenerator.java | 158 +- main/java/gregtech/common/GT_Network.java | 226 +-- .../gregtech/common/GT_PlayerActivityLogger.java | 72 +- main/java/gregtech/common/GT_RecipeAdder.java | 1310 +++++++-------- main/java/gregtech/common/GT_Server.java | 72 +- .../gregtech/common/GT_Worldgen_GT_Ore_Layer.java | 182 +-- .../common/GT_Worldgen_GT_Ore_SmallPieces.java | 98 +- main/java/gregtech/common/GT_Worldgen_Stone.java | 182 +-- main/java/gregtech/common/GT_Worldgenerator.java | 260 +-- .../gregtech/common/blocks/GT_Block_Casings1.java | 178 +-- .../gregtech/common/blocks/GT_Block_Casings2.java | 202 +-- .../gregtech/common/blocks/GT_Block_Casings3.java | 184 +-- .../gregtech/common/blocks/GT_Block_Casings4.java | 148 +- .../common/blocks/GT_Block_Casings_Abstract.java | 280 ++-- .../gregtech/common/blocks/GT_Block_Concretes.java | 208 +-- .../gregtech/common/blocks/GT_Block_Granites.java | 160 +- .../gregtech/common/blocks/GT_Block_Machines.java | 1142 ++++++------- .../java/gregtech/common/blocks/GT_Block_Ores.java | 522 +++--- .../common/blocks/GT_Block_Stones_Abstract.java | 350 ++-- .../gregtech/common/blocks/GT_Item_Casings1.java | 58 +- .../gregtech/common/blocks/GT_Item_Casings2.java | 50 +- .../gregtech/common/blocks/GT_Item_Casings3.java | 24 +- .../gregtech/common/blocks/GT_Item_Casings4.java | 24 +- .../common/blocks/GT_Item_Casings_Abstract.java | 90 +- .../gregtech/common/blocks/GT_Item_Concretes.java | 48 +- .../gregtech/common/blocks/GT_Item_Granites.java | 24 +- .../gregtech/common/blocks/GT_Item_Machines.java | 332 ++-- main/java/gregtech/common/blocks/GT_Item_Ores.java | 108 +- .../common/blocks/GT_Item_Stones_Abstract.java | 82 +- .../common/blocks/GT_Material_Casings.java | 42 +- .../common/blocks/GT_Material_Machines.java | 42 +- .../gregtech/common/blocks/GT_Packet_Ores.java | 136 +- .../gregtech/common/blocks/GT_TileEntity_Ores.java | 488 +++--- main/java/gregtech/common/covers/GT_Cover_Arm.java | 224 +-- .../common/covers/GT_Cover_Blastproof.java | 50 +- .../common/covers/GT_Cover_ControlsWork.java | 150 +- .../gregtech/common/covers/GT_Cover_Conveyor.java | 266 ++-- .../gregtech/common/covers/GT_Cover_Crafting.java | 70 +- .../gregtech/common/covers/GT_Cover_DoesWork.java | 188 +-- .../gregtech/common/covers/GT_Cover_Drain.java | 216 +-- .../gregtech/common/covers/GT_Cover_EUMeter.java | 276 ++-- .../common/covers/GT_Cover_EnergyOnly.java | 204 +-- .../gregtech/common/covers/GT_Cover_ItemMeter.java | 186 +-- .../java/gregtech/common/covers/GT_Cover_Lens.java | 40 +- .../common/covers/GT_Cover_LiquidMeter.java | 194 +-- .../common/covers/GT_Cover_NeedMaintainance.java | 148 +- .../common/covers/GT_Cover_PlayerDetector.java | 106 +- .../java/gregtech/common/covers/GT_Cover_Pump.java | 374 ++--- .../common/covers/GT_Cover_RedstoneConductor.java | 168 +- .../covers/GT_Cover_RedstoneReceiverExternal.java | 50 +- .../covers/GT_Cover_RedstoneReceiverInternal.java | 48 +- .../common/covers/GT_Cover_RedstoneSignalizer.java | 162 +- .../GT_Cover_RedstoneTransmitterExternal.java | 50 +- .../GT_Cover_RedstoneTransmitterInternal.java | 50 +- .../covers/GT_Cover_RedstoneWirelessBase.java | 196 +-- .../gregtech/common/covers/GT_Cover_Screen.java | 160 +- .../gregtech/common/covers/GT_Cover_Shutter.java | 92 +- .../common/covers/GT_Cover_SolarPanel.java | 82 +- .../java/gregtech/common/covers/GT_Cover_Vent.java | 80 +- .../gregtech/common/entities/GT_Entity_Arrow.java | 782 ++++----- .../common/entities/GT_Entity_Arrow_Potion.java | 142 +- .../gregtech/common/gui/GT_Container_Boiler.java | 182 +-- .../gui/GT_Container_BronzeBlastFurnace.java | 68 +- .../common/gui/GT_Container_ChestBuffer.java | 176 +- .../gregtech/common/gui/GT_Container_Filter.java | 286 ++-- .../common/gui/GT_Container_Regulator.java | 348 ++-- .../common/gui/GT_Container_SuperBuffer.java | 166 +- .../common/gui/GT_Container_TypeFilter.java | 246 +-- .../common/gui/GT_GUIContainer_Boiler.java | 94 +- .../gui/GT_GUIContainer_BronzeBlastFurnace.java | 66 +- .../common/gui/GT_GUIContainer_ChestBuffer.java | 44 +- .../common/gui/GT_GUIContainer_Filter.java | 44 +- .../common/gui/GT_GUIContainer_Regulator.java | 72 +- .../common/gui/GT_GUIContainer_SuperBuffer.java | 44 +- .../common/gui/GT_GUIContainer_TypeFilter.java | 44 +- .../gregtech/common/items/GT_FluidDisplayItem.java | 204 +-- .../common/items/GT_IntegratedCircuit_Item.java | 250 +-- .../common/items/GT_MetaGenerated_Item_01.java | 1684 ++++++++++---------- .../common/items/GT_MetaGenerated_Item_02.java | 894 +++++------ .../common/items/GT_MetaGenerated_Item_03.java | 44 +- .../common/items/GT_MetaGenerated_Tool_01.java | 338 ++-- .../gregtech/common/items/GT_SensorCard_Item.java | 202 +-- .../common/items/behaviors/Behaviour_Arrow.java | 258 +-- .../items/behaviors/Behaviour_Arrow_Potion.java | 132 +- .../common/items/behaviors/Behaviour_Crowbar.java | 126 +- .../common/items/behaviors/Behaviour_DataOrb.java | 230 +-- .../items/behaviors/Behaviour_DataStick.java | 74 +- .../common/items/behaviors/Behaviour_Hoe.java | 136 +- .../common/items/behaviors/Behaviour_Lighter.java | 274 ++-- .../common/items/behaviors/Behaviour_None.java | 164 +- .../behaviors/Behaviour_Plunger_Essentia.java | 106 +- .../items/behaviors/Behaviour_Plunger_Fluid.java | 112 +- .../items/behaviors/Behaviour_Plunger_Item.java | 152 +- .../items/behaviors/Behaviour_PrintedPages.java | 80 +- .../items/behaviors/Behaviour_Prospecting.java | 286 ++-- .../common/items/behaviors/Behaviour_Scanner.java | 88 +- .../common/items/behaviors/Behaviour_Scoop.java | 114 +- .../items/behaviors/Behaviour_Screwdriver.java | 112 +- .../common/items/behaviors/Behaviour_Sense.java | 106 +- .../items/behaviors/Behaviour_SensorKit.java | 104 +- .../items/behaviors/Behaviour_SoftHammer.java | 250 +-- .../items/behaviors/Behaviour_Sonictron.java | 282 ++-- .../items/behaviors/Behaviour_Spray_Color.java | 274 ++-- .../items/behaviors/Behaviour_WrittenBook.java | 76 +- .../redstonecircuits/GT_Circuit_BasicLogic.java | 214 +-- .../common/redstonecircuits/GT_Circuit_BitAnd.java | 158 +- .../GT_Circuit_CombinationLock.java | 234 +-- .../common/redstonecircuits/GT_Circuit_Equals.java | 146 +- .../common/redstonecircuits/GT_Circuit_Pulser.java | 186 +-- .../redstonecircuits/GT_Circuit_Randomizer.java | 188 +-- .../redstonecircuits/GT_Circuit_RedstoneMeter.java | 194 +-- .../redstonecircuits/GT_Circuit_Repeater.java | 194 +-- .../common/redstonecircuits/GT_Circuit_Timer.java | 248 +-- .../gregtech/common/render/GT_CapeRenderer.java | 202 +-- .../render/GT_MetaGenerated_Item_Renderer.java | 368 ++--- .../render/GT_MetaGenerated_Tool_Renderer.java | 416 ++--- .../java/gregtech/common/render/GT_RenderUtil.java | 72 +- .../common/render/GT_Renderer_Entity_Arrow.java | 46 +- .../automation/GT_MetaTileEntity_ChestBuffer.java | 148 +- .../automation/GT_MetaTileEntity_Filter.java | 174 +- .../automation/GT_MetaTileEntity_Regulator.java | 208 +-- .../automation/GT_MetaTileEntity_SuperBuffer.java | 88 +- .../automation/GT_MetaTileEntity_TypeFilter.java | 260 +-- .../boilers/GT_MetaTileEntity_Boiler_Lava.java | 318 ++-- .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 292 ++-- .../boilers/GT_MetaTileEntity_Boiler_Steel.java | 350 ++-- .../GT_MetaTileEntity_DieselGenerator.java | 224 +-- .../GT_MetaTileEntity_FluidNaquadahReactor.java | 196 +-- .../generators/GT_MetaTileEntity_GasTurbine.java | 198 +-- .../GT_MetaTileEntity_MagicEnergyConverter.java | 194 +-- .../GT_MetaTileEntity_MagicalEnergyAbsorber.java | 194 +-- .../GT_MetaTileEntity_PlasmaGenerator.java | 194 +-- .../GT_MetaTileEntity_SolidNaquadahReactor.java | 196 +-- .../generators/GT_MetaTileEntity_SteamTurbine.java | 222 +-- .../GT_MetaTileEntity_BasicHull_Bronze.java | 80 +- .../GT_MetaTileEntity_BasicHull_BronzeBricks.java | 80 +- .../GT_MetaTileEntity_BasicHull_Steel.java | 80 +- .../GT_MetaTileEntity_BasicHull_SteelBricks.java | 80 +- .../basic/GT_MetaTileEntity_Boxinator.java | 184 +-- .../basic/GT_MetaTileEntity_Disassembler.java | 128 +- .../basic/GT_MetaTileEntity_Massfabricator.java | 152 +- .../basic/GT_MetaTileEntity_PotionBrewer.java | 314 ++-- .../machines/basic/GT_MetaTileEntity_Printer.java | 124 +- .../basic/GT_MetaTileEntity_Replicator.java | 232 +-- .../basic/GT_MetaTileEntity_RockBreaker.java | 160 +- .../machines/basic/GT_MetaTileEntity_Scanner.java | 400 ++--- .../GT_MetaTileEntity_BronzeBlastFurnace.java | 798 +++++----- .../multi/GT_MetaTileEntity_DistillationTower.java | 326 ++-- .../GT_MetaTileEntity_ElectricBlastFurnace.java | 480 +++--- .../multi/GT_MetaTileEntity_FusionComputer.java | 296 ++-- .../multi/GT_MetaTileEntity_HeatExchanger.java | 300 ++-- .../GT_MetaTileEntity_ImplosionCompressor.java | 342 ++-- .../multi/GT_MetaTileEntity_LargeBoiler.java | 484 +++--- .../GT_MetaTileEntity_LargeBoiler_Bronze.java | 150 +- .../multi/GT_MetaTileEntity_LargeBoiler_Steel.java | 150 +- .../GT_MetaTileEntity_LargeBoiler_Titanium.java | 150 +- ...T_MetaTileEntity_LargeBoiler_TungstenSteel.java | 150 +- .../multi/GT_MetaTileEntity_MultiFurnace.java | 370 ++--- .../multi/GT_MetaTileEntity_ProcessingArray.java | 232 +-- .../multi/GT_MetaTileEntity_VacuumFreezer.java | 332 ++-- .../GT_MetaTileEntity_AlloySmelter_Bronze.java | 226 +-- .../GT_MetaTileEntity_AlloySmelter_Steel.java | 226 +-- .../steam/GT_MetaTileEntity_Compressor_Bronze.java | 216 +-- .../steam/GT_MetaTileEntity_Compressor_Steel.java | 216 +-- .../steam/GT_MetaTileEntity_Extractor_Bronze.java | 216 +-- .../steam/GT_MetaTileEntity_Extractor_Steel.java | 216 +-- .../GT_MetaTileEntity_ForgeHammer_Bronze.java | 226 +-- .../steam/GT_MetaTileEntity_ForgeHammer_Steel.java | 226 +-- .../steam/GT_MetaTileEntity_Furnace_Bronze.java | 216 +-- .../steam/GT_MetaTileEntity_Furnace_Steel.java | 216 +-- .../steam/GT_MetaTileEntity_Macerator_Steel.java | 240 +-- .../storage/GT_MetaTileEntity_Locker.java | 384 ++--- main/java/gregtech/common/tools/GT_Tool.java | 334 ++-- main/java/gregtech/common/tools/GT_Tool_Axe.java | 286 ++-- .../common/tools/GT_Tool_BranchCutter.java | 192 +-- .../common/tools/GT_Tool_ButcheryKnife.java | 196 +-- .../gregtech/common/tools/GT_Tool_BuzzSaw.java | 156 +- .../gregtech/common/tools/GT_Tool_Chainsaw_HV.java | 108 +- .../gregtech/common/tools/GT_Tool_Chainsaw_LV.java | 210 +-- .../gregtech/common/tools/GT_Tool_Chainsaw_MV.java | 108 +- .../gregtech/common/tools/GT_Tool_Crowbar.java | 284 ++-- .../gregtech/common/tools/GT_Tool_Drill_HV.java | 118 +- .../gregtech/common/tools/GT_Tool_Drill_LV.java | 256 +-- .../gregtech/common/tools/GT_Tool_Drill_MV.java | 112 +- main/java/gregtech/common/tools/GT_Tool_File.java | 242 +-- .../gregtech/common/tools/GT_Tool_HardHammer.java | 364 ++--- main/java/gregtech/common/tools/GT_Tool_Hoe.java | 256 +-- .../gregtech/common/tools/GT_Tool_JackHammer.java | 226 +-- main/java/gregtech/common/tools/GT_Tool_Knife.java | 116 +- .../java/gregtech/common/tools/GT_Tool_Mortar.java | 242 +-- .../gregtech/common/tools/GT_Tool_Pickaxe.java | 254 +-- main/java/gregtech/common/tools/GT_Tool_Plow.java | 156 +- .../gregtech/common/tools/GT_Tool_Plunger.java | 174 +- .../gregtech/common/tools/GT_Tool_RollingPin.java | 128 +- main/java/gregtech/common/tools/GT_Tool_Saw.java | 276 ++-- main/java/gregtech/common/tools/GT_Tool_Scoop.java | 262 +-- .../gregtech/common/tools/GT_Tool_Screwdriver.java | 282 ++-- .../common/tools/GT_Tool_Screwdriver_LV.java | 62 +- main/java/gregtech/common/tools/GT_Tool_Sense.java | 154 +- .../java/gregtech/common/tools/GT_Tool_Shovel.java | 232 +-- .../gregtech/common/tools/GT_Tool_SoftHammer.java | 270 ++-- .../common/tools/GT_Tool_Soldering_Iron.java | 230 +-- main/java/gregtech/common/tools/GT_Tool_Sword.java | 238 +-- .../common/tools/GT_Tool_UniversalSpade.java | 266 ++-- .../gregtech/common/tools/GT_Tool_WireCutter.java | 232 +-- .../java/gregtech/common/tools/GT_Tool_Wrench.java | 282 ++-- .../gregtech/common/tools/GT_Tool_Wrench_HV.java | 132 +- .../gregtech/common/tools/GT_Tool_Wrench_LV.java | 146 +- .../gregtech/common/tools/GT_Tool_Wrench_MV.java | 132 +- 212 files changed, 22522 insertions(+), 22522 deletions(-) (limited to 'main/java/gregtech/common') diff --git a/main/java/gregtech/common/GT_Client.java b/main/java/gregtech/common/GT_Client.java index 013dc3fa60..7607e315ac 100644 --- a/main/java/gregtech/common/GT_Client.java +++ b/main/java/gregtech/common/GT_Client.java @@ -194,14 +194,14 @@ label0: // super.onPostLoad(); -// /* */ -// /* 83 */ for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { -// /* */ try { -// /* 85 */ for (; i < GregTech_API.METATILEENTITIES.length; i++) if (GregTech_API.METATILEENTITIES[i] != null) GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip(null, true); -// /* */ } catch (Throwable e) { -// /* 87 */ e.printStackTrace(GT_Log.err); -// /* */ } -// /* */ } +// +// for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { +// try { +// for (; i < GregTech_API.METATILEENTITIES.length; i++) if (GregTech_API.METATILEENTITIES[i] != null) GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip(null, true); +// } catch (Throwable e) { +// e.printStackTrace(GT_Log.err); +// } +// } } public void run() diff --git a/main/java/gregtech/common/GT_DummyWorld.java b/main/java/gregtech/common/GT_DummyWorld.java index e8e4b3e70e..aed129e71e 100644 --- a/main/java/gregtech/common/GT_DummyWorld.java +++ b/main/java/gregtech/common/GT_DummyWorld.java @@ -1,150 +1,150 @@ -/* 1: */ package gregtech.common; -/* 2: */ -/* 3: */ import java.io.File; -/* 4: */ import net.minecraft.block.Block; -/* 5: */ import net.minecraft.entity.Entity; -/* 6: */ import net.minecraft.init.Blocks; -/* 7: */ import net.minecraft.item.ItemStack; -/* 8: */ import net.minecraft.nbt.NBTTagCompound; -/* 9: */ import net.minecraft.profiler.Profiler; -/* 10: */ import net.minecraft.world.World; -/* 11: */ import net.minecraft.world.WorldProvider; -/* 12: */ import net.minecraft.world.WorldSettings; -/* 13: */ import net.minecraft.world.biome.BiomeGenBase; -/* 14: */ import net.minecraft.world.chunk.IChunkProvider; -/* 15: */ import net.minecraft.world.chunk.storage.IChunkLoader; -/* 16: */ import net.minecraft.world.storage.IPlayerFileData; -/* 17: */ import net.minecraft.world.storage.ISaveHandler; -/* 18: */ import net.minecraft.world.storage.WorldInfo; -/* 19: */ -/* 20: */ public class GT_DummyWorld -/* 21: */ extends World -/* 22: */ { -/* 23: 25 */ public GT_IteratorRandom mRandom = new GT_IteratorRandom(); -/* 24: 26 */ public ItemStack mLastSetBlock = null; -/* 25: */ -/* 26: */ public GT_DummyWorld(ISaveHandler par1iSaveHandler, String par2Str, WorldProvider par3WorldProvider, WorldSettings par4WorldSettings, Profiler par5Profiler) -/* 27: */ { -/* 28: 29 */ super(par1iSaveHandler, par2Str, par4WorldSettings, par3WorldProvider, par5Profiler); -/* 29: 30 */ this.rand = this.mRandom; -/* 30: */ } -/* 31: */ -/* 32: */ public GT_DummyWorld() -/* 33: */ { -/* 34: 34 */ this(new ISaveHandler() -/* 35: */ { -/* 36: */ public void saveWorldInfoWithPlayer(WorldInfo var1, NBTTagCompound var2) {} -/* 37: */ -/* 38: */ public void saveWorldInfo(WorldInfo var1) {} -/* 39: */ -/* 40: */ public WorldInfo loadWorldInfo() -/* 41: */ { -/* 42: 38 */ return null; -/* 43: */ } -/* 44: */ -/* 45: */ public IPlayerFileData getSaveHandler() -/* 46: */ { -/* 47: 39 */ return null; -/* 48: */ } -/* 49: */ -/* 50: */ public File getMapFileFromName(String var1) -/* 51: */ { -/* 52: 40 */ return null; -/* 53: */ } -/* 54: */ -/* 55: */ public IChunkLoader getChunkLoader(WorldProvider var1) -/* 56: */ { -/* 57: 41 */ return null; -/* 58: */ } -/* 59: */ -/* 60: */ public void flush() {} -/* 61: */ -/* 62: */ public void checkSessionLock() {} -/* 63: */ -/* 64: */ public String getWorldDirectoryName() -/* 65: */ { -/* 66: 44 */ return null; -/* 67: */ } -/* 68: */ -/* 69: */ public File getWorldDirectory() -/* 70: */ { -/* 71: 45 */ return null; -/* 72: */ } -/* 73: 45 */ }, "DUMMY_DIMENSION", null, +package gregtech.common; + +import java.io.File; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.profiler.Profiler; +import net.minecraft.world.World; +import net.minecraft.world.WorldProvider; +import net.minecraft.world.WorldSettings; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.chunk.storage.IChunkLoader; +import net.minecraft.world.storage.IPlayerFileData; +import net.minecraft.world.storage.ISaveHandler; +import net.minecraft.world.storage.WorldInfo; + +public class GT_DummyWorld + extends World +{ + public GT_IteratorRandom mRandom = new GT_IteratorRandom(); + public ItemStack mLastSetBlock = null; + + public GT_DummyWorld(ISaveHandler par1iSaveHandler, String par2Str, WorldProvider par3WorldProvider, WorldSettings par4WorldSettings, Profiler par5Profiler) + { + super(par1iSaveHandler, par2Str, par4WorldSettings, par3WorldProvider, par5Profiler); + this.rand = this.mRandom; + } + + public GT_DummyWorld() + { + this(new ISaveHandler() + { + public void saveWorldInfoWithPlayer(WorldInfo var1, NBTTagCompound var2) {} + + public void saveWorldInfo(WorldInfo var1) {} + + public WorldInfo loadWorldInfo() + { + return null; + } + + public IPlayerFileData getSaveHandler() + { + return null; + } + + public File getMapFileFromName(String var1) + { + return null; + } + + public IChunkLoader getChunkLoader(WorldProvider var1) + { + return null; + } + + public void flush() {} + + public void checkSessionLock() {} + + public String getWorldDirectoryName() + { + return null; + } + + public File getWorldDirectory() + { + return null; + } + }, "DUMMY_DIMENSION", null, // new WorldProvider(), -///* 74: */ -///* 75: */ -///* 76: */ -///* 77: 49 */ new WorldSettings(new WorldInfo(new NBTTagCompound())) -///* 78: */ { -///* 79: */ public String getDimensionName() -///* 80: */ { -///* 81: 49 */ return "DUMMY_DIMENSION"; -///* 82: */ } -///* 83: 49 */ } +// +// +// +// new WorldSettings(new WorldInfo(new NBTTagCompound())) +// { +// public String getDimensionName() +// { +// return "DUMMY_DIMENSION"; +// } +// } new WorldSettings(new WorldInfo(new NBTTagCompound())), new Profiler()); -/* 84: */ } -/* 85: */ -/* 86: */ protected IChunkProvider createChunkProvider() -/* 87: */ { -/* 88: 58 */ return null; -/* 89: */ } -/* 90: */ -/* 91: */ public Entity getEntityByID(int aEntityID) -/* 92: */ { -/* 93: 63 */ return null; -/* 94: */ } -/* 95: */ -/* 96: */ public boolean setBlock(int aX, int aY, int aZ, Block aBlock, int aMeta, int aFlags) -/* 97: */ { -/* 98: 68 */ this.mLastSetBlock = new ItemStack(aBlock, 1, aMeta); -/* 99: 69 */ return true; -/* 100: */ } -/* 101: */ -/* 102: */ public float getSunBrightnessFactor(float p_72967_1_) -/* 103: */ { -/* 104: 74 */ return 1.0F; -/* 105: */ } -/* 106: */ -/* 107: */ public BiomeGenBase getBiomeGenForCoords(int aX, int aZ) -/* 108: */ { -/* 109: 79 */ if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) { -/* 110: 79 */ return BiomeGenBase.plains; -/* 111: */ } -/* 112: 80 */ return BiomeGenBase.ocean; -/* 113: */ } -/* 114: */ -/* 115: */ public int getFullBlockLightValue(int aX, int aY, int aZ) -/* 116: */ { -/* 117: 85 */ return 10; -/* 118: */ } -/* 119: */ -/* 120: */ public Block getBlock(int aX, int aY, int aZ) -/* 121: */ { -/* 122: 90 */ if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) { -/* 123: 90 */ return aY == 64 ? Blocks.grass : Blocks.air; -/* 124: */ } -/* 125: 91 */ return Blocks.air; -/* 126: */ } -/* 127: */ -/* 128: */ public int getBlockMetadata(int aX, int aY, int aZ) -/* 129: */ { -/* 130: 96 */ return 0; -/* 131: */ } -/* 132: */ -/* 133: */ public boolean canBlockSeeTheSky(int aX, int aY, int aZ) -/* 134: */ { -/* 135:101 */ if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) { -/* 136:101 */ return aY > 64; -/* 137: */ } -/* 138:102 */ return true; -/* 139: */ } -/* 140: */ -/* 141: */ protected int func_152379_p() -/* 142: */ { -/* 143:107 */ return 0; -/* 144: */ } -/* 145: */ } + } + + protected IChunkProvider createChunkProvider() + { + return null; + } + + public Entity getEntityByID(int aEntityID) + { + return null; + } + + public boolean setBlock(int aX, int aY, int aZ, Block aBlock, int aMeta, int aFlags) + { + this.mLastSetBlock = new ItemStack(aBlock, 1, aMeta); + return true; + } + + public float getSunBrightnessFactor(float p_72967_1_) + { + return 1.0F; + } + + public BiomeGenBase getBiomeGenForCoords(int aX, int aZ) + { + if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) { + return BiomeGenBase.plains; + } + return BiomeGenBase.ocean; + } + + public int getFullBlockLightValue(int aX, int aY, int aZ) + { + return 10; + } + + public Block getBlock(int aX, int aY, int aZ) + { + if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) { + return aY == 64 ? Blocks.grass : Blocks.air; + } + return Blocks.air; + } + + public int getBlockMetadata(int aX, int aY, int aZ) + { + return 0; + } + + public boolean canBlockSeeTheSky(int aX, int aY, int aZ) + { + if ((aX >= 16) && (aZ >= 16) && (aX < 32) && (aZ < 32)) { + return aY > 64; + } + return true; + } + + protected int func_152379_p() + { + return 0; + } +} /* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar diff --git a/main/java/gregtech/common/GT_IteratorRandom.java b/main/java/gregtech/common/GT_IteratorRandom.java index 7db9aa0c49..e0e33bfd42 100644 --- a/main/java/gregtech/common/GT_IteratorRandom.java +++ b/main/java/gregtech/common/GT_IteratorRandom.java @@ -1,21 +1,21 @@ -/* 1: */ package gregtech.common; -/* 2: */ -/* 3: */ import java.util.Random; -/* 4: */ -/* 5: */ public class GT_IteratorRandom -/* 6: */ extends Random -/* 7: */ { -/* 8: */ private static final long serialVersionUID = 1L; -/* 9: 8 */ public int mIterationStep = 2147483647; -/* 10: */ -/* 11: */ public int nextInt(int aParameter) -/* 12: */ { -/* 13:11 */ if ((this.mIterationStep == 0) || (this.mIterationStep > aParameter)) { -/* 14:12 */ this.mIterationStep = aParameter; -/* 15: */ } -/* 16:14 */ return --this.mIterationStep; -/* 17: */ } -/* 18: */ } +package gregtech.common; + +import java.util.Random; + +public class GT_IteratorRandom + extends Random +{ + private static final long serialVersionUID = 1L; + public int mIterationStep = 2147483647; + + public int nextInt(int aParameter) + { + if ((this.mIterationStep == 0) || (this.mIterationStep > aParameter)) { + this.mIterationStep = aParameter; + } + return --this.mIterationStep; + } +} /* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar diff --git a/main/java/gregtech/common/GT_MinableOreGenerator.java b/main/java/gregtech/common/GT_MinableOreGenerator.java index 5ebd994a8f..cd0c9bfb89 100644 --- a/main/java/gregtech/common/GT_MinableOreGenerator.java +++ b/main/java/gregtech/common/GT_MinableOreGenerator.java @@ -1,82 +1,82 @@ -/* 1: */ package gregtech.common; -/* 2: */ -/* 3: */ import java.util.Random; -/* 4: */ import net.minecraft.block.Block; -/* 5: */ import net.minecraft.init.Blocks; -/* 6: */ import net.minecraft.util.MathHelper; -/* 7: */ import net.minecraft.world.World; -/* 8: */ import net.minecraft.world.gen.feature.WorldGenerator; -/* 9: */ -/* 10: */ public class GT_MinableOreGenerator -/* 11: */ extends WorldGenerator -/* 12: */ { -/* 13: */ private Block minableBlockId; -/* 14: */ private Block mBlock; -/* 15:17 */ private int minableBlockMeta = 0; -/* 16: */ private int numberOfBlocks; -/* 17:21 */ private boolean allowVoid = false; -/* 18: */ -/* 19: */ public GT_MinableOreGenerator(Block par1, int par2) -/* 20: */ { -/* 21:24 */ this.minableBlockId = par1; -/* 22:25 */ this.numberOfBlocks = par2; -/* 23: */ } -/* 24: */ -/* 25: */ public GT_MinableOreGenerator(Block id, int meta, int number, boolean aAllowVoid, Block aBlock) -/* 26: */ { -/* 27:29 */ this(id, number); -/* 28:30 */ this.minableBlockMeta = meta; -/* 29:31 */ this.allowVoid = aAllowVoid; -/* 30:32 */ this.mBlock = aBlock; -/* 31: */ } -/* 32: */ -/* 33: */ public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) -/* 34: */ { -/* 35:37 */ float var6 = par2Random.nextFloat() * 3.141593F; -/* 36:38 */ double var7 = par3 + 8 + MathHelper.sin(var6) * this.numberOfBlocks / 8.0F; -/* 37:39 */ double var9 = par3 + 8 - MathHelper.sin(var6) * this.numberOfBlocks / 8.0F; -/* 38:40 */ double var11 = par5 + 8 + MathHelper.cos(var6) * this.numberOfBlocks / 8.0F; -/* 39:41 */ double var13 = par5 + 8 - MathHelper.cos(var6) * this.numberOfBlocks / 8.0F; -/* 40:42 */ double var15 = par4 + par2Random.nextInt(3) - 2; -/* 41:43 */ double var17 = par4 + par2Random.nextInt(3) - 2; -/* 42:45 */ for (int var19 = 0; var19 <= this.numberOfBlocks; var19++) -/* 43: */ { -/* 44:47 */ double var20 = var7 + (var9 - var7) * var19 / this.numberOfBlocks; -/* 45:48 */ double var22 = var15 + (var17 - var15) * var19 / this.numberOfBlocks; -/* 46:49 */ double var24 = var11 + (var13 - var11) * var19 / this.numberOfBlocks; -/* 47:50 */ double var26 = par2Random.nextDouble() * this.numberOfBlocks / 16.0D; -/* 48:51 */ double var28 = (MathHelper.sin(var19 * 3.141593F / this.numberOfBlocks) + 1.0F) * var26 + 1.0D; -/* 49:52 */ double var30 = (MathHelper.sin(var19 * 3.141593F / this.numberOfBlocks) + 1.0F) * var26 + 1.0D; -/* 50:53 */ int var32 = MathHelper.floor_double(var20 - var28 / 2.0D); -/* 51:54 */ int var33 = MathHelper.floor_double(var22 - var30 / 2.0D); -/* 52:55 */ int var34 = MathHelper.floor_double(var24 - var28 / 2.0D); -/* 53:56 */ int var35 = MathHelper.floor_double(var20 + var28 / 2.0D); -/* 54:57 */ int var36 = MathHelper.floor_double(var22 + var30 / 2.0D); -/* 55:58 */ int var37 = MathHelper.floor_double(var24 + var28 / 2.0D); -/* 56:60 */ for (int var38 = var32; var38 <= var35; var38++) -/* 57: */ { -/* 58:61 */ double var39 = (var38 + 0.5D - var20) / (var28 / 2.0D); -/* 59:62 */ if (var39 * var39 < 1.0D) { -/* 60:63 */ for (int var41 = var33; var41 <= var36; var41++) -/* 61: */ { -/* 62:64 */ double var42 = (var41 + 0.5D - var22) / (var30 / 2.0D); -/* 63:65 */ if (var39 * var39 + var42 * var42 < 1.0D) { -/* 64:66 */ for (int var44 = var34; var44 <= var37; var44++) -/* 65: */ { -/* 66:67 */ double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D); -/* 67:68 */ Block block = par1World.getBlock(var38, var41, var44); -/* 68:69 */ if ((var39 * var39 + var42 * var42 + var45 * var45 < 1.0D) && (((this.allowVoid) && (par1World.getBlock(var38, var41, var44) == Blocks.air)) || ((block != null) && (block.isReplaceableOreGen(par1World, var38, var41, var44, this.mBlock))))) { -/* 69:70 */ par1World.setBlock(var38, var41, var44, this.minableBlockId, this.minableBlockMeta, 0); -/* 70: */ } -/* 71: */ } -/* 72: */ } -/* 73: */ } -/* 74: */ } -/* 75: */ } -/* 76: */ } -/* 77:79 */ return true; -/* 78: */ } -/* 79: */ } +package gregtech.common; + +import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class GT_MinableOreGenerator + extends WorldGenerator +{ + private Block minableBlockId; + private Block mBlock; + private int minableBlockMeta = 0; + private int numberOfBlocks; + private boolean allowVoid = false; + + public GT_MinableOreGenerator(Block par1, int par2) + { + this.minableBlockId = par1; + this.numberOfBlocks = par2; + } + + public GT_MinableOreGenerator(Block id, int meta, int number, boolean aAllowVoid, Block aBlock) + { + this(id, number); + this.minableBlockMeta = meta; + this.allowVoid = aAllowVoid; + this.mBlock = aBlock; + } + + public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + { + float var6 = par2Random.nextFloat() * 3.141593F; + double var7 = par3 + 8 + MathHelper.sin(var6) * this.numberOfBlocks / 8.0F; + double var9 = par3 + 8 - MathHelper.sin(var6) * this.numberOfBlocks / 8.0F; + double var11 = par5 + 8 + MathHelper.cos(var6) * this.numberOfBlocks / 8.0F; + double var13 = par5 + 8 - MathHelper.cos(var6) * this.numberOfBlocks / 8.0F; + double var15 = par4 + par2Random.nextInt(3) - 2; + double var17 = par4 + par2Random.nextInt(3) - 2; + for (int var19 = 0; var19 <= this.numberOfBlocks; var19++) + { + double var20 = var7 + (var9 - var7) * var19 / this.numberOfBlocks; + double var22 = var15 + (var17 - var15) * var19 / this.numberOfBlocks; + double var24 = var11 + (var13 - var11) * var19 / this.numberOfBlocks; + double var26 = par2Random.nextDouble() * this.numberOfBlocks / 16.0D; + double var28 = (MathHelper.sin(var19 * 3.141593F / this.numberOfBlocks) + 1.0F) * var26 + 1.0D; + double var30 = (MathHelper.sin(var19 * 3.141593F / this.numberOfBlocks) + 1.0F) * var26 + 1.0D; + int var32 = MathHelper.floor_double(var20 - var28 / 2.0D); + int var33 = MathHelper.floor_double(var22 - var30 / 2.0D); + int var34 = MathHelper.floor_double(var24 - var28 / 2.0D); + int var35 = MathHelper.floor_double(var20 + var28 / 2.0D); + int var36 = MathHelper.floor_double(var22 + var30 / 2.0D); + int var37 = MathHelper.floor_double(var24 + var28 / 2.0D); + for (int var38 = var32; var38 <= var35; var38++) + { + double var39 = (var38 + 0.5D - var20) / (var28 / 2.0D); + if (var39 * var39 < 1.0D) { + for (int var41 = var33; var41 <= var36; var41++) + { + double var42 = (var41 + 0.5D - var22) / (var30 / 2.0D); + if (var39 * var39 + var42 * var42 < 1.0D) { + for (int var44 = var34; var44 <= var37; var44++) + { + double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D); + Block block = par1World.getBlock(var38, var41, var44); + if ((var39 * var39 + var42 * var42 + var45 * var45 < 1.0D) && (((this.allowVoid) && (par1World.getBlock(var38, var41, var44) == Blocks.air)) || ((block != null) && (block.isReplaceableOreGen(par1World, var38, var41, var44, this.mBlock))))) { + par1World.setBlock(var38, var41, var44, this.minableBlockId, this.minableBlockMeta, 0); + } + } + } + } + } + } + } + return true; + } +} /* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar diff --git a/main/java/gregtech/common/GT_Network.java b/main/java/gregtech/common/GT_Network.java index 6aadbf75e0..51044140a3 100644 --- a/main/java/gregtech/common/GT_Network.java +++ b/main/java/gregtech/common/GT_Network.java @@ -1,116 +1,116 @@ -/* 1: */ package gregtech.common; -/* 2: */ -/* 3: */ import com.google.common.io.ByteArrayDataInput; -/* 4: */ import com.google.common.io.ByteStreams; -/* 5: */ import cpw.mods.fml.common.network.FMLEmbeddedChannel; -/* 6: */ import cpw.mods.fml.common.network.FMLOutboundHandler; -/* 7: */ import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget; -/* 8: */ import cpw.mods.fml.common.network.NetworkRegistry; -/* 9: */ import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -/* 10: */ import cpw.mods.fml.common.network.internal.FMLProxyPacket; -/* 11: */ import cpw.mods.fml.relauncher.Side; -/* 12: */ import gregtech.api.enums.GT_Values; -/* 13: */ import gregtech.api.interfaces.internal.IGT_Mod; -/* 14: */ import gregtech.api.net.GT_Packet; -/* 15: */ import gregtech.api.net.GT_Packet_Block_Event; -/* 16: */ import gregtech.api.net.GT_Packet_Sound; -/* 17: */ import gregtech.api.net.GT_Packet_TileEntity; -/* 18: */ import gregtech.api.net.IGT_NetworkHandler; -/* 19: */ import gregtech.common.blocks.GT_Packet_Ores; -/* 20: */ import io.netty.buffer.ByteBuf; -/* 21: */ import io.netty.buffer.Unpooled; -/* 22: */ import io.netty.channel.Channel; -/* 23: */ import io.netty.channel.ChannelHandler; -/* 24: */ import io.netty.channel.ChannelHandler.Sharable; -/* 25: */ import io.netty.channel.ChannelHandlerContext; -/* 26: */ import io.netty.channel.SimpleChannelInboundHandler; -/* 27: */ import io.netty.handler.codec.MessageToMessageCodec; -/* 28: */ import io.netty.util.Attribute; -/* 29: */ import java.util.EnumMap; -/* 30: */ import java.util.List; -/* 31: */ import net.minecraft.entity.player.EntityPlayer; -/* 32: */ import net.minecraft.entity.player.EntityPlayerMP; -/* 33: */ import net.minecraft.server.management.PlayerManager; -/* 34: */ import net.minecraft.world.World; -/* 35: */ import net.minecraft.world.WorldServer; -/* 36: */ import net.minecraft.world.chunk.Chunk; -/* 37: */ -/* 38: */ @ChannelHandler.Sharable -/* 39: */ public class GT_Network -/* 40: */ extends MessageToMessageCodec -/* 41: */ implements IGT_NetworkHandler -/* 42: */ { -/* 43: */ private final EnumMap mChannel; -/* 44: */ private final GT_Packet[] mSubChannels; -/* 45: */ -/* 46: */ public GT_Network() -/* 47: */ { -/* 48:32 */ this.mChannel = NetworkRegistry.INSTANCE.newChannel("GregTech", new ChannelHandler[] { this, new HandlerShared() }); -/* 49:33 */ this.mSubChannels = new GT_Packet[] { new GT_Packet_TileEntity(), new GT_Packet_Sound(), new GT_Packet_Block_Event(), new GT_Packet_Ores() }; -/* 50: */ } -/* 51: */ -/* 52: */ protected void encode(ChannelHandlerContext aContext, GT_Packet aPacket, List aOutput) -/* 53: */ throws Exception -/* 54: */ { -/* 55:37 */ aOutput.add(new FMLProxyPacket(Unpooled.buffer().writeByte(aPacket.getPacketID()).writeBytes(aPacket.encode()).copy(), (String)aContext.channel().attr(NetworkRegistry.FML_CHANNEL).get())); -/* 56: */ } -/* 57: */ -/* 58: */ protected void decode(ChannelHandlerContext aContext, FMLProxyPacket aPacket, List aOutput) -/* 59: */ throws Exception -/* 60: */ { -/* 61:42 */ ByteArrayDataInput aData = ByteStreams.newDataInput(aPacket.payload().array()); -/* 62:43 */ aOutput.add(this.mSubChannels[aData.readByte()].decode(aData)); -/* 63: */ } -/* 64: */ -/* 65: */ public void sendToPlayer(GT_Packet aPacket, EntityPlayerMP aPlayer) -/* 66: */ { -/* 67:48 */ ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); -/* 68:49 */ ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPlayer); -/* 69:50 */ ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).writeAndFlush(aPacket); -/* 70: */ } -/* 71: */ -/* 72: */ public void sendToAllAround(GT_Packet aPacket, NetworkRegistry.TargetPoint aPosition) -/* 73: */ { -/* 74:55 */ ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); -/* 75:56 */ ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPosition); -/* 76:57 */ ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).writeAndFlush(aPacket); -/* 77: */ } -/* 78: */ -/* 79: */ public void sendToServer(GT_Packet aPacket) -/* 80: */ { -/* 81:62 */ ((FMLEmbeddedChannel)this.mChannel.get(Side.CLIENT)).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.TOSERVER); -/* 82:63 */ ((FMLEmbeddedChannel)this.mChannel.get(Side.CLIENT)).writeAndFlush(aPacket); -/* 83: */ } -/* 84: */ -/* 85: */ public void sendPacketToAllPlayersInRange(World aWorld, GT_Packet aPacket, int aX, int aZ) -/* 86: */ { -/* 87:68 */ if (!aWorld.isRemote) { -/* 88:68 */ for (Object tObject : aWorld.playerEntities) -/* 89: */ { -/* 90:69 */ if (!(tObject instanceof EntityPlayerMP)) { -/* 91: */ break; -/* 92: */ } -/* 93:70 */ EntityPlayerMP tPlayer = (EntityPlayerMP)tObject; -/* 94:71 */ Chunk tChunk = aWorld.getChunkFromBlockCoords(aX, aZ); -/* 95:72 */ if (tPlayer.getServerForPlayer().getPlayerManager().isPlayerWatchingChunk(tPlayer, tChunk.xPosition, tChunk.zPosition)) { -/* 96:74 */ sendToPlayer(aPacket, tPlayer); -/* 97: */ } -/* 98: */ } -/* 99: */ } -/* :0: */ } -/* :1: */ -/* :2: */ @ChannelHandler.Sharable -/* :3: */ static final class HandlerShared -/* :4: */ extends SimpleChannelInboundHandler -/* :5: */ { -/* :6: */ protected void channelRead0(ChannelHandlerContext ctx, GT_Packet aPacket) -/* :7: */ throws Exception -/* :8: */ { -/* :9:86 */ EntityPlayer aPlayer = GT_Values.GT.getThePlayer(); -/* ;0:87 */ aPacket.process(aPlayer == null ? null : GT_Values.GT.getThePlayer().worldObj); -/* ;1: */ } -/* ;2: */ } -/* ;3: */ } +package gregtech.common; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteStreams; +import cpw.mods.fml.common.network.FMLEmbeddedChannel; +import cpw.mods.fml.common.network.FMLOutboundHandler; +import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import cpw.mods.fml.relauncher.Side; +import gregtech.api.enums.GT_Values; +import gregtech.api.interfaces.internal.IGT_Mod; +import gregtech.api.net.GT_Packet; +import gregtech.api.net.GT_Packet_Block_Event; +import gregtech.api.net.GT_Packet_Sound; +import gregtech.api.net.GT_Packet_TileEntity; +import gregtech.api.net.IGT_NetworkHandler; +import gregtech.common.blocks.GT_Packet_Ores; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.Channel; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandler.Sharable; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; +import io.netty.handler.codec.MessageToMessageCodec; +import io.netty.util.Attribute; +import java.util.EnumMap; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.management.PlayerManager; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraft.world.chunk.Chunk; + +@ChannelHandler.Sharable +public class GT_Network + extends MessageToMessageCodec + implements IGT_NetworkHandler +{ + private final EnumMap mChannel; + private final GT_Packet[] mSubChannels; + + public GT_Network() + { + this.mChannel = NetworkRegistry.INSTANCE.newChannel("GregTech", new ChannelHandler[] { this, new HandlerShared() }); + this.mSubChannels = new GT_Packet[] { new GT_Packet_TileEntity(), new GT_Packet_Sound(), new GT_Packet_Block_Event(), new GT_Packet_Ores() }; + } + + protected void encode(ChannelHandlerContext aContext, GT_Packet aPacket, List aOutput) + throws Exception + { + aOutput.add(new FMLProxyPacket(Unpooled.buffer().writeByte(aPacket.getPacketID()).writeBytes(aPacket.encode()).copy(), (String)aContext.channel().attr(NetworkRegistry.FML_CHANNEL).get())); + } + + protected void decode(ChannelHandlerContext aContext, FMLProxyPacket aPacket, List aOutput) + throws Exception + { + ByteArrayDataInput aData = ByteStreams.newDataInput(aPacket.payload().array()); + aOutput.add(this.mSubChannels[aData.readByte()].decode(aData)); + } + + public void sendToPlayer(GT_Packet aPacket, EntityPlayerMP aPlayer) + { + ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); + ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPlayer); + ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).writeAndFlush(aPacket); + } + + public void sendToAllAround(GT_Packet aPacket, NetworkRegistry.TargetPoint aPosition) + { + ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); + ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPosition); + ((FMLEmbeddedChannel)this.mChannel.get(Side.SERVER)).writeAndFlush(aPacket); + } + + public void sendToServer(GT_Packet aPacket) + { + ((FMLEmbeddedChannel)this.mChannel.get(Side.CLIENT)).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.TOSERVER); + ((FMLEmbeddedChannel)this.mChannel.get(Side.CLIENT)).writeAndFlush(aPacket); + } + + public void sendPacketToAllPlayersInRange(World aWorld, GT_Packet aPacket, int aX, int aZ) + { + if (!aWorld.isRemote) { + for (Object tObject : aWorld.playerEntities) + { + if (!(tObject instanceof EntityPlayerMP)) { + break; + } + EntityPlayerMP tPlayer = (EntityPlayerMP)tObject; + Chunk tChunk = aWorld.getChunkFromBlockCoords(aX, aZ); + if (tPlayer.getServerForPlayer().getPlayerManager().isPlayerWatchingChunk(tPlayer, tChunk.xPosition, tChunk.zPosition)) { + sendToPlayer(aPacket, tPlayer); + } + } + } + } + + @ChannelHandler.Sharable + static final class HandlerShared + extends SimpleChannelInboundHandler + { + protected void channelRead0(ChannelHandlerContext ctx, GT_Packet aPacket) + throws Exception + { + EntityPlayer aPlayer = GT_Values.GT.getThePlayer(); + aPacket.process(aPlayer == null ? null : GT_Values.GT.getThePlayer().worldObj); + } + } +} /* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar diff --git a/main/java/gregtech/common/GT_PlayerActivityLogger.java b/main/java/gregtech/common/GT_PlayerActivityLogger.java index 988e6af0bb..7d5a247a40 100644 --- a/main/java/gregtech/common/GT_PlayerActivityLogger.java +++ b/main/java/gregtech/common/GT_PlayerActivityLogger.java @@ -1,39 +1,39 @@ -/* 1: */ package gregtech.common; -/* 2: */ -/* 3: */ import gregtech.GT_Mod; -/* 4: */ import gregtech.api.util.GT_Log; -/* 5: */ import java.io.PrintStream; -/* 6: */ import java.util.ArrayList; -/* 7: */ -/* 8: */ public class GT_PlayerActivityLogger -/* 9: */ implements Runnable -/* 10: */ { -/* 11: */ public void run() -/* 12: */ { -/* 13: */ try -/* 14: */ { -/* 15: */ for (;;) -/* 16: */ { -/* 17:13 */ if (GT_Log.pal == null) { -/* 18:13 */ return; -/* 19: */ } -/* 20:14 */ ArrayList tList = GT_Mod.gregtechproxy.mBufferedPlayerActivity; -/* 21:15 */ GT_Mod.gregtechproxy.mBufferedPlayerActivity = new ArrayList(); -/* 22:16 */ String tLastOutput = ""; -/* 23:17 */ int i = 0; -/* 24:17 */ for (int j = tList.size(); i < j; i++) -/* 25: */ { -/* 26:18 */ if (!tLastOutput.equals(tList.get(i))) { -/* 27:18 */ GT_Log.pal.println((String)tList.get(i)); -/* 28: */ } -/* 29:19 */ tLastOutput = (String)tList.get(i); -/* 30: */ } -/* 31:21 */ Thread.sleep(10000L); -/* 32: */ } -/* 33: */ } -/* 34: */ catch (Throwable e) {} -/* 35: */ } -/* 36: */ } +package gregtech.common; + +import gregtech.GT_Mod; +import gregtech.api.util.GT_Log; +import java.io.PrintStream; +import java.util.ArrayList; + +public class GT_PlayerActivityLogger + implements Runnable +{ + public void run() + { + try + { + for (;;) + { + if (GT_Log.pal == null) { + return; + } + ArrayList tList = GT_Mod.gregtechproxy.mBufferedPlayerActivity; + GT_Mod.gregtechproxy.mBufferedPlayerActivity = new ArrayList(); + String tLastOutput = ""; + int i = 0; + for (int j = tList.size(); i < j; i++) + { + if (!tLastOutput.equals(tList.get(i))) { + GT_Log.pal.println((String)tList.get(i)); + } + tLastOutput = (String)tList.get(i); + } + Thread.sleep(10000L); + } + } + catch (Throwable e) {} + } +} /* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar diff --git a/main/java/gregtech/common/GT_RecipeAdder.java b/main/java/gregtech/common/GT_RecipeAdder.java index dc88c2b95d..22d66a5826 100644 --- a/main/java/gregtech/common/GT_RecipeAdder.java +++ b/main/java/gregtech/common/GT_RecipeAdder.java @@ -1,27 +1,27 @@ -/* 1: */ package gregtech.common; -/* 2: */ -/* 3: */ import gregtech.GT_Mod; -/* 4: */ import gregtech.api.GregTech_API; -/* 5: */ import gregtech.api.enums.ItemList; -/* 6: */ import gregtech.api.enums.Materials; -/* 7: */ import gregtech.api.enums.OrePrefixes; -/* 8: */ import gregtech.api.interfaces.internal.IGT_RecipeAdder; -/* 9: */ import gregtech.api.util.GT_Config; -/* 10: */ import gregtech.api.util.GT_ModHandler; -/* 11: */ import gregtech.api.util.GT_Recipe; -/* 12: */ import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -/* 13: */ import java.util.ArrayList; -/* 14: */ import net.minecraft.item.ItemStack; -/* 15: */ import net.minecraftforge.fluids.Fluid; -/* 16: */ import net.minecraftforge.fluids.FluidStack; -/* 17: */ -/* 18: */ public class GT_RecipeAdder -/* 19: */ implements IGT_RecipeAdder -/* 20: */ { -/* 21: */ public boolean addFusionReactorRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt, int aStartEU) -/* 22: */ { -/* 23: 26 */ return false; -/* 31: */ } +package gregtech.common; + +import gregtech.GT_Mod; +import gregtech.api.GregTech_API; +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_Config; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import java.util.ArrayList; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +public class GT_RecipeAdder + implements IGT_RecipeAdder +{ + public boolean addFusionReactorRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt, int aStartEU) + { + return false; + } @Override public boolean addFusionReactorRecipe(FluidStack aInput1, FluidStack aInput2,FluidStack aOutput1, int aDuration, int aEUt, int aStartEU) { @@ -31,161 +31,161 @@ GT_Recipe.GT_Recipe_Map.sFusionRecipes.addRecipe( null, new FluidStack[] {aInput1, aInput2},new FluidStack[]{aOutput1}, aDuration, aEUt, aStartEU); return true; } -/* 32: */ -/* 33: */ public boolean addCentrifugeRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int aDuration) -/* 34: */ { -/* 35: 34 */ return addCentrifugeRecipe(aInput1, aInput2 < 0 ? ItemList.IC2_Fuel_Can_Empty.get(-aInput2, new Object[0]) : aInput2 > 0 ? ItemList.Cell_Empty.get(aInput2, new Object[0]) : null, null, null, aOutput1, aOutput2, aOutput3, aOutput4, aOutput5, aOutput6, null, aDuration, 5); -/* 36: */ } -/* 37: */ -/* 38: */ public boolean addCentrifugeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) -/* 39: */ { -/* 40: 39 */ if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) { -/* 41: 39 */ return false; -/* 42: */ } -/* 43: 40 */ if ((aInput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("centrifuge", aInput1, aDuration)) <= 0)) { -/* 44: 40 */ return false; -/* 45: */ } -/* 46: 41 */ if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile.get("centrifuge", aFluidInput.getFluid().getName(), aDuration)) <= 0)) { -/* 47: 41 */ return false; -/* 48: */ } -/* 49: 42 */ GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 }, new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4, aOutput5, aOutput6 }, null, aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); -/* 50: 43 */ return true; -/* 51: */ } -/* 52: */ -/* 53: */ public boolean addElectrolyzerRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int aDuration, int aEUt) -/* 54: */ { -/* 55: 48 */ return addElectrolyzerRecipe(aInput1, aInput2 < 0 ? ItemList.IC2_Fuel_Can_Empty.get(-aInput2, new Object[0]) : aInput2 > 0 ? ItemList.Cell_Empty.get(aInput2, new Object[0]) : null, null, null, aOutput1, aOutput2, aOutput3, aOutput4, aOutput5, aOutput6, null, aDuration, aEUt); -/* 56: */ } -/* 57: */ -/* 58: */ public boolean addElectrolyzerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) -/* 59: */ { -/* 60: 53 */ if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) { -/* 61: 53 */ return false; -/* 62: */ } -/* 63: 54 */ if ((aInput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("electrolyzer", aInput1, aDuration)) <= 0)) { -/* 64: 54 */ return false; -/* 65: */ } -/* 66: 55 */ if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile.get("electrolyzer", aFluidInput.getFluid().getName(), aDuration)) <= 0)) { -/* 67: 55 */ return false; -/* 68: */ } -/* 69: 56 */ GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 }, new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4, aOutput5, aOutput6 }, null, aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); -/* 70: 57 */ return true; -/* 71: */ } -/* 72: */ -/* 73: */ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int aDuration) -/* 74: */ { -/* 75: 62 */ return addChemicalRecipe(aInput1, aInput2, null, null, aOutput, aDuration); -/* 76: */ } -/* 77: */ -/* 78: */ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration) -/* 79: */ { -/* 80: 67 */ if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput == null) && (aFluidOutput == null))) { -/* 81: 67 */ return false; -/* 82: */ } -/* 83: 68 */ if ((aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aOutput, aDuration)) <= 0)) { -/* 84: 68 */ return false; -/* 85: */ } -/* 86: 69 */ if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { -/* 87: 69 */ return false; -/* 88: */ } -/* 89: 70 */ GT_Recipe.GT_Recipe_Map.sChemicalRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 }, new ItemStack[] { aOutput }, null, null, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, 30, 0); -/* 90: 71 */ return true; -/* 91: */ } -/* 92: */ -/* 93: */ public boolean addBlastRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, int aLevel) -/* 94: */ { -/* 95: 76 */ return addBlastRecipe(aInput1, aInput2, null, null, aOutput1, aOutput2, aDuration, aEUt, aLevel); -/* 96: */ } -/* 97: */ -/* 98: */ public boolean addBlastRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, int aLevel) -/* 99: */ { -/* 100: 81 */ if ((aInput1 == null) || (aOutput1 == null)) { -/* 101: 81 */ return false; -/* 102: */ } -/* 103: 82 */ if ((aDuration = GregTech_API.sRecipeFile.get("blastfurnace", aInput1, aDuration)) <= 0) { -/* 104: 82 */ return false; -/* 105: */ } -/* 106: 83 */ GT_Recipe.GT_Recipe_Map.sBlastRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 }, new ItemStack[] { aOutput1, aOutput2 }, null, null, new FluidStack[] { aFluidInput }, null, aDuration, aEUt, aLevel); -/* 107: 84 */ return true; -/* 108: */ } -/* 109: */ -/* 110: */ public boolean addCannerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt) -/* 111: */ { -/* 112: 89 */ if ((aInput1 == null) || (aOutput1 == null)) { -/* 113: 89 */ return false; -/* 114: */ } -/* 115: 90 */ if ((aDuration = GregTech_API.sRecipeFile.get("canning", aInput1, aDuration)) <= 0) { -/* 116: 90 */ return false; -/* 117: */ } -/* 118: 91 */ new GT_Recipe(aInput1, aEUt, aInput2, aDuration, aOutput1, aOutput2); -/* 119: 92 */ return true; -/* 120: */ } -/* 121: */ -/* 122: */ public boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt) -/* 123: */ { -/* 124: 97 */ if ((aInput1 == null) || (aOutput1 == null)) { -/* 125: 97 */ return false; -/* 126: */ } -/* 127: 98 */ if ((aInput2 == null) && ((OrePrefixes.ingot.contains(aInput1)) || (OrePrefixes.dust.contains(aInput1)) || (OrePrefixes.gem.contains(aInput1)))) { -/* 128: 98 */ return false; -/* 129: */ } -/* 130: 99 */ if ((aDuration = GregTech_API.sRecipeFile.get("alloysmelting", aInput2 == null ? aInput1 : aOutput1, aDuration)) <= 0) { -/* 131: 99 */ return false; -/* 132: */ } -/* 133:100 */ new GT_Recipe(aInput1, aInput2, aEUt, aDuration, aOutput1); -/* 134:101 */ return true; -/* 135: */ } -/* 136: */ -/* 137: */ public boolean addCNCRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt) -/* 138: */ { -/* 139:106 */ if ((aInput1 == null) || (aOutput1 == null)) { -/* 140:106 */ return false; -/* 141: */ } -/* 142:107 */ if ((aDuration = GregTech_API.sRecipeFile.get("cnc", aOutput1, aDuration)) <= 0) { -/* 143:107 */ return false; -/* 144: */ } -/* 145:109 */ return true; -/* 146: */ } -/* 147: */ -/* 148: */ public boolean addLatheRecipe(ItemStack aInput1, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt) -/* 149: */ { -/* 150:114 */ if ((aInput1 == null) || (aOutput1 == null)) { -/* 151:114 */ return false; -/* 152: */ } -/* 153:115 */ if ((aDuration = GregTech_API.sRecipeFile.get("lathe", aInput1, aDuration)) <= 0) { -/* 154:115 */ return false; -/* 155: */ } -/* 156:116 */ new GT_Recipe(aInput1, aOutput1, aOutput2, aDuration, aEUt); -/* 157:117 */ return true; -/* 158: */ } -/* 159: */ -/* 160: */ public boolean addCutterRecipe(ItemStack aInput, FluidStack aLubricant, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt) -/* 161: */ { -/* 162:122 */ if ((aInput == null) || (aLubricant == null) || (aOutput1 == null)) { -/* 163:122 */ return false; -/* 164: */ } -/* 165:123 */ if ((aDuration = GregTech_API.sRecipeFile.get("cutting", aInput, aDuration)) <= 0) { -/* 166:123 */ return false; -/* 167: */ } -/* 168:124 */ GT_Recipe.GT_Recipe_Map.sCutterRecipes.addRecipe(true, new ItemStack[] { aInput }, new ItemStack[] { aOutput1, aOutput2 }, null, new FluidStack[] { aLubricant }, null, aDuration, aEUt, 0); -/* 169:125 */ return true; -/* 170: */ } -/* 171: */ -/* 172: */ public boolean addCutterRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt) -/* 173: */ { -/* 174:130 */ if ((aInput == null) || (aOutput1 == null)) { -/* 175:130 */ return false; -/* 176: */ } -/* 177:131 */ if ((aDuration = GregTech_API.sRecipeFile.get("cutting", aInput, aDuration)) <= 0) { -/* 178:131 */ return false; -/* 179: */ } -/* 180:132 */ GT_Recipe.GT_Recipe_Map.sCutterRecipes.addRecipe(true, new ItemStack[] { aInput }, new ItemStack[] { aOutput1, aOutput2 }, null, new FluidStack[] { Materials.Water.getFluid(Math.max(4, Math.min(1000, aDuration * aEUt / 320))) }, null, aDuration * 2, aEUt, 0); -/* 181:133 */ GT_Recipe.GT_Recipe_Map.sCutterRecipes.addRecipe(true, new ItemStack[] { aInput }, new ItemStack[] { aOutput1, aOutput2 }, null, new FluidStack[] { GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, aDuration * aEUt / 426))) }, null, aDuration * 2, aEUt, 0); -/* 182:134 */ GT_Recipe.GT_Recipe_Map.sCutterRecipes.addRecipe(true, new ItemStack[] { aInput }, new ItemStack[] { aOutput1, aOutput2 }, null, new FluidStack[] { Materials.Lubricant.getFluid(Math.max(1, Math.min(250, aDuration * aEUt / 1280))) }, null, aDuration, aEUt, 0); -/* 183:135 */ return true; -/* 184: */ } -/* 185: */ -/* 186: */ public boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt) + + public boolean addCentrifugeRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int aDuration) + { + return addCentrifugeRecipe(aInput1, aInput2 < 0 ? ItemList.IC2_Fuel_Can_Empty.get(-aInput2, new Object[0]) : aInput2 > 0 ? ItemList.Cell_Empty.get(aInput2, new Object[0]) : null, null, null, aOutput1, aOutput2, aOutput3, aOutput4, aOutput5, aOutput6, null, aDuration, 5); + } + + public boolean addCentrifugeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) + { + if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) { + return false; + } + if ((aInput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("centrifuge", aInput1, aDuration)) <= 0)) { + return false; + } + if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile.get("centrifuge", aFluidInput.getFluid().getName(), aDuration)) <= 0)) { + return false; + } + GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 }, new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4, aOutput5, aOutput6 }, null, aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); + return true; + } + + public boolean addElectrolyzerRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int aDuration, int aEUt) + { + return addElectrolyzerRecipe(aInput1, aInput2 < 0 ? ItemList.IC2_Fuel_Can_Empty.get(-aInput2, new Object[0]) : aInput2 > 0 ? ItemList.Cell_Empty.get(aInput2, new Object[0]) : null, null, null, aOutput1, aOutput2, aOutput3, aOutput4, aOutput5, aOutput6, null, aDuration, aEUt); + } + + public boolean addElectrolyzerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOut