From d251d8310549ba1bae89a4b4df2464256eb52461 Mon Sep 17 00:00:00 2001 From: Alexander Kornilov Date: Sun, 23 Apr 2017 04:31:40 +0300 Subject: [PATCH] Improve code readability for binnie.core package (#14) --- src/main/java/binnie/Binnie.java | 51 +- src/main/java/binnie/Constants.java | 8 +- .../binnie/botany/ceramic/BlockCeramic.java | 53 +- .../botany/ceramic/BlockCeramicBrick.java | 14 +- .../binnie/botany/ceramic/BlockStained.java | 53 +- .../botany/flower/TileEntityFlower.java | 6 +- .../java/binnie/botany/items/BotanyItems.java | 10 +- src/main/java/binnie/core/AbstractMod.java | 100 ++-- src/main/java/binnie/core/BinnieCore.java | 148 +++--- src/main/java/binnie/core/IInitializable.java | 7 +- src/main/java/binnie/core/ManagerBase.java | 10 +- src/main/java/binnie/core/Mods.java | 53 +- .../java/binnie/core/block/BlockMetadata.java | 107 ++-- .../binnie/core/block/IBlockMetadata.java | 26 +- .../binnie/core/block/IMultipassBlock.java | 9 +- .../java/binnie/core/block/ItemMetadata.java | 53 +- .../core/block/ItemMetadataRenderer.java | 32 +- .../core/block/MultipassBlockRenderer.java | 62 +-- .../core/block/MultipassItemRenderer.java | 70 +-- .../binnie/core/block/TileEntityMetadata.java | 93 ++-- .../binnie/core/circuits/BinnieCircuit.java | 45 +- .../core/circuits/BinnieCircuitLayout.java | 22 +- .../core/genetics/BeeBreedingSystem.java | 173 ++++--- .../core/genetics/BeeModifierLogic.java | 40 +- .../binnie/core/genetics/BreedingSystem.java | 476 +++++++++--------- .../core/genetics/EnumBeeBooleanModifier.java | 9 +- .../binnie/core/genetics/EnumBeeModifier.java | 11 +- .../core/genetics/FlowerBreedingSystem.java | 148 +++--- .../binnie/core/genetics/ForestryAllele.java | 86 ++-- src/main/java/binnie/core/genetics/Gene.java | 81 ++- .../binnie/core/genetics/IAlleleProvider.java | 7 +- .../core/genetics/IBreedingMessage.java | 47 +- .../genetics/IItemStackRepresentative.java | 7 + .../genetics/IItemStackRepresentitive.java | 12 - .../binnie/core/genetics/ManagerGenetics.java | 163 +++--- .../core/genetics/MothBreedingSystem.java | 154 +++--- .../java/binnie/core/genetics/Tolerance.java | 28 +- .../core/genetics/TreeBreedingSystem.java | 342 ++++++------- .../core/genetics/VirtualBeeHousing.java | 58 +-- .../binnie/core/genetics/VirtualHousing.java | 66 ++- .../core/genetics/VirtualMothHousing.java | 16 +- .../java/binnie/core/gui/BinnieCoreGUI.java | 53 +- .../binnie/core/gui/BinnieGUIHandler.java | 32 +- .../java/binnie/core/gui/IBinnieGUID.java | 13 +- src/main/java/binnie/core/item/IItemEnum.java | 11 +- src/main/java/binnie/core/item/IItemMisc.java | 18 +- .../java/binnie/core/item/ItemFieldKit.java | 71 ++- .../java/binnie/core/item/ItemGenesis.java | 33 +- src/main/java/binnie/core/item/ItemMisc.java | 67 ++- .../java/binnie/core/item/ManagerItem.java | 9 +- .../java/binnie/core/item/ModuleItems.java | 89 ++-- .../binnie/core/language/ManagerLanguage.java | 49 +- .../java/binnie/core/liquid/BinnieFluid.java | 25 +- .../binnie/core/liquid/FluidContainer.java | 95 ++-- .../java/binnie/core/liquid/IFluidType.java | 17 +- .../java/binnie/core/liquid/ILiquidType.java | 4 - .../core/liquid/ItemFluidContainer.java | 159 +++--- .../binnie/core/liquid/ManagerLiquid.java | 49 +- .../binnie/core/machines/BlockMachine.java | 139 +++-- .../binnie/core/machines/IBlockMachine.java | 11 +- .../java/binnie/core/machines/IMachine.java | 16 +- .../binnie/core/machines/IMachineType.java | 7 +- .../java/binnie/core/machines/IOwnable.java | 9 +- .../binnie/core/machines/ItemMachine.java | 23 +- .../java/binnie/core/machines/Machine.java | 220 ++++---- .../core/machines/MachineComponent.java | 36 +- .../binnie/core/machines/MachineGroup.java | 90 ++-- .../binnie/core/machines/MachinePackage.java | 46 +- .../core/machines/MachineRendererBlock.java | 21 +- .../binnie/core/machines/MachineUtil.java | 164 +++--- .../binnie/core/machines/ManagerMachine.java | 76 ++- .../java/binnie/core/machines/ModelBlock.java | 42 +- .../binnie/core/machines/RendererMachine.java | 48 +- .../core/machines/TileEntityMachine.java | 80 ++- .../core/machines/base/DefaultInventory.java | 33 +- .../core/machines/base/DefaultPower.java | 27 +- .../machines/base/DefaultTankContainer.java | 41 +- .../machines/base/TileEntityMachineBase.java | 180 ++++--- .../machines/component/ComponentRecipe.java | 9 +- .../core/machines/component/IBuildcraft.java | 20 +- .../machines/component/IComponentRecipe.java | 9 +- .../core/machines/component/IInteraction.java | 18 +- .../core/machines/component/IRender.java | 27 +- .../machines/inventory/AccessDirection.java | 59 +-- .../core/machines/inventory/BaseSlot.java | 105 ++-- .../inventory/ComponentChargedSlots.java | 94 ++-- .../inventory/ComponentInventory.java | 16 +- .../inventory/ComponentInventorySlots.java | 187 +++---- .../inventory/ComponentInventoryTransfer.java | 127 +++-- .../inventory/ComponentTankContainer.java | 158 +++--- .../machines/inventory/IChargedSlots.java | 13 +- .../machines/inventory/IInventoryMachine.java | 9 +- .../machines/inventory/IInventorySlots.java | 15 +- .../inventory/IValidatedInventory.java | 9 +- .../inventory/IValidatedTankContainer.java | 11 +- .../machines/inventory/InventorySlot.java | 79 ++- .../core/machines/inventory/MachineSide.java | 42 +- .../core/machines/inventory/SetList.java | 27 +- .../core/machines/inventory/SidedAccess.java | 81 ++- .../machines/inventory/SlotValidator.java | 34 +- .../core/machines/inventory/TankSlot.java | 50 +- .../machines/inventory/TankValidator.java | 22 +- .../machines/inventory/TransferHandler.java | 108 ++-- .../core/machines/inventory/Validator.java | 7 +- .../machines/inventory/ValidatorIcon.java | 24 +- .../core/machines/network/INetwork.java | 30 +- .../power/ComponentPowerReceptor.java | 132 +++-- .../core/machines/power/ComponentProcess.java | 46 +- .../power/ComponentProcessIndefinate.java | 86 ++-- .../power/ComponentProcessSetCost.java | 17 +- .../core/machines/power/ErrorState.java | 131 +++-- .../machines/power/IErrorStateSource.java | 7 +- .../core/machines/power/IPoweredMachine.java | 9 +- .../binnie/core/machines/power/IProcess.java | 7 +- .../core/machines/power/IProcessTimed.java | 7 +- .../core/machines/power/ITankMachine.java | 17 +- .../binnie/core/machines/power/PowerInfo.java | 33 +- .../core/machines/power/PowerInterface.java | 66 ++- .../core/machines/power/PowerSystem.java | 29 +- .../core/machines/power/ProcessInfo.java | 70 ++- .../binnie/core/machines/power/TankInfo.java | 49 +- .../core/machines/storage/Compartment.java | 39 +- .../core/machines/storage/CompartmentTab.java | 62 ++- .../storage/ComponentBinnieCoreGUI.java | 21 +- .../ComponentCompartmentInventory.java | 105 ++-- .../storage/ControlColourSelector.java | 39 +- .../storage/MachineRendererCompartment.java | 29 +- .../machines/storage/ModelCompartment.java | 293 ++++++----- .../core/machines/storage/ModuleStorage.java | 71 ++- .../machines/storage/StandardCompartment.java | 46 +- .../machines/storage/WindowCompartment.java | 377 +++++++------- .../core/machines/storage/WindowTest.java | 18 +- .../machines/transfer/TransferHandler.java | 8 +- .../machines/transfer/TransferRequest.java | 263 +++++----- .../core/mod/config/BinnieConfiguration.java | 14 +- .../core/mod/config/BinnieItemData.java | 10 +- .../binnie/core/mod/config/ConfigFile.java | 6 +- .../core/mod/config/ConfigProperty.java | 14 +- .../core/mod/config/ConfigurationMain.java | 4 - .../core/mod/config/ConfigurationMods.java | 37 +- .../binnie/core/mod/config/ManagerConfig.java | 53 +- .../binnie/core/mod/config/PropBoolean.java | 20 +- .../binnie/core/mod/config/PropDouble.java | 20 +- .../binnie/core/mod/config/PropInteger.java | 20 +- .../core/mod/config/PropPercentage.java | 22 +- .../binnie/core/mod/config/PropertyBase.java | 60 +-- .../binnie/core/mod/parser/FieldParser.java | 39 +- .../binnie/core/mod/parser/ItemParser.java | 16 +- .../multiblock/BlockMultiblockMachine.java | 20 +- .../TileEntityMultiblockMachine.java | 12 +- .../core/network/BinnieCorePacketID.java | 71 ++- .../core/network/BinniePacketHandler.java | 23 +- .../binnie/core/network/INetworkedEntity.java | 11 +- .../java/binnie/core/network/IOrdinaled.java | 7 +- .../java/binnie/core/network/IPacketID.java | 11 +- .../binnie/core/network/IPacketProvider.java | 7 +- .../binnie/core/network/packet/IPacket.java | 8 +- .../core/network/packet/IPacketLocation.java | 9 +- .../core/network/packet/IndexInPayload.java | 13 +- .../core/network/packet/MachinePayload.java | 57 +-- .../core/network/packet/MessageBase.java | 43 +- .../core/network/packet/MessageBinnie.java | 31 +- .../packet/MessageContainerUpdate.java | 12 +- .../network/packet/MessageCoordinates.java | 44 +- .../core/network/packet/MessageCraftGUI.java | 11 +- .../core/network/packet/MessageMetadata.java | 24 +- .../core/network/packet/MessageNBT.java | 32 +- .../core/network/packet/MessageTileNBT.java | 46 +- .../core/network/packet/MessageUpdate.java | 72 +-- .../core/network/packet/PacketPayload.java | 51 +- .../binnie/core/proxy/BinnieModProxy.java | 55 +- .../java/binnie/core/proxy/BinnieProxy.java | 95 ++-- .../binnie/core/proxy/BinnieProxyClient.java | 98 ++-- .../binnie/core/proxy/BinnieProxyServer.java | 7 +- .../binnie/core/proxy/IBinnieModProxy.java | 25 +- .../java/binnie/core/proxy/IBinnieProxy.java | 48 +- .../java/binnie/core/proxy/IProxyCore.java | 7 +- .../java/binnie/core/resource/BinnieIcon.java | 30 +- .../binnie/core/resource/BinnieResource.java | 20 +- .../binnie/core/resource/IBinnieTexture.java | 7 +- .../binnie/core/resource/ManagerResource.java | 26 +- .../binnie/core/resource/ResourceType.java | 11 +- .../core/texture/BinnieCoreTexture.java | 15 +- .../binnie/core/texture/TextureManager.java | 19 +- .../binnie/core/triggers/ActionProvider.java | 31 +- .../binnie/core/triggers/BinnieAction.java | 58 +-- .../binnie/core/triggers/BinnieTrigger.java | 61 +-- .../binnie/core/triggers/ModuleTrigger.java | 15 +- .../binnie/core/triggers/TriggerData.java | 20 +- .../core/triggers/TriggerInventory.java | 10 +- .../binnie/core/triggers/TriggerPower.java | 43 +- .../binnie/core/triggers/TriggerProvider.java | 52 +- .../binnie/core/triggers/TriggerWorking.java | 25 +- .../java/binnie/core/util/FluidStackSet.java | 95 ++-- .../java/binnie/core/util/IValidator.java | 9 +- .../java/binnie/core/util/ItemStackSet.java | 97 ++-- .../binnie/core/util/UniqueFluidStackSet.java | 22 +- .../binnie/core/util/UniqueItemStackSet.java | 22 +- .../craftgui/binniecore/WindowFieldKit.java | 4 +- .../craftgui/binniecore/WindowGenesis.java | 6 +- .../extratrees/dictionary/WindowPress.java | 4 +- .../genetics/machine/WindowGeneBank.java | 6 +- .../genetics/machine/WindowSequencer.java | 6 +- .../binnie/craftgui/minecraft/Window.java | 6 +- .../minecraft/control/ControlTabIcon.java | 6 +- .../apiary/machine/AlvearyMachine.java | 4 +- .../binnie/extrabees/core/ExtraBeeItems.java | 10 +- .../extrabees/products/EnumHoneyComb.java | 6 +- .../extrabees/products/EnumHoneyDrop.java | 6 +- .../extrabees/products/EnumPropolis.java | 6 +- .../binnie/extratrees/block/BlockBranch.java | 45 +- .../binnie/extratrees/block/BlockETDoor.java | 83 +-- .../binnie/extratrees/block/BlockETLog.java | 14 +- .../extratrees/block/BlockETPlanks.java | 14 +- .../binnie/extratrees/block/BlockETSlab.java | 14 +- .../extratrees/block/BlockETStairs.java | 14 +- .../binnie/extratrees/block/ItemETDoor.java | 4 +- .../extratrees/block/decor/BlockFence.java | 57 +-- .../extratrees/block/decor/BlockGate.java | 14 +- .../block/decor/BlockMultiFence.java | 4 +- .../carpentry/BlockCarpentryPanel.java | 8 +- .../extratrees/carpentry/BlockDesign.java | 12 +- .../extratrees/item/ExtraTreeItems.java | 10 +- .../extratrees/item/ExtraTreeLiquid.java | 4 +- .../java/binnie/extratrees/item/Food.java | 10 +- .../extratrees/kitchen/KitchenMachine.java | 4 +- .../binnie/extratrees/machines/Brewery.java | 63 ++- .../binnie/extratrees/machines/Designer.java | 4 +- .../extratrees/machines/Distillery.java | 55 +- .../extratrees/machines/ExtraTreeMachine.java | 4 +- .../binnie/extratrees/machines/Infuser.java | 8 +- .../binnie/extratrees/machines/Nursery.java | 2 +- .../binnie/genetics/gui/WindowAnalyst.java | 2 +- .../binnie/genetics/item/GeneticsItems.java | 10 +- .../binnie/genetics/machine/Analyser.java | 4 +- .../binnie/genetics/machine/Genepool.java | 4 +- .../genetics/machine/GeneticMachine.java | 4 +- .../binnie/genetics/machine/Inoculator.java | 4 +- .../binnie/genetics/machine/Isolator.java | 4 +- .../genetics/machine/LaboratoryMachine.java | 4 +- .../java/binnie/genetics/machine/Splicer.java | 4 +- 241 files changed, 5085 insertions(+), 5971 deletions(-) create mode 100644 src/main/java/binnie/core/genetics/IItemStackRepresentative.java delete mode 100644 src/main/java/binnie/core/genetics/IItemStackRepresentitive.java diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index a2555563..53808fd1 100644 --- a/src/main/java/binnie/Binnie.java +++ b/src/main/java/binnie/Binnie.java @@ -1,39 +1,24 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie; -import java.util.ArrayList; -import binnie.core.resource.ManagerResource; -import binnie.core.item.ManagerItem; -import binnie.core.machines.ManagerMachine; -import binnie.core.liquid.ManagerLiquid; -import binnie.core.mod.config.ManagerConfig; -import binnie.core.genetics.ManagerGenetics; -import binnie.core.language.ManagerLanguage; import binnie.core.ManagerBase; +import binnie.core.genetics.ManagerGenetics; +import binnie.core.item.ManagerItem; +import binnie.core.language.ManagerLanguage; +import binnie.core.liquid.ManagerLiquid; +import binnie.core.machines.ManagerMachine; +import binnie.core.mod.config.ManagerConfig; +import binnie.core.resource.ManagerResource; + +import java.util.ArrayList; import java.util.List; -public final class Binnie -{ - public static final List Managers; - public static final ManagerLanguage Language; - public static final ManagerGenetics Genetics; - public static final ManagerConfig Configuration; - public static final ManagerLiquid Liquid; - public static final ManagerMachine Machine; - public static final ManagerItem Item; - public static final ManagerResource Resource; - - static { - Managers = new ArrayList(); - Language = new ManagerLanguage(); - Genetics = new ManagerGenetics(); - Configuration = new ManagerConfig(); - Liquid = new ManagerLiquid(); - Machine = new ManagerMachine(); - Item = new ManagerItem(); - Resource = new ManagerResource(); - } +public final class Binnie { + public static List Managers = new ArrayList<>(); + public static ManagerLanguage Language = new ManagerLanguage(); + public static ManagerGenetics Genetics = new ManagerGenetics(); + public static ManagerConfig Configuration = new ManagerConfig(); + public static ManagerLiquid Liquid = new ManagerLiquid(); + public static ManagerMachine Machine = new ManagerMachine(); + public static ManagerItem Item = new ManagerItem(); + public static ManagerResource Resource = new ManagerResource(); } diff --git a/src/main/java/binnie/Constants.java b/src/main/java/binnie/Constants.java index e070d020..6ae5a162 100644 --- a/src/main/java/binnie/Constants.java +++ b/src/main/java/binnie/Constants.java @@ -1,11 +1,7 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie; -public final class Constants -{ +// TODO unusing class? +public final class Constants { public static final String LiquidJuice = "juice"; public static final String LiquidWater = "water"; public static final String LiquidSeedOil = "seedoil"; diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 0c985814..37659e10 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -4,29 +4,30 @@ package binnie.botany.ceramic; -import net.minecraft.util.MovingObjectPosition; import binnie.botany.Botany; -import net.minecraft.client.renderer.texture.IIconRegister; +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import java.util.List; -import binnie.botany.genetics.EnumFlowerColor; -import net.minecraftforge.common.util.ForgeDirection; -import binnie.core.block.TileEntityMetadata; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.entity.player.EntityPlayer; -import binnie.core.block.BlockMetadata; -import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import net.minecraft.world.World; -import binnie.botany.CreativeTabBotany; -import net.minecraft.block.material.Material; -import binnie.core.block.IBlockMetadata; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; +import java.util.List; public class BlockCeramic extends Block implements IBlockMetadata { @@ -66,8 +67,8 @@ public class BlockCeramic extends Block implements IBlockMetadata } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - return TileEntityMetadata.getItemDamage(stack); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override @@ -76,18 +77,18 @@ public class BlockCeramic extends Block implements IBlockMetadata } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return EnumFlowerColor.get(meta).getName() + " Ceramic Block"; } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index a51de22c..ccb9e59e 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -74,8 +74,8 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - return TileEntityMetadata.getItemDamage(stack); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override @@ -84,18 +84,18 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return getType(meta).getName(); } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override diff --git a/src/main/java/binnie/botany/ceramic/BlockStained.java b/src/main/java/binnie/botany/ceramic/BlockStained.java index e4052b04..3b8302ba 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStained.java +++ b/src/main/java/binnie/botany/ceramic/BlockStained.java @@ -4,32 +4,33 @@ package binnie.botany.ceramic; -import net.minecraft.util.MovingObjectPosition; import binnie.botany.Botany; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import java.util.List; +import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; -import net.minecraftforge.common.util.ForgeDirection; -import binnie.core.block.TileEntityMetadata; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.entity.player.EntityPlayer; import binnie.core.block.BlockMetadata; -import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import net.minecraft.world.World; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; -import net.minecraft.util.Facing; -import net.minecraft.world.IBlockAccess; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.Random; -import binnie.botany.CreativeTabBotany; -import net.minecraft.block.material.Material; -import binnie.core.block.IBlockMetadata; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Facing; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; public class BlockStained extends Block implements IBlockMetadata { @@ -96,8 +97,8 @@ public class BlockStained extends Block implements IBlockMetadata } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - return TileEntityMetadata.getItemDamage(stack); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override @@ -106,18 +107,18 @@ public class BlockStained extends Block implements IBlockMetadata } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return EnumFlowerColor.get(meta).getName() + " Pigmented Glass"; } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index 302cee3d..57be5069 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -24,13 +24,10 @@ import net.minecraft.world.World; import forestry.lepidopterology.entities.EntityButterfly; import binnie.botany.gardening.BlockPlant; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import binnie.botany.api.EnumFlowerStage; -import cpw.mods.fml.common.network.simpleimpl.IMessage; - import binnie.botany.network.MessageFlowerUpdate; import net.minecraft.network.Packet; @@ -57,7 +54,6 @@ import java.util.EnumSet; import binnie.botany.core.BotanyCore; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; import binnie.Binnie; import binnie.core.BinnieCore; @@ -307,7 +303,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt if (this.renderInfo == null && this.getFlower() != null && this.getFlower().getGenome() != null) { this.renderInfo = new RenderInfo(this.getFlower(), this); } - return (this.renderInfo != null) ? Botany.instance.getNetworkWrapper().getPacketFrom(new MessageFlowerUpdate(this.xCoord, this.yCoord, this.zCoord, this.renderInfo).GetMessage()) : null; + return (this.renderInfo != null) ? Botany.instance.getNetworkWrapper().getPacketFrom(new MessageFlowerUpdate(this.xCoord, this.yCoord, this.zCoord, this.renderInfo).getMessage()) : null; } public void updateRender(final boolean update) { diff --git a/src/main/java/binnie/botany/items/BotanyItems.java b/src/main/java/binnie/botany/items/BotanyItems.java index c4422a39..03d0dd65 100644 --- a/src/main/java/binnie/botany/items/BotanyItems.java +++ b/src/main/java/binnie/botany/items/BotanyItems.java @@ -33,7 +33,7 @@ public enum BotanyItems implements IItemMisc } @Override - public IIcon getIcon(final ItemStack stack) { + public IIcon getIcon(final ItemStack itemStack) { return this.icon; } @@ -43,17 +43,17 @@ public enum BotanyItems implements IItemMisc } @Override - public void addInformation(final List par3List) { + public void addInformation(final List data) { } @Override - public String getName(final ItemStack stack) { + public String getName(final ItemStack itemStack) { return this.name; } @Override - public ItemStack get(final int size) { - return new ItemStack(Botany.misc, size, this.ordinal()); + public ItemStack get(final int count) { + return new ItemStack(Botany.misc, count, this.ordinal()); } @Override diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 90305346..b04e6096 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -1,35 +1,32 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core; -import cpw.mods.fml.relauncher.Side; -import binnie.core.network.packet.MessageBinnie; -import cpw.mods.fml.common.network.NetworkRegistry; -import binnie.core.mod.parser.FieldParser; import binnie.Binnie; -import binnie.core.network.BinniePacketHandler; -import binnie.core.proxy.IProxyCore; import binnie.core.gui.IBinnieGUID; +import binnie.core.mod.parser.FieldParser; +import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; -import net.minecraftforge.common.MinecraftForge; -import java.util.ArrayList; -import java.util.List; -import java.lang.reflect.Field; -import java.util.LinkedHashSet; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import binnie.core.network.IPacketProvider; +import binnie.core.network.packet.MessageBinnie; +import binnie.core.proxy.IProxyCore; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.common.MinecraftForge; -public abstract class AbstractMod implements IPacketProvider, IInitializable -{ +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; + +public abstract class AbstractMod implements IPacketProvider, IInitializable { private SimpleNetworkWrapper wrapper; private LinkedHashSet fields; protected List modules; public AbstractMod() { - this.fields = new LinkedHashSet(); - this.modules = new ArrayList(); + this.fields = new LinkedHashSet<>(); + this.modules = new ArrayList<>(); BinnieCore.registerMod(this); MinecraftForge.EVENT_BUS.register(this); } @@ -57,39 +54,37 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable public abstract String getModID(); public SimpleNetworkWrapper getNetworkWrapper() { - return this.wrapper; + return wrapper; } protected abstract Class getPacketHandler(); @Override public void preInit() { - if (!this.isActive()) { + if (!isActive()) { return; } - if (this.getConfigs() != null) { - for (final Class cls : this.getConfigs()) { + + if (getConfigs() != null) { + for (Class cls : getConfigs()) { Binnie.Configuration.registerConfiguration(cls, this); } } - this.getProxy().preInit(); - for (final IInitializable module : this.modules) { + + getProxy().preInit(); + for (IInitializable module : modules) { module.preInit(); } - for (final Field field : this.getClass().getFields()) { - this.fields.add(field); + + // TODO what does it mean? + Collections.addAll(fields, getClass().getFields()); + for (Class cls : getClass().getClasses()) { + Collections.addAll(fields, getClass().getFields()); } - for (final Class cls : this.getClass().getClasses()) { - for (final Field field2 : this.getClass().getFields()) { - this.fields.add(field2); - } + for (IInitializable module : modules) { + Collections.addAll(fields, module.getClass().getFields()); } - for (final IInitializable module : this.modules) { - for (final Field field3 : module.getClass().getFields()) { - this.fields.add(field3); - } - } - for (final Field field4 : this.fields) { + for (Field field4 : this.fields) { try { FieldParser.preInitParse(field4, this); } catch (Exception e) { @@ -100,16 +95,19 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable @Override public void init() { - if (!this.isActive()) { + if (!isActive()) { return; } - this.getProxy().init(); - (this.wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(this.getChannel())).registerMessage((Class) this.getPacketHandler(), (Class) MessageBinnie.class, 1, Side.CLIENT); - this.wrapper.registerMessage((Class) this.getPacketHandler(), (Class) MessageBinnie.class, 1, Side.SERVER); - for (final IInitializable module : this.modules) { + getProxy().init(); + + wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(this.getChannel()); + wrapper.registerMessage(getPacketHandler(), MessageBinnie.class, 1, Side.CLIENT); + wrapper.registerMessage(getPacketHandler(), MessageBinnie.class, 1, Side.SERVER); + for (IInitializable module : this.modules) { module.init(); } - for (final Field field : this.fields) { + + for (Field field : this.fields) { try { FieldParser.initParse(field, this); } catch (Exception e) { @@ -120,14 +118,16 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable @Override public void postInit() { - if (!this.isActive()) { + if (!isActive()) { return; } - this.getProxy().postInit(); - for (final IInitializable module : this.modules) { + + getProxy().postInit(); + for (IInitializable module : this.modules) { module.postInit(); } - for (final Field field : this.fields) { + + for (Field field : this.fields) { try { FieldParser.postInitParse(field, this); } catch (Exception e) { @@ -136,8 +136,8 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable } } - protected final void addModule(final IInitializable init) { - this.modules.add(init); + protected void addModule(IInitializable init) { + modules.add(init); MinecraftForge.EVENT_BUS.register(init); } } diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index fc60598d..e57e72ef 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -1,95 +1,88 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core; -import binnie.core.network.BinniePacketHandler; -import binnie.core.mod.config.ConfigurationMain; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraftforge.client.event.TextureStitchEvent; -import binnie.core.network.BinnieCorePacketID; -import binnie.core.network.IPacketID; -import binnie.core.proxy.IBinnieProxy; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.MinecraftServer; -import forestry.api.core.ForestryEvent; -import java.util.ArrayList; -import forestry.plugins.PluginManager; -import binnie.core.block.TileEntityMetadata; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import binnie.core.block.MultipassBlockRenderer; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.network.IGuiHandler; -import binnie.core.gui.BinnieGUIHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import net.minecraft.item.Item; -import binnie.core.mod.parser.ItemParser; -import binnie.core.mod.parser.FieldParser; -import cpw.mods.fml.common.registry.GameRegistry; -import binnie.core.liquid.ItemFluidContainer; -import binnie.core.liquid.FluidContainer; -import binnie.core.gui.BinnieCoreGUI; -import binnie.core.gui.IBinnieGUID; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import binnie.core.triggers.ModuleTrigger; -import cpw.mods.fml.common.Loader; -import binnie.core.item.ModuleItems; -import binnie.core.machines.storage.ModuleStorage; -import binnie.craftgui.minecraft.ModuleCraftGUI; -import binnie.core.mod.config.ConfigurationMods; import binnie.Binnie; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import binnie.core.block.MultipassBlockRenderer; +import binnie.core.block.TileEntityMetadata; +import binnie.core.gui.BinnieCoreGUI; +import binnie.core.gui.BinnieGUIHandler; +import binnie.core.gui.IBinnieGUID; import binnie.core.item.ItemFieldKit; import binnie.core.item.ItemGenesis; +import binnie.core.item.ModuleItems; +import binnie.core.liquid.FluidContainer; +import binnie.core.liquid.ItemFluidContainer; import binnie.core.machines.MachineGroup; -import java.util.List; -import cpw.mods.fml.common.SidedProxy; +import binnie.core.machines.storage.ModuleStorage; +import binnie.core.mod.config.ConfigurationMain; +import binnie.core.mod.config.ConfigurationMods; +import binnie.core.mod.parser.FieldParser; +import binnie.core.mod.parser.ItemParser; +import binnie.core.network.BinnieCorePacketID; +import binnie.core.network.BinniePacketHandler; +import binnie.core.network.IPacketID; import binnie.core.proxy.BinnieProxy; +import binnie.core.proxy.IBinnieProxy; +import binnie.core.triggers.ModuleTrigger; +import binnie.craftgui.minecraft.ModuleCraftGUI; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.ForestryEvent; +import forestry.plugins.PluginManager; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.client.event.TextureStitchEvent; + +import java.util.ArrayList; +import java.util.List; @Mod(modid = "BinnieCore", name = "Binnie Core", useMetadata = true) -public final class BinnieCore extends AbstractMod -{ +public final class BinnieCore extends AbstractMod { @Mod.Instance("BinnieCore") public static BinnieCore instance; @SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer") public static BinnieProxy proxy; public static int multipassRenderID; - private static List modList; + private static List modList = new ArrayList<>(); public static MachineGroup packageCompartment; public static ItemGenesis genesis; public static ItemFieldKit fieldKit; @Mod.EventHandler - public void preInit(final FMLPreInitializationEvent evt) { + public void preInit(FMLPreInitializationEvent evt) { Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this); - for (final ManagerBase baseManager : Binnie.Managers) { - this.addModule(baseManager); + for (ManagerBase baseManager : Binnie.Managers) { + addModule(baseManager); } - this.addModule(new ModuleCraftGUI()); - this.addModule(new ModuleStorage()); - this.addModule(new ModuleItems()); + + addModule(new ModuleCraftGUI()); + addModule(new ModuleStorage()); + addModule(new ModuleItems()); if (Loader.isModLoaded("BuildCraft|Silicon")) { - this.addModule(new ModuleTrigger()); + addModule(new ModuleTrigger()); } - this.preInit(); + preInit(); } @Mod.EventHandler - public void init(final FMLInitializationEvent evt) { - this.init(); + public void init(FMLInitializationEvent evt) { + init(); } @Mod.EventHandler - public void postInit(final FMLPostInitializationEvent evt) { - this.postInit(); + public void postInit(FMLPostInitializationEvent evt) { + postInit(); } @Override @@ -100,8 +93,8 @@ public final class BinnieCore extends AbstractMod @Override public void preInit() { BinnieCore.instance = this; - for (final FluidContainer container : FluidContainer.values()) { - final Item item = new ItemFluidContainer(container); + for (FluidContainer container : FluidContainer.values()) { + Item item = new ItemFluidContainer(container); GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5)); } FieldParser.parsers.add(new ItemParser()); @@ -111,9 +104,10 @@ public final class BinnieCore extends AbstractMod @Override public void init() { super.init(); - for (final AbstractMod mod : getActiveMods()) { + for (AbstractMod mod : getActiveMods()) { NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod)); } + BinnieCore.multipassRenderID = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer()); GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata"); @@ -152,13 +146,13 @@ public final class BinnieCore extends AbstractMod super.postInit(); } - static void registerMod(final AbstractMod mod) { + static void registerMod(AbstractMod mod) { BinnieCore.modList.add(mod); } private static List getActiveMods() { - final List list = new ArrayList(); - for (final AbstractMod mod : BinnieCore.modList) { + List list = new ArrayList<>(); + for (AbstractMod mod : BinnieCore.modList) { if (mod.isActive()) { list.add(mod); } @@ -168,16 +162,17 @@ public final class BinnieCore extends AbstractMod @SubscribeEvent @SideOnly(Side.CLIENT) - public void handleSpeciesDiscovered(final ForestryEvent.SpeciesDiscovered event) { + public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) { try { - final EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(event.username.getName()); + EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(event.username.getName()); if (player == null) { return; } event.tracker.synchToPlayer(player); - final NBTTagCompound nbt = new NBTTagCompound(); + NBTTagCompound nbt = new NBTTagCompound(); nbt.setString("species", event.species.getUID()); } catch (Exception ex) { + // ignored } } @@ -203,7 +198,7 @@ public final class BinnieCore extends AbstractMod @SubscribeEvent @SideOnly(Side.CLIENT) - public void handleTextureRemap(final TextureStitchEvent.Pre event) { + public void handleTextureRemap(TextureStitchEvent.Pre event) { if (event.map.getTextureType() == 0) { Binnie.Liquid.reloadIcons(event.map); } @@ -212,7 +207,7 @@ public final class BinnieCore extends AbstractMod @Override public Class[] getConfigs() { - return new Class[] { ConfigurationMain.class }; + return new Class[]{ConfigurationMain.class}; } @Override @@ -225,12 +220,7 @@ public final class BinnieCore extends AbstractMod return true; } - static { - BinnieCore.modList = new ArrayList(); - } - - public static class PacketHandler extends BinniePacketHandler - { + public static class PacketHandler extends BinniePacketHandler { public PacketHandler() { super(BinnieCore.instance); } diff --git a/src/main/java/binnie/core/IInitializable.java b/src/main/java/binnie/core/IInitializable.java index 740d9591..725046cc 100644 --- a/src/main/java/binnie/core/IInitializable.java +++ b/src/main/java/binnie/core/IInitializable.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core; -public interface IInitializable -{ +public interface IInitializable { void preInit(); void init(); diff --git a/src/main/java/binnie/core/ManagerBase.java b/src/main/java/binnie/core/ManagerBase.java index d114da4f..7615f463 100644 --- a/src/main/java/binnie/core/ManagerBase.java +++ b/src/main/java/binnie/core/ManagerBase.java @@ -1,26 +1,24 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core; import binnie.Binnie; -public abstract class ManagerBase implements IInitializable -{ +public abstract class ManagerBase implements IInitializable { public ManagerBase() { Binnie.Managers.add(this); } @Override public void preInit() { + // ignored } @Override public void init() { + // ignored } @Override public void postInit() { + // ignored } } diff --git a/src/main/java/binnie/core/Mods.java b/src/main/java/binnie/core/Mods.java index 3221b9d6..7e3a35e2 100644 --- a/src/main/java/binnie/core/Mods.java +++ b/src/main/java/binnie/core/Mods.java @@ -1,44 +1,38 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core; -import cpw.mods.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.versioning.Restriction; -import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import cpw.mods.fml.common.Loader; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.versioning.DefaultArtifactVersion; +import cpw.mods.fml.common.versioning.Restriction; +import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; -public class Mods -{ +public class Mods { public static Mod Forestry; public static Mod IC2; public static Mod Botania; private static boolean WARN; - private static Item findItem(final String modId, final String name) { - final Item stack = GameRegistry.findItem(modId, name); - if (stack == null && Mods.WARN && modId == "Forestry") { + private static Item findItem(String modId, String name) { + Item stack = GameRegistry.findItem(modId, name); + if (stack == null && Mods.WARN && modId.equals("Forestry")) { throw new RuntimeException("Item not found: " + modId + ":" + name); } return stack; } - private static ItemStack findItemStack(final String modId, final String name, final int stackSize) { - final ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize); - if (stack == null && Mods.WARN && modId == "Forestry") { + private static ItemStack findItemStack(String modId, String name, int stackSize) { + ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize); + if (stack == null && Mods.WARN && modId.equals("Forestry")) { throw new RuntimeException("Stack not found: " + modId + ":" + name); } return stack; } - private static Block findBlock(final String modId, final String name) { - final Block stack = GameRegistry.findBlock(modId, name); - if (stack == null && Mods.WARN && modId == "Forestry") { + private static Block findBlock(String modId, String name) { + Block stack = GameRegistry.findBlock(modId, name); + if (stack == null && Mods.WARN && modId.equals("Forestry")) { throw new RuntimeException("Block not found: " + modId + ":" + name); } return stack; @@ -48,8 +42,8 @@ public class Mods Mods.Forestry = new Mod("Forestry") { @Override public boolean dev() { - final String forVersion = Loader.instance().getIndexedModList().get("Forestry").getVersion(); - final Restriction rest = new Restriction(new DefaultArtifactVersion("3.6"), true, (ArtifactVersion) null, false); + String forVersion = Loader.instance().getIndexedModList().get("Forestry").getVersion(); + Restriction rest = new Restriction(new DefaultArtifactVersion("3.6"), true, null, false); return rest.containsVersion(new DefaultArtifactVersion(forVersion)); } }; @@ -58,31 +52,30 @@ public class Mods Mods.WARN = true; } - public static class Mod - { + public static class Mod { private String id; - private Mod(final String id) { + private Mod(String id) { this.id = id; } - public Item item(final String name) { + public Item item(String name) { return findItem(this.id, name); } - public Block block(final String name) { + public Block block(String name) { return findBlock(this.id, name); } - public ItemStack stack(final String name, final int stackSize) { + public ItemStack stack(String name, int stackSize) { return findItemStack(this.id, name, stackSize); } - public ItemStack stack(final String name) { + public ItemStack stack(String name) { return this.stack(name, 1); } - public ItemStack stack(final String string, final int i, final int j) { + public ItemStack stack(String string, int i, int j) { return new ItemStack(this.item(string), i, j); } diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index e4a3bee8..677df236 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -1,106 +1,101 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.block; -import net.minecraft.util.MovingObjectPosition; import binnie.core.BinnieCore; import net.minecraft.block.Block; -import net.minecraftforge.common.util.ForgeDirection; -import java.util.List; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import java.util.ArrayList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockContainer; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockMetadata extends BlockContainer implements IBlockMetadata -{ - static int temporyMeta; +import java.util.ArrayList; +import java.util.List; - public BlockMetadata(final Material material) { +public class BlockMetadata extends BlockContainer implements IBlockMetadata { + public BlockMetadata(Material material) { super(material); } @Override - public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { return getBlockDropped(this, world, x, y, z, blockMeta); } @Override - public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { + // TODO fix deprecated usage + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { return breakBlock(this, player, world, x, y, z); } @Override - public TileEntity createNewTileEntity(final World var1, final int i) { + public TileEntity createNewTileEntity(World world, int i) { return new TileEntityMetadata(); } @Override - public boolean hasTileEntity(final int meta) { + public boolean hasTileEntity(int meta) { return true; } @Override - public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockEventReceived(World world, int x, int y, int z, int par5, int par6) { + super.onBlockEventReceived(world, x, y, z, par5, par6); + TileEntity tileentity = world.getTileEntity(x, y, z); return tileentity != null && tileentity.receiveClientEvent(par5, par6); } @Override - public IIcon getIcon(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4, final int par5) { - final int metadata = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3, par4); + public IIcon getIcon(IBlockAccess block, int x, int y, int z, int par5) { + int metadata = TileEntityMetadata.getTileMetadata(block, x, y, z); return this.getIcon(par5, metadata); } @Override - public String getBlockName(final ItemStack par1ItemStack) { - return this.getLocalizedName(); + public String getBlockName(ItemStack itemStack) { + return getLocalizedName(); } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(ItemStack itemStack, List tooltip) { + // ignored } @Override - public int getPlacedMeta(final ItemStack item, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - final int damage = TileEntityMetadata.getItemDamage(item); - return damage; + public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override - public int getDroppedMeta(final int tileMeta, final int blockMeta) { - return tileMeta; + public int getDroppedMeta(int blockMeta, int tileMeta) { + return blockMeta; } - public static ArrayList getBlockDropped(final IBlockMetadata block, final World world, final int x, final int y, final int z, final int blockMeta) { - final ArrayList array = new ArrayList(); - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); + public static ArrayList getBlockDropped(IBlockMetadata block, World world, int x, int y, int z, int blockMeta) { + ArrayList array = new ArrayList<>(); + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null && !tile.hasDroppedBlock()) { - final int meta = block.getDroppedMeta(world.getBlockMetadata(x, y, z), tile.getTileMetadata()); + int meta = block.getDroppedMeta(world.getBlockMetadata(x, y, z), tile.getTileMetadata()); array.add(TileEntityMetadata.getItemStack((Block) block, meta)); } return array; } - public static boolean breakBlock(final IBlockMetadata block, final EntityPlayer player, final World world, final int i, final int j, final int k) { - List drops = new ArrayList(); - final Block block2 = (Block) block; - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, i, j, k); + public static boolean breakBlock(IBlockMetadata block, EntityPlayer player, World world, int i, int j, int k) { + List drops = new ArrayList<>(); + Block block2 = (Block) block; + TileEntityMetadata tile = TileEntityMetadata.getTile(world, i, j, k); if (tile != null && !tile.hasDroppedBlock()) { - final int tileMeta = TileEntityMetadata.getTileMetadata(world, i, j, k); drops = block2.getDrops(world, i, j, k, world.getBlockMetadata(i, j, k), 0); } - final boolean hasBeenBroken = world.setBlockToAir(i, j, k); + + boolean hasBeenBroken = world.setBlockToAir(i, j, k); if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { - for (final ItemStack drop : drops) { + for (ItemStack drop : drops) { block.dropAsStack(world, i, j, k, drop); } tile.dropBlock(); @@ -109,27 +104,25 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override - public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { - super.breakBlock(par1World, par2, par3, par4, par5, par6); - par1World.removeTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + super.breakBlock(world, x, y, z, block, meta); + world.removeTileEntity(x, y, z); } - public static ItemStack getPickBlock(final World world, final int x, final int y, final int z) { - final List list = getBlockDropped((IBlockMetadata) world.getBlock(x, y, z), world, x, y, z, world.getBlockMetadata(x, y, z)); + public static ItemStack getPickBlock(World world, int x, int y, int z) { + IBlockMetadata block = (IBlockMetadata) world.getBlock(x, y, z); + List list = getBlockDropped(block, world, x, y, z, world.getBlockMetadata(x, y, z)); return list.isEmpty() ? null : list.get(0); } @Override - public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { + // TODO fix deprecated usage + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { return getPickBlock(world, x, y, z); } - - static { - BlockMetadata.temporyMeta = -1; - } } diff --git a/src/main/java/binnie/core/block/IBlockMetadata.java b/src/main/java/binnie/core/block/IBlockMetadata.java index 9cbec26c..b0940bbd 100644 --- a/src/main/java/binnie/core/block/IBlockMetadata.java +++ b/src/main/java/binnie/core/block/IBlockMetadata.java @@ -1,24 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.block; -import java.util.List; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.world.World; -import net.minecraft.item.ItemStack; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public interface IBlockMetadata extends ITileEntityProvider -{ - int getPlacedMeta(final ItemStack p0, final World p1, final int p2, final int p3, final int p4, final ForgeDirection p5); +import java.util.List; - int getDroppedMeta(final int p0, final int p1); +public interface IBlockMetadata extends ITileEntityProvider { + int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction); - String getBlockName(final ItemStack p0); + int getDroppedMeta(int blockMeta, int tileMeta); - void getBlockTooltip(final ItemStack p0, final List p1); + String getBlockName(ItemStack itemStack); - void dropAsStack(final World p0, final int p1, final int p2, final int p3, final ItemStack p4); + void getBlockTooltip(ItemStack itemStack, List tooltip); + + void dropAsStack(World world, int x, int y, int z, ItemStack itemStack); } diff --git a/src/main/java/binnie/core/block/IMultipassBlock.java b/src/main/java/binnie/core/block/IMultipassBlock.java index aeecf2b1..ee2a9b6f 100644 --- a/src/main/java/binnie/core/block/IMultipassBlock.java +++ b/src/main/java/binnie/core/block/IMultipassBlock.java @@ -1,12 +1,7 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.block; -public interface IMultipassBlock -{ +public interface IMultipassBlock { int getNumberOfPasses(); - int colorMultiplier(final int p0); + int colorMultiplier(int meta); } diff --git a/src/main/java/binnie/core/block/ItemMetadata.java b/src/main/java/binnie/core/block/ItemMetadata.java index 85fe3e43..467d6aa8 100644 --- a/src/main/java/binnie/core/block/ItemMetadata.java +++ b/src/main/java/binnie/core/block/ItemMetadata.java @@ -1,48 +1,41 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.block; -import net.minecraft.util.IIcon; -import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.world.World; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class ItemMetadata extends ItemBlock -{ - public ItemMetadata(final Block block) { +import java.util.List; + +public class ItemMetadata extends ItemBlock { + public ItemMetadata(Block block) { super(block); } @Override - public int getMetadata(final int par1) { + public int getMetadata(int damage) { return 0; } @Override - public boolean placeBlockAt(final ItemStack stack, final EntityPlayer player, final World world, final int x, final int y, final int z, final int side, final float hitX, final float hitY, final float hitZ, final int metadata) { - final Block block = this.field_150939_a; + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { + Block block = field_150939_a; if (!(block instanceof IBlockMetadata)) { return false; } - final int placedMeta = ((IBlockMetadata) block).getPlacedMeta(stack, world, x, y, z, ForgeDirection.values()[side]); - if (placedMeta < 0) { - return false; - } - if (!world.setBlock(x, y, z, block, metadata, 3)) { + + int placedMeta = ((IBlockMetadata) block).getPlacedMeta(stack, world, x, y, z, ForgeDirection.values()[side]); + if (placedMeta < 0 || !world.setBlock(x, y, z, block, metadata, 3)) { return false; } + if (world.getBlock(x, y, z) == block) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null) { tile.setTileMetadata(placedMeta, false); } @@ -54,18 +47,18 @@ public class ItemMetadata extends ItemBlock @Override @SideOnly(Side.CLIENT) - public String getItemStackDisplayName(final ItemStack par1ItemStack) { - return ((IBlockMetadata) this.field_150939_a).getBlockName(par1ItemStack); + public String getItemStackDisplayName(ItemStack par1ItemStack) { + return ((IBlockMetadata) field_150939_a).getBlockName(par1ItemStack); } @Override @SideOnly(Side.CLIENT) - public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) { - ((IBlockMetadata) this.field_150939_a).getBlockTooltip(par1ItemStack, par3List); + public void addInformation(ItemStack itemStack, EntityPlayer player, List par3List, boolean par4) { + ((IBlockMetadata) field_150939_a).getBlockTooltip(itemStack, par3List); } @Override - public IIcon getIconFromDamage(final int par1) { - return this.field_150939_a.getIcon(1, par1); + public IIcon getIconFromDamage(int damage) { + return field_150939_a.getIcon(1, damage); } } diff --git a/src/main/java/binnie/core/block/ItemMetadataRenderer.java b/src/main/java/binnie/core/block/ItemMetadataRenderer.java index 3d6bad5d..39e1ca64 100644 --- a/src/main/java/binnie/core/block/ItemMetadataRenderer.java +++ b/src/main/java/binnie/core/block/ItemMetadataRenderer.java @@ -1,38 +1,38 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.block.Block; -import org.lwjgl.opengl.GL11; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; -public class ItemMetadataRenderer implements IItemRenderer -{ +public class ItemMetadataRenderer implements IItemRenderer { @Override - public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { - return type == IItemRenderer.ItemRenderType.INVENTORY || type == IItemRenderer.ItemRenderType.ENTITY || type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON; + public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { + return type == IItemRenderer.ItemRenderType.INVENTORY + || type == IItemRenderer.ItemRenderType.ENTITY + || type == IItemRenderer.ItemRenderType.EQUIPPED + || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON; } @Override - public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { if (type == IItemRenderer.ItemRenderType.INVENTORY) { return helper == IItemRenderer.ItemRendererHelper.INVENTORY_BLOCK; } if (type == IItemRenderer.ItemRenderType.ENTITY) { - return helper == IItemRenderer.ItemRendererHelper.ENTITY_BOBBING || helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION; + return helper == IItemRenderer.ItemRendererHelper.ENTITY_BOBBING + || helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION; } - return (type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) && helper == IItemRenderer.ItemRendererHelper.EQUIPPED_BLOCK; + return (type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) + && helper == IItemRenderer.ItemRendererHelper.EQUIPPED_BLOCK; } @Override - public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { + public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) { GL11.glPushMatrix(); - final Block block = Block.getBlockFromItem(item.getItem()); + Block block = Block.getBlockFromItem(item.getItem()); if (type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) { GL11.glTranslated(0.5, 0.5, 0.5); } diff --git a/src/main/java/binnie/core/block/MultipassBlockRenderer.java b/src/main/java/binnie/core/block/MultipassBlockRenderer.java index 7864d341..2539e5d1 100644 --- a/src/main/java/binnie/core/block/MultipassBlockRenderer.java +++ b/src/main/java/binnie/core/block/MultipassBlockRenderer.java @@ -1,64 +1,53 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.block; import binnie.core.BinnieCore; -import net.minecraft.world.IBlockAccess; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.block.Block; -import org.lwjgl.opengl.GL11; -import net.minecraft.client.renderer.Tessellator; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.IBlockAccess; +import org.lwjgl.opengl.GL11; -public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler -{ +public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler { public static MultipassBlockRenderer instance; - private static int layer; + private static int layer = 0; public MultipassBlockRenderer() { MultipassBlockRenderer.instance = this; } - private void setColour(final Tessellator tess, final int colour) { - final float var6 = (colour >> 16 & 0xFF) / 255.0f; - final float var7 = (colour >> 8 & 0xFF) / 255.0f; - final float var8 = (colour & 0xFF) / 255.0f; - GL11.glColor3f(var6, var7, var8); - } - public static int getLayer() { return MultipassBlockRenderer.layer; } @Override - public void renderInventoryBlock(final Block block, final int meta, final int modelID, final RenderBlocks renderer) { + public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) { block.setBlockBoundsForItemRender(); renderer.setRenderBoundsFromBlock(block); GL11.glTranslatef(-0.5f, -0.5f, -0.5f); + MultipassBlockRenderer.layer = 0; while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) { - this.renderItem(block, renderer, meta); - ++MultipassBlockRenderer.layer; + renderItem(block, renderer, meta); + MultipassBlockRenderer.layer++; } MultipassBlockRenderer.layer = 0; } @Override - public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { boolean r = true; MultipassBlockRenderer.layer = 0; while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) { r = renderer.renderStandardBlock(block, x, y, z); - ++MultipassBlockRenderer.layer; + MultipassBlockRenderer.layer++; } MultipassBlockRenderer.layer = 0; return r; } @Override - public boolean shouldRender3DInInventory(final int i) { + public boolean shouldRender3DInInventory(int i) { return true; } @@ -67,43 +56,44 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler return BinnieCore.multipassRenderID; } - public void renderItem(final Block block, final RenderBlocks renderer, final int meta) { - this.setColor(((IMultipassBlock) block).colorMultiplier(meta)); - final Tessellator tessellator = Tessellator.instance; + public void renderItem(Block block, RenderBlocks renderer, int meta) { + setColor(((IMultipassBlock) block).colorMultiplier(meta)); + Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setNormal(0.0f, -1.0f, 0.0f); renderer.renderFaceYNeg(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 0, meta)); tessellator.draw(); + tessellator.startDrawingQuads(); tessellator.setNormal(0.0f, 1.0f, 0.0f); renderer.renderFaceYPos(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 1, meta)); tessellator.draw(); + tessellator.startDrawingQuads(); tessellator.setNormal(0.0f, 0.0f, -1.0f); renderer.renderFaceZNeg(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 2, meta)); tessellator.draw(); + tessellator.startDrawingQuads(); tessellator.setNormal(0.0f, 0.0f, 1.0f); renderer.renderFaceZPos(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 3, meta)); tessellator.draw(); + tessellator.startDrawingQuads(); tessellator.setNormal(-1.0f, 0.0f, 0.0f); renderer.renderFaceXNeg(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 4, meta)); tessellator.draw(); + tessellator.startDrawingQuads(); tessellator.setNormal(1.0f, 0.0f, 0.0f); renderer.renderFaceXPos(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 5, meta)); tessellator.draw(); } - public void setColor(final int l) { - final float f = (l >> 16 & 0xFF) / 255.0f; - final float f2 = (l >> 8 & 0xFF) / 255.0f; - final float f3 = (l & 0xFF) / 255.0f; + public void setColor(int l) { + float f = (l >> 16 & 0xFF) / 255.0f; + float f2 = (l >> 8 & 0xFF) / 255.0f; + float f3 = (l & 0xFF) / 255.0f; GL11.glColor3f(f, f2, f3); } - - static { - MultipassBlockRenderer.layer = 0; - } } diff --git a/src/main/java/binnie/core/block/MultipassItemRenderer.java b/src/main/java/binnie/core/block/MultipassItemRenderer.java index 1794ac22..eaaf3928 100644 --- a/src/main/java/binnie/core/block/MultipassItemRenderer.java +++ b/src/main/java/binnie/core/block/MultipassItemRenderer.java @@ -1,32 +1,27 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.block; import net.minecraft.block.Block; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.item.ItemBlock; -import org.lwjgl.opengl.GL11; -import net.minecraft.item.ItemStack; import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; -public class MultipassItemRenderer implements IItemRenderer -{ - private void render(final RenderBlocks renderer, final ItemStack item, final float f, final float g, final float h) { +public class MultipassItemRenderer implements IItemRenderer { + private void render(RenderBlocks renderer, ItemStack item, float f, float g, float h) { GL11.glTranslatef(f, g, h); - final Block block = ((ItemBlock) item.getItem()).field_150939_a; + Block block = ((ItemBlock) item.getItem()).field_150939_a; GL11.glEnable(3008); if (block.getRenderBlockPass() != 0) { GL11.glAlphaFunc(516, 0.1f); GL11.glEnable(3042); OpenGlHelper.glBlendFunc(770, 771, 1, 0); - } - else { + } else { GL11.glAlphaFunc(516, 0.5f); GL11.glDisable(3042); } + MultipassBlockRenderer.instance.renderInventoryBlock(block, TileEntityMetadata.getItemDamage(item), 0, renderer); if (block.getRenderBlockPass() == 0) { GL11.glAlphaFunc(516, 0.1f); @@ -35,47 +30,34 @@ public class MultipassItemRenderer implements IItemRenderer } @Override - public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { + public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { switch (type) { - case ENTITY: { - return true; - } - case EQUIPPED: { - return true; - } - case INVENTORY: { - return true; - } - case EQUIPPED_FIRST_PERSON: { - return true; - } - default: { - return false; - } + case ENTITY: + case EQUIPPED: + case INVENTORY: + case EQUIPPED_FIRST_PERSON: + return true; } + return false; } @Override - public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { return true; } @Override - public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { + public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) { switch (type) { - case ENTITY: { - this.render((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); - break; - } - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: { - this.render((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f); - break; - } - case INVENTORY: { - this.render((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); - break; - } + case INVENTORY: + case ENTITY: + render((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); + break; + + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + render((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f); + break; } } } diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/src/main/java/binnie/core/block/TileEntityMetadata.java index 63b32253..af09b3f6 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -1,47 +1,42 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.block; -import net.minecraft.item.ItemStack; -import net.minecraft.block.Block; -import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import binnie.core.network.packet.MessageMetadata; import binnie.core.BinnieCore; -import net.minecraft.network.Packet; +import binnie.core.network.packet.MessageMetadata; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; -public class TileEntityMetadata extends TileEntity -{ +public class TileEntityMetadata extends TileEntity { private int meta; private boolean droppedBlock; public TileEntityMetadata() { - this.droppedBlock = false; + droppedBlock = false; } @Override - public boolean receiveClientEvent(final int par1, final int par2) { - if (par1 == 42) { - this.meta = par2; - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + public boolean receiveClientEvent(int id, int meta) { + // TODO fix magic const + if (id == 42) { + this.meta = meta; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } return true; } @Override - public void readFromNBT(final NBTTagCompound nbt) { + public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - this.meta = nbt.getInteger("meta"); + meta = nbt.getInteger("meta"); } @Override - public void writeToNBT(final NBTTagCompound nbt) { + public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("meta", this.meta); + nbt.setInteger("meta", meta); } @Override @@ -50,61 +45,61 @@ public class TileEntityMetadata extends TileEntity } public int getTileMetadata() { - return this.meta; + return meta; } - public void setTileMetadata(final int meta, final boolean notify) { - if (this.meta != meta) { - this.meta = meta; - if (notify) { - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - } + public void setTileMetadata(int meta, boolean notify) { + if (this.meta == meta) { + return; + } + + this.meta = meta; + if (notify) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } @Override public Packet getDescriptionPacket() { - return BinnieCore.instance.getNetworkWrapper().getPacketFrom(new MessageMetadata(this.xCoord, this.yCoord, this.zCoord, this.meta).GetMessage()); + MessageMetadata message = new MessageMetadata(xCoord, yCoord, zCoord, meta); + return BinnieCore.instance.getNetworkWrapper().getPacketFrom(message.getMessage()); } - public static TileEntityMetadata getTile(final IBlockAccess world, final int x, final int y, final int z) { - final TileEntity tile = world.getTileEntity(x, y, z); - if (!(tile instanceof TileEntityMetadata)) { - return null; + public static TileEntityMetadata getTile(IBlockAccess world, int x, int y, int z) { + TileEntity tile = world.getTileEntity(x, y, z); + if (tile instanceof TileEntityMetadata) { + return (TileEntityMetadata) tile; } - return (TileEntityMetadata) tile; + return null; } - public static ItemStack getItemStack(final Block block, final int damage) { - final ItemStack item = new ItemStack(block, 1, 0); - setItemDamage(item, damage); + public static ItemStack getItemStack(Block block, int damage) { + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("meta", damage); + + ItemStack item = new ItemStack(block, 1, 0); + item.setItemDamage((damage < 16387) ? damage : 16387); + item.setTagCompound(tag); return item; } - public static void setItemDamage(final ItemStack item, final int i) { - item.setItemDamage((i < 16387) ? i : 16387); - final NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("meta", i); - item.setTagCompound(tag); - } - - public static int getItemDamage(final ItemStack item) { + public static int getItemDamage(ItemStack item) { if (item.hasTagCompound() && item.getTagCompound().hasKey("meta")) { return item.getTagCompound().getInteger("meta"); } return item.getItemDamage(); } - public static int getTileMetadata(final IBlockAccess world, final int x, final int y, final int z) { - final TileEntityMetadata tile = getTile(world, x, y, z); + public static int getTileMetadata(IBlockAccess world, int x, int y, int z) { + TileEntityMetadata tile = getTile(world, x, y, z); return (tile == null) ? 0 : tile.getTileMetadata(); } public boolean hasDroppedBlock() { - return this.droppedBlock; + return droppedBlock; } public void dropBlock() { - this.droppedBlock = true; + droppedBlock = true; } } diff --git a/src/main/java/binnie/core/circuits/BinnieCircuit.java b/src/main/java/binnie/core/circuits/BinnieCircuit.java index 38504958..015ea6ec 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuit.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuit.java @@ -1,50 +1,41 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.circuits; -import net.minecraft.item.Item; - import forestry.api.circuits.ChipsetManager; - -import java.util.ArrayList; - +import forestry.api.circuits.ICircuit; +import forestry.api.circuits.ICircuitLayout; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import forestry.api.circuits.ICircuitLayout; - +import java.util.ArrayList; import java.util.List; -import forestry.api.circuits.ICircuit; - -public class BinnieCircuit implements ICircuit -{ +public class BinnieCircuit implements ICircuit { private String uid; private int limit; private List tooltips; - public BinnieCircuit(final String uid, final int limit, final ICircuitLayout layout, final ItemStack itemStack) { - this.tooltips = new ArrayList(); + public BinnieCircuit(String uid, int limit, ICircuitLayout layout, ItemStack itemStack) { + tooltips = new ArrayList<>(); this.uid = "binnie.circuit." + uid; this.limit = limit; + ChipsetManager.circuitRegistry.registerCircuit(this); if (itemStack != null) { ChipsetManager.solderManager.addRecipe(layout, itemStack, this); } } - public BinnieCircuit(final String uid, final int limit, final ICircuitLayout layout, final Item item, final int itemMeta) { + public BinnieCircuit(String uid, int limit, ICircuitLayout layout, Item item, int itemMeta) { this(uid, limit, layout, new ItemStack(item, 1, itemMeta)); } - public void addTooltipString(final String string) { - this.tooltips.add(string); + public void addTooltipString(String string) { + tooltips.add(string); } @Override public String getUID() { - return this.uid; + return uid; } @Override @@ -54,17 +45,17 @@ public class BinnieCircuit implements ICircuit @Override public int getLimit() { - return this.limit; + return limit; } @Override public String getName() { - return this.uid; + return uid; } @Override - public void addTooltip(final List list) { - for (final String string : this.tooltips) { + public void addTooltip(List list) { + for (String string : tooltips) { list.add(" - " + string); } } @@ -76,17 +67,21 @@ public class BinnieCircuit implements ICircuit @Override public void onInsertion(int arg0, Object arg1) { + // ignored } @Override public void onLoad(int arg0, Object arg1) { + // ignored } @Override public void onRemoval(int arg0, Object arg1) { + // ignored } @Override public void onTick(int arg0, Object arg1) { + // ignored } } diff --git a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java index 6a8e46ef..eedffb78 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java @@ -1,22 +1,17 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.circuits; import binnie.Binnie; +import binnie.core.AbstractMod; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; -import forestry.api.circuits.ICircuitSocketType; -import binnie.core.AbstractMod; import forestry.api.circuits.ICircuitLayout; +import forestry.api.circuits.ICircuitSocketType; -public class BinnieCircuitLayout implements ICircuitLayout -{ +public class BinnieCircuitLayout implements ICircuitLayout { private String uid; private AbstractMod mod; - public BinnieCircuitLayout(final AbstractMod mod, final String uid) { + public BinnieCircuitLayout(AbstractMod mod, String uid) { this.uid = uid; this.mod = mod; ChipsetManager.circuitRegistry.registerLayout(this); @@ -24,21 +19,22 @@ public class BinnieCircuitLayout implements ICircuitLayout @Override public String getUID() { - return "binnie.circuitLayout" + this.uid; + return "binnie.circuitLayout" + uid; } @Override public String getName() { - return Binnie.Language.localise(this.mod, "circuit.layout." + this.uid.toLowerCase()); + return Binnie.Language.localise(mod, "circuit.layout." + uid.toLowerCase()); } @Override public String getUsage() { - return Binnie.Language.localise(this.mod, "circuit.layout." + this.uid.toLowerCase() + ".usage"); + return Binnie.Language.localise(mod, "circuit.layout." + uid.toLowerCase() + ".usage"); } @Override public ICircuitSocketType getSocketType() { - return CircuitSocketType.NONE;// TODO hmm? CircuitSocketType + // TODO hmm? CircuitSocketType + return CircuitSocketType.NONE; } } diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index d2974cd6..22865ea7 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -1,49 +1,40 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.extrabees.ExtraBees; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IApiaristTracker; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeMutation; +import forestry.api.apiculture.IBeeRoot; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import java.util.TreeSet; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeRoot; - -import net.minecraft.item.ItemStack; - -import binnie.core.BinnieCore; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.genetics.IChromosomeType; -import forestry.api.apiculture.IApiaristTracker; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.apiculture.IBeeMutation; -import forestry.api.genetics.IAllele; - -import net.minecraft.entity.player.EntityPlayer; - -import forestry.api.genetics.IMutation; -import binnie.extrabees.ExtraBees; -import binnie.Binnie; - -class BeeBreedingSystem extends BreedingSystem -{ +class BeeBreedingSystem extends BreedingSystem { public BeeBreedingSystem() { - this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); - this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); + iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); + iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); } @Override - public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) { - return ((IBeeMutation) mutation). - getChance(new VirtualBeeHousing(player), - (IAlleleBeeSpecies) species1, - (IAlleleBeeSpecies) species2, - (IBeeGenome) this.getSpeciesRoot(). - templateAsGenome(this.getSpeciesRoot().getTemplate(species1.getUID())), - (IBeeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species2.getUID()))); + public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) { + return ((IBeeMutation) mutation).getChance( + new VirtualBeeHousing(player), + (IAlleleBeeSpecies) species1, + (IAlleleBeeSpecies) species2, + (IBeeGenome) getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(species1.getUID())), + (IBeeGenome) getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(species2.getUID())) + ); } @Override @@ -53,7 +44,7 @@ class BeeBreedingSystem extends BreedingSystem @Override public int getColour() { - return 16767232; + return 0xffd900; } @Override @@ -62,7 +53,7 @@ class BeeBreedingSystem extends BreedingSystem } @Override - public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { + public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (chromosome == EnumBeeChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low"); @@ -81,63 +72,67 @@ class BeeBreedingSystem extends BreedingSystem } @Override - public boolean isDNAManipulable(final ItemStack member) { - return ((IBeeRoot) this.getSpeciesRoot()).getType(member) == EnumBeeType.LARVAE; + public boolean isDNAManipulable(ItemStack member) { + return ((IBeeRoot) getSpeciesRoot()).getType(member) == EnumBeeType.LARVAE; } @Override public int[] getActiveTypes() { - return new int[] { EnumBeeType.DRONE.ordinal(), EnumBeeType.PRINCESS.ordinal(), EnumBeeType.QUEEN.ordinal(), EnumBeeType.LARVAE.ordinal() }; + return new int[] { + EnumBeeType.DRONE.ordinal(), + EnumBeeType.PRINCESS.ordinal(), + EnumBeeType.QUEEN.ordinal(), + EnumBeeType.LARVAE.ordinal() + }; } @Override - public void addExtraAlleles(final IChromosomeType chromosome, final TreeSet alleles) { + public void addExtraAlleles(IChromosomeType chromosome, TreeSet alleles) { switch ((EnumBeeChromosome) chromosome) { - case FERTILITY: { - for (final ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) { - alleles.add(a.getAllele()); - } - break; - } - case FLOWERING: { - for (final ForestryAllele.Flowering a2 : ForestryAllele.Flowering.values()) { - alleles.add(a2.getAllele()); - } - break; - } - case HUMIDITY_TOLERANCE: - case TEMPERATURE_TOLERANCE: { - for (final Tolerance a3 : Tolerance.values()) { - alleles.add(a3.getAllele()); - } - break; - } - case LIFESPAN: { - for (final ForestryAllele.Lifespan a4 : ForestryAllele.Lifespan.values()) { - alleles.add(a4.getAllele()); - } - break; - } - case SPEED: { - for (final ForestryAllele.Speed a5 : ForestryAllele.Speed.values()) { - alleles.add(a5.getAllele()); - } - break; - } - case TERRITORY: { - for (final ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) { - alleles.add(a6.getAllele()); - } - break; - } - case NOCTURNAL: - case CAVE_DWELLING: - case TOLERANT_FLYER: { - for (final ForestryAllele.Bool a7 : ForestryAllele.Bool.values()) { - alleles.add(a7.getAllele()); - } - break; - } + case FERTILITY: + for (ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) { + alleles.add(a.getAllele()); + } + break; + + case FLOWERING: + for (ForestryAllele.Flowering a2 : ForestryAllele.Flowering.values()) { + alleles.add(a2.getAllele()); + } + break; + + case HUMIDITY_TOLERANCE: + case TEMPERATURE_TOLERANCE: + for (Tolerance a3 : Tolerance.values()) { + alleles.add(a3.getAllele()); + } + break; + + case LIFESPAN: + for (ForestryAllele.Lifespan a4 : ForestryAllele.Lifespan.values()) { + alleles.add(a4.getAllele()); + } + break; + + case SPEED: + for (ForestryAllele.Speed a5 : ForestryAllele.Speed.values()) { + alleles.add(a5.getAllele()); + } + break; + + case TERRITORY: + for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) { + alleles.add(a6.getAllele()); + } + break; + + case NOCTURNAL: + case CAVE_DWELLING: + case TOLERANT_FLYER: + for (ForestryAllele.Bool a7 : ForestryAllele.Bool.values()) { + alleles.add(a7.getAllele()); + } + break; } } } diff --git a/src/main/java/binnie/core/genetics/BeeModifierLogic.java b/src/main/java/binnie/core/genetics/BeeModifierLogic.java index 6d314bc9..4eff6171 100644 --- a/src/main/java/binnie/core/genetics/BeeModifierLogic.java +++ b/src/main/java/binnie/core/genetics/BeeModifierLogic.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; import java.util.ArrayList; @@ -9,45 +5,45 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class BeeModifierLogic -{ +public class BeeModifierLogic { private Map modifiers; private List booleanModifiers; public BeeModifierLogic() { - this.modifiers = new HashMap(); - this.booleanModifiers = new ArrayList(); + this.modifiers = new HashMap<>(); + this.booleanModifiers = new ArrayList<>(); } - public float getModifier(final EnumBeeModifier modifier, final float currentModifier) { + public float getModifier(EnumBeeModifier modifier, float currentModifier) { if (!this.modifiers.containsKey(modifier)) { return 1.0f; } - final float mult = this.modifiers.get(modifier)[0]; - final float max = this.modifiers.get(modifier)[1]; + + Float[] values = modifiers.get(modifier); + float mult = values[0]; + float max = values[1]; if (max >= 1.0f) { if (max <= currentModifier) { return 1.0f; } return Math.min(max / currentModifier, mult); } - else { - if (max >= currentModifier) { - return 1.0f; - } - return Math.max(max / currentModifier, mult); + + if (max >= currentModifier) { + return 1.0f; } + return Math.max(max / currentModifier, mult); } - public boolean getModifier(final EnumBeeBooleanModifier modifier) { - return this.booleanModifiers.contains(modifier); + public boolean getModifier(EnumBeeBooleanModifier modifier) { + return booleanModifiers.contains(modifier); } - public void setModifier(final EnumBeeBooleanModifier modifier) { - this.booleanModifiers.add(modifier); + public void setModifier(EnumBeeBooleanModifier modifier) { + booleanModifiers.add(modifier); } - public void setModifier(final EnumBeeModifier modifier, final float mult, final float max) { - this.modifiers.put(modifier, new Float[] { mult, max }); + public void setModifier(EnumBeeModifier modifier, float mult, float max) { + modifiers.put(modifier, new Float[] { mult, max }); } } diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index c6d15e31..e2aa1828 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -1,53 +1,49 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; -import forestry.api.genetics.IGenome; -import java.util.TreeSet; -import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; -import forestry.api.genetics.IAlleleBoolean; +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.core.resource.BinnieIcon; +import binnie.extrabees.genetics.ExtraBeeMutation; +import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import forestry.api.core.ForestryEvent; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.IIcon; -import forestry.api.genetics.IBreedingTracker; -import com.mojang.authlib.GameProfile; -import net.minecraft.world.World; -import java.util.Set; -import binnie.extrabees.genetics.ExtraBeeMutation; -import java.util.LinkedHashSet; -import forestry.api.genetics.IAllele; import forestry.api.genetics.AlleleManager; -import java.util.Collection; -import forestry.api.genetics.ISpeciesRoot; -import binnie.core.BinnieCore; -import forestry.api.genetics.IChromosomeType; -import net.minecraftforge.common.MinecraftForge; -import binnie.Binnie; -import java.util.HashMap; -import java.util.ArrayList; -import java.util.Map; -import forestry.api.genetics.IMutation; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleBoolean; import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IClassification; -import java.util.List; -import binnie.core.resource.BinnieIcon; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; -public abstract class BreedingSystem implements IItemStackRepresentitive -{ +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +public abstract class BreedingSystem implements IItemStackRepresentative { protected BinnieIcon iconUndiscovered; protected BinnieIcon iconDiscovered; - private List allBranches; - List allActiveSpecies; - private List allSpecies; - private List allMutations; - private Map> resultantMutations; - private Map> furtherMutations; - private Map> allResultantMutations; - private Map> allFurtherMutations; + private List allBranches = new ArrayList<>(); + List allActiveSpecies = new ArrayList<>(); + private List allSpecies = new ArrayList<>(); + private List allMutations = new ArrayList<>(); + private Map> resultantMutations = new HashMap<>(); + private Map> furtherMutations = new HashMap<>(); + private Map> allResultantMutations = new HashMap<>(); + private Map> allFurtherMutations = new HashMap<>(); public float discoveredSpeciesPercentage; public int totalSpeciesCount; public int discoveredSpeciesCount; @@ -61,200 +57,190 @@ public abstract class BreedingSystem implements IItemStackRepresentitive String currentEpithet; public BreedingSystem() { - this.allBranches = new ArrayList(); - this.allActiveSpecies = new ArrayList(); - this.allSpecies = new ArrayList(); - this.allMutations = new ArrayList(); - this.resultantMutations = new HashMap>(); - this.furtherMutations = new HashMap>(); - this.allResultantMutations = new HashMap>(); - this.allFurtherMutations = new HashMap>(); Binnie.Genetics.registerBreedingSystem(this); MinecraftForge.EVENT_BUS.register(this); } - public String getChromosomeName(final IChromosomeType chromo) { - return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName()); + public String getChromosomeName(IChromosomeType chromo) { + return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".chromosome." + chromo.getName()); } - public String getChromosomeShortName(final IChromosomeType chromo) { - return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short"); + public String getChromosomeShortName(IChromosomeType chromo) { + return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short"); } - public final String getEpitome(final float discoveredPercentage) { + public String getEpitome(float discoveredPercentage) { + // TODO refactor int i = 0; if (discoveredPercentage == 1.0f) { i = 6; - } - else if (discoveredPercentage < 0.1f) { + } else if (discoveredPercentage < 0.1f) { i = 0; - } - else if (discoveredPercentage < 0.3f) { + } else if (discoveredPercentage < 0.3f) { i = 1; - } - else if (discoveredPercentage < 0.5f) { + } else if (discoveredPercentage < 0.5f) { i = 2; - } - else if (discoveredPercentage < 0.7f) { + } else if (discoveredPercentage < 0.7f) { i = 3; - } - else if (discoveredPercentage < 0.9f) { + } else if (discoveredPercentage < 0.9f) { i = 4; - } - else if (discoveredPercentage < 1.0f) { + } else if (discoveredPercentage < 1.0f) { i = 5; } - return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".epitome." + i); + return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".epitome." + i); } public abstract ISpeciesRoot getSpeciesRoot(); - public final List getAllBranches() { - return this.allBranches; + public List getAllBranches() { + return allBranches; } - public final Collection getAllSpecies() { - return this.allActiveSpecies; + public Collection getAllSpecies() { + return allActiveSpecies; } - public final Collection getAllMutations() { - return this.allMutations; + public Collection getAllMutations() { + return allMutations; } public void calculateArrays() { - final Collection allAlleles = AlleleManager.alleleRegistry.getRegisteredAlleles().values(); - this.resultantMutations = new HashMap>(); - this.furtherMutations = new HashMap>(); - this.allResultantMutations = new HashMap>(); - this.allFurtherMutations = new HashMap>(); - this.allActiveSpecies = new ArrayList(); - this.allSpecies = new ArrayList(); - for (final IAllele species : allAlleles) { - if (this.getSpeciesRoot().getTemplate(species.getUID()) != null) { - this.resultantMutations.put((IAlleleSpecies) species, new ArrayList()); - this.furtherMutations.put((IAlleleSpecies) species, new ArrayList()); - this.allResultantMutations.put((IAlleleSpecies) species, new ArrayList()); - this.allFurtherMutations.put((IAlleleSpecies) species, new ArrayList()); - this.allSpecies.add((IAlleleSpecies) species); - if (this.isBlacklisted(species) || species.getUID().contains("speciesBotAlfheim")) { + Collection allAlleles = AlleleManager.alleleRegistry.getRegisteredAlleles().values(); + resultantMutations = new HashMap<>(); + furtherMutations = new HashMap<>(); + allResultantMutations = new HashMap<>(); + allFurtherMutations = new HashMap<>(); + allActiveSpecies = new ArrayList<>(); + allSpecies = new ArrayList<>(); + for (IAllele species : allAlleles) { + if (getSpeciesRoot().getTemplate(species.getUID()) != null) { + resultantMutations.put((IAlleleSpecies) species, new ArrayList<>()); + furtherMutations.put((IAlleleSpecies) species, new ArrayList<>()); + allResultantMutations.put((IAlleleSpecies) species, new ArrayList<>()); + allFurtherMutations.put((IAlleleSpecies) species, new ArrayList<>()); + allSpecies.add((IAlleleSpecies) species); + + if (isBlacklisted(species) || species.getUID().contains("speciesBotAlfheim")) { continue; } - this.allActiveSpecies.add((IAlleleSpecies) species); + allActiveSpecies.add((IAlleleSpecies) species); } } - this.allMutations = new ArrayList(); - final Collection allRegBranches = AlleleManager.alleleRegistry.getRegisteredClassifications().values(); - this.allBranches = new ArrayList(); - for (final IClassification branch : allRegBranches) { - if (branch.getMemberSpecies().length > 0 && this.getSpeciesRoot().getTemplate(branch.getMemberSpecies()[0].getUID()) != null) { + + allMutations = new ArrayList<>(); + Collection allRegBranches = AlleleManager.alleleRegistry.getRegisteredClassifications().values(); + allBranches = new ArrayList<>(); + for (IClassification branch : allRegBranches) { + if (branch.getMemberSpecies().length > 0 && getSpeciesRoot().getTemplate(branch.getMemberSpecies()[0].getUID()) != null) { boolean possible = false; - for (final IAlleleSpecies species2 : branch.getMemberSpecies()) { - if (this.allActiveSpecies.contains(species2)) { + for (IAlleleSpecies species2 : branch.getMemberSpecies()) { + if (allActiveSpecies.contains(species2)) { possible = true; } } if (!possible) { continue; } - this.allBranches.add(branch); + allBranches.add(branch); } } - if (this.getSpeciesRoot().getMutations(false) != null) { - final Set mutations = new LinkedHashSet(); - mutations.addAll(this.getSpeciesRoot().getMutations(false)); + if (getSpeciesRoot().getMutations(false) != null) { + Set mutations = new LinkedHashSet<>(); + mutations.addAll(getSpeciesRoot().getMutations(false)); if (this == Binnie.Genetics.beeBreedingSystem) { mutations.addAll(ExtraBeeMutation.mutations); } - for (final IMutation mutation : mutations) { - this.allMutations.add(mutation); - final Set participatingSpecies = new LinkedHashSet(); - if (mutation.getAllele0() instanceof IAlleleSpecies) { + for (IMutation mutation : mutations) { + allMutations.add(mutation); + Set participatingSpecies = new LinkedHashSet<>(); + if (mutation.getAllele0() != null) { participatingSpecies.add(mutation.getAllele0()); } - if (mutation.getAllele1() instanceof IAlleleSpecies) { + if (mutation.getAllele1() != null) { participatingSpecies.add(mutation.getAllele1()); } - for (final IAlleleSpecies species3 : participatingSpecies) { - this.allFurtherMutations.get(species3).add(mutation); - if (this.allActiveSpecies.contains(species3)) { - this.furtherMutations.get(species3).add(mutation); + + for (IAlleleSpecies species3 : participatingSpecies) { + allFurtherMutations.get(species3).add(mutation); + if (allActiveSpecies.contains(species3)) { + furtherMutations.get(species3).add(mutation); } } - if (this.resultantMutations.containsKey(mutation.getTemplate()[0])) { - this.allResultantMutations.get(mutation.getTemplate()[0]).add(mutation); - this.resultantMutations.get(mutation.getTemplate()[0]).add(mutation); + if (resultantMutations.containsKey(mutation.getTemplate()[0])) { + allResultantMutations.get(mutation.getTemplate()[0]).add(mutation); + resultantMutations.get(mutation.getTemplate()[0]).add(mutation); } } } } - public final boolean isBlacklisted(final IAllele allele) { + public boolean isBlacklisted(IAllele allele) { return AlleleManager.alleleRegistry.isBlacklisted(allele.getUID()); } - public final List getResultantMutations(final IAlleleSpecies species, final boolean includeInactive) { - if (this.resultantMutations.isEmpty()) { - this.calculateArrays(); + public List getResultantMutations(IAlleleSpecies species, boolean includeInactive) { + if (resultantMutations.isEmpty()) { + calculateArrays(); } - return includeInactive ? this.allResultantMutations.get(species) : this.resultantMutations.get(species); + return includeInactive ? allResultantMutations.get(species) : resultantMutations.get(species); } - public final List getResultantMutations(final IAlleleSpecies species) { - if (this.resultantMutations.isEmpty()) { - this.calculateArrays(); + public List getResultantMutations(IAlleleSpecies species) { + if (resultantMutations.isEmpty()) { + calculateArrays(); } - return this.resultantMutations.get(species); + return resultantMutations.get(species); } - public final List getFurtherMutations(final IAlleleSpecies species, final boolean includeInactive) { - if (this.furtherMutations.isEmpty()) { - this.calculateArrays(); + public List getFurtherMutations(IAlleleSpecies species, boolean includeInactive) { + if (furtherMutations.isEmpty()) { + calculateArrays(); } - return includeInactive ? this.allFurtherMutations.get(species) : this.furtherMutations.get(species); + return includeInactive ? allFurtherMutations.get(species) : furtherMutations.get(species); } - public final List getFurtherMutations(final IAlleleSpecies species) { - if (this.furtherMutations.isEmpty()) { - this.calculateArrays(); + public List getFurtherMutations(IAlleleSpecies species) { + if (furtherMutations.isEmpty()) { + calculateArrays(); } - return this.furtherMutations.get(species); + return furtherMutations.get(species); } - public final boolean isMutationDiscovered(final IMutation mutation, final World world, final GameProfile name) { - return this.isMutationDiscovered(mutation, this.getSpeciesRoot().getBreedingTracker(world, name)); + public boolean isMutationDiscovered(IMutation mutation, World world, GameProfile name) { + return isMutationDiscovered(mutation, getSpeciesRoot().getBreedingTracker(world, name)); } - public final boolean isMutationDiscovered(final IMutation mutation, final IBreedingTracker tracker) { + public boolean isMutationDiscovered(IMutation mutation, IBreedingTracker tracker) { return tracker == null || tracker.isDiscovered(mutation); } - public final boolean isSpeciesDiscovered(final IAlleleSpecies species, final World world, final GameProfile name) { - return this.isSpeciesDiscovered(species, this.getSpeciesRoot().getBreedingTracker(world, name)); + public boolean isSpeciesDiscovered(IAlleleSpecies species, World world, GameProfile name) { + return isSpeciesDiscovered(species, getSpeciesRoot().getBreedingTracker(world, name)); } - public final boolean isSpeciesDiscovered(final IAlleleSpecies species, final IBreedingTracker tracker) { + public boolean isSpeciesDiscovered(IAlleleSpecies species, IBreedingTracker tracker) { return tracker == null || tracker.isDiscovered(species); } - public final boolean isSecret(final IAlleleSpecies species) { + public boolean isSecret(IAlleleSpecies species) { return !species.isCounted(); } - public final boolean isSecret(final IClassification branch) { - for (final IAlleleSpecies species : branch.getMemberSpecies()) { - if (!this.isSecret(species)) { + public boolean isSecret(IClassification branch) { + for (IAlleleSpecies species : branch.getMemberSpecies()) { + if (!isSecret(species)) { return false; } } return true; } - public final Collection getDiscoveredBranches(final World world, final GameProfile player) { - final List branches = new ArrayList(); - for (final IClassification branch : this.getAllBranches()) { + public Collection getDiscoveredBranches(World world, GameProfile player) { + List branches = new ArrayList<>(); + for (IClassification branch : getAllBranches()) { boolean discovered = false; - for (final IAlleleSpecies species : branch.getMemberSpecies()) { - if (this.isSpeciesDiscovered(species, world, player)) { + for (IAlleleSpecies species : branch.getMemberSpecies()) { + if (isSpeciesDiscovered(species, world, player)) { discovered = true; } } @@ -265,12 +251,12 @@ public abstract class BreedingSystem implements IItemStackRepresentitive return branches; } - public final Collection getDiscoveredBranches(final IBreedingTracker tracker) { - final List branches = new ArrayList(); - for (final IClassification branch : this.getAllBranches()) { + public Collection getDiscoveredBranches(IBreedingTracker tracker) { + List branches = new ArrayList<>(); + for (IClassification branch : getAllBranches()) { boolean discovered = false; - for (final IAlleleSpecies species : branch.getMemberSpecies()) { - if (this.isSpeciesDiscovered(species, tracker)) { + for (IAlleleSpecies species : branch.getMemberSpecies()) { + if (isSpeciesDiscovered(species, tracker)) { discovered = true; } } @@ -281,145 +267,148 @@ public abstract class BreedingSystem implements IItemStackRepresentitive return branches; } - public final Collection getDiscoveredSpecies(final World world, final GameProfile player) { - final List speciesList = new ArrayList(); - for (final IAlleleSpecies species : this.getAllSpecies()) { - if (this.isSpeciesDiscovered(species, world, player)) { + public Collection getDiscoveredSpecies(World world, GameProfile player) { + List speciesList = new ArrayList<>(); + for (IAlleleSpecies species : getAllSpecies()) { + if (isSpeciesDiscovered(species, world, player)) { speciesList.add(species); } } return speciesList; } - public final Collection getDiscoveredSpecies(final IBreedingTracker tracker) { - final List speciesList = new ArrayList(); - for (final IAlleleSpecies species : this.getAllSpecies()) { - if (this.isSpeciesDiscovered(species, tracker)) { + public Collection getDiscoveredSpecies(IBreedingTracker tracker) { + List speciesList = new ArrayList<>(); + for (IAlleleSpecies species : getAllSpecies()) { + if (isSpeciesDiscovered(species, tracker)) { speciesList.add(species); } } return speciesList; } - public final List getDiscoveredMutations(final World world, final GameProfile player) { - final List speciesList = new ArrayList(); - for (final IMutation species : this.getAllMutations()) { - if (this.isMutationDiscovered(species, world, player)) { + public List getDiscoveredMutations(World world, GameProfile player) { + List speciesList = new ArrayList<>(); + for (IMutation species : getAllMutations()) { + if (isMutationDiscovered(species, world, player)) { speciesList.add(species); } } return speciesList; } - public final List getDiscoveredMutations(final IBreedingTracker tracker) { - final List speciesList = new ArrayList(); - for (final IMutation species : this.getAllMutations()) { - if (this.isMutationDiscovered(species, tracker)) { + public List getDiscoveredMutations(IBreedingTracker tracker) { + List speciesList = new ArrayList<>(); + for (IMutation species : getAllMutations()) { + if (isMutationDiscovered(species, tracker)) { speciesList.add(species); } } return speciesList; } - public final int getDiscoveredBranchMembers(final IClassification branch, final IBreedingTracker tracker) { + public int getDiscoveredBranchMembers(IClassification branch, IBreedingTracker tracker) { int discoveredSpecies = 0; - for (final IAlleleSpecies species : branch.getMemberSpecies()) { - if (this.isSpeciesDiscovered(species, tracker)) { - ++discoveredSpecies; + for (IAlleleSpecies species : branch.getMemberSpecies()) { + if (isSpeciesDiscovered(species, tracker)) { + discoveredSpecies++; } } return discoveredSpecies; } public IIcon getUndiscoveredIcon() { - return this.iconUndiscovered.getIcon(); + return iconUndiscovered.getIcon(); } public IIcon getDiscoveredIcon() { - return this.iconDiscovered.getIcon(); + return iconDiscovered.getIcon(); } - public abstract float getChance(final IMutation p0, final EntityPlayer p1, final IAllele p2, final IAllele p3); + public abstract float getChance(IMutation mutation, EntityPlayer player, IAllele allele1, IAllele allele2); public abstract Class getTrackerClass(); @SubscribeEvent - public final void onSyncBreedingTracker(final ForestryEvent.SyncedBreedingTracker event) { - final IBreedingTracker tracker = event.tracker; - if (!this.getTrackerClass().isInstance(tracker)) { + public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) { + IBreedingTracker tracker = event.tracker; + if (!getTrackerClass().isInstance(tracker)) { return; } - this.syncTracker(tracker); + syncTracker(tracker); } - public final void syncTracker(final IBreedingTracker tracker) { - this.discoveredSpeciesPercentage = 0.0f; - this.totalSpeciesCount = 0; - this.discoveredSpeciesCount = 0; - this.totalSecretCount = 0; - this.discoveredSecretCount = 0; - final Collection discoveredSpecies = this.getDiscoveredSpecies(tracker); - final Collection allSpecies = this.getAllSpecies(); - for (final IAlleleSpecies species : allSpecies) { - if (!this.isSecret(species)) { - ++this.totalSpeciesCount; - if (!this.isSpeciesDiscovered(species, tracker)) { + public void syncTracker(IBreedingTracker tracker) { + discoveredSpeciesPercentage = 0.0f; + totalSpeciesCount = 0; + discoveredSpeciesCount = 0; + totalSecretCount = 0; + discoveredSecretCount = 0; + Collection discoveredSpecies = getDiscoveredSpecies(tracker); + Collection allSpecies = getAllSpecies(); + + for (IAlleleSpecies species : allSpecies) { + if (!isSecret(species)) { + totalSpeciesCount++; + if (!isSpeciesDiscovered(species, tracker)) { continue; } - ++this.discoveredSpeciesCount; - } - else { - ++this.totalSecretCount; - if (!this.isSpeciesDiscovered(species, tracker)) { + discoveredSpeciesCount++; + } else { + totalSecretCount++; + if (!isSpeciesDiscovered(species, tracker)) { continue; } - ++this.discoveredSecretCount; + discoveredSecretCount++; } } - this.discoveredBranchPercentage = 0.0f; - this.totalBranchCount = 0; - this.discoveredBranchCount = 0; - final Collection discoveredBranches = this.getDiscoveredBranches(tracker); - final Collection allBranches = this.getAllBranches(); - for (final IClassification branch : allBranches) { - if (!this.isSecret(branch)) { - ++this.totalBranchCount; + + discoveredBranchPercentage = 0.0f; + totalBranchCount = 0; + discoveredBranchCount = 0; + Collection discoveredBranches = getDiscoveredBranches(tracker); + Collection allBranches = getAllBranches(); + + for (IClassification branch : allBranches) { + if (!isSecret(branch)) { + totalBranchCount++; if (!discoveredBranches.contains(branch)) { continue; } - ++this.discoveredBranchCount; - } - else { - ++this.totalSecretBranchCount; + discoveredBranchCount++; + } else { + totalSecretBranchCount++; if (!discoveredBranches.contains(branch)) { continue; } - ++this.discoveredSecretBranchCount; + discoveredSecretBranchCount++; } } - this.discoveredSpeciesPercentage = this.discoveredSpeciesCount / this.totalSpeciesCount; - this.discoveredBranchPercentage = this.discoveredBranchCount / this.totalBranchCount; - final String epithet = this.getEpitome(); - this.onSyncBreedingTracker(tracker); + + discoveredSpeciesPercentage = discoveredSpeciesCount / totalSpeciesCount; + discoveredBranchPercentage = discoveredBranchCount / totalBranchCount; + String epithet = getEpitome(); + onSyncBreedingTracker(tracker); } - public void onSyncBreedingTracker(final IBreedingTracker tracker) { + public void onSyncBreedingTracker(IBreedingTracker tracker) { + // ignored } public String getEpitome() { - return this.getEpitome(this.discoveredSpeciesPercentage); + return getEpitome(discoveredSpeciesPercentage); } - public final String getDescriptor() { - return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".descriptor"); + public String getDescriptor() { + return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".descriptor"); } - public final String getIdent() { - return this.getSpeciesRoot().getUID(); + public String getIdent() { + return getSpeciesRoot().getUID(); } - public final IChromosomeType getChromosome(final int i) { - for (final IChromosomeType chromosome : this.getSpeciesRoot().getKaryotype()) { + public IChromosomeType getChromosome(int i) { + for (IChromosomeType chromosome : getSpeciesRoot().getKaryotype()) { if (i == chromosome.ordinal()) { return chromosome; } @@ -429,9 +418,11 @@ public abstract class BreedingSystem implements IItemStackRepresentitive public abstract int getColour(); - public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { + public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (allele instanceof IAlleleBoolean) { - return ((IAlleleBoolean) allele).getValue() ? Binnie.Language.localise(BinnieCore.instance, "allele.true") : Binnie.Language.localise(BinnieCore.instance, "allele.false"); + return ((IAlleleBoolean) allele).getValue() ? + Binnie.Language.localise(BinnieCore.instance, "allele.true") : + Binnie.Language.localise(BinnieCore.instance, "allele.false"); } if (allele.getName() == "for.gui.maximum") { return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum"); @@ -440,55 +431,56 @@ public abstract class BreedingSystem implements IItemStackRepresentitive } public String getName() { - return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".shortName"); + return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".shortName"); } @Override - public ItemStack getItemStackRepresentitive() { - final IIndividual first = this.getSpeciesRoot().getIndividualTemplates().get(0); - return this.getSpeciesRoot().getMemberStack(first, this.getDefaultType()); + public ItemStack getItemStackRepresentative() { + ISpeciesRoot speciesRoot = getSpeciesRoot(); + IIndividual first = speciesRoot.getIndividualTemplates().get(0); + return speciesRoot.getMemberStack(first, getDefaultType()); } @Override public String toString() { - return this.getName(); + return getName(); } - public abstract boolean isDNAManipulable(final ItemStack p0); + public abstract boolean isDNAManipulable(ItemStack p0); - public IIndividual getConversion(final ItemStack stack) { + public IIndividual getConversion(ItemStack stack) { return null; } - public final IIndividual getDefaultIndividual() { - return this.getSpeciesRoot().templateAsIndividual(this.getSpeciesRoot().getDefaultTemplate()); + public IIndividual getDefaultIndividual() { + return getSpeciesRoot().templateAsIndividual(getSpeciesRoot().getDefaultTemplate()); } - public final int getDefaultType() { - return this.getActiveTypes()[0]; + public int getDefaultType() { + return getActiveTypes()[0]; } public abstract int[] getActiveTypes(); - public abstract void addExtraAlleles(final IChromosomeType p0, final TreeSet p1); + public abstract void addExtraAlleles(IChromosomeType chromosome, TreeSet alleles); - public ItemStack getConversionStack(final ItemStack stack) { - return this.getSpeciesRoot().getMemberStack(this.getConversion(stack), this.getDefaultType()); + public ItemStack getConversionStack(ItemStack stack) { + return getSpeciesRoot().getMemberStack(getConversion(stack), getDefaultType()); } - public final Collection getActiveKaryotype() { - return Binnie.Genetics.getActiveChromosomes(this.getSpeciesRoot()); + public Collection getActiveKaryotype() { + return Binnie.Genetics.getActiveChromosomes(getSpeciesRoot()); } - public ItemStack getDefaultMember(final String uid) { - return this.getSpeciesRoot().getMemberStack(this.getIndividual(uid), this.getDefaultType()); + public ItemStack getDefaultMember(String uid) { + return getSpeciesRoot().getMemberStack(getIndividual(uid), getDefaultType()); } - public IIndividual getIndividual(final String uid) { - return this.getSpeciesRoot().templateAsIndividual(this.getSpeciesRoot().getTemplate(uid)); + public IIndividual getIndividual(String uid) { + return getSpeciesRoot().templateAsIndividual(getSpeciesRoot().getTemplate(uid)); } - public IGenome getGenome(final String uid) { - return this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(uid)); + public IGenome getGenome(String uid) { + return getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(uid)); } } diff --git a/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java b/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java index b9e46f5c..2f441b9e 100644 --- a/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java +++ b/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java @@ -1,13 +1,8 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; -public enum EnumBeeBooleanModifier -{ +public enum EnumBeeBooleanModifier { Sealed, SelfLighted, SunlightStimulated, - Hellish; + Hellish } diff --git a/src/main/java/binnie/core/genetics/EnumBeeModifier.java b/src/main/java/binnie/core/genetics/EnumBeeModifier.java index 91ccf076..62d2d64d 100644 --- a/src/main/java/binnie/core/genetics/EnumBeeModifier.java +++ b/src/main/java/binnie/core/genetics/EnumBeeModifier.java @@ -1,14 +1,9 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; -import binnie.core.BinnieCore; import binnie.Binnie; +import binnie.core.BinnieCore; -public enum EnumBeeModifier -{ +public enum EnumBeeModifier { Territory, Mutation, Lifespan, @@ -17,6 +12,6 @@ public enum EnumBeeModifier GeneticDecay; public String getName() { - return Binnie.Language.localise(BinnieCore.instance, "beemodifier." + this.name().toLowerCase()); + return Binnie.Language.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase()); } } diff --git a/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java index 50cc4ce0..087e86e9 100644 --- a/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java @@ -1,39 +1,34 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; -import binnie.botany.genetics.EnumFlowerColor; -import java.util.TreeSet; -import binnie.botany.core.BotanyCore; -import forestry.api.genetics.IIndividual; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.IFlowerRoot; -import net.minecraft.item.ItemStack; -import binnie.core.BinnieCore; -import binnie.botany.api.EnumFlowerChromosome; -import forestry.api.genetics.IChromosomeType; -import binnie.botany.api.IBotanistTracker; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.ISpeciesRoot; -import binnie.botany.api.IFlowerMutation; -import forestry.api.genetics.IAllele; -import net.minecraft.entity.player.EntityPlayer; -import forestry.api.genetics.IMutation; -import binnie.extrabees.ExtraBees; import binnie.Binnie; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.IBotanistTracker; +import binnie.botany.api.IFlowerRoot; +import binnie.botany.core.BotanyCore; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.BinnieCore; +import binnie.extrabees.ExtraBees; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; -class FlowerBreedingSystem extends BreedingSystem -{ +import java.util.TreeSet; + +class FlowerBreedingSystem extends BreedingSystem { public FlowerBreedingSystem() { - this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); - this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); + iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); + iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); } @Override - public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) { - return ((IFlowerMutation) mutation).getBaseChance(); + public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) { + return mutation.getBaseChance(); } @Override @@ -43,7 +38,7 @@ class FlowerBreedingSystem extends BreedingSystem @Override public int getColour() { - return 14563127; + return 0xde3737; } @Override @@ -52,7 +47,7 @@ class FlowerBreedingSystem extends BreedingSystem } @Override - public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { + public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (chromosome == EnumFlowerChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low"); @@ -71,63 +66,66 @@ class FlowerBreedingSystem extends BreedingSystem } @Override - public boolean isDNAManipulable(final ItemStack member) { - return ((IFlowerRoot) this.getSpeciesRoot()).getStageType(member) == EnumFlowerStage.POLLEN; + public boolean isDNAManipulable(ItemStack member) { + return ((IFlowerRoot) getSpeciesRoot()).getStageType(member) == EnumFlowerStage.POLLEN; } @Override - public IIndividual getConversion(final ItemStack stack) { + public IIndividual getConversion(ItemStack stack) { return BotanyCore.getFlowerRoot().getConversion(stack); } @Override public int[] getActiveTypes() { - return new int[] { EnumFlowerStage.FLOWER.ordinal(), EnumFlowerStage.POLLEN.ordinal(), EnumFlowerStage.SEED.ordinal() }; + return new int[]{ + EnumFlowerStage.FLOWER.ordinal(), + EnumFlowerStage.POLLEN.ordinal(), + EnumFlowerStage.SEED.ordinal() + }; } @Override - public void addExtraAlleles(final IChromosomeType chromosome, final TreeSet alleles) { + public void addExtraAlleles(IChromosomeType chromosome, TreeSet alleles) { switch ((EnumFlowerChromosome) chromosome) { - case FERTILITY: { - for (final ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) { - alleles.add(a.getAllele()); - } - break; - } - case LIFESPAN: { - for (final ForestryAllele.Lifespan a2 : ForestryAllele.Lifespan.values()) { - alleles.add(a2.getAllele()); - } - break; - } - case HUMIDITY_TOLERANCE: - case PH_TOLERANCE: - case TEMPERATURE_TOLERANCE: { - for (final Tolerance a3 : Tolerance.values()) { - alleles.add(a3.getAllele()); - } - break; - } - case PRIMARY: - case SECONDARY: - case STEM: { - for (final EnumFlowerColor a4 : EnumFlowerColor.values()) { - alleles.add(a4.getAllele()); - } - break; - } - case SAPPINESS: { - for (final ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) { - alleles.add(a5.getAllele()); - } - break; - } - case TERRITORY: { - for (final ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) { - alleles.add(a6.getAllele()); - } - break; - } + case FERTILITY: + for (ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) { + alleles.add(a.getAllele()); + } + break; + + case LIFESPAN: + for (ForestryAllele.Lifespan a2 : ForestryAllele.Lifespan.values()) { + alleles.add(a2.getAllele()); + } + break; + + case HUMIDITY_TOLERANCE: + case PH_TOLERANCE: + case TEMPERATURE_TOLERANCE: + for (Tolerance a3 : Tolerance.values()) { + alleles.add(a3.getAllele()); + } + break; + + case PRIMARY: + case SECONDARY: + case STEM: + for (EnumFlowerColor a4 : EnumFlowerColor.values()) { + alleles.add(a4.getAllele()); + } + break; + + case SAPPINESS: + for (ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) { + alleles.add(a5.getAllele()); + } + break; + + case TERRITORY: + for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) { + alleles.add(a6.getAllele()); + } + break; } } } diff --git a/src/main/java/binnie/core/genetics/ForestryAllele.java b/src/main/java/binnie/core/genetics/ForestryAllele.java index 9074af10..3b338f53 100644 --- a/src/main/java/binnie/core/genetics/ForestryAllele.java +++ b/src/main/java/binnie/core/genetics/ForestryAllele.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; import binnie.Binnie; @@ -9,10 +5,8 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -public class ForestryAllele -{ - public enum Lifespan - { +public class ForestryAllele { + public enum Lifespan { Shortest, Shorter, Short, @@ -24,12 +18,11 @@ public class ForestryAllele Longest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.lifespan" + this.toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.lifespan" + toString()); } } - public enum Speed - { + public enum Speed { Slowest, Slower, Slow, @@ -39,24 +32,22 @@ public class ForestryAllele Fastest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.speed" + this.toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.speed" + toString()); } } - public enum Fertility - { + public enum Fertility { Low, Normal, High, Maximum; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.fertility" + this.toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.fertility" + toString()); } } - public enum Flowering - { + public enum Flowering { Slowest, Slower, Slow, @@ -67,24 +58,22 @@ public class ForestryAllele Maximum; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.flowering" + this.toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.flowering" + toString()); } } - public enum Territory - { + public enum Territory { Default, Large, Larger, Largest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.territory" + this.toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.territory" + toString()); } } - public enum Sappiness - { + public enum Sappiness { Lowest, Lower, Low, @@ -94,12 +83,11 @@ public class ForestryAllele Highest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.sappiness" + this.toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.sappiness" + toString()); } } - public enum TreeHeight - { + public enum TreeHeight { Smallest, Smaller, Small, @@ -110,12 +98,11 @@ public class ForestryAllele Gigantic; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.height" + ((this == TreeHeight.Average) ? "Max10" : this.toString())); + return AlleleManager.alleleRegistry.getAllele("forestry.height" + ((this == TreeHeight.Average) ? "Max10" : toString())); } } - public enum Size - { + public enum Size { Smallest, Smaller, Small, @@ -125,12 +112,11 @@ public class ForestryAllele Largest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.size" + this.toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.size" + toString()); } } - public enum Saplings - { + public enum Saplings { Lowest, Lower, Low, @@ -140,7 +126,7 @@ public class ForestryAllele Highest; public IAllele getAllele() { - String s = this.toString(); + String s = toString(); if (this == Saplings.Average) { s = "Default"; } @@ -154,8 +140,7 @@ public class ForestryAllele } } - public enum Yield - { + public enum Yield { Lowest, Lower, Low, @@ -165,12 +150,11 @@ public class ForestryAllele Highest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.yield" + ((this == Yield.Average) ? "Default" : this.toString())); + return AlleleManager.alleleRegistry.getAllele("forestry.yield" + ((this == Yield.Average) ? "Default" : toString())); } } - public enum Maturation - { + public enum Maturation { Slowest, Slower, Slow, @@ -180,35 +164,32 @@ public class ForestryAllele Fastest; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.maturation" + this.toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.maturation" + toString()); } } - public enum Bool - { + public enum Bool { True, False; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.bool" + this.toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.bool" + toString()); } - public static IAllele get(final boolean bool) { + public static IAllele get(boolean bool) { return (bool ? Bool.True : Bool.False).getAllele(); } } - public enum Growth - { + public enum Growth { Tropical; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.growth" + this.toString()); + return AlleleManager.alleleRegistry.getAllele("forestry.growth" + toString()); } } - public enum Int - { + public enum Int { Int1, Int2, Int3, @@ -221,12 +202,11 @@ public class ForestryAllele Int10; public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.i" + (this.ordinal() + 1) + "d"); + return AlleleManager.alleleRegistry.getAllele("forestry.i" + (ordinal() + 1) + "d"); } } - public enum BeeSpecies - { + public enum BeeSpecies { Modest, Noble, Forest, @@ -261,11 +241,11 @@ public class ForestryAllele Demonic; public IAlleleBeeSpecies getAllele() { - return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.species" + this.toString()); + return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.species" + toString()); } public IAllele[] getTemplate() { - return Binnie.Genetics.getBeeRoot().getTemplate(this.getAllele().getUID()); + return Binnie.Genetics.getBeeRoot().getTemplate(getAllele().getUID()); } } } diff --git a/src/main/java/binnie/core/genetics/Gene.java b/src/main/java/binnie/core/genetics/Gene.java index 30f0add4..8b768d79 100644 --- a/src/main/java/binnie/core/genetics/Gene.java +++ b/src/main/java/binnie/core/genetics/Gene.java @@ -1,119 +1,114 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; import binnie.Binnie; -import forestry.api.genetics.AlleleManager; -import net.minecraft.nbt.NBTTagCompound; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IAllele; import binnie.genetics.api.IGene; import forestry.api.core.INBTTagable; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; +import net.minecraft.nbt.NBTTagCompound; -public class Gene implements INBTTagable, IGene -{ +public class Gene implements INBTTagable, IGene { private IAllele allele; private IChromosomeType chromosome; private ISpeciesRoot root; @Override public ISpeciesRoot getSpeciesRoot() { - return this.root; + return root; } @Override public String toString() { - return this.getAlleleName(); + return getAlleleName(); } - public Gene(final IAllele allele, final IChromosomeType chromosome, final ISpeciesRoot root) { + public Gene(IAllele allele, IChromosomeType chromosome, ISpeciesRoot root) { this.allele = allele; this.chromosome = chromosome; this.root = root; } - public Gene(final NBTTagCompound nbt) { - this.readFromNBT(nbt); + public Gene(NBTTagCompound nbt) { + readFromNBT(nbt); } @Override - public void readFromNBT(final NBTTagCompound nbt) { - this.allele = AlleleManager.alleleRegistry.getAllele(nbt.getString("allele")); - this.root = AlleleManager.alleleRegistry.getSpeciesRoot(nbt.getString("root")); - final int chromoID = nbt.getByte("chromo"); - if (this.root != null && chromoID >= 0 && chromoID < this.root.getKaryotype().length) { - this.chromosome = this.root.getKaryotype()[chromoID]; + public void readFromNBT(NBTTagCompound nbt) { + allele = AlleleManager.alleleRegistry.getAllele(nbt.getString("allele")); + root = AlleleManager.alleleRegistry.getSpeciesRoot(nbt.getString("root")); + int chromoID = nbt.getByte("chromo"); + if (root != null && chromoID >= 0 && chromoID < root.getKaryotype().length) { + chromosome = root.getKaryotype()[chromoID]; } } @Override - public void writeToNBT(final NBTTagCompound nbt) { - nbt.setString("allele", this.allele.getUID()); - nbt.setString("root", this.root.getUID()); - nbt.setByte("chromo", (byte) this.chromosome.ordinal()); + public void writeToNBT(NBTTagCompound nbt) { + nbt.setString("allele", allele.getUID()); + nbt.setString("root", root.getUID()); + nbt.setByte("chromo", (byte) chromosome.ordinal()); } public boolean isCorrupted() { - return this.allele == null || this.chromosome == null || this.root == null; + return allele == null || chromosome == null || root == null; } - public static Gene create(final NBTTagCompound nbt) { - final Gene gene = new Gene(nbt); + public static Gene create(NBTTagCompound nbt) { + Gene gene = new Gene(nbt); return gene.isCorrupted() ? null : gene; } - public static Gene create(final IAllele allele, final IChromosomeType chromosome, final ISpeciesRoot root) { - final Gene gene = new Gene(allele, chromosome, root); + public static Gene create(IAllele allele, IChromosomeType chromosome, ISpeciesRoot root) { + Gene gene = new Gene(allele, chromosome, root); return gene.isCorrupted() ? null : gene; } @Override public NBTTagCompound getNBTTagCompound() { - final NBTTagCompound nbt = new NBTTagCompound(); - this.writeToNBT(nbt); + NBTTagCompound nbt = new NBTTagCompound(); + writeToNBT(nbt); return nbt; } @Override public String getName() { - return Binnie.Genetics.getSystem(this.root).getAlleleName(this.chromosome, this.allele); + return Binnie.Genetics.getSystem(root).getAlleleName(chromosome, allele); } public BreedingSystem getSystem() { - return Binnie.Genetics.getSystem(this.root); + return Binnie.Genetics.getSystem(root); } @Override public IChromosomeType getChromosome() { - return this.chromosome; + return chromosome; } @Override public IAllele getAllele() { - return this.allele; + return allele; } @Override - public boolean equals(final Object obj) { + public boolean equals(Object obj) { if (!(obj instanceof Gene)) { return false; } - final Gene g = (Gene) obj; - return this.allele == g.allele && this.chromosome.ordinal() == g.chromosome.ordinal() && this.root == g.root; + Gene g = (Gene) obj; + return allele == g.allele && chromosome.ordinal() == g.chromosome.ordinal() && root == g.root; } public String getAlleleName() { - return this.getSystem().getAlleleName(this.chromosome, this.allele); + return getSystem().getAlleleName(chromosome, allele); } public String getChromosomeName() { - return this.getSystem().getChromosomeName(this.chromosome); + return getSystem().getChromosomeName(chromosome); } public String getShortChromosomeName() { - return this.getSystem().getChromosomeShortName(this.chromosome); + return getSystem().getChromosomeShortName(chromosome); } } diff --git a/src/main/java/binnie/core/genetics/IAlleleProvider.java b/src/main/java/binnie/core/genetics/IAlleleProvider.java index 65eff615..2db1378b 100644 --- a/src/main/java/binnie/core/genetics/IAlleleProvider.java +++ b/src/main/java/binnie/core/genetics/IAlleleProvider.java @@ -1,12 +1,7 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; import forestry.api.genetics.IAllele; -public interface IAlleleProvider -{ +public interface IAlleleProvider { IAllele getAllele(); } diff --git a/src/main/java/binnie/core/genetics/IBreedingMessage.java b/src/main/java/binnie/core/genetics/IBreedingMessage.java index 825a5ad5..ae05d754 100644 --- a/src/main/java/binnie/core/genetics/IBreedingMessage.java +++ b/src/main/java/binnie/core/genetics/IBreedingMessage.java @@ -1,40 +1,35 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; -import forestry.api.genetics.IClassification; -import binnie.core.BinnieCore; import binnie.Binnie; -import forestry.api.genetics.ISpeciesRoot; +import binnie.core.BinnieCore; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IClassification; +import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; -interface IBreedingMessage -{ +// TODO unused interface? +interface IBreedingMessage { String getTitle(); String getBody(); ItemStack getIcon(); - public static class MessageSpeciesDiscovered implements IBreedingMessage - { + class MessageSpeciesDiscovered implements IBreedingMessage { IAlleleSpecies species; ItemStack stack; - public MessageSpeciesDiscovered(final IAlleleSpecies species) { + public MessageSpeciesDiscovered(IAlleleSpecies species) { this.species = species; ISpeciesRoot root = null; - for (final ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { + for (ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { if (sRoot.getKaryotype()[0].getAlleleClass().isInstance(species)) { root = sRoot; } } if (root != null) { - this.stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species.getUID())), 0); + stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species.getUID())), 0); } } @@ -45,32 +40,31 @@ interface IBreedingMessage @Override public String getBody() { - return this.species.getName(); + return species.getName(); } @Override public ItemStack getIcon() { - return this.stack; + return stack; } } - public static class BranchDiscovered implements IBreedingMessage - { + class BranchDiscovered implements IBreedingMessage { IAlleleSpecies species; IClassification classification; ItemStack stack; - public BranchDiscovered(final IAlleleSpecies species, final IClassification classification) { + public BranchDiscovered(IAlleleSpecies species, IClassification classification) { this.species = species; this.classification = classification; ISpeciesRoot root = null; - for (final ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { + for (ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { if (sRoot.getKaryotype()[0].getAlleleClass().isInstance(species)) { root = sRoot; } } if (root != null) { - this.stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species.getUID())), 0); + stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species.getUID())), 0); } } @@ -90,14 +84,13 @@ interface IBreedingMessage } } - public static class EpithetGained implements IBreedingMessage - { + class EpithetGained implements IBreedingMessage { String epithet; ItemStack stack; - public EpithetGained(final String epithet, final ISpeciesRoot root) { + public EpithetGained(String epithet, ISpeciesRoot root) { this.epithet = epithet; - this.stack = root.getMemberStack(root.templateAsIndividual(root.getDefaultTemplate()), 0); + stack = root.getMemberStack(root.templateAsIndividual(root.getDefaultTemplate()), 0); } @Override @@ -107,12 +100,12 @@ interface IBreedingMessage @Override public String getBody() { - return this.epithet; + return epithet; } @Override public ItemStack getIcon() { - return this.stack; + return stack; } } } diff --git a/src/main/java/binnie/core/genetics/IItemStackRepresentative.java b/src/main/java/binnie/core/genetics/IItemStackRepresentative.java new file mode 100644 index 00000000..191c64c1 --- /dev/null +++ b/src/main/java/binnie/core/genetics/IItemStackRepresentative.java @@ -0,0 +1,7 @@ +package binnie.core.genetics; + +import net.minecraft.item.ItemStack; + +public interface IItemStackRepresentative { + ItemStack getItemStackRepresentative(); +} diff --git a/src/main/java/binnie/core/genetics/IItemStackRepresentitive.java b/src/main/java/binnie/core/genetics/IItemStackRepresentitive.java deleted file mode 100644 index 08242ced..00000000 --- a/src/main/java/binnie/core/genetics/IItemStackRepresentitive.java +++ /dev/null @@ -1,12 +0,0 @@ -// -// Decompiled by Procyon v0.5.30 -// - -package binnie.core.genetics; - -import net.minecraft.item.ItemStack; - -public interface IItemStackRepresentitive -{ - ItemStack getItemStackRepresentitive(); -} diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index cddf4baa..78fffbe6 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -1,68 +1,64 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; -import binnie.botany.genetics.AlleleColor; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IAlleleFloat; -import forestry.api.genetics.IGenome; -import java.util.Comparator; -import java.util.TreeSet; import binnie.Binnie; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.event.world.WorldEvent; -import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; -import java.util.Collection; -import forestry.api.genetics.EnumTolerance; import binnie.botany.api.IFlowerRoot; -import forestry.api.lepidopterology.IButterflyRoot; -import forestry.api.apiculture.IBeeRoot; -import forestry.api.genetics.AlleleManager; -import forestry.api.arboriculture.ITreeRoot; -import net.minecraft.world.World; -import forestry.api.genetics.IAlleleSpecies; +import binnie.botany.genetics.AlleleColor; import binnie.core.BinnieCore; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import java.util.List; -import forestry.api.genetics.ISpeciesRoot; -import java.util.Map; import binnie.core.ManagerBase; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import forestry.api.apiculture.IBeeRoot; +import forestry.api.arboriculture.ITreeRoot; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleFloat; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.lepidopterology.IButterflyRoot; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.event.world.WorldEvent; -public class ManagerGenetics extends ManagerBase -{ +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; + +public class ManagerGenetics extends ManagerBase { public BreedingSystem beeBreedingSystem; public BreedingSystem treeBreedingSystem; public BreedingSystem mothBreedingSystem; public BreedingSystem flowerBreedingSystem; - private final Map BREEDING_SYSTEMS; + private Map breedingSystems; private List invalidChromosomeTypes; private Map>> chromosomeArray; public ManagerGenetics() { - this.BREEDING_SYSTEMS = new LinkedHashMap(); - this.invalidChromosomeTypes = new ArrayList(); - this.chromosomeArray = new LinkedHashMap>>(); + breedingSystems = new LinkedHashMap<>(); + invalidChromosomeTypes = new ArrayList<>(); + chromosomeArray = new LinkedHashMap<>(); } @Override public void init() { if (BinnieCore.isApicultureActive()) { - this.beeBreedingSystem = new BeeBreedingSystem(); + beeBreedingSystem = new BeeBreedingSystem(); } if (BinnieCore.isArboricultureActive()) { - this.treeBreedingSystem = new TreeBreedingSystem(); + treeBreedingSystem = new TreeBreedingSystem(); } if (BinnieCore.isLepidopteryActive()) { - this.mothBreedingSystem = new MothBreedingSystem(); + mothBreedingSystem = new MothBreedingSystem(); } if (BinnieCore.isBotanyActive()) { - this.flowerBreedingSystem = new FlowerBreedingSystem(); + flowerBreedingSystem = new FlowerBreedingSystem(); } } @@ -71,7 +67,8 @@ public class ManagerGenetics extends ManagerBase this.refreshData(); } - public boolean isSpeciesDiscovered(final IAlleleSpecies species, final World world, final boolean nei) { + // TODO unused method? + public boolean isSpeciesDiscovered(IAlleleSpecies species, World world, boolean nei) { return true; } @@ -91,8 +88,8 @@ public class ManagerGenetics extends ManagerBase return (IFlowerRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers"); } - public BreedingSystem getSystem(final String string) { - for (final BreedingSystem system : this.BREEDING_SYSTEMS.values()) { + public BreedingSystem getSystem(String string) { + for (BreedingSystem system : breedingSystems.values()) { if (system.getIdent().equals(string)) { return system; } @@ -100,12 +97,12 @@ public class ManagerGenetics extends ManagerBase return null; } - public BreedingSystem getSystem(final ISpeciesRoot root) { - return this.getSystem(root.getUID()); + public BreedingSystem getSystem(ISpeciesRoot root) { + return getSystem(root.getUID()); } - public ISpeciesRoot getSpeciesRoot(final IAlleleSpecies species) { - for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { + public ISpeciesRoot getSpeciesRoot(IAlleleSpecies species) { + for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { if (root.getKaryotype()[0].getAlleleClass().isInstance(species)) { return root; } @@ -113,24 +110,24 @@ public class ManagerGenetics extends ManagerBase return null; } - public IAllele getToleranceAllele(final EnumTolerance tol) { + public IAllele getToleranceAllele(EnumTolerance tol) { return AlleleManager.alleleRegistry.getAllele(Tolerance.values()[tol.ordinal()].getUID()); } - public int[] getTolerance(final EnumTolerance tol) { + public int[] getTolerance(EnumTolerance tol) { return Tolerance.values()[tol.ordinal()].getBounds(); } public Collection getActiveSystems() { - return this.BREEDING_SYSTEMS.values(); + return breedingSystems.values(); } - public void registerBreedingSystem(final BreedingSystem system) { - this.BREEDING_SYSTEMS.put(system.getSpeciesRoot(), system); + public void registerBreedingSystem(BreedingSystem system) { + breedingSystems.put(system.getSpeciesRoot(), system); } - public BreedingSystem getConversionSystem(final ItemStack stack) { - for (final BreedingSystem system : this.getActiveSystems()) { + public BreedingSystem getConversionSystem(ItemStack stack) { + for (BreedingSystem system : getActiveSystems()) { if (system.getConversion(stack) != null) { return system; } @@ -138,40 +135,40 @@ public class ManagerGenetics extends ManagerBase return null; } - public ItemStack getConversionStack(final ItemStack stack) { - final BreedingSystem system = this.getConversionSystem(stack); + public ItemStack getConversionStack(ItemStack stack) { + BreedingSystem system = getConversionSystem(stack); return (system == null) ? null : system.getConversionStack(stack); } - public IIndividual getConversion(final ItemStack stack) { - final BreedingSystem system = this.getConversionSystem(stack); + public IIndividual getConversion(ItemStack stack) { + BreedingSystem system = getConversionSystem(stack); return (system == null) ? null : system.getConversion(stack); } @SubscribeEvent - public void onWorldLoad(final WorldEvent.Load event) { + public void onWorldLoad(WorldEvent.Load event) { this.refreshData(); } private void refreshData() { - this.loadAlleles(); - for (final BreedingSystem system : Binnie.Genetics.getActiveSystems()) { + loadAlleles(); + for (BreedingSystem system : Binnie.Genetics.getActiveSystems()) { system.calculateArrays(); } } private void loadAlleles() { this.invalidChromosomeTypes.clear(); - for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - final BreedingSystem system = this.getSystem(root); - final Map> chromosomeMap = new LinkedHashMap>(); - for (final IChromosomeType chromosome : root.getKaryotype()) { - final TreeSet alleles = new TreeSet(new ComparatorAllele()); - for (final IIndividual individual : root.getIndividualTemplates()) { - final IGenome genome = individual.getGenome(); + for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { + BreedingSystem system = getSystem(root); + Map> chromosomeMap = new LinkedHashMap<>(); + for (IChromosomeType chromosome : root.getKaryotype()) { + TreeSet alleles = new TreeSet<>(new ComparatorAllele()); + for (IIndividual individual : root.getIndividualTemplates()) { + IGenome genome = individual.getGenome(); try { - final IAllele a1 = genome.getActiveAllele(chromosome); - final IAllele a2 = genome.getInactiveAllele(chromosome); + IAllele a1 = genome.getActiveAllele(chromosome); + IAllele a2 = genome.getInactiveAllele(chromosome); if (chromosome.getAlleleClass().isInstance(a1)) { alleles.add(a1); } @@ -180,38 +177,38 @@ public class ManagerGenetics extends ManagerBase } alleles.add(a2); } catch (Exception ex) { + // ignored } } + system.addExtraAlleles(chromosome, alleles); if (alleles.size() == 0) { - this.invalidChromosomeTypes.add(chromosome); - } - else { - final List alleleList = new ArrayList(); + invalidChromosomeTypes.add(chromosome); + } else { + List alleleList = new ArrayList<>(); alleleList.addAll(alleles); chromosomeMap.put(chromosome, alleleList); } } - this.chromosomeArray.put(root, chromosomeMap); + chromosomeArray.put(root, chromosomeMap); } } - public Map> getChromosomeMap(final ISpeciesRoot root) { - return this.chromosomeArray.get(root); + public Map> getChromosomeMap(ISpeciesRoot root) { + return chromosomeArray.get(root); } - public Collection getActiveChromosomes(final ISpeciesRoot root) { - return this.getChromosomeMap(root).keySet(); + public Collection getActiveChromosomes(ISpeciesRoot root) { + return getChromosomeMap(root).keySet(); } - public boolean isInvalidChromosome(final IChromosomeType type) { - return this.invalidChromosomeTypes.contains(type); + public boolean isInvalidChromosome(IChromosomeType type) { + return invalidChromosomeTypes.contains(type); } - static class ComparatorAllele implements Comparator - { + static class ComparatorAllele implements Comparator { @Override - public int compare(final IAllele o1, final IAllele o2) { + public int compare(IAllele o1, IAllele o2) { if (o1 == null || o2 == null) { throw new NullPointerException("Allele is null!"); } diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index a21d3927..c537d520 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -1,35 +1,31 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; -import java.util.TreeSet; +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.extratrees.ExtraTrees; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IButterflyRoot; -import net.minecraft.item.ItemStack; -import binnie.core.BinnieCore; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.lepidopterology.EnumButterflyChromosome; -import forestry.api.genetics.IChromosomeType; import forestry.api.lepidopterology.ILepidopteristTracker; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.IAllele; import net.minecraft.entity.player.EntityPlayer; -import forestry.api.genetics.IMutation; -import binnie.extratrees.ExtraTrees; -import binnie.Binnie; +import net.minecraft.item.ItemStack; -class MothBreedingSystem extends BreedingSystem -{ +import java.util.TreeSet; + +class MothBreedingSystem extends BreedingSystem { public MothBreedingSystem() { - this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth"); - this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth"); + iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth"); + iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth"); } @Override - public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) { + public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) { return 0.0f; } @@ -40,7 +36,7 @@ class MothBreedingSystem extends BreedingSystem @Override public int getColour() { - return 62194; + return 0x00f2f2; } @Override @@ -49,9 +45,9 @@ class MothBreedingSystem extends BreedingSystem } @Override - public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { + public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (chromosome == EnumButterflyChromosome.METABOLISM) { - final int metabolism = ((IAlleleInteger) allele).getValue(); + int metabolism = ((IAlleleInteger) allele).getValue(); if (metabolism >= 19) { return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.highest"); } @@ -72,73 +68,73 @@ class MothBreedingSystem extends BreedingSystem } return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slowest"); } - else { - if (chromosome == EnumButterflyChromosome.FERTILITY) { - final int metabolism = ((IAlleleInteger) allele).getValue(); - return metabolism + "x"; - } - return super.getAlleleName(chromosome, allele); + if (chromosome == EnumButterflyChromosome.FERTILITY) { + return ((IAlleleInteger) allele).getValue() + "x"; } + return super.getAlleleName(chromosome, allele); } @Override - public boolean isDNAManipulable(final ItemStack member) { - return ((IButterflyRoot) this.getSpeciesRoot()).getType(member) == EnumFlutterType.SERUM; + public boolean isDNAManipulable(ItemStack member) { + return ((IButterflyRoot) getSpeciesRoot()).getType(member) == EnumFlutterType.SERUM; } @Override public int[] getActiveTypes() { - return new int[] { EnumFlutterType.BUTTERFLY.ordinal(), EnumFlutterType.CATERPILLAR.ordinal(), EnumFlutterType.SERUM.ordinal() }; + return new int[]{ + EnumFlutterType.BUTTERFLY.ordinal(), + EnumFlutterType.CATERPILLAR.ordinal(), + EnumFlutterType.SERUM.ordinal() + }; } @Override - public void addExtraAlleles(final IChromosomeType chromosome, final TreeSet alleles) { + public void addExtraAlleles(IChromosomeType chromosome, TreeSet alleles) { switch ((EnumButterflyChromosome) chromosome) { - case FERTILITY: { - for (final ForestryAllele.Int a : ForestryAllele.Int.values()) { - alleles.add(a.getAllele()); - } - break; - } - case LIFESPAN: { - for (final ForestryAllele.Lifespan a2 : ForestryAllele.Lifespan.values()) { - alleles.add(a2.getAllele()); - } - break; - } - case METABOLISM: { - for (final ForestryAllele.Int a : ForestryAllele.Int.values()) { - alleles.add(a.getAllele()); - } - break; - } - case TOLERANT_FLYER: - case FIRE_RESIST: - case NOCTURNAL: { - for (final ForestryAllele.Bool a3 : ForestryAllele.Bool.values()) { - alleles.add(a3.getAllele()); - } - break; - } - case SIZE: { - for (final ForestryAllele.Size a4 : ForestryAllele.Size.values()) { - alleles.add(a4.getAllele()); - } - break; - } - case SPEED: { - for (final ForestryAllele.Speed a5 : ForestryAllele.Speed.values()) { - alleles.add(a5.getAllele()); - } - break; - } - case HUMIDITY_TOLERANCE: - case TEMPERATURE_TOLERANCE: { - for (final Tolerance a6 : Tolerance.values()) { - alleles.add(a6.getAllele()); - } - break; - } + case FERTILITY: + for (ForestryAllele.Int a : ForestryAllele.Int.values()) { + alleles.add(a.getAllele()); + } + break; + + case LIFESPAN: + for (ForestryAllele.Lifespan a2 : ForestryAllele.Lifespan.values()) { + alleles.add(a2.getAllele()); + } + break; + + case METABOLISM: + for (ForestryAllele.Int a : ForestryAllele.Int.values()) { + alleles.add(a.getAllele()); + } + break; + + case TOLERANT_FLYER: + case FIRE_RESIST: + case NOCTURNAL: + for (ForestryAllele.Bool a3 : ForestryAllele.Bool.values()) { + alleles.add(a3.getAllele()); + } + break; + + case SIZE: + for (ForestryAllele.Size a4 : ForestryAllele.Size.values()) { + alleles.add(a4.getAllele()); + } + break; + + case SPEED: + for (ForestryAllele.Speed a5 : ForestryAllele.Speed.values()) { + alleles.add(a5.getAllele()); + } + break; + + case HUMIDITY_TOLERANCE: + case TEMPERATURE_TOLERANCE: + for (Tolerance a6 : Tolerance.values()) { + alleles.add(a6.getAllele()); + } + break; } } } diff --git a/src/main/java/binnie/core/genetics/Tolerance.java b/src/main/java/binnie/core/genetics/Tolerance.java index ea0bf2bb..b1cc4163 100644 --- a/src/main/java/binnie/core/genetics/Tolerance.java +++ b/src/main/java/binnie/core/genetics/Tolerance.java @@ -1,15 +1,10 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAllele; -public enum Tolerance -{ +public enum Tolerance { None(0, 0), Both1(-1, 1), Both2(-2, 2), @@ -29,31 +24,32 @@ public enum Tolerance private int[] bounds; - private Tolerance(final int a, final int b) { - this.bounds = new int[] { a, b }; + Tolerance(int a, int b) { + bounds = new int[]{a, b}; } public String getUID() { - return "forestry.tolerance" + this.toString(); + return "forestry.tolerance" + toString(); } public int[] getBounds() { - return this.bounds; + return bounds; } - public static Tolerance get(final EnumTolerance tol) { + public static Tolerance get(EnumTolerance tol) { return values()[tol.ordinal()]; } public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele(this.getUID()); + return AlleleManager.alleleRegistry.getAllele(getUID()); } - public > boolean canTolerate(final T base, final T test) { - return test.ordinal() <= base.ordinal() + this.bounds[1] && test.ordinal() >= base.ordinal() + this.bounds[0]; + public > boolean canTolerate(T base, T test) { + return test.ordinal() <= base.ordinal() + bounds[1] + && test.ordinal() >= base.ordinal() + bounds[0]; } - public static > boolean canTolerate(final T base, final T test, final EnumTolerance tol) { + public static > boolean canTolerate(T base, T test, EnumTolerance tol) { return get(tol).canTolerate(base, test); } } diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 230625de..04bb10a6 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -1,87 +1,66 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; -import java.util.TreeSet; -import java.util.Map; - -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IIndividual; +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.core.util.UniqueItemStackSet; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.FakeWorld; +import binnie.extratrees.machines.Lumbermill; +import com.mojang.authlib.GameProfile; import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IArboristTracker; +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.ITreeMutation; import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; -import binnie.extratrees.machines.Lumbermill; - -import java.util.Set; - -import forestry.api.genetics.IFruitFamily; - -import java.util.HashSet; -import java.util.List; -import java.util.ArrayList; -import java.util.Collection; - -import com.mojang.authlib.GameProfile; - -import net.minecraft.world.World; - -import net.minecraft.item.ItemStack; - -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAllelePlantType; import forestry.api.genetics.IAlleleSpecies; -import forestry.api.arboriculture.IFruitProvider; - -import java.util.EnumSet; - -import forestry.api.arboriculture.IAlleleFruit; - +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IFruitFamily; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.util.ForgeDirection; -import binnie.core.BinnieCore; -import forestry.api.genetics.IAllelePlantType; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.genetics.IChromosomeType; -import forestry.api.arboriculture.IArboristTracker; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.arboriculture.ITreeMutation; -import forestry.api.genetics.IAllele; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; -import net.minecraft.entity.player.EntityPlayer; - -import forestry.api.genetics.IMutation; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.FakeWorld; -import binnie.Binnie; -import binnie.core.util.UniqueItemStackSet; - -public class TreeBreedingSystem extends BreedingSystem -{ - public UniqueItemStackSet allFruits; - public UniqueItemStackSet allWoods; - private UniqueItemStackSet discoveredFruits; - private UniqueItemStackSet discoveredWoods; - public UniqueItemStackSet discoveredPlanks; +public class TreeBreedingSystem extends BreedingSystem { + public UniqueItemStackSet allFruits = new UniqueItemStackSet(); + public UniqueItemStackSet allWoods = new UniqueItemStackSet(); + private UniqueItemStackSet discoveredFruits = new UniqueItemStackSet(); + private UniqueItemStackSet discoveredWoods = new UniqueItemStackSet(); + public UniqueItemStackSet discoveredPlanks = new UniqueItemStackSet(); public TreeBreedingSystem() { - this.allFruits = new UniqueItemStackSet(); - this.allWoods = new UniqueItemStackSet(); - this.discoveredFruits = new UniqueItemStackSet(); - this.discoveredWoods = new UniqueItemStackSet(); - this.discoveredPlanks = new UniqueItemStackSet(); - this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree"); - this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredTree"); + iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree"); + iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredTree"); } @Override - public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) { - final ITreeGenome genome0 = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species1.getUID())); - final ITreeGenome genome2 = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species2.getUID())); + public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) { + ISpeciesRoot speciesRoot = getSpeciesRoot(); + ITreeGenome genome0 = (ITreeGenome) speciesRoot.templateAsGenome(speciesRoot.getTemplate(species1.getUID())); + ITreeGenome genome2 = (ITreeGenome) speciesRoot.templateAsGenome(speciesRoot.getTemplate(species2.getUID())); return ((ITreeMutation) mutation).getChance(player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ, (IAlleleTreeSpecies) species1, (IAlleleTreeSpecies) species2, genome0, genome2); } @@ -101,18 +80,25 @@ public class TreeBreedingSystem extends BreedingSystem } @Override - public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { + public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (chromosome == EnumTreeChromosome.GIRTH) { return ((IAlleleInteger) allele).getValue() + "x" + ((IAlleleInteger) allele).getValue(); } + if (chromosome == EnumTreeChromosome.PLANT) { - final EnumSet types = ((IAllelePlantType) allele).getPlantTypes(); - return types.isEmpty() ? Binnie.Language.localise(BinnieCore.instance, "allele.none") : types.iterator().next().toString(); + EnumSet types = ((IAllelePlantType) allele).getPlantTypes(); + return types.isEmpty() ? + Binnie.Language.localise(BinnieCore.instance, "allele.none") : + types.iterator().next().toString(); } + if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) { - final IFruitProvider provider = ((IAlleleFruit) allele).getProvider(); - return (provider.getProducts().length == 0) ? Binnie.Language.localise(BinnieCore.instance, "allele.none") : provider.getProducts()[0].getDisplayName(); + IFruitProvider provider = ((IAlleleFruit) allele).getProvider(); + return (provider.getProducts().length == 0) ? + Binnie.Language.localise(BinnieCore.instance, "allele.none") : + provider.getProducts()[0].getDisplayName(); } + if (chromosome == EnumTreeChromosome.GROWTH) { if (allele.getUID().contains("Tropical")) { return Binnie.Language.localise(BinnieCore.instance, "allele.growth.tropical"); @@ -125,65 +111,64 @@ public class TreeBreedingSystem extends BreedingSystem } @Override - public void onSyncBreedingTracker(final IBreedingTracker tracker) { - this.discoveredFruits.clear(); - this.discoveredWoods.clear(); - for (final IAlleleSpecies species : this.getDiscoveredSpecies(tracker)) { - final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); + public void onSyncBreedingTracker(IBreedingTracker tracker) { + discoveredFruits.clear(); + discoveredWoods.clear(); + for (IAlleleSpecies species : getDiscoveredSpecies(tracker)) { + IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; + ISpeciesRoot speciesRoot = getSpeciesRoot(); + ITreeGenome genome = (ITreeGenome) speciesRoot.templateAsGenome(speciesRoot.getTemplate(tSpecies.getUID())); FakeWorld world = FakeWorld.instance; genome.getPrimary().getGenerator().setLogBlock(genome, world, 0, 0, 0, ForgeDirection.UP); - final ItemStack wood = world.getWooLog(); + ItemStack wood = world.getWooLog(); if (wood != null) { - this.discoveredWoods.add(wood); + discoveredWoods.add(wood); } - // for (final ItemStack wood : + // TODO ??? + // for (ItemStack wood : // tSpecies.getRoot().templateAsIndividual(getSpeciesRoot().getTemplate(tSpecies.getUID())).getProduceList()) // { // this.discoveredWoods.add(wood); // } - for (final ItemStack fruit : genome.getFruitProvider().getProducts()) { - this.discoveredFruits.add(fruit); - } + discoveredFruits.addAll(Arrays.asList(genome.getFruitProvider().getProducts())); for (ItemStack wood2 : this.discoveredWoods) { } } } @Override - public final void calculateArrays() { + public void calculateArrays() { super.calculateArrays(); - for (final IAlleleSpecies species : this.allActiveSpecies) { - final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); + for (IAlleleSpecies species : this.allActiveSpecies) { + IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; + ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); FakeWorld world = FakeWorld.instance; genome.getPrimary().getGenerator().setLogBlock(genome, world, 0, 0, 0, ForgeDirection.UP); - final ItemStack wood = world.getWooLog(); + ItemStack wood = world.getWooLog(); if (wood != null) { this.allWoods.add(wood); } - // for (final ItemStack wood : + // TODO ??? + // for (ItemStack wood : // tSpecies.getRoot().templateAsIndividual(getSpeciesRoot().getTemplate(tSpecies.getUID())).getProduceList()) // { // this.allWoods.add(wood); // } - for (final ItemStack fruit : genome.getFruitProvider().getProducts()) { - this.allFruits.add(fruit); - } + allFruits.addAll(Arrays.asList(genome.getFruitProvider().getProducts())); } } - public Collection getTreesThatBearFruit(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { - final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); - final List found = new ArrayList(); - for (final IAlleleSpecies species : set) { - final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); - for (final ItemStack fruit2 : genome.getFruitProvider().getProducts()) { + public Collection getTreesThatBearFruit(ItemStack fruit, boolean nei, World world, GameProfile player) { + Collection set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player); + List found = new ArrayList<>(); + for (IAlleleSpecies species : set) { + IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; + ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); + for (ItemStack fruit2 : genome.getFruitProvider().getProducts()) { if (fruit2.isItemEqual(fruit)) { found.add(species); } @@ -192,22 +177,22 @@ public class TreeBreedingSystem extends BreedingSystem return found; } - public Collection getTreesThatCanBearFruit(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { - final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); - final List found = new ArrayList(); - final Set providers = new HashSet(); - for (final IAlleleSpecies species : set) { - final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID())); - for (final ItemStack fruit2 : genome.getFruitProvider().getProducts()) { + public Collection getTreesThatCanBearFruit(ItemStack fruit, boolean nei, World world, GameProfile player) { + Collection set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player); + List found = new ArrayList<>(); + Set providers = new HashSet<>(); + for (IAlleleSpecies species : set) { + IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; + ITreeGenome genome = (ITreeGenome) getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(tSpecies.getUID())); + for (ItemStack fruit2 : genome.getFruitProvider().getProducts()) { if (fruit2.isItemEqual(fruit)) { providers.add(genome.getFruitProvider().getFamily()); } } } - for (final IAlleleSpecies species : set) { - final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - for (final IFruitFamily family : providers) { + for (IAlleleSpecies species : set) { + IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; + for (IFruitFamily family : providers) { if (tSpecies.getSuitableFruit().contains(family)) { found.add(species); break; @@ -217,13 +202,13 @@ public class TreeBreedingSystem extends BreedingSystem return found; } - public Collection getTreesThatHaveWood(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { - final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); - final List found = new ArrayList(); - for (final IAlleleSpecies species : set) { + public Collection getTreesThatHaveWood(ItemStack fruit, boolean nei, World world, GameProfile player) { + Collection set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player); + List found = new ArrayList<>(); + for (IAlleleSpecies species : set) { IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); - // for (final ItemStack fruit2 : + // for (ItemStack fruit2 : // tSpecies.getRoot().getMember(fruit).getProduceList()){ tSpecies.getGenerator().setLogBlock(genome, FakeWorld.instance, 0, 0, 0, ForgeDirection.UP); ItemStack fruit2 = FakeWorld.instance.getWooLog(); @@ -235,18 +220,18 @@ public class TreeBreedingSystem extends BreedingSystem return found; } - public Collection getTreesThatMakePlanks(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) { + public Collection getTreesThatMakePlanks(ItemStack fruit, boolean nei, World world, GameProfile player) { if (fruit == null) { - return new ArrayList(); + return new ArrayList<>(); } - final Collection set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player); - final List found = new ArrayList(); - for (final IAlleleSpecies species : set) { - final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; + Collection set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player); + List found = new ArrayList(); + for (IAlleleSpecies species : set) { + IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); tSpecies.getGenerator().setLogBlock(genome, FakeWorld.instance, 0, 0, 0, ForgeDirection.UP); ItemStack fruit2 = FakeWorld.instance.getWooLog(); - // for (final ItemStack fruit2 : + // for (ItemStack fruit2 : // tSpecies.getRoot().getMember(fruit).getProduceList()) { if (Lumbermill.getPlankProduct(fruit2) != null && fruit.isItemEqual(Lumbermill.getPlankProduct(fruit2))) { found.add(species); @@ -257,16 +242,16 @@ public class TreeBreedingSystem extends BreedingSystem } @Override - public boolean isDNAManipulable(final ItemStack member) { - return ((ITreeRoot) this.getSpeciesRoot()).getType(member) == EnumGermlingType.POLLEN; + public boolean isDNAManipulable(ItemStack member) { + return ((ITreeRoot) getSpeciesRoot()).getType(member) == EnumGermlingType.POLLEN; } @Override - public IIndividual getConversion(final ItemStack stack) { + public IIndividual getConversion(ItemStack stack) { if (stack == null) { return null; } - for (final Map.Entry entry : AlleleManager.ersatzSaplings.entrySet()) { + for (Map.Entry entry : AlleleManager.ersatzSaplings.entrySet()) { if (ItemStack.areItemStacksEqual(stack, entry.getKey())) { return entry.getValue(); } @@ -276,60 +261,59 @@ public class TreeBreedingSystem extends BreedingSystem @Override public int[] getActiveTypes() { - return new int[] { EnumGermlingType.SAPLING.ordinal(), EnumGermlingType.POLLEN.ordinal() }; + return new int[]{EnumGermlingType.SAPLING.ordinal(), EnumGermlingType.POLLEN.ordinal()}; } @Override - public void addExtraAlleles(final IChromosomeType chromosome, final TreeSet alleles) { + public void addExtraAlleles(IChromosomeType chromosome, TreeSet alleles) { switch ((EnumTreeChromosome) chromosome) { - case FERTILITY: { - for (final ForestryAllele.Saplings a : ForestryAllele.Saplings.values()) { - alleles.add(a.getAllele()); - } - break; - } - case GIRTH: { - for (final ForestryAllele.Int a2 : ForestryAllele.Int.values()) { - alleles.add(a2.getAllele()); - } - break; - } - case HEIGHT: { - for (final ForestryAllele.TreeHeight a3 : ForestryAllele.TreeHeight.values()) { - alleles.add(a3.getAllele()); - } - break; - } - case MATURATION: { - for (final ForestryAllele.Maturation a4 : ForestryAllele.Maturation.values()) { - alleles.add(a4.getAllele()); - } - break; - } - case SAPPINESS: { - for (final ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) { - alleles.add(a5.getAllele()); - } - break; - } - case TERRITORY: { - for (final ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) { - alleles.add(a6.getAllele()); - } - break; - } - case YIELD: { - for (final ForestryAllele.Yield a7 : ForestryAllele.Yield.values()) { - alleles.add(a7.getAllele()); - } - break; - } - case FIREPROOF: { - for (final ForestryAllele.Bool a8 : ForestryAllele.Bool.values()) { - alleles.add(a8.getAllele()); - } - break; - } + case FERTILITY: + for (ForestryAllele.Saplings a : ForestryAllele.Saplings.values()) { + alleles.add(a.getAllele()); + } + break; + + case GIRTH: + for (ForestryAllele.Int a2 : ForestryAllele.Int.values()) { + alleles.add(a2.getAllele()); + } + break; + + case HEIGHT: + for (ForestryAllele.TreeHeight a3 : ForestryAllele.TreeHeight.values()) { + alleles.add(a3.getAllele()); + } + break; + + case MATURATION: + for (ForestryAllele.Maturation a4 : ForestryAllele.Maturation.values()) { + alleles.add(a4.getAllele()); + } + break; + + case SAPPINESS: + for (ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) { + alleles.add(a5.getAllele()); + } + break; + + case TERRITORY: + for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) { + alleles.add(a6.getAllele()); + } + break; + + case YIELD: + for (ForestryAllele.Yield a7 : ForestryAllele.Yield.values()) { + alleles.add(a7.getAllele()); + } + break; + + case FIREPROOF: + for (ForestryAllele.Bool a8 : ForestryAllele.Bool.values()) { + alleles.add(a8.getAllele()); + } + break; } } } diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index 3fa332fb..9faf3372 100644 --- a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -1,18 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; -import java.util.ArrayList; - import com.mojang.authlib.GameProfile; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Vec3; -import net.minecraft.world.biome.BiomeGenBase; - import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -24,36 +12,40 @@ import forestry.api.core.IErrorLogic; import forestry.api.genetics.IIndividual; import forestry.apiculture.InventoryBeeHousing; import forestry.core.access.FakeAccessHandler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Vec3; +import net.minecraft.world.biome.BiomeGenBase; -public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IBeeModifier -{ - ArrayList beeModifier = new ArrayList(); +import java.util.ArrayList; + +public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IBeeModifier { + ArrayList beeModifier = new ArrayList<>(); private InventoryBeeHousing beeInventory; - public VirtualBeeHousing(final EntityPlayer player) { + public VirtualBeeHousing(EntityPlayer player) { super(player); beeModifier.add(this); beeInventory = new InventoryBeeHousing(12, FakeAccessHandler.getInstance()); - } @Override - public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) { + public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { return 1.0f; } @Override - public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { + public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { return 1.0f; } @Override - public float getLifespanModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { + public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { return 1.0f; } @Override - public float getProductionModifier(final IBeeGenome genome, final float currentModifier) { + public float getProductionModifier(IBeeGenome genome, float currentModifier) { return 1.0f; } @@ -65,10 +57,11 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB return null; } - public void setQueen(final ItemStack itemstack) { + public void setQueen(ItemStack itemStack) { + // ignored } - public void setDrone(final ItemStack itemstack) { + public void setDrone(ItemStack itemStack) { } public boolean canBreed() { @@ -76,14 +69,14 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB } @Override - public boolean addProduct(final ItemStack product, final boolean all) { + public boolean addProduct(ItemStack product, boolean all) { return false; } - public void wearOutEquipment(final int amount) { + public void wearOutEquipment(int amount) { } - public void onQueenChange(final ItemStack queen) { + public void onQueenChange(ItemStack queen) { } @Override @@ -107,26 +100,26 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB } @Override - public float getFloweringModifier(final IBeeGenome genome, final float currentModifier) { + public float getFloweringModifier(IBeeGenome genome, float currentModifier) { return 1.0f; } - public void onQueenDeath(final IBee queen) { + public void onQueenDeath(IBee queen) { } - public void onPostQueenDeath(final IBee queen) { + public void onPostQueenDeath(IBee queen) { } - public boolean onPollenRetrieved(final IBee queen, final IIndividual pollen, final boolean isHandled) { + public boolean onPollenRetrieved(IBee queen, IIndividual pollen, boolean isHandled) { return false; } - public boolean onEggLaid(final IBee queen) { + public boolean onEggLaid(IBee queen) { return false; } @Override - public float getGeneticDecay(final IBeeGenome genome, final float currentModifier) { + public float getGeneticDecay(IBeeGenome genome, float currentModifier) { return 1.0f; } @@ -177,5 +170,4 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB public GameProfile getOwner() { return getOwnerName(); } - } diff --git a/src/main/java/binnie/core/genetics/VirtualHousing.java b/src/main/java/binnie/core/genetics/VirtualHousing.java index 67f3b26e..678bf15a 100644 --- a/src/main/java/binnie/core/genetics/VirtualHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualHousing.java @@ -1,50 +1,39 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; +import com.mojang.authlib.GameProfile; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorState; +import forestry.api.genetics.IHousing; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + import java.util.Set; -import forestry.api.core.IErrorState; - -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.biome.BiomeGenBase; - -import com.mojang.authlib.GameProfile; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; - -import net.minecraft.entity.player.EntityPlayer; - -import forestry.api.genetics.IHousing; - -class VirtualHousing implements IHousing -{ +class VirtualHousing implements IHousing { private EntityPlayer player; - public VirtualHousing(final EntityPlayer player) { + public VirtualHousing(EntityPlayer player) { this.player = player; } - public int getXCoord() { - return (int) this.player.posX; + public int getX() { + return (int) player.posX; } - public int getYCoord() { - return (int) this.player.posY; + public int getY() { + return (int) player.posY; } - public int getZCoord() { - return (int) this.player.posZ; + public int getZ() { + return (int) player.posZ; } public int getBiomeId() { - return this.player.worldObj.getBiomeGenForCoords(this.getXCoord(), this.getYCoord()).biomeID; + return player.worldObj.getBiomeGenForCoords(getX(), getY()).biomeID; } public EnumTemperature getTemperature() { @@ -59,33 +48,34 @@ class VirtualHousing implements IHousing return this.player.worldObj; } - public void setErrorState(final int state) { + public void setErrorState(int state) { + // ignored } public int getErrorOrdinal() { return 0; } - public boolean addProduct(final ItemStack product, final boolean all) { + public boolean addProduct(ItemStack product, boolean all) { return false; } public GameProfile getOwnerName() { - return this.player.getGameProfile(); + return player.getGameProfile(); } public BiomeGenBase getBiome() { - return this.player.worldObj.getBiomeGenForCoords(this.getXCoord(), this.getZCoord()); + return player.worldObj.getBiomeGenForCoords(getX(), getZ()); } // public EnumErrorCode getErrorState() { // return null; // } - public void setErrorState(final IErrorState state) { + public void setErrorState(IErrorState state) { } - public boolean setErrorCondition(final boolean condition, final IErrorState errorState) { + public boolean setErrorCondition(boolean condition, IErrorState errorState) { return false; } @@ -95,6 +85,6 @@ class VirtualHousing implements IHousing @Override public ChunkCoordinates getCoordinates() { - return new ChunkCoordinates(getXCoord(), getYCoord(), getZCoord()); + return new ChunkCoordinates(getX(), getY(), getZ()); } } diff --git a/src/main/java/binnie/core/genetics/VirtualMothHousing.java b/src/main/java/binnie/core/genetics/VirtualMothHousing.java index 7747f125..ab6d7195 100644 --- a/src/main/java/binnie/core/genetics/VirtualMothHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualMothHousing.java @@ -1,17 +1,13 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.genetics; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; -import net.minecraft.entity.player.EntityPlayer; import forestry.api.lepidopterology.IButterflyNursery; +import net.minecraft.entity.player.EntityPlayer; -public class VirtualMothHousing extends VirtualHousing implements IButterflyNursery -{ - public VirtualMothHousing(final EntityPlayer player) { +// TODO unused class? +public class VirtualMothHousing extends VirtualHousing implements IButterflyNursery { + public VirtualMothHousing(EntityPlayer player) { super(player); } @@ -26,11 +22,11 @@ public class VirtualMothHousing extends VirtualHousing implements IButterflyNurs } @Override - public void setCaterpillar(final IButterfly butterfly) { + public void setCaterpillar(IButterfly butterfly) { } @Override - public boolean canNurse(final IButterfly butterfly) { + public boolean canNurse(IButterfly butterfly) { return false; } } diff --git a/src/main/java/binnie/core/gui/BinnieCoreGUI.java b/src/main/java/binnie/core/gui/BinnieCoreGUI.java index df61e45d..aefd52bb 100644 --- a/src/main/java/binnie/core/gui/BinnieCoreGUI.java +++ b/src/main/java/binnie/core/gui/BinnieCoreGUI.java @@ -1,54 +1,47 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.gui; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import binnie.craftgui.binniecore.WindowGenesis; -import binnie.craftgui.binniecore.WindowFieldKit; import binnie.core.machines.storage.WindowCompartment; +import binnie.craftgui.binniecore.WindowFieldKit; +import binnie.craftgui.binniecore.WindowGenesis; import binnie.craftgui.minecraft.Window; import cpw.mods.fml.relauncher.Side; -import net.minecraft.inventory.IInventory; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public enum BinnieCoreGUI implements IBinnieGUID -{ +public enum BinnieCoreGUI implements IBinnieGUID { Compartment, FieldKit, Genesis; - public Window getWindow(final EntityPlayer player, final IInventory object, final Side side) throws Exception { + public Window getWindow(EntityPlayer player, IInventory object, Side side) throws Exception { switch (this) { - case Compartment: { - return new WindowCompartment(player, object, side); - } - case FieldKit: { - return new WindowFieldKit(player, null, side); - } - case Genesis: { - return new WindowGenesis(player, null, side); - } - default: { - return null; - } + case Compartment: + return new WindowCompartment(player, object, side); + + case FieldKit: + return new WindowFieldKit(player, null, side); + + case Genesis: + return new WindowGenesis(player, null, side); } + return null; } @Override - public Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) { - Window window = null; - final TileEntity tileEntity = world.getTileEntity(x, y, z); + public Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side) { + TileEntity tileEntity = world.getTileEntity(x, y, z); IInventory object = null; if (tileEntity instanceof IInventory) { object = (IInventory) tileEntity; } + + Window window = null; try { - window = this.getWindow(player, object, side); - } catch (Exception e) { - e.printStackTrace(); + window = getWindow(player, object, side); + } catch (Exception ex) { + ex.printStackTrace(); } return window; } diff --git a/src/main/java/binnie/core/gui/BinnieGUIHandler.java b/src/main/java/binnie/core/gui/BinnieGUIHandler.java index e1a63b9d..2ab79d5c 100644 --- a/src/main/java/binnie/core/gui/BinnieGUIHandler.java +++ b/src/main/java/binnie/core/gui/BinnieGUIHandler.java @@ -1,28 +1,23 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.gui; +import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.craftgui.minecraft.Window; -import cpw.mods.fml.relauncher.Side; -import net.minecraft.world.World; -import net.minecraft.entity.player.EntityPlayer; -import binnie.core.AbstractMod; import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; -public final class BinnieGUIHandler implements IGuiHandler -{ +public class BinnieGUIHandler implements IGuiHandler { private AbstractMod mod; - public BinnieGUIHandler(final AbstractMod mod) { + public BinnieGUIHandler(AbstractMod mod) { this.mod = mod; } @Override - public final Object getServerGuiElement(final int id, final EntityPlayer player, final World world, final int x, final int y, final int z) { - final Window window = this.getWindow(id, player, world, x, y, z, Side.SERVER); + public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + Window window = this.getWindow(id, player, world, x, y, z, Side.SERVER); if (window == null) { return null; } @@ -31,19 +26,20 @@ public final class BinnieGUIHandler implements IGuiHandler } @Override - public final Object getClientGuiElement(final int id, final EntityPlayer player, final World world, final int x, final int y, final int z) { + public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (BinnieCore.proxy.isSimulating(world)) { - return this.getServerGuiElement(id, player, world, x, y, z); + return getServerGuiElement(id, player, world, x, y, z); } - final Window window = this.getWindow(id, player, world, x, y, z, Side.CLIENT); + + Window window = getWindow(id, player, world, x, y, z, Side.CLIENT); if (window == null) { return null; } return window.getGui(); } - public Window getWindow(final int id, final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) { - for (final IBinnieGUID guid : this.mod.getGUIDs()) { + public Window getWindow(int id, EntityPlayer player, World world, int x, int y, int z, Side side) { + for (IBinnieGUID guid : mod.getGUIDs()) { if (guid.ordinal() == id) { return guid.getWindow(player, world, x, y, z, side); } diff --git a/src/main/java/binnie/core/gui/IBinnieGUID.java b/src/main/java/binnie/core/gui/IBinnieGUID.java index f66b1caa..00e9ee46 100644 --- a/src/main/java/binnie/core/gui/IBinnieGUID.java +++ b/src/main/java/binnie/core/gui/IBinnieGUID.java @@ -1,16 +1,11 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.gui; +import binnie.core.network.IOrdinaled; import binnie.craftgui.minecraft.Window; import cpw.mods.fml.relauncher.Side; -import net.minecraft.world.World; import net.minecraft.entity.player.EntityPlayer; -import binnie.core.network.IOrdinaled; +import net.minecraft.world.World; -public interface IBinnieGUID extends IOrdinaled -{ - Window getWindow(final EntityPlayer p0, final World p1, final int p2, final int p3, final int p4, final Side p5); +public interface IBinnieGUID extends IOrdinaled { + Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side); } diff --git a/src/main/java/binnie/core/item/IItemEnum.java b/src/main/java/binnie/core/item/IItemEnum.java index b6ba3682..9890899c 100644 --- a/src/main/java/binnie/core/item/IItemEnum.java +++ b/src/main/java/binnie/core/item/IItemEnum.java @@ -1,18 +1,13 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.item; import net.minecraft.item.ItemStack; -public interface IItemEnum -{ +public interface IItemEnum { boolean isActive(); - String getName(final ItemStack p0); + String getName(ItemStack itemStack); int ordinal(); - ItemStack get(final int p0); + ItemStack get(int count); } diff --git a/src/main/java/binnie/core/item/IItemMisc.java b/src/main/java/binnie/core/item/IItemMisc.java index 618c38c5..79639c63 100644 --- a/src/main/java/binnie/core/item/IItemMisc.java +++ b/src/main/java/binnie/core/item/IItemMisc.java @@ -1,22 +1,18 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.item; -import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; -public interface IItemMisc extends IItemEnum -{ - IIcon getIcon(final ItemStack p0); +import java.util.List; + +public interface IItemMisc extends IItemEnum { + IIcon getIcon(ItemStack itemStack); @SideOnly(Side.CLIENT) - void registerIcons(final IIconRegister p0); + void registerIcons(IIconRegister register); - void addInformation(final List p0); + void addInformation(List data); } diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/core/item/ItemFieldKit.java index 575b93f3..1dd27232 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/core/item/ItemFieldKit.java @@ -1,84 +1,79 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.item; -import java.util.List; +import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.core.BinnieCore; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.IIcon; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; -public class ItemFieldKit extends Item -{ +import java.util.List; + +public class ItemFieldKit extends Item { private IIcon fieldKit0; private IIcon fieldKit1; private IIcon fieldKit2; private IIcon fieldKit3; public ItemFieldKit() { - this.setUnlocalizedName("fieldKit"); - this.setCreativeTab(CreativeTabs.tabTools); - this.setMaxStackSize(1); - this.setMaxDamage(64); + setUnlocalizedName("fieldKit"); + setCreativeTab(CreativeTabs.tabTools); + setMaxStackSize(1); + setMaxDamage(64); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.fieldKit0 = BinnieCore.proxy.getIcon(register, "fieldKit"); - this.fieldKit1 = BinnieCore.proxy.getIcon(register, "fieldKit1"); - this.fieldKit2 = BinnieCore.proxy.getIcon(register, "fieldKit2"); - this.fieldKit3 = BinnieCore.proxy.getIcon(register, "fieldKit3"); - this.itemIcon = this.fieldKit0; + public void registerIcons(IIconRegister register) { + fieldKit0 = BinnieCore.proxy.getIcon(register, "fieldKit"); + fieldKit1 = BinnieCore.proxy.getIcon(register, "fieldKit1"); + fieldKit2 = BinnieCore.proxy.getIcon(register, "fieldKit2"); + fieldKit3 = BinnieCore.proxy.getIcon(register, "fieldKit3"); + itemIcon = fieldKit0; } @Override - public IIcon getIcon(final ItemStack stack, final int pass) { - final int damage = stack.getItemDamage(); + public IIcon getIcon(ItemStack stack, int pass) { + int damage = stack.getItemDamage(); if (damage < 24) { - return this.fieldKit3; + return fieldKit3; } if (damage < 48) { - return this.fieldKit2; + return fieldKit2; } if (damage < 64) { - return this.fieldKit1; + return fieldKit1; } - return this.fieldKit0; + return fieldKit0; } @Override - public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player) { + public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { if (!player.isSneaking()) { BinnieCore.proxy.openGui(BinnieCoreGUI.FieldKit, player, (int) player.posX, (int) player.posY, (int) player.posZ); } - return itemstack; + return itemStack; } @Override @SideOnly(Side.CLIENT) - public void addInformation(final ItemStack p_77624_1_, final EntityPlayer p_77624_2_, final List p_77624_3_, final boolean p_77624_4_) { - final int i = this.getMaxDamage() - p_77624_1_.getItemDamage(); + public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { + int i = getMaxDamage() - itemStack.getItemDamage(); if (i == 0) { - p_77624_3_.add("No paper"); + tooltip.add("No paper"); + } else { + tooltip.add("" + i + " sheet" + ((i > 1) ? "s" : "") + " of paper"); } - else { - p_77624_3_.add("" + i + " sheet" + ((i > 1) ? "s" : "") + " of paper"); - } - super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_); + super.addInformation(itemStack, player, tooltip, advanced); } @Override - public String getItemStackDisplayName(final ItemStack p_77653_1_) { + public String getItemStackDisplayName(ItemStack p_77653_1_) { return "Field Kit"; } } diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index dd595872..df9667af 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -1,42 +1,37 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.item; +import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import net.minecraft.item.ItemStack; -import forestry.api.core.Tabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.core.BinnieCore; +import forestry.api.core.Tabs; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; -public class ItemGenesis extends Item -{ +public class ItemGenesis extends Item { @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.itemIcon = BinnieCore.proxy.getIcon(register, "genesis"); + public void registerIcons(IIconRegister register) { + itemIcon = BinnieCore.proxy.getIcon(register, "genesis"); } public ItemGenesis() { - this.setCreativeTab(Tabs.tabApiculture); - this.setUnlocalizedName("genesis"); - this.setMaxStackSize(1); + setCreativeTab(Tabs.tabApiculture); + setUnlocalizedName("genesis"); + setMaxStackSize(1); } @Override - public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player) { + public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { BinnieCore.proxy.openGui(BinnieCoreGUI.Genesis, player, (int) player.posX, (int) player.posY, (int) player.posZ); - return itemstack; + return itemStack; } @Override - public String getItemStackDisplayName(final ItemStack i) { + public String getItemStackDisplayName(ItemStack itemStack) { return "Genesis"; } } diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index 07b099e4..0ae9c6ed 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -1,80 +1,79 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.item; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; -public class ItemMisc extends Item -{ +import java.util.List; + +public class ItemMisc extends Item { private IItemMisc[] items; - protected ItemMisc(final CreativeTabs tab, final IItemMisc[] items2) { - this.setCreativeTab(tab); - this.setHasSubtypes(true); - this.setUnlocalizedName("misc"); - this.items = items2; + protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) { + setCreativeTab(tab); + setHasSubtypes(true); + setUnlocalizedName("misc"); + items = items2; } @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { - for (final IItemMisc item : this.items) { + public void getSubItems(Item par1, CreativeTabs tab, List list) { + for (IItemMisc item : items) { if (item.isActive()) { - par3List.add(this.getStack(item, 1)); + list.add(getStack(item, 1)); } } } - private IItemMisc getItem(final int damage) { - return (damage >= this.items.length) ? this.items[0] : this.items[damage]; + private IItemMisc getItem(int damage) { + if (damage >= items.length) { + return items[0]; + } + return items[damage]; } - public ItemStack getStack(final IItemMisc type, final int size) { + public ItemStack getStack(IItemMisc type, int size) { return new ItemStack(this, size, type.ordinal()); } @Override @SideOnly(Side.CLIENT) - public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) { - super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4); - final IItemMisc item = this.getItem(par1ItemStack.getItemDamage()); + public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(itemStack, player, tooltip, advanced); + IItemMisc item = getItem(itemStack.getItemDamage()); if (item != null) { - item.addInformation(par3List); + item.addInformation(tooltip); } } @Override - public String getItemStackDisplayName(final ItemStack stack) { - final IItemMisc item = this.getItem(stack.getItemDamage()); + public String getItemStackDisplayName(ItemStack stack) { + IItemMisc item = getItem(stack.getItemDamage()); return (item != null) ? item.getName(stack) : "null"; } @Override - public IIcon getIcon(final ItemStack stack, final int pass) { - final IItemMisc item = this.getItem(stack.getItemDamage()); + public IIcon getIcon(ItemStack stack, int pass) { + IItemMisc item = getItem(stack.getItemDamage()); return (item != null) ? item.getIcon(stack) : null; } @Override - public IIcon getIconFromDamage(final int damage) { - final IItemMisc item = this.getItem(damage); + public IIcon getIconFromDamage(int damage) { + IItemMisc item = getItem(damage); return (item != null) ? item.getIcon(null) : null; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - for (final IItemMisc item : this.items) { + public void registerIcons(IIconRegister register) { + for (IItemMisc item : items) { item.registerIcons(register); } } diff --git a/src/main/java/binnie/core/item/ManagerItem.java b/src/main/java/binnie/core/item/ManagerItem.java index e53193d3..29a68bd5 100644 --- a/src/main/java/binnie/core/item/ManagerItem.java +++ b/src/main/java/binnie/core/item/ManagerItem.java @@ -1,14 +1,9 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.item; import net.minecraft.creativetab.CreativeTabs; -public class ManagerItem -{ - public ItemMisc registerMiscItems(final IItemMisc[] items, final CreativeTabs tab) { +public class ManagerItem { + public ItemMisc registerMiscItems(IItemMisc[] items, CreativeTabs tab) { return new ItemMisc(tab, items); } } diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index 7d223b25..a2f25cda 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -1,29 +1,22 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.item; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import binnie.botany.api.IFlower; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.entity.EntityLivingBase; -import binnie.core.network.packet.MessageNBT; -import binnie.botany.network.PacketID; import binnie.botany.Botany; -import net.minecraft.nbt.NBTTagCompound; +import binnie.botany.api.IFlower; import binnie.botany.flower.TileEntityFlower; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.init.Items; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import binnie.botany.network.PacketID; import binnie.core.BinnieCore; import binnie.core.IInitializable; +import binnie.core.network.packet.MessageNBT; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; -public class ModuleItems implements IInitializable -{ +public class ModuleItems implements IInitializable { @Override public void preInit() { BinnieCore.fieldKit = new ItemFieldKit(); @@ -32,39 +25,51 @@ public class ModuleItems implements IInitializable @Override public void init() { + // ignored } @Override public void postInit() { - GameRegistry.addRecipe(new ItemStack(BinnieCore.fieldKit, 1, 63), new Object[] { "g ", " is", " pi", 'g', Blocks.glass_pane, 'i', Items.iron_ingot, 'p', Items.paper, 's', new ItemStack(Items.dye, 1) }); + GameRegistry.addRecipe( + new ItemStack(BinnieCore.fieldKit, 1, 63), + "g ", " is", " pi", + 'g', Blocks.glass_pane, + 'i', Items.iron_ingot, + 'p', Items.paper, + 's', new ItemStack(Items.dye, 1) + ); } @SubscribeEvent - public void onUseFieldKit(final PlayerInteractEvent event) { - if (!BinnieCore.isBotanyActive()) { + public void onUseFieldKit(PlayerInteractEvent event) { + if (!BinnieCore.isBotanyActive() || event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { return; } - if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { - return; - } - if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == BinnieCore.fieldKit && event.entityPlayer.isSneaking()) { - final TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); - if (tile instanceof TileEntityFlower) { - final TileEntityFlower tileFlower = (TileEntityFlower) tile; - final IFlower flower = tileFlower.getFlower(); - if (flower != null) { - final NBTTagCompound info = new NBTTagCompound(); - info.setString("Species", flower.getGenome().getPrimary().getUID()); - info.setString("Species2", flower.getGenome().getSecondary().getUID()); - info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan()); - info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID()); - info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID()); - info.setBoolean("Wilting", flower.isWilted()); - info.setBoolean("Flowered", flower.hasFlowered()); - Botany.proxy.sendToPlayer(new MessageNBT(PacketID.Encylopedia.ordinal(), info), event.entityPlayer); - event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer); - } + if (event.entityPlayer != null + && event.entityPlayer.getHeldItem() != null + && event.entityPlayer.getHeldItem().getItem() == BinnieCore.fieldKit + && event.entityPlayer.isSneaking()) { + TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); + if (!(tile instanceof TileEntityFlower)) { + return; } + + TileEntityFlower tileFlower = (TileEntityFlower) tile; + IFlower flower = tileFlower.getFlower(); + if (flower == null) { + return; + } + + NBTTagCompound info = new NBTTagCompound(); + info.setString("Species", flower.getGenome().getPrimary().getUID()); + info.setString("Species2", flower.getGenome().getSecondary().getUID()); + info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan()); + info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID()); + info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID()); + info.setBoolean("Wilting", flower.isWilted()); + info.setBoolean("Flowered", flower.hasFlowered()); + Botany.proxy.sendToPlayer(new MessageNBT(PacketID.Encylopedia.ordinal(), info), event.entityPlayer); + event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer); } } } diff --git a/src/main/java/binnie/core/language/ManagerLanguage.java b/src/main/java/binnie/core/language/ManagerLanguage.java index 755cf695..13831dff 100644 --- a/src/main/java/binnie/core/language/ManagerLanguage.java +++ b/src/main/java/binnie/core/language/ManagerLanguage.java @@ -1,58 +1,57 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.language; -import net.minecraft.util.StatCollector; import binnie.core.AbstractMod; +import binnie.core.ManagerBase; +import net.minecraft.util.StatCollector; + import java.util.HashMap; import java.util.Map; -import binnie.core.ManagerBase; -public class ManagerLanguage extends ManagerBase -{ +public class ManagerLanguage extends ManagerBase { private Map objNames; public ManagerLanguage() { - this.objNames = new HashMap(); + objNames = new HashMap<>(); } - public void addObjectName(final Object obj, final String name) { - this.objNames.put(obj, name); + public void addObjectName(Object obj, String name) { + objNames.put(obj, name); } - public String unlocalised(final AbstractMod mod, final String id) { + public String unlocalised(AbstractMod mod, String id) { return mod.getModID() + "." + id; } - public String localise(final Object key) { - final String loc = StatCollector.translateToLocal(key.toString()); + public String localise(Object key) { + String loc = StatCollector.translateToLocal(key.toString()); if (loc.equals(key.toString())) { - return this.objNames.containsKey(key) ? this.localise(this.objNames.get(key)) : key.toString(); + if (objNames.containsKey(key)) { + return localise(objNames.get(key)); + } + return key.toString(); } return loc; } - public String localise(final AbstractMod mod, final String id) { - return this.localise(this.unlocalised(mod, id)); + public String localise(AbstractMod mod, String id) { + return localise(unlocalised(mod, id)); } - public String localiseOrBlank(final AbstractMod mod, final String id) { - return this.localiseOrBlank(this.unlocalised(mod, id)); + public String localiseOrBlank(AbstractMod mod, String id) { + return localiseOrBlank(unlocalised(mod, id)); } - public String localise(final AbstractMod mod, final String id, final Object... objs) { - return String.format(this.localise(mod, id), objs); + public String localise(AbstractMod mod, String id, Object... objs) { + return String.format(localise(mod, id), objs); } - public String localiseOrBlank(final Object key) { - final String trans = this.localise(key); + public String localiseOrBlank(Object key) { + String trans = localise(key); return trans.equals(key) ? "" : trans; } - public boolean canLocalise(final Object key) { - final String trans = this.localise(key); + public boolean canLocalise(Object key) { + String trans = localise(key); return !trans.equals(key); } } diff --git a/src/main/java/binnie/core/liquid/BinnieFluid.java b/src/main/java/binnie/core/liquid/BinnieFluid.java index cba22f09..d700f1b3 100644 --- a/src/main/java/binnie/core/liquid/BinnieFluid.java +++ b/src/main/java/binnie/core/liquid/BinnieFluid.java @@ -1,33 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.liquid; import net.minecraftforge.fluids.Fluid; -class BinnieFluid extends Fluid -{ - private final String name; - final IFluidType fluidType; +class BinnieFluid extends Fluid { + protected IFluidType fluidType; + + private String name; @Override + // TODO fix deprecated usage public String getLocalizedName() { - return this.name; + return name; } - public BinnieFluid(final IFluidType fluid) { + public BinnieFluid(IFluidType fluid) { super(fluid.getIdentifier()); - this.fluidType = fluid; - this.name = fluid.getName(); + fluidType = fluid; + name = fluid.getName(); } @Override public int getColor() { - return this.fluidType.getColour(); + return fluidType.getColour(); } public IFluidType getType() { - return this.fluidType; + return fluidType; } } diff --git a/src/main/java/binnie/core/liquid/FluidContainer.java b/src/main/java/binnie/core/liquid/FluidContainer.java index 823b5187..860600f5 100644 --- a/src/main/java/binnie/core/liquid/FluidContainer.java +++ b/src/main/java/binnie/core/liquid/FluidContainer.java @@ -1,22 +1,17 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.liquid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import binnie.genetics.item.GeneticsItems; +import binnie.core.BinnieCore; import binnie.core.Mods; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; +import binnie.genetics.item.GeneticsItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.core.BinnieCore; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidContainerRegistry; -public enum FluidContainer -{ +public enum FluidContainer { Bucket, Capsule, Refractory, @@ -24,72 +19,78 @@ public enum FluidContainer Glass, Cylinder; - IIcon bottle; - IIcon contents; - ItemFluidContainer item; + protected IIcon bottle; + protected IIcon contents; + protected ItemFluidContainer item; public int getMaxStackSize() { return (this == FluidContainer.Bucket) ? 1 : 16; } @SideOnly(Side.CLIENT) - public void updateIcons(final IIconRegister register) { - this.bottle = BinnieCore.proxy.getIcon(register, (this == FluidContainer.Cylinder) ? "binniecore" : "forestry", "liquids/" + this.toString().toLowerCase() + ".bottle"); - this.contents = BinnieCore.proxy.getIcon(register, (this == FluidContainer.Cylinder) ? "binniecore" : "forestry", "liquids/" + this.toString().toLowerCase() + ".contents"); + public void updateIcons(IIconRegister register) { + String liquidName = "liquids/" + toString().toLowerCase(); + String modName; + if (this == FluidContainer.Cylinder) { + modName = "binniecore"; + } else { + modName = "forestry"; + } + bottle = BinnieCore.proxy.getIcon(register, modName, liquidName + ".bottle"); + contents = BinnieCore.proxy.getIcon(register, modName, liquidName + ".contents"); } public IIcon getBottleIcon() { - return this.bottle; + return bottle; } public IIcon getContentsIcon() { - return this.contents; + return contents; } public String getName() { - return BinnieCore.proxy.localise("item.container." + this.name().toLowerCase()); + return BinnieCore.proxy.localise("item.container." + name().toLowerCase()); } public boolean isActive() { - return this.getEmpty() != null; + return getEmpty() != null; } public ItemStack getEmpty() { switch (this) { - case Bucket: { - return new ItemStack(Items.bucket, 1, 0); - } - case Can: { - return Mods.Forestry.stack("canEmpty"); - } - case Capsule: { - return Mods.Forestry.stack("waxCapsule"); - } - case Glass: { - return new ItemStack(Items.glass_bottle, 1, 0); - } - case Refractory: { - return Mods.Forestry.stack("refractoryEmpty"); - } - case Cylinder: { - return GeneticsItems.Cylinder.get(1); - } - default: { - return null; - } + case Bucket: + return new ItemStack(Items.bucket, 1, 0); + + case Can: + return Mods.Forestry.stack("canEmpty"); + + case Capsule: + return Mods.Forestry.stack("waxCapsule"); + + case Glass: + return new ItemStack(Items.glass_bottle, 1, 0); + + case Refractory: + return Mods.Forestry.stack("refractoryEmpty"); + + case Cylinder: + return GeneticsItems.Cylinder.get(1); } + return null; } - public void registerContainerData(final IFluidType fluid) { - if (!this.isActive()) { + public void registerContainerData(IFluidType fluid) { + if (!isActive()) { return; } - final ItemStack filled = this.item.getContainer(fluid); - final ItemStack empty = this.getEmpty(); + + ItemStack filled = item.getContainer(fluid); + ItemStack empty = getEmpty(); if (filled == null || empty == null || fluid.get(1000) == null) { return; } - final FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(fluid.get(1000), filled, empty); + + FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(fluid.get(1000), filled, empty); FluidContainerRegistry.registerFluidContainer(data); } } diff --git a/src/main/java/binnie/core/liquid/IFluidType.java b/src/main/java/binnie/core/liquid/IFluidType.java index 0972efe3..c6e03313 100644 --- a/src/main/java/binnie/core/liquid/IFluidType.java +++ b/src/main/java/binnie/core/liquid/IFluidType.java @@ -1,24 +1,19 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.liquid; -import net.minecraftforge.fluids.FluidStack; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; -public interface IFluidType -{ +public interface IFluidType { IIcon getIcon(); - void registerIcon(final IIconRegister p0); + void registerIcon(IIconRegister register); String getName(); String getIdentifier(); - FluidStack get(final int p0); + FluidStack get(int amount); int getColour(); @@ -26,7 +21,7 @@ public interface IFluidType int getTransparency(); - boolean canPlaceIn(final FluidContainer p0); + boolean canPlaceIn(FluidContainer container); - boolean showInCreative(final FluidContainer p0); + boolean showInCreative(FluidContainer container); } diff --git a/src/main/java/binnie/core/liquid/ILiquidType.java b/src/main/java/binnie/core/liquid/ILiquidType.java index 9ca1556b..b3508645 100644 --- a/src/main/java/binnie/core/liquid/ILiquidType.java +++ b/src/main/java/binnie/core/liquid/ILiquidType.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.liquid; public interface ILiquidType extends IFluidType diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 1770377b..c4b6d4cd 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -1,112 +1,105 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.liquid; -import java.util.HashMap; -import net.minecraft.item.EnumAction; -import binnie.extratrees.alcohol.drink.IDrinkLiquid; +import binnie.Binnie; import binnie.extratrees.alcohol.AlcoholEffect; import binnie.extratrees.alcohol.drink.DrinkManager; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import net.minecraft.util.IIcon; -import java.util.List; -import net.minecraft.item.Item; +import binnie.extratrees.alcohol.drink.IDrinkLiquid; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.Binnie; -import net.minecraftforge.fluids.FluidStack; -import net.minecraft.item.ItemStack; import net.minecraft.creativetab.CreativeTabs; -import java.util.Map; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; -public class ItemFluidContainer extends ItemFood -{ +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class ItemFluidContainer extends ItemFood { private FluidContainer container; - public static int LiquidExtraBee; - public static int LiquidExtraTree; - public static int LiquidJuice; - public static int LiquidAlcohol; - public static int LiquidSpirit; - public static int LiquidLiqueuer; - public static int LiquidGenetics; - private static Map idToFluid; - private static Map fluidToID; + public static int LiquidExtraBee = 64; + public static int LiquidExtraTree = 128; + public static int LiquidJuice = 256; + public static int LiquidAlcohol = 384; + public static int LiquidSpirit = 512; + public static int LiquidLiqueuer = 640; + public static int LiquidGenetics = 768; - public static void registerFluid(final IFluidType fluid, final int id) { + private static Map idToFluid = new HashMap(); + private static Map fluidToID = new HashMap(); + + public static void registerFluid(IFluidType fluid, int id) { ItemFluidContainer.idToFluid.put(id, fluid.getIdentifier().toLowerCase()); ItemFluidContainer.fluidToID.put(fluid.getIdentifier().toLowerCase(), id); } - public ItemFluidContainer(final FluidContainer container) { + public ItemFluidContainer(FluidContainer container) { super(0, false); this.container = container; container.item = this; - this.maxStackSize = container.getMaxStackSize(); - this.setHasSubtypes(true); - this.setUnlocalizedName("container" + container.name()); - this.setCreativeTab(CreativeTabs.tabMaterials); + maxStackSize = container.getMaxStackSize(); + setHasSubtypes(true); + setUnlocalizedName("container" + container.name()); + setCreativeTab(CreativeTabs.tabMaterials); } - private FluidStack getLiquid(final ItemStack stack) { - final String liquid = ItemFluidContainer.idToFluid.get(stack.getItemDamage()); + private FluidStack getLiquid(ItemStack stack) { + String liquid = ItemFluidContainer.idToFluid.get(stack.getItemDamage()); return (liquid == null) ? null : Binnie.Liquid.getLiquidStack(liquid, 1000); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.container.updateIcons(register); + public void registerIcons(IIconRegister register) { + container.updateIcons(register); } @Override - public String getItemStackDisplayName(final ItemStack itemstack) { + public String getItemStackDisplayName(ItemStack itemstack) { if (itemstack == null) { return "???"; } - final FluidStack fluid = this.getLiquid(itemstack); + + FluidStack fluid = getLiquid(itemstack); if (fluid == null) { return "Missing Fluid"; } - return fluid.getFluid().getLocalizedName(fluid) + " " + this.container.getName(); + return fluid.getFluid().getLocalizedName(fluid) + " " + container.getName(); } @Override - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { - for (final IFluidType liquid : Binnie.Liquid.fluids.values()) { - if (!liquid.canPlaceIn(this.container)) { - continue; - } - if (!liquid.showInCreative(this.container)) { + public void getSubItems(Item item, CreativeTabs tab, List itemList) { + for (IFluidType liquid : Binnie.Liquid.fluids.values()) { + if (!liquid.canPlaceIn(container) || !liquid.showInCreative(container)) { continue; } itemList.add(this.getContainer(liquid)); } } - public ItemStack getContainer(final IFluidType liquid) { - final int id = ItemFluidContainer.fluidToID.get(liquid.getIdentifier().toLowerCase()); - final ItemStack itemstack = new ItemStack(this, 1, id); - return itemstack; + public ItemStack getContainer(IFluidType liquid) { + int id = ItemFluidContainer.fluidToID.get(liquid.getIdentifier().toLowerCase()); + return new ItemStack(this, 1, id); } @Override - public IIcon getIcon(final ItemStack itemstack, final int j) { + public IIcon getIcon(ItemStack itemStack, int j) { if (j > 0) { - return this.container.getBottleIcon(); + return container.getBottleIcon(); } - return this.container.getContentsIcon(); + return container.getContentsIcon(); } @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(final ItemStack item, final int pass) { - final FluidStack fluid = this.getLiquid(item); + public int getColorFromItemStack(ItemStack item, int pass) { + FluidStack fluid = this.getLiquid(item); if (fluid == null) { return 16777215; } @@ -122,67 +115,57 @@ public class ItemFluidContainer extends ItemFood } @Override - public ItemStack onEaten(final ItemStack stack, final World world, final EntityPlayer player) { + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { player.getFoodStats().func_151686_a(this, stack); world.playSoundAtEntity(player, "random.burp", 0.5f, world.rand.nextFloat() * 0.1f + 0.9f); - this.onFoodEaten(stack, world, player); - return this.container.getEmpty(); + onFoodEaten(stack, world, player); + return container.getEmpty(); } @Override - protected void onFoodEaten(final ItemStack stack, final World world, final EntityPlayer player) { - if (!world.isRemote) { - final FluidStack fluid = this.getLiquid(stack); - final IDrinkLiquid liquid = DrinkManager.getLiquid(fluid); - if (liquid != null) { - AlcoholEffect.makeDrunk(player, liquid.getABV() * fluid.amount); - } + protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { + if (world.isRemote) { + return; + } + + FluidStack fluid = this.getLiquid(stack); + IDrinkLiquid liquid = DrinkManager.getLiquid(fluid); + if (liquid != null) { + AlcoholEffect.makeDrunk(player, liquid.getABV() * fluid.amount); } } @Override - public int getMaxItemUseDuration(final ItemStack stack) { + public int getMaxItemUseDuration(ItemStack stack) { return 32; } @Override - public EnumAction getItemUseAction(final ItemStack stack) { - return this.isDrinkable(stack) ? EnumAction.drink : EnumAction.none; + public EnumAction getItemUseAction(ItemStack stack) { + return isDrinkable(stack) ? EnumAction.drink : EnumAction.none; } @Override - public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer player) { - if (this.isDrinkable(stack)) { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (isDrinkable(stack)) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } return stack; } @Override - public int func_150905_g(final ItemStack p_150905_1_) { + public int func_150905_g(ItemStack p_150905_1_) { return 0; } @Override - public float func_150906_h(final ItemStack p_150906_1_) { + public float func_150906_h(ItemStack p_150906_1_) { return 0.0f; } - private boolean isDrinkable(final ItemStack stack) { - final FluidStack fluid = this.getLiquid(stack); - final IDrinkLiquid liquid = DrinkManager.getLiquid(fluid); + private boolean isDrinkable(ItemStack stack) { + FluidStack fluid = this.getLiquid(stack); + IDrinkLiquid liquid = DrinkManager.getLiquid(fluid); return liquid != null && liquid.isConsumable(); } - - static { - ItemFluidContainer.LiquidExtraBee = 64; - ItemFluidContainer.LiquidExtraTree = 128; - ItemFluidContainer.LiquidJuice = 256; - ItemFluidContainer.LiquidAlcohol = 384; - ItemFluidContainer.LiquidSpirit = 512; - ItemFluidContainer.LiquidLiqueuer = 640; - ItemFluidContainer.LiquidGenetics = 768; - ItemFluidContainer.idToFluid = new HashMap(); - ItemFluidContainer.fluidToID = new HashMap(); - } } diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 846a117b..356faf20 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -1,57 +1,53 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.liquid; +import binnie.core.ManagerBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; -import binnie.core.ManagerBase; -public class ManagerLiquid extends ManagerBase -{ +public class ManagerLiquid extends ManagerBase { Map fluids; public ManagerLiquid() { - this.fluids = new LinkedHashMap(); + fluids = new LinkedHashMap(); } public Collection getFluidTypes() { - return this.fluids.values(); + return fluids.values(); } - public void createLiquids(final IFluidType[] liquids, int startID) { - for (final IFluidType liquid : liquids) { - final BinnieFluid fluid = this.createLiquid(liquid, startID++); + public void createLiquids(IFluidType[] liquids, int startID) { + for (IFluidType liquid : liquids) { + BinnieFluid fluid = this.createLiquid(liquid, startID++); if (fluid == null) { throw new RuntimeException("Liquid registered incorrectly - " + liquid.getIdentifier()); } } } - public BinnieFluid createLiquid(final IFluidType fluid, final int id) { - this.fluids.put(fluid.getIdentifier().toLowerCase(), fluid); - final BinnieFluid bFluid = new BinnieFluid(fluid); - FluidRegistry.registerFluid(bFluid); + public BinnieFluid createLiquid(IFluidType fluid, int id) { + fluids.put(fluid.getIdentifier().toLowerCase(), fluid); + BinnieFluid binnieFluid = new BinnieFluid(fluid); + FluidRegistry.registerFluid(binnieFluid); ItemFluidContainer.registerFluid(fluid, id); - return bFluid; + return binnieFluid; } - public FluidStack getLiquidStack(final String name, final int amount) { + public FluidStack getLiquidStack(String name, int amount) { return FluidRegistry.getFluidStack(name.toLowerCase(), amount); } @SideOnly(Side.CLIENT) - public void reloadIcons(final IIconRegister register) { - for (final IFluidType type : this.fluids.values()) { - final Fluid fluid = this.getLiquidStack(type.getIdentifier(), 1).getFluid(); + public void reloadIcons(IIconRegister register) { + for (IFluidType type : fluids.values()) { + Fluid fluid = getLiquidStack(type.getIdentifier(), 1).getFluid(); type.registerIcon(register); if (fluid == null) { throw new RuntimeException("[Binnie] Liquid not registered properly - " + type.getIdentifier()); @@ -62,12 +58,13 @@ public class ManagerLiquid extends ManagerBase @Override public void init() { + // ignored } @Override public void postInit() { - for (final IFluidType fluid : this.fluids.values()) { - for (final FluidContainer container : FluidContainer.values()) { + for (IFluidType fluid : fluids.values()) { + for (FluidContainer container : FluidContainer.values()) { if (container.isActive() && fluid.canPlaceIn(container)) { container.registerContainerData(fluid); } @@ -75,7 +72,7 @@ public class ManagerLiquid extends ManagerBase } } - public IFluidType getFluidType(final String liquid) { - return this.fluids.get(liquid.toLowerCase()); + public IFluidType getFluidType(String liquid) { + return fluids.get(liquid.toLowerCase()); } } diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index 4eabf6be..4ae5f26f 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -1,46 +1,42 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -import java.util.ArrayList; +import binnie.Binnie; +import binnie.core.BinnieCore; import binnie.core.machines.component.IRender; -import java.util.Random; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraft.entity.EntityLivingBase; -import binnie.core.BinnieCore; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import binnie.Binnie; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockContainer; -class BlockMachine extends BlockContainer implements IBlockMachine -{ +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +class BlockMachine extends BlockContainer implements IBlockMachine { private MachineGroup group; - public BlockMachine(final MachineGroup group, final String blockName) { + public BlockMachine(MachineGroup group, String blockName) { super(Material.iron); this.group = group; - this.setHardness(1.5f); - this.setBlockName(blockName); + setHardness(1.5f); + setBlockName(blockName); } @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { - for (final MachinePackage pack : this.group.getPackages()) { + public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { + for (MachinePackage pack : group.getPackages()) { if (pack.isActive()) { itemList.add(new ItemStack(this, 1, pack.getMetadata())); } @@ -54,7 +50,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine @Override public boolean renderAsNormalBlock() { - return !this.group.customRenderer; + return !group.customRenderer; } @Override @@ -63,42 +59,42 @@ class BlockMachine extends BlockContainer implements IBlockMachine } @Override - public TileEntity createTileEntity(final World world, final int metadata) { - if (this.group.getPackage(metadata) == null) { + public TileEntity createTileEntity(World world, int meta) { + MachinePackage pkg = group.getPackage(meta); + if (pkg == null) { return null; } - return this.group.getPackage(metadata).createTileEntity(); + return pkg.createTileEntity(); } @Override - public MachinePackage getPackage(final int meta) { - return this.group.getPackage(meta); + public MachinePackage getPackage(int meta) { + return group.getPackage(meta); } @Override - public String getMachineName(final int meta) { - return (this.getPackage(meta) == null) ? "Unnamed Machine" : this.getPackage(meta).getDisplayName(); + public String getMachineName(int meta) { + MachinePackage pkg = getPackage(meta); + return (pkg == null) ? "Unnamed Machine" : pkg.getDisplayName(); } @Override - public int damageDropped(final int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public TileEntity createNewTileEntity(final World var1, final int meta) { - return this.createTileEntity(var1, meta); + public TileEntity createNewTileEntity(World world, int meta) { + return createTileEntity(world, meta); } @Override - public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int par6, final float par7, final float par8, final float par9) { - if (!BinnieCore.proxy.isSimulating(world)) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float xOffset, float yOffset, float zOffset) { + if (!BinnieCore.proxy.isSimulating(world) || player.isSneaking()) { return true; } - if (player.isSneaking()) { - return true; - } - final TileEntity entity = world.getTileEntity(x, y, z); + + TileEntity entity = world.getTileEntity(x, y, z); if (entity instanceof TileEntityMachine) { ((TileEntityMachine) entity).getMachine().onRightClick(world, player, x, y, z); } @@ -106,23 +102,25 @@ class BlockMachine extends BlockContainer implements IBlockMachine } @Override - public void onBlockPlacedBy(final World world, final int i, final int j, final int k, final EntityLivingBase entityliving, final ItemStack stack) { - super.onBlockPlacedBy(world, i, j, k, entityliving, stack); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, entity, stack); if (!BinnieCore.proxy.isSimulating(world)) { return; } - final IMachine machine = Machine.getMachine(world.getTileEntity(i, j, k)); + + IMachine machine = Machine.getMachine(world.getTileEntity(x, y, z)); if (machine == null) { return; } - if (entityliving instanceof EntityPlayer) { - machine.setOwner(((EntityPlayer) entityliving).getGameProfile()); + + if (entity instanceof EntityPlayer) { + machine.setOwner(((EntityPlayer) entity).getGameProfile()); } } @Override - public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { - final TileEntity entity = world.getTileEntity(x, y, z); + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileEntity entity = world.getTileEntity(x, y, z); if (entity instanceof TileEntityMachine && ((TileEntityMachine) entity).getMachine().hasInterface(IMachineTexturedFaces.class)) { return ((TileEntityMachine) entity).getMachine().getInterface(IMachineTexturedFaces.class).getIcon(side); } @@ -130,51 +128,50 @@ class BlockMachine extends BlockContainer implements IBlockMachine } @Override - public void breakBlock(final World world, final int x, final int y, final int z, final Block par5, final int par6) { - final TileEntity tileentity = world.getTileEntity(x, y, z); + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + TileEntity tileentity = world.getTileEntity(x, y, z); if (!(tileentity instanceof TileEntityMachine)) { return; } - final TileEntityMachine entity = (TileEntityMachine) tileentity; - if (entity != null) { - entity.onBlockDestroy(); - } - super.breakBlock(world, x, y, z, par5, par6); + + TileEntityMachine entity = (TileEntityMachine) tileentity; + entity.onBlockDestroy(); + super.breakBlock(world, x, y, z, block, meta); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { + // ignored } @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random rand) { - final IMachine machine = Machine.getMachine(world.getTileEntity(x, y, z)); + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + IMachine machine = Machine.getMachine(world.getTileEntity(x, y, z)); if (machine != null) { - for (final IRender.RandomDisplayTick renders : machine.getInterfaces(IRender.RandomDisplayTick.class)) { + for (IRender.RandomDisplayTick renders : machine.getInterfaces(IRender.RandomDisplayTick.class)) { renders.onRandomDisplayTick(world, x, y, z, rand); } } } @Override - public ArrayList getDrops(final World world, final int x, final int y, final int z, final int metadata, final int fortune) { - return new ArrayList(); + public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { + return new ArrayList<>(); } @Override - public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z, final boolean willHarvest) { - if (BinnieCore.proxy.isSimulating(world) && this.canHarvestBlock(player, world.getBlockMetadata(x, y, z)) && !player.capabilities.isCreativeMode) { - final int metadata = world.getBlockMetadata(x, y, z); - final ItemStack stack = new ItemStack(Item.getItemFromBlock(this), 1, this.damageDropped(metadata)); - this.dropBlockAsItem(world, x, y, z, stack); + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + if (BinnieCore.proxy.isSimulating(world) && canHarvestBlock(player, world.getBlockMetadata(x, y, z)) && !player.capabilities.isCreativeMode) { + int metadata = world.getBlockMetadata(x, y, z); + ItemStack stack = new ItemStack(Item.getItemFromBlock(this), 1, damageDropped(metadata)); + dropBlockAsItem(world, x, y, z, stack); } return world.setBlockToAir(x, y, z); } - public interface IMachineTexturedFaces - { - IIcon getIcon(final int p0); + public interface IMachineTexturedFaces { + IIcon getIcon(int p0); } } diff --git a/src/main/java/binnie/core/machines/IBlockMachine.java b/src/main/java/binnie/core/machines/IBlockMachine.java index e14df469..e11b4833 100644 --- a/src/main/java/binnie/core/machines/IBlockMachine.java +++ b/src/main/java/binnie/core/machines/IBlockMachine.java @@ -1,12 +1,7 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -interface IBlockMachine -{ - MachinePackage getPackage(final int p0); +interface IBlockMachine { + MachinePackage getPackage(int meta); - String getMachineName(final int p0); + String getMachineName(int meta); } diff --git a/src/main/java/binnie/core/machines/IMachine.java b/src/main/java/binnie/core/machines/IMachine.java index 87dcac7d..58bc5fa1 100644 --- a/src/main/java/binnie/core/machines/IMachine.java +++ b/src/main/java/binnie/core/machines/IMachine.java @@ -1,20 +1,16 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -import java.util.Collection; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public interface IMachine extends IOwnable -{ - void addComponent(final MachineComponent p0); +import java.util.Collection; + +public interface IMachine extends IOwnable { + void addComponent(MachineComponent component); MachineUtil getMachineUtil(); - T getInterface(final Class p0); + T getInterface(Class cls); void markDirty(); @@ -22,7 +18,7 @@ public interface IMachine extends IOwnable TileEntity getTileEntity(); - Collection getInterfaces(final Class p0); + Collection getInterfaces(Class cls); MachinePackage getPackage(); } diff --git a/src/main/java/binnie/core/machines/IMachineType.java b/src/main/java/binnie/core/machines/IMachineType.java index 70898f4a..3d89fa8f 100644 --- a/src/main/java/binnie/core/machines/IMachineType.java +++ b/src/main/java/binnie/core/machines/IMachineType.java @@ -1,13 +1,8 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; import binnie.core.network.IOrdinaled; -public interface IMachineType extends IOrdinaled -{ +public interface IMachineType extends IOrdinaled { Class getPackageClass(); boolean isActive(); diff --git a/src/main/java/binnie/core/machines/IOwnable.java b/src/main/java/binnie/core/machines/IOwnable.java index d56be7d2..cd1bb643 100644 --- a/src/main/java/binnie/core/machines/IOwnable.java +++ b/src/main/java/binnie/core/machines/IOwnable.java @@ -1,14 +1,9 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; import com.mojang.authlib.GameProfile; -interface IOwnable -{ +interface IOwnable { GameProfile getOwner(); - void setOwner(final GameProfile p0); + void setOwner(GameProfile owner); } diff --git a/src/main/java/binnie/core/machines/ItemMachine.java b/src/main/java/binnie/core/machines/ItemMachine.java index 7a13589b..96262e72 100644 --- a/src/main/java/binnie/core/machines/ItemMachine.java +++ b/src/main/java/binnie/core/machines/ItemMachine.java @@ -1,31 +1,26 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -import net.minecraft.item.ItemStack; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; -public class ItemMachine extends ItemBlock -{ +public class ItemMachine extends ItemBlock { private IBlockMachine associatedBlock; - public ItemMachine(final Block block) { + public ItemMachine(Block block) { super(block); - this.setMaxDamage(0); - this.setHasSubtypes(true); - this.associatedBlock = (IBlockMachine) block; + setMaxDamage(0); + setHasSubtypes(true); + associatedBlock = (IBlockMachine) block; } @Override - public int getMetadata(final int i) { + public int getMetadata(int i) { return i; } @Override - public String getItemStackDisplayName(final ItemStack itemstack) { - return this.associatedBlock.getMachineName(itemstack.getItemDamage()); + public String getItemStackDisplayName(ItemStack itemstack) { + return associatedBlock.getMachineName(itemstack.getItemDamage()); } } diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index af7ae740..9326a8ea 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -1,38 +1,32 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import binnie.core.network.packet.MessageTileNBT; -import binnie.core.network.BinnieCorePacketID; -import net.minecraft.network.Packet; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.nbt.NBTTagCompound; -import binnie.core.machines.power.ITankMachine; -import net.minecraft.inventory.IInventory; -import binnie.core.machines.component.IRender; -import binnie.core.machines.component.IInteraction; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import binnie.core.network.packet.PacketPayload; -import cpw.mods.fml.relauncher.Side; import binnie.core.BinnieCore; -import java.util.Collection; -import java.util.ArrayList; -import java.util.LinkedHashMap; +import binnie.core.machines.component.IInteraction; +import binnie.core.machines.component.IRender; +import binnie.core.machines.network.INetwork; +import binnie.core.machines.power.ITankMachine; +import binnie.core.network.BinnieCorePacketID; +import binnie.core.network.INetworkedEntity; +import binnie.core.network.packet.MessageTileNBT; +import binnie.core.network.packet.PacketPayload; import com.mojang.authlib.GameProfile; +import cpw.mods.fml.relauncher.Side; +import forestry.api.core.INBTTagable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import binnie.core.machines.network.INetwork; -import forestry.api.core.INBTTagable; -import binnie.core.network.INetworkedEntity; -public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT -{ +public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT { private MachinePackage machinePackage; private Map> componentInterfaceMap; private Map, MachineComponent> componentMap; @@ -41,74 +35,78 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack private int nextProgressBarID; private GameProfile owner; - public Machine(final MachinePackage pack, final TileEntity tile) { - this.componentInterfaceMap = new LinkedHashMap>(); - this.componentMap = new LinkedHashMap, MachineComponent>(); - this.queuedInventoryUpdate = false; - this.nextProgressBarID = 0; - this.owner = null; + public Machine(MachinePackage pack, TileEntity tile) { + componentInterfaceMap = new LinkedHashMap<>(); + componentMap = new LinkedHashMap<>(); + queuedInventoryUpdate = false; + nextProgressBarID = 0; + owner = null; this.tile = tile; pack.createMachine(this); - this.machinePackage = pack; + machinePackage = pack; } @Override - public void addComponent(final MachineComponent component) { + public void addComponent(MachineComponent component) { if (component == null) { throw new NullPointerException("Can't have a null machine component!"); } component.setMachine(this); - this.componentMap.put(component.getClass(), component); - for (final Class inter : component.getComponentInterfaces()) { - if (!this.componentInterfaceMap.containsKey(inter)) { - this.componentInterfaceMap.put(inter, new ArrayList()); + componentMap.put(component.getClass(), component); + for (Class inter : component.getComponentInterfaces()) { + if (!componentInterfaceMap.containsKey(inter)) { + componentInterfaceMap.put(inter, new ArrayList<>()); } - this.componentInterfaceMap.get(inter).add(component); + componentInterfaceMap.get(inter).add(component); } } public Collection getComponents() { - return this.componentMap.values(); + return componentMap.values(); } - public T getComponent(final Class componentClass) { - return this.hasComponent(componentClass) ? ((T) componentClass.cast(this.componentMap.get(componentClass))) : null; + public T getComponent(Class componentClass) { + if (hasComponent(componentClass)) { + return componentClass.cast(componentMap.get(componentClass)); + } + return null; } @Override - public T getInterface(final Class interfaceClass) { - if (this.hasInterface(interfaceClass)) { - return this.getInterfaces(interfaceClass).get(0); + public T getInterface(Class cls) { + if (this.hasInterface(cls)) { + return getInterfaces(cls).get(0); } - if (interfaceClass.isInstance(this.getPackage())) { - return interfaceClass.cast(this.getPackage()); + if (cls.isInstance(getPackage())) { + return cls.cast(getPackage()); } - for (final MachineComponent component : this.getComponents()) { - if (interfaceClass.isInstance(component)) { - return interfaceClass.cast(component); + + for (MachineComponent component : getComponents()) { + if (cls.isInstance(component)) { + return cls.cast(component); } } return null; } @Override - public List getInterfaces(final Class interfaceClass) { - final ArrayList interfaces = new ArrayList(); - if (!this.hasInterface(interfaceClass)) { + public List getInterfaces(Class cls) { + ArrayList interfaces = new ArrayList<>(); + if (!hasInterface(cls)) { return interfaces; } - for (final MachineComponent component : this.componentInterfaceMap.get(interfaceClass)) { - interfaces.add(interfaceClass.cast(component)); + for (MachineComponent component : componentInterfaceMap.get(cls)) { + interfaces.add(cls.cast(component)); } return interfaces; } - public boolean hasInterface(final Class interfaceClass) { - return this.componentInterfaceMap.containsKey(interfaceClass); + public boolean hasInterface(Class interfaceClass) { + return componentInterfaceMap.containsKey(interfaceClass); } - public boolean hasComponent(final Class componentClass) { - return this.componentMap.containsKey(componentClass); + public boolean hasComponent(Class componentClass) { + return componentMap.containsKey(componentClass); } @Override @@ -117,19 +115,19 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack } public void sendPacket() { - if (!BinnieCore.proxy.isSimulating(this.getTileEntity().getWorldObj())) { + if (!BinnieCore.proxy.isSimulating(getTileEntity().getWorldObj())) { return; } - BinnieCore.proxy.sendNetworkEntityPacket((INetworkedEntity) this.getTileEntity()); + BinnieCore.proxy.sendNetworkEntityPacket((INetworkedEntity) getTileEntity()); } public Side getSide() { - return BinnieCore.proxy.isSimulating(this.getTileEntity().getWorldObj()) ? Side.SERVER : Side.CLIENT; + return BinnieCore.proxy.isSimulating(getTileEntity().getWorldObj()) ? Side.SERVER : Side.CLIENT; } @Override - public void writeToPacket(final PacketPayload payload) { - for (final MachineComponent component : this.getComponents()) { + public void writeToPacket(PacketPayload payload) { + for (MachineComponent component : getComponents()) { if (component instanceof INetworkedEntity) { ((INetworkedEntity) component).writeToPacket(payload); } @@ -137,69 +135,70 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack } @Override - public void readFromPacket(final PacketPayload payload) { - for (final MachineComponent component : this.getComponents()) { + public void readFromPacket(PacketPayload payload) { + for (MachineComponent component : getComponents()) { if (component instanceof INetworkedEntity) { ((INetworkedEntity) component).readFromPacket(payload); } } } - public void onRightClick(final World world, final EntityPlayer player, final int x, final int y, final int z) { - for (final IInteraction.RightClick component : this.getInterfaces(IInteraction.RightClick.class)) { + public void onRightClick(World world, EntityPlayer player, int x, int y, int z) { + for (IInteraction.RightClick component : getInterfaces(IInteraction.RightClick.class)) { component.onRightClick(world, player, x, y, z); } } @Override public void markDirty() { - this.queuedInventoryUpdate = true; + queuedInventoryUpdate = true; } public void onUpdate() { - if (BinnieCore.proxy.isSimulating(this.getWorld())) { - for (final MachineComponent component : this.getComponents()) { + if (BinnieCore.proxy.isSimulating(getWorld())) { + for (MachineComponent component : getComponents()) { component.onUpdate(); } - } - else { - for (final IRender.DisplayTick renders : this.getInterfaces(IRender.DisplayTick.class)) { - renders.onDisplayTick(this.getWorld(), this.getTileEntity().xCoord, this.getTileEntity().yCoord, this.getTileEntity().zCoord, this.getWorld().rand); + } else { + for (IRender.DisplayTick renders : getInterfaces(IRender.DisplayTick.class)) { + TileEntity tileEntity = getTileEntity(); + renders.onDisplayTick(getWorld(), tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, getWorld().rand); } } - if (this.queuedInventoryUpdate) { - for (final MachineComponent component : this.getComponents()) { + + if (queuedInventoryUpdate) { + for (MachineComponent component : getComponents()) { component.onInventoryUpdate(); } - this.queuedInventoryUpdate = false; + queuedInventoryUpdate = false; } } public IInventory getInventory() { - return this.getInterface(IInventory.class); + return getInterface(IInventory.class); } public ITankMachine getTankContainer() { - return this.getInterface(ITankMachine.class); + return getInterface(ITankMachine.class); } @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { - for (final MachineComponent component : this.getComponents()) { + public void readFromNBT(NBTTagCompound nbttagcompound) { + for (MachineComponent component : getComponents()) { component.readFromNBT(nbttagcompound); } - this.owner = NBTUtil.func_152459_a(nbttagcompound.getCompoundTag("owner")); - this.markDirty(); + owner = NBTUtil.func_152459_a(nbttagcompound.getCompoundTag("owner")); + markDirty(); } @Override - public void writeToNBT(final NBTTagCompound nbttagcompound) { - for (final MachineComponent component : this.getComponents()) { + public void writeToNBT(NBTTagCompound nbttagcompound) { + for (MachineComponent component : getComponents()) { component.writeToNBT(nbttagcompound); } - if (this.owner != null) { - final NBTTagCompound nbt = new NBTTagCompound(); - NBTUtil.func_152460_a(nbt, this.owner); + if (owner != null) { + NBTTagCompound nbt = new NBTTagCompound(); + NBTUtil.func_152460_a(nbt, owner); nbttagcompound.setTag("owner", nbt); } } @@ -209,7 +208,7 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack return this.machinePackage; } - public static IMachine getMachine(final Object inventory) { + public static IMachine getMachine(Object inventory) { if (inventory != null && inventory instanceof IMachine) { return (IMachine) inventory; } @@ -222,8 +221,8 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack return null; } - public static T getInterface(final Class interfac, final Object inventory) { - final IMachine machine = getMachine(inventory); + public static T getInterface(Class interfac, Object inventory) { + IMachine machine = getMachine(inventory); if (machine != null) { return machine.getInterface(interfac); } @@ -240,63 +239,64 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack @Override public World getWorld() { - return this.getTileEntity().getWorldObj(); + return getTileEntity().getWorldObj(); } public void onBlockDestroy() { - for (final MachineComponent component : this.getComponents()) { + for (MachineComponent component : getComponents()) { component.onDestruction(); } } public int getUniqueProgressBarID() { - return this.nextProgressBarID++; + return nextProgressBarID++; } @Override public GameProfile getOwner() { - return this.owner; + return owner; } @Override - public void setOwner(final GameProfile owner) { + public void setOwner(GameProfile owner) { this.owner = owner; } public Packet getDescriptionPacket() { - final NBTTagCompound nbt = new NBTTagCompound(); - this.syncToNBT(nbt); + NBTTagCompound nbt = new NBTTagCompound(); + syncToNBT(nbt); if (nbt.hasNoTags()) { return null; } - return BinnieCore.instance.getNetworkWrapper().getPacketFrom(new MessageTileNBT(BinnieCorePacketID.TileDescriptionSync.ordinal(), this.getTileEntity(), nbt).GetMessage()); + MessageTileNBT tileNbt = new MessageTileNBT(BinnieCorePacketID.TileDescriptionSync.ordinal(), getTileEntity(), nbt); + return BinnieCore.instance.getNetworkWrapper().getPacketFrom(tileNbt.getMessage()); } @Override - public void syncToNBT(final NBTTagCompound nbt) { - for (final INetwork.TilePacketSync comp : this.getInterfaces(INetwork.TilePacketSync.class)) { + public void syncToNBT(NBTTagCompound nbt) { + for (INetwork.TilePacketSync comp : this.getInterfaces(INetwork.TilePacketSync.class)) { comp.syncToNBT(nbt); } } @Override - public void syncFromNBT(final NBTTagCompound nbt) { - for (final INetwork.TilePacketSync comp : this.getInterfaces(INetwork.TilePacketSync.class)) { + public void syncFromNBT(NBTTagCompound nbt) { + for (INetwork.TilePacketSync comp : getInterfaces(INetwork.TilePacketSync.class)) { comp.syncFromNBT(nbt); } } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { - for (final INetwork.RecieveGuiNBT recieve : this.getInterfaces(INetwork.RecieveGuiNBT.class)) { + public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { + for (INetwork.RecieveGuiNBT recieve : getInterfaces(INetwork.RecieveGuiNBT.class)) { recieve.recieveGuiNBT(side, player, name, nbt); } } @Override - public void sendGuiNBT(final Map nbt) { - for (final INetwork.SendGuiNBT recieve : this.getInterfaces(INetwork.SendGuiNBT.class)) { - recieve.sendGuiNBT(nbt); + public void sendGuiNBT(Map nbts) { + for (INetwork.SendGuiNBT recieve : getInterfaces(INetwork.SendGuiNBT.class)) { + recieve.sendGuiNBT(nbts); } } } diff --git a/src/main/java/binnie/core/machines/MachineComponent.java b/src/main/java/binnie/core/machines/MachineComponent.java index 4dd670c9..92d2049c 100644 --- a/src/main/java/binnie/core/machines/MachineComponent.java +++ b/src/main/java/binnie/core/machines/MachineComponent.java @@ -1,62 +1,58 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -import net.minecraft.inventory.IInventory; -import binnie.core.network.packet.MachinePayload; import binnie.Binnie; -import net.minecraft.nbt.NBTTagCompound; +import binnie.core.network.packet.MachinePayload; import forestry.api.core.INBTTagable; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; -public class MachineComponent implements INBTTagable -{ +public class MachineComponent implements INBTTagable { private IMachine machine; - public MachineComponent(final IMachine machine) { - this.setMachine(machine); + public MachineComponent(IMachine machine) { + setMachine(machine); machine.addComponent(this); } - public void setMachine(final IMachine machine) { + public void setMachine(IMachine machine) { this.machine = machine; } public IMachine getMachine() { - return this.machine; + return machine; } @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { + public void readFromNBT(NBTTagCompound nbttagcompound) { } @Override - public void writeToNBT(final NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { } public void onUpdate() { } public Class[] getComponentInterfaces() { - return Binnie.Machine.getComponentInterfaces(this.getClass()); + return Binnie.Machine.getComponentInterfaces(getClass()); } public void onInventoryUpdate() { } - public final MachinePayload getPayload() { - return new MachinePayload(Binnie.Machine.getNetworkID(this.getClass())); + public MachinePayload getPayload() { + return new MachinePayload(Binnie.Machine.getNetworkID(getClass())); } - public void recieveData(final MachinePayload payload) { + public void recieveData(MachinePayload payload) { } public MachineUtil getUtil() { - return this.getMachine().getMachineUtil(); + return getMachine().getMachineUtil(); } public void onDestruction() { + // desctruction } public IInventory getInventory() { diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index 2b922221..4e3cc66f 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -1,20 +1,15 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -import net.minecraft.creativetab.CreativeTabs; -import java.util.Collection; -import net.minecraft.block.Block; -import cpw.mods.fml.common.registry.GameRegistry; import binnie.Binnie; +import binnie.core.AbstractMod; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.creativetab.CreativeTabs; + +import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; -import binnie.core.AbstractMod; -public class MachineGroup -{ +public class MachineGroup { private AbstractMod mod; private String blockName; private String uid; @@ -24,81 +19,78 @@ public class MachineGroup public boolean customRenderer; private boolean renderedTileEntity; - public MachineGroup(final AbstractMod mod, final String uid, final String blockName, final IMachineType[] types) { - this.packages = new LinkedHashMap(); - this.packagesID = new LinkedHashMap(); - this.customRenderer = true; - this.renderedTileEntity = true; + public MachineGroup(AbstractMod mod, String uid, String blockName, IMachineType[] types) { + packages = new LinkedHashMap<>(); + packagesID = new LinkedHashMap<>(); + customRenderer = true; + renderedTileEntity = true; this.mod = mod; this.uid = uid; this.blockName = blockName; - for (final IMachineType type : types) { - if (type.getPackageClass() != null) { - if (type.isActive()) { - try { - final MachinePackage pack = type.getPackageClass().newInstance(); - pack.assignMetadata(type.ordinal()); - pack.setActive(type.isActive()); - this.addPackage(pack); - } catch (Exception e) { - throw new RuntimeException("Failed to create machine package " + type.toString(), e); - } + + for (IMachineType type : types) { + if (type.getPackageClass() != null && type.isActive()) { + try { + MachinePackage pack = type.getPackageClass().newInstance(); + pack.assignMetadata(type.ordinal()); + pack.setActive(type.isActive()); + addPackage(pack); + } catch (Exception e) { + throw new RuntimeException("Failed to create machine package " + type.toString(), e); } } } Binnie.Machine.registerMachineGroup(this); - this.block = new BlockMachine(this, blockName); - if (this.block != null) { - GameRegistry.registerBlock(this.block, ItemMachine.class, blockName); - for (final MachinePackage pack2 : this.getPackages()) { - pack2.register(); - } + block = new BlockMachine(this, blockName); + GameRegistry.registerBlock(block, ItemMachine.class, blockName); + for (MachinePackage pack2 : getPackages()) { + pack2.register(); } } - private void addPackage(final MachinePackage pack) { - this.packages.put(pack.getUID(), pack); - this.packagesID.put(pack.getMetadata(), pack); + private void addPackage(MachinePackage pack) { + packages.put(pack.getUID(), pack); + packagesID.put(pack.getMetadata(), pack); pack.setGroup(this); } public Collection getPackages() { - return this.packages.values(); + return packages.values(); } public BlockMachine getBlock() { - return this.block; + return block; } - public MachinePackage getPackage(final int metadata) { - return this.packagesID.get(metadata); + public MachinePackage getPackage(int metadata) { + return packagesID.get(metadata); } - public MachinePackage getPackage(final String name) { - return this.packages.get(name); + public MachinePackage getPackage(String name) { + return packages.get(name); } public String getUID() { - return this.mod.getModID() + "." + this.uid; + return mod.getModID() + "." + uid; } public String getShortUID() { - return this.uid; + return uid; } boolean isTileEntityRenderered() { - return this.renderedTileEntity; + return renderedTileEntity; } public void renderAsBlock() { - this.renderedTileEntity = false; + renderedTileEntity = false; } - public void setCreativeTab(final CreativeTabs tab) { - this.block.setCreativeTab(tab); + public void setCreativeTab(CreativeTabs tab) { + block.setCreativeTab(tab); } public AbstractMod getMod() { - return this.mod; + return mod; } } diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index dfffb65b..244d62cb 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -1,15 +1,10 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -import net.minecraft.client.renderer.RenderBlocks; import binnie.Binnie; +import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; -public abstract class MachinePackage -{ +public abstract class MachinePackage { private String uid; private boolean active; boolean powered; @@ -17,54 +12,53 @@ public abstract class MachinePackage private MachineGroup group; public String getUID() { - return this.uid; + return uid; } - protected MachinePackage(final String uid, final boolean powered) { - this.active = true; - this.powered = false; - this.metadata = -1; + protected MachinePackage(String uid, boolean powered) { + active = true; + metadata = -1; this.uid = uid; this.powered = powered; } - public abstract void createMachine(final Machine p0); + public abstract void createMachine(Machine machine); public abstract TileEntity createTileEntity(); public abstract void register(); - public final String getDisplayName() { - return Binnie.Language.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID()); + public String getDisplayName() { + return Binnie.Language.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID()); } - public final Integer getMetadata() { - return this.metadata; + public Integer getMetadata() { + return metadata; } - public void assignMetadata(final int meta) { - this.metadata = meta; + public void assignMetadata(int meta) { + metadata = meta; } public MachineGroup getGroup() { - return this.group; + return group; } - public void setGroup(final MachineGroup group) { + public void setGroup(MachineGroup group) { this.group = group; } - public abstract void renderMachine(final Machine p0, final double p1, final double p2, final double p3, final float p4, final RenderBlocks p5); + public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer); public boolean isActive() { - return this.active; + return active; } - public void setActive(final boolean active) { + public void setActive(boolean active) { this.active = active; } - public final String getInformation() { - return Binnie.Language.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID() + ".info"); + public String getInformation() { + return Binnie.Language.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID() + ".info"); } } diff --git a/src/main/java/binnie/core/machines/MachineRendererBlock.java b/src/main/java/binnie/core/machines/MachineRendererBlock.java index 4cfac8d7..682772c5 100644 --- a/src/main/java/binnie/core/machines/MachineRendererBlock.java +++ b/src/main/java/binnie/core/machines/MachineRendererBlock.java @@ -1,39 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; import binnie.core.BinnieCore; -import org.lwjgl.opengl.GL11; import binnie.core.resource.BinnieResource; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class MachineRendererBlock -{ - public static MachineRendererBlock instance; +public class MachineRendererBlock { + public static MachineRendererBlock instance = new MachineRendererBlock(); private BinnieResource texture; private ModelBlock model; public MachineRendererBlock() { - this.model = new ModelBlock(); + model = new ModelBlock(); } - public void renderMachine(final BinnieResource texture, final double x, final double y, final double z, final float var8) { + public void renderMachine(BinnieResource texture, double x, double y, double z, float var8) { this.texture = texture; GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 1.5, z + 0.5); GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f); BinnieCore.proxy.bindTexture(texture); GL11.glPushMatrix(); - this.model.render((float) x, (float) y, (float) z, 0.0625f, 0.0625f, 0.0625f); + model.render((float) x, (float) y, (float) z, 0.0625f, 0.0625f, 0.0625f); GL11.glPopMatrix(); GL11.glPopMatrix(); } - - static { - MachineRendererBlock.instance = new MachineRendererBlock(); - } } diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index 17f6ff21..6e69a230 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -1,159 +1,154 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; import binnie.core.BinnieCore; -import java.util.ArrayList; -import java.util.List; -import binnie.core.machines.power.IProcess; import binnie.core.machines.inventory.IChargedSlots; +import binnie.core.machines.power.IPoweredMachine; +import binnie.core.machines.power.IProcess; +import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.PowerSystem; import binnie.core.util.ItemStackSet; -import java.util.Random; -import net.minecraftforge.fluids.FluidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.IFluidTank; -import binnie.core.machines.power.IPoweredMachine; -import binnie.core.machines.power.ITankMachine; import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; -public class MachineUtil -{ +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; + +public class MachineUtil { private IMachine machine; - public MachineUtil(final IMachine machine) { + public MachineUtil(IMachine machine) { this.machine = machine; } public IInventory getInventory() { - return this.machine.getInterface(IInventory.class); + return machine.getInterface(IInventory.class); } public ITankMachine getTankContainer() { - return this.machine.getInterface(ITankMachine.class); + return machine.getInterface(ITankMachine.class); } public IPoweredMachine getPoweredMachine() { - return this.machine.getInterface(IPoweredMachine.class); + return machine.getInterface(IPoweredMachine.class); } - public boolean isSlotEmpty(final int slot) { - return this.getInventory().getStackInSlot(slot) == null; + public boolean isSlotEmpty(int slot) { + return getInventory().getStackInSlot(slot) == null; } - public IFluidTank getTank(final int id) { - return this.getTankContainer().getTanks()[id]; + public IFluidTank getTank(int id) { + return getTankContainer().getTanks()[id]; } - public boolean spaceInTank(final int id, final int amount) { - final IFluidTank tank = this.getTank(id); - final int space = tank.getCapacity() - tank.getFluidAmount(); + public boolean spaceInTank(int id, int amount) { + IFluidTank tank = getTank(id); + int space = tank.getCapacity() - tank.getFluidAmount(); return amount <= space; } - public ItemStack getStack(final int slot) { - return this.getInventory().getStackInSlot(slot); + public ItemStack getStack(int slot) { + return getInventory().getStackInSlot(slot); } - public void deleteStack(final int slot) { - this.setStack(slot, null); + public void deleteStack(int slot) { + setStack(slot, null); } - public ItemStack decreaseStack(final int slotWood, final int amount) { - return this.getInventory().decrStackSize(slotWood, amount); + public ItemStack decreaseStack(int slotWood, int amount) { + return getInventory().decrStackSize(slotWood, amount); } - public void setStack(final int slot, final ItemStack stack) { - this.getInventory().setInventorySlotContents(slot, stack); + public void setStack(int slot, ItemStack stack) { + getInventory().setInventorySlotContents(slot, stack); } - public void fillTank(final int id, final FluidStack liquidStack) { - final IFluidTank tank = this.getTank(id); + public void fillTank(int id, FluidStack liquidStack) { + IFluidTank tank = getTank(id); tank.fill(liquidStack, true); } - public void addStack(final int slot, final ItemStack addition) { - if (this.isSlotEmpty(slot)) { - this.setStack(slot, addition); - } - else { - final ItemStack merge = this.getStack(slot); + public void addStack(int slot, ItemStack addition) { + if (isSlotEmpty(slot)) { + setStack(slot, addition); + } else { + ItemStack merge = getStack(slot); if (merge.isItemEqual(addition) && merge.stackSize + addition.stackSize <= merge.getMaxStackSize()) { - final ItemStack itemStack = merge; + ItemStack itemStack = merge; itemStack.stackSize += addition.stackSize; - this.setStack(slot, merge); + setStack(slot, merge); } } } - public FluidStack drainTank(final int tank, final int amount) { - return this.getTank(tank).drain(amount, true); + public FluidStack drainTank(int tank, int amount) { + return getTank(tank).drain(amount, true); } - public boolean liquidInTank(final int tank, final int amount) { - return this.getTank(tank).drain(amount, false) != null && this.getTank(tank).drain(amount, false).amount == amount; + public boolean liquidInTank(int tank, int amount) { + FluidStack fluidStack = getTank(tank).drain(amount, false); + return fluidStack != null && fluidStack.amount == amount; } - public void damageItem(final int slot, final int damage) { - final ItemStack item = this.getStack(slot); + public void damageItem(int slot, int damage) { + ItemStack item = getStack(slot); if (damage < 0) { item.setItemDamage(Math.max(0, item.getItemDamage() + damage)); + } else if (item.attemptDamageItem(damage, new Random())) { + setStack(slot, null); } - else if (item.attemptDamageItem(damage, new Random())) { - this.setStack(slot, null); - } - this.setStack(slot, item); + setStack(slot, item); } - public boolean isTankEmpty(final int tankInput) { + public boolean isTankEmpty(int tankInput) { return this.getTank(tankInput).getFluidAmount() == 0; } - public FluidStack getFluid(final int tankInput) { - return (this.getTank(tankInput).getFluid() == null) ? null : this.getTank(tankInput).getFluid(); + public FluidStack getFluid(int tankInput) { + return getTank(tankInput).getFluid(); } - public ItemStack[] getStacks(final int[] slotGrains) { - final ItemStack[] stacks = new ItemStack[slotGrains.length]; + public ItemStack[] getStacks(int[] slotGrains) { + ItemStack[] stacks = new ItemStack[slotGrains.length]; for (int i = 0; i < slotGrains.length; ++i) { - stacks[i] = this.getStack(slotGrains[i]); + stacks[i] = getStack(slotGrains[i]); } return stacks; } - public ItemStack hasIngredients(final int recipe, final int[] inventory) { + public ItemStack hasIngredients(int recipe, int[] inventory) { return null; } - public boolean hasIngredients(final int[] recipe, final int[] inventory) { - final ItemStackSet requiredStacks = new ItemStackSet(); - for (final ItemStack stack : this.getStacks(recipe)) { - requiredStacks.add(stack); - } - final ItemStackSet inventoryStacks = new ItemStackSet(); - for (final ItemStack stack2 : this.getStacks(inventory)) { - inventoryStacks.add(stack2); - } + public boolean hasIngredients(int[] recipe, int[] inventory) { + ItemStackSet requiredStacks = new ItemStackSet(); + Collections.addAll(requiredStacks, getStacks(recipe)); + + ItemStackSet inventoryStacks = new ItemStackSet(); + Collections.addAll(inventoryStacks, getStacks(inventory)); + requiredStacks.removeAll(inventoryStacks); return requiredStacks.isEmpty(); } - public void useEnergyMJ(final float powerUsage) { - this.getPoweredMachine().getInterface().useEnergy(PowerSystem.MJ, powerUsage, true); + public void useEnergyMJ(float powerUsage) { + getPoweredMachine().getInterface().useEnergy(PowerSystem.MJ, powerUsage, true); } - public boolean hasEnergyMJ(final float powerUsage) { - return this.getPoweredMachine().getInterface().useEnergy(PowerSystem.MJ, powerUsage, false) >= powerUsage; + public boolean hasEnergyMJ(float powerUsage) { + return getPoweredMachine().getInterface().useEnergy(PowerSystem.MJ, powerUsage, false) >= powerUsage; } - public float getSlotCharge(final int slot) { - return this.machine.getInterface(IChargedSlots.class).getCharge(slot); + public float getSlotCharge(int slot) { + return machine.getInterface(IChargedSlots.class).getCharge(slot); } - public void useCharge(final int slot, final float loss) { - this.machine.getInterface(IChargedSlots.class).alterCharge(slot, -loss); + public void useCharge(int slot, float loss) { + machine.getInterface(IChargedSlots.class).alterCharge(slot, -loss); } public Random getRandom() { @@ -161,16 +156,17 @@ public class MachineUtil } public void refreshBlock() { - this.machine.getWorld().markBlockForUpdate(this.machine.getTileEntity().xCoord, this.machine.getTileEntity().yCoord, this.machine.getTileEntity().zCoord); + TileEntity tileEntity = machine.getTileEntity(); + machine.getWorld().markBlockForUpdate(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); } public IProcess getProcess() { - return this.machine.getInterface(IProcess.class); + return machine.getInterface(IProcess.class); } - public List getNonNullStacks(final int[] slotacclimatiser) { - final List stacks = new ArrayList(); - for (final ItemStack stack : this.getStacks(slotacclimatiser)) { + public List getNonNullStacks(int[] slotAcclimatiser) { + List stacks = new ArrayList(); + for (ItemStack stack : getStacks(slotAcclimatiser)) { if (stack != null) { stacks.add(stack); } @@ -179,6 +175,6 @@ public class MachineUtil } public boolean isServer() { - return BinnieCore.proxy.isSimulating(this.machine.getWorld()); + return BinnieCore.proxy.isSimulating(machine.getWorld()); } } diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index 8db0d07a..60d30e77 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -1,21 +1,18 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; +import binnie.core.BinnieCore; +import binnie.core.ManagerBase; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.ValidatorIcon; -import binnie.core.BinnieCore; -import java.util.Set; import forestry.api.core.INBTTagable; -import java.util.HashSet; -import java.util.HashMap; -import java.util.Map; -import binnie.core.ManagerBase; -public class ManagerMachine extends ManagerBase -{ +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class ManagerMachine extends ManagerBase { private Map, Class[]> componentInterfaceMap; private Map machineGroups; private Map> networkIDToComponent; @@ -24,61 +21,58 @@ public class ManagerMachine extends ManagerBase private int machineRenderID; public ManagerMachine() { - this.componentInterfaceMap = new HashMap, Class[]>(); - this.machineGroups = new HashMap(); - this.networkIDToComponent = new HashMap>(); - this.componentToNetworkID = new HashMap, Integer>(); - this.nextNetworkID = 0; + componentInterfaceMap = new HashMap<>(); + machineGroups = new HashMap<>(); + networkIDToComponent = new HashMap<>(); + componentToNetworkID = new HashMap<>(); + nextNetworkID = 0; } - public void registerMachineGroup(final MachineGroup group) { - this.machineGroups.put(group.getUID(), group); + public void registerMachineGroup(MachineGroup group) { + machineGroups.put(group.getUID(), group); } - public MachineGroup getGroup(final String name) { + public MachineGroup getGroup(String name) { return this.machineGroups.get(name); } - public MachinePackage getPackage(final String group, final String name) { - final MachineGroup machineGroup = this.getGroup(group); + public MachinePackage getPackage(String group, String name) { + MachineGroup machineGroup = getGroup(group); return (machineGroup == null) ? null : machineGroup.getPackage(name); } - private void registerComponentClass(final Class component) { - if (this.componentInterfaceMap.containsKey(component)) { + private void registerComponentClass(Class component) { + if (componentInterfaceMap.containsKey(component)) { return; } - final Set> interfaces = new HashSet>(); + + Set> interfaces = new HashSet>(); for (Class currentClass = component; currentClass != null; currentClass = null) { - for (final Class clss : currentClass.getInterfaces()) { - interfaces.add(clss); - } - currentClass = currentClass.getSuperclass(); - if (currentClass == Object.class) { - } + Collections.addAll(interfaces, currentClass.getInterfaces()); } + interfaces.remove(INBTTagable.class); this.componentInterfaceMap.put(component, interfaces.toArray(new Class[0])); - final int networkID = this.nextNetworkID++; + int networkID = nextNetworkID++; this.networkIDToComponent.put(networkID, component); this.componentToNetworkID.put(component, networkID); } - public int getNetworkID(final Class component) { + public int getNetworkID(Class component) { return this.componentToNetworkID.get(component); } - public Class getComponentClass(final int networkID) { - return this.networkIDToComponent.get(networkID); + public Class getComponentClass(int networkID) { + return networkIDToComponent.get(networkID); } public int getMachineRenderID() { - return this.machineRenderID; + return machineRenderID; } @Override public void init() { - this.machineRenderID = BinnieCore.proxy.getUniqueRenderID(); + machineRenderID = BinnieCore.proxy.getUniqueRenderID(); SlotValidator.IconBee = new ValidatorIcon(BinnieCore.instance, "validator/bee.0", "validator/bee.1"); SlotValidator.IconFrame = new ValidatorIcon(BinnieCore.instance, "validator/frame.0", "validator/frame.1"); SlotValidator.IconCircuit = new ValidatorIcon(BinnieCore.instance, "validator/circuit.0", "validator/circuit.1"); @@ -91,10 +85,10 @@ public class ManagerMachine extends ManagerBase BinnieCore.proxy.registerTileEntity(TileEntityMachine.class, "binnie.tile.machine", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine")); } - public Class[] getComponentInterfaces(final Class clss) { - if (!this.componentInterfaceMap.containsKey(clss)) { - this.registerComponentClass(clss); + public Class[] getComponentInterfaces(Class clss) { + if (!componentInterfaceMap.containsKey(clss)) { + registerComponentClass(clss); } - return this.componentInterfaceMap.get(clss); + return componentInterfaceMap.get(clss); } } diff --git a/src/main/java/binnie/core/machines/ModelBlock.java b/src/main/java/binnie/core/machines/ModelBlock.java index 9036ec1d..8e3b43d2 100644 --- a/src/main/java/binnie/core/machines/ModelBlock.java +++ b/src/main/java/binnie/core/machines/ModelBlock.java @@ -1,40 +1,36 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -import net.minecraft.entity.Entity; -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; -class ModelBlock extends ModelBase -{ - private ModelRenderer Block; +class ModelBlock extends ModelBase { + private ModelRenderer block; public ModelBlock() { - this.textureWidth = 64; - this.textureHeight = 32; - (this.Block = new ModelRenderer(this, 0, 0)).addBox(0.0f, 0.0f, 0.0f, 16, 16, 16); - this.Block.setRotationPoint(-8.0f, 8.0f, -8.0f); - this.Block.setTextureSize(64, 32); - this.Block.mirror = true; - this.setRotation(this.Block, 0.0f, 0.0f, 0.0f); + textureWidth = 64; + textureHeight = 32; + + block = new ModelRenderer(this, 0, 0); + block.addBox(0.0f, 0.0f, 0.0f, 16, 16, 16); + block.setRotationPoint(-8.0f, 8.0f, -8.0f); + block.setTextureSize(64, 32); + block.mirror = true; + setRotation(block, 0.0f, 0.0f, 0.0f); } - public void render(final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { - super.render((Entity) null, f, f1, f2, f3, f4, f5); - this.setRotationAngles(f, f1, f2, f3, f4, f5); - this.Block.render(f5); + public void render(float f, float f1, float f2, float f3, float f4, float f5) { + super.render(null, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5); + block.render(f5); } - private void setRotation(final ModelRenderer model, final float x, final float y, final float z) { + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; } - public void setRotationAngles(final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { - super.setRotationAngles(f, f1, f2, f3, f4, f5, (Entity) null); + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) { + super.setRotationAngles(f, f1, f2, f3, f4, f5, null); } } diff --git a/src/main/java/binnie/core/machines/RendererMachine.java b/src/main/java/binnie/core/machines/RendererMachine.java index c18eab8c..a3e81489 100644 --- a/src/main/java/binnie/core/machines/RendererMachine.java +++ b/src/main/java/binnie/core/machines/RendererMachine.java @@ -1,57 +1,53 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -import net.minecraft.world.IBlockAccess; import binnie.Binnie; -import net.minecraft.world.World; -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.client.renderer.RenderBlocks; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler -{ +// TODO unused class? +public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler { RenderBlocks blockRenderer; @Override - public void renderTileEntityAt(final TileEntity entity, final double x, final double y, final double z, final float var8) { - this.renderTileEntity((TileEntityMachine) entity, x, y, z, var8, this.blockRenderer); + public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float partialTick) { + renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick, blockRenderer); } - public void renderTileEntity(final TileEntityMachine entity, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { + public void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick, RenderBlocks renderer) { if (entity != null && entity.getMachine() != null) { - final MachinePackage machinePackage = entity.getMachine().getPackage(); - machinePackage.renderMachine(entity.getMachine(), x, y, z, var8, renderer); + MachinePackage machinePackage = entity.getMachine().getPackage(); + machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick, renderer); } } - public void renderInvBlock(final RenderBlocks renderblocks, final Block block, final int i, final int j) { - final TileEntity entity = block.createTileEntity((World) null, i); + public void renderInvBlock(RenderBlocks renderblocks, Block block, int i, int j) { + TileEntity entity = block.createTileEntity(null, i); this.renderTileEntity((TileEntityMachine) entity, 0.0, -0.1, 0.0, 0.0625f, renderblocks); } @Override - public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { if (modelID == Binnie.Machine.getMachineRenderID()) { - this.renderInvBlock(renderer, block, metadata, modelID); + renderInvBlock(renderer, block, metadata, modelID); } } @Override - public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) { - final TileEntityMachine tile = (TileEntityMachine) world.getTileEntity(x, y, z); + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + TileEntityMachine tile = (TileEntityMachine) world.getTileEntity(x, y, z); if (tile != null && tile.getMachine() != null && tile.getMachine().getPackage() != null && tile.getMachine().getPackage().getGroup() != null && !tile.getMachine().getPackage().getGroup().customRenderer) { - this.renderTileEntity(tile, x, y, z, 1.0f, renderer); + renderTileEntity(tile, x, y, z, 1.0f, renderer); } return true; } @Override - public boolean shouldRender3DInInventory(final int i) { + public boolean shouldRender3DInInventory(int i) { return true; } @@ -61,7 +57,7 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl } @Override - public void func_147496_a(final World par1World) { - this.blockRenderer = new RenderBlocks(par1World); + public void func_147496_a(World par1World) { + blockRenderer = new RenderBlocks(par1World); } } diff --git a/src/main/java/binnie/core/machines/TileEntityMachine.java b/src/main/java/binnie/core/machines/TileEntityMachine.java index bd43382d..4d96ee2f 100644 --- a/src/main/java/binnie/core/machines/TileEntityMachine.java +++ b/src/main/java/binnie/core/machines/TileEntityMachine.java @@ -1,100 +1,92 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines; -import binnie.core.machines.component.IInteraction; -import net.minecraft.network.Packet; -import binnie.core.network.packet.PacketPayload; import binnie.Binnie; -import net.minecraft.nbt.NBTTagCompound; -import binnie.core.network.INetworkedEntity; import binnie.core.machines.base.TileEntityMachineBase; +import binnie.core.machines.component.IInteraction; +import binnie.core.network.INetworkedEntity; +import binnie.core.network.packet.PacketPayload; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; -public class TileEntityMachine extends TileEntityMachineBase implements INetworkedEntity -{ +public class TileEntityMachine extends TileEntityMachineBase implements INetworkedEntity { private Machine machine; @Override public void updateEntity() { super.updateEntity(); - if (this.machine != null) { - this.machine.onUpdate(); + if (machine != null) { + machine.onUpdate(); } } - @Override - public boolean canUpdate() { - return super.canUpdate(); - } - - public TileEntityMachine(final MachinePackage pack) { - this.setMachine(pack); + public TileEntityMachine(MachinePackage pack) { + setMachine(pack); } public TileEntityMachine() { + // ignored } - public void setMachine(final MachinePackage pack) { + public void setMachine(MachinePackage pack) { if (pack != null) { - this.machine = new Machine(pack, this); + machine = new Machine(pack, this); } } @Override - public void readFromNBT(final NBTTagCompound nbtTagCompound) { + public void readFromNBT(NBTTagCompound nbtTagCompound) { super.readFromNBT(nbtTagCompound); - final String name = nbtTagCompound.getString("name"); - final String group = nbtTagCompound.getString("group"); - final MachinePackage pack = Binnie.Machine.getPackage(group, name); + String name = nbtTagCompound.getString("name"); + String group = nbtTagCompound.getString("group"); + MachinePackage pack = Binnie.Machine.getPackage(group, name); if (pack == null) { - this.invalidate(); + invalidate(); return; } - this.setMachine(pack); - this.getMachine().readFromNBT(nbtTagCompound); + + setMachine(pack); + getMachine().readFromNBT(nbtTagCompound); } @Override - public void writeToNBT(final NBTTagCompound nbtTagCompound) { + public void writeToNBT(NBTTagCompound nbtTagCompound) { super.writeToNBT(nbtTagCompound); - final String name = this.machine.getPackage().getUID(); - final String group = this.machine.getPackage().getGroup().getUID(); + String name = machine.getPackage().getUID(); + String group = machine.getPackage().getGroup().getUID(); nbtTagCompound.setString("group", group); nbtTagCompound.setString("name", name); - this.getMachine().writeToNBT(nbtTagCompound); + getMachine().writeToNBT(nbtTagCompound); } @Override - public void writeToPacket(final PacketPayload payload) { - this.machine.writeToPacket(payload); + public void writeToPacket(PacketPayload payload) { + machine.writeToPacket(payload); } @Override - public void readFromPacket(final PacketPayload payload) { - this.machine.readFromPacket(payload); + public void readFromPacket(PacketPayload payload) { + machine.readFromPacket(payload); } public Machine getMachine() { - return this.machine; + return machine; } public void onBlockDestroy() { - if (this.getMachine() != null) { - this.getMachine().onBlockDestroy(); + if (getMachine() != null) { + getMachine().onBlockDestroy(); } } @Override - public final Packet getDescriptionPacket() { - return (this.getMachine() != null) ? this.getMachine().getDescriptionPacket() : null; + public Packet getDescriptionPacket() { + return (getMachine() != null) ? getMachine().getDescriptionPacket() : null; } @Override public void invalidate() { super.invalidate(); - for (final IInteraction.Invalidation c : this.getMachine().getInterfaces(IInteraction.Invalidation.class)) { + for (IInteraction.Invalidation c : getMachine().getInterfaces(IInteraction.Invalidation.class)) { c.onInvalidation(); } } @@ -102,7 +94,7 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork @Override public void onChunkUnload() { super.onChunkUnload(); - for (final IInteraction.ChunkUnload c : this.getMachine().getInterfaces(IInteraction.ChunkUnload.class)) { + for (IInteraction.ChunkUnload c : getMachine().getInterfaces(IInteraction.ChunkUnload.class)) { c.onChunkUnload(); } } diff --git a/src/main/java/binnie/core/machines/base/DefaultInventory.java b/src/main/java/binnie/core/machines/base/DefaultInventory.java index b9e419c3..8d837a57 100644 --- a/src/main/java/binnie/core/machines/base/DefaultInventory.java +++ b/src/main/java/binnie/core/machines/base/DefaultInventory.java @@ -1,37 +1,33 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.base; +import binnie.core.machines.inventory.IInventoryMachine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import binnie.core.machines.inventory.IInventoryMachine; -class DefaultInventory implements IInventoryMachine -{ +class DefaultInventory implements IInventoryMachine { @Override public int getSizeInventory() { return 0; } @Override - public ItemStack getStackInSlot(final int i) { + public ItemStack getStackInSlot(int slot) { return null; } @Override - public ItemStack decrStackSize(final int i, final int j) { + public ItemStack decrStackSize(int index, int count) { return null; } @Override - public ItemStack getStackInSlotOnClosing(final int i) { + public ItemStack getStackInSlotOnClosing(int index) { return null; } @Override - public void setInventorySlotContents(final int i, final ItemStack itemstack) { + public void setInventorySlotContents(int index, ItemStack itemStack) { + // ignored } @Override @@ -40,32 +36,32 @@ class DefaultInventory implements IInventoryMachine } @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { + public boolean isUseableByPlayer(EntityPlayer player) { return false; } @Override - public boolean isItemValidForSlot(final int i, final ItemStack itemstack) { + public boolean isItemValidForSlot(int index, ItemStack itemStack) { return false; } @Override - public int[] getAccessibleSlotsFromSide(final int var1) { + public int[] getAccessibleSlotsFromSide(int side) { return new int[0]; } @Override - public boolean canInsertItem(final int i, final ItemStack itemstack, final int j) { + public boolean canInsertItem(int index, ItemStack itemStack, int direction) { return false; } @Override - public boolean canExtractItem(final int i, final ItemStack itemstack, final int j) { + public boolean canExtractItem(int index, ItemStack itemStack, int direction) { return false; } @Override - public boolean isReadOnly(final int slot) { + public boolean isReadOnly(int slot) { return false; } @@ -81,13 +77,16 @@ class DefaultInventory implements IInventoryMachine @Override public void markDirty() { + // ignored } @Override public void openInventory() { + // ignored } @Override public void closeInventory() { + // ignored } } diff --git a/src/main/java/binnie/core/machines/base/DefaultPower.java b/src/main/java/binnie/core/machines/base/DefaultPower.java index f942f491..3f7f4147 100644 --- a/src/main/java/binnie/core/machines/base/DefaultPower.java +++ b/src/main/java/binnie/core/machines/base/DefaultPower.java @@ -1,18 +1,13 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.base; +import binnie.core.machines.power.IPoweredMachine; +import binnie.core.machines.power.PowerInfo; import binnie.core.machines.power.PowerInterface; +import cpw.mods.fml.common.Optional; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Optional; -import binnie.core.machines.power.PowerInfo; -import binnie.core.machines.power.IPoweredMachine; -class DefaultPower implements IPoweredMachine -{ +class DefaultPower implements IPoweredMachine { @Override public PowerInfo getPowerInfo() { return new PowerInfo(this, 0.0f); @@ -32,38 +27,38 @@ class DefaultPower implements IPoweredMachine @Override @Optional.Method(modid = "IC2") - public double injectEnergy(final ForgeDirection directionFrom, final double amount, final double voltage) { + public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) { return 0.0; } @Override @Optional.Method(modid = "IC2") - public boolean acceptsEnergyFrom(final TileEntity emitter, final ForgeDirection direction) { + public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) { return false; } @Override - public int receiveEnergy(final ForgeDirection from, final int maxReceive, final boolean simulate) { + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { return 0; } @Override - public int extractEnergy(final ForgeDirection from, final int maxExtract, final boolean simulate) { + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { return 0; } @Override - public int getEnergyStored(final ForgeDirection from) { + public int getEnergyStored(ForgeDirection from) { return 0; } @Override - public int getMaxEnergyStored(final ForgeDirection from) { + public int getMaxEnergyStored(ForgeDirection from) { return 0; } @Override - public boolean canConnectEnergy(final ForgeDirection from) { + public boolean canConnectEnergy(ForgeDirection from) { return false; } diff --git a/src/main/java/binnie/core/machines/base/DefaultTankContainer.java b/src/main/java/binnie/core/machines/base/DefaultTankContainer.java index 06e8bf83..97a0eb7c 100644 --- a/src/main/java/binnie/core/machines/base/DefaultTankContainer.java +++ b/src/main/java/binnie/core/machines/base/DefaultTankContainer.java @@ -1,27 +1,22 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.base; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.IFluidTank; import binnie.core.machines.inventory.TankSlot; -import binnie.core.machines.power.TankInfo; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.common.util.ForgeDirection; import binnie.core.machines.power.ITankMachine; +import binnie.core.machines.power.TankInfo; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidTank; -class DefaultTankContainer implements ITankMachine -{ +class DefaultTankContainer implements ITankMachine { @Override - public int fill(final ForgeDirection from, final FluidStack resource, final boolean doFill) { + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { return 0; } @Override - public FluidStack drain(final ForgeDirection from, final int maxDrain, final boolean doDrain) { + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { return null; } @@ -31,47 +26,47 @@ class DefaultTankContainer implements ITankMachine } @Override - public boolean isTankReadOnly(final int tank) { + public boolean isTankReadOnly(int tank) { return false; } @Override - public boolean isLiquidValidForTank(final FluidStack liquid, final int tank) { + public boolean isLiquidValidForTank(FluidStack liquid, int tank) { return false; } @Override - public TankSlot addTank(final int index, final String name, final int capacity) { + public TankSlot addTank(int index, String name, int capacity) { return null; } @Override - public IFluidTank getTank(final int index) { + public IFluidTank getTank(int index) { return null; } @Override - public TankSlot getTankSlot(final int slot) { + public TankSlot getTankSlot(int slot) { return null; } @Override - public FluidStack drain(final ForgeDirection from, final FluidStack resource, final boolean doDrain) { + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { return null; } @Override - public boolean canFill(final ForgeDirection from, final Fluid fluid) { + public boolean canFill(ForgeDirection from, Fluid fluid) { return false; } @Override - public boolean canDrain(final ForgeDirection from, final Fluid fluid) { + public boolean canDrain(ForgeDirection from, Fluid fluid) { return false; } @Override - public FluidTankInfo[] getTankInfo(final ForgeDirection from) { + public FluidTankInfo[] getTankInfo(ForgeDirection from) { return new FluidTankInfo[0]; } diff --git a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java index 325d8e02..c4d4755f 100644 --- a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java +++ b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java @@ -1,251 +1,249 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.base; -import binnie.core.machines.power.PowerInterface; -import cpw.mods.fml.common.Optional; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.IFluidTank; -import binnie.core.machines.inventory.TankSlot; -import net.minecraftforge.fluids.FluidStack; -import binnie.core.machines.power.TankInfo; -import binnie.core.machines.power.PowerInfo; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import binnie.core.machines.Machine; +import binnie.core.machines.inventory.IInventoryMachine; +import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.power.IPoweredMachine; import binnie.core.machines.power.ITankMachine; -import binnie.core.machines.inventory.IInventoryMachine; +import binnie.core.machines.power.PowerInfo; +import binnie.core.machines.power.PowerInterface; +import binnie.core.machines.power.TankInfo; +import cpw.mods.fml.common.Optional; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidTank; -public class TileEntityMachineBase extends TileEntity implements IInventoryMachine, ITankMachine, IPoweredMachine -{ +public class TileEntityMachineBase extends TileEntity implements IInventoryMachine, ITankMachine, IPoweredMachine { public IInventoryMachine getInventory() { - final IInventoryMachine inv = Machine.getInterface(IInventoryMachine.class, this); + IInventoryMachine inv = Machine.getInterface(IInventoryMachine.class, this); return (inv == null || inv == this) ? new DefaultInventory() : inv; } public ITankMachine getTankContainer() { - final ITankMachine inv = Machine.getInterface(ITankMachine.class, this); + ITankMachine inv = Machine.getInterface(ITankMachine.class, this); return (inv == null || inv == this) ? new DefaultTankContainer() : inv; } public IPoweredMachine getPower() { - final IPoweredMachine inv = Machine.getInterface(IPoweredMachine.class, this); + IPoweredMachine inv = Machine.getInterface(IPoweredMachine.class, this); return (inv == null || inv == this) ? new DefaultPower() : inv; } @Override public int getSizeInventory() { - return this.getInventory().getSizeInventory(); + return getInventory().getSizeInventory(); } @Override - public ItemStack getStackInSlot(final int index) { - return this.getInventory().getStackInSlot(index); + public ItemStack getStackInSlot(int index) { + return getInventory().getStackInSlot(index); } @Override - public ItemStack decrStackSize(final int index, final int amount) { - return this.getInventory().decrStackSize(index, amount); + public ItemStack decrStackSize(int index, int amount) { + return getInventory().decrStackSize(index, amount); } @Override - public ItemStack getStackInSlotOnClosing(final int var1) { - return this.getInventory().getStackInSlotOnClosing(var1); + public ItemStack getStackInSlotOnClosing(int var1) { + return getInventory().getStackInSlotOnClosing(var1); } @Override - public void setInventorySlotContents(final int index, final ItemStack itemStack) { - this.getInventory().setInventorySlotContents(index, itemStack); + public void setInventorySlotContents(int index, ItemStack itemStack) { + getInventory().setInventorySlotContents(index, itemStack); } @Override public String getInventoryName() { - return this.getInventory().getInventoryName(); + return getInventory().getInventoryName(); } @Override public int getInventoryStackLimit() { - return this.getInventory().getInventoryStackLimit(); + return getInventory().getInventoryStackLimit(); } @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { - return !this.isInvalid() && this.getWorldObj().getTileEntity(this.xCoord, this.yCoord, this.zCoord) == this && entityplayer.getDistanceSq(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5) <= 64.0 && this.getInventory().isUseableByPlayer(entityplayer); + public boolean isUseableByPlayer(EntityPlayer player) { + return !isInvalid() + && getWorldObj().getTileEntity(xCoord, yCoord, zCoord) == this + && player.getDistanceSq(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5) <= 64.0 + && getInventory().isUseableByPlayer(player); } @Override public void openInventory() { - this.getInventory().openInventory(); + getInventory().openInventory(); } @Override public void closeInventory() { - this.getInventory().closeInventory(); + getInventory().closeInventory(); } @Override public boolean hasCustomInventoryName() { - return this.getInventory().hasCustomInventoryName(); + return getInventory().hasCustomInventoryName(); } @Override public void markDirty() { super.markDirty(); - this.getInventory().markDirty(); + getInventory().markDirty(); } @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemStack) { - return this.getInventory().isItemValidForSlot(slot, itemStack); + public boolean isItemValidForSlot(int slot, ItemStack itemStack) { + return getInventory().isItemValidForSlot(slot, itemStack); } @Override - public int[] getAccessibleSlotsFromSide(final int var1) { - return this.getInventory().getAccessibleSlotsFromSide(var1); + public int[] getAccessibleSlotsFromSide(int var1) { + return getInventory().getAccessibleSlotsFromSide(var1); } @Override - public boolean canInsertItem(final int i, final ItemStack itemstack, final int j) { - return this.getInventory().canInsertItem(i, itemstack, j); + public boolean canInsertItem(int i, ItemStack itemstack, int j) { + return getInventory().canInsertItem(i, itemstack, j); } @Override - public boolean canExtractItem(final int i, final ItemStack itemstack, final int j) { - return this.getInventory().canExtractItem(i, itemstack, j); + public boolean canExtractItem(int i, ItemStack itemstack, int j) { + return getInventory().canExtractItem(i, itemstack, j); } @Override - public boolean isReadOnly(final int slot) { - return this.getInventory().isReadOnly(slot); + public boolean isReadOnly(int slot) { + return getInventory().isReadOnly(slot); } @Override public PowerInfo getPowerInfo() { - return this.getPower().getPowerInfo(); + return getPower().getPowerInfo(); } @Override public TankInfo[] getTankInfos() { - return this.getTankContainer().getTankInfos(); + return getTankContainer().getTankInfos(); } @Override - public boolean isTankReadOnly(final int tank) { - return this.getTankContainer().isTankReadOnly(tank); + public boolean isTankReadOnly(int tank) { + return getTankContainer().isTankReadOnly(tank); } @Override - public boolean isLiquidValidForTank(final FluidStack liquid, final int tank) { - return this.getTankContainer().isLiquidValidForTank(liquid, tank); + public boolean isLiquidValidForTank(FluidStack liquid, int tank) { + return getTankContainer().isLiquidValidForTank(liquid, tank); } @Override - public TankSlot addTank(final int index, final String name, final int capacity) { - return this.getTankContainer().addTank(index, name, capacity); + public TankSlot addTank(int index, String name, int capacity) { + return getTankContainer().addTank(index, name, capacity); } @Override - public IFluidTank getTank(final int index) { - return this.getTankContainer().getTank(index); + public IFluidTank getTank(int index) { + return getTankContainer().getTank(index); } @Override - public TankSlot getTankSlot(final int index) { - return this.getTankContainer().getTankSlot(index); + public TankSlot getTankSlot(int slot) { + return getTankContainer().getTankSlot(slot); } @Override - public int fill(final ForgeDirection from, final FluidStack resource, final boolean doFill) { - return this.getTankContainer().fill(from, resource, doFill); + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return getTankContainer().fill(from, resource, doFill); } @Override - public FluidStack drain(final ForgeDirection from, final FluidStack resource, final boolean doDrain) { - return this.getTankContainer().drain(from, resource, doDrain); + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return getTankContainer().drain(from, resource, doDrain); } @Override - public FluidStack drain(final ForgeDirection from, final int maxDrain, final boolean doDrain) { - return this.getTankContainer().drain(from, maxDrain, doDrain); + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return getTankContainer().drain(from, maxDrain, doDrain); } @Override - public boolean canFill(final ForgeDirection from, final Fluid fluid) { - return this.getTankContainer().canFill(from, fluid); + public boolean canFill(ForgeDirection from, Fluid fluid) { + return getTankContainer().canFill(from, fluid); } @Override - public boolean canDrain(final ForgeDirection from, final Fluid fluid) { - return this.getTankContainer().canDrain(from, fluid); + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return getTankContainer().canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(final ForgeDirection from) { - return this.getTankContainer().getTankInfo(from); + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return getTankContainer().getTankInfo(from); } @Override public IFluidTank[] getTanks() { - return this.getTankContainer().getTanks(); + return getTankContainer().getTanks(); } @Override @Optional.Method(modid = "IC2") public double getDemandedEnergy() { - return this.getPower().getDemandedEnergy(); + return getPower().getDemandedEnergy(); } @Override @Optional.Method(modid = "IC2") public int getSinkTier() { - return this.getPower().getSinkTier(); + return getPower().getSinkTier(); } @Override @Optional.Method(modid = "IC2") - public double injectEnergy(final ForgeDirection directionFrom, final double amount, final double voltage) { - return this.getPower().injectEnergy(directionFrom, amount, voltage); + public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) { + return getPower().injectEnergy(directionFrom, amount, voltage); } @Override @Optional.Method(modid = "IC2") - public boolean acceptsEnergyFrom(final TileEntity emitter, final ForgeDirection direction) { - return this.getPower().acceptsEnergyFrom(emitter, direction); + public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) { + return getPower().acceptsEnergyFrom(emitter, direction); } @Override - public int receiveEnergy(final ForgeDirection from, final int maxReceive, final boolean simulate) { - return this.getPower().receiveEnergy(from, maxReceive, simulate); + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return getPower().receiveEnergy(from, maxReceive, simulate); } @Override - public int extractEnergy(final ForgeDirection from, final int maxExtract, final boolean simulate) { - return this.getPower().extractEnergy(from, maxExtract, simulate); + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return getPower().extractEnergy(from, maxExtract, simulate); } @Override - public int getEnergyStored(final ForgeDirection from) { - return this.getPower().getEnergyStored(from); + public int getEnergyStored(ForgeDirection from) { + return getPower().getEnergyStored(from); } @Override - public int getMaxEnergyStored(final ForgeDirection from) { - return this.getPower().getMaxEnergyStored(from); + public int getMaxEnergyStored(ForgeDirection from) { + return getPower().getMaxEnergyStored(from); } @Override - public boolean canConnectEnergy(final ForgeDirection from) { - return this.getPower().canConnectEnergy(from); + public boolean canConnectEnergy(ForgeDirection from) { + return getPower().canConnectEnergy(from); } @Override public PowerInterface getInterface() { - return this.getPower().getInterface(); + return getPower().getInterface(); } } diff --git a/src/main/java/binnie/core/machines/component/ComponentRecipe.java b/src/main/java/binnie/core/machines/component/ComponentRecipe.java index 3fb6e8ed..c2a8df73 100644 --- a/src/main/java/binnie/core/machines/component/ComponentRecipe.java +++ b/src/main/java/binnie/core/machines/component/ComponentRecipe.java @@ -1,15 +1,10 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.component; import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; -public abstract class ComponentRecipe extends MachineComponent implements IComponentRecipe -{ - public ComponentRecipe(final Machine machine) { +public abstract class ComponentRecipe extends MachineComponent implements IComponentRecipe { + public ComponentRecipe(Machine machine) { super(machine); } } diff --git a/src/main/java/binnie/core/machines/component/IBuildcraft.java b/src/main/java/binnie/core/machines/component/IBuildcraft.java index 0d01799b..87094ee8 100644 --- a/src/main/java/binnie/core/machines/component/IBuildcraft.java +++ b/src/main/java/binnie/core/machines/component/IBuildcraft.java @@ -1,23 +1,17 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.component; +import binnie.core.triggers.TriggerData; import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionReceptor; -import binnie.core.triggers.TriggerData; + import java.util.List; -public interface IBuildcraft -{ - public interface TriggerProvider - { - void getTriggers(final List p0); +public interface IBuildcraft { + interface TriggerProvider { + void getTriggers(List p0); } - public interface ActionProvider extends IActionReceptor - { - void getActions(final List p0); + interface ActionProvider extends IActionReceptor { + void getActions(List p0); } } diff --git a/src/main/java/binnie/core/machines/component/IComponentRecipe.java b/src/main/java/binnie/core/machines/component/IComponentRecipe.java index aa301175..2f669814 100644 --- a/src/main/java/binnie/core/machines/component/IComponentRecipe.java +++ b/src/main/java/binnie/core/machines/component/IComponentRecipe.java @@ -1,16 +1,11 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.component; import net.minecraft.item.ItemStack; -public interface IComponentRecipe -{ +public interface IComponentRecipe { boolean isRecipe(); - ItemStack doRecipe(final boolean p0); + ItemStack doRecipe(boolean p0); ItemStack getProduct(); } diff --git a/src/main/java/binnie/core/machines/component/IInteraction.java b/src/main/java/binnie/core/machines/component/IInteraction.java index d52c9865..25fa7af7 100644 --- a/src/main/java/binnie/core/machines/component/IInteraction.java +++ b/src/main/java/binnie/core/machines/component/IInteraction.java @@ -1,26 +1,18 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.component; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -public interface IInteraction -{ - public interface ChunkUnload - { +public interface IInteraction { + interface ChunkUnload { void onChunkUnload(); } - public interface Invalidation - { + interface Invalidation { void onInvalidation(); } - public interface RightClick - { - void onRightClick(final World p0, final EntityPlayer p1, final int p2, final int p3, final int p4); + interface RightClick { + void onRightClick(World world, EntityPlayer player, int x, int y, int z); } } diff --git a/src/main/java/binnie/core/machines/component/IRender.java b/src/main/java/binnie/core/machines/component/IRender.java index dceb631f..cd6e9720 100644 --- a/src/main/java/binnie/core/machines/component/IRender.java +++ b/src/main/java/binnie/core/machines/component/IRender.java @@ -1,32 +1,25 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.component; -import net.minecraft.client.renderer.entity.RenderItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.Random; +import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.world.World; -public interface IRender -{ - public interface DisplayTick - { +import java.util.Random; + +public interface IRender { + interface DisplayTick { @SideOnly(Side.CLIENT) - void onDisplayTick(final World p0, final int p1, final int p2, final int p3, final Random p4); + void onDisplayTick(World world, int x, int y, int z, Random rand); } - public interface RandomDisplayTick - { + interface RandomDisplayTick { @SideOnly(Side.CLIENT) - void onRandomDisplayTick(final World p0, final int p1, final int p2, final int p3, final Random p4); + void onRandomDisplayTick(World world, int x, int y, int p3, Random rand); } - public interface Render - { + interface Render { @SideOnly(Side.CLIENT) - void renderInWorld(final RenderItem p0, final double p1, final double p2, final double p3); + void renderInWorld(RenderItem renderItem, double x, double y, double z); } } diff --git a/src/main/java/binnie/core/machines/inventory/AccessDirection.java b/src/main/java/binnie/core/machines/inventory/AccessDirection.java index 05345ced..b0d4a3f8 100644 --- a/src/main/java/binnie/core/machines/inventory/AccessDirection.java +++ b/src/main/java/binnie/core/machines/inventory/AccessDirection.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -enum AccessDirection -{ +enum AccessDirection { Both, In, Out, @@ -23,7 +18,7 @@ enum AccessDirection return this != AccessDirection.Neither; } - AccessDirection changeInsert(final boolean b) { + AccessDirection changeInsert(boolean b) { if (b) { if (this == AccessDirection.Out) { return AccessDirection.Both; @@ -31,8 +26,7 @@ enum AccessDirection if (this == AccessDirection.Neither) { return AccessDirection.In; } - } - else { + } else { if (this == AccessDirection.Both) { return AccessDirection.Out; } @@ -43,7 +37,7 @@ enum AccessDirection return this; } - AccessDirection changeExtract(final boolean b) { + AccessDirection changeExtract(boolean b) { if (b) { if (this == AccessDirection.In) { return AccessDirection.Both; @@ -51,8 +45,7 @@ enum AccessDirection if (this == AccessDirection.Neither) { return AccessDirection.Out; } - } - else { + } else { if (this == AccessDirection.Both) { return AccessDirection.In; } @@ -65,35 +58,29 @@ enum AccessDirection public String getTextColour() { switch (this) { - case Both: { - return "§a"; - } - case In: { - return "§e"; - } - case Neither: { - return "§c"; - } - default: { - return "§b"; - } + case Both: + return "§a"; + + case In: + return "§e"; + + case Neither: + return "§c"; } + return "§b"; } public int getShadeColour() { switch (this) { - case Both: { - return 1431699285; - } - case In: { - return 1442840405; - } - case Neither: { - return 1442796885; - } - default: { - return 1431699455; - } + case Both: + return 0x5555ff55; + + case In: + return 0x55ffff55; + + case Neither: + return 0x55ff5555; } + return 0x5555ffff; } } diff --git a/src/main/java/binnie/core/machines/inventory/BaseSlot.java b/src/main/java/binnie/core/machines/inventory/BaseSlot.java index cf9e98ca..4bec7a78 100644 --- a/src/main/java/binnie/core/machines/inventory/BaseSlot.java +++ b/src/main/java/binnie/core/machines/inventory/BaseSlot.java @@ -1,123 +1,122 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import java.util.Collection; -import net.minecraftforge.common.util.ForgeDirection; -import java.util.EnumSet; import binnie.core.util.IValidator; import forestry.api.core.INBTTagable; +import net.minecraftforge.common.util.ForgeDirection; -public abstract class BaseSlot implements INBTTagable, IValidator -{ - private SidedAccess access; - Validator validator; - private boolean readOnly; - private int index; +import java.util.Collection; +import java.util.EnumSet; + +public abstract class BaseSlot implements INBTTagable, IValidator { + protected Validator validator; protected String unlocName; - public BaseSlot(final int index, final String unlocName) { - this.access = new SidedAccess(); - this.validator = null; - this.readOnly = false; - this.unlocName = ""; - this.setIndex(index); - this.setUnlocalisedName(unlocName); + private SidedAccess access; + private boolean readOnly; + private int index; + + public BaseSlot(int index, String unlocalizedName) { + access = new SidedAccess(); + validator = null; + readOnly = false; + setIndex(index); + setUnlocalizedName(unlocalizedName); } public void setReadOnly() { - this.readOnly = true; - this.forbidInsertion(); + readOnly = true; + forbidInsertion(); } @Override - public boolean isValid(final T item) { - return item == null || this.validator == null || this.validator.isValid(item); + public boolean isValid(T item) { + return item == null + || validator == null + || validator.isValid(item); } public abstract T getContent(); - public abstract void setContent(final T p0); + public abstract void setContent(T p0); - public void setValidator(final Validator val) { - this.validator = val; + public void setValidator(Validator validator) { + this.validator = validator; } public boolean isEmpty() { - return this.getContent() == null; + return getContent() == null; } public boolean isReadOnly() { - return this.readOnly; + return readOnly; } public int getIndex() { - return this.index; + return index; } - private void setIndex(final int index) { + private void setIndex(int index) { this.index = index; } public boolean canInsert() { - return !this.access.getInsertionSides().isEmpty(); + return !access.getInsertionSides().isEmpty(); } public boolean canExtract() { - return !this.access.getExtractionSides().isEmpty(); + return !access.getExtractionSides().isEmpty(); } public void forbidInteraction() { - this.forbidInsertion(); - this.forbidExtraction(); + forbidInsertion(); + forbidExtraction(); } - public void setInputSides(final EnumSet sides) { - for (final ForgeDirection side : EnumSet.complementOf(sides)) { + // TODO unusing method? + public void setInputSides(EnumSet sides) { + for (ForgeDirection side : EnumSet.complementOf(sides)) { if (side != ForgeDirection.UNKNOWN) { - this.access.setInsert(side, false); + access.setInsert(side, false); } } } - public void setOutputSides(final EnumSet sides) { - for (final ForgeDirection side : EnumSet.complementOf(sides)) { + public void setOutputSides(EnumSet sides) { + for (ForgeDirection side : EnumSet.complementOf(sides)) { if (side != ForgeDirection.UNKNOWN) { - this.access.setExtract(side, false); + access.setExtract(side, false); } } } public void forbidExtraction() { - this.access.setExtract(false); - this.access.forbidExtractChange(); + access.setExtract(false); + access.forbidExtractChange(); } public void forbidInsertion() { - this.access.setInsert(false); - this.access.forbidInsertChange(); + access.setInsert(false); + access.forbidInsertChange(); } - public boolean canInsert(final ForgeDirection dir) { - return this.access.canInsert(dir); + public boolean canInsert(ForgeDirection dir) { + return access.canInsert(dir); } - public boolean canExtract(final ForgeDirection dir) { - return this.access.canExtract(dir); + public boolean canExtract(ForgeDirection dir) { + return access.canExtract(dir); } public Collection getInputSides() { - return this.access.getInsertionSides(); + return access.getInsertionSides(); } public Collection getOutputSides() { - return this.access.getExtractionSides(); + return access.getExtractionSides(); } - public void setUnlocalisedName(final String name) { - this.unlocName = name; + public void setUnlocalizedName(String name) { + unlocName = name; } public abstract String getName(); diff --git a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java index b9888016..15e31da9 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java @@ -1,46 +1,40 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.relauncher.Side; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagCompound; -import java.util.HashMap; import binnie.core.machines.Machine; -import java.util.Map; -import binnie.core.machines.network.INetwork; import binnie.core.machines.MachineComponent; +import binnie.core.machines.network.INetwork; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; -public class ComponentChargedSlots extends MachineComponent implements INetwork.GuiNBT, IChargedSlots -{ - private Map charges; +import java.util.HashMap; +import java.util.Map; - public ComponentChargedSlots(final Machine machine) { +public class ComponentChargedSlots extends MachineComponent implements INetwork.GuiNBT, IChargedSlots { + private Map charges = new HashMap<>(); + + public ComponentChargedSlots(Machine machine) { super(machine); - this.charges = new HashMap(); } @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { + public void readFromNBT(NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); - this.charges.clear(); - final NBTTagList list = nbttagcompound.getTagList("charges", 10); + charges.clear(); + NBTTagList list = nbttagcompound.getTagList("charges", 10); for (int i = 0; i < list.tagCount(); ++i) { - final NBTTagCompound tag = list.getCompoundTagAt(i); - this.charges.put((int) tag.getByte("i"), tag.getByte("v") / 100.0f); + NBTTagCompound tag = list.getCompoundTagAt(i); + charges.put((int) tag.getByte("i"), tag.getByte("v") / 100.0f); } } @Override - public void writeToNBT(final NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { super.writeToNBT(nbttagcompound); - final NBTTagList chargeList = new NBTTagList(); - for (final Map.Entry entry : this.charges.entrySet()) { - final NBTTagCompound chargesNBT = new NBTTagCompound(); + NBTTagList chargeList = new NBTTagList(); + for (Map.Entry entry : charges.entrySet()) { + NBTTagCompound chargesNBT = new NBTTagCompound(); chargesNBT.setByte("i", (byte) (0 + entry.getKey())); chargesNBT.setByte("v", (byte) (entry.getValue() * 100.0f)); chargeList.appendTag(chargesNBT); @@ -48,57 +42,57 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork. nbttagcompound.setTag("charges", chargeList); } - public void addCharge(final int slot) { - this.charges.put(slot, 0.0f); + public void addCharge(int slot) { + charges.put(slot, 0.0f); } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { + public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { if (name.equals("slot-charges")) { - for (final int i : this.charges.keySet()) { - this.charges.put(i, nbt.getShort("" + i) / 100.0f); + for (int i : charges.keySet()) { + charges.put(i, nbt.getShort("" + i) / 100.0f); } } } @Override - public void sendGuiNBT(final Map nbt) { - final NBTTagCompound tag = new NBTTagCompound(); - for (final int i : this.charges.keySet()) { - tag.setShort("" + i, (short) (this.charges.get(i) * 100.0f)); + public void sendGuiNBT(Map nbts) { + NBTTagCompound tag = new NBTTagCompound(); + for (int i : charges.keySet()) { + tag.setShort("" + i, (short) (charges.get(i) * 100.0f)); } - nbt.put("slot-charges", tag); + nbts.put("slot-charges", tag); } @Override - public float getCharge(final int slot) { - return this.charges.containsKey(slot) ? this.charges.get(slot) : 0.0f; + public float getCharge(int slot) { + return charges.containsKey(slot) ? charges.get(slot) : 0.0f; } @Override - public void setCharge(final int slot, float charge) { - if (charge > 1.0f) { - charge = 1.0f; + public void setCharge(int slot, float value) { + if (value > 1.0f) { + value = 1.0f; } - if (charge < 0.0f) { - charge = 0.0f; + if (value < 0.0f) { + value = 0.0f; } - if (this.charges.containsKey(slot)) { - this.charges.put(slot, charge); + if (charges.containsKey(slot)) { + charges.put(slot, value); } } @Override public void onUpdate() { - for (final int slot : this.charges.keySet()) { - if (this.getCharge(slot) <= 0.0f && this.getUtil().decreaseStack(slot, 1) != null) { - this.setCharge(slot, 1.0f); + for (int slot : this.charges.keySet()) { + if (getCharge(slot) <= 0.0f && getUtil().decreaseStack(slot, 1) != null) { + setCharge(slot, 1.0f); } } } @Override - public void alterCharge(final int slot, final float charge) { - this.setCharge(slot, this.getCharge(slot) + charge); + public void alterCharge(int slot, float value) { + setCharge(slot, getCharge(slot) + value); } } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventory.java b/src/main/java/binnie/core/machines/inventory/ComponentInventory.java index 6b99e384..9c1be4dd 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventory.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventory.java @@ -1,23 +1,19 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; import binnie.core.machines.IMachine; -import net.minecraft.inventory.IInventory; import binnie.core.machines.MachineComponent; +import net.minecraft.inventory.IInventory; -public abstract class ComponentInventory extends MachineComponent implements IInventory -{ - public ComponentInventory(final IMachine machine) { +public abstract class ComponentInventory extends MachineComponent implements IInventory { + public ComponentInventory(IMachine machine) { super(machine); } @Override public void markDirty() { - if (this.getMachine() != null) { - this.getMachine().markDirty(); + IMachine machine = getMachine(); + if (machine != null) { + machine.markDirty(); } } } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index 3d08dacc..a17a8c00 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -1,79 +1,75 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.entity.Entity; +import binnie.core.machines.IMachine; import net.minecraft.entity.item.EntityItem; -import java.util.List; -import java.util.ArrayList; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; import java.util.LinkedHashMap; -import binnie.core.machines.IMachine; +import java.util.List; import java.util.Map; +import java.util.Random; -public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots -{ - private Map inventory; +public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots { + private Map inventory = new LinkedHashMap<>(); - public ComponentInventorySlots(final IMachine machine) { + public ComponentInventorySlots(IMachine machine) { super(machine); - this.inventory = new LinkedHashMap(); } @Override public int getSizeInventory() { int size = 0; - for (final Integer index : this.inventory.keySet()) { + for (Integer index : inventory.keySet()) { size = Math.max(size, index + 1); } return size; } @Override - public ItemStack getStackInSlot(final int index) { - if (this.inventory.containsKey(index)) { - return this.inventory.get(index).getContent(); + public ItemStack getStackInSlot(int index) { + if (inventory.containsKey(index)) { + return inventory.get(index).getContent(); } return null; } @Override - public ItemStack decrStackSize(final int index, final int amount) { - if (this.inventory.containsKey(index)) { - final ItemStack stack = this.inventory.get(index).decrStackSize(amount); - this.markDirty(); + public ItemStack decrStackSize(int index, int amount) { + if (inventory.containsKey(index)) { + ItemStack stack = inventory.get(index).decrStackSize(amount); + markDirty(); return stack; } return null; } @Override - public ItemStack getStackInSlotOnClosing(final int var1) { + public ItemStack getStackInSlotOnClosing(int var1) { return null; } @Override - public void setInventorySlotContents(final int index, final ItemStack itemStack) { - if (this.inventory.containsKey(index) && (itemStack == null || this.inventory.get(index).isValid(itemStack))) { - this.inventory.get(index).setContent(itemStack); + public void setInventorySlotContents(int index, ItemStack itemStack) { + if (inventory.containsKey(index) && (itemStack == null || inventory.get(index).isValid(itemStack))) { + inventory.get(index).setContent(itemStack); } this.markDirty(); } - protected void transferItem(final int indexFrom, final int indexTo) { - if (this.inventory.containsKey(indexFrom) && this.inventory.containsKey(indexTo)) { - final ItemStack newStack = this.inventory.get(indexFrom).getContent().copy(); - this.inventory.get(indexFrom).setContent(null); - this.inventory.get(indexTo).setContent(newStack); + protected void transferItem(int indexFrom, int indexTo) { + if (inventory.containsKey(indexFrom) && inventory.containsKey(indexTo)) { + ItemStack newStack = inventory.get(indexFrom).getContent().copy(); + inventory.get(indexFrom).setContent(null); + inventory.get(indexTo).setContent(newStack); } - this.markDirty(); + markDirty(); } @Override @@ -87,43 +83,45 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } @Override - public boolean isUseableByPlayer(final EntityPlayer var1) { + public boolean isUseableByPlayer(EntityPlayer var1) { return true; } @Override public void openInventory() { + // ignored } @Override public void closeInventory() { + // ignored } @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { + public void readFromNBT(NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); if (nbttagcompound.hasKey("inventory")) { - final NBTTagList inventoryNBT = nbttagcompound.getTagList("inventory", 10); + NBTTagList inventoryNBT = nbttagcompound.getTagList("inventory", 10); for (int i = 0; i < inventoryNBT.tagCount(); ++i) { - final NBTTagCompound slotNBT = inventoryNBT.getCompoundTagAt(i); + NBTTagCompound slotNBT = inventoryNBT.getCompoundTagAt(i); int index = slotNBT.getInteger("id"); if (slotNBT.hasKey("Slot")) { index = (slotNBT.getByte("Slot") & 0xFF); } - if (this.inventory.containsKey(index)) { - this.inventory.get(index).readFromNBT(slotNBT); + if (inventory.containsKey(index)) { + inventory.get(index).readFromNBT(slotNBT); } } } - this.markDirty(); + markDirty(); } @Override - public void writeToNBT(final NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { super.writeToNBT(nbttagcompound); - final NBTTagList inventoryNBT = new NBTTagList(); - for (final Map.Entry entry : this.inventory.entrySet()) { - final NBTTagCompound slotNBT = new NBTTagCompound(); + NBTTagList inventoryNBT = new NBTTagList(); + for (Map.Entry entry : inventory.entrySet()) { + NBTTagCompound slotNBT = new NBTTagCompound(); slotNBT.setInteger("id", entry.getKey()); entry.getValue().writeToNBT(slotNBT); inventoryNBT.appendTag(slotNBT); @@ -132,46 +130,46 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } @Override - public final InventorySlot addSlot(final int index, final String unlocName) { - this.inventory.put(index, new InventorySlot(index, unlocName)); - return this.getSlot(index); + public InventorySlot addSlot(int index, String unlocalizedName) { + inventory.put(index, new InventorySlot(index, unlocalizedName)); + return getSlot(index); } @Override - public final InventorySlot[] addSlotArray(final int[] indexes, final String unlocName) { - for (final int k : indexes) { - this.addSlot(k, unlocName); + public InventorySlot[] addSlotArray(int[] indexes, String unlocalizedName) { + for (int k : indexes) { + addSlot(k, unlocalizedName); } - return this.getSlots(indexes); + return getSlots(indexes); } @Override - public InventorySlot getSlot(final int index) { - if (this.inventory.containsKey(index)) { - return this.inventory.get(index); + public InventorySlot getSlot(int index) { + if (inventory.containsKey(index)) { + return inventory.get(index); } return null; } @Override public InventorySlot[] getAllSlots() { - return this.inventory.values().toArray(new InventorySlot[0]); + return inventory.values().toArray(new InventorySlot[0]); } @Override - public InventorySlot[] getSlots(final int[] indexes) { - final List list = new ArrayList(); - for (final int i : indexes) { - if (this.getSlot(i) != null) { - list.add(this.getSlot(i)); + public InventorySlot[] getSlots(int[] indexes) { + List list = new ArrayList(); + for (int i : indexes) { + if (getSlot(i) != null) { + list.add(getSlot(i)); } } return list.toArray(new InventorySlot[0]); } @Override - public boolean isReadOnly(final int slot) { - final InventorySlot iSlot = this.getSlot(slot); + public boolean isReadOnly(int slot) { + InventorySlot iSlot = getSlot(slot); return iSlot == null || iSlot.isReadOnly(); } @@ -181,41 +179,49 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemStack) { - final InventorySlot iSlot = this.getSlot(slot); - return iSlot != null && (iSlot.isValid(itemStack) && !this.isReadOnly(slot)); + public boolean isItemValidForSlot(int slot, ItemStack itemStack) { + InventorySlot iSlot = getSlot(slot); + return iSlot != null && (iSlot.isValid(itemStack) && !isReadOnly(slot)); } @Override public void onDestruction() { - for (final InventorySlot slot : this.inventory.values()) { - final ItemStack stack = slot.getContent(); - if (!slot.isRecipe() && stack != null) { - final float f = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; - final float f2 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; - final float f3 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f; - if (stack.stackSize == 0) { - stack.stackSize = 1; - } - final EntityItem entityitem = new EntityItem(this.getMachine().getWorld(), this.getMachine().getTileEntity().xCoord + f, this.getMachine().getTileEntity().yCoord + f2, this.getMachine().getTileEntity().zCoord + f3, stack.copy()); - final float accel = 0.05f; - entityitem.motionX = (float) this.getMachine().getWorld().rand.nextGaussian() * accel; - entityitem.motionY = (float) this.getMachine().getWorld().rand.nextGaussian() * accel + 0.2f; - entityitem.motionZ = (float) this.getMachine().getWorld().rand.nextGaussian() * accel; - this.getMachine().getWorld().spawnEntityInWorld(entityitem); + for (InventorySlot slot : this.inventory.values()) { + ItemStack stack = slot.getContent(); + if (slot.isRecipe() || stack == null) { + continue; } + + IMachine machine = getMachine(); + World world = machine.getWorld(); + Random rand = world.rand; + TileEntity tileEntity = machine.getTileEntity(); + float xOffset = rand.nextFloat() * 0.8f + 0.1f; + float yOffset = rand.nextFloat() * 0.8f + 0.1f; + float zOffset = rand.nextFloat() * 0.8f + 0.1f; + + if (stack.stackSize == 0) { + stack.stackSize = 1; + } + + EntityItem entityItem = new EntityItem(world, tileEntity.xCoord + xOffset, tileEntity.yCoord + yOffset, tileEntity.zCoord + zOffset, stack.copy()); + float accel = 0.05f; + entityItem.motionX = (float) rand.nextGaussian() * accel; + entityItem.motionY = (float) rand.nextGaussian() * accel + 0.2f; + entityItem.motionZ = (float) rand.nextGaussian() * accel; + world.spawnEntityInWorld(entityItem); } } @Override - public int[] getAccessibleSlotsFromSide(final int var1) { - final List slots = new ArrayList(); - for (final InventorySlot slot : this.inventory.values()) { + public int[] getAccessibleSlotsFromSide(int var1) { + List slots = new ArrayList<>(); + for (InventorySlot slot : inventory.values()) { if (slot.canInsert() || slot.canExtract()) { slots.add(slot.getIndex()); } } - final int[] ids = new int[slots.size()]; + int[] ids = new int[slots.size()]; for (int i = 0; i < slots.size(); ++i) { ids[i] = slots.get(i); } @@ -223,12 +229,13 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve } @Override - public boolean canInsertItem(final int i, final ItemStack itemstack, final int j) { - return this.isItemValidForSlot(i, itemstack) && this.getSlot(i).canInsert(ForgeDirection.getOrientation(j)); + public boolean canInsertItem(int slot, ItemStack itemstack, int direction) { + return isItemValidForSlot(slot, itemstack) + && getSlot(slot).canInsert(ForgeDirection.getOrientation(direction)); } @Override - public boolean canExtractItem(final int i, final ItemStack itemstack, final int j) { - return this.getSlot(i).canExtract(ForgeDirection.getOrientation(j)); + public boolean canExtractItem(int slot, ItemStack itemstack, int direction) { + return getSlot(slot).canExtract(ForgeDirection.getOrientation(direction)); } } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java index 04fdf62f..af9a4c79 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java @@ -1,147 +1,144 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import binnie.core.machines.transfer.TransferRequest; -import net.minecraft.item.ItemStack; -import net.minecraft.inventory.IInventory; -import java.util.ArrayList; import binnie.core.machines.IMachine; -import java.util.List; import binnie.core.machines.MachineComponent; +import binnie.core.machines.transfer.TransferRequest; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; -public class ComponentInventoryTransfer extends MachineComponent -{ - private List transfers; +import java.util.ArrayList; +import java.util.List; - public ComponentInventoryTransfer(final IMachine machine) { +public class ComponentInventoryTransfer extends MachineComponent { + private List transfers = new ArrayList<>(); + + public ComponentInventoryTransfer(IMachine machine) { super(machine); - this.transfers = new ArrayList(); } - public void addRestock(final int[] buffer, final int destination, final int limit) { - this.transfers.add(new Restock(this.getMachine(), buffer, destination, limit)); + public void addRestock(int[] buffer, int destination, int limit) { + this.transfers.add(new Restock(getMachine(), buffer, destination, limit)); } - public void addRestock(final int[] buffer, final int destination) { - this.transfers.add(new Restock(this.getMachine(), buffer, destination)); + public void addRestock(int[] buffer, int destination) { + this.transfers.add(new Restock(getMachine(), buffer, destination)); } - public void addStorage(final int source, final int[] destination) { - this.transfers.add(new Storage(this.getMachine(), source, destination)); + public void addStorage(int source, int[] destination) { + this.transfers.add(new Storage(getMachine(), source, destination)); } - public void performTransfer(final int source, final int[] destination) { - new Storage(this.getMachine(), source, destination).transfer(this.getMachine().getInterface(IInventoryMachine.class)); + public void performTransfer(int source, int[] destination) { + new Storage(getMachine(), source, destination).transfer(getMachine().getInterface(IInventoryMachine.class)); } @Override public void onUpdate() { - for (final Transfer transfer : this.transfers) { - transfer.transfer(this.getMachine().getInterface(IInventoryMachine.class)); + for (Transfer transfer : transfers) { + transfer.transfer(getMachine().getInterface(IInventoryMachine.class)); } } - public void addStorage(final int source, final int[] destination, final Condition condition) { - this.transfers.add(new Storage(this.getMachine(), source, destination).setCondition(condition)); + public void addStorage(int source, int[] destination, Condition condition) { + this.transfers.add(new Storage(getMachine(), source, destination).setCondition(condition)); } - public abstract class Transfer - { + public abstract class Transfer { protected Condition condition; protected IMachine machine; - private Transfer(final IMachine machine) { + private Transfer(IMachine machine) { this.machine = machine; } - public final void transfer(final IInventory inv) { - if (this.condition == null || this.fufilled(inv)) { + public void transfer(IInventory inv) { + if (this.condition == null || fufilled(inv)) { this.doTransfer(inv); } } - protected boolean fufilled(final IInventory inv) { + protected boolean fufilled(IInventory inv) { return true; } - protected void doTransfer(final IInventory inv) { + protected void doTransfer(IInventory inv) { } - public final Transfer setCondition(final Condition condition) { + public Transfer setCondition(Condition condition) { this.condition = condition; return condition.transfer = this; } - public final IMachine getMachine() { - return this.machine; + public IMachine getMachine() { + return machine; } } - private class Restock extends Transfer - { - int[] buffer; - int destination; - int limit; + private class Restock extends Transfer { + private int[] buffer; + private int destination; + private int limit; - private Restock(final IMachine machine, final int[] buffer, final int destination, final int limit) { + private Restock(IMachine machine, int[] buffer, int destination, int limit) { super(machine); this.buffer = buffer; this.destination = destination; this.limit = limit; } - private Restock(final IMachine machine, final int[] buffer, final int destination) { + private Restock(IMachine machine, int[] buffer, int destination) { this(machine, buffer, destination, 64); } @Override - protected void doTransfer(final IInventory inv) { + protected void doTransfer(IInventory inv) { if (inv.getStackInSlot(this.destination) == null) { - for (final int i : this.buffer) { - if (inv.getStackInSlot(i) != null) { - final ItemStack newStack = inv.decrStackSize(i, this.limit); - if (newStack != null) { - inv.setInventorySlotContents(this.destination, newStack); - return; - } + for (int i : buffer) { + if (inv.getStackInSlot(i) == null) { + continue; + } + + ItemStack newStack = inv.decrStackSize(i, limit); + if (newStack != null) { + inv.setInventorySlotContents(destination, newStack); + return; } } } } } - private class Storage extends Transfer - { - int source; - int[] destination; + private class Storage extends Transfer { + private int source; + private int[] destination; - private Storage(final IMachine machine, final int source, final int[] destination) { + private Storage(IMachine machine, int source, int[] destination) { super(machine); this.source = source; this.destination = destination; } @Override - protected void doTransfer(final IInventory inv) { - if (inv.getStackInSlot(this.source) != null) { - inv.setInventorySlotContents(this.source, new TransferRequest(inv.getStackInSlot(this.source), inv).setTargetSlots(this.destination).ignoreValidation().transfer(true)); + protected void doTransfer(IInventory inv) { + if (inv.getStackInSlot(source) != null) { + TransferRequest request = new TransferRequest(inv.getStackInSlot(source), inv); + ItemStack itemStack = request.setTargetSlots(destination) + .ignoreValidation() + .transfer(true); + inv.setInventorySlotContents(source, itemStack); } } @Override - protected boolean fufilled(final IInventory inv) { - final ItemStack stack = inv.getStackInSlot(this.source); - return stack != null && this.condition.fufilled(stack); + protected boolean fufilled(IInventory inv) { + ItemStack stack = inv.getStackInSlot(source); + return stack != null && condition.fufilled(stack); } } - public abstract static class Condition - { + public abstract static class Condition { public Transfer transfer; - public abstract boolean fufilled(final ItemStack p0); + public abstract boolean fufilled(ItemStack p0); } } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 1c7f2f30..3e32f7ba 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -1,89 +1,83 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.Fluid; -import java.util.List; -import java.util.ArrayList; -import net.minecraftforge.fluids.IFluidTank; -import binnie.core.machines.power.TankInfo; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.common.util.ForgeDirection; -import java.util.LinkedHashMap; import binnie.core.machines.IMachine; -import java.util.Map; -import binnie.core.machines.power.ITankMachine; import binnie.core.machines.MachineComponent; +import binnie.core.machines.power.ITankMachine; +import binnie.core.machines.power.TankInfo; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidTank; -public class ComponentTankContainer extends MachineComponent implements ITankMachine -{ - private Map tanks; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; - public ComponentTankContainer(final IMachine machine) { +public class ComponentTankContainer extends MachineComponent implements ITankMachine { + private Map tanks = new LinkedHashMap<>(); + + public ComponentTankContainer(IMachine machine) { super(machine); - this.tanks = new LinkedHashMap(); } @Override - public final TankSlot addTank(final int index, final String name, final int capacity) { - final TankSlot tank = new TankSlot(index, name, capacity); - this.tanks.put(index, tank); + public TankSlot addTank(int index, String name, int capacity) { + TankSlot tank = new TankSlot(index, name, capacity); + tanks.put(index, tank); return tank; } @Override - public final int fill(final ForgeDirection from, final FluidStack resource, final boolean doFill) { - final int index = this.getTankIndexToFill(from, resource); - if (this.tanks.containsKey(index)) { - return this.fill(index, resource, doFill); + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + int index = getTankIndexToFill(from, resource); + if (tanks.containsKey(index)) { + return fill(index, resource, doFill); } return 0; } @Override - public final FluidStack drain(final ForgeDirection from, final int maxDrain, final boolean doDrain) { - final int index = this.getTankIndexToDrain(from, null); - if (this.tanks.containsKey(index)) { - return this.drain(index, maxDrain, doDrain); + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + int index = getTankIndexToDrain(from, null); + if (tanks.containsKey(index)) { + return drain(index, maxDrain, doDrain); } return null; } - private final int fill(final int tankIndex, final FluidStack resource, final boolean doFill) { - if (!this.tanks.containsKey(tankIndex)) { + private int fill(int tankIndex, FluidStack resource, boolean doFill) { + if (!tanks.containsKey(tankIndex)) { return 0; } - if (!this.isLiquidValidForTank(resource, tankIndex)) { + if (!isLiquidValidForTank(resource, tankIndex)) { return 0; } - final TankSlot tank = this.tanks.get(tankIndex); - final int filled = tank.getTank().fill(resource, doFill); + TankSlot tank = tanks.get(tankIndex); + int filled = tank.getTank().fill(resource, doFill); if (filled > 0) { - this.markDirty(); + markDirty(); } return filled; } - private final FluidStack drain(final int tankIndex, final int maxDrain, final boolean doDrain) { - if (!this.tanks.containsKey(tankIndex)) { + private FluidStack drain(int tankIndex, int maxDrain, boolean doDrain) { + if (!tanks.containsKey(tankIndex)) { return null; } - final TankSlot tank = this.tanks.get(tankIndex); - final FluidStack drained = tank.getTank().drain(maxDrain, doDrain); + TankSlot tank = tanks.get(tankIndex); + FluidStack drained = tank.getTank().drain(maxDrain, doDrain); if (drained != null) { - this.markDirty(); + markDirty(); } return drained; } - private int getTankIndexToFill(final ForgeDirection from, final FluidStack resource) { - for (final TankSlot tank : this.tanks.values()) { + private int getTankIndexToFill(ForgeDirection from, FluidStack resource) { + for (TankSlot tank : tanks.values()) { if (tank.isValid(resource) && tank.canInsert(from) && (tank.getContent() == null || tank.getContent().isFluidEqual(resource))) { return tank.getIndex(); } @@ -91,8 +85,8 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac return -1; } - private int getTankIndexToDrain(final ForgeDirection from, final FluidStack resource) { - for (final TankSlot tank : this.tanks.values()) { + private int getTankIndexToDrain(ForgeDirection from, FluidStack resource) { + for (TankSlot tank : tanks.values()) { if (tank.getContent() != null && tank.canExtract(from) && (resource == null || resource.isFluidEqual(tank.getContent()))) { return tank.getIndex(); } @@ -101,26 +95,26 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac } @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { + public void readFromNBT(NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); if (nbttagcompound.hasKey("liquidTanks")) { - final NBTTagList tanksNBT = nbttagcompound.getTagList("liquidTanks", 10); + NBTTagList tanksNBT = nbttagcompound.getTagList("liquidTanks", 10); for (int i = 0; i < tanksNBT.tagCount(); ++i) { - final NBTTagCompound tankNBT = tanksNBT.getCompoundTagAt(i); - final int index = tankNBT.getInteger("index"); - if (this.tanks.containsKey(index)) { - this.tanks.get(index).readFromNBT(tankNBT); + NBTTagCompound tankNBT = tanksNBT.getCompoundTagAt(i); + int index = tankNBT.getInteger("index"); + if (tanks.containsKey(index)) { + tanks.get(index).readFromNBT(tankNBT); } } } } @Override - public void writeToNBT(final NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { super.writeToNBT(nbttagcompound); - final NBTTagList tanksNBT = new NBTTagList(); - for (final Map.Entry entry : this.tanks.entrySet()) { - final NBTTagCompound tankNBT = new NBTTagCompound(); + NBTTagList tanksNBT = new NBTTagList(); + for (Map.Entry entry : tanks.entrySet()) { + NBTTagCompound tankNBT = new NBTTagCompound(); tankNBT.setInteger("index", entry.getKey()); entry.getValue().writeToNBT(tankNBT); tanksNBT.appendTag(tankNBT); @@ -129,13 +123,13 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac } @Override - public boolean isTankReadOnly(final int tank) { - return this.tanks.get(tank).isReadOnly(); + public boolean isTankReadOnly(int tank) { + return tanks.get(tank).isReadOnly(); } @Override - public boolean isLiquidValidForTank(final FluidStack liquid, final int tank) { - final TankSlot slot = this.getTankSlot(tank); + public boolean isLiquidValidForTank(FluidStack liquid, int tank) { + TankSlot slot = getTankSlot(tank); return slot != null && (slot.isValid(liquid) && !slot.isReadOnly()); } @@ -145,55 +139,55 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac } @Override - public IFluidTank getTank(final int index) { - return this.getTanks()[index]; + public IFluidTank getTank(int index) { + return getTanks()[index]; } @Override public IFluidTank[] getTanks() { - final List ltanks = new ArrayList(); - for (final TankSlot tank : this.tanks.values()) { + List ltanks = new ArrayList<>(); + for (TankSlot tank : tanks.values()) { ltanks.add(tank.getTank()); } return ltanks.toArray(new IFluidTank[0]); } @Override - public TankSlot getTankSlot(final int index) { - return this.tanks.get(index); + public TankSlot getTankSlot(int slot) { + return tanks.get(slot); } @Override - public FluidStack drain(final ForgeDirection from, final FluidStack resource, final boolean doDrain) { - final int index = this.getTankIndexToDrain(from, null); - if (this.tanks.containsKey(index)) { - return this.drain(index, resource.amount, doDrain); + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + int index = getTankIndexToDrain(from, null); + if (tanks.containsKey(index)) { + return drain(index, resource.amount, doDrain); } return null; } @Override - public boolean canFill(final ForgeDirection from, final Fluid fluid) { - return this.fill(from, new FluidStack(fluid, 1), false) > 0; + public boolean canFill(ForgeDirection from, Fluid fluid) { + return fill(from, new FluidStack(fluid, 1), false) > 0; } @Override - public boolean canDrain(final ForgeDirection from, final Fluid fluid) { - return this.drain(from, new FluidStack(fluid, 1), false) != null; + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return drain(from, new FluidStack(fluid, 1), false) != null; } @Override - public FluidTankInfo[] getTankInfo(final ForgeDirection from) { - final FluidTankInfo[] info = new FluidTankInfo[this.getTanks().length]; + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + FluidTankInfo[] info = new FluidTankInfo[getTanks().length]; for (int i = 0; i < info.length; ++i) { - info[i] = new FluidTankInfo(this.getTanks()[i]); + info[i] = new FluidTankInfo(getTanks()[i]); } return info; } public void markDirty() { - if (this.getMachine() != null) { - this.getMachine().markDirty(); + if (getMachine() != null) { + getMachine().markDirty(); } } } diff --git a/src/main/java/binnie/core/machines/inventory/IChargedSlots.java b/src/main/java/binnie/core/machines/inventory/IChargedSlots.java index 63f9f264..85c7e587 100644 --- a/src/main/java/binnie/core/machines/inventory/IChargedSlots.java +++ b/src/main/java/binnie/core/machines/inventory/IChargedSlots.java @@ -1,14 +1,9 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -public interface IChargedSlots -{ - float getCharge(final int p0); +public interface IChargedSlots { + float getCharge(int slot); - void setCharge(final int p0, final float p1); + void setCharge(int slot, float value); - void alterCharge(final int p0, final float p1); + void alterCharge(int slot, float value); } diff --git a/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java b/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java index 2f1b5836..752a3115 100644 --- a/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java +++ b/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java @@ -1,12 +1,7 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; -public interface IInventoryMachine extends IInventory, ISidedInventory, IValidatedInventory -{ +public interface IInventoryMachine extends IInventory, ISidedInventory, IValidatedInventory { } diff --git a/src/main/java/binnie/core/machines/inventory/IInventorySlots.java b/src/main/java/binnie/core/machines/inventory/IInventorySlots.java index 0e5cce39..946d53ad 100644 --- a/src/main/java/binnie/core/machines/inventory/IInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/IInventorySlots.java @@ -1,18 +1,13 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -public interface IInventorySlots -{ - InventorySlot addSlot(final int p0, final String p1); +public interface IInventorySlots { + InventorySlot addSlot(int index, String unlocalizedName); - InventorySlot[] addSlotArray(final int[] p0, final String p1); + InventorySlot[] addSlotArray(int[] indexes, String unlocalizedName); - InventorySlot getSlot(final int p0); + InventorySlot getSlot(int index); - InventorySlot[] getSlots(final int[] p0); + InventorySlot[] getSlots(int[] indexes); InventorySlot[] getAllSlots(); } diff --git a/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java b/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java index 742b647a..ed34b69c 100644 --- a/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java +++ b/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java @@ -1,12 +1,7 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; import net.minecraft.inventory.IInventory; -interface IValidatedInventory extends IInventory -{ - boolean isReadOnly(final int p0); +interface IValidatedInventory extends IInventory { + boolean isReadOnly(int slot); } diff --git a/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java b/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java index 84136a1d..b3e609b0 100644 --- a/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java @@ -1,14 +1,9 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; import net.minecraftforge.fluids.FluidStack; -public interface IValidatedTankContainer -{ - boolean isTankReadOnly(final int p0); +public interface IValidatedTankContainer { + boolean isTankReadOnly(int tank); - boolean isLiquidValidForTank(final FluidStack p0, final int p1); + boolean isLiquidValidForTank(FluidStack liquid, int tank); } diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 007a9a29..a2936fa6 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -1,109 +1,102 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import binnie.core.BinnieCore; import binnie.Binnie; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; +import binnie.core.BinnieCore; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; -public class InventorySlot extends BaseSlot -{ +public class InventorySlot extends BaseSlot { private ItemStack itemStack; private Type type; - public InventorySlot(final int index, final String unlocName) { - super(index, unlocName); + public InventorySlot(int index, String unlocalizedName) { + super(index, unlocalizedName); this.itemStack = null; this.type = Type.Standard; } @Override public ItemStack getContent() { - return this.itemStack; + return itemStack; } public ItemStack getItemStack() { - return this.getContent(); + return getContent(); } @Override - public void setContent(final ItemStack itemStack) { + public void setContent(ItemStack itemStack) { this.itemStack = itemStack; } - public ItemStack decrStackSize(final int amount) { - if (this.itemStack == null) { + public ItemStack decrStackSize(int amount) { + if (itemStack == null) { return null; } - if (this.itemStack.stackSize <= amount) { - final ItemStack returnStack = this.itemStack.copy(); - this.itemStack = null; + if (itemStack.stackSize <= amount) { + ItemStack returnStack = itemStack.copy(); + itemStack = null; return returnStack; } - final ItemStack returnStack = this.itemStack.copy(); - final ItemStack itemStack = this.itemStack; + + ItemStack returnStack = itemStack.copy(); + ItemStack itemStack = this.itemStack; itemStack.stackSize -= amount; returnStack.stackSize = amount; return returnStack; } @Override - public void readFromNBT(final NBTTagCompound slotNBT) { + public void readFromNBT(NBTTagCompound slotNBT) { if (slotNBT.hasKey("item")) { - final NBTTagCompound itemNBT = slotNBT.getCompoundTag("item"); - this.itemStack = ItemStack.loadItemStackFromNBT(itemNBT); - } - else { - this.itemStack = null; + NBTTagCompound itemNBT = slotNBT.getCompoundTag("item"); + itemStack = ItemStack.loadItemStackFromNBT(itemNBT); + } else { + itemStack = null; } } @Override - public void writeToNBT(final NBTTagCompound slotNBT) { - final NBTTagCompound itemNBT = new NBTTagCompound(); - if (this.itemStack != null) { - this.itemStack.writeToNBT(itemNBT); + public void writeToNBT(NBTTagCompound slotNBT) { + NBTTagCompound itemNBT = new NBTTagCompound(); + if (itemStack != null) { + itemStack.writeToNBT(itemNBT); } slotNBT.setTag("item", itemNBT); } - public void setItemStack(final ItemStack duplicate) { - this.setContent(duplicate); + public void setItemStack(ItemStack duplicate) { + setContent(duplicate); } @Override public SlotValidator getValidator() { - return (SlotValidator) this.validator; + return (SlotValidator) validator; } - public void setType(final Type type) { + public void setType(Type type) { this.type = type; if (type == Type.Recipe) { - this.setReadOnly(); - this.forbidInteraction(); + setReadOnly(); + forbidInteraction(); } } public Type getType() { - return this.type; + return type; } public boolean isRecipe() { - return this.type == Type.Recipe; + return type == Type.Recipe; } @Override public String getName() { - return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + this.unlocName); + return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + unlocName); } - public enum Type - { + public enum Type { Standard, - Recipe; + Recipe } } diff --git a/src/main/java/binnie/core/machines/inventory/MachineSide.java b/src/main/java/binnie/core/machines/inventory/MachineSide.java index 2d9d8f14..1790f697 100644 --- a/src/main/java/binnie/core/machines/inventory/MachineSide.java +++ b/src/main/java/binnie/core/machines/inventory/MachineSide.java @@ -1,29 +1,26 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import java.util.Collection; import net.minecraftforge.common.util.ForgeDirection; + +import java.util.Collection; import java.util.EnumSet; -public class MachineSide -{ - private static EnumSet All; - public static EnumSet TopAndBottom; - public static EnumSet None; - public static EnumSet Top; - public static EnumSet Bottom; - public static EnumSet Sides; +public class MachineSide { + private static EnumSet All = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN, ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); + public static EnumSet TopAndBottom = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN); + public static EnumSet None = EnumSet.noneOf(ForgeDirection.class); + public static EnumSet Top = EnumSet.of(ForgeDirection.UP); + public static EnumSet Bottom = EnumSet.of(ForgeDirection.DOWN); + public static EnumSet Sides = EnumSet.of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); - public static String asString(final Collection sides) { + public static String asString(Collection sides) { if (sides.containsAll(MachineSide.All)) { return "Any"; } if (sides.isEmpty()) { return "None"; } + String text = ""; if (sides.contains(ForgeDirection.UP)) { if (sides.size() > 0) { @@ -31,37 +28,41 @@ public class MachineSide } text += "Up"; } + if (sides.contains(ForgeDirection.DOWN)) { if (sides.size() > 0) { text += ", "; } text += "Down"; } + if (sides.containsAll(MachineSide.Sides)) { if (sides.size() > 0) { text += ", "; } text += "Sides"; - } - else { + } else { if (sides.contains(ForgeDirection.NORTH)) { if (sides.size() > 0) { text += ", "; } text += "North"; } + if (sides.contains(ForgeDirection.EAST)) { if (sides.size() > 0) { text += ", "; } text += "East"; } + if (sides.contains(ForgeDirection.SOUTH)) { if (sides.size() > 0) { text += ", "; } text += "South"; } + if (sides.contains(ForgeDirection.WEST)) { if (sides.size() > 0) { text += ", "; @@ -71,13 +72,4 @@ public class MachineSide } return text; } - - static { - MachineSide.All = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN, ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); - MachineSide.TopAndBottom = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN); - MachineSide.None = EnumSet.noneOf(ForgeDirection.class); - MachineSide.Top = EnumSet.of(ForgeDirection.UP); - MachineSide.Bottom = EnumSet.of(ForgeDirection.DOWN); - MachineSide.Sides = EnumSet.of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); - } } diff --git a/src/main/java/binnie/core/machines/inventory/SetList.java b/src/main/java/binnie/core/machines/inventory/SetList.java index 4e7eeab5..c00389c0 100644 --- a/src/main/java/binnie/core/machines/inventory/SetList.java +++ b/src/main/java/binnie/core/machines/inventory/SetList.java @@ -1,37 +1,32 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; +import java.util.ArrayList; import java.util.Collection; import java.util.Set; -import java.util.ArrayList; -public class SetList extends ArrayList implements Set -{ - private static final long serialVersionUID = 1277112003159980135L; +public class SetList extends ArrayList implements Set { + private static long serialVersionUID = 1277112003159980135L; @Override - public boolean add(final E e) { - return !this.contains(e) && super.add(e); + public boolean add(E e) { + return !contains(e) && super.add(e); } @Override - public void add(final int index, final E e) { - if (!this.contains(e)) { + public void add(int index, E e) { + if (!contains(e)) { super.add(index, e); } } @Override - public boolean addAll(final Collection c) { - return this.addAll(this.size(), c); + public boolean addAll(Collection c) { + return addAll(size(), c); } @Override - public boolean addAll(final int index, final Collection c) { - final Collection copy = new ArrayList(c); + public boolean addAll(int index, Collection c) { + Collection copy = new ArrayList<>(c); copy.removeAll(this); return super.addAll(index, copy); } diff --git a/src/main/java/binnie/core/machines/inventory/SidedAccess.java b/src/main/java/binnie/core/machines/inventory/SidedAccess.java index 8e3e8c5c..b24c7e51 100644 --- a/src/main/java/binnie/core/machines/inventory/SidedAccess.java +++ b/src/main/java/binnie/core/machines/inventory/SidedAccess.java @@ -1,66 +1,59 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import java.util.List; +import net.minecraftforge.common.util.ForgeDirection; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import net.minecraftforge.common.util.ForgeDirection; +import java.util.List; import java.util.Map; -class SidedAccess -{ - private Map accesses; - private AccessDirection base; +class SidedAccess { + private Map accesses = new HashMap<>(); + private AccessDirection base = AccessDirection.Both; private boolean insertLocked; private boolean extractLocked; public SidedAccess() { - this.accesses = new HashMap(); - this.base = AccessDirection.Both; - this.insertLocked = false; - this.extractLocked = false; + // ignored } - public AccessDirection getAccess(final ForgeDirection side) { - return this.accesses.containsKey(side) ? this.accesses.get(side) : this.base; + public AccessDirection getAccess(ForgeDirection side) { + return accesses.containsKey(side) ? accesses.get(side) : base; } - public boolean canInsert(final ForgeDirection side) { - return this.getAccess(side).canInsert(); + public boolean canInsert(ForgeDirection side) { + return getAccess(side).canInsert(); } - public boolean canExtract(final ForgeDirection side) { - return this.getAccess(side).canExtract(); + public boolean canExtract(ForgeDirection side) { + return getAccess(side).canExtract(); } - public boolean canAccess(final ForgeDirection side) { - return this.getAccess(side).canAccess(); + public boolean canAccess(ForgeDirection side) { + return getAccess(side).canAccess(); } public boolean canChangeInsert() { - return !this.insertLocked; + return !insertLocked; } public boolean canChangeExtract() { - return !this.extractLocked; + return !extractLocked; } public void forbidInsertChange() { - this.insertLocked = true; + insertLocked = true; } public void forbidExtractChange() { - this.extractLocked = true; + extractLocked = true; } public Collection getInsertionSides() { - final List dirs = new ArrayList(); - for (final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (this.getAccess(dir).canInsert()) { + List dirs = new ArrayList<>(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (getAccess(dir).canInsert()) { dirs.add(dir); } } @@ -68,36 +61,36 @@ class SidedAccess } public Collection getExtractionSides() { - final List dirs = new ArrayList(); - for (final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (this.getAccess(dir).canExtract()) { + List dirs = new ArrayList<>(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (getAccess(dir).canExtract()) { dirs.add(dir); } } return dirs; } - public void setInsert(final ForgeDirection side, final boolean b) { - if (this.getAccess(side).canInsert() != b) { - this.accesses.put(side, this.getAccess(side).changeInsert(b)); + public void setInsert(ForgeDirection side, boolean b) { + if (getAccess(side).canInsert() != b) { + accesses.put(side, getAccess(side).changeInsert(b)); } } - public void setExtract(final ForgeDirection side, final boolean b) { - if (this.getAccess(side).canExtract() != b) { - this.accesses.put(side, this.getAccess(side).changeExtract(b)); + public void setExtract(ForgeDirection side, boolean b) { + if (getAccess(side).canExtract() != b) { + accesses.put(side, getAccess(side).changeExtract(b)); } } - public void setInsert(final boolean b) { - if (this.base.canInsert() != b) { - this.base = this.base.changeInsert(b); + public void setInsert(boolean b) { + if (base.canInsert() != b) { + base = base.changeInsert(b); } } - public void setExtract(final boolean b) { - if (this.base.canExtract() != b) { - this.base = this.base.changeExtract(b); + public void setExtract(boolean b) { + if (base.canExtract() != b) { + base = base.changeExtract(b); } } } diff --git a/src/main/java/binnie/core/machines/inventory/SlotValidator.java b/src/main/java/binnie/core/machines/inventory/SlotValidator.java index 04cea0aa..6d634a19 100644 --- a/src/main/java/binnie/core/machines/inventory/SlotValidator.java +++ b/src/main/java/binnie/core/machines/inventory/SlotValidator.java @@ -1,57 +1,53 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; import forestry.api.genetics.AlleleManager; -import net.minecraft.util.IIcon; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; -public abstract class SlotValidator extends Validator -{ +public abstract class SlotValidator extends Validator { public static ValidatorIcon IconBee; public static ValidatorIcon IconFrame; public static ValidatorIcon IconCircuit; public static ValidatorIcon IconBlock; private ValidatorIcon icon; - public SlotValidator(final ValidatorIcon icon) { + public SlotValidator(ValidatorIcon icon) { this.icon = icon; } - public IIcon getIcon(final boolean input) { - return (this.icon == null) ? null : this.icon.getIcon(input).getIcon(); + public IIcon getIcon(boolean input) { + if (icon == null) { + return null; + } + return icon.getIcon(input).getIcon(); } - public static class Item extends SlotValidator - { + public static class Item extends SlotValidator { private ItemStack target; - public Item(final ItemStack target, final ValidatorIcon icon) { + public Item(ItemStack target, ValidatorIcon icon) { super(icon); this.target = target; } @Override - public boolean isValid(final ItemStack itemStack) { - return itemStack.isItemEqual(this.target); + public boolean isValid(ItemStack itemStack) { + return itemStack.isItemEqual(target); } @Override public String getTooltip() { - return this.target.getDisplayName(); + return target.getDisplayName(); } } - public static class Individual extends SlotValidator - { + public static class Individual extends SlotValidator { public Individual() { super(null); } @Override - public boolean isValid(final ItemStack itemStack) { + public boolean isValid(ItemStack itemStack) { return AlleleManager.alleleRegistry.getIndividual(itemStack) != null; } diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index 2fff7a2d..5c907cb5 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -1,61 +1,53 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import binnie.core.BinnieCore; import binnie.Binnie; -import net.minecraftforge.fluids.IFluidTank; +import binnie.core.BinnieCore; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.IFluidTank; -public class TankSlot extends BaseSlot -{ - public static final String NameJuice = "Juice Tank"; - public static final String NameWater = "Water Tank"; - public static String NameCupboard; +public class TankSlot extends BaseSlot { + public static String NameJuice = "Juice Tank"; + public static String NameWater = "Water Tank"; + public static String NameCupboard = "Cupboard Slot"; private FluidTank tank; - public TankSlot(final int index, final String name, final int capacity) { + public TankSlot(int index, String name, int capacity) { super(index, name); - this.tank = new FluidTank(capacity); + tank = new FluidTank(capacity); } @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { - final FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbttagcompound); - this.setContent(liquid); + public void readFromNBT(NBTTagCompound nbttagcompound) { + FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbttagcompound); + setContent(liquid); } @Override - public void writeToNBT(final NBTTagCompound nbttagcompound) { - if (this.getContent() != null) { - this.getContent().writeToNBT(nbttagcompound); + public void writeToNBT(NBTTagCompound nbttagcompound) { + FluidStack content = getContent(); + if (content != null) { + content.writeToNBT(nbttagcompound); } } @Override public FluidStack getContent() { - return this.tank.getFluid(); + return tank.getFluid(); } @Override - public void setContent(final FluidStack itemStack) { - this.tank.setFluid(itemStack); + public void setContent(FluidStack itemStack) { + tank.setFluid(itemStack); } public IFluidTank getTank() { - return this.tank; + return tank; } @Override public String getName() { - return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + this.unlocName); - } - - static { - TankSlot.NameCupboard = "Cupboard Slot"; + return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + unlocName); } } diff --git a/src/main/java/binnie/core/machines/inventory/TankValidator.java b/src/main/java/binnie/core/machines/inventory/TankValidator.java index e9e16c5d..08c72f8e 100644 --- a/src/main/java/binnie/core/machines/inventory/TankValidator.java +++ b/src/main/java/binnie/core/machines/inventory/TankValidator.java @@ -1,34 +1,28 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; import binnie.Binnie; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -public abstract class TankValidator extends Validator -{ +public abstract class TankValidator extends Validator { @Override - public abstract boolean isValid(final FluidStack p0); + public abstract boolean isValid(FluidStack liquid); - public static class Basic extends TankValidator - { + public static class Basic extends TankValidator { private Fluid fluid; - public Basic(final String name) { - this.fluid = Binnie.Liquid.getLiquidStack(name, 1).getFluid(); + public Basic(String name) { + fluid = Binnie.Liquid.getLiquidStack(name, 1).getFluid(); } @Override - public boolean isValid(final FluidStack stack) { - return new FluidStack(this.fluid, 1).isFluidEqual(stack); + public boolean isValid(FluidStack liquid) { + return new FluidStack(fluid, 1).isFluidEqual(liquid); } @Override public String getTooltip() { - return new FluidStack(this.fluid, 1).getLocalizedName(); + return new FluidStack(fluid, 1).getLocalizedName(); } } } diff --git a/src/main/java/binnie/core/machines/inventory/TransferHandler.java b/src/main/java/binnie/core/machines/inventory/TransferHandler.java index fd43e3f0..b0a1289a 100644 --- a/src/main/java/binnie/core/machines/inventory/TransferHandler.java +++ b/src/main/java/binnie/core/machines/inventory/TransferHandler.java @@ -1,20 +1,16 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; -import net.minecraftforge.fluids.FluidStack; import binnie.core.machines.Machine; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.IFluidTank; import binnie.core.machines.power.ITankMachine; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; -public class TransferHandler -{ - public static ItemStack transfer(final ItemStack item, final IInventory origin, final IInventory destination, final boolean doAdd) { +// TODO unused class? +public class TransferHandler { + public static ItemStack transfer(ItemStack item, IInventory origin, IInventory destination, boolean doAdd) { ItemStack ret = transferItemToInventory(item, destination, doAdd); if (destination instanceof ITankMachine) { ret = transferContainerIntoTank(ret, origin, (ITankMachine) destination, doAdd); @@ -23,13 +19,14 @@ public class TransferHandler return ret; } - public static ItemStack transferItemToInventory(final ItemStack item, final IInventory destination, final boolean doAdd) { + public static ItemStack transferItemToInventory(ItemStack item, IInventory destination, boolean doAdd) { if (item == null || destination == null) { return item; } + ItemStack addition = item.copy(); for (int i = 0; i < destination.getSizeInventory(); ++i) { - addition = transferToInventory(addition, destination, new int[] { i }, doAdd, false); + addition = transferToInventory(addition, destination, new int[]{i}, doAdd, false); if (addition == null) { return null; } @@ -37,8 +34,8 @@ public class TransferHandler return addition; } - public static ItemStack transferToInventory(ItemStack item, final IInventory destination, final int[] targetSlots, final boolean doAdd, final boolean ignoreValidation) { - for (final int i : targetSlots) { + public static ItemStack transferToInventory(ItemStack item, IInventory destination, int[] targetSlots, boolean doAdd, boolean ignoreValidation) { + for (int i : targetSlots) { if (destination.isItemValidForSlot(i, item) || ignoreValidation) { if (destination.getStackInSlot(i) == null) { if (doAdd) { @@ -47,8 +44,8 @@ public class TransferHandler return null; } if (item.isStackable()) { - final ItemStack merged = destination.getStackInSlot(i).copy(); - final ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy()); + ItemStack merged = destination.getStackInSlot(i).copy(); + ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy()); item = newStacks[0]; if (doAdd) { destination.setInventorySlotContents(i, newStacks[1]); @@ -62,29 +59,29 @@ public class TransferHandler return item; } - public static ItemStack[] mergeStacks(ItemStack itemstack, final ItemStack merged) { + public static ItemStack[] mergeStacks(ItemStack itemstack, ItemStack merged) { if (ItemStack.areItemStackTagsEqual(itemstack, merged) && itemstack.isItemEqual(merged)) { - final int space = merged.getMaxStackSize() - merged.stackSize; + int space = merged.getMaxStackSize() - merged.stackSize; if (space > 0) { if (itemstack.stackSize > space) { - final ItemStack itemStack = itemstack; + ItemStack itemStack = itemstack; itemStack.stackSize -= space; merged.stackSize += space; - } - else if (itemstack.stackSize <= space) { + } else if (itemstack.stackSize <= space) { merged.stackSize += itemstack.stackSize; itemstack = null; } } } - return new ItemStack[] { itemstack, merged }; + return new ItemStack[]{itemstack, merged}; } - public static ItemStack transferContainerIntoTank(final ItemStack item, final IInventory origin, final ITankMachine destination, final boolean doAdd) { + public static ItemStack transferContainerIntoTank(ItemStack item, IInventory origin, ITankMachine destination, boolean doAdd) { if (item == null) { return null; } - final IFluidTank[] tanks = destination.getTanks(); + + IFluidTank[] tanks = destination.getTanks(); ItemStack stack = item.copy(); for (int i = 0; i < tanks.length; ++i) { stack = transferToTank(stack, origin, destination, i, doAdd); @@ -92,11 +89,12 @@ public class TransferHandler return stack; } - public static ItemStack transferTankIntoContainer(final ItemStack item, final IInventory origin, final ITankMachine destination, final boolean doAdd) { + public static ItemStack transferTankIntoContainer(ItemStack item, IInventory origin, ITankMachine destination, boolean doAdd) { if (item == null) { return null; } - final IFluidTank[] tanks = destination.getTanks(); + + IFluidTank[] tanks = destination.getTanks(); ItemStack stack = item.copy(); for (int i = 0; i < tanks.length; ++i) { stack = transferFromTank(stack, origin, destination, i, doAdd); @@ -104,54 +102,62 @@ public class TransferHandler return stack; } - public static ItemStack transferToTank(final ItemStack item, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { + public static ItemStack transferToTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { if (item == null) { return item; } + FluidStack containerLiquid = null; FluidContainerRegistry.FluidContainerData containerLiquidData = null; - for (final FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { if (data.filledContainer.isItemEqual(item)) { containerLiquidData = data; containerLiquid = data.fluid.copy(); break; } } + if (containerLiquid == null) { return item; } - final IFluidTank tank = destination.getTanks()[tankID]; - final IValidatedTankContainer validated = Machine.getInterface(IValidatedTankContainer.class, destination); + + IFluidTank tank = destination.getTanks()[tankID]; + IValidatedTankContainer validated = Machine.getInterface(IValidatedTankContainer.class, destination); if (validated != null && !validated.isLiquidValidForTank(containerLiquid, tankID)) { return item; } - final FluidStack largeAmountOfLiquid = containerLiquid.copy(); + + FluidStack largeAmountOfLiquid = containerLiquid.copy(); largeAmountOfLiquid.amount = tank.getCapacity(); - final int amountAdded = tank.fill(largeAmountOfLiquid, false); + int amountAdded = tank.fill(largeAmountOfLiquid, false); int numberOfContainersToAdd = amountAdded / containerLiquid.amount; if (numberOfContainersToAdd > item.stackSize) { numberOfContainersToAdd = item.stackSize; } - final ItemStack copy; + + ItemStack copy; ItemStack leftOverContainers = copy = item.copy(); copy.stackSize -= numberOfContainersToAdd; if (leftOverContainers.stackSize <= 0) { leftOverContainers = null; } + ItemStack emptyContainers = containerLiquidData.emptyContainer.copy(); emptyContainers.stackSize = 0; - final ItemStack itemStack = emptyContainers; + ItemStack itemStack = emptyContainers; itemStack.stackSize += numberOfContainersToAdd; if (emptyContainers.stackSize <= 0) { emptyContainers = null; } - final ItemStack containersThatCantBeDumped = transferItemToInventory(emptyContainers, origin, false); + + ItemStack containersThatCantBeDumped = transferItemToInventory(emptyContainers, origin, false); if (containersThatCantBeDumped != null) { return item; } + if (doAdd) { - final FluidStack copy2; - final FluidStack liquidToFillTank = copy2 = containerLiquid.copy(); + FluidStack copy2; + FluidStack liquidToFillTank = copy2 = containerLiquid.copy(); copy2.amount *= numberOfContainersToAdd; tank.fill(liquidToFillTank, true); transferItemToInventory(emptyContainers, origin, true); @@ -159,49 +165,57 @@ public class TransferHandler return leftOverContainers; } - public static ItemStack transferFromTank(final ItemStack item, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { + public static ItemStack transferFromTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { if (item == null) { return item; } - final IFluidTank tank = destination.getTanks()[tankID]; - final FluidStack liquidInTank = tank.getFluid(); + + IFluidTank tank = destination.getTanks()[tankID]; + FluidStack liquidInTank = tank.getFluid(); if (liquidInTank == null) { return item; } + FluidContainerRegistry.FluidContainerData containerLiquidData = null; - for (final FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { if (data.emptyContainer.isItemEqual(item) && liquidInTank.isFluidEqual(data.fluid)) { containerLiquidData = data; break; } } + if (containerLiquidData == null) { return item; } - final int maximumExtractedLiquid = item.stackSize * containerLiquidData.fluid.amount; - final FluidStack drainedLiquid = tank.drain(maximumExtractedLiquid, false); - final int amountInTank = (drainedLiquid == null) ? 0 : drainedLiquid.amount; + + int maximumExtractedLiquid = item.stackSize * containerLiquidData.fluid.amount; + FluidStack drainedLiquid = tank.drain(maximumExtractedLiquid, false); + int amountInTank = (drainedLiquid == null) ? 0 : drainedLiquid.amount; int numberOfContainersToFill = amountInTank / containerLiquidData.fluid.amount; if (numberOfContainersToFill > item.stackSize) { numberOfContainersToFill = item.stackSize; } - final ItemStack copy; + + ItemStack copy; ItemStack leftOverContainers = copy = item.copy(); copy.stackSize -= numberOfContainersToFill; if (leftOverContainers.stackSize <= 0) { leftOverContainers = null; } + ItemStack filledContainers = containerLiquidData.filledContainer.copy(); filledContainers.stackSize = 0; - final ItemStack itemStack = filledContainers; + ItemStack itemStack = filledContainers; itemStack.stackSize += numberOfContainersToFill; if (filledContainers.stackSize <= 0) { filledContainers = null; } - final ItemStack containersThatCantBeDumped = transferItemToInventory(filledContainers, origin, false); + + ItemStack containersThatCantBeDumped = transferItemToInventory(filledContainers, origin, false); if (containersThatCantBeDumped != null) { return item; } + if (doAdd) { tank.drain(maximumExtractedLiquid, true); transferItemToInventory(filledContainers, origin, true); diff --git a/src/main/java/binnie/core/machines/inventory/Validator.java b/src/main/java/binnie/core/machines/inventory/Validator.java index 5d77c298..d63cf40d 100644 --- a/src/main/java/binnie/core/machines/inventory/Validator.java +++ b/src/main/java/binnie/core/machines/inventory/Validator.java @@ -1,12 +1,7 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; import binnie.core.util.IValidator; -public abstract class Validator implements IValidator -{ +public abstract class Validator implements IValidator { public abstract String getTooltip(); } diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java index 038bb612..db033cbc 100644 --- a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java +++ b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java @@ -1,28 +1,24 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.inventory; import binnie.Binnie; -import java.util.ArrayList; import binnie.core.AbstractMod; import binnie.core.resource.BinnieIcon; + +import java.util.ArrayList; import java.util.List; -public class ValidatorIcon -{ +public class ValidatorIcon { private List iconsInput; private List iconsOutput; - public ValidatorIcon(final AbstractMod mod, final String pathInput, final String pathOutput) { - this.iconsInput = new ArrayList(); - this.iconsOutput = new ArrayList(); - this.iconsInput.add(Binnie.Resource.getItemIcon(mod, pathInput)); - this.iconsOutput.add(Binnie.Resource.getItemIcon(mod, pathOutput)); + public ValidatorIcon(AbstractMod mod, String pathInput, String pathOutput) { + iconsInput = new ArrayList<>(); + iconsOutput = new ArrayList<>(); + iconsInput.add(Binnie.Resource.getItemIcon(mod, pathInput)); + iconsOutput.add(Binnie.Resource.getItemIcon(mod, pathOutput)); } - public BinnieIcon getIcon(final boolean input) { - return input ? this.iconsInput.get(0) : this.iconsOutput.get(0); + public BinnieIcon getIcon(boolean input) { + return input ? iconsInput.get(0) : iconsOutput.get(0); } } diff --git a/src/main/java/binnie/core/machines/network/INetwork.java b/src/main/java/binnie/core/machines/network/INetwork.java index 179fe89a..65a9b561 100644 --- a/src/main/java/binnie/core/machines/network/INetwork.java +++ b/src/main/java/binnie/core/machines/network/INetwork.java @@ -1,34 +1,26 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.network; -import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; + import java.util.Map; -public interface INetwork -{ - public interface SendGuiNBT - { - void sendGuiNBT(final Map p0); +public interface INetwork { + interface SendGuiNBT { + void sendGuiNBT(Map nbts); } - public interface TilePacketSync - { - void syncToNBT(final NBTTagCompound p0); + interface TilePacketSync { + void syncToNBT(NBTTagCompound nbt); - void syncFromNBT(final NBTTagCompound p0); + void syncFromNBT(NBTTagCompound nbt); } - public interface RecieveGuiNBT - { - void recieveGuiNBT(final Side p0, final EntityPlayer p1, final String p2, final NBTTagCompound p3); + interface RecieveGuiNBT { + void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt); } - public interface GuiNBT extends RecieveGuiNBT, SendGuiNBT - { + interface GuiNBT extends RecieveGuiNBT, SendGuiNBT { } } diff --git a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java index 9a4b4256..e583aa91 100644 --- a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java +++ b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java @@ -1,71 +1,70 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -import ic2.api.energy.event.EnergyTileUnloadEvent; -import cpw.mods.fml.common.eventhandler.Event; -import ic2.api.energy.event.EnergyTileLoadEvent; -import ic2.api.energy.tile.IEnergyTile; -import net.minecraftforge.common.MinecraftForge; import binnie.core.Mods; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import binnie.core.triggers.TriggerPower; -import binnie.core.triggers.TriggerData; -import java.util.List; -import net.minecraft.nbt.NBTTagCompound; import binnie.core.machines.IMachine; -import java.util.LinkedList; -import cpw.mods.fml.common.Optional; -import binnie.core.machines.component.IInteraction; -import binnie.core.machines.component.IBuildcraft; import binnie.core.machines.MachineComponent; +import binnie.core.machines.component.IBuildcraft; +import binnie.core.machines.component.IInteraction; +import binnie.core.triggers.TriggerData; +import binnie.core.triggers.TriggerPower; +import cpw.mods.fml.common.Optional; +import ic2.api.energy.event.EnergyTileLoadEvent; +import ic2.api.energy.event.EnergyTileUnloadEvent; +import ic2.api.energy.tile.IEnergyTile; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.LinkedList; +import java.util.List; @Optional.Interface(iface = "binnie.core.machines.component.IBuildcraft.TriggerProvider", modid = "BuildCraft|Silicon") -public class ComponentPowerReceptor extends MachineComponent implements IPoweredMachine, IBuildcraft.TriggerProvider, IInteraction.ChunkUnload, IInteraction.Invalidation -{ +public class ComponentPowerReceptor extends MachineComponent implements + IPoweredMachine, + IBuildcraft.TriggerProvider, + IInteraction.ChunkUnload, + IInteraction.Invalidation { private boolean registeredToIC2EnergyNet; float previousPower; LinkedList inputs; - static final int inputAverageTicks = 20; + static int inputAverageTicks = 20; private PowerInterface container; - public ComponentPowerReceptor(final IMachine machine) { + public ComponentPowerReceptor(IMachine machine) { this(machine, 1000); } - public ComponentPowerReceptor(final IMachine machine, final int storage) { + public ComponentPowerReceptor(IMachine machine, int storage) { super(machine); - this.registeredToIC2EnergyNet = false; - this.previousPower = 0.0f; - this.inputs = new LinkedList(); - this.container = new PowerInterface(storage); - if (!this.registeredToIC2EnergyNet) { - this.addToEnergyNet(); + registeredToIC2EnergyNet = false; + previousPower = 0.0f; + inputs = new LinkedList<>(); + container = new PowerInterface(storage); + if (!registeredToIC2EnergyNet) { + addToEnergyNet(); } } @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { + public void readFromNBT(NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); - this.container.readFromNBT(nbttagcompound); - if (!this.registeredToIC2EnergyNet) { - this.addToEnergyNet(); + container.readFromNBT(nbttagcompound); + if (!registeredToIC2EnergyNet) { + addToEnergyNet(); } } @Override - public void writeToNBT(final NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { super.writeToNBT(nbttagcompound); - this.container.writeToNBT(nbttagcompound); + container.writeToNBT(nbttagcompound); } @Override public void onUpdate() { - if (!this.registeredToIC2EnergyNet && !this.getMachine().getTileEntity().isInvalid()) { - this.addToEnergyNet(); + if (!registeredToIC2EnergyNet && !getMachine().getTileEntity().isInvalid()) { + addToEnergyNet(); } } @@ -76,7 +75,7 @@ public class ComponentPowerReceptor extends MachineComponent implements IPowered @Optional.Method(modid = "BuildCraft|Silicon") @Override - public final void getTriggers(final List triggers) { + public void getTriggers(List triggers) { triggers.add(TriggerPower.powerNone(this)); triggers.add(TriggerPower.powerLow(this)); triggers.add(TriggerPower.powerMedium(this)); @@ -87,7 +86,7 @@ public class ComponentPowerReceptor extends MachineComponent implements IPowered @Override @Optional.Method(modid = "IC2") public double getDemandedEnergy() { - return this.container.getEnergySpace(PowerSystem.EU); + return container.getEnergySpace(PowerSystem.EU); } @Override @@ -98,89 +97,88 @@ public class ComponentPowerReceptor extends MachineComponent implements IPowered @Override @Optional.Method(modid = "IC2") - public double injectEnergy(final ForgeDirection directionFrom, final double amount, final double voltage) { - this.container.addEnergy(PowerSystem.EU, amount, true); + public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) { + container.addEnergy(PowerSystem.EU, amount, true); return 0.0; } @Override @Optional.Method(modid = "IC2") - public boolean acceptsEnergyFrom(final TileEntity emitter, final ForgeDirection direction) { - return this.acceptsPowerSystem(PowerSystem.EU); + public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) { + return acceptsPowerSystem(PowerSystem.EU); } @Override - public int receiveEnergy(final ForgeDirection from, final int maxReceive, final boolean simulate) { - return (int) this.container.addEnergy(PowerSystem.RF, maxReceive, !simulate); + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return (int) container.addEnergy(PowerSystem.RF, maxReceive, !simulate); } @Override - public int extractEnergy(final ForgeDirection from, final int maxExtract, final boolean simulate) { - return this.container.useEnergy(maxExtract, simulate); + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return container.useEnergy(maxExtract, simulate); } @Override - public int getEnergyStored(final ForgeDirection from) { - return (int) this.container.getEnergy(PowerSystem.RF); + public int getEnergyStored(ForgeDirection from) { + return (int) container.getEnergy(PowerSystem.RF); } @Override - public int getMaxEnergyStored(final ForgeDirection from) { - return (int) this.container.getCapacity(PowerSystem.RF); + public int getMaxEnergyStored(ForgeDirection from) { + return (int) container.getCapacity(PowerSystem.RF); } @Override - public boolean canConnectEnergy(final ForgeDirection from) { - final boolean can = this.acceptsPowerSystem(PowerSystem.RF); - return can; + public boolean canConnectEnergy(ForgeDirection from) { + return acceptsPowerSystem(PowerSystem.RF); } @Override public PowerInterface getInterface() { - return this.container; + return container; } - private boolean acceptsPowerSystem(final PowerSystem system) { + private boolean acceptsPowerSystem(PowerSystem system) { return true; } @Override public void onInvalidation() { - this.removeFromEnergyNet(); + removeFromEnergyNet(); } @Override public void onChunkUnload() { - this.removeFromEnergyNet(); + removeFromEnergyNet(); } private void addToEnergyNet() { - if (this.getMachine().getWorld() == null) { + if (getMachine().getWorld() == null) { return; } if (Mods.IC2.active()) { - this.do_addToEnergyNet(); + do_addToEnergyNet(); } } private void removeFromEnergyNet() { - if (this.getMachine().getWorld() == null) { + if (getMachine().getWorld() == null) { return; } if (Mods.IC2.active()) { - this.do_removeFromEnergyNet(); + do_removeFromEnergyNet(); } } @Optional.Method(modid = "IC2") private void do_addToEnergyNet() { - MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent((IEnergyTile) this.getMachine().getTileEntity())); - this.registeredToIC2EnergyNet = true; + MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent((IEnergyTile) getMachine().getTileEntity())); + registeredToIC2EnergyNet = true; } @Optional.Method(modid = "IC2") private void do_removeFromEnergyNet() { - MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile) this.getMachine().getTileEntity())); - this.registeredToIC2EnergyNet = false; + MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile) getMachine().getTileEntity())); + registeredToIC2EnergyNet = false; } } diff --git a/src/main/java/binnie/core/machines/power/ComponentProcess.java b/src/main/java/binnie/core/machines/power/ComponentProcess.java index 04f35073..3b37180e 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcess.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcess.java @@ -1,29 +1,24 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -import net.minecraft.nbt.NBTTagCompound; import binnie.core.machines.IMachine; +import net.minecraft.nbt.NBTTagCompound; -public abstract class ComponentProcess extends ComponentProcessIndefinate implements IProcessTimed -{ +public abstract class ComponentProcess extends ComponentProcessIndefinate implements IProcessTimed { private float progressAmount; - public ComponentProcess(final IMachine machine) { + public ComponentProcess(IMachine machine) { super(machine, 0.0f); - this.progressAmount = 0.0f; + progressAmount = 0.0f; } @Override public float getEnergyPerTick() { - return this.getProcessEnergy() / this.getProcessLength(); + return getProcessEnergy() / getProcessLength(); } @Override public float getProgressPerTick() { - return 100.0f / this.getProcessLength(); + return 100.0f / getProcessLength(); } @Override @@ -39,49 +34,50 @@ public abstract class ComponentProcess extends ComponentProcessIndefinate implem @Override public void onUpdate() { super.onUpdate(); - if (this.progressAmount >= 100.0f) { - this.onFinishTask(); - this.progressAmount = 0.0f; + if (progressAmount >= 100.0f) { + onFinishTask(); + progressAmount = 0.0f; } } - public void alterProgress(final float f) { - this.progressAmount += f; + public void alterProgress(float value) { + progressAmount += value; } - public void setProgress(final float f) { - this.progressAmount = f; + public void setProgress(float value) { + progressAmount = value; } @Override protected void progressTick() { super.progressTick(); - this.alterProgress(this.getProgressPerTick()); + alterProgress(getProgressPerTick()); } @Override public boolean inProgress() { - return this.progressAmount > 0.0f; + return progressAmount > 0.0f; } @Override public float getProgress() { - return this.progressAmount; + return progressAmount; } protected void onFinishTask() { + // ignored } @Override - public void readFromNBT(final NBTTagCompound nbt) { + public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - this.progressAmount = nbt.getFloat("progress"); + progressAmount = nbt.getFloat("progress"); } @Override - public void writeToNBT(final NBTTagCompound nbt) { + public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setFloat("progress", this.progressAmount); + nbt.setFloat("progress", progressAmount); } @Override diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java index 225b774e..0d98f146 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java @@ -1,16 +1,11 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; import binnie.core.machines.IMachine; -import net.minecraft.nbt.NBTTagCompound; -import binnie.core.machines.network.INetwork; import binnie.core.machines.MachineComponent; +import binnie.core.machines.network.INetwork; +import net.minecraft.nbt.NBTTagCompound; -public abstract class ComponentProcessIndefinate extends MachineComponent implements IProcess, INetwork.TilePacketSync -{ +public abstract class ComponentProcessIndefinate extends MachineComponent implements IProcess, INetwork.TilePacketSync { private float energyPerTick; private boolean inProgress; private float actionPauseProcess; @@ -19,25 +14,24 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem int clientInProgress; @Override - public void syncFromNBT(final NBTTagCompound nbt) { - this.inProgress = nbt.getBoolean("progress"); + public void syncFromNBT(NBTTagCompound nbt) { + inProgress = nbt.getBoolean("progress"); } @Override - public void syncToNBT(final NBTTagCompound nbt) { - nbt.setBoolean("progress", this.inProgress); + public void syncToNBT(NBTTagCompound nbt) { + nbt.setBoolean("progress", inProgress); } - public ComponentProcessIndefinate(final IMachine machine, final float energyPerTick) { + public ComponentProcessIndefinate(IMachine machine, float energyPerTick) { super(machine); - this.energyPerTick = 0.1f; - this.actionPauseProcess = 0.0f; - this.actionCancelTask = 0.0f; - this.clientEnergyPerSecond = 0; + actionPauseProcess = 0.0f; + actionCancelTask = 0.0f; + clientEnergyPerSecond = 0; this.energyPerTick = energyPerTick; } - protected final IPoweredMachine getPower() { + protected IPoweredMachine getPower() { return this.getMachine().getInterface(IPoweredMachine.class); } @@ -48,63 +42,71 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem @Override public void onUpdate() { - final float energyAvailable = (float) this.getPower().getInterface().useEnergy(PowerSystem.RF, this.getEnergyPerTick(), false); - if (this.canWork() == null) { - if (!this.isInProgress() && this.canProgress() == null) { - this.onStartTask(); - } - else if (this.canProgress() == null) { - this.progressTick(); - this.onTickTask(); + float energyAvailable = (float) this.getPower().getInterface().useEnergy(PowerSystem.RF, this.getEnergyPerTick(), false); + if (canWork() == null) { + if (!isInProgress() && canProgress() == null) { + onStartTask(); + } else if (canProgress() == null) { + progressTick(); + onTickTask(); } + } else if (isInProgress()) { + onCancelTask(); } - else if (this.isInProgress()) { - this.onCancelTask(); - } - if (this.actionPauseProcess > 0.0f) { - --this.actionPauseProcess; + if (actionPauseProcess > 0.0f) { + actionPauseProcess--; } if (this.actionCancelTask > 0.0f) { - --this.actionCancelTask; + actionCancelTask--; } + super.onUpdate(); - if (this.inProgress != this.inProgress()) { - this.inProgress = this.inProgress(); - this.getUtil().refreshBlock(); + if (inProgress != inProgress()) { + inProgress = inProgress(); + getUtil().refreshBlock(); } } protected void progressTick() { - this.getPower().getInterface().useEnergy(PowerSystem.RF, this.getEnergyPerTick(), true); + getPower().getInterface().useEnergy(PowerSystem.RF, getEnergyPerTick(), true); } @Override public ErrorState canWork() { - return (this.actionCancelTask == 0.0f) ? null : new ErrorState("Task Cancelled", "Cancelled by Buildcraft Gate"); + if (actionCancelTask == 0.0f) { + return null; + } + return new ErrorState("Task Cancelled", "Cancelled by Buildcraft Gate"); } @Override public ErrorState canProgress() { - if (this.actionPauseProcess != 0.0f) { + if (actionPauseProcess != 0.0f) { return new ErrorState("Process Paused", "Paused by Buildcraft Gate"); } - return (this.getPower().getInterface().getEnergy(PowerSystem.RF) < this.getEnergyPerTick()) ? new ErrorState.InsufficientPower() : null; + if (getPower().getInterface().getEnergy(PowerSystem.RF) < getEnergyPerTick()) { + return new ErrorState.InsufficientPower(); + } + return null; } @Override - public final boolean isInProgress() { - return this.inProgress; + public boolean isInProgress() { + return inProgress; } protected abstract boolean inProgress(); protected void onCancelTask() { + // ignored } protected void onStartTask() { + // ignored } protected void onTickTask() { + // ignored } @Override @@ -113,7 +115,7 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem } @Override - public final ProcessInfo getInfo() { + public ProcessInfo getInfo() { return new ProcessInfo(this); } } diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java b/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java index 80ecfedb..b33b0376 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java @@ -1,29 +1,24 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; import binnie.core.machines.IMachine; -public class ComponentProcessSetCost extends ComponentProcess -{ +public class ComponentProcessSetCost extends ComponentProcess { private int processLength; private int processEnergy; - public ComponentProcessSetCost(final IMachine machine, final int rfCost, final int timePeriod) { + public ComponentProcessSetCost(IMachine machine, int rfCost, int timePeriod) { super(machine); - this.processLength = timePeriod; - this.processEnergy = rfCost; + processLength = timePeriod; + processEnergy = rfCost; } @Override public int getProcessLength() { - return this.processLength; + return processLength; } @Override public int getProcessEnergy() { - return this.processEnergy; + return processEnergy; } } diff --git a/src/main/java/binnie/core/machines/power/ErrorState.java b/src/main/java/binnie/core/machines/power/ErrorState.java index 69a616f2..6304dc7d 100644 --- a/src/main/java/binnie/core/machines/power/ErrorState.java +++ b/src/main/java/binnie/core/machines/power/ErrorState.java @@ -4,11 +4,10 @@ package binnie.core.machines.power; -import net.minecraft.nbt.NBTTagCompound; import forestry.api.core.INBTTagable; +import net.minecraft.nbt.NBTTagCompound; -public class ErrorState implements INBTTagable -{ +public class ErrorState implements INBTTagable { private String name; private String desc; private int[] data; @@ -17,26 +16,21 @@ public class ErrorState implements INBTTagable private boolean tankError; private boolean powerError; - public ErrorState(final String name, final String desc) { - this.name = ""; - this.desc = ""; - this.data = new int[0]; - this.progress = false; - this.itemError = false; - this.tankError = false; - this.powerError = false; + public ErrorState(String name, String desc) { + data = new int[0]; + progress = false; + itemError = false; + tankError = false; + powerError = false; this.name = name; this.desc = desc; } - public ErrorState(final String name, final String desc, final int[] data) { - this.name = ""; - this.desc = ""; - this.data = new int[0]; - this.progress = false; - this.itemError = false; - this.tankError = false; - this.powerError = false; + public ErrorState(String name, String desc, int[] data) { + progress = false; + itemError = false; + tankError = false; + powerError = false; this.name = name; this.desc = desc; this.data = data; @@ -44,130 +38,121 @@ public class ErrorState implements INBTTagable @Override public String toString() { - return this.name; + return name; } public String getTooltip() { - return this.desc; + return desc; } public int[] getData() { - return this.data; + return data; } public boolean isProgress() { - return this.progress; + return progress; } public void setIsProgress() { - this.progress = true; + progress = true; } @Override - public void readFromNBT(final NBTTagCompound nbt) { - this.name = nbt.getString("name"); - this.desc = nbt.getString("desc"); - this.data = nbt.getIntArray("data"); - this.itemError = nbt.getBoolean("item"); - this.tankError = nbt.getBoolean("tank"); - this.powerError = nbt.getBoolean("power"); + public void readFromNBT(NBTTagCompound nbt) { + name = nbt.getString("name"); + desc = nbt.getString("desc"); + data = nbt.getIntArray("data"); + itemError = nbt.getBoolean("item"); + tankError = nbt.getBoolean("tank"); + powerError = nbt.getBoolean("power"); } @Override - public void writeToNBT(final NBTTagCompound nbt) { - nbt.setString("name", this.toString()); - nbt.setString("desc", this.getTooltip()); - nbt.setIntArray("data", this.data); - if (this.isItemError()) { + public void writeToNBT(NBTTagCompound nbt) { + nbt.setString("name", toString()); + nbt.setString("desc", getTooltip()); + nbt.setIntArray("data", data); + if (isItemError()) { nbt.setBoolean("item", true); } - if (this.isTankError()) { + if (isTankError()) { nbt.setBoolean("tank", true); } - if (this.isPowerError()) { + if (isPowerError()) { nbt.setBoolean("power", true); } } public boolean isItemError() { - return this.itemError || this instanceof Item; + return itemError || this instanceof Item; } public boolean isTankError() { - return this.tankError || this instanceof Tank; + return tankError || this instanceof Tank; } public boolean isPowerError() { - return this.powerError || this instanceof InsufficientPower; + return powerError || this instanceof InsufficientPower; } - public static class Item extends ErrorState - { - public Item(final String name, final String desc, final int[] slots) { + public static class Item extends ErrorState { + public Item(String name, String desc, int[] slots) { super(name, desc, slots); } } - public static class Tank extends ErrorState - { - public Tank(final String name, final String desc, final int[] slots) { + public static class Tank extends ErrorState { + public Tank(String name, String desc, int[] slots) { super(name, desc, slots); } } - public static class NoItem extends Item - { - public NoItem(final String desc, final int slot) { - this(desc, new int[] { slot }); + public static class NoItem extends Item { + public NoItem(String desc, int slot) { + this(desc, new int[]{slot}); } - public NoItem(final String desc, final int[] slots) { + public NoItem(String desc, int[] slots) { super("No Item", desc, slots); } } - public static class InvalidItem extends Item - { - public InvalidItem(final String desc, final int slot) { + public static class InvalidItem extends Item { + public InvalidItem(String desc, int slot) { this("Invalid Item", desc, slot); } - public InvalidItem(final String name, final String desc, final int slot) { - super(name, desc, new int[] { slot }); + public InvalidItem(String name, String desc, int slot) { + super(name, desc, new int[]{slot}); } } - public static class NoSpace extends Item - { - public NoSpace(final String desc, final int[] slots) { + public static class NoSpace extends Item { + public NoSpace(String desc, int[] slots) { super("No Space", desc, slots); } } - public static class InsufficientPower extends ErrorState - { + public static class InsufficientPower extends ErrorState { public InsufficientPower() { super("Insufficient Power", "Not enough power to operate"); } } - public static class TankSpace extends Tank - { - public TankSpace(final String desc, final int tank) { - super("Tank Full", desc, new int[] { tank }); + public static class TankSpace extends Tank { + public TankSpace(String desc, int tank) { + super("Tank Full", desc, new int[]{tank}); } } - public static class InsufficientLiquid extends Tank - { - public InsufficientLiquid(final String desc, final int tank) { - super("Insufficient Liquid", desc, new int[] { tank }); + public static class InsufficientLiquid extends Tank { + public InsufficientLiquid(String desc, int tank) { + super("Insufficient Liquid", desc, new int[]{tank}); } } - public static class InvalidRecipe extends Item - { - public InvalidRecipe(final String string, final int[] slots) { + public static class InvalidRecipe extends Item { + public InvalidRecipe(String string, int[] slots) { super("Invalid Recipe", string, slots); } } diff --git a/src/main/java/binnie/core/machines/power/IErrorStateSource.java b/src/main/java/binnie/core/machines/power/IErrorStateSource.java index 80793c80..537b612b 100644 --- a/src/main/java/binnie/core/machines/power/IErrorStateSource.java +++ b/src/main/java/binnie/core/machines/power/IErrorStateSource.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -public interface IErrorStateSource -{ +public interface IErrorStateSource { ErrorState canWork(); ErrorState canProgress(); diff --git a/src/main/java/binnie/core/machines/power/IPoweredMachine.java b/src/main/java/binnie/core/machines/power/IPoweredMachine.java index 577b4c20..38db4ddc 100644 --- a/src/main/java/binnie/core/machines/power/IPoweredMachine.java +++ b/src/main/java/binnie/core/machines/power/IPoweredMachine.java @@ -1,16 +1,11 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -import cpw.mods.fml.common.Optional; import cofh.api.energy.IEnergyHandler; +import cpw.mods.fml.common.Optional; import ic2.api.energy.tile.IEnergySink; @Optional.Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2") -public interface IPoweredMachine extends IEnergySink, IEnergyHandler -{ +public interface IPoweredMachine extends IEnergySink, IEnergyHandler { PowerInfo getPowerInfo(); PowerInterface getInterface(); diff --git a/src/main/java/binnie/core/machines/power/IProcess.java b/src/main/java/binnie/core/machines/power/IProcess.java index ab5f6f04..8acebc2d 100644 --- a/src/main/java/binnie/core/machines/power/IProcess.java +++ b/src/main/java/binnie/core/machines/power/IProcess.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -public interface IProcess extends IErrorStateSource -{ +public interface IProcess extends IErrorStateSource { float getEnergyPerTick(); String getTooltip(); diff --git a/src/main/java/binnie/core/machines/power/IProcessTimed.java b/src/main/java/binnie/core/machines/power/IProcessTimed.java index fed9cd26..5346ebe2 100644 --- a/src/main/java/binnie/core/machines/power/IProcessTimed.java +++ b/src/main/java/binnie/core/machines/power/IProcessTimed.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -interface IProcessTimed extends IProcess, IErrorStateSource -{ +interface IProcessTimed extends IProcess, IErrorStateSource { int getProcessLength(); int getProcessEnergy(); diff --git a/src/main/java/binnie/core/machines/power/ITankMachine.java b/src/main/java/binnie/core/machines/power/ITankMachine.java index 13b073a4..cb7434b4 100644 --- a/src/main/java/binnie/core/machines/power/ITankMachine.java +++ b/src/main/java/binnie/core/machines/power/ITankMachine.java @@ -1,23 +1,18 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -import binnie.core.machines.inventory.TankSlot; -import net.minecraftforge.fluids.IFluidTank; import binnie.core.machines.inventory.IValidatedTankContainer; +import binnie.core.machines.inventory.TankSlot; import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; -public interface ITankMachine extends IFluidHandler, IValidatedTankContainer -{ +public interface ITankMachine extends IFluidHandler, IValidatedTankContainer { TankInfo[] getTankInfos(); IFluidTank[] getTanks(); - TankSlot addTank(final int p0, final String p1, final int p2); + TankSlot addTank(int index, String name, int capacity); - IFluidTank getTank(final int p0); + IFluidTank getTank(int index); - TankSlot getTankSlot(final int p0); + TankSlot getTankSlot(int slot); } diff --git a/src/main/java/binnie/core/machines/power/PowerInfo.java b/src/main/java/binnie/core/machines/power/PowerInfo.java index e83ad653..1590c88d 100644 --- a/src/main/java/binnie/core/machines/power/PowerInfo.java +++ b/src/main/java/binnie/core/machines/power/PowerInfo.java @@ -1,46 +1,39 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -import net.minecraft.nbt.NBTTagCompound; import forestry.api.core.INBTTagable; +import net.minecraft.nbt.NBTTagCompound; -public class PowerInfo implements INBTTagable -{ +public class PowerInfo implements INBTTagable { private float currentEnergy; private float maxEnergy; - public PowerInfo(final IPoweredMachine machine, final float currentInput) { - this.currentEnergy = 0.0f; - this.maxEnergy = 0.0f; + public PowerInfo(IPoweredMachine machine, float currentInput) { this.currentEnergy = (float) machine.getInterface().getEnergy(PowerSystem.RF); this.maxEnergy = (float) machine.getInterface().getCapacity(PowerSystem.RF); } public PowerInfo() { - this.currentEnergy = 0.0f; - this.maxEnergy = 0.0f; + currentEnergy = 0.0f; + maxEnergy = 0.0f; } public int getStoredEnergy() { - return (int) this.currentEnergy; + return (int) currentEnergy; } public int getMaxEnergy() { - return (int) this.maxEnergy; + return (int) maxEnergy; } @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { - this.currentEnergy = nbttagcompound.getInteger("current"); - this.maxEnergy = nbttagcompound.getInteger("max"); + public void readFromNBT(NBTTagCompound nbttagcompound) { + currentEnergy = nbttagcompound.getInteger("current"); + maxEnergy = nbttagcompound.getInteger("max"); } @Override - public void writeToNBT(final NBTTagCompound nbttagcompound) { - nbttagcompound.setInteger("current", this.getStoredEnergy()); - nbttagcompound.setInteger("max", this.getMaxEnergy()); + public void writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound.setInteger("current", getStoredEnergy()); + nbttagcompound.setInteger("max", getMaxEnergy()); } } diff --git a/src/main/java/binnie/core/machines/power/PowerInterface.java b/src/main/java/binnie/core/machines/power/PowerInterface.java index f71550e9..f21432ef 100644 --- a/src/main/java/binnie/core/machines/power/PowerInterface.java +++ b/src/main/java/binnie/core/machines/power/PowerInterface.java @@ -1,83 +1,77 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -import net.minecraft.nbt.NBTTagCompound; import forestry.api.core.INBTTagable; +import net.minecraft.nbt.NBTTagCompound; -public class PowerInterface implements INBTTagable -{ +public class PowerInterface implements INBTTagable { private int capacity; private int energy; - public PowerInterface(final int capacity) { + public PowerInterface(int capacity) { this.capacity = capacity * 100; this.energy = 0; } public int getCapacity() { - return this.capacity; + return capacity; } public int getEnergy() { - return this.energy; + return energy; } - public int addEnergy(final int amount, final boolean shouldDo) { - final int added = Math.min(this.getEnergySpace(), amount); + public int addEnergy(int amount, boolean shouldDo) { + int added = Math.min(this.getEnergySpace(), amount); if (shouldDo) { - this.energy += added; + energy += added; } return added; } - public int useEnergy(final int amount, final boolean simulate) { - final int added = Math.min(this.getEnergy(), amount); + public int useEnergy(int amount, boolean simulate) { + int added = Math.min(getEnergy(), amount); if (simulate) { - this.energy -= added; + energy -= added; } return added; } public int getEnergySpace() { - return this.getCapacity() - this.getEnergy(); + return getCapacity() - getEnergy(); } - public double addEnergy(final PowerSystem unit, final double amount, final boolean simulate) { - return unit.convertTo(this.addEnergy(unit.convertFrom(amount), simulate)); + public double addEnergy(PowerSystem unit, double amount, boolean simulate) { + return unit.convertTo(addEnergy(unit.convertFrom(amount), simulate)); } - public double useEnergy(final PowerSystem unit, final double amount, final boolean simulate) { - return unit.convertTo(this.useEnergy(unit.convertFrom(amount), simulate)); + public double useEnergy(PowerSystem unit, double amount, boolean simulate) { + return unit.convertTo(useEnergy(unit.convertFrom(amount), simulate)); } - public double getEnergy(final PowerSystem unit) { - return unit.convertTo(this.getEnergy()); + public double getEnergy(PowerSystem unit) { + return unit.convertTo(getEnergy()); } - public double getCapacity(final PowerSystem unit) { - return unit.convertTo(this.getCapacity()); + public double getCapacity(PowerSystem unit) { + return unit.convertTo(getCapacity()); } - public double getEnergySpace(final PowerSystem unit) { - return unit.convertTo(this.getEnergySpace()); + public double getEnergySpace(PowerSystem unit) { + return unit.convertTo(getEnergySpace()); } @Override - public void readFromNBT(final NBTTagCompound nbt) { - this.energy = nbt.getInteger("Energy"); - if (this.energy > this.capacity) { - this.energy = this.capacity; - } - else if (this.energy < 0) { - this.energy = 0; + public void readFromNBT(NBTTagCompound nbt) { + energy = nbt.getInteger("Energy"); + if (energy > capacity) { + energy = capacity; + } else if (energy < 0) { + energy = 0; } } @Override - public void writeToNBT(final NBTTagCompound nbt) { - nbt.setInteger("Energy", this.getEnergy()); + public void writeToNBT(NBTTagCompound nbt) { + nbt.setInteger("Energy", getEnergy()); } } diff --git a/src/main/java/binnie/core/machines/power/PowerSystem.java b/src/main/java/binnie/core/machines/power/PowerSystem.java index 6ec45adf..03a2d883 100644 --- a/src/main/java/binnie/core/machines/power/PowerSystem.java +++ b/src/main/java/binnie/core/machines/power/PowerSystem.java @@ -1,33 +1,28 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; -public enum PowerSystem -{ +public enum PowerSystem { MJ(100.0), RF(10.0), EU(40.0); - double conversion; + private double conversion; - private PowerSystem(final double conversion) { + PowerSystem(double conversion) { this.conversion = conversion; } - public double convertTo(final int value) { - return value / this.conversion; + public double convertTo(int value) { + return value / conversion; } - public int convertFrom(final double value) { - return (int) (value * this.conversion); + public int convertFrom(double value) { + return (int) (value * conversion); } - public static PowerSystem get(final int i) { + public static PowerSystem get(int i) { return values()[i % values().length]; } @@ -35,9 +30,9 @@ public enum PowerSystem return this.name(); } - public ItemStack saveTo(final ItemStack stack) { - final NBTTagCompound tag = stack.hasTagCompound() ? stack.getTagCompound() : new NBTTagCompound(); - tag.setByte("power-system", (byte) this.ordinal()); + public ItemStack saveTo(ItemStack stack) { + NBTTagCompound tag = stack.hasTagCompound() ? stack.getTagCompound() : new NBTTagCompound(); + tag.setByte("power-system", (byte) ordinal()); stack.setTagCompound(tag); return stack; } diff --git a/src/main/java/binnie/core/machines/power/ProcessInfo.java b/src/main/java/binnie/core/machines/power/ProcessInfo.java index 9bd34417..a702f06e 100644 --- a/src/main/java/binnie/core/machines/power/ProcessInfo.java +++ b/src/main/java/binnie/core/machines/power/ProcessInfo.java @@ -1,72 +1,66 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -import net.minecraft.nbt.NBTTagCompound; import forestry.api.core.INBTTagable; +import net.minecraft.nbt.NBTTagCompound; -public class ProcessInfo implements INBTTagable -{ +public class ProcessInfo implements INBTTagable { private float currentProgress; private int processEnergy; private int processTime; private float energyPerTick; - public ProcessInfo(final IProcess process) { - this.currentProgress = 0.0f; - this.processEnergy = 0; - this.processTime = 0; - this.energyPerTick = 0.0f; - this.energyPerTick = process.getEnergyPerTick(); + public ProcessInfo(IProcess process) { + currentProgress = 0.0f; + processEnergy = 0; + processTime = 0; + energyPerTick = process.getEnergyPerTick(); + if (process instanceof IProcessTimed) { - final IProcessTimed time = (IProcessTimed) process; - this.currentProgress = time.getProgress(); - this.processEnergy = time.getProcessEnergy(); - this.processTime = time.getProcessLength(); - } - else { - this.currentProgress = (process.isInProgress() ? 100.0f : 0.0f); + IProcessTimed time = (IProcessTimed) process; + currentProgress = time.getProgress(); + processEnergy = time.getProcessEnergy(); + processTime = time.getProcessLength(); + } else { + currentProgress = process.isInProgress() ? 100.0f : 0.0f; } } public ProcessInfo() { - this.currentProgress = 0.0f; - this.processEnergy = 0; - this.processTime = 0; - this.energyPerTick = 0.0f; + currentProgress = 0.0f; + processEnergy = 0; + processTime = 0; + energyPerTick = 0.0f; } public float getCurrentProgress() { - return this.currentProgress; + return currentProgress; } public int getProcessEnergy() { - return this.processEnergy; + return processEnergy; } public int getProcessTime() { - return this.processTime; + return processTime; } public float getEnergyPerTick() { - return this.energyPerTick; + return energyPerTick; } @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { - this.energyPerTick = nbttagcompound.getFloat("ept"); - this.processEnergy = nbttagcompound.getInteger("e"); - this.processTime = nbttagcompound.getInteger("t"); - this.currentProgress = nbttagcompound.getFloat("p"); + public void readFromNBT(NBTTagCompound nbttagcompound) { + energyPerTick = nbttagcompound.getFloat("ept"); + processEnergy = nbttagcompound.getInteger("e"); + processTime = nbttagcompound.getInteger("t"); + currentProgress = nbttagcompound.getFloat("p"); } @Override - public void writeToNBT(final NBTTagCompound nbttagcompound) { - nbttagcompound.setFloat("ept", this.energyPerTick); - nbttagcompound.setFloat("p", this.currentProgress); - nbttagcompound.setInteger("e", this.processEnergy); - nbttagcompound.setInteger("t", this.processTime); + public void writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound.setFloat("ept", energyPerTick); + nbttagcompound.setFloat("p", currentProgress); + nbttagcompound.setInteger("e", processEnergy); + nbttagcompound.setInteger("t", processTime); } } diff --git a/src/main/java/binnie/core/machines/power/TankInfo.java b/src/main/java/binnie/core/machines/power/TankInfo.java index 1caa45c4..92fe52d1 100644 --- a/src/main/java/binnie/core/machines/power/TankInfo.java +++ b/src/main/java/binnie/core/machines/power/TankInfo.java @@ -1,72 +1,65 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; -import net.minecraft.nbt.NBTBase; +import forestry.api.core.INBTTagable; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.FluidStack; -import forestry.api.core.INBTTagable; +import net.minecraftforge.fluids.IFluidTank; -public class TankInfo implements INBTTagable -{ +public class TankInfo implements INBTTagable { public FluidStack liquid; private float capacity; - public TankInfo(final IFluidTank tank) { - this.capacity = 0.0f; - this.capacity = tank.getCapacity(); - this.liquid = tank.getFluid(); + public TankInfo(IFluidTank tank) { + capacity = tank.getCapacity(); + liquid = tank.getFluid(); } public TankInfo() { - this.capacity = 0.0f; + capacity = 0.0f; } public float getAmount() { - return (this.liquid == null) ? 0.0f : this.liquid.amount; + return (liquid == null) ? 0.0f : liquid.amount; } public float getCapacity() { - return this.capacity; + return capacity; } public boolean isEmpty() { - return this.liquid == null; + return liquid == null; } public IIcon getIcon() { - return this.liquid.getFluid().getStillIcon(); + return liquid.getFluid().getStillIcon(); } public String getName() { - return (this.liquid == null) ? "" : this.liquid.getFluid().getLocalizedName(); + return (liquid == null) ? "" : liquid.getFluid().getLocalizedName(); } @Override - public void readFromNBT(final NBTTagCompound nbt) { + public void readFromNBT(NBTTagCompound nbt) { this.capacity = nbt.getInteger("capacity"); if (nbt.hasKey("liquid")) { - this.liquid = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("liquid")); + liquid = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("liquid")); } } @Override - public void writeToNBT(final NBTTagCompound nbt) { - nbt.setInteger("capacity", (int) this.getCapacity()); - if (this.liquid == null) { + public void writeToNBT(NBTTagCompound nbt) { + nbt.setInteger("capacity", (int) getCapacity()); + if (liquid == null) { return; } - final NBTTagCompound tag = new NBTTagCompound(); - this.liquid.writeToNBT(tag); + NBTTagCompound tag = new NBTTagCompound(); + liquid.writeToNBT(tag); nbt.setTag("liquid", tag); } - public static TankInfo[] get(final ITankMachine machine) { - final TankInfo[] info = new TankInfo[machine.getTanks().length]; + public static TankInfo[] get(ITankMachine machine) { + TankInfo[] info = new TankInfo[machine.getTanks().length]; for (int i = 0; i < info.length; ++i) { info[i] = new TankInfo(machine.getTanks()[i]); } diff --git a/src/main/java/binnie/core/machines/storage/Compartment.java b/src/main/java/binnie/core/machines/storage/Compartment.java index 6d1cb1da..e5bb5fcf 100644 --- a/src/main/java/binnie/core/machines/storage/Compartment.java +++ b/src/main/java/binnie/core/machines/storage/Compartment.java @@ -1,23 +1,17 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; -import net.minecraft.client.renderer.RenderBlocks; -import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; -import binnie.core.resource.IBinnieTexture; -import binnie.core.resource.BinnieResource; -import net.minecraft.block.Block; import binnie.core.BinnieCore; -import net.minecraft.item.ItemStack; -import binnie.core.machines.MachinePackage; import binnie.core.machines.IMachineType; +import binnie.core.machines.Machine; +import binnie.core.machines.MachinePackage; +import binnie.core.machines.TileEntityMachine; +import binnie.core.resource.BinnieResource; +import binnie.core.resource.IBinnieTexture; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; -enum Compartment implements IMachineType -{ +enum Compartment implements IMachineType { Compartment(StandardCompartment.PackageCompartment.class), CompartmentCopper(StandardCompartment.PackageCompartmentCopper.class), CompartmentBronze(StandardCompartment.PackageCompartmentBronze.class), @@ -27,13 +21,13 @@ enum Compartment implements IMachineType Class clss; - private Compartment(final Class clss) { + Compartment(Class clss) { this.clss = clss; } @Override public Class getPackageClass() { - return this.clss; + return clss; } @Override @@ -41,15 +35,14 @@ enum Compartment implements IMachineType return true; } - public ItemStack get(final int i) { + public ItemStack get(int i) { return new ItemStack(BinnieCore.packageCompartment.getBlock(), i, this.ordinal()); } - public abstract static class PackageCompartment extends MachinePackage - { + public abstract static class PackageCompartment extends MachinePackage { private BinnieResource renderTexture; - protected PackageCompartment(final String uid, final IBinnieTexture renderTexture) { + protected PackageCompartment(String uid, IBinnieTexture renderTexture) { super(uid, false); this.renderTexture = renderTexture.getTexture(); } @@ -64,8 +57,8 @@ enum Compartment implements IMachineType } @Override - public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { - MachineRendererCompartment.instance.renderMachine(machine, 16777215, this.renderTexture, x, y, z, var8); + public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { + MachineRendererCompartment.instance.renderMachine(machine, 0xffffff, this.renderTexture, x, y, z, partialTick); } } } diff --git a/src/main/java/binnie/core/machines/storage/CompartmentTab.java b/src/main/java/binnie/core/machines/storage/CompartmentTab.java index f2e8efad..d3524bf7 100644 --- a/src/main/java/binnie/core/machines/storage/CompartmentTab.java +++ b/src/main/java/binnie/core/machines/storage/CompartmentTab.java @@ -1,73 +1,71 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.init.Items; import binnie.craftgui.minecraft.EnumColor; -import net.minecraft.item.ItemStack; import forestry.api.core.INBTTagable; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; -class CompartmentTab implements INBTTagable -{ +class CompartmentTab implements INBTTagable { private String name; private ItemStack icon; private EnumColor color; private int id; - public CompartmentTab(final int id) { - this.name = ""; - this.icon = new ItemStack(Items.paper); - this.color = EnumColor.White; + public CompartmentTab(int id) { + name = ""; + icon = new ItemStack(Items.paper); + color = EnumColor.White; this.id = id; } @Override - public void readFromNBT(final NBTTagCompound nbt) { - this.name = nbt.getString("name"); - this.icon = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("icon")); - this.color = EnumColor.values()[nbt.getByte("color")]; - this.id = nbt.getByte("id"); + public void readFromNBT(NBTTagCompound nbt) { + name = nbt.getString("name"); + icon = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("icon")); + color = EnumColor.values()[nbt.getByte("color")]; + id = nbt.getByte("id"); } @Override - public void writeToNBT(final NBTTagCompound nbt) { + public void writeToNBT(NBTTagCompound nbt) { nbt.setString("name", this.name); - final NBTTagCompound n = new NBTTagCompound(); - this.icon.writeToNBT(n); + NBTTagCompound n = new NBTTagCompound(); + icon.writeToNBT(n); nbt.setTag("icon", n); - nbt.setByte("color", (byte) this.color.ordinal()); - nbt.setByte("id", (byte) this.id); + nbt.setByte("color", (byte) color.ordinal()); + nbt.setByte("id", (byte) id); } public String getName() { - return this.name; + return name; } public ItemStack getIcon() { - return this.icon; + return icon; } public EnumColor getColor() { - return this.color; + return color; } public int getId() { - return this.id; + return id; } - public void setName(final String name) { - this.name = ((name == null) ? "" : name); + public void setName(String name) { + if (name == null) { + this.name = ""; + } else { + this.name = name; + } } - public void setIcon(final ItemStack icon) { + public void setIcon(ItemStack icon) { this.icon = icon; } - public void setColor(final EnumColor color) { + public void setColor(EnumColor color) { this.color = color; } } diff --git a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java index 98d9344f..9b6b6d86 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java +++ b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java @@ -1,28 +1,23 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; import binnie.core.BinnieCore; +import binnie.core.gui.BinnieCoreGUI; +import binnie.core.machines.Machine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.component.IInteraction; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import binnie.core.machines.Machine; -import binnie.core.gui.BinnieCoreGUI; -import binnie.core.machines.component.IInteraction; -import binnie.core.machines.MachineComponent; -class ComponentBinnieCoreGUI extends MachineComponent implements IInteraction.RightClick -{ +class ComponentBinnieCoreGUI extends MachineComponent implements IInteraction.RightClick { private BinnieCoreGUI id; - public ComponentBinnieCoreGUI(final Machine machine, final BinnieCoreGUI id) { + public ComponentBinnieCoreGUI(Machine machine, BinnieCoreGUI id) { super(machine); this.id = id; } @Override - public void onRightClick(final World world, final EntityPlayer player, final int x, final int y, final int z) { - BinnieCore.proxy.openGui(this.id, player, x, y, z); + public void onRightClick(World world, EntityPlayer player, int x, int y, int z) { + BinnieCore.proxy.openGui(id, player, x, y, z); } } diff --git a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java index 29317118..eee30f5d 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java +++ b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java @@ -1,114 +1,109 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; -import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.relauncher.Side; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagCompound; -import java.util.HashMap; import binnie.core.machines.IMachine; -import java.util.Map; -import binnie.core.machines.network.INetwork; import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.network.INetwork; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; -class ComponentCompartmentInventory extends ComponentInventorySlots implements INetwork.GuiNBT -{ +import java.util.HashMap; +import java.util.Map; + +class ComponentCompartmentInventory extends ComponentInventorySlots implements INetwork.GuiNBT { private int numberOfTabs; private int slotsPerPage; private Map tabs; - public ComponentCompartmentInventory(final IMachine machine, final int sections) { + public ComponentCompartmentInventory(IMachine machine, int sections) { this(machine, sections, 4); } - public ComponentCompartmentInventory(final IMachine machine, final int tabs, final int pageSize) { + public ComponentCompartmentInventory(IMachine machine, int tabs, int pageSize) { super(machine); - this.tabs = new HashMap(); - this.numberOfTabs = tabs; - this.slotsPerPage = pageSize; - for (int i = 0; i < this.numberOfTabs * this.slotsPerPage; ++i) { - this.addSlot(i, "compartment"); + this.tabs = new HashMap<>(); + numberOfTabs = tabs; + slotsPerPage = pageSize; + for (int i = 0; i < numberOfTabs * slotsPerPage; ++i) { + addSlot(i, "compartment"); } } public int getPageSize() { - return this.slotsPerPage; + return slotsPerPage; } public int getTabNumber() { - return this.numberOfTabs; + return numberOfTabs; } - public int[] getSlotsForTab(final int currentTab) { - final int[] slots = new int[this.slotsPerPage]; - for (int i = 0; i < this.slotsPerPage; ++i) { - slots[i] = i + currentTab * this.slotsPerPage; + public int[] getSlotsForTab(int currentTab) { + int[] slots = new int[slotsPerPage]; + for (int i = 0; i < slotsPerPage; ++i) { + slots[i] = i + currentTab * slotsPerPage; } return slots; } - public CompartmentTab getTab(final int i) { - if (!this.tabs.containsKey(i)) { - this.tabs.put(i, new CompartmentTab(i)); + public CompartmentTab getTab(int i) { + if (!tabs.containsKey(i)) { + tabs.put(i, new CompartmentTab(i)); } - return this.tabs.get(i); + return tabs.get(i); } @Override - public void sendGuiNBT(final Map nbt) { - final NBTTagList list = new NBTTagList(); + public void sendGuiNBT(Map nbts) { + NBTTagList list = new NBTTagList(); for (int i = 0; i < this.numberOfTabs; ++i) { - final NBTTagCompound nbt2 = new NBTTagCompound(); - this.getTab(i).writeToNBT(nbt2); + NBTTagCompound nbt2 = new NBTTagCompound(); + getTab(i).writeToNBT(nbt2); list.appendTag(nbt2); } - final NBTTagCompound tag = new NBTTagCompound(); + NBTTagCompound tag = new NBTTagCompound(); tag.setTag("tabs", list); - nbt.put("comp-tabs", tag); + nbts.put("comp-tabs", tag); } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { + public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { if (name.equals("comp-tabs")) { - final NBTTagList tags = nbt.getTagList("tabs", 10); + NBTTagList tags = nbt.getTagList("tabs", 10); for (int i = 0; i < tags.tagCount(); ++i) { - final NBTTagCompound tag = tags.getCompoundTagAt(i); - final CompartmentTab tab = new CompartmentTab(0); + NBTTagCompound tag = tags.getCompoundTagAt(i); + CompartmentTab tab = new CompartmentTab(0); tab.readFromNBT(tag); - this.tabs.put(tab.getId(), tab); + tabs.put(tab.getId(), tab); } } if (name.equals("comp-change-tab")) { - final CompartmentTab tab2 = new CompartmentTab(0); + CompartmentTab tab2 = new CompartmentTab(0); tab2.readFromNBT(nbt); - this.tabs.put(tab2.getId(), tab2); - this.getMachine().getTileEntity().markDirty(); + tabs.put(tab2.getId(), tab2); + getMachine().getTileEntity().markDirty(); } } @Override - public void readFromNBT(final NBTTagCompound nbt) { + public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - final NBTTagList tags = nbt.getTagList("tabs", 10); + NBTTagList tags = nbt.getTagList("tabs", 10); for (int i = 0; i < tags.tagCount(); ++i) { - final NBTTagCompound tag = tags.getCompoundTagAt(i); - final CompartmentTab tab = new CompartmentTab(0); + NBTTagCompound tag = tags.getCompoundTagAt(i); + CompartmentTab tab = new CompartmentTab(0); tab.readFromNBT(tag); - this.tabs.put(tab.getId(), tab); + tabs.put(tab.getId(), tab); } } @Override - public void writeToNBT(final NBTTagCompound nbt) { + public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - final NBTTagList list = new NBTTagList(); - for (int i = 0; i < this.numberOfTabs; ++i) { - final NBTTagCompound nbt2 = new NBTTagCompound(); - this.getTab(i).writeToNBT(nbt2); + NBTTagList list = new NBTTagList(); + for (int i = 0; i < numberOfTabs; ++i) { + NBTTagCompound nbt2 = new NBTTagCompound(); + getTab(i).writeToNBT(nbt2); list.appendTag(nbt2); } nbt.setTag("tabs", list); diff --git a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java index ddb471a1..fd1f6754 100644 --- a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java +++ b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java @@ -1,47 +1,42 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.EnumColor; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.ITooltip; import binnie.craftgui.controls.core.Control; +import binnie.craftgui.controls.core.IControlValue; +import binnie.craftgui.core.Attribute; +import binnie.craftgui.core.CraftGUI; +import binnie.craftgui.core.ITooltip; +import binnie.craftgui.core.IWidget; +import binnie.craftgui.core.Tooltip; +import binnie.craftgui.minecraft.EnumColor; -class ControlColourSelector extends Control implements ITooltip, IControlValue -{ +class ControlColourSelector extends Control implements ITooltip, IControlValue { private EnumColor value; - public ControlColourSelector(final IWidget parent, final float x, final float y, final float w, final float h, final EnumColor value) { + public ControlColourSelector(IWidget parent, float x, float y, float w, float h, EnumColor value) { super(parent, x, y, w, h); - this.setValue(value); - this.addAttribute(Attribute.MouseOver); + setValue(value); + addAttribute(Attribute.MouseOver); } @Override - public void getTooltip(final Tooltip tooltip) { - tooltip.add(this.value.toString()); + public void getTooltip(Tooltip tooltip) { + tooltip.add(value.toString()); } @Override public EnumColor getValue() { - return this.value; + return value; } @Override - public void setValue(final EnumColor value) { + public void setValue(EnumColor value) { this.value = value; - this.setColour(this.getValue().getColour()); + setColour(value.getColour()); } @Override public void onRenderBackground() { super.onRenderBackground(); - CraftGUI.Render.gradientRect(this.getArea(), -16777216 + this.value.getColour(), -16777216 + this.value.getColour()); + CraftGUI.Render.gradientRect(getArea(), 0xff000000 + value.getColour(), 0xff000000 + value.getColour()); } } diff --git a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java index bcecffa6..bd721d49 100644 --- a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java +++ b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java @@ -1,46 +1,37 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; import binnie.core.BinnieCore; -import org.lwjgl.opengl.GL11; -import binnie.core.resource.BinnieResource; import binnie.core.machines.Machine; +import binnie.core.resource.BinnieResource; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -class MachineRendererCompartment -{ - public static MachineRendererCompartment instance; +class MachineRendererCompartment { + public static MachineRendererCompartment instance = new MachineRendererCompartment(); private ModelCompartment model; public MachineRendererCompartment() { this.model = new ModelCompartment(); } - public void renderMachine(final Machine machine, final int colour, final BinnieResource texture, final double x, final double y, final double z, final float var8) { + public void renderMachine(Machine machine, int colour, BinnieResource texture, double x, double y, double z, float var8) { GL11.glPushMatrix(); int i1 = 0; - final int ix = machine.getTileEntity().xCoord; - final int iy = machine.getTileEntity().yCoord; - final int iz = machine.getTileEntity().zCoord; + int ix = machine.getTileEntity().xCoord; + int iy = machine.getTileEntity().yCoord; + int iz = machine.getTileEntity().zCoord; if (machine.getTileEntity() != null) { i1 = ix * iy * iz + ix * iy - ix * iz + iy * iz - ix + iy - iz; } - final float phase = (float) Math.max(0.0, Math.sin((System.currentTimeMillis() + i1) * 0.003)); + float phase = (float) Math.max(0.0, Math.sin((System.currentTimeMillis() + i1) * 0.003)); GL11.glTranslated(x + 0.5, y + 1.5, z + 0.5); GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f); BinnieCore.proxy.bindTexture(texture); GL11.glPushMatrix(); - this.model.render(null, (float) x, (float) y, (float) z, 0.0625f, 0.0625f, 0.0625f); + model.render(null, (float) x, (float) y, (float) z, 0.0625f, 0.0625f, 0.0625f); GL11.glPopMatrix(); GL11.glPopMatrix(); } - - static { - MachineRendererCompartment.instance = new MachineRendererCompartment(); - } } diff --git a/src/main/java/binnie/core/machines/storage/ModelCompartment.java b/src/main/java/binnie/core/machines/storage/ModelCompartment.java index 620eef4c..e5f06c2b 100644 --- a/src/main/java/binnie/core/machines/storage/ModelCompartment.java +++ b/src/main/java/binnie/core/machines/storage/ModelCompartment.java @@ -4,150 +4,183 @@ package binnie.core.machines.storage; -import net.minecraft.entity.Entity; -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; -class ModelCompartment extends ModelBase -{ - private ModelRenderer Column1; - private ModelRenderer Column4; - private ModelRenderer Column2; - private ModelRenderer Column3; - private ModelRenderer Lid_1; - private ModelRenderer Body_1; - private ModelRenderer Lock_1; - private ModelRenderer Lid_2; - private ModelRenderer Body_2; - private ModelRenderer Lock_2; - private ModelRenderer Body; - private ModelRenderer Lid_3; - private ModelRenderer Body_3; - private ModelRenderer Lock_3; - private ModelRenderer Lid_4; - private ModelRenderer Body_4; - private ModelRenderer Lock_4; +class ModelCompartment extends ModelBase { + private ModelRenderer column1; + private ModelRenderer column4; + private ModelRenderer column2; + private ModelRenderer column3; + private ModelRenderer lid1; + private ModelRenderer body1; + private ModelRenderer lock1; + private ModelRenderer lid2; + private ModelRenderer body2; + private ModelRenderer lock2; + private ModelRenderer body; + private ModelRenderer lid3; + private ModelRenderer body3; + private ModelRenderer lock3; + private ModelRenderer lid4; + private ModelRenderer body4; + private ModelRenderer lock4; public ModelCompartment() { - this.textureWidth = 128; - this.textureHeight = 128; - (this.Column1 = new ModelRenderer(this, 0, 0)).addBox(-8.0f, 8.0f, -8.0f, 4, 16, 4); - this.Column1.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Column1.setTextureSize(128, 128); - this.Column1.mirror = true; - this.setRotation(this.Column1, 0.0f, 0.0f, 0.0f); - (this.Column4 = new ModelRenderer(this, 0, 0)).addBox(4.0f, 8.0f, -8.0f, 4, 16, 4); - this.Column4.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Column4.setTextureSize(128, 128); - this.Column4.mirror = true; - this.setRotation(this.Column4, 0.0f, 0.0f, 0.0f); - (this.Column2 = new ModelRenderer(this, 0, 0)).addBox(-8.0f, 8.0f, 4.0f, 4, 16, 4); - this.Column2.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Column2.setTextureSize(128, 128); - this.Column2.mirror = true; - this.setRotation(this.Column2, 0.0f, 0.0f, 0.0f); - (this.Column3 = new ModelRenderer(this, 0, 0)).addBox(4.0f, 8.0f, 4.0f, 4, 16, 4); - this.Column3.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Column3.setTextureSize(128, 128); - this.Column3.mirror = true; - this.setRotation(this.Column3, 0.0f, 0.0f, 0.0f); - (this.Lid_1 = new ModelRenderer(this, 48, 0)).addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); - this.Lid_1.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lid_1.setTextureSize(128, 128); - this.Lid_1.mirror = true; - this.setRotation(this.Lid_1, 0.0f, 0.0f, 0.0f); - (this.Body_1 = new ModelRenderer(this, 0, 24)).addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); - this.Body_1.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Body_1.setTextureSize(128, 128); - this.Body_1.mirror = true; - this.setRotation(this.Body_1, 0.0f, 0.0f, 0.0f); - (this.Lock_1 = new ModelRenderer(this, 22, 24)).addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); - this.Lock_1.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lock_1.setTextureSize(128, 128); - this.Lock_1.mirror = true; - this.setRotation(this.Lock_1, 0.0f, 0.0f, 0.0f); - (this.Lid_2 = new ModelRenderer(this, 48, 0)).addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); - this.Lid_2.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lid_2.setTextureSize(128, 128); - this.Lid_2.mirror = true; - this.setRotation(this.Lid_2, 0.0f, 1.570796f, 0.0f); - (this.Body_2 = new ModelRenderer(this, 0, 24)).addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); - this.Body_2.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Body_2.setTextureSize(128, 128); - this.Body_2.mirror = true; - this.setRotation(this.Body_2, 0.0f, 1.570796f, 0.0f); - (this.Lock_2 = new ModelRenderer(this, 22, 24)).addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); - this.Lock_2.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lock_2.setTextureSize(128, 128); - this.Lock_2.mirror = true; - this.setRotation(this.Lock_2, 0.0f, 1.570796f, 0.0f); - (this.Body = new ModelRenderer(this, 16, 0)).addBox(-4.0f, 8.0f, -4.0f, 8, 16, 8); - this.Body.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Body.setTextureSize(128, 128); - this.Body.mirror = true; - this.setRotation(this.Body, 0.0f, 0.0f, 0.0f); - (this.Lid_3 = new ModelRenderer(this, 48, 0)).addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); - this.Lid_3.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lid_3.setTextureSize(128, 128); - this.Lid_3.mirror = true; - this.setRotation(this.Lid_3, 0.0f, 3.141593f, 0.0f); - (this.Body_3 = new ModelRenderer(this, 0, 24)).addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); - this.Body_3.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Body_3.setTextureSize(128, 128); - this.Body_3.mirror = true; - this.setRotation(this.Body_3, 0.0f, 3.141593f, 0.0f); - (this.Lock_3 = new ModelRenderer(this, 22, 24)).addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); - this.Lock_3.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lock_3.setTextureSize(128, 128); - this.Lock_3.mirror = true; - this.setRotation(this.Lock_3, 0.0f, 3.141593f, 0.0f); - (this.Lid_4 = new ModelRenderer(this, 48, 0)).addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); - this.Lid_4.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lid_4.setTextureSize(128, 128); - this.Lid_4.mirror = true; - this.setRotation(this.Lid_4, 0.0f, -1.570796f, 0.0f); - (this.Body_4 = new ModelRenderer(this, 0, 24)).addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); - this.Body_4.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Body_4.setTextureSize(128, 128); - this.Body_4.mirror = true; - this.setRotation(this.Body_4, 0.0f, -1.570796f, 0.0f); - (this.Lock_4 = new ModelRenderer(this, 22, 24)).addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); - this.Lock_4.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lock_4.setTextureSize(128, 128); - this.Lock_4.mirror = true; - this.setRotation(this.Lock_4, 0.0f, -1.570796f, 0.0f); + textureWidth = 128; + textureHeight = 128; + + column1 = new ModelRenderer(this, 0, 0); + column1.addBox(-8.0f, 8.0f, -8.0f, 4, 16, 4); + column1.setRotationPoint(0.0f, 0.0f, 0.0f); + column1.setTextureSize(128, 128); + column1.mirror = true; + setRotation(column1, 0.0f, 0.0f, 0.0f); + + column4 = new ModelRenderer(this, 0, 0); + column4.addBox(4.0f, 8.0f, -8.0f, 4, 16, 4); + column4.setRotationPoint(0.0f, 0.0f, 0.0f); + column4.setTextureSize(128, 128); + column4.mirror = true; + setRotation(column4, 0.0f, 0.0f, 0.0f); + + column2 = new ModelRenderer(this, 0, 0); + column2.addBox(-8.0f, 8.0f, 4.0f, 4, 16, 4); + column2.setRotationPoint(0.0f, 0.0f, 0.0f); + column2.setTextureSize(128, 128); + column2.mirror = true; + setRotation(column2, 0.0f, 0.0f, 0.0f); + + column3 = new ModelRenderer(this, 0, 0); + column3.addBox(4.0f, 8.0f, 4.0f, 4, 16, 4); + column3.setRotationPoint(0.0f, 0.0f, 0.0f); + column3.setTextureSize(128, 128); + column3.mirror = true; + setRotation(column3, 0.0f, 0.0f, 0.0f); + + lid1 = new ModelRenderer(this, 48, 0); + lid1.addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); + lid1.setRotationPoint(0.0f, 0.0f, 0.0f); + lid1.setTextureSize(128, 128); + lid1.mirror = true; + setRotation(lid1, 0.0f, 0.0f, 0.0f); + + body1 = new ModelRenderer(this, 0, 24); + body1.addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); + body1.setRotationPoint(0.0f, 0.0f, 0.0f); + body1.setTextureSize(128, 128); + body1.mirror = true; + setRotation(body1, 0.0f, 0.0f, 0.0f); + + lock1 = new ModelRenderer(this, 22, 24); + lock1.addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); + lock1.setRotationPoint(0.0f, 0.0f, 0.0f); + lock1.setTextureSize(128, 128); + lock1.mirror = true; + setRotation(lock1, 0.0f, 0.0f, 0.0f); + + lid2 = new ModelRenderer(this, 48, 0); + lid2.addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); + lid2.setRotationPoint(0.0f, 0.0f, 0.0f); + lid2.setTextureSize(128, 128); + lid2.mirror = true; + setRotation(lid2, 0.0f, 1.570796f, 0.0f); + + body2 = new ModelRenderer(this, 0, 24); + body2.addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); + body2.setRotationPoint(0.0f, 0.0f, 0.0f); + body2.setTextureSize(128, 128); + body2.mirror = true; + setRotation(body2, 0.0f, 1.570796f, 0.0f); + + lock2 = new ModelRenderer(this, 22, 24); + lock2.addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); + lock2.setRotationPoint(0.0f, 0.0f, 0.0f); + lock2.setTextureSize(128, 128); + lock2.mirror = true; + setRotation(lock2, 0.0f, 1.570796f, 0.0f); + + body = new ModelRenderer(this, 16, 0); + body.addBox(-4.0f, 8.0f, -4.0f, 8, 16, 8); + body.setRotationPoint(0.0f, 0.0f, 0.0f); + body.setTextureSize(128, 128); + body.mirror = true; + setRotation(body, 0.0f, 0.0f, 0.0f); + + lid3 = new ModelRenderer(this, 48, 0); + lid3.addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); + lid3.setRotationPoint(0.0f, 0.0f, 0.0f); + lid3.setTextureSize(128, 128); + lid3.mirror = true; + setRotation(lid3, 0.0f, 3.141593f, 0.0f); + + body3 = new ModelRenderer(this, 0, 24); + body3.addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); + body3.setRotationPoint(0.0f, 0.0f, 0.0f); + body3.setTextureSize(128, 128); + body3.mirror = true; + setRotation(body3, 0.0f, 3.141593f, 0.0f); + + lock3 = new ModelRenderer(this, 22, 24); + lock3.addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); + lock3.setRotationPoint(0.0f, 0.0f, 0.0f); + lock3.setTextureSize(128, 128); + lock3.mirror = true; + setRotation(lock3, 0.0f, 3.141593f, 0.0f); + + lid4 = new ModelRenderer(this, 48, 0); + lid4.addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); + lid4.setRotationPoint(0.0f, 0.0f, 0.0f); + lid4.setTextureSize(128, 128); + lid4.mirror = true; + setRotation(lid4, 0.0f, -1.570796f, 0.0f); + + body4 = new ModelRenderer(this, 0, 24); + body4.addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); + body4.setRotationPoint(0.0f, 0.0f, 0.0f); + body4.setTextureSize(128, 128); + body4.mirror = true; + setRotation(body4, 0.0f, -1.570796f, 0.0f); + + lock4 = new ModelRenderer(this, 22, 24); + lock4.addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); + lock4.setRotationPoint(0.0f, 0.0f, 0.0f); + lock4.setTextureSize(128, 128); + lock4.mirror = true; + setRotation(lock4, 0.0f, -1.570796f, 0.0f); } @Override - public void render(final Entity entity, final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - this.setRotationAngles(f, f1, f2, f3, f4, f5); - this.Column1.render(f5); - this.Column4.render(f5); - this.Column2.render(f5); - this.Column3.render(f5); - this.Lid_1.render(f5); - this.Body_1.render(f5); - this.Lock_1.render(f5); - this.Lid_2.render(f5); - this.Body_2.render(f5); - this.Lock_2.render(f5); - this.Body.render(f5); - this.Lid_3.render(f5); - this.Body_3.render(f5); - this.Lock_3.render(f5); - this.Lid_4.render(f5); - this.Body_4.render(f5); - this.Lock_4.render(f5); + setRotationAngles(f, f1, f2, f3, f4, f5); + column1.render(f5); + column4.render(f5); + column2.render(f5); + column3.render(f5); + lid1.render(f5); + body1.render(f5); + lock1.render(f5); + lid2.render(f5); + body2.render(f5); + lock2.render(f5); + body.render(f5); + lid3.render(f5); + body3.render(f5); + lock3.render(f5); + lid4.render(f5); + body4.render(f5); + lock4.render(f5); } - private void setRotation(final ModelRenderer model, final float x, final float y, final float z) { + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; } - public void setRotationAngles(final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { - super.setRotationAngles(f, f1, f2, f3, f4, f5, (Entity) null); + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) { + super.setRotationAngles(f, f1, f2, f3, f4, f5, null); } } diff --git a/src/main/java/binnie/core/machines/storage/ModuleStorage.java b/src/main/java/binnie/core/machines/storage/ModuleStorage.java index 7cd96789..f255ce8e 100644 --- a/src/main/java/binnie/core/machines/storage/ModuleStorage.java +++ b/src/main/java/binnie/core/machines/storage/ModuleStorage.java @@ -1,41 +1,68 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; -import net.minecraft.item.crafting.IRecipe; +import binnie.core.BinnieCore; +import binnie.core.IInitializable; +import binnie.core.machines.MachineGroup; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraftforge.oredict.OreDictionary; -import net.minecraft.creativetab.CreativeTabs; -import binnie.core.machines.MachineGroup; -import binnie.core.BinnieCore; -import binnie.core.IInitializable; +import net.minecraftforge.oredict.ShapedOreRecipe; -public class ModuleStorage implements IInitializable -{ +public class ModuleStorage implements IInitializable { @Override public void preInit() { - (BinnieCore.packageCompartment = new MachineGroup(BinnieCore.instance, "storage", "storage", Compartment.values())).setCreativeTab(CreativeTabs.tabBlock); + BinnieCore.packageCompartment = new MachineGroup(BinnieCore.instance, "storage", "storage", Compartment.values()); + BinnieCore.packageCompartment.setCreativeTab(CreativeTabs.tabBlock); } @Override public void init() { + // ignored } @Override public void postInit() { - final String ironGear = OreDictionary.getOres("gearIron").isEmpty() ? "ingotIron" : "gearIron"; - final String goldGear = OreDictionary.getOres("gearGold").isEmpty() ? "ingotGold" : "gearGold"; - final String diamondGear = "gemDiamond"; - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.Compartment.get(1), new Object[] { "pcp", "cbc", "pcp", 'b', Items.book, 'c', Blocks.chest, 'p', Blocks.stone_button })); - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentCopper.get(1), new Object[] { "pcp", "cbc", "pcp", 'b', Compartment.Compartment.get(1), 'c', "gearCopper", 'p', Blocks.stone_button })); - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentBronze.get(1), new Object[] { "pcp", "cbc", "pcp", 'b', Compartment.CompartmentCopper.get(1), 'c', "gearBronze", 'p', Items.gold_nugget })); - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentIron.get(1), new Object[] { "pcp", "cbc", "pcp", 'b', Compartment.CompartmentCopper.get(1), 'c', ironGear, 'p', Items.gold_nugget })); - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentGold.get(1), new Object[] { "pcp", "cbc", "pcp", 'b', Compartment.CompartmentIron.get(1), 'c', goldGear, 'p', Items.emerald })); - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentDiamond.get(1), new Object[] { "pcp", "cbc", "pcp", 'b', Compartment.CompartmentGold.get(1), 'c', diamondGear, 'p', Items.emerald })); + String ironGear = OreDictionary.getOres("gearIron").isEmpty() ? "ingotIron" : "gearIron"; + String goldGear = OreDictionary.getOres("gearGold").isEmpty() ? "ingotGold" : "gearGold"; + String diamondGear = "gemDiamond"; + + GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.Compartment.get(1), new Object[]{ + "pcp", "cbc", "pcp", + 'b', Items.book, + 'c', Blocks.chest, + 'p', Blocks.stone_button + })); + GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentCopper.get(1), new Object[]{ + "pcp", "cbc", "pcp", + 'b', Compartment.Compartment.get(1), + 'c', "gearCopper", + 'p', Blocks.stone_button + })); + GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentBronze.get(1), new Object[]{ + "pcp", "cbc", "pcp", + 'b', Compartment.CompartmentCopper.get(1), + 'c', "gearBronze", + 'p', Items.gold_nugget + })); + GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentIron.get(1), new Object[]{ + "pcp", "cbc", "pcp", + 'b', Compartment.CompartmentCopper.get(1), + 'c', ironGear, + 'p', Items.gold_nugget + })); + GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentGold.get(1), new Object[]{ + "pcp", "cbc", "pcp", + 'b', Compartment.CompartmentIron.get(1), + 'c', goldGear, + 'p', Items.emerald + })); + GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentDiamond.get(1), new Object[]{ + "pcp", "cbc", "pcp", + 'b', Compartment.CompartmentGold.get(1), + 'c', diamondGear, + 'p', Items.emerald + })); } } diff --git a/src/main/java/binnie/core/machines/storage/StandardCompartment.java b/src/main/java/binnie/core/machines/storage/StandardCompartment.java index 34205fa5..58bcb4b3 100644 --- a/src/main/java/binnie/core/machines/storage/StandardCompartment.java +++ b/src/main/java/binnie/core/machines/storage/StandardCompartment.java @@ -1,25 +1,19 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; -import binnie.core.machines.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; import binnie.core.gui.BinnieCoreGUI; import binnie.core.machines.Machine; +import binnie.core.machines.TileEntityMachine; import binnie.core.texture.BinnieCoreTexture; +import net.minecraft.tileentity.TileEntity; -class StandardCompartment -{ - public static class PackageCompartment extends Compartment.PackageCompartment - { +class StandardCompartment { + public static class PackageCompartment extends Compartment.PackageCompartment { public PackageCompartment() { super("compartment", BinnieCoreTexture.Compartment); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ComponentBinnieCoreGUI(machine, BinnieCoreGUI.Compartment); new ComponentCompartmentInventory(machine, 4, 25); } @@ -34,14 +28,13 @@ class StandardCompartment } } - public static class PackageCompartmentCopper extends Compartment.PackageCompartment - { + public static class PackageCompartmentCopper extends Compartment.PackageCompartment { public PackageCompartmentCopper() { super("compartmentCopper", BinnieCoreTexture.CompartmentCopper); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ComponentBinnieCoreGUI(machine, BinnieCoreGUI.Compartment); new ComponentCompartmentInventory(machine, 6, 25); } @@ -53,17 +46,17 @@ class StandardCompartment @Override public void register() { + // ignored } } - public static class PackageCompartmentBronze extends Compartment.PackageCompartment - { + public static class PackageCompartmentBronze extends Compartment.PackageCompartment { public PackageCompartmentBronze() { super("compartmentBronze", BinnieCoreTexture.CompartmentBronze); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ComponentBinnieCoreGUI(machine, BinnieCoreGUI.Compartment); new ComponentCompartmentInventory(machine, 8, 25); } @@ -75,17 +68,17 @@ class StandardCompartment @Override public void register() { + // ignored } } - public static class PackageCompartmentIron extends Compartment.PackageCompartment - { + public static class PackageCompartmentIron extends Compartment.PackageCompartment { public PackageCompartmentIron() { super("compartmentIron", BinnieCoreTexture.CompartmentIron); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ComponentBinnieCoreGUI(machine, BinnieCoreGUI.Compartment); new ComponentCompartmentInventory(machine, 4, 50); } @@ -97,17 +90,17 @@ class StandardCompartment @Override public void register() { + // ignored } } - public static class PackageCompartmentGold extends Compartment.PackageCompartment - { + public static class PackageCompartmentGold extends Compartment.PackageCompartment { public PackageCompartmentGold() { super("compartmentGold", BinnieCoreTexture.CompartmentGold); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ComponentBinnieCoreGUI(machine, BinnieCoreGUI.Compartment); new ComponentCompartmentInventory(machine, 6, 50); } @@ -119,17 +112,17 @@ class StandardCompartment @Override public void register() { + // ignored } } - public static class PackageCompartmentDiamond extends Compartment.PackageCompartment - { + public static class PackageCompartmentDiamond extends Compartment.PackageCompartment { public PackageCompartmentDiamond() { super("compartmentDiamond", BinnieCoreTexture.CompartmentDiamond); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ComponentBinnieCoreGUI(machine, BinnieCoreGUI.Compartment); new ComponentCompartmentInventory(machine, 8, 50); } @@ -141,6 +134,7 @@ class StandardCompartment @Override public void register() { + // ignored } } } diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 934b2717..518a553c 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -1,146 +1,126 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; -import binnie.core.machines.transfer.TransferRequest; -import binnie.core.BinnieCore; import binnie.core.AbstractMod; - -import binnie.craftgui.minecraft.control.ControlSlot; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedList; -import java.util.Map.Entry; - -import net.minecraft.init.Blocks; -import net.minecraft.block.Block; - +import binnie.core.BinnieCore; +import binnie.core.machines.Machine; +import binnie.core.machines.transfer.TransferRequest; import binnie.craftgui.controls.ControlCheckbox; -import binnie.craftgui.core.geometry.IBorder; -import binnie.craftgui.controls.scroll.ControlScrollableContent; -import binnie.craftgui.minecraft.Dialog; -import binnie.craftgui.controls.button.ControlButton; -import binnie.craftgui.minecraft.EnumColor; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.core.Attribute; - -import net.minecraft.init.Items; - -import binnie.craftgui.events.EventTextEdit; import binnie.craftgui.controls.ControlText; -import binnie.craftgui.minecraft.control.ControlSlide; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.core.geometry.IPoint; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.CraftGUITexture; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.core.geometry.CraftGUIUtil; +import binnie.craftgui.controls.ControlTextEdit; +import binnie.craftgui.controls.button.ControlButton; +import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.page.ControlPage; import binnie.craftgui.controls.page.ControlPages; -import binnie.craftgui.events.EventHandler; -import net.minecraft.nbt.NBTTagCompound; - -import binnie.craftgui.events.EventValueChanged; - -import java.util.Arrays; - -import net.minecraft.item.ItemStack; - -import binnie.craftgui.minecraft.control.ControlTabIcon; +import binnie.craftgui.controls.scroll.ControlScrollableContent; import binnie.craftgui.controls.tab.ControlTab; import binnie.craftgui.controls.tab.ControlTabBar; -import binnie.craftgui.core.geometry.Position; +import binnie.craftgui.core.Attribute; +import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.controls.core.Control; -import binnie.core.machines.Machine; - -import java.util.HashMap; - -import binnie.craftgui.minecraft.Window; - -import cpw.mods.fml.relauncher.Side; - -import net.minecraft.inventory.IInventory; -import net.minecraft.entity.player.EntityPlayer; - -import binnie.craftgui.minecraft.control.ControlItemDisplay; -import binnie.craftgui.controls.ControlTextEdit; -import binnie.craftgui.window.Panel; - -import java.util.Map; - -import binnie.craftgui.minecraft.IWindowAffectsShiftClick; +import binnie.craftgui.core.geometry.CraftGUIUtil; +import binnie.craftgui.core.geometry.IBorder; +import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Position; +import binnie.craftgui.events.EventHandler; +import binnie.craftgui.events.EventMouse; +import binnie.craftgui.events.EventTextEdit; +import binnie.craftgui.events.EventValueChanged; import binnie.craftgui.genetics.machine.WindowMachine; +import binnie.craftgui.minecraft.Dialog; +import binnie.craftgui.minecraft.EnumColor; +import binnie.craftgui.minecraft.IWindowAffectsShiftClick; +import binnie.craftgui.minecraft.MinecraftGUI; +import binnie.craftgui.minecraft.Window; +import binnie.craftgui.minecraft.control.ControlItemDisplay; +import binnie.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.craftgui.minecraft.control.ControlSlide; +import binnie.craftgui.minecraft.control.ControlSlot; +import binnie.craftgui.minecraft.control.ControlSlotArray; +import binnie.craftgui.minecraft.control.ControlTabIcon; +import binnie.craftgui.resource.Texture; +import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.craftgui.window.Panel; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; -public class WindowCompartment extends WindowMachine implements IWindowAffectsShiftClick -{ - private final Map panels; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +public class WindowCompartment extends WindowMachine implements IWindowAffectsShiftClick { + private Map panels; private ControlTextEdit tabName; private ControlItemDisplay tabIcon; private ControlColourSelector tabColour; boolean dueUpdate; private int currentTab; - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + public static Window create(EntityPlayer player, IInventory inventory, Side side) { return new WindowCompartment(player, inventory, side); } - public WindowCompartment(final EntityPlayer player, final IInventory inventory, final Side side) { + public WindowCompartment(EntityPlayer player, IInventory inventory, Side side) { super(320, 226, player, inventory, side); - this.panels = new HashMap(); + this.panels = new HashMap<>(); this.currentTab = 0; } @Override public void initialiseClient() { - this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); + this.setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName()); int x = 16; - final int y = 32; - final ComponentCompartmentInventory inv = Machine.getMachine(this.getInventory()).getInterface(ComponentCompartmentInventory.class); + int y = 32; + ComponentCompartmentInventory inv = Machine.getMachine(getInventory()).getInterface(ComponentCompartmentInventory.class); Integer[] tabs1 = new Integer[0]; Integer[] tabs2 = new Integer[0]; if (inv.getTabNumber() == 4) { - tabs1 = new Integer[] { 0, 1 }; - tabs2 = new Integer[] { 2, 3 }; + tabs1 = new Integer[]{0, 1}; + tabs2 = new Integer[]{2, 3}; } if (inv.getTabNumber() == 6) { - tabs1 = new Integer[] { 0, 1, 2 }; - tabs2 = new Integer[] { 3, 4, 5 }; + tabs1 = new Integer[]{0, 1, 2}; + tabs2 = new Integer[]{3, 4, 5}; } if (inv.getTabNumber() == 8) { - tabs1 = new Integer[] { 0, 1, 2, 3 }; - tabs2 = new Integer[] { 4, 5, 6, 7 }; + tabs1 = new Integer[]{0, 1, 2, 3}; + tabs2 = new Integer[]{4, 5, 6, 7}; } - final boolean doubleTabbed = tabs2.length > 0; - final int compartmentPageWidth = 16 + 18 * inv.getPageSize() / 5; - final int compartmentPageHeight = 106; - final int compartmentWidth = compartmentPageWidth + (doubleTabbed ? 48 : 24); - final int compartmentHeight = compartmentPageHeight; - final Control controlCompartment = new Control(this, x, y, compartmentWidth, compartmentHeight); - final ControlTabBar tab = new ControlTabBar(controlCompartment, 0.0f, 0.0f, 24.0f, compartmentPageHeight, Position.Left) { + boolean doubleTabbed = tabs2.length > 0; + int compartmentPageWidth = 16 + 18 * inv.getPageSize() / 5; + int compartmentPageHeight = 106; + int compartmentWidth = compartmentPageWidth + (doubleTabbed ? 48 : 24); + int compartmentHeight = compartmentPageHeight; + + Control controlCompartment = new Control(this, x, y, compartmentWidth, compartmentHeight); + ControlTabBar tab = new ControlTabBar(controlCompartment, 0.0f, 0.0f, 24.0f, compartmentPageHeight, Position.Left) { @Override - public ControlTab createTab(final float x, final float y, final float w, final float h, final Integer value) { + public ControlTab createTab(float x, float y, float w, float h, Integer value) { return new ControlTabIcon(this, x, y, w, h, value) { @Override public ItemStack getItemStack() { - return WindowCompartment.this.getTab(this.value).getIcon(); + return WindowCompartment.this.getTab(value).getIcon(); } @Override public String getName() { - return WindowCompartment.this.getTab(this.value).getName(); + return WindowCompartment.this.getTab(value).getName(); } @Override public int getOutlineColour() { - return WindowCompartment.this.getTab(this.value).getColor().getColour(); + return WindowCompartment.this.getTab(value).getColor().getColour(); } @Override @@ -150,40 +130,42 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh }; } }; - final String[] tabHelp = { "Compartment Tab", "Tabs that divide the inventory into sections. Each one can be labelled seperately." }; + + String[] tabHelp = {"Compartment Tab", "Tabs that divide the inventory into sections. Each one can be labelled seperately."}; tab.addHelp(tabHelp); tab.setValues(Arrays.asList(tabs1)); tab.setValue(0); tab.addEventHandler(new EventValueChanged.Handler() { @Override - public void onEvent(final EventValueChanged event) { - final NBTTagCompound nbt = new NBTTagCompound(); - final int i = ((Integer) event.getValue()).intValue(); + public void onEvent(EventValueChanged event) { + NBTTagCompound nbt = new NBTTagCompound(); + int i = ((Integer) event.getValue()).intValue(); nbt.setByte("i", (byte) i); Window.get(tab).sendClientAction("tab-change", nbt); WindowCompartment.this.currentTab = i; } }.setOrigin(EventHandler.Origin.DirectChild, tab)); x += 24; - final ControlPages compartmentPages = new ControlPages(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight); - final ControlPage[] page = new ControlPage[inv.getTabNumber()]; + ControlPages compartmentPages = new ControlPages(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight); + ControlPage[] page = new ControlPage[inv.getTabNumber()]; for (int p = 0; p < inv.getTabNumber(); ++p) { page[p] = new ControlPage(compartmentPages, Integer.valueOf(p)); } CraftGUIUtil.linkWidgets(tab, compartmentPages); int i = 0; for (int p2 = 0; p2 < inv.getTabNumber(); ++p2) { - final ControlPage thisPage = page[p2]; - final Panel panel = new Panel(thisPage, 0.0f, 0.0f, thisPage.w(), thisPage.h(), MinecraftGUI.PanelType.Black) { + ControlPage thisPage = page[p2]; + Panel panel = new Panel(thisPage, 0.0f, 0.0f, thisPage.w(), thisPage.h(), MinecraftGUI.PanelType.Black) { @Override public void onRenderForeground() { - final Texture iTexture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline); + Texture iTexture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline); CraftGUI.Render.colour(WindowCompartment.this.getTab(WindowCompartment.this.panels.get(this)).getColor().getColour()); - CraftGUI.Render.texture(iTexture, this.getArea().inset(3)); + CraftGUI.Render.texture(iTexture, getArea().inset(3)); } }; + this.panels.put(panel, p2); - final int[] slotsIDs = new int[inv.getPageSize()]; + int[] slotsIDs = new int[inv.getPageSize()]; for (int k = 0; k < inv.getPageSize(); ++k) { slotsIDs[k] = i++; } @@ -191,23 +173,23 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } x += compartmentPageWidth; if (tabs2.length > 0) { - final ControlTabBar tab2 = new ControlTabBar(controlCompartment, 24 + compartmentPageWidth, 0.0f, 24.0f, compartmentPageHeight, Position.Right) { + ControlTabBar tab2 = new ControlTabBar(controlCompartment, 24 + compartmentPageWidth, 0.0f, 24.0f, compartmentPageHeight, Position.Right) { @Override - public ControlTab createTab(final float x, final float y, final float w, final float h, final Integer value) { + public ControlTab createTab(float x, float y, float w, float h, Integer value) { return new ControlTabIcon(this, x, y, w, h, value) { @Override public ItemStack getItemStack() { - return WindowCompartment.this.getTab(this.value).getIcon(); + return WindowCompartment.this.getTab(value).getIcon(); } @Override public String getName() { - return WindowCompartment.this.getTab(this.value).getName(); + return WindowCompartment.this.getTab(value).getName(); } @Override public int getOutlineColour() { - return WindowCompartment.this.getTab(this.value).getColor().getColour(); + return WindowCompartment.this.getTab(value).getColor().getColour(); } @Override @@ -222,9 +204,9 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh tab2.addHelp(tabHelp); tab2.addEventHandler(new EventValueChanged.Handler() { @Override - public void onEvent(final EventValueChanged event) { - final NBTTagCompound nbt = new NBTTagCompound(); - final int i = ((Integer) event.getValue()).intValue(); + public void onEvent(EventValueChanged event) { + NBTTagCompound nbt = new NBTTagCompound(); + int i = ((Integer) event.getValue()).intValue(); nbt.setByte("i", (byte) i); Window.get(tab).sendClientAction("tab-change", nbt); WindowCompartment.this.currentTab = i; @@ -236,62 +218,67 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh x += 16; this.setSize(new IPoint(Math.max(32 + compartmentWidth, 252), this.h())); controlCompartment.setPosition(new IPoint((this.w() - controlCompartment.w()) / 2.0f, controlCompartment.y())); - final ControlPlayerInventory invent = new ControlPlayerInventory(this, true); - final ControlSlide slide = new ControlSlide(this, 0.0f, 134.0f, 136.0f, 92.0f, Position.Left); + ControlPlayerInventory invent = new ControlPlayerInventory(this, true); + ControlSlide slide = new ControlSlide(this, 0.0f, 134.0f, 136.0f, 92.0f, Position.Left); slide.setLabel("Tab Properties"); slide.setSlide(false); slide.addHelp("Tab Properties"); slide.addHelp("The label, colour and icon of the Tab can be altered here. Clicking on the icon with a held item will change it."); - final Panel tabPropertyPanel = new Panel(slide, 16.0f, 8.0f, 112.0f, 76.0f, MinecraftGUI.PanelType.Gray); + Panel tabPropertyPanel = new Panel(slide, 16.0f, 8.0f, 112.0f, 76.0f, MinecraftGUI.PanelType.Gray); int y2 = 4; new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), "Tab Name:"); - final Panel parent = tabPropertyPanel; - final float x2 = 4.0f; + Panel parent = tabPropertyPanel; + float x2 = 4.0f; y2 += 12; - (this.tabName = new ControlTextEdit(parent, x2, y2, 104.0f, 12.0f)).addSelfEventHandler(new EventTextEdit.Handler() { + + tabName = new ControlTextEdit(parent, x2, y2, 104.0f, 12.0f); + tabName.addSelfEventHandler(new EventTextEdit.Handler() { @Override - public void onEvent(final EventTextEdit event) { - final CompartmentTab tab = WindowCompartment.this.getCurrentTab(); + public void onEvent(EventTextEdit event) { + CompartmentTab tab = WindowCompartment.this.getCurrentTab(); tab.setName(event.getValue()); - final NBTTagCompound nbt = new NBTTagCompound(); + NBTTagCompound nbt = new NBTTagCompound(); tab.writeToNBT(nbt); WindowCompartment.this.sendClientAction("comp-change-tab", nbt); } }.setOrigin(EventHandler.Origin.Self, this.tabName)); y2 += 20; new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), "Tab Icon: "); - (this.tabIcon = new ControlItemDisplay(tabPropertyPanel, 58.0f, y2 - 4)).setItemStack(new ItemStack(Items.paper)); - this.tabIcon.addAttribute(Attribute.MouseOver); - this.tabIcon.addSelfEventHandler(new EventMouse.Down.Handler() { + + tabIcon = new ControlItemDisplay(tabPropertyPanel, 58.0f, y2 - 4); + tabIcon.setItemStack(new ItemStack(Items.paper)); + tabIcon.addAttribute(Attribute.MouseOver); + tabIcon.addSelfEventHandler(new EventMouse.Down.Handler() { @Override - public void onEvent(final EventMouse.Down event) { + public void onEvent(EventMouse.Down event) { if (WindowCompartment.this.getHeldItemStack() == null) { return; } - final CompartmentTab tab = WindowCompartment.this.getCurrentTab(); - final ItemStack stack = WindowCompartment.this.getHeldItemStack().copy(); + CompartmentTab tab = WindowCompartment.this.getCurrentTab(); + ItemStack stack = WindowCompartment.this.getHeldItemStack().copy(); stack.stackSize = 1; tab.setIcon(stack); - final NBTTagCompound nbt = new NBTTagCompound(); + NBTTagCompound nbt = new NBTTagCompound(); tab.writeToNBT(nbt); WindowCompartment.this.sendClientAction("comp-change-tab", nbt); } }); - this.tabColour = new ControlColourSelector(tabPropertyPanel, 82.0f, y2 - 4, 16.0f, 16.0f, EnumColor.White); - this.tabIcon.addHelp("Icon for Current Tab"); - this.tabIcon.addHelp("Click here with an item to change"); + + tabColour = new ControlColourSelector(tabPropertyPanel, 82.0f, y2 - 4, 16.0f, 16.0f, EnumColor.White); + tabIcon.addHelp("Icon for Current Tab"); + tabIcon.addHelp("Click here with an item to change"); y2 += 20; new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), "Colour: "); - final int cw = 8; - final Panel panelColour = new Panel(tabPropertyPanel, 40.0f, y2 - 4, cw * 8 + 2, cw * 2 + 1, MinecraftGUI.PanelType.Gray); + int cw = 8; + Panel panelColour = new Panel(tabPropertyPanel, 40.0f, y2 - 4, cw * 8 + 2, cw * 2 + 1, MinecraftGUI.PanelType.Gray); for (int cc = 0; cc < 16; ++cc) { - final ControlColourSelector color = new ControlColourSelector(panelColour, 1 + cw * (cc % 8), 1 + cw * (cc / 8), cw, cw, EnumColor.values()[cc]); + ControlColourSelector color = new ControlColourSelector(panelColour, 1 + cw * (cc % 8), 1 + cw * (cc / 8), cw, cw, EnumColor.values()[cc]); color.addSelfEventHandler(new EventMouse.Down.Handler() { @Override - public void onEvent(final EventMouse.Down event) { - final CompartmentTab tab = WindowCompartment.this.getCurrentTab(); + public void onEvent(EventMouse.Down event) { + CompartmentTab tab = WindowCompartment.this.getCurrentTab(); tab.setColor(color.getValue()); - final NBTTagCompound nbt = new NBTTagCompound(); + NBTTagCompound nbt = new NBTTagCompound(); tab.writeToNBT(nbt); WindowCompartment.this.sendClientAction("comp-change-tab", nbt); } @@ -300,16 +287,16 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh color.addHelp("Select a colour to highlight the current tab"); } y2 += 20; - final ControlButton searchButton = new ControlButton(controlCompartment, compartmentWidth - 24 - 64 - 8, compartmentPageHeight, 64.0f, 16.0f, "Search") { + ControlButton searchButton = new ControlButton(controlCompartment, compartmentWidth - 24 - 64 - 8, compartmentPageHeight, 64.0f, 16.0f, "Search") { @Override - protected void onMouseClick(final EventMouse.Down event) { + protected void onMouseClick(EventMouse.Down event) { WindowCompartment.this.createSearchDialog(); } @Override public void onRenderBackground() { - final Object texture = this.isMouseOver() ? CraftGUITexture.TabHighlighted : CraftGUITexture.Tab; - CraftGUI.Render.texture(CraftGUI.Render.getTexture(texture).crop(Position.Bottom, 8.0f), this.getArea()); + Object texture = isMouseOver() ? CraftGUITexture.TabHighlighted : CraftGUITexture.Tab; + CraftGUI.Render.texture(CraftGUI.Render.getTexture(texture).crop(Position.Bottom, 8.0f), getArea()); } }; searchButton.addHelp("Search Button"); @@ -326,98 +313,106 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh @Override public void onClose() { + // ignored } @Override public void initialise() { - final ControlScrollableContent scroll = new ControlScrollableContent(this, 124.0f, 16.0f, 116.0f, 92.0f, 6.0f) { + ControlScrollableContent scroll = new ControlScrollableContent(this, 124.0f, 16.0f, 116.0f, 92.0f, 6.0f) { @Override public void onRenderBackground() { CraftGUI.Render.colour(11184810); CraftGUI.Render.texture(CraftGUITexture.Outline, this.getArea().inset(new IBorder(0.0f, 6.0f, 0.0f, 0.0f))); } }; - scroll.setScrollableContent(this.slotGrid = new Control(scroll, 1.0f, 1.0f, 108.0f, 18.0f)); + slotGrid = new Control(scroll, 1.0f, 1.0f, 108.0f, 18.0f); + scroll.setScrollableContent(slotGrid); new ControlPlayerInventory(this, true); new ControlTextEdit(this, 16.0f, 16.0f, 100.0f, 14.0f).addEventHandler(new EventTextEdit.Handler() { @Override - public void onEvent(final EventTextEdit event) { + public void onEvent(EventTextEdit event) { textSearch = event.value; updateSearch(); } }); - this.includeItems = true; - this.includeBlocks = true; - new ControlCheckbox(this, 16.0f, 40.0f, 100.0f, "Sort A-Z", this.sortByName) { + includeItems = true; + includeBlocks = true; + new ControlCheckbox(this, 16.0f, 40.0f, 100.0f, "Sort A-Z", sortByName) { @Override - protected void onValueChanged(final boolean value) { + protected void onValueChanged(boolean value) { sortByName = value; updateSearch(); } }; - new ControlCheckbox(this, 16.0f, 64.0f, 100.0f, "Include Items", this.includeItems) { + new ControlCheckbox(this, 16.0f, 64.0f, 100.0f, "Include Items", includeItems) { @Override - protected void onValueChanged(final boolean value) { + protected void onValueChanged(boolean value) { includeItems = value; updateSearch(); } }; - new ControlCheckbox(this, 16.0f, 88.0f, 100.0f, "Include Blocks", this.includeBlocks) { + new ControlCheckbox(this, 16.0f, 88.0f, 100.0f, "Include Blocks", includeBlocks) { @Override - protected void onValueChanged(final boolean value) { + protected void onValueChanged(boolean value) { includeBlocks = value; updateSearch(); } }; - this.updateSearch(); + updateSearch(); } private void updateSearch() { - Map slotIds = new HashMap(); - final IInventory inv = WindowCompartment.this.getInventory(); + Map slotIds = new HashMap<>(); + IInventory inv = WindowCompartment.this.getInventory(); for (int i = 0; i < inv.getSizeInventory(); ++i) { - final ItemStack stack = inv.getStackInSlot(i); - if (stack != null) { - final String name = stack.getDisplayName().toLowerCase(); - if (this.textSearch == null || name.contains(this.textSearch)) { - if (this.includeBlocks || Block.getBlockFromItem(stack.getItem()) == Blocks.air) { - if (this.includeItems || Block.getBlockFromItem(stack.getItem()) != Blocks.air) { - slotIds.put(i, name); - } - } + ItemStack stack = inv.getStackInSlot(i); + if (stack == null) { + continue; + } + + String name = stack.getDisplayName().toLowerCase(); + if (textSearch == null || name.contains(textSearch)) { + Block block = Block.getBlockFromItem(stack.getItem()); + if ((includeBlocks || block == Blocks.air) && (includeItems || block != Blocks.air)) { + slotIds.put(i, name); } } } + if (this.sortByName) { - final List> list = new LinkedList(slotIds.entrySet()); + List> list = new LinkedList(slotIds.entrySet()); Collections.sort(list, new Comparator>() { @Override public int compare(Entry o1, Entry o2) { return -o2.getValue().compareTo(o1.getValue()); } }); - final Map result = new LinkedHashMap(); - for (final Map.Entry entry : list) { + + Map result = new LinkedHashMap(); + for (Map.Entry entry : list) { result.put(entry.getKey(), entry.getValue()); } slotIds = result; } + int y = 0; int x = 0; - final int width = 108; - final int height = 2 + 18 * (1 + (slotIds.size() - 1) / 6); - this.slotGrid.deleteAllChildren(); - this.slotGrid.setSize(new IPoint(width, height)); - for (final int k : slotIds.keySet()) { - new ControlSlot(this.slotGrid, x, y).assign(k); + int width = 108; + int height = 2 + 18 * (1 + (slotIds.size() - 1) / 6); + slotGrid.deleteAllChildren(); + slotGrid.setSize(new IPoint(width, height)); + + for (int k : slotIds.keySet()) { + new ControlSlot(slotGrid, x, y).assign(k); x += 18; if (x >= 108) { x = 0; y += 18; } } + while (y < 108 || x != 0) { - new ControlSlot(this.slotGrid, x, y); + new ControlSlot(slotGrid, x, y); x += 18; if (x >= 108) { x = 0; @@ -431,20 +426,21 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh @Override public void onUpdateClient() { super.onUpdateClient(); - this.updateTabs(); + updateTabs(); } public void updateTabs() { - this.tabName.setValue(this.getCurrentTab().getName()); - this.tabIcon.setItemStack(this.getCurrentTab().getIcon()); - this.tabColour.setValue(this.getCurrentTab().getColor()); + CompartmentTab tab = getCurrentTab(); + tabName.setValue(tab.getName()); + tabIcon.setItemStack(tab.getIcon()); + tabColour.setValue(tab.getColor()); } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { - super.recieveGuiNBT(side, player, name, action); + public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { + super.recieveGuiNBT(side, player, name, nbt); if (name.equals("tab-change")) { - this.currentTab = action.getByte("i"); + currentTab = nbt.getByte("i"); } } @@ -464,18 +460,19 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } @Override - public void alterRequest(final TransferRequest request) { - if (request.getDestination() == this.getInventory()) { - final ComponentCompartmentInventory inv = Machine.getMachine(this.getInventory()).getInterface(ComponentCompartmentInventory.class); - request.setTargetSlots(inv.getSlotsForTab(this.currentTab)); + public void alterRequest(TransferRequest request) { + IInventory inventory = getInventory(); + if (request.getDestination() == inventory) { + ComponentCompartmentInventory inv = Machine.getMachine(inventory).getInterface(ComponentCompartmentInventory.class); + request.setTargetSlots(inv.getSlotsForTab(currentTab)); } } - public CompartmentTab getTab(final int i) { - return Machine.getInterface(ComponentCompartmentInventory.class, this.getInventory()).getTab(i); + public CompartmentTab getTab(int i) { + return Machine.getInterface(ComponentCompartmentInventory.class, getInventory()).getTab(i); } public CompartmentTab getCurrentTab() { - return this.getTab(this.currentTab); + return getTab(currentTab); } } diff --git a/src/main/java/binnie/core/machines/storage/WindowTest.java b/src/main/java/binnie/core/machines/storage/WindowTest.java index 49b727cb..fd36dfc8 100644 --- a/src/main/java/binnie/core/machines/storage/WindowTest.java +++ b/src/main/java/binnie/core/machines/storage/WindowTest.java @@ -1,24 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; -import binnie.core.BinnieCore; import binnie.core.AbstractMod; +import binnie.core.BinnieCore; +import binnie.craftgui.genetics.machine.WindowMachine; import binnie.craftgui.minecraft.Window; import cpw.mods.fml.relauncher.Side; -import net.minecraft.inventory.IInventory; import net.minecraft.entity.player.EntityPlayer; -import binnie.craftgui.genetics.machine.WindowMachine; +import net.minecraft.inventory.IInventory; -public class WindowTest extends WindowMachine -{ - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { +// TODO unused class? +public class WindowTest extends WindowMachine { + public static Window create(EntityPlayer player, IInventory inventory, Side side) { return new WindowCompartment(player, inventory, side); } - public WindowTest(final EntityPlayer player, final IInventory inventory, final Side side) { + public WindowTest(EntityPlayer player, IInventory inventory, Side side) { super(320, 240, player, inventory, side); } diff --git a/src/main/java/binnie/core/machines/transfer/TransferHandler.java b/src/main/java/binnie/core/machines/transfer/TransferHandler.java index 5e6c9e3d..210f0b2f 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferHandler.java +++ b/src/main/java/binnie/core/machines/transfer/TransferHandler.java @@ -1,9 +1,5 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.transfer; -public class TransferHandler -{ +// TODO unused class? +public class TransferHandler { } diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index c7f101e0..10ac94c5 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -1,24 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.transfer; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.IFluidTank; -import net.minecraftforge.fluids.FluidStack; import binnie.core.machines.Machine; -import binnie.core.machines.inventory.IValidatedTankContainer; -import net.minecraftforge.fluids.IFluidContainerItem; import binnie.core.machines.inventory.IInventorySlots; +import binnie.core.machines.inventory.IValidatedTankContainer; import binnie.core.machines.power.ITankMachine; -import java.util.ArrayList; -import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.IFluidTank; -public class TransferRequest -{ +import java.util.ArrayList; +import java.util.List; + +public class TransferRequest { private ItemStack itemToTransfer; private ItemStack returnItem; private IInventory origin; @@ -30,19 +26,21 @@ public class TransferRequest private List insertedSlots; private List insertedTanks; - public TransferRequest(final ItemStack toTransfer, final IInventory destination) { - this.itemToTransfer = null; - this.returnItem = null; - this.targetSlots = new int[0]; - this.targetTanks = new int[0]; - this.transferLiquids = true; - this.ignoreReadOnly = false; - this.insertedSlots = new ArrayList(); - this.insertedTanks = new ArrayList(); - final int[] target = new int[destination.getSizeInventory()]; + public TransferRequest(ItemStack toTransfer, IInventory destination) { + itemToTransfer = null; + returnItem = null; + targetSlots = new int[0]; + targetTanks = new int[0]; + transferLiquids = true; + ignoreReadOnly = false; + insertedSlots = new ArrayList<>(); + insertedTanks = new ArrayList<>(); + int[] target = new int[destination.getSizeInventory()]; + for (int i = 0; i < target.length; ++i) { target[i] = i; } + int[] targetTanks = new int[0]; if (destination instanceof ITankMachine) { targetTanks = new int[((ITankMachine) destination).getTanks().length]; @@ -50,80 +48,85 @@ public class TransferRequest targetTanks[j] = j; } } + if (toTransfer != null) { - this.setItemToTransfer(toTransfer.copy()); - this.setReturnItem(toTransfer.copy()); + setItemToTransfer(toTransfer.copy()); + setReturnItem(toTransfer.copy()); } - this.setOrigin(null); - this.setDestination(destination); - this.setTargetSlots(target); - this.setTargetTanks(targetTanks); - this.transferLiquids = true; + + setOrigin(null); + setDestination(destination); + setTargetSlots(target); + setTargetTanks(targetTanks); + transferLiquids = true; } - private void setItemToTransfer(final ItemStack itemToTransfer) { + private void setItemToTransfer(ItemStack itemToTransfer) { this.itemToTransfer = itemToTransfer; } - private void setReturnItem(final ItemStack returnItem) { + private void setReturnItem(ItemStack returnItem) { this.returnItem = returnItem; } - public TransferRequest setOrigin(final IInventory origin) { + public TransferRequest setOrigin(IInventory origin) { this.origin = origin; return this; } - private void setDestination(final IInventory destination) { + private void setDestination(IInventory destination) { this.destination = destination; } - public TransferRequest setTargetSlots(final int[] targetSlots) { + public TransferRequest setTargetSlots(int[] targetSlots) { this.targetSlots = targetSlots; return this; } - public TransferRequest setTargetTanks(final int[] targetTanks) { + public TransferRequest setTargetTanks(int[] targetTanks) { this.targetTanks = targetTanks; return this; } public TransferRequest ignoreValidation() { - this.ignoreReadOnly = true; + ignoreReadOnly = true; return this; } public ItemStack getReturnItem() { - return this.returnItem; + return returnItem; } - public ItemStack transfer(final boolean doAdd) { - ItemStack item = this.returnItem; - if (item == null || this.destination == null) { + public ItemStack transfer(boolean doAdd) { + ItemStack item = returnItem; + if (item == null || destination == null) { return null; } + if (this.transferLiquids && this.destination instanceof ITankMachine) { - for (final int tankID : this.targetTanks) { - item = this.transferToTank(item, this.origin, (ITankMachine) this.destination, tankID, doAdd); + for (int tankID : targetTanks) { + item = transferToTank(item, origin, (ITankMachine) destination, tankID, doAdd); if (item != null) { - item = this.transferFromTank(item, this.origin, (ITankMachine) this.destination, tankID, doAdd); + item = transferFromTank(item, origin, (ITankMachine) destination, tankID, doAdd); } } } + + // TODO simplify if (item != null) { - for (final int slot : this.targetSlots) { - if (this.destination.isItemValidForSlot(slot, item) || this.ignoreReadOnly) { - if (!(this.destination instanceof IInventorySlots) || ((IInventorySlots) this.destination).getSlot(slot) == null || !((IInventorySlots) this.destination).getSlot(slot).isRecipe()) { - if (this.destination.getStackInSlot(slot) != null) { + for (int slot : targetSlots) { + if (destination.isItemValidForSlot(slot, item) || ignoreReadOnly) { + if (!(destination instanceof IInventorySlots) || ((IInventorySlots) destination).getSlot(slot) == null || !((IInventorySlots) destination).getSlot(slot).isRecipe()) { + if (destination.getStackInSlot(slot) != null) { if (item.isStackable()) { - final ItemStack merged = this.destination.getStackInSlot(slot).copy(); - final ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy()); + ItemStack merged = destination.getStackInSlot(slot).copy(); + ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy()); item = newStacks[0]; if (!areItemsEqual(merged, newStacks[1])) { - this.insertedSlots.add(new TransferSlot(slot, this.destination)); + insertedSlots.add(new TransferSlot(slot, destination)); } if (doAdd) { - this.destination.setInventorySlotContents(slot, newStacks[1]); + destination.setInventorySlotContents(slot, newStacks[1]); } if (item == null) { return null; @@ -133,15 +136,14 @@ public class TransferRequest } } } - } - if (item != null) { - for (final int slot : this.targetSlots) { - if (this.destination.isItemValidForSlot(slot, item) || this.ignoreReadOnly) { - if (!(this.destination instanceof IInventorySlots) || ((IInventorySlots) this.destination).getSlot(slot) == null || !((IInventorySlots) this.destination).getSlot(slot).isRecipe()) { - if (this.destination.getStackInSlot(slot) == null && item != null) { - this.insertedSlots.add(new TransferSlot(slot, this.destination)); + + for (int slot : targetSlots) { + if (destination.isItemValidForSlot(slot, item) || ignoreReadOnly) { + if (!(destination instanceof IInventorySlots) || ((IInventorySlots) destination).getSlot(slot) == null || !((IInventorySlots) destination).getSlot(slot).isRecipe()) { + if (destination.getStackInSlot(slot) == null) { + insertedSlots.add(new TransferSlot(slot, destination)); if (doAdd) { - this.destination.setInventorySlotContents(slot, item.copy()); + destination.setInventorySlotContents(slot, item.copy()); } return null; } @@ -149,109 +151,121 @@ public class TransferRequest } } } - this.setReturnItem(item); - return this.getReturnItem(); + + setReturnItem(item); + return item; } - private static boolean areItemsEqual(final ItemStack merged, final ItemStack itemstack) { + private static boolean areItemsEqual(ItemStack merged, ItemStack itemstack) { return ItemStack.areItemStackTagsEqual(itemstack, merged) && itemstack.isItemEqual(merged); } - public static ItemStack[] mergeStacks(ItemStack itemstack, final ItemStack merged) { + public static ItemStack[] mergeStacks(ItemStack itemstack, ItemStack merged) { if (areItemsEqual(itemstack, merged)) { - final int space = merged.getMaxStackSize() - merged.stackSize; + int space = merged.getMaxStackSize() - merged.stackSize; if (space > 0) { if (itemstack.stackSize > space) { - final ItemStack itemStack = itemstack; + ItemStack itemStack = itemstack; itemStack.stackSize -= space; merged.stackSize += space; - } - else if (itemstack.stackSize <= space) { + } else if (itemstack.stackSize <= space) { merged.stackSize += itemstack.stackSize; itemstack = null; } } } - return new ItemStack[] { itemstack, merged }; + return new ItemStack[]{itemstack, merged}; } - private ItemStack transferToTank(ItemStack item, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { - item = this.transferToTankUsingContainerData(item, origin, destination, tankID, doAdd); - item = this.transferToTankUsingFluidContainer(item, origin, destination, tankID, doAdd); + private ItemStack transferToTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { + item = transferToTankUsingContainerData(item, origin, destination, tankID, doAdd); + item = transferToTankUsingFluidContainer(item, origin, destination, tankID, doAdd); return item; } - private ItemStack transferToTankUsingFluidContainer(final ItemStack item, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { + private ItemStack transferToTankUsingFluidContainer(ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { if (item == null || !(item.getItem() instanceof IFluidContainerItem)) { return item; } - final IFluidContainerItem fluidContainer = (IFluidContainerItem) item.getItem(); - final FluidStack fluid = fluidContainer.getFluid(item); + + IFluidContainerItem fluidContainer = (IFluidContainerItem) item.getItem(); + FluidStack fluid = fluidContainer.getFluid(item); if (fluid == null) { return item; } - final IFluidTank tank = destination.getTanks()[tankID]; - final IValidatedTankContainer validated = Machine.getInterface(IValidatedTankContainer.class, destination); + + IFluidTank tank = destination.getTanks()[tankID]; + IValidatedTankContainer validated = Machine.getInterface(IValidatedTankContainer.class, destination); if (validated != null && (!validated.isLiquidValidForTank(fluid, tankID) || validated.isTankReadOnly(tankID))) { return item; } - final int maxFill = tank.fill(fluid, false); - final FluidStack toTake = fluidContainer.drain(item, maxFill, true); + + int maxFill = tank.fill(fluid, false); + FluidStack toTake = fluidContainer.drain(item, maxFill, true); if (doAdd) { tank.fill(toTake, true); } return item; } - private ItemStack transferToTankUsingContainerData(final ItemStack item, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { + private ItemStack transferToTankUsingContainerData(ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { if (item == null) { return item; } + FluidStack containerLiquid = null; FluidContainerRegistry.FluidContainerData containerLiquidData = null; - for (final FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { if (data.filledContainer.isItemEqual(item)) { containerLiquidData = data; containerLiquid = data.fluid.copy(); break; } } + if (containerLiquid == null) { return item; } - final IFluidTank tank = destination.getTanks()[tankID]; - final IValidatedTankContainer validated = Machine.getInterface(IValidatedTankContainer.class, destination); + + IFluidTank tank = destination.getTanks()[tankID]; + IValidatedTankContainer validated = Machine.getInterface(IValidatedTankContainer.class, destination); if (validated != null && (!validated.isLiquidValidForTank(containerLiquid, tankID) || validated.isTankReadOnly(tankID))) { return item; } - final FluidStack largeAmountOfLiquid = containerLiquid.copy(); + + FluidStack largeAmountOfLiquid = containerLiquid.copy(); largeAmountOfLiquid.amount = tank.getCapacity(); - final int amountAdded = tank.fill(largeAmountOfLiquid, false); + int amountAdded = tank.fill(largeAmountOfLiquid, false); int numberOfContainersToAdd = amountAdded / containerLiquid.amount; if (numberOfContainersToAdd > item.stackSize) { numberOfContainersToAdd = item.stackSize; } - final ItemStack copy; + + // TODO simplify + ItemStack copy; ItemStack leftOverContainers = copy = item.copy(); copy.stackSize -= numberOfContainersToAdd; if (leftOverContainers.stackSize <= 0) { leftOverContainers = null; } + ItemStack emptyContainers = containerLiquidData.emptyContainer.copy(); emptyContainers.stackSize = 0; - final ItemStack itemStack = emptyContainers; + ItemStack itemStack = emptyContainers; itemStack.stackSize += numberOfContainersToAdd; if (emptyContainers.stackSize <= 0) { emptyContainers = null; } - final TransferRequest containersDump = new TransferRequest(emptyContainers, origin); - final ItemStack containersThatCantBeDumped = containersDump.transfer(false); + + TransferRequest containersDump = new TransferRequest(emptyContainers, origin); + ItemStack containersThatCantBeDumped = containersDump.transfer(false); if (containersThatCantBeDumped != null) { return item; } + if (doAdd) { - final FluidStack copy2; - final FluidStack liquidToFillTank = copy2 = containerLiquid.copy(); + FluidStack copy2; + FluidStack liquidToFillTank = copy2 = containerLiquid.copy(); copy2.amount *= numberOfContainersToAdd; tank.fill(liquidToFillTank, true); containersDump.transfer(true); @@ -259,81 +273,93 @@ public class TransferRequest return leftOverContainers; } - private ItemStack transferFromTank(ItemStack item, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { - item = this.transferFromTankUsingContainerData(item, origin, destination, tankID, doAdd); - item = this.transferFromTankUsingFluidContainer(item, origin, destination, tankID, doAdd); + private ItemStack transferFromTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { + item = transferFromTankUsingContainerData(item, origin, destination, tankID, doAdd); + item = transferFromTankUsingFluidContainer(item, origin, destination, tankID, doAdd); return item; } - private ItemStack transferFromTankUsingFluidContainer(final ItemStack item, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { + private ItemStack transferFromTankUsingFluidContainer(ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { if (item == null || !(item.getItem() instanceof IFluidContainerItem)) { return item; } - final IFluidContainerItem fluidContainer = (IFluidContainerItem) item.getItem(); - final IFluidTank tank = destination.getTanks()[tankID]; - final FluidStack fluid = tank.getFluid(); + + IFluidContainerItem fluidContainer = (IFluidContainerItem) item.getItem(); + IFluidTank tank = destination.getTanks()[tankID]; + FluidStack fluid = tank.getFluid(); if (fluid == null) { return item; } + int amount = fluidContainer.fill(item, fluid, false); amount = Math.min(amount, (tank.drain(amount, false) == null) ? 0 : tank.drain(amount, false).amount); if (amount <= 0) { return item; } + fluidContainer.fill(item, tank.drain(amount, doAdd), doAdd); return item; } - private ItemStack transferFromTankUsingContainerData(final ItemStack item, final IInventory origin, final ITankMachine destination, final int tankID, final boolean doAdd) { + private ItemStack transferFromTankUsingContainerData(ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { if (item == null) { return item; } - final IFluidTank tank = destination.getTanks()[tankID]; - final FluidStack liquidInTank = tank.getFluid(); + + IFluidTank tank = destination.getTanks()[tankID]; + FluidStack liquidInTank = tank.getFluid(); if (liquidInTank == null) { return item; } + FluidContainerRegistry.FluidContainerData containerLiquidData = null; - for (final FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { if (data.emptyContainer.isItemEqual(item) && liquidInTank.isFluidEqual(data.fluid)) { containerLiquidData = data; break; } } + FluidStack fluid = null; ItemStack filled = null; if (containerLiquidData != null) { fluid = containerLiquidData.fluid; filled = containerLiquidData.filledContainer; } + if (fluid == null || filled == null) { return item; } - final int maximumExtractedLiquid = item.stackSize * fluid.amount; - final FluidStack drainedLiquid = tank.drain(maximumExtractedLiquid, false); - final int amountInTank = (drainedLiquid == null) ? 0 : drainedLiquid.amount; + + int maximumExtractedLiquid = item.stackSize * fluid.amount; + FluidStack drainedLiquid = tank.drain(maximumExtractedLiquid, false); + int amountInTank = (drainedLiquid == null) ? 0 : drainedLiquid.amount; int numberOfContainersToFill = amountInTank / fluid.amount; if (numberOfContainersToFill > item.stackSize) { numberOfContainersToFill = item.stackSize; } - final ItemStack copy; + + ItemStack copy; ItemStack leftOverContainers = copy = item.copy(); copy.stackSize -= numberOfContainersToFill; if (leftOverContainers.stackSize <= 0) { leftOverContainers = null; } + ItemStack filledContainers = filled.copy(); filledContainers.stackSize = 0; - final ItemStack itemStack = filledContainers; + ItemStack itemStack = filledContainers; itemStack.stackSize += numberOfContainersToFill; if (filledContainers.stackSize <= 0) { filledContainers = null; } - final TransferRequest containersDump = new TransferRequest(filledContainers, origin); - final ItemStack containersThatCantBeDumped = containersDump.transfer(false); + + TransferRequest containersDump = new TransferRequest(filledContainers, origin); + ItemStack containersThatCantBeDumped = containersDump.transfer(false); if (containersThatCantBeDumped != null) { return item; } + if (doAdd) { tank.drain(maximumExtractedLiquid, true); containersDump.transfer(true); @@ -342,39 +368,38 @@ public class TransferRequest } public List getInsertedSlots() { - return this.insertedSlots; + return insertedSlots; } public List getInsertedTanks() { - return this.insertedTanks; + return insertedTanks; } public IInventory getOrigin() { - return this.origin; + return origin; } public IInventory getDestination() { - return this.destination; + return destination; } public ItemStack getItemToTransfer() { - return this.itemToTransfer; + return itemToTransfer; } public int[] getTargetSlots() { - return this.targetSlots; + return targetSlots; } public int[] getTargetTanks() { - return this.targetTanks; + return targetTanks; } - public static class TransferSlot - { + public static class TransferSlot { public int id; public IInventory inventory; - public TransferSlot(final int id, final IInventory inventory) { + public TransferSlot(int id, IInventory inventory) { this.id = id; this.inventory = inventory; } diff --git a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java b/src/main/java/binnie/core/mod/config/BinnieConfiguration.java index b5213c49..872fd2b1 100644 --- a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java +++ b/src/main/java/binnie/core/mod/config/BinnieConfiguration.java @@ -1,20 +1,16 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; -import java.io.File; -import binnie.core.BinnieCore; import binnie.core.AbstractMod; +import binnie.core.BinnieCore; import net.minecraftforge.common.config.Configuration; -class BinnieConfiguration extends Configuration -{ +import java.io.File; + +class BinnieConfiguration extends Configuration { public AbstractMod mod; private String filename; - public BinnieConfiguration(final String filename, final AbstractMod mod) { + public BinnieConfiguration(String filename, AbstractMod mod) { super(new File(BinnieCore.proxy.getDirectory(), filename)); this.mod = mod; this.filename = filename; diff --git a/src/main/java/binnie/core/mod/config/BinnieItemData.java b/src/main/java/binnie/core/mod/config/BinnieItemData.java index fd6a6cb9..e8adca2f 100644 --- a/src/main/java/binnie/core/mod/config/BinnieItemData.java +++ b/src/main/java/binnie/core/mod/config/BinnieItemData.java @@ -1,16 +1,12 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; -class BinnieItemData -{ +// TODO Why do we need this class? +class BinnieItemData { private int item; private BinnieConfiguration configFile; private String configKey; - public BinnieItemData(final int item, final BinnieConfiguration configFile, final String configKey) { + public BinnieItemData(int item, BinnieConfiguration configFile, String configKey) { this.item = item; this.configFile = configFile; this.configKey = configKey; diff --git a/src/main/java/binnie/core/mod/config/ConfigFile.java b/src/main/java/binnie/core/mod/config/ConfigFile.java index b4c83554..2bcb591a 100644 --- a/src/main/java/binnie/core/mod/config/ConfigFile.java +++ b/src/main/java/binnie/core/mod/config/ConfigFile.java @@ -1,11 +1,7 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; -import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) public @interface ConfigFile { diff --git a/src/main/java/binnie/core/mod/config/ConfigProperty.java b/src/main/java/binnie/core/mod/config/ConfigProperty.java index 8e03f407..a17e07fd 100644 --- a/src/main/java/binnie/core/mod/config/ConfigProperty.java +++ b/src/main/java/binnie/core/mod/config/ConfigProperty.java @@ -1,16 +1,12 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; import java.lang.annotation.ElementType; -import java.lang.annotation.Target; -import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD }) +@Target({ElementType.FIELD}) public @interface ConfigProperty { String key(); @@ -19,8 +15,8 @@ public @interface ConfigProperty { String[] comment() default {}; @Retention(RetentionPolicy.RUNTIME) - @Target({ ElementType.ANNOTATION_TYPE }) - public @interface Type { + @Target({ElementType.ANNOTATION_TYPE}) + @interface Type { Class propertyClass(); String category() default "general"; diff --git a/src/main/java/binnie/core/mod/config/ConfigurationMain.java b/src/main/java/binnie/core/mod/config/ConfigurationMain.java index a1043a81..5c81e9ab 100644 --- a/src/main/java/binnie/core/mod/config/ConfigurationMain.java +++ b/src/main/java/binnie/core/mod/config/ConfigurationMain.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; @ConfigFile(filename = "/config/forestry/binniecore/main.conf") diff --git a/src/main/java/binnie/core/mod/config/ConfigurationMods.java b/src/main/java/binnie/core/mod/config/ConfigurationMods.java index b3fe6687..987bb087 100644 --- a/src/main/java/binnie/core/mod/config/ConfigurationMods.java +++ b/src/main/java/binnie/core/mod/config/ConfigurationMods.java @@ -1,29 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; @ConfigFile(filename = "/config/forestry/binnie-mods.conf") -public class ConfigurationMods -{ - @ConfigProperty(key = "extraBees", comment = { "Enables the Extra Bees Mod." }) +public class ConfigurationMods { + @ConfigProperty(key = "extraBees", comment = {"Enables the Extra Bees Mod."}) @PropBoolean - public static boolean extraBees; - @ConfigProperty(key = "extraTrees", comment = { "Enables the Extra Trees Mod." }) - @PropBoolean - public static boolean extraTrees; - @ConfigProperty(key = "botany", comment = { "Enables the Botany Mod." }) - @PropBoolean - public static boolean botany; - @ConfigProperty(key = "genetics", comment = { "Enables the Genetics Mod." }) - @PropBoolean - public static boolean genetics; + public static boolean extraBees = true; - static { - ConfigurationMods.extraBees = true; - ConfigurationMods.extraTrees = true; - ConfigurationMods.botany = true; - ConfigurationMods.genetics = true; - } + @ConfigProperty(key = "extraTrees", comment = {"Enables the Extra Trees Mod."}) + @PropBoolean + public static boolean extraTrees = true; + + @ConfigProperty(key = "botany", comment = {"Enables the Botany Mod."}) + @PropBoolean + public static boolean botany = true; + + @ConfigProperty(key = "genetics", comment = {"Enables the Genetics Mod."}) + @PropBoolean + public static boolean genetics = true; } diff --git a/src/main/java/binnie/core/mod/config/ManagerConfig.java b/src/main/java/binnie/core/mod/config/ManagerConfig.java index 4ba20816..a7785037 100644 --- a/src/main/java/binnie/core/mod/config/ManagerConfig.java +++ b/src/main/java/binnie/core/mod/config/ManagerConfig.java @@ -1,63 +1,60 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; -import java.util.ArrayList; -import java.lang.reflect.Field; +import binnie.core.AbstractMod; +import binnie.core.ManagerBase; +import net.minecraftforge.common.config.Configuration; + import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; -import binnie.core.AbstractMod; -import net.minecraftforge.common.config.Configuration; import java.util.Map; -import binnie.core.ManagerBase; -public class ManagerConfig extends ManagerBase -{ +public class ManagerConfig extends ManagerBase { private Map, Configuration> configurations; private Map> itemIDs; public ManagerConfig() { - this.configurations = new LinkedHashMap, Configuration>(); - this.itemIDs = new HashMap>(); + configurations = new LinkedHashMap<>(); + itemIDs = new HashMap<>(); } - public void registerConfiguration(final Class cls, final AbstractMod mod) { + public void registerConfiguration(Class cls, AbstractMod mod) { if (cls.isAnnotationPresent(ConfigFile.class)) { - this.loadConfiguration(cls, mod); + loadConfiguration(cls, mod); } } - public void loadConfiguration(final Class cls, final AbstractMod mod) { + public void loadConfiguration(Class cls, AbstractMod mod) { try { - final String filename = cls.getAnnotation(ConfigFile.class).filename(); - final BinnieConfiguration config = new BinnieConfiguration(filename, mod); + String filename = cls.getAnnotation(ConfigFile.class).filename(); + BinnieConfiguration config = new BinnieConfiguration(filename, mod); config.load(); - for (final Field field : cls.getFields()) { + for (Field field : cls.getFields()) { if (field.isAnnotationPresent(ConfigProperty.class)) { - final ConfigProperty propertyAnnot = field.getAnnotation(ConfigProperty.class); - for (final Annotation annotation : field.getAnnotations()) { + ConfigProperty propertyAnnot = field.getAnnotation(ConfigProperty.class); + for (Annotation annotation : field.getAnnotations()) { if (annotation.annotationType().isAnnotationPresent(ConfigProperty.Type.class)) { - final Class propertyClass = annotation.annotationType().getAnnotation(ConfigProperty.Type.class).propertyClass(); - final PropertyBase property = (PropertyBase) propertyClass.getConstructor(Field.class, BinnieConfiguration.class, ConfigProperty.class, annotation.annotationType()).newInstance(field, config, propertyAnnot, annotation.annotationType().cast(annotation)); + Class propertyClass = annotation.annotationType().getAnnotation(ConfigProperty.Type.class).propertyClass(); + // TODO what for? + PropertyBase property = (PropertyBase) propertyClass.getConstructor(Field.class, BinnieConfiguration.class, ConfigProperty.class, annotation.annotationType()).newInstance(field, config, propertyAnnot, annotation.annotationType().cast(annotation)); } } } } config.save(); - this.configurations.put(cls, config); + configurations.put(cls, config); } catch (Exception e) { e.printStackTrace(); } } - public void addItemID(final Integer configValue, final String configKey, final BinnieConfiguration configFile) { - if (!this.itemIDs.containsKey(configFile.mod)) { - this.itemIDs.put(configFile.mod, new ArrayList()); + public void addItemID(Integer configValue, String configKey, BinnieConfiguration configFile) { + if (!itemIDs.containsKey(configFile.mod)) { + itemIDs.put(configFile.mod, new ArrayList<>()); } - this.itemIDs.get(configFile.mod).add(new BinnieItemData(configValue + 256, configFile, configKey)); + itemIDs.get(configFile.mod).add(new BinnieItemData(configValue + 256, configFile, configKey)); } } diff --git a/src/main/java/binnie/core/mod/config/PropBoolean.java b/src/main/java/binnie/core/mod/config/PropBoolean.java index c1094636..2aec2ab8 100644 --- a/src/main/java/binnie/core/mod/config/PropBoolean.java +++ b/src/main/java/binnie/core/mod/config/PropBoolean.java @@ -1,36 +1,32 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; import net.minecraftforge.common.config.Property; -import java.lang.reflect.Field; -import java.lang.annotation.RetentionPolicy; + import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.reflect.Field; @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropBoolean.PropertyBoolean.class) public @interface PropBoolean { - public static class PropertyBoolean extends PropertyBase - { - public PropertyBoolean(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final PropBoolean annotedProperty) throws IllegalArgumentException, IllegalAccessException { + class PropertyBoolean extends PropertyBase { + public PropertyBoolean(Field field, BinnieConfiguration file, ConfigProperty configProperty, PropBoolean annotedProperty) throws IllegalArgumentException, IllegalAccessException { super(field, file, configProperty, annotedProperty); } @Override protected Property getProperty() { - return this.file.get(this.getCategory(), this.getKey(), this.defaultValue); + return file.get(getCategory(), getKey(), defaultValue); } @Override protected Boolean getConfigValue() { - return this.property.getBoolean(this.defaultValue); + return property.getBoolean(defaultValue); } @Override protected void addComments() { - this.addComment("Default value is " + this.defaultValue + "."); + addComment("Default value is " + defaultValue + "."); } } } diff --git a/src/main/java/binnie/core/mod/config/PropDouble.java b/src/main/java/binnie/core/mod/config/PropDouble.java index 1ea970c1..d4c90f59 100644 --- a/src/main/java/binnie/core/mod/config/PropDouble.java +++ b/src/main/java/binnie/core/mod/config/PropDouble.java @@ -1,36 +1,32 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; import net.minecraftforge.common.config.Property; -import java.lang.reflect.Field; -import java.lang.annotation.RetentionPolicy; + import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.reflect.Field; @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropDouble.PropertyDouble.class) public @interface PropDouble { - public static class PropertyDouble extends PropertyBase - { - public PropertyDouble(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final PropDouble annotedProperty) throws IllegalArgumentException, IllegalAccessException { + class PropertyDouble extends PropertyBase { + public PropertyDouble(Field field, BinnieConfiguration file, ConfigProperty configProperty, PropDouble annotedProperty) throws IllegalArgumentException, IllegalAccessException { super(field, file, configProperty, annotedProperty); } @Override protected Property getProperty() { - return this.file.get(this.getCategory(), this.getKey(), this.defaultValue); + return file.get(getCategory(), getKey(), defaultValue); } @Override protected Double getConfigValue() { - return this.property.getDouble(this.defaultValue); + return property.getDouble(defaultValue); } @Override protected void addComments() { - this.addComment("Default value is " + this.defaultValue + "."); + addComment("Default value is " + defaultValue + "."); } } } diff --git a/src/main/java/binnie/core/mod/config/PropInteger.java b/src/main/java/binnie/core/mod/config/PropInteger.java index fe88423a..88432a2e 100644 --- a/src/main/java/binnie/core/mod/config/PropInteger.java +++ b/src/main/java/binnie/core/mod/config/PropInteger.java @@ -1,36 +1,32 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; import net.minecraftforge.common.config.Property; -import java.lang.reflect.Field; -import java.lang.annotation.RetentionPolicy; + import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.reflect.Field; @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropInteger.PropertyInteger.class) public @interface PropInteger { - public static class PropertyInteger extends PropertyBase - { - public PropertyInteger(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final PropInteger annotedProperty) throws IllegalArgumentException, IllegalAccessException { + class PropertyInteger extends PropertyBase { + public PropertyInteger(Field field, BinnieConfiguration file, ConfigProperty configProperty, PropInteger annotedProperty) throws IllegalArgumentException, IllegalAccessException { super(field, file, configProperty, annotedProperty); } @Override protected Property getProperty() { - return this.file.get(this.getCategory(), this.getKey(), this.defaultValue); + return file.get(getCategory(), getKey(), defaultValue); } @Override protected Integer getConfigValue() { - return this.property.getInt(this.defaultValue); + return property.getInt(defaultValue); } @Override protected void addComments() { - this.addComment("Default value is " + this.defaultValue + "."); + addComment("Default value is " + defaultValue + "."); } } } diff --git a/src/main/java/binnie/core/mod/config/PropPercentage.java b/src/main/java/binnie/core/mod/config/PropPercentage.java index 714de10e..06c82027 100644 --- a/src/main/java/binnie/core/mod/config/PropPercentage.java +++ b/src/main/java/binnie/core/mod/config/PropPercentage.java @@ -1,13 +1,10 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; import net.minecraftforge.common.config.Property; -import java.lang.reflect.Field; -import java.lang.annotation.RetentionPolicy; + import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.reflect.Field; @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropPercentage.PropertyPercentage.class) @@ -16,26 +13,25 @@ public @interface PropPercentage { int lower() default 0; - public static class PropertyPercentage extends PropertyBase - { - public PropertyPercentage(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final PropPercentage annotedProperty) throws IllegalArgumentException, IllegalAccessException { + class PropertyPercentage extends PropertyBase { + public PropertyPercentage(Field field, BinnieConfiguration file, ConfigProperty configProperty, PropPercentage annotedProperty) throws IllegalArgumentException, IllegalAccessException { super(field, file, configProperty, annotedProperty); } @Override protected Integer getConfigValue() { - return this.property.getInt(this.defaultValue); + return property.getInt(defaultValue); } @Override protected void addComments() { - this.addComment("Default value is " + this.defaultValue + "%."); - this.addComment("Range is " + this.annotatedProperty.lower() + "-" + this.annotatedProperty.upper() + "%."); + addComment("Default value is " + defaultValue + "%."); + addComment("Range is " + annotatedProperty.lower() + "-" + annotatedProperty.upper() + "%."); } @Override protected Property getProperty() { - return this.file.get(this.getCategory(), this.getKey(), this.defaultValue); + return file.get(getCategory(), getKey(), defaultValue); } } } diff --git a/src/main/java/binnie/core/mod/config/PropertyBase.java b/src/main/java/binnie/core/mod/config/PropertyBase.java index 5e2b0015..c02a3f09 100644 --- a/src/main/java/binnie/core/mod/config/PropertyBase.java +++ b/src/main/java/binnie/core/mod/config/PropertyBase.java @@ -1,40 +1,38 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.config; -import java.util.ArrayList; -import java.lang.reflect.Field; -import java.util.List; -import net.minecraftforge.common.config.Property; import net.minecraftforge.common.config.Configuration; -import java.lang.annotation.Annotation; +import net.minecraftforge.common.config.Property; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +abstract class PropertyBase { + protected Configuration file; + protected Property property; + protected ValueType defaultValue; + protected AnnotationType annotatedProperty; -abstract class PropertyBase -{ - Configuration file; - Property property; - ValueType defaultValue; private ConfigProperty configProperty; - AnnotationType annotatedProperty; private List comments; private Field field; - protected PropertyBase(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final AnnotationType annotedProperty) throws IllegalArgumentException, IllegalAccessException { - this.comments = new ArrayList(); + protected PropertyBase(Field field, BinnieConfiguration file, ConfigProperty configProperty, AnnotationType annotedProperty) throws IllegalArgumentException, IllegalAccessException { + comments = new ArrayList<>(); this.field = field; this.file = file; this.configProperty = configProperty; this.annotatedProperty = annotedProperty; - this.defaultValue = this.getDefaultValue(field); - this.property = this.getProperty(); - for (final String comment : configProperty.comment()) { - this.addComment(comment); + defaultValue = getDefaultValue(field); + property = getProperty(); + + for (String comment : configProperty.comment()) { + addComment(comment); } - this.addComments(); - this.property.comment = this.getComment(); - field.set(null, this.getConfigValue()); + addComments(); + property.comment = getComment(); + field.set(null, getConfigValue()); } protected abstract Property getProperty(); @@ -44,24 +42,26 @@ abstract class PropertyBase protected abstract void addComments(); protected String getCategory() { - return this.configProperty.category().equals("") ? this.annotatedProperty.annotationType().getAnnotation(ConfigProperty.Type.class).category() : this.configProperty.category(); + return configProperty.category().equals("") ? + annotatedProperty.annotationType().getAnnotation(ConfigProperty.Type.class).category() : + configProperty.category(); } protected String getKey() { - return this.configProperty.key(); + return configProperty.key(); } - protected ValueType getDefaultValue(final Field field) throws IllegalArgumentException, IllegalAccessException { + protected ValueType getDefaultValue(Field field) throws IllegalArgumentException, IllegalAccessException { return (ValueType) field.get(null); } - protected void addComment(final String comment) { - this.comments.add(comment); + protected void addComment(String comment) { + comments.add(comment); } protected String getComment() { String comment = ""; - for (final String com : this.comments) { + for (String com : comments) { comment = comment + com + " "; } return comment; diff --git a/src/main/java/binnie/core/mod/parser/FieldParser.java b/src/main/java/binnie/core/mod/parser/FieldParser.java index 540bc636..59b5d887 100644 --- a/src/main/java/binnie/core/mod/parser/FieldParser.java +++ b/src/main/java/binnie/core/mod/parser/FieldParser.java @@ -1,54 +1,49 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.parser; -import java.util.ArrayList; import binnie.core.AbstractMod; + import java.lang.reflect.Field; +import java.util.ArrayList; import java.util.Collection; -public abstract class FieldParser -{ - public static Collection parsers; +public abstract class FieldParser { + public static Collection parsers = new ArrayList<>(); - public abstract boolean isHandled(final Field p0, final AbstractMod p1); + public abstract boolean isHandled(Field field, AbstractMod mod); - public void preInit(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { + public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { + // ignored } - public void init(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { + public void init(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { + // ignored } - public void postInit(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { + public void postInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { + // ignored } - public static void preInitParse(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - for (final FieldParser parser : FieldParser.parsers) { + public static void preInitParse(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { + for (FieldParser parser : FieldParser.parsers) { if (parser.isHandled(field, mod)) { parser.preInit(field, mod); } } } - public static void initParse(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - for (final FieldParser parser : FieldParser.parsers) { + public static void initParse(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { + for (FieldParser parser : FieldParser.parsers) { if (parser.isHandled(field, mod)) { parser.init(field, mod); } } } - public static void postInitParse(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - for (final FieldParser parser : FieldParser.parsers) { + public static void postInitParse(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { + for (FieldParser parser : FieldParser.parsers) { if (parser.isHandled(field, mod)) { parser.postInit(field, mod); } } } - - static { - FieldParser.parsers = new ArrayList(); - } } diff --git a/src/main/java/binnie/core/mod/parser/ItemParser.java b/src/main/java/binnie/core/mod/parser/ItemParser.java index da1ecebd..5186220e 100644 --- a/src/main/java/binnie/core/mod/parser/ItemParser.java +++ b/src/main/java/binnie/core/mod/parser/ItemParser.java @@ -1,24 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.mod.parser; +import binnie.core.AbstractMod; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; -import binnie.core.AbstractMod; + import java.lang.reflect.Field; -public class ItemParser extends FieldParser -{ +public class ItemParser extends FieldParser { @Override - public boolean isHandled(final Field field, final AbstractMod mod) { + public boolean isHandled(Field field, AbstractMod mod) { return Item.class.isAssignableFrom(field.getType()); } @Override - public void preInit(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - final Item item = (Item) field.get(null); + public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { + Item item = (Item) field.get(null); if (item != null) { GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5)); } diff --git a/src/main/java/binnie/core/multiblock/BlockMultiblockMachine.java b/src/main/java/binnie/core/multiblock/BlockMultiblockMachine.java index d76dd876..16a66d2c 100644 --- a/src/main/java/binnie/core/multiblock/BlockMultiblockMachine.java +++ b/src/main/java/binnie/core/multiblock/BlockMultiblockMachine.java @@ -1,29 +1,25 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.multiblock; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockContainer; -public class BlockMultiblockMachine extends BlockContainer -{ - public BlockMultiblockMachine(final String blockName) { +// TODO unused class? +public class BlockMultiblockMachine extends BlockContainer { + public BlockMultiblockMachine(String blockName) { super(Material.iron); this.setHardness(1.5f); - this.setBlockName(blockName); + setBlockName(blockName); } @Override - public TileEntity createTileEntity(final World world, final int metadata) { + public TileEntity createTileEntity(World world, int metadata) { return new TileEntityMultiblockMachine(); } @Override - public TileEntity createNewTileEntity(final World var1, final int i) { + public TileEntity createNewTileEntity(World world, int metadata) { return new TileEntityMultiblockMachine(); } } diff --git a/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java b/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java index 3e1afbf5..8a461ca4 100644 --- a/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java +++ b/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java @@ -1,15 +1,10 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.multiblock; -import binnie.core.machines.TileEntityMachine; import binnie.core.machines.Machine; +import binnie.core.machines.TileEntityMachine; import net.minecraft.tileentity.TileEntity; -class TileEntityMultiblockMachine extends TileEntity -{ +class TileEntityMultiblockMachine extends TileEntity { private boolean inStructure; private int tileX; private int tileY; @@ -27,7 +22,8 @@ class TileEntityMultiblockMachine extends TileEntity if (!this.inStructure) { return null; } - final TileEntity tile = this.worldObj.getTileEntity(this.xCoord + this.tileX, this.yCoord + this.tileY, this.zCoord + this.tileZ); + + TileEntity tile = this.worldObj.getTileEntity(xCoord + tileX, yCoord + tileY, zCoord + tileZ); if (tile instanceof TileEntityMachine) { return ((TileEntityMachine) tile).getMachine(); } diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index 2f96bc98..37092e4c 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -1,68 +1,59 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network; -import binnie.core.machines.IMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import binnie.core.machines.network.INetwork; -import binnie.core.machines.Machine; -import binnie.core.network.packet.MessageTileNBT; -import net.minecraft.network.NetHandlerPlayServer; -import binnie.craftgui.minecraft.ContainerCraftGUI; -import binnie.core.network.packet.MessageCraftGUI; -import cpw.mods.fml.relauncher.Side; -import binnie.core.block.TileEntityMetadata; -import binnie.core.network.packet.MessageMetadata; import binnie.core.BinnieCore; -import binnie.core.network.packet.MessageUpdate; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import binnie.core.block.TileEntityMetadata; +import binnie.core.machines.IMachine; +import binnie.core.machines.Machine; +import binnie.core.machines.network.INetwork; import binnie.core.network.packet.MessageBinnie; +import binnie.core.network.packet.MessageCraftGUI; +import binnie.core.network.packet.MessageMetadata; +import binnie.core.network.packet.MessageTileNBT; +import binnie.core.network.packet.MessageUpdate; +import binnie.craftgui.minecraft.ContainerCraftGUI; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.tileentity.TileEntity; -public enum BinnieCorePacketID implements IPacketID -{ +public enum BinnieCorePacketID implements IPacketID { NetworkEntityUpdate, TileMetadata, CraftGUIAction, TileDescriptionSync; @Override - public void onMessage(final MessageBinnie message, final MessageContext context) { + public void onMessage(MessageBinnie message, MessageContext context) { if (this == BinnieCorePacketID.NetworkEntityUpdate) { - final MessageUpdate packet = new MessageUpdate(message); - final TileEntity tile = packet.getTileEntity(BinnieCore.proxy.getWorld()); + MessageUpdate packet = new MessageUpdate(message); + TileEntity tile = packet.getTileEntity(BinnieCore.proxy.getWorld()); if (tile instanceof INetworkedEntity) { ((INetworkedEntity) tile).readFromPacket(packet.payload); } - } - else if (this == BinnieCorePacketID.TileMetadata) { - final MessageMetadata packet2 = new MessageMetadata(message); - final TileEntity tile = packet2.getTileEntity(BinnieCore.proxy.getWorld()); + } else if (this == BinnieCorePacketID.TileMetadata) { + MessageMetadata packet2 = new MessageMetadata(message); + TileEntity tile = packet2.getTileEntity(BinnieCore.proxy.getWorld()); if (tile instanceof TileEntityMetadata) { ((TileEntityMetadata) tile).setTileMetadata(packet2.meta, true); } - } - else if (this == BinnieCorePacketID.CraftGUIAction && context.side == Side.CLIENT) { - final MessageCraftGUI packet3 = new MessageCraftGUI(message); - final EntityPlayer player = BinnieCore.proxy.getPlayer(); + } else if (this == BinnieCorePacketID.CraftGUIAction && context.side == Side.CLIENT) { + MessageCraftGUI packet3 = new MessageCraftGUI(message); + EntityPlayer player = BinnieCore.proxy.getPlayer(); if (player.openContainer instanceof ContainerCraftGUI && packet3.getTagCompound() != null) { ((ContainerCraftGUI) player.openContainer).recieveNBT(Side.CLIENT, player, packet3.getTagCompound()); } - } - else if (this == BinnieCorePacketID.CraftGUIAction && context.side == Side.SERVER && context.netHandler instanceof NetHandlerPlayServer) { - final MessageCraftGUI packet3 = new MessageCraftGUI(message); - final EntityPlayer player = ((NetHandlerPlayServer) context.netHandler).playerEntity; + } else if (this == BinnieCorePacketID.CraftGUIAction && context.side == Side.SERVER && context.netHandler instanceof NetHandlerPlayServer) { + MessageCraftGUI packet3 = new MessageCraftGUI(message); + EntityPlayer player = ((NetHandlerPlayServer) context.netHandler).playerEntity; if (player.openContainer instanceof ContainerCraftGUI && packet3.getTagCompound() != null) { ((ContainerCraftGUI) player.openContainer).recieveNBT(Side.SERVER, player, packet3.getTagCompound()); } - } - else if (this == BinnieCorePacketID.TileDescriptionSync && context.side == Side.CLIENT) { - final MessageTileNBT packet4 = new MessageTileNBT(message); - final TileEntity tile = packet4.getTarget(BinnieCore.proxy.getWorld()); + } else if (this == BinnieCorePacketID.TileDescriptionSync && context.side == Side.CLIENT) { + MessageTileNBT packet4 = new MessageTileNBT(message); + TileEntity tile = packet4.getTarget(BinnieCore.proxy.getWorld()); if (tile != null && packet4.getTagCompound() != null) { - final IMachine machine = Machine.getMachine(tile); + IMachine machine = Machine.getMachine(tile); if (machine != null && machine instanceof INetwork.TilePacketSync) { ((INetwork.TilePacketSync) machine).syncFromNBT(packet4.getTagCompound()); } diff --git a/src/main/java/binnie/core/network/BinniePacketHandler.java b/src/main/java/binnie/core/network/BinniePacketHandler.java index 3714b9c1..a6daf020 100644 --- a/src/main/java/binnie/core/network/BinniePacketHandler.java +++ b/src/main/java/binnie/core/network/BinniePacketHandler.java @@ -1,32 +1,27 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; import binnie.core.AbstractMod; -import cpw.mods.fml.common.network.simpleimpl.IMessage; import binnie.core.network.packet.MessageBinnie; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; -public abstract class BinniePacketHandler implements IMessageHandler -{ +public abstract class BinniePacketHandler implements IMessageHandler { private IPacketProvider provider; - public BinniePacketHandler(final AbstractMod mod) { - this.setProvider(mod); + public BinniePacketHandler(AbstractMod mod) { + setProvider(mod); } - public void setProvider(final IPacketProvider provider) { + public void setProvider(IPacketProvider provider) { this.provider = provider; } @Override - public IMessage onMessage(final MessageBinnie message, final MessageContext ctx) { + public IMessage onMessage(MessageBinnie message, MessageContext ctx) { try { - final int packetId = message.id; - for (final IPacketID id : this.provider.getPacketIDs()) { + int packetId = message.id; + for (IPacketID id : provider.getPacketIDs()) { if (id.ordinal() == packetId) { id.onMessage(message, ctx); return null; diff --git a/src/main/java/binnie/core/network/INetworkedEntity.java b/src/main/java/binnie/core/network/INetworkedEntity.java index dfb1aacd..7c79d3f9 100644 --- a/src/main/java/binnie/core/network/INetworkedEntity.java +++ b/src/main/java/binnie/core/network/INetworkedEntity.java @@ -1,14 +1,9 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network; import binnie.core.network.packet.PacketPayload; -public interface INetworkedEntity -{ - void writeToPacket(final PacketPayload p0); +public interface INetworkedEntity { + void writeToPacket(PacketPayload payload); - void readFromPacket(final PacketPayload p0); + void readFromPacket(PacketPayload payload); } diff --git a/src/main/java/binnie/core/network/IOrdinaled.java b/src/main/java/binnie/core/network/IOrdinaled.java index 86c994e8..81a4ed34 100644 --- a/src/main/java/binnie/core/network/IOrdinaled.java +++ b/src/main/java/binnie/core/network/IOrdinaled.java @@ -1,10 +1,5 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network; -public interface IOrdinaled -{ +public interface IOrdinaled { int ordinal(); } diff --git a/src/main/java/binnie/core/network/IPacketID.java b/src/main/java/binnie/core/network/IPacketID.java index 88b004cb..4f3487ec 100644 --- a/src/main/java/binnie/core/network/IPacketID.java +++ b/src/main/java/binnie/core/network/IPacketID.java @@ -1,13 +1,8 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; import binnie.core.network.packet.MessageBinnie; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; -public interface IPacketID extends IOrdinaled -{ - void onMessage(final MessageBinnie p0, final MessageContext p1); +public interface IPacketID extends IOrdinaled { + void onMessage(MessageBinnie message, MessageContext context); } diff --git a/src/main/java/binnie/core/network/IPacketProvider.java b/src/main/java/binnie/core/network/IPacketProvider.java index 25ce565a..67594e32 100644 --- a/src/main/java/binnie/core/network/IPacketProvider.java +++ b/src/main/java/binnie/core/network/IPacketProvider.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network; -public interface IPacketProvider -{ +public interface IPacketProvider { String getChannel(); IPacketID[] getPacketIDs(); diff --git a/src/main/java/binnie/core/network/packet/IPacket.java b/src/main/java/binnie/core/network/packet/IPacket.java index 87b07b54..ed31a199 100644 --- a/src/main/java/binnie/core/network/packet/IPacket.java +++ b/src/main/java/binnie/core/network/packet/IPacket.java @@ -1,12 +1,8 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; import net.minecraft.network.Packet; -public interface IPacket -{ +// TODO unused interface? +public interface IPacket { Packet getPacket(); } diff --git a/src/main/java/binnie/core/network/packet/IPacketLocation.java b/src/main/java/binnie/core/network/packet/IPacketLocation.java index cbf74dc3..74994f3b 100644 --- a/src/main/java/binnie/core/network/packet/IPacketLocation.java +++ b/src/main/java/binnie/core/network/packet/IPacketLocation.java @@ -1,15 +1,10 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -interface IPacketLocation -{ - TileEntity getTarget(final World p0); +interface IPacketLocation { + TileEntity getTarget(World world); int getX(); diff --git a/src/main/java/binnie/core/network/packet/IndexInPayload.java b/src/main/java/binnie/core/network/packet/IndexInPayload.java index dd53b47d..ce99fa7b 100644 --- a/src/main/java/binnie/core/network/packet/IndexInPayload.java +++ b/src/main/java/binnie/core/network/packet/IndexInPayload.java @@ -1,19 +1,12 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; -public class IndexInPayload -{ +// TODO unused class? +public class IndexInPayload { public int intIndex; public int floatIndex; public int stringIndex; - public IndexInPayload(final int intIndex, final int floatIndex, final int stringIndex) { - this.intIndex = 0; - this.floatIndex = 0; - this.stringIndex = 0; + public IndexInPayload(int intIndex, int floatIndex, int stringIndex) { this.intIndex = intIndex; this.floatIndex = floatIndex; this.stringIndex = stringIndex; diff --git a/src/main/java/binnie/core/network/packet/MachinePayload.java b/src/main/java/binnie/core/network/packet/MachinePayload.java index 72d55d59..b2d64b62 100644 --- a/src/main/java/binnie/core/network/packet/MachinePayload.java +++ b/src/main/java/binnie/core/network/packet/MachinePayload.java @@ -1,79 +1,72 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; import java.util.ArrayList; import java.util.List; -public class MachinePayload -{ +public class MachinePayload { private List intPayload; private List floatPayload; private List stringPayload; private int id; - public MachinePayload(final int id) { - this.intPayload = new ArrayList(); - this.floatPayload = new ArrayList(); - this.stringPayload = new ArrayList(); - this.id = 0; + public MachinePayload(int id) { + intPayload = new ArrayList<>(); + floatPayload = new ArrayList<>(); + stringPayload = new ArrayList<>(); this.id = id; - this.intPayload.clear(); - this.floatPayload.clear(); - this.stringPayload.clear(); } public MachinePayload() { - this.intPayload = new ArrayList(); - this.floatPayload = new ArrayList(); - this.stringPayload = new ArrayList(); + this.intPayload = new ArrayList<>(); + this.floatPayload = new ArrayList<>(); + this.stringPayload = new ArrayList<>(); this.id = 0; } - public void addInteger(final int a) { - this.intPayload.add(a); + public void addInteger(int a) { + intPayload.add(a); } - public void addFloat(final float a) { - this.floatPayload.add(a); + public void addFloat(float a) { + floatPayload.add(a); } - public void addString(final String a) { - this.stringPayload.add(a); + public void addString(String a) { + stringPayload.add(a); } public int getInteger() { - return this.intPayload.remove(0); + return intPayload.remove(0); } public float getFloat() { - return this.floatPayload.remove(0); + return floatPayload.remove(0); } public String getString() { - return this.stringPayload.remove(0); + return stringPayload.remove(0); } - public void append(final MachinePayload other) { + public void append(MachinePayload other) { if (other == null) { return; } - this.intPayload.addAll(other.intPayload); - this.floatPayload.addAll(other.floatPayload); - this.stringPayload.addAll(other.stringPayload); + intPayload.addAll(other.intPayload); + floatPayload.addAll(other.floatPayload); + stringPayload.addAll(other.stringPayload); } public boolean isEmpty() { - return this.intPayload.isEmpty() && this.floatPayload.isEmpty() && this.stringPayload.isEmpty(); + return intPayload.isEmpty() + && floatPayload.isEmpty() + && stringPayload.isEmpty(); } public int getID() { return this.id; } - public void setID(final int readInt) { + public void setID(int readInt) { this.id = readInt; } } diff --git a/src/main/java/binnie/core/network/packet/MessageBase.java b/src/main/java/binnie/core/network/packet/MessageBase.java index 1d83fe54..9466e85d 100644 --- a/src/main/java/binnie/core/network/packet/MessageBase.java +++ b/src/main/java/binnie/core/network/packet/MessageBase.java @@ -1,25 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; -import java.io.InputStream; -import net.minecraft.nbt.CompressedStreamTools; -import java.io.ByteArrayInputStream; -import net.minecraft.nbt.NBTTagCompound; import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; + +import java.io.ByteArrayInputStream; import java.io.IOException; -public class MessageBase -{ +public class MessageBase { private int id; - public MessageBase(final int id) { + public MessageBase(int id) { this.id = id; } - public MessageBase(final MessageBinnie message) { + public MessageBase(MessageBinnie message) { try { this.readData(message.data); } catch (IOException e) { @@ -27,34 +22,36 @@ public class MessageBase } } - public MessageBinnie GetMessage() { - return new MessageBinnie(this.id, this); + public MessageBinnie getMessage() { + return new MessageBinnie(id, this); } - protected NBTTagCompound readNBTTagCompound(final ByteBuf data) throws IOException { - final short length = data.readShort(); + protected NBTTagCompound readNBTTagCompound(ByteBuf data) throws IOException { + short length = data.readShort(); if (length < 0) { return null; } - final byte[] compressed = new byte[length]; + + byte[] compressed = new byte[length]; data.readBytes(compressed); return CompressedStreamTools.readCompressed(new ByteArrayInputStream(compressed)); } - protected void writeNBTTagCompound(final NBTTagCompound nbttagcompound, final ByteBuf data) throws IOException { + protected void writeNBTTagCompound(NBTTagCompound nbttagcompound, ByteBuf data) throws IOException { if (nbttagcompound == null) { data.writeShort(-1); - } - else { - final byte[] compressed = CompressedStreamTools.compress(nbttagcompound); + } else { + byte[] compressed = CompressedStreamTools.compress(nbttagcompound); data.writeShort((short) compressed.length); data.writeBytes(compressed); } } - public void writeData(final ByteBuf data) throws IOException { + public void writeData(ByteBuf data) throws IOException { + // ignored } - public void readData(final ByteBuf data) throws IOException { + public void readData(ByteBuf data) throws IOException { + // ignored } } diff --git a/src/main/java/binnie/core/network/packet/MessageBinnie.java b/src/main/java/binnie/core/network/packet/MessageBinnie.java index bda404ea..a5b0e8a8 100644 --- a/src/main/java/binnie/core/network/packet/MessageBinnie.java +++ b/src/main/java/binnie/core/network/packet/MessageBinnie.java @@ -1,40 +1,37 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; -import java.io.IOException; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; +import io.netty.buffer.ByteBuf; -public final class MessageBinnie implements IMessage -{ +import java.io.IOException; + +public class MessageBinnie implements IMessage { public int id; private MessageBase message; - ByteBuf data; + protected ByteBuf data; public MessageBinnie() { + // ignored } - public MessageBinnie(final int id, final MessageBase base) { + public MessageBinnie(int id, MessageBase message) { this.id = id; - this.message = base; + this.message = message; } @Override - public void toBytes(final ByteBuf buf) { - buf.writeByte(this.id); + public void toBytes(ByteBuf buf) { + buf.writeByte(id); try { - this.message.writeData(buf); + message.writeData(buf); } catch (IOException e) { e.printStackTrace(); } } @Override - public void fromBytes(final ByteBuf buf) { - this.id = buf.readByte(); - this.data = buf; + public void fromBytes(ByteBuf buf) { + id = buf.readByte(); + data = buf; } } diff --git a/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java b/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java index 0db41268..c490053e 100644 --- a/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java @@ -1,18 +1,14 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; import net.minecraft.nbt.NBTTagCompound; -public class MessageContainerUpdate extends MessageCraftGUI -{ - public MessageContainerUpdate(final NBTTagCompound nbt) { +public class MessageContainerUpdate extends MessageCraftGUI { + public MessageContainerUpdate(NBTTagCompound nbt) { super(nbt); } - public MessageContainerUpdate(final MessageBinnie message) { + // TODO unused constructor? + public MessageContainerUpdate(MessageBinnie message) { super(message); } } diff --git a/src/main/java/binnie/core/network/packet/MessageCoordinates.java b/src/main/java/binnie/core/network/packet/MessageCoordinates.java index 76154002..17c4c68a 100644 --- a/src/main/java/binnie/core/network/packet/MessageCoordinates.java +++ b/src/main/java/binnie/core/network/packet/MessageCoordinates.java @@ -1,30 +1,27 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import java.io.IOException; import io.netty.buffer.ByteBuf; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; -public class MessageCoordinates extends MessageBase -{ +import java.io.IOException; + +public class MessageCoordinates extends MessageBase { public int posX; public int posY; public int posZ; - public MessageCoordinates(final MessageBinnie message) { + public MessageCoordinates(MessageBinnie message) { super(message); } - public MessageCoordinates(final int id, final ChunkCoordinates coordinates) { + // TODO unused constructor? + public MessageCoordinates(int id, ChunkCoordinates coordinates) { this(id, coordinates.posX, coordinates.posY, coordinates.posZ); } - public MessageCoordinates(final int id, final int posX, final int posY, final int posZ) { + public MessageCoordinates(int id, int posX, int posY, int posZ) { super(id); this.posX = posX; this.posY = posY; @@ -32,24 +29,25 @@ public class MessageCoordinates extends MessageBase } @Override - public void writeData(final ByteBuf data) throws IOException { - data.writeInt(this.posX); - data.writeInt(this.posY); - data.writeInt(this.posZ); + public void writeData(ByteBuf data) throws IOException { + data.writeInt(posX); + data.writeInt(posY); + data.writeInt(posZ); } @Override - public void readData(final ByteBuf data) throws IOException { - this.posX = data.readInt(); - this.posY = data.readInt(); - this.posZ = data.readInt(); + public void readData(ByteBuf data) throws IOException { + posX = data.readInt(); + posY = data.readInt(); + posZ = data.readInt(); } + // TODO unused method? public ChunkCoordinates getCoordinates() { - return new ChunkCoordinates(this.posX, this.posY, this.posZ); + return new ChunkCoordinates(posX, posY, posZ); } - public TileEntity getTileEntity(final World world) { - return world.getTileEntity(this.posX, this.posY, this.posZ); + public TileEntity getTileEntity(World world) { + return world.getTileEntity(posX, posY, posZ); } } diff --git a/src/main/java/binnie/core/network/packet/MessageCraftGUI.java b/src/main/java/binnie/core/network/packet/MessageCraftGUI.java index 6401d80c..aaf04505 100644 --- a/src/main/java/binnie/core/network/packet/MessageCraftGUI.java +++ b/src/main/java/binnie/core/network/packet/MessageCraftGUI.java @@ -1,19 +1,14 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; import binnie.core.network.BinnieCorePacketID; import net.minecraft.nbt.NBTTagCompound; -public class MessageCraftGUI extends MessageNBT -{ - public MessageCraftGUI(final MessageBinnie message) { +public class MessageCraftGUI extends MessageNBT { + public MessageCraftGUI(MessageBinnie message) { super(message); } - public MessageCraftGUI(final NBTTagCompound action) { + public MessageCraftGUI(NBTTagCompound action) { super(BinnieCorePacketID.CraftGUIAction.ordinal(), action); } } diff --git a/src/main/java/binnie/core/network/packet/MessageMetadata.java b/src/main/java/binnie/core/network/packet/MessageMetadata.java index 762f5d87..35028aa6 100644 --- a/src/main/java/binnie/core/network/packet/MessageMetadata.java +++ b/src/main/java/binnie/core/network/packet/MessageMetadata.java @@ -1,35 +1,31 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; -import java.io.IOException; -import io.netty.buffer.ByteBuf; import binnie.core.network.BinnieCorePacketID; +import io.netty.buffer.ByteBuf; -public class MessageMetadata extends MessageCoordinates -{ +import java.io.IOException; + +public class MessageMetadata extends MessageCoordinates { public int meta; - public MessageMetadata(final int posX, final int posY, final int posZ, final int meta) { + public MessageMetadata(int posX, int posY, int posZ, int meta) { super(BinnieCorePacketID.TileMetadata.ordinal(), posX, posY, posZ); this.meta = meta; } - public MessageMetadata(final MessageBinnie message) { + public MessageMetadata(MessageBinnie message) { super(message); } @Override - public void writeData(final ByteBuf data) throws IOException { + public void writeData(ByteBuf data) throws IOException { super.writeData(data); - data.writeInt(this.meta); + data.writeInt(meta); } @Override - public void readData(final ByteBuf data) throws IOException { + public void readData(ByteBuf data) throws IOException { super.readData(data); - this.meta = data.readInt(); + meta = data.readInt(); } } diff --git a/src/main/java/binnie/core/network/packet/MessageNBT.java b/src/main/java/binnie/core/network/packet/MessageNBT.java index f61f3f8c..d69a4753 100644 --- a/src/main/java/binnie/core/network/packet/MessageNBT.java +++ b/src/main/java/binnie/core/network/packet/MessageNBT.java @@ -1,45 +1,41 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; -import java.io.IOException; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; -public class MessageNBT extends MessageBase -{ - NBTTagCompound nbt; +import java.io.IOException; + +public class MessageNBT extends MessageBase { + protected NBTTagCompound nbt; public NBTTagCompound getTagCompound() { - return this.nbt; + return nbt; } - void setTagCompound(final NBTTagCompound nbt) { + void setTagCompound(NBTTagCompound nbt) { this.nbt = nbt; } - public MessageNBT(final int id) { + public MessageNBT(int id) { super(id); } - public MessageNBT(final int id, final NBTTagCompound nbt) { + public MessageNBT(int id, NBTTagCompound nbt) { this(id); - this.setTagCompound(nbt); + setTagCompound(nbt); } - public MessageNBT(final MessageBinnie message) { + public MessageNBT(MessageBinnie message) { super(message); } @Override - public void writeData(final ByteBuf data) throws IOException { - this.writeNBTTagCompound(this.nbt, data); + public void writeData(ByteBuf data) throws IOException { + writeNBTTagCompound(nbt, data); } @Override - public void readData(final ByteBuf data) throws IOException { - this.nbt = this.readNBTTagCompound(data); + public void readData(ByteBuf data) throws IOException { + nbt = readNBTTagCompound(data); } } diff --git a/src/main/java/binnie/core/network/packet/MessageTileNBT.java b/src/main/java/binnie/core/network/packet/MessageTileNBT.java index 88e1b836..8a105488 100644 --- a/src/main/java/binnie/core/network/packet/MessageTileNBT.java +++ b/src/main/java/binnie/core/network/packet/MessageTileNBT.java @@ -1,26 +1,22 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; -import net.minecraft.world.World; -import java.io.IOException; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public class MessageTileNBT extends MessageNBT implements IPacketLocation -{ +import java.io.IOException; + +public class MessageTileNBT extends MessageNBT implements IPacketLocation { private int posX; private int posY; private int posZ; - public MessageTileNBT(final MessageBinnie message) { + public MessageTileNBT(MessageBinnie message) { super(message); } - public MessageTileNBT(final int id, final TileEntity tile, final NBTTagCompound nbt) { + public MessageTileNBT(int id, TileEntity tile, NBTTagCompound nbt) { super(id); this.posX = tile.xCoord; this.posY = tile.yCoord; @@ -29,48 +25,48 @@ public class MessageTileNBT extends MessageNBT implements IPacketLocation } @Override - public void writeData(final ByteBuf data) throws IOException { - data.writeInt(this.posX); - data.writeInt(this.posY); - data.writeInt(this.posZ); + public void writeData(ByteBuf data) throws IOException { + data.writeInt(posX); + data.writeInt(posY); + data.writeInt(posZ); super.writeData(data); } @Override - public void readData(final ByteBuf data) throws IOException { - this.posX = data.readInt(); - this.posY = data.readInt(); - this.posZ = data.readInt(); + public void readData(ByteBuf data) throws IOException { + posX = data.readInt(); + posY = data.readInt(); + posZ = data.readInt(); super.readData(data); } @Override - public TileEntity getTarget(final World world) { - return world.getTileEntity(this.posX, this.posY, this.posZ); + public TileEntity getTarget(World world) { + return world.getTileEntity(posX, posY, posZ); } @Override public int getX() { - return this.posX; + return posX; } @Override public int getY() { - return this.posY; + return posY; } @Override public int getZ() { - return this.posZ; + return posZ; } @Override public NBTTagCompound getTagCompound() { - return this.nbt; + return nbt; } @Override - void setTagCompound(final NBTTagCompound nbt) { + void setTagCompound(NBTTagCompound nbt) { this.nbt = nbt; } } diff --git a/src/main/java/binnie/core/network/packet/MessageUpdate.java b/src/main/java/binnie/core/network/packet/MessageUpdate.java index 0c4f9e03..6b41819d 100644 --- a/src/main/java/binnie/core/network/packet/MessageUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageUpdate.java @@ -1,77 +1,79 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; -import net.minecraft.world.World; -import java.io.IOException; +import binnie.core.network.INetworkedEntity; import io.netty.buffer.ByteBuf; import net.minecraft.tileentity.TileEntity; -import binnie.core.network.INetworkedEntity; +import net.minecraft.world.World; -public class MessageUpdate extends MessageCoordinates -{ +import java.io.IOException; + +public class MessageUpdate extends MessageCoordinates { public PacketPayload payload; - public MessageUpdate(final MessageBinnie message) { + public MessageUpdate(MessageBinnie message) { super(message); } - public MessageUpdate(final int id, final INetworkedEntity tile) { + public MessageUpdate(int id, INetworkedEntity tile) { super(id, ((TileEntity) tile).xCoord, ((TileEntity) tile).yCoord, ((TileEntity) tile).zCoord); - tile.writeToPacket(this.payload = new PacketPayload()); + payload = new PacketPayload(); + tile.writeToPacket(payload); } @Override - public void writeData(final ByteBuf data) throws IOException { + public void writeData(ByteBuf data) throws IOException { super.writeData(data); - if (this.payload == null) { + if (payload == null) { data.writeInt(0); data.writeInt(0); data.writeInt(0); return; } - data.writeInt(this.payload.intPayload.size()); - data.writeInt(this.payload.floatPayload.size()); - data.writeInt(this.payload.stringPayload.size()); - for (final int intData : this.payload.intPayload) { + + data.writeInt(payload.intPayload.size()); + data.writeInt(payload.floatPayload.size()); + data.writeInt(payload.stringPayload.size()); + + for (int intData : payload.intPayload) { data.writeInt(intData); } - for (final float floatData : this.payload.floatPayload) { + for (float floatData : payload.floatPayload) { data.writeFloat(floatData); } - for (final String stringData : this.payload.stringPayload) { - final byte[] bytes = stringData.getBytes("UTF-8"); + for (String stringData : payload.stringPayload) { + byte[] bytes = stringData.getBytes("UTF-8"); data.writeShort(bytes.length); data.writeBytes(bytes); } } @Override - public void readData(final ByteBuf data) throws IOException { + public void readData(ByteBuf data) throws IOException { super.readData(data); - this.payload = new PacketPayload(); - final int intLength = data.readInt(); - final int floatLength = data.readInt(); - final int stringLength = data.readInt(); - this.payload.intPayload.clear(); - this.payload.floatPayload.clear(); - this.payload.stringPayload.clear(); + payload = new PacketPayload(); + payload.intPayload.clear(); + payload.floatPayload.clear(); + payload.stringPayload.clear(); + + int intLength = data.readInt(); + int floatLength = data.readInt(); + int stringLength = data.readInt(); + for (int i = 0; i < intLength; ++i) { - this.payload.addInteger(data.readInt()); + payload.addInteger(data.readInt()); } for (int i = 0; i < floatLength; ++i) { - this.payload.addFloat(data.readFloat()); + payload.addFloat(data.readFloat()); } for (int i = 0; i < stringLength; ++i) { - final int length = data.readShort(); - final byte[] string = data.readBytes(length).array(); - this.payload.addString(new String(string, "UTF-8")); + int length = data.readShort(); + byte[] string = data.readBytes(length).array(); + payload.addString(new String(string, "UTF-8")); } } - public TileEntity getTarget(final World world) { + // TODO unused method? + public TileEntity getTarget(World world) { return world.getTileEntity(this.posX, this.posY, this.posZ); } } diff --git a/src/main/java/binnie/core/network/packet/PacketPayload.java b/src/main/java/binnie/core/network/packet/PacketPayload.java index a36f2eca..765b3f1a 100644 --- a/src/main/java/binnie/core/network/packet/PacketPayload.java +++ b/src/main/java/binnie/core/network/packet/PacketPayload.java @@ -1,67 +1,64 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.network.packet; import binnie.core.network.INetworkedEntity; + import java.util.ArrayList; import java.util.List; -public class PacketPayload -{ +public class PacketPayload { public List intPayload; public List floatPayload; public List stringPayload; public PacketPayload() { - this.intPayload = new ArrayList(); - this.floatPayload = new ArrayList(); - this.stringPayload = new ArrayList(); - this.intPayload.clear(); - this.floatPayload.clear(); - this.stringPayload.clear(); + intPayload = new ArrayList<>(); + floatPayload = new ArrayList<>(); + stringPayload = new ArrayList<>(); } - public PacketPayload(final INetworkedEntity tile) { + // TODO unused constructor? + public PacketPayload(INetworkedEntity tile) { this(); tile.writeToPacket(this); } - public void addInteger(final int a) { - this.intPayload.add(a); + public void addInteger(int a) { + intPayload.add(a); } - public void addFloat(final float a) { - this.floatPayload.add(a); + public void addFloat(float a) { + floatPayload.add(a); } - public void addString(final String a) { - this.stringPayload.add(a); + public void addString(String a) { + stringPayload.add(a); } public int getInteger() { - return this.intPayload.remove(0); + return intPayload.remove(0); } public float getFloat() { - return this.floatPayload.remove(0); + return floatPayload.remove(0); } public String getString() { - return this.stringPayload.remove(0); + return stringPayload.remove(0); } - public void append(final PacketPayload other) { + // TODO unused method + public void append(PacketPayload other) { if (other == null) { return; } - this.intPayload.addAll(other.intPayload); - this.floatPayload.addAll(other.floatPayload); - this.stringPayload.addAll(other.stringPayload); + intPayload.addAll(other.intPayload); + floatPayload.addAll(other.floatPayload); + stringPayload.addAll(other.stringPayload); } public boolean isEmpty() { - return this.intPayload.isEmpty() && this.floatPayload.isEmpty() && this.stringPayload.isEmpty(); + return intPayload.isEmpty() + && floatPayload.isEmpty() + && stringPayload.isEmpty(); } } diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index e7e51ceb..21e032aa 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -1,72 +1,69 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.proxy; import binnie.Binnie; -import net.minecraft.util.IIcon; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayerMP; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import binnie.core.network.packet.MessageBase; -import binnie.core.BinnieCore; -import net.minecraft.entity.player.EntityPlayer; -import binnie.core.gui.IBinnieGUID; import binnie.core.AbstractMod; +import binnie.core.BinnieCore; +import binnie.core.gui.IBinnieGUID; +import binnie.core.network.packet.MessageBase; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.IIcon; -public class BinnieModProxy implements IBinnieModProxy -{ +public class BinnieModProxy implements IBinnieModProxy { private AbstractMod mod; - public BinnieModProxy(final AbstractMod mod) { + public BinnieModProxy(AbstractMod mod) { this.mod = mod; } @Override - public void openGui(final IBinnieGUID ID, final EntityPlayer player, final int x, final int y, final int z) { - BinnieCore.proxy.openGui(this.mod, ID.ordinal(), player, x, y, z); + public void openGui(IBinnieGUID ID, EntityPlayer player, int x, int y, int z) { + BinnieCore.proxy.openGui(mod, ID.ordinal(), player, x, y, z); } @Override - public void sendToAll(final MessageBase packet) { - this.mod.getNetworkWrapper().sendToAll(packet.GetMessage()); + public void sendToAll(MessageBase packet) { + mod.getNetworkWrapper().sendToAll(packet.getMessage()); } @Override - public void sendToPlayer(final MessageBase packet, final EntityPlayer entityplayer) { + public void sendToPlayer(MessageBase packet, EntityPlayer entityplayer) { if (entityplayer instanceof EntityPlayerMP) { - this.mod.getNetworkWrapper().sendTo((IMessage) packet.GetMessage(), (EntityPlayerMP) entityplayer); + mod.getNetworkWrapper().sendTo(packet.getMessage(), (EntityPlayerMP) entityplayer); } } @Override - public void sendToServer(final MessageBase packet) { - this.mod.getNetworkWrapper().sendToServer(packet.GetMessage()); + public void sendToServer(MessageBase packet) { + mod.getNetworkWrapper().sendToServer(packet.getMessage()); } @Override - public IIcon getIcon(final IIconRegister register, final String string) { - return BinnieCore.proxy.getIcon(register, this.mod.getModID(), string); + public IIcon getIcon(IIconRegister register, String string) { + return BinnieCore.proxy.getIcon(register, mod.getModID(), string); } @Override public void preInit() { + // ignored } @Override public void init() { + // ignored } @Override public void postInit() { + // ignored } - public String localise(final String string) { - return Binnie.Language.localise(this.mod, string); + public String localise(String string) { + return Binnie.Language.localise(mod, string); } - public String localiseOrBlank(final String string) { - return Binnie.Language.localiseOrBlank(this.mod, string); + public String localiseOrBlank(String string) { + return Binnie.Language.localiseOrBlank(mod, string); } } diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index 61bc3233..faf1974d 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -1,32 +1,28 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.proxy; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.IIcon; -import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.core.network.packet.MessageUpdate; -import binnie.core.network.BinnieCorePacketID; -import binnie.core.network.INetworkedEntity; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.tileentity.TileEntity; -import java.io.File; -import net.minecraft.client.Minecraft; -import cpw.mods.fml.common.FMLCommonHandler; -import net.minecraftforge.client.IItemRenderer; -import net.minecraft.item.Item; -import net.minecraft.world.World; -import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.client.registry.RenderingRegistry; -import binnie.core.resource.BinnieResource; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.network.BinnieCorePacketID; +import binnie.core.network.INetworkedEntity; +import binnie.core.network.packet.MessageUpdate; +import binnie.core.resource.BinnieResource; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; -public class BinnieProxy extends BinnieModProxy implements IBinnieProxy -{ +import java.io.File; + +public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { private short uniqueTextureUID; public BinnieProxy() { @@ -36,21 +32,25 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy @Override public void preInit() { + // ignored } @Override public void init() { + // ignored } @Override public void postInit() { + // ignored } @Override - public void bindTexture(final BinnieResource texture) { + public void bindTexture(BinnieResource texture) { + // ignored } - public boolean checkTexture(final BinnieResource location) { + public boolean checkTexture(BinnieResource location) { return false; } @@ -60,21 +60,21 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy } @Override - public void openGui(final AbstractMod mod, final int id, final EntityPlayer player, final int x, final int y, final int z) { + public void openGui(AbstractMod mod, int id, EntityPlayer player, int x, int y, int z) { player.openGui(mod, id, player.worldObj, x, y, z); } @Override - public boolean isSimulating(final World world) { + public boolean isSimulating(World world) { return true; } @Override - public void registerCustomItemRenderer(final Item item, final IItemRenderer itemRenderer) { + public void registerCustomItemRenderer(Item item, IItemRenderer itemRenderer) { } @Override - public boolean needsTagCompoundSynched(final Item item) { + public boolean needsTagCompoundSynched(Item item) { return item.getShareTag(); } @@ -83,7 +83,8 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy return null; } - public void throwException(final String message, final Throwable e) { + // TODO unused method? + public void throwException(String message, Throwable e) { FMLCommonHandler.instance().raiseException(e, message, true); } @@ -108,12 +109,13 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy } @Override - public void registerTileEntity(final Class tile, final String id, final Object renderer) { + public void registerTileEntity(Class tile, String id, Object renderer) { GameRegistry.registerTileEntity(tile, id); } @Override - public void createPipe(final Item pipe) { + public void createPipe(Item pipe) { + // ignored } @Override @@ -122,38 +124,43 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy } @Override - public void registerBlockRenderer(final Object renderer) { + public void registerBlockRenderer(Object renderer) { + // ignored } @Override - public Object createObject(final String renderer) { + public Object createObject(String renderer) { return null; } - public void sendNetworkEntityPacket(final INetworkedEntity entity) { - final MessageUpdate packet = new MessageUpdate(BinnieCorePacketID.NetworkEntityUpdate.ordinal(), entity); - this.sendToAll(packet); + public void sendNetworkEntityPacket(INetworkedEntity entity) { + MessageUpdate packet = new MessageUpdate(BinnieCorePacketID.NetworkEntityUpdate.ordinal(), entity); + sendToAll(packet); } @Override - public IIcon getIcon(final IIconRegister register, final String mod, final String name) { + public IIcon getIcon(IIconRegister register, String mod, String name) { return null; } - public void handleTextureRefresh(final IIconRegister register, final int type) { + // TODO unused method? + public void handleTextureRefresh(IIconRegister register, int type) { + // ignored } - public void handlePostTextureRefresh(final IIconRegister register, final int type) { + // TODO unused method? + public void handlePostTextureRefresh(IIconRegister register, int type) { + // ignored } public short getUniqueTextureUID() { - final short uniqueTextureUID = this.uniqueTextureUID; - this.uniqueTextureUID = (short) (uniqueTextureUID + 1); + uniqueTextureUID++; return uniqueTextureUID; } @Override - public void bindTexture(final ResourceLocation location) { + public void bindTexture(ResourceLocation location) { + // ignored } public boolean isShiftDown() { diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 9b9f7ccb..1256f5a5 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -1,56 +1,50 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.proxy; -import net.minecraft.client.renderer.texture.ITextureObject; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.IResourceManagerReloadListener; -import binnie.craftgui.resource.minecraft.CraftGUIResourceManager; -import net.minecraft.client.resources.IReloadableResourceManager; import binnie.Binnie; -import net.minecraft.entity.player.EntityPlayer; -import org.lwjgl.input.Keyboard; -import net.minecraft.util.IIcon; -import net.minecraft.client.renderer.texture.IIconRegister; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.client.registry.ClientRegistry; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import java.io.File; -import cpw.mods.fml.client.FMLClientHandler; -import net.minecraft.client.Minecraft; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.IItemRenderer; -import net.minecraft.item.Item; -import net.minecraft.world.World; -import java.io.IOException; -import net.minecraft.client.renderer.texture.SimpleTexture; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import binnie.core.resource.BinnieResource; +import binnie.craftgui.resource.minecraft.CraftGUIResourceManager; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.SimpleTexture; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.MinecraftForgeClient; +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; -public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy -{ +import java.io.File; +import java.io.IOException; + +public class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { @Override - public void bindTexture(final BinnieResource texture) { + public void bindTexture(BinnieResource texture) { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); this.bindTexture(texture.getResourceLocation()); } @Override - public void bindTexture(final ResourceLocation location) { + public void bindTexture(ResourceLocation location) { this.getMinecraftInstance().getTextureManager().bindTexture(location); } @Override - public boolean checkTexture(final BinnieResource location) { - final SimpleTexture texture = new SimpleTexture(location.getResourceLocation()); + public boolean checkTexture(BinnieResource location) { + SimpleTexture texture = new SimpleTexture(location.getResourceLocation()); try { - ((ITextureObject) texture).loadTexture(this.getMinecraftInstance().getResourceManager()); + texture.loadTexture(this.getMinecraftInstance().getResourceManager()); } catch (IOException e) { return false; } @@ -58,18 +52,18 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy } @Override - public boolean isSimulating(final World world) { + public boolean isSimulating(World world) { return !world.isRemote; } @Override - public void registerCustomItemRenderer(final Item item, final IItemRenderer itemRenderer) { + public void registerCustomItemRenderer(Item item, IItemRenderer itemRenderer) { MinecraftForgeClient.registerItemRenderer(item, itemRenderer); } @Override public World getWorld() { - return this.getMinecraftInstance().theWorld; + return getMinecraftInstance().theWorld; } @Override @@ -93,41 +87,42 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy } @Override - public void registerTileEntity(final Class tile, final String id, final Object renderer) { + public void registerTileEntity(Class tile, String id, Object renderer) { if (renderer != null && renderer instanceof TileEntitySpecialRenderer) { - ClientRegistry.registerTileEntity((Class) tile, id, (TileEntitySpecialRenderer) renderer); - } - else { + ClientRegistry.registerTileEntity(tile, id, (TileEntitySpecialRenderer) renderer); + } else { GameRegistry.registerTileEntity(tile, id); } } @Override - public void registerBlockRenderer(final Object renderer) { + public void registerBlockRenderer(Object renderer) { if (renderer != null && renderer instanceof ISimpleBlockRenderingHandler) { RenderingRegistry.registerBlockHandler((ISimpleBlockRenderingHandler) renderer); } } @Override - public void createPipe(final Item pipe) { + public void createPipe(Item pipe) { + // ignored } @Override - public Object createObject(final String renderer) { + public Object createObject(String renderer) { Object object = null; try { - final Class rendererClass = Class.forName(renderer); + Class rendererClass = Class.forName(renderer); if (rendererClass != null) { object = rendererClass.newInstance(); } } catch (Exception ex) { + // ignored } return object; } @Override - public IIcon getIcon(final IIconRegister register, final String mod, final String name) { + public IIcon getIcon(IIconRegister register, String mod, String name) { return register.registerIcon(mod + ":" + name); } @@ -141,7 +136,8 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy return Minecraft.getMinecraft().thePlayer; } - public void handlePreTextureRefresh(final IIconRegister register, final int type) { + // TODO unused method? + public void handlePreTextureRefresh(IIconRegister register, int type) { if (type == 0) { Binnie.Liquid.reloadIcons(register); } @@ -149,7 +145,7 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy @Override public void preInit() { - final IResourceManager manager = Minecraft.getMinecraft().getResourceManager(); + IResourceManager manager = Minecraft.getMinecraft().getResourceManager(); if (manager instanceof IReloadableResourceManager) { ((IReloadableResourceManager) manager).registerReloadListener(new CraftGUIResourceManager()); } diff --git a/src/main/java/binnie/core/proxy/BinnieProxyServer.java b/src/main/java/binnie/core/proxy/BinnieProxyServer.java index 33c53f15..0e8959d9 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyServer.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyServer.java @@ -1,9 +1,4 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.proxy; -public class BinnieProxyServer extends BinnieProxy implements IBinnieProxy -{ +public class BinnieProxyServer extends BinnieProxy implements IBinnieProxy { } diff --git a/src/main/java/binnie/core/proxy/IBinnieModProxy.java b/src/main/java/binnie/core/proxy/IBinnieModProxy.java index 7fb71fe8..060f166a 100644 --- a/src/main/java/binnie/core/proxy/IBinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieModProxy.java @@ -1,24 +1,19 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.proxy; -import net.minecraft.util.IIcon; -import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.core.network.packet.MessageBase; -import net.minecraft.entity.player.EntityPlayer; import binnie.core.gui.IBinnieGUID; +import binnie.core.network.packet.MessageBase; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.IIcon; -interface IBinnieModProxy extends IProxyCore -{ - void openGui(final IBinnieGUID p0, final EntityPlayer p1, final int p2, final int p3, final int p4); +interface IBinnieModProxy extends IProxyCore { + void openGui(IBinnieGUID mod, EntityPlayer player, int x, int y, int z); - void sendToAll(final MessageBase p0); + void sendToAll(MessageBase p0); - void sendToPlayer(final MessageBase p0, final EntityPlayer p1); + void sendToPlayer(MessageBase p0, EntityPlayer p1); - void sendToServer(final MessageBase p0); + void sendToServer(MessageBase p0); - IIcon getIcon(final IIconRegister p0, final String p1); + IIcon getIcon(IIconRegister p0, String p1); } diff --git a/src/main/java/binnie/core/proxy/IBinnieProxy.java b/src/main/java/binnie/core/proxy/IBinnieProxy.java index 92f40e24..9b56c75c 100644 --- a/src/main/java/binnie/core/proxy/IBinnieProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieProxy.java @@ -1,57 +1,53 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.proxy; -import net.minecraft.util.IIcon; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.client.Minecraft; -import net.minecraft.world.World; -import net.minecraft.entity.player.EntityPlayer; import binnie.core.AbstractMod; -import net.minecraftforge.client.IItemRenderer; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; import binnie.core.resource.BinnieResource; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; + import java.io.File; -public interface IBinnieProxy extends IProxyCore -{ +public interface IBinnieProxy extends IProxyCore { boolean isClient(); boolean isServer(); File getDirectory(); - void bindTexture(final BinnieResource p0); + void bindTexture(BinnieResource texture); - void bindTexture(final ResourceLocation p0); + void bindTexture(ResourceLocation location); int getUniqueRenderID(); - void registerCustomItemRenderer(final Item p0, final IItemRenderer p1); + void registerCustomItemRenderer(Item item, IItemRenderer itemRenderer); - void openGui(final AbstractMod p0, final int p1, final EntityPlayer p2, final int p3, final int p4, final int p5); + void openGui(AbstractMod mod, int id, EntityPlayer player, int x, int y, int z); - boolean isSimulating(final World p0); + boolean isSimulating(World world); World getWorld(); Minecraft getMinecraftInstance(); - boolean needsTagCompoundSynched(final Item p0); + boolean needsTagCompoundSynched(Item item); - Object createObject(final String p0); + Object createObject(String renderer); - void registerTileEntity(final Class p0, final String p1, final Object p2); + void registerTileEntity(Class tile, String id, Object renderer); - void createPipe(final Item p0); + void createPipe(Item pipe); boolean isDebug(); - void registerBlockRenderer(final Object p0); + void registerBlockRenderer(Object renderer); - IIcon getIcon(final IIconRegister p0, final String p1, final String p2); + IIcon getIcon(IIconRegister register, String mod, String name); } diff --git a/src/main/java/binnie/core/proxy/IProxyCore.java b/src/main/java/binnie/core/proxy/IProxyCore.java index df9d9d9a..14e188c7 100644 --- a/src/main/java/binnie/core/proxy/IProxyCore.java +++ b/src/main/java/binnie/core/proxy/IProxyCore.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.proxy; import binnie.core.IInitializable; -public interface IProxyCore extends IInitializable -{ +public interface IProxyCore extends IInitializable { } diff --git a/src/main/java/binnie/core/resource/BinnieIcon.java b/src/main/java/binnie/core/resource/BinnieIcon.java index a54591fe..3a97f3c9 100644 --- a/src/main/java/binnie/core/resource/BinnieIcon.java +++ b/src/main/java/binnie/core/resource/BinnieIcon.java @@ -1,27 +1,21 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.resource; +import binnie.Binnie; +import binnie.core.AbstractMod; import binnie.core.BinnieCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.Binnie; -import binnie.core.AbstractMod; import net.minecraft.util.IIcon; -public class BinnieIcon extends BinnieResource -{ +public class BinnieIcon extends BinnieResource { private int textureSheet; private IIcon icon; - public BinnieIcon(final AbstractMod mod, final ResourceType type, final String path) { + public BinnieIcon(AbstractMod mod, ResourceType type, String path) { super(mod, type, path); - this.textureSheet = 0; - this.icon = null; - this.textureSheet = ((type != ResourceType.Block) ? 1 : 0); + icon = null; + textureSheet = ((type != ResourceType.Block) ? 1 : 0); Binnie.Resource.registerIcon(this); } @@ -30,17 +24,17 @@ public class BinnieIcon extends BinnieResource } @SideOnly(Side.CLIENT) - public IIcon getIcon(final IIconRegister register) { - this.registerIcon(register); - return this.icon; + public IIcon getIcon(IIconRegister register) { + registerIcon(register); + return icon; } @SideOnly(Side.CLIENT) - public void registerIcon(final IIconRegister register) { - this.icon = BinnieCore.proxy.getIcon(register, this.mod, this.path); + public void registerIcon(IIconRegister register) { + icon = BinnieCore.proxy.getIcon(register, mod, path); } public int getTextureSheet() { - return this.textureSheet; + return textureSheet; } } diff --git a/src/main/java/binnie/core/resource/BinnieResource.java b/src/main/java/binnie/core/resource/BinnieResource.java index 8975a6e0..4d45e35c 100644 --- a/src/main/java/binnie/core/resource/BinnieResource.java +++ b/src/main/java/binnie/core/resource/BinnieResource.java @@ -1,37 +1,33 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.resource; -import net.minecraft.util.ResourceLocation; import binnie.core.AbstractMod; +import net.minecraft.util.ResourceLocation; -public class BinnieResource -{ +public class BinnieResource { String mod; private ResourceType type; String path; - public BinnieResource(final AbstractMod mod, final ResourceType type, final String path) { + public BinnieResource(AbstractMod mod, ResourceType type, String path) { this(mod.getModID(), type, path); } - public BinnieResource(final String modid, final ResourceType type, final String path) { + public BinnieResource(String modid, ResourceType type, String path) { this.mod = modid; this.type = type; this.path = path; } + // TODO unused method? public String getFullPath() { - return "/assets/" + this.mod + "/textures/" + this.type.toString() + "/" + this.path; + return "/assets/" + mod + "/textures/" + type.toString() + "/" + path; } public ResourceLocation getResourceLocation() { - return new ResourceLocation(this.mod, "textures/" + this.type.toString() + "/" + this.path); + return new ResourceLocation(mod, "textures/" + type.toString() + "/" + path); } public String getShortPath() { - return "textures/" + this.type.toString() + "/" + this.path; + return "textures/" + type.toString() + "/" + path; } } diff --git a/src/main/java/binnie/core/resource/IBinnieTexture.java b/src/main/java/binnie/core/resource/IBinnieTexture.java index 7f3eeddd..93520a50 100644 --- a/src/main/java/binnie/core/resource/IBinnieTexture.java +++ b/src/main/java/binnie/core/resource/IBinnieTexture.java @@ -1,10 +1,5 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.resource; -public interface IBinnieTexture -{ +public interface IBinnieTexture { BinnieResource getTexture(); } diff --git a/src/main/java/binnie/core/resource/ManagerResource.java b/src/main/java/binnie/core/resource/ManagerResource.java index 135732ed..018064c0 100644 --- a/src/main/java/binnie/core/resource/ManagerResource.java +++ b/src/main/java/binnie/core/resource/ManagerResource.java @@ -1,47 +1,43 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.resource; +import binnie.core.AbstractMod; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.core.AbstractMod; + import java.util.ArrayList; import java.util.List; -public class ManagerResource -{ +public class ManagerResource { private List icons; public ManagerResource() { - this.icons = new ArrayList(); + this.icons = new ArrayList<>(); } - public BinnieResource getPNG(final AbstractMod mod, final ResourceType type, final String path) { + public BinnieResource getPNG(AbstractMod mod, ResourceType type, String path) { return this.getFile(mod, type, path + ".png"); } - public BinnieResource getFile(final AbstractMod mod, final ResourceType type, final String path) { + public BinnieResource getFile(AbstractMod mod, ResourceType type, String path) { return new BinnieResource(mod, type, path); } - public void registerIcon(final BinnieIcon binnieIcon) { + public void registerIcon(BinnieIcon binnieIcon) { this.icons.add(binnieIcon); } - public BinnieIcon getItemIcon(final AbstractMod mod, final String iconFile) { + public BinnieIcon getItemIcon(AbstractMod mod, String iconFile) { return new BinnieIcon(mod, ResourceType.Item, iconFile); } - public BinnieIcon getBlockIcon(final AbstractMod mod, final String iconFile) { + public BinnieIcon getBlockIcon(AbstractMod mod, String iconFile) { return new BinnieIcon(mod, ResourceType.Block, iconFile); } @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register, final int type) { - for (final BinnieIcon icon : this.icons) { + public void registerIcons(IIconRegister register, int type) { + for (BinnieIcon icon : this.icons) { if (icon.getTextureSheet() == type) { icon.registerIcon(register); } diff --git a/src/main/java/binnie/core/resource/ResourceType.java b/src/main/java/binnie/core/resource/ResourceType.java index 2a9ed1a2..318c74a6 100644 --- a/src/main/java/binnie/core/resource/ResourceType.java +++ b/src/main/java/binnie/core/resource/ResourceType.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.resource; -public enum ResourceType -{ +public enum ResourceType { Item("items"), Block("blocks"), Tile("tile"), @@ -15,12 +10,12 @@ public enum ResourceType String name; - private ResourceType(final String name) { + ResourceType(String name) { this.name = name; } @Override public String toString() { - return this.name; + return name; } } diff --git a/src/main/java/binnie/core/texture/BinnieCoreTexture.java b/src/main/java/binnie/core/texture/BinnieCoreTexture.java index 5a108221..9ac57780 100644 --- a/src/main/java/binnie/core/texture/BinnieCoreTexture.java +++ b/src/main/java/binnie/core/texture/BinnieCoreTexture.java @@ -1,17 +1,12 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.texture; -import binnie.core.BinnieCore; import binnie.Binnie; +import binnie.core.BinnieCore; import binnie.core.resource.BinnieResource; -import binnie.core.resource.ResourceType; import binnie.core.resource.IBinnieTexture; +import binnie.core.resource.ResourceType; -public enum BinnieCoreTexture implements IBinnieTexture -{ +public enum BinnieCoreTexture implements IBinnieTexture { Compartment(ResourceType.Tile, "Compartment"), CompartmentIron(ResourceType.Tile, "CompartmentIron"), CompartmentDiamond(ResourceType.Tile, "CompartmentDiamond"), @@ -24,13 +19,13 @@ public enum BinnieCoreTexture implements IBinnieTexture String texture; ResourceType type; - private BinnieCoreTexture(final ResourceType base, final String texture) { + BinnieCoreTexture(ResourceType base, String texture) { this.texture = texture; this.type = base; } @Override public BinnieResource getTexture() { - return Binnie.Resource.getPNG(BinnieCore.instance, this.type, this.texture); + return Binnie.Resource.getPNG(BinnieCore.instance, type, texture); } } diff --git a/src/main/java/binnie/core/texture/TextureManager.java b/src/main/java/binnie/core/texture/TextureManager.java index 4fff7037..8bce81d2 100644 --- a/src/main/java/binnie/core/texture/TextureManager.java +++ b/src/main/java/binnie/core/texture/TextureManager.java @@ -1,24 +1,19 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.texture; -import java.util.ArrayList; -import javax.swing.Icon; -import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import javax.swing.*; +import java.util.ArrayList; +import java.util.List; + +// TODO unused class? @SideOnly(Side.CLIENT) public class TextureManager { - static List textures; + static List textures = new ArrayList<>(); public static void init() { - } - - static { - TextureManager.textures = new ArrayList(); + // ignored } } diff --git a/src/main/java/binnie/core/triggers/ActionProvider.java b/src/main/java/binnie/core/triggers/ActionProvider.java index 78e5a0ce..f291a46f 100644 --- a/src/main/java/binnie/core/triggers/ActionProvider.java +++ b/src/main/java/binnie/core/triggers/ActionProvider.java @@ -1,37 +1,34 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.triggers; import binnie.core.machines.component.IBuildcraft; -import java.util.LinkedList; import buildcraft.api.statements.IActionExternal; +import buildcraft.api.statements.IActionInternal; +import buildcraft.api.statements.IActionProvider; +import buildcraft.api.statements.IStatementContainer; +import cpw.mods.fml.common.Optional; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Optional; -import buildcraft.api.statements.IActionInternal; -import java.util.Collection; -import buildcraft.api.statements.IStatementContainer; -import buildcraft.api.statements.IActionProvider; -class ActionProvider implements IActionProvider -{ +import java.util.Collection; +import java.util.LinkedList; + +class ActionProvider implements IActionProvider { @Override @Optional.Method(modid = "BuildCraft|Silicon") - public Collection getInternalActions(final IStatementContainer container) { + public Collection getInternalActions(IStatementContainer container) { return null; } @Override @Optional.Method(modid = "BuildCraft|Silicon") - public Collection getExternalActions(final ForgeDirection side, final TileEntity tile) { - final LinkedList list = new LinkedList(); + public Collection getExternalActions(ForgeDirection side, TileEntity tile) { + LinkedList list = new LinkedList<>(); if (tile instanceof IBuildcraft.ActionProvider) { ((IBuildcraft.ActionProvider) tile).getActions(list); } - final LinkedList list2 = new LinkedList(); - for (final IActionExternal action : list2) { + + LinkedList list2 = new LinkedList<>(); + for (IActionExternal action : list2) { if (action != null && action.getUniqueTag() != null) { list.add(action); } diff --git a/src/main/java/binnie/core/triggers/BinnieAction.java b/src/main/java/binnie/core/triggers/BinnieAction.java index 7fa6945c..afd625e0 100644 --- a/src/main/java/binnie/core/triggers/BinnieAction.java +++ b/src/main/java/binnie/core/triggers/BinnieAction.java @@ -1,28 +1,23 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.triggers; -import buildcraft.api.statements.IStatementContainer; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.tileentity.TileEntity; -import buildcraft.api.statements.IStatementParameter; -import net.minecraft.client.renderer.texture.IIconRegister; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.IIcon; import binnie.Binnie; -import buildcraft.api.statements.IStatement; -import buildcraft.api.statements.StatementManager; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.resource.BinnieIcon; import buildcraft.api.statements.IActionExternal; +import buildcraft.api.statements.IStatement; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.StatementManager; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; -class BinnieAction implements IActionExternal -{ - private static int incrementalID; +class BinnieAction implements IActionExternal { + private static int incrementalID = 800; public static BinnieAction actionPauseProcess; public static BinnieAction actionCancelTask; private String desc; @@ -30,39 +25,39 @@ class BinnieAction implements IActionExternal private String tag; private int id; - BinnieAction(final String desc, final String tag, final String iconFile) { + BinnieAction(String desc, String tag, String iconFile) { this(desc, tag, BinnieCore.instance, iconFile); } - private BinnieAction(final String desc, final String tag, final AbstractMod mod, final String iconFile) { - this.id = 0; - this.id = BinnieAction.incrementalID++; + private BinnieAction(String desc, String tag, AbstractMod mod, String iconFile) { + // TODO why? Where is used? + id = BinnieAction.incrementalID++; this.tag = tag; StatementManager.registerStatement(this); - this.icon = Binnie.Resource.getItemIcon(mod, iconFile); + icon = Binnie.Resource.getItemIcon(mod, iconFile); this.desc = desc; } @Override public String getDescription() { - return this.desc; + return desc; } @Override public String getUniqueTag() { - return this.tag; + return tag; } @Override @SideOnly(Side.CLIENT) public IIcon getIcon() { - return this.icon.getIcon(); + return icon.getIcon(); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister iconRegister) { - this.icon.registerIcon(iconRegister); + public void registerIcons(IIconRegister iconRegister) { + icon.registerIcon(iconRegister); } @Override @@ -76,7 +71,7 @@ class BinnieAction implements IActionExternal } @Override - public IStatementParameter createParameter(final int index) { + public IStatementParameter createParameter(int index) { return null; } @@ -86,10 +81,7 @@ class BinnieAction implements IActionExternal } @Override - public void actionActivate(final TileEntity target, final ForgeDirection side, final IStatementContainer source, final IStatementParameter[] parameters) { - } - - static { - BinnieAction.incrementalID = 800; + public void actionActivate(TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + // ignored } } diff --git a/src/main/java/binnie/core/triggers/BinnieTrigger.java b/src/main/java/binnie/core/triggers/BinnieTrigger.java index d229cab0..def63438 100644 --- a/src/main/java/binnie/core/triggers/BinnieTrigger.java +++ b/src/main/java/binnie/core/triggers/BinnieTrigger.java @@ -1,28 +1,23 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.triggers; -import buildcraft.api.statements.IStatementContainer; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.tileentity.TileEntity; -import buildcraft.api.statements.IStatementParameter; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.IIcon; -import net.minecraft.client.renderer.texture.IIconRegister; import binnie.Binnie; -import buildcraft.api.statements.IStatement; -import buildcraft.api.statements.StatementManager; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.resource.BinnieIcon; +import buildcraft.api.statements.IStatement; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; +import buildcraft.api.statements.StatementManager; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; -final class BinnieTrigger implements ITriggerExternal -{ - private static int incrementalID; +class BinnieTrigger implements ITriggerExternal { + private static int incrementalID = 800; protected static BinnieTrigger triggerNoBlankTemplate; protected static BinnieTrigger triggerNoTemplate; protected static BinnieTrigger triggerIsWorking; @@ -47,45 +42,45 @@ final class BinnieTrigger implements ITriggerExternal private BinnieIcon icon; private int id; - public BinnieTrigger(final String desc, final String tag, final String iconFile) { + public BinnieTrigger(String desc, String tag, String iconFile) { this(desc, tag, BinnieCore.instance, iconFile); } - public BinnieTrigger(final String desc, final String tag, final AbstractMod mod, final String iconFile) { - this.id = 0; - this.id = BinnieTrigger.incrementalID++; + public BinnieTrigger(String desc, String tag, AbstractMod mod, String iconFile) { + // TODO why? Where is used? + id = BinnieTrigger.incrementalID++; this.tag = tag; StatementManager.registerStatement(this); TriggerProvider.triggers.add(this); - this.icon = Binnie.Resource.getItemIcon(mod, iconFile); + icon = Binnie.Resource.getItemIcon(mod, iconFile); this.desc = desc; } @Override public String getDescription() { - return this.desc; + return desc; } @SideOnly(Side.CLIENT) - public IIcon getIcon(final IIconRegister register) { - return this.icon.getIcon(register); + public IIcon getIcon(IIconRegister register) { + return icon.getIcon(register); } @Override public String getUniqueTag() { - return this.tag; + return tag; } @Override @SideOnly(Side.CLIENT) public IIcon getIcon() { - return this.icon.getIcon(); + return icon.getIcon(); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister iconRegister) { - this.icon.registerIcon(iconRegister); + public void registerIcons(IIconRegister iconRegister) { + icon.registerIcon(iconRegister); } @Override @@ -99,7 +94,7 @@ final class BinnieTrigger implements ITriggerExternal } @Override - public IStatementParameter createParameter(final int index) { + public IStatementParameter createParameter(int index) { return null; } @@ -109,11 +104,7 @@ final class BinnieTrigger implements ITriggerExternal } @Override - public boolean isTriggerActive(final TileEntity target, final ForgeDirection side, final IStatementContainer source, final IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { return false; } - - static { - BinnieTrigger.incrementalID = 800; - } } diff --git a/src/main/java/binnie/core/triggers/ModuleTrigger.java b/src/main/java/binnie/core/triggers/ModuleTrigger.java index 68347115..1efe00ee 100644 --- a/src/main/java/binnie/core/triggers/ModuleTrigger.java +++ b/src/main/java/binnie/core/triggers/ModuleTrigger.java @@ -1,19 +1,13 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.triggers; -import buildcraft.api.statements.ITriggerProvider; -import binnie.extrabees.ExtraBees; -import buildcraft.api.statements.IActionProvider; -import buildcraft.api.statements.StatementManager; import binnie.core.IInitializable; +import binnie.extrabees.ExtraBees; +import buildcraft.api.statements.StatementManager; -public class ModuleTrigger implements IInitializable -{ +public class ModuleTrigger implements IInitializable { @Override public void preInit() { + // ignored } @Override @@ -40,5 +34,6 @@ public class ModuleTrigger implements IInitializable @Override public void postInit() { + // ignored } } diff --git a/src/main/java/binnie/core/triggers/TriggerData.java b/src/main/java/binnie/core/triggers/TriggerData.java index 04c66062..bf8835d0 100644 --- a/src/main/java/binnie/core/triggers/TriggerData.java +++ b/src/main/java/binnie/core/triggers/TriggerData.java @@ -1,18 +1,14 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.triggers; import buildcraft.api.statements.ITriggerExternal; + import java.util.Map; -public class TriggerData implements Map.Entry -{ - private final ITriggerExternal key; +public class TriggerData implements Map.Entry { + private ITriggerExternal key; private Boolean value; - public TriggerData(final ITriggerExternal key, final Boolean value) { + public TriggerData(ITriggerExternal key, Boolean value) { if (key == null) { throw new NullPointerException(); } @@ -22,17 +18,17 @@ public class TriggerData implements Map.Entry @Override public ITriggerExternal getKey() { - return this.key; + return key; } @Override public Boolean getValue() { - return this.value; + return value; } @Override - public Boolean setValue(final Boolean value) { - final Boolean old = this.value; + public Boolean setValue(Boolean value) { + Boolean old = this.value; this.value = value; return old; } diff --git a/src/main/java/binnie/core/triggers/TriggerInventory.java b/src/main/java/binnie/core/triggers/TriggerInventory.java index bc6e9ac0..40a82d07 100644 --- a/src/main/java/binnie/core/triggers/TriggerInventory.java +++ b/src/main/java/binnie/core/triggers/TriggerInventory.java @@ -1,14 +1,10 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.triggers; import net.minecraft.inventory.IInventory; -public class TriggerInventory -{ - private static Boolean isSlotEmpty(final IInventory inventory, final int slot) { +// TODO unusing class? +public class TriggerInventory { + private static Boolean isSlotEmpty(IInventory inventory, int slot) { return inventory.getStackInSlot(slot) != null; } } diff --git a/src/main/java/binnie/core/triggers/TriggerPower.java b/src/main/java/binnie/core/triggers/TriggerPower.java index 7b5ddcb6..1304c006 100644 --- a/src/main/java/binnie/core/triggers/TriggerPower.java +++ b/src/main/java/binnie/core/triggers/TriggerPower.java @@ -1,43 +1,38 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.triggers; import binnie.core.machines.Machine; import binnie.core.machines.power.IPoweredMachine; -import buildcraft.api.statements.ITriggerExternal; -public class TriggerPower -{ - public static TriggerData powerNone(final Object tile) { - return new TriggerData(BinnieTrigger.triggerPowerNone, getPercentage(tile) < 0.05000000074505806); +public class TriggerPower { + public static TriggerData powerNone(Object tile) { + double percent = getPercentage(tile); + return new TriggerData(BinnieTrigger.triggerPowerNone, percent < 0.05000000074505806); } - public static TriggerData powerLow(final Object tile) { - return new TriggerData(BinnieTrigger.triggerPowerLow, getPercentage(tile) < 0.3499999940395355); + public static TriggerData powerLow(Object tile) { + double percent = getPercentage(tile); + return new TriggerData(BinnieTrigger.triggerPowerLow, percent < 0.3499999940395355); } - public static TriggerData powerMedium(final Object tile) { - final double p = getPercentage(tile); - return new TriggerData(BinnieTrigger.triggerPowerMedium, p >= 0.3499999940395355 && p <= 0.6499999761581421); + public static TriggerData powerMedium(Object tile) { + double percent = getPercentage(tile); + return new TriggerData(BinnieTrigger.triggerPowerMedium, percent >= 0.3499999940395355 && percent <= 0.6499999761581421); } - public static TriggerData powerHigh(final Object tile) { - final double p = getPercentage(tile); - return new TriggerData(BinnieTrigger.triggerPowerHigh, getPercentage(tile) > 0.6499999761581421); + public static TriggerData powerHigh(Object tile) { + double percent = getPercentage(tile); + return new TriggerData(BinnieTrigger.triggerPowerHigh, percent > 0.6499999761581421); } - public static TriggerData powerFull(final Object tile) { - final double p = getPercentage(tile); - return new TriggerData(BinnieTrigger.triggerPowerFull, getPercentage(tile) > 0.949999988079071); + public static TriggerData powerFull(Object tile) { + double percent = getPercentage(tile); + return new TriggerData(BinnieTrigger.triggerPowerFull, percent > 0.949999988079071); } - private static double getPercentage(final Object tile) { - final IPoweredMachine process = Machine.getInterface(IPoweredMachine.class, tile); + private static double getPercentage(Object tile) { + IPoweredMachine process = Machine.getInterface(IPoweredMachine.class, tile); if (process != null) { - final double percentage = process.getInterface().getEnergy() / process.getInterface().getCapacity(); - return percentage; + return (double) (process.getInterface().getEnergy() / process.getInterface().getCapacity()); } return 0.0; } diff --git a/src/main/java/binnie/core/triggers/TriggerProvider.java b/src/main/java/binnie/core/triggers/TriggerProvider.java index 2dfd8ab2..bbed6f34 100644 --- a/src/main/java/binnie/core/triggers/TriggerProvider.java +++ b/src/main/java/binnie/core/triggers/TriggerProvider.java @@ -1,34 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.triggers; -import java.util.ArrayList; -import buildcraft.api.statements.ITriggerInternal; -import buildcraft.api.statements.IStatementContainer; import binnie.core.machines.component.IBuildcraft; -import java.util.LinkedList; +import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; -import java.util.Collection; +import buildcraft.api.statements.ITriggerInternal; +import buildcraft.api.statements.ITriggerProvider; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import java.util.List; -import buildcraft.api.statements.ITriggerProvider; -class TriggerProvider implements ITriggerProvider -{ - static TriggerProvider instance; - public static List triggers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +class TriggerProvider implements ITriggerProvider { + static TriggerProvider instance = new TriggerProvider(); + public static List triggers = new ArrayList<>(); @Override - public Collection getExternalTriggers(final ForgeDirection side, final TileEntity tile) { - final LinkedList list = new LinkedList(); - final LinkedList triggerData = new LinkedList(); + public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + LinkedList list = new LinkedList(); + LinkedList triggerData = new LinkedList(); if (tile instanceof IBuildcraft.TriggerProvider) { ((IBuildcraft.TriggerProvider) tile).getTriggers(list); } - for (final TriggerData data : list) { + for (TriggerData data : list) { if (data.getKey() != null && data.getKey().getUniqueTag() != null) { triggerData.add(data.getKey()); } @@ -36,13 +32,14 @@ class TriggerProvider implements ITriggerProvider return triggerData; } - public static boolean isTriggerActive(final ITriggerExternal trigger, final TileEntity tile) { - final LinkedList list = new LinkedList(); - final LinkedList triggerData = new LinkedList(); + // TODO unusing method? + public static boolean isTriggerActive(ITriggerExternal trigger, TileEntity tile) { + LinkedList list = new LinkedList(); + LinkedList triggerData = new LinkedList(); if (tile instanceof IBuildcraft.TriggerProvider) { ((IBuildcraft.TriggerProvider) tile).getTriggers(list); } - for (final TriggerData data : list) { + for (TriggerData data : list) { if (data.getKey() == trigger) { return data.getValue(); } @@ -51,12 +48,7 @@ class TriggerProvider implements ITriggerProvider } @Override - public Collection getInternalTriggers(final IStatementContainer container) { - return new ArrayList(); - } - - static { - TriggerProvider.instance = new TriggerProvider(); - TriggerProvider.triggers = new ArrayList(); + public Collection getInternalTriggers(IStatementContainer container) { + return new ArrayList<>(); } } diff --git a/src/main/java/binnie/core/triggers/TriggerWorking.java b/src/main/java/binnie/core/triggers/TriggerWorking.java index 78e1fbc8..85b7d42c 100644 --- a/src/main/java/binnie/core/triggers/TriggerWorking.java +++ b/src/main/java/binnie/core/triggers/TriggerWorking.java @@ -1,17 +1,12 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.triggers; -import buildcraft.api.statements.ITriggerExternal; import binnie.core.machines.Machine; import binnie.core.machines.power.IProcess; -public class TriggerWorking -{ - public static TriggerData isNotWorking(final Object inventory) { - final IProcess process = Machine.getInterface(IProcess.class, inventory); +// TODO unusing class? +public class TriggerWorking { + public static TriggerData isNotWorking(Object inventory) { + IProcess process = Machine.getInterface(IProcess.class, inventory); boolean b = false; if (process != null) { b = (process.canWork() != null && process.canProgress() != null); @@ -19,8 +14,8 @@ public class TriggerWorking return new TriggerData(BinnieTrigger.triggerIsNotWorking, b); } - public static TriggerData isWorking(final Object inventory) { - final IProcess process = Machine.getInterface(IProcess.class, inventory); + public static TriggerData isWorking(Object inventory) { + IProcess process = Machine.getInterface(IProcess.class, inventory); boolean b = false; if (process != null) { b = (process.canWork() == null && process.canProgress() == null); @@ -28,8 +23,8 @@ public class TriggerWorking return new TriggerData(BinnieTrigger.triggerIsWorking, b); } - public static TriggerData canWork(final Object inventory) { - final IProcess process = Machine.getInterface(IProcess.class, inventory); + public static TriggerData canWork(Object inventory) { + IProcess process = Machine.getInterface(IProcess.class, inventory); boolean b = false; if (process != null) { b = (process.canWork() == null); @@ -37,8 +32,8 @@ public class TriggerWorking return new TriggerData(BinnieTrigger.triggerCanWork, b); } - public static TriggerData cannotWork(final Object inventory) { - final IProcess process = Machine.getInterface(IProcess.class, inventory); + public static TriggerData cannotWork(Object inventory) { + IProcess process = Machine.getInterface(IProcess.class, inventory); boolean b = false; if (process != null) { b = (process.canWork() != null); diff --git a/src/main/java/binnie/core/util/FluidStackSet.java b/src/main/java/binnie/core/util/FluidStackSet.java index 8e08ac7a..68d04c8c 100644 --- a/src/main/java/binnie/core/util/FluidStackSet.java +++ b/src/main/java/binnie/core/util/FluidStackSet.java @@ -1,131 +1,126 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.util; +import net.minecraftforge.fluids.FluidStack; + +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.ArrayList; import java.util.List; -import net.minecraftforge.fluids.FluidStack; import java.util.Set; -class FluidStackSet implements Set -{ - List itemStacks; +class FluidStackSet implements Set { + protected List itemStacks; FluidStackSet() { - this.itemStacks = new ArrayList(); + itemStacks = new ArrayList<>(); } @Override public String toString() { - return this.itemStacks.toString(); + return itemStacks.toString(); } - protected FluidStack getExisting(final FluidStack stack) { - for (final FluidStack stack2 : this.itemStacks) { - if (stack2.isFluidEqual(stack)) { - return stack2; + protected FluidStack getExisting(FluidStack stack) { + for (FluidStack existStack : itemStacks) { + if (existStack.isFluidEqual(stack)) { + return existStack; } } return null; } @Override - public boolean add(final FluidStack e) { - if (e != null) { - if (this.getExisting(e) == null) { - return this.itemStacks.add(e.copy()); + public boolean add(FluidStack fluidStack) { + if (fluidStack != null) { + FluidStack existing = getExisting(fluidStack); + if (existing == null) { + return itemStacks.add(fluidStack.copy()); } - final FluidStack existing = this.getExisting(e); - existing.amount += e.amount; + existing.amount += fluidStack.amount; } return false; } @Override - public boolean addAll(final Collection c) { + public boolean addAll(Collection collection) { boolean addedAll = true; - for (final FluidStack stack : c) { - addedAll = (this.add(stack) && addedAll); + for (FluidStack stack : collection) { + addedAll = add(stack) && addedAll; } return addedAll; } @Override public void clear() { - this.itemStacks.clear(); + itemStacks.clear(); } @Override - public boolean contains(final Object o) { - return o instanceof FluidStack && this.getExisting((FluidStack) o) != null; + public boolean contains(Object object) { + return object instanceof FluidStack + && getExisting((FluidStack) object) != null; } @Override - public boolean containsAll(final Collection c) { + public boolean containsAll(Collection collection) { boolean addedAll = true; - for (final Object o : c) { - addedAll = (addedAll && this.contains(o)); + for (Object object : collection) { + addedAll = addedAll && contains(object); } return false; } @Override public boolean isEmpty() { - return this.itemStacks.isEmpty(); + return itemStacks.isEmpty(); } @Override public Iterator iterator() { - return this.itemStacks.iterator(); + return itemStacks.iterator(); } @Override - public boolean remove(final Object o) { - if (this.contains(o)) { - final FluidStack r = (FluidStack) o; - final FluidStack existing = this.getExisting(r); + public boolean remove(Object object) { + if (contains(object)) { + FluidStack r = (FluidStack) object; + FluidStack existing = getExisting(r); if (existing.amount > r.amount) { - final FluidStack fluidStack = existing; - fluidStack.amount -= r.amount; - } - else { - this.itemStacks.remove(existing); + existing.amount -= r.amount; + } else { + itemStacks.remove(existing); } } return false; } @Override - public boolean removeAll(final Collection c) { + public boolean removeAll(Collection collection) { boolean addedAll = true; - for (final Object o : c) { - final boolean removed = this.remove(o); + for (Object object : collection) { + boolean removed = this.remove(object); addedAll = (removed && addedAll); } return false; } @Override - public boolean retainAll(final Collection c) { - return this.itemStacks.retainAll(c); + public boolean retainAll(Collection collection) { + return itemStacks.retainAll(collection); } @Override public int size() { - return this.itemStacks.size(); + return itemStacks.size(); } @Override public Object[] toArray() { - return this.itemStacks.toArray(); + return itemStacks.toArray(); } @Override - public T[] toArray(final T[] a) { - return this.itemStacks.toArray(a); + public T[] toArray(T[] array) { + return itemStacks.toArray(array); } } diff --git a/src/main/java/binnie/core/util/IValidator.java b/src/main/java/binnie/core/util/IValidator.java index 369300ee..d62debfd 100644 --- a/src/main/java/binnie/core/util/IValidator.java +++ b/src/main/java/binnie/core/util/IValidator.java @@ -1,10 +1,5 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.util; -public interface IValidator -{ - boolean isValid(final T p0); +public interface IValidator { + boolean isValid(T object); } diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/src/main/java/binnie/core/util/ItemStackSet.java index 7a84a7b3..a3265f13 100644 --- a/src/main/java/binnie/core/util/ItemStackSet.java +++ b/src/main/java/binnie/core/util/ItemStackSet.java @@ -1,131 +1,126 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.util; +import net.minecraft.item.ItemStack; + +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.ArrayList; import java.util.List; -import net.minecraft.item.ItemStack; import java.util.Set; -public class ItemStackSet implements Set -{ - List itemStacks; +public class ItemStackSet implements Set { + protected List itemStacks; public ItemStackSet() { - this.itemStacks = new ArrayList(); + itemStacks = new ArrayList<>(); } @Override public String toString() { - return this.itemStacks.toString(); + return itemStacks.toString(); } - protected ItemStack getExisting(final ItemStack stack) { - for (final ItemStack stack2 : this.itemStacks) { - if (stack2.isItemEqual(stack)) { - return stack2; + protected ItemStack getExisting(ItemStack stack) { + for (ItemStack existStack : itemStacks) { + if (existStack.isItemEqual(stack)) { + return existStack; } } return null; } @Override - public boolean add(final ItemStack e) { - if (e != null) { - if (this.getExisting(e) == null) { - return this.itemStacks.add(e.copy()); + public boolean add(ItemStack itemStack) { + if (itemStack != null) { + ItemStack existing = getExisting(itemStack); + if (existing == null) { + return itemStacks.add(itemStack.copy()); } - final ItemStack existing = this.getExisting(e); - existing.stackSize += e.stackSize; + existing.stackSize += itemStack.stackSize; } return false; } @Override - public boolean addAll(final Collection c) { + public boolean addAll(Collection c) { boolean addedAll = true; - for (final ItemStack stack : c) { - addedAll = (this.add(stack) && addedAll); + for (ItemStack stack : c) { + addedAll = add(stack) && addedAll; } return addedAll; } @Override public void clear() { - this.itemStacks.clear(); + itemStacks.clear(); } @Override - public boolean contains(final Object o) { - return o instanceof ItemStack && this.getExisting((ItemStack) o) != null; + public boolean contains(Object o) { + return o instanceof ItemStack + && getExisting((ItemStack) o) != null; } @Override - public boolean containsAll(final Collection c) { + public boolean containsAll(Collection collection) { boolean addedAll = true; - for (final Object o : c) { - addedAll = (addedAll && this.contains(o)); + for (Object object : collection) { + addedAll = addedAll && contains(object); } return false; } @Override public boolean isEmpty() { - return this.itemStacks.isEmpty(); + return itemStacks.isEmpty(); } @Override public Iterator iterator() { - return this.itemStacks.iterator(); + return itemStacks.iterator(); } @Override - public boolean remove(final Object o) { - if (this.contains(o)) { - final ItemStack r = (ItemStack) o; - final ItemStack existing = this.getExisting(r); + public boolean remove(Object object) { + if (this.contains(object)) { + ItemStack r = (ItemStack) object; + ItemStack existing = this.getExisting(r); if (existing.stackSize > r.stackSize) { - final ItemStack itemStack = existing; - itemStack.stackSize -= r.stackSize; - } - else { - this.itemStacks.remove(existing); + existing.stackSize -= r.stackSize; + } else { + itemStacks.remove(existing); } } return false; } @Override - public boolean removeAll(final Collection c) { + public boolean removeAll(Collection collection) { boolean addedAll = true; - for (final Object o : c) { - final boolean removed = this.remove(o); - addedAll = (removed && addedAll); + for (Object object : collection) { + boolean removed = remove(object); + addedAll = removed && addedAll; } return false; } @Override - public boolean retainAll(final Collection c) { - return this.itemStacks.retainAll(c); + public boolean retainAll(Collection collection) { + return itemStacks.retainAll(collection); } @Override public int size() { - return this.itemStacks.size(); + return itemStacks.size(); } @Override public Object[] toArray() { - return this.itemStacks.toArray(); + return itemStacks.toArray(); } @Override - public T[] toArray(final T[] a) { - return this.itemStacks.toArray(a); + public T[] toArray(T[] array) { + return itemStacks.toArray(array); } } diff --git a/src/main/java/binnie/core/util/UniqueFluidStackSet.java b/src/main/java/binnie/core/util/UniqueFluidStackSet.java index 7f6becc8..1bfec7bd 100644 --- a/src/main/java/binnie/core/util/UniqueFluidStackSet.java +++ b/src/main/java/binnie/core/util/UniqueFluidStackSet.java @@ -1,24 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.util; import net.minecraftforge.fluids.FluidStack; -public class UniqueFluidStackSet extends FluidStackSet -{ +public class UniqueFluidStackSet extends FluidStackSet { @Override - public boolean add(final FluidStack e) { - return e != null && this.getExisting(e) == null && this.itemStacks.add(e.copy()); + public boolean add(FluidStack fluidStack) { + return fluidStack != null + && getExisting(fluidStack) == null + && itemStacks.add(fluidStack.copy()); } @Override - public boolean remove(final Object o) { - if (this.contains(o)) { - final FluidStack r = (FluidStack) o; - final FluidStack existing = this.getExisting(r); - this.itemStacks.remove(existing); + public boolean remove(Object object) { + if (contains(object)) { + FluidStack existing = getExisting((FluidStack) object); + itemStacks.remove(existing); } return false; } diff --git a/src/main/java/binnie/core/util/UniqueItemStackSet.java b/src/main/java/binnie/core/util/UniqueItemStackSet.java index 3b58419e..638be1b0 100644 --- a/src/main/java/binnie/core/util/UniqueItemStackSet.java +++ b/src/main/java/binnie/core/util/UniqueItemStackSet.java @@ -1,24 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.util; import net.minecraft.item.ItemStack; -public class UniqueItemStackSet extends ItemStackSet -{ +public class UniqueItemStackSet extends ItemStackSet { @Override - public boolean add(final ItemStack e) { - return e != null && this.getExisting(e) == null && this.itemStacks.add(e.copy()); + public boolean add(ItemStack itemStack) { + return itemStack != null + && getExisting(itemStack) == null + && itemStacks.add(itemStack.copy()); } @Override - public boolean remove(final Object o) { - if (this.contains(o)) { - final ItemStack r = (ItemStack) o; - final ItemStack existing = this.getExisting(r); - this.itemStacks.remove(existing); + public boolean remove(Object object) { + if (contains(object)) { + ItemStack existing = getExisting((ItemStack) object); + itemStacks.remove(existing); } return false; } diff --git a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java index 7b303e74..1c425a43 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java @@ -276,8 +276,8 @@ public class WindowFieldKit extends Window } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { - super.recieveGuiNBT(side, player, name, action); + public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { + super.recieveGuiNBT(side, player, name, nbt); if (side == Side.SERVER && name.equals("analyse")) { this.getWindowInventory().setInventorySlotContents(0, Analyser.analyse(this.getWindowInventory().getStackInSlot(0))); this.getWindowInventory().decrStackSize(1, 1); diff --git a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java index d1b40de4..60886fb3 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java @@ -198,10 +198,10 @@ public class WindowGenesis extends Window } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { - super.recieveGuiNBT(side, player, name, action); + public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { + super.recieveGuiNBT(side, player, name, nbt); if (side == Side.SERVER && name.equals("genesis")) { - final ItemStack stack = ItemStack.loadItemStackFromNBT(action); + final ItemStack stack = ItemStack.loadItemStackFromNBT(nbt); final InventoryPlayer playerInv = player.inventory; if (stack == null) { return; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java b/src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java index 6e09f713..80831153 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java @@ -56,9 +56,9 @@ public class WindowPress extends Window } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { + public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { final Press.ComponentFruitPressLogic logic = Machine.getInterface(Press.ComponentFruitPressLogic.class, this.getInventory()); - super.recieveGuiNBT(side, player, name, action); + super.recieveGuiNBT(side, player, name, nbt); if (side == Side.SERVER && name.equals("fruitpress-click")) { if (logic.canWork() == null && (logic.canProgress() == null || logic.canProgress() instanceof ErrorState.InsufficientPower)) { logic.alterProgress(2.0f); diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java b/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java index 75b00058..3d9b259d 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java +++ b/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java @@ -47,10 +47,10 @@ public class WindowGeneBank extends WindowMachine ControlGeneScroll genes; @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { - super.recieveGuiNBT(side, player, name, action); + public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { + super.recieveGuiNBT(side, player, name, nbt); if (side == Side.SERVER && name.equals("gene-select")) { - final Gene gene = new Gene(action.getCompoundTag("gene")); + final Gene gene = new Gene(nbt.getCompoundTag("gene")); if (gene != null && !gene.isCorrupted()) { final ItemStack held = this.getHeldItemStack(); final ItemStack converted = Engineering.addGene(held, gene); diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowSequencer.java b/src/main/java/binnie/craftgui/genetics/machine/WindowSequencer.java index 93f987af..3cafc6a3 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowSequencer.java +++ b/src/main/java/binnie/craftgui/genetics/machine/WindowSequencer.java @@ -44,11 +44,11 @@ public class WindowSequencer extends WindowMachine } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { + public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { if (side == Side.CLIENT && name.equals("username")) { - this.slotText.setValue("§8Genes will be sequenced by " + action.getString("username")); + this.slotText.setValue("§8Genes will be sequenced by " + nbt.getString("username")); } - super.recieveGuiNBT(side, player, name, action); + super.recieveGuiNBT(side, player, name, nbt); } @Override diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/craftgui/minecraft/Window.java index dc1492f2..d68dd2e6 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/craftgui/minecraft/Window.java @@ -280,19 +280,19 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { + public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { if (side == Side.CLIENT && name.equals("username")) { final float w = this.w(); final float titleButtonRight = this.titleButtonRight + 16.0f; this.titleButtonRight = titleButtonRight; - final ControlUser controlUser = new ControlUser(this, w - titleButtonRight, 8.0f, action.getString("username")); + final ControlUser controlUser = new ControlUser(this, w - titleButtonRight, 8.0f, nbt.getString("username")); this.titleButtonRight += 6.0f; } if (side == Side.CLIENT && name.equals("power-system")) { final float w2 = this.w(); final float titleButtonRight2 = this.titleButtonRight + 16.0f; this.titleButtonRight = titleButtonRight2; - final ControlPowerSystem controlPowerSystem = new ControlPowerSystem(this, w2 - titleButtonRight2, 8.0f, PowerSystem.get(action.getByte("system"))); + final ControlPowerSystem controlPowerSystem = new ControlPowerSystem(this, w2 - titleButtonRight2, 8.0f, PowerSystem.get(nbt.getByte("system"))); this.titleButtonRight += 6.0f; } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java b/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java index b5b1a494..63359f00 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java @@ -5,7 +5,7 @@ package binnie.craftgui.minecraft.control; import binnie.craftgui.core.geometry.IPoint; -import binnie.core.genetics.IItemStackRepresentitive; +import binnie.core.genetics.IItemStackRepresentative; import net.minecraft.item.ItemStack; import binnie.craftgui.controls.tab.ControlTabBar; import binnie.craftgui.controls.tab.ControlTab; @@ -21,8 +21,8 @@ public class ControlTabIcon extends ControlTab } public ItemStack getItemStack() { - if (this.value instanceof IItemStackRepresentitive) { - return ((IItemStackRepresentitive) this.value).getItemStackRepresentitive(); + if (this.value instanceof IItemStackRepresentative) { + return ((IItemStackRepresentative) this.value).getItemStackRepresentative(); } return null; } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java index 96667db1..cbbafa91 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java @@ -68,8 +68,8 @@ public enum AlvearyMachine implements IMachineType } @Override - public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { - MachineRendererBlock.instance.renderMachine(this.machineTexture, x, y, z, var8); + public void renderMachine(final Machine machine, final double x, final double y, final double z, final float partialTick, final RenderBlocks renderer) { + MachineRendererBlock.instance.renderMachine(this.machineTexture, x, y, z, partialTick); } } } diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java index 075fc655..55c41dcf 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java @@ -141,7 +141,7 @@ public enum ExtraBeeItems implements IItemMisc } @Override - public IIcon getIcon(final ItemStack stack) { + public IIcon getIcon(final ItemStack itemStack) { return this.icon; } @@ -152,17 +152,17 @@ public enum ExtraBeeItems implements IItemMisc } @Override - public void addInformation(final List par3List) { + public void addInformation(final List data) { } @Override - public String getName(final ItemStack stack) { + public String getName(final ItemStack itemStack) { return this.name; } @Override - public ItemStack get(final int i) { - return new ItemStack(ExtraBees.itemMisc, i, this.ordinal()); + public ItemStack get(final int count) { + return new ItemStack(ExtraBees.itemMisc, count, this.ordinal()); } static { diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java index 9e8ac13d..2896b7e1 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java @@ -138,12 +138,12 @@ public enum EnumHoneyComb implements IItemEnum } @Override - public ItemStack get(final int size) { - return new ItemStack(ExtraBees.comb, size, this.ordinal()); + public ItemStack get(final int count) { + return new ItemStack(ExtraBees.comb, count, this.ordinal()); } @Override - public String getName(final ItemStack stack) { + public String getName(final ItemStack itemStack) { return ExtraBees.proxy.localise("item.comb." + this.name().toLowerCase()); } diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java index 03f7a071..15d8d95d 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java @@ -87,12 +87,12 @@ public enum EnumHoneyDrop implements IItemEnum } @Override - public ItemStack get(final int size) { - return new ItemStack(ExtraBees.honeyDrop, size, this.ordinal()); + public ItemStack get(final int count) { + return new ItemStack(ExtraBees.honeyDrop, count, this.ordinal()); } @Override - public String getName(final ItemStack stack) { + public String getName(final ItemStack itemStack) { return ExtraBees.proxy.localise("item.honeydrop." + this.name().toLowerCase()); } } diff --git a/src/main/java/binnie/extrabees/products/EnumPropolis.java b/src/main/java/binnie/extrabees/products/EnumPropolis.java index f07a7bfe..ea921246 100644 --- a/src/main/java/binnie/extrabees/products/EnumPropolis.java +++ b/src/main/java/binnie/extrabees/products/EnumPropolis.java @@ -61,12 +61,12 @@ public enum EnumPropolis implements IItemEnum } @Override - public ItemStack get(final int size) { - return new ItemStack(ExtraBees.propolis, size, this.ordinal()); + public ItemStack get(final int count) { + return new ItemStack(ExtraBees.propolis, count, this.ordinal()); } @Override - public String getName(final ItemStack stack) { + public String getName(final ItemStack itemStack) { return ExtraBees.proxy.localise("item.propolis." + this.name().toLowerCase()); } } diff --git a/src/main/java/binnie/extratrees/block/BlockBranch.java b/src/main/java/binnie/extratrees/block/BlockBranch.java index 5f6a3530..a0524f16 100644 --- a/src/main/java/binnie/extratrees/block/BlockBranch.java +++ b/src/main/java/binnie/extratrees/block/BlockBranch.java @@ -4,27 +4,28 @@ package binnie.extratrees.block; -import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.entity.player.EntityPlayer; import binnie.core.block.BlockMetadata; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.block.Block; -import binnie.core.block.TileEntityMetadata; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import forestry.api.core.Tabs; -import binnie.core.block.IBlockMetadata; +import net.minecraft.block.Block; import net.minecraft.block.BlockLog; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; +import java.util.List; public class BlockBranch extends BlockLog implements IBlockMetadata { @@ -73,8 +74,8 @@ public class BlockBranch extends BlockLog implements IBlockMetadata } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override @@ -110,18 +111,18 @@ public class BlockBranch extends BlockLog implements IBlockMetadata } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return ILogType.ExtraTreeLog.values()[meta].getName() + " Branch"; } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - return TileEntityMetadata.getItemDamage(stack); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 818e646a..e2eee419 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -46,9 +46,9 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { protected BlockETDoor() { super(Material.wood); - this.setHardness(3.0f).setStepSound(Block.soundTypeWood); - this.setCreativeTab(Tabs.tabArboriculture); - this.setBlockName("door"); + setHardness(3.0f).setStepSound(Block.soundTypeWood); + setCreativeTab(Tabs.tabArboriculture); + setBlockName("door"); } @Override @@ -60,32 +60,23 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { @SideOnly(Side.CLIENT) public IIcon getIcon(final IBlockAccess blockAccess, final int x, final int y, final int z, final int par5) { if (par5 != 1 && par5 != 0) { - final int i1 = this.getFullMetadata(blockAccess, x, y, z); + final int i1 = getFullMetadata(blockAccess, x, y, z); final int j1 = i1 & 0x3; - final boolean flag = (i1 & 0x4) != 0x0; - boolean flag2 = false; - final boolean flag3 = (i1 & 0x8) != 0x0; + final boolean flag = (i1 & 0x4) != 0; + boolean flag2; + final boolean flag3 = (i1 & 0x8) != 0; if (flag) { - if (j1 == 0 && par5 == 2) { - flag2 = !flag2; - } else if (j1 == 1 && par5 == 5) { - flag2 = !flag2; - } else if (j1 == 2 && par5 == 3) { - flag2 = !flag2; - } else if (j1 == 3 && par5 == 4) { - flag2 = !flag2; - } + flag2 = (j1 == 0 && par5 == 2) + || (j1 == 1 && par5 == 5) + || (j1 == 2 && par5 == 3) + || (j1 == 3 && par5 == 4); } else { - if (j1 == 0 && par5 == 5) { - flag2 = !flag2; - } else if (j1 == 1 && par5 == 3) { - flag2 = !flag2; - } else if (j1 == 2 && par5 == 4) { - flag2 = !flag2; - } else if (j1 == 3 && par5 == 2) { - flag2 = !flag2; - } - if ((i1 & 0x10) != 0x0) { + flag2 = (j1 == 0 && par5 == 5) + || (j1 == 1 && par5 == 3) + || (j1 == 2 && par5 == 4) + || (j1 == 3 && par5 == 2); + + if ((i1 & 0x10) != 0) { flag2 = !flag2; } } @@ -119,38 +110,8 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { @Override @SideOnly(Side.CLIENT) public int colorMultiplier(final IBlockAccess blockAccess, final int x, final int y, final int z) { - final int par5 = 2; - final int i1 = this.getFullMetadata(blockAccess, x, y, z); - final int j1 = i1 & 0x3; - final boolean flag = (i1 & 0x4) != 0x0; - boolean flag2 = false; - final boolean flag3 = (i1 & 0x8) != 0x0; - // TODO useless code? - if (flag) { - if (j1 == 0 && par5 == 2) { - flag2 = !flag2; - } else if (j1 == 1 && par5 == 5) { - flag2 = !flag2; - } else if (j1 == 2 && par5 == 3) { - flag2 = !flag2; - } else if (j1 == 3 && par5 == 4) { - flag2 = !flag2; - } - } else { - if (j1 == 0 && par5 == 5) { - flag2 = !flag2; - } else if (j1 == 1 && par5 == 3) { - flag2 = !flag2; - } else if (j1 == 2 && par5 == 4) { - flag2 = !flag2; - } else if (j1 == 3 && par5 == 2) { - flag2 = !flag2; - } - if ((i1 & 0x10) != 0x0) { - flag2 = !flag2; - } - } - if (flag3) { + final int i1 = getFullMetadata(blockAccess, x, y, z); + if ((i1 & 0x8) != 0) { final int meta = TileEntityMetadata.getTileMetadata(blockAccess, x, y - 1, z); return WoodManager.getPlankType(meta & 0xFF).getColour(); } @@ -236,13 +197,13 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { } @Override - public void getBlockTooltip(final ItemStack itemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { // ignored } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + dropBlockAsItem(world, x, y, z, itemStack); } @Override diff --git a/src/main/java/binnie/extratrees/block/BlockETLog.java b/src/main/java/binnie/extratrees/block/BlockETLog.java index fb387cd7..fe4ad558 100644 --- a/src/main/java/binnie/extratrees/block/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/BlockETLog.java @@ -97,8 +97,8 @@ public class BlockETLog extends BlockLog implements IBlockMetadata } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override @@ -134,13 +134,13 @@ public class BlockETLog extends BlockLog implements IBlockMetadata } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.log.name", ILogType.ExtraTreeLog.values()[meta].getName()); } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { } @Override @@ -149,8 +149,8 @@ public class BlockETLog extends BlockLog implements IBlockMetadata } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - return TileEntityMetadata.getItemDamage(stack); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override diff --git a/src/main/java/binnie/extratrees/block/BlockETPlanks.java b/src/main/java/binnie/extratrees/block/BlockETPlanks.java index 88c148e5..558863d2 100644 --- a/src/main/java/binnie/extratrees/block/BlockETPlanks.java +++ b/src/main/java/binnie/extratrees/block/BlockETPlanks.java @@ -66,8 +66,8 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - return TileEntityMetadata.getItemDamage(stack); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override @@ -76,18 +76,18 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName()); } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override diff --git a/src/main/java/binnie/extratrees/block/BlockETSlab.java b/src/main/java/binnie/extratrees/block/BlockETSlab.java index 3f023284..ee5f39b1 100644 --- a/src/main/java/binnie/extratrees/block/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/BlockETSlab.java @@ -73,8 +73,8 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - return TileEntityMetadata.getItemDamage(stack); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override @@ -83,18 +83,18 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName()); } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override diff --git a/src/main/java/binnie/extratrees/block/BlockETStairs.java b/src/main/java/binnie/extratrees/block/BlockETStairs.java index 717ca510..1f2e9f25 100644 --- a/src/main/java/binnie/extratrees/block/BlockETStairs.java +++ b/src/main/java/binnie/extratrees/block/BlockETStairs.java @@ -66,8 +66,8 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override @@ -98,8 +98,8 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - return TileEntityMetadata.getItemDamage(stack); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override @@ -108,13 +108,13 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName()); } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { } @Override diff --git a/src/main/java/binnie/extratrees/block/ItemETDoor.java b/src/main/java/binnie/extratrees/block/ItemETDoor.java index 1877e1ed..fc1bd64c 100644 --- a/src/main/java/binnie/extratrees/block/ItemETDoor.java +++ b/src/main/java/binnie/extratrees/block/ItemETDoor.java @@ -104,8 +104,8 @@ public class ItemETDoor extends ItemMetadata @SideOnly(Side.CLIENT) @Override - public IIcon getIconFromDamage(final int par1) { - final DoorType type = BlockETDoor.getDoorType(par1); + public IIcon getIconFromDamage(final int damage) { + final DoorType type = BlockETDoor.getDoorType(damage); return type.iconItem; } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index 28a97d79..0451409c 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -4,35 +4,36 @@ package binnie.extratrees.block.decor; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import binnie.core.Mods; -import net.minecraft.item.ItemBlock; -import net.minecraft.block.Block; import binnie.Binnie; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.entity.player.EntityPlayer; +import binnie.core.Mods; import binnie.core.block.BlockMetadata; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.IFenceProvider; +import binnie.extratrees.block.PlankType; import binnie.extratrees.block.WoodManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.core.block.TileEntityMetadata; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import binnie.extratrees.block.IFenceProvider; -import binnie.extratrees.block.PlankType; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import forestry.api.core.Tabs; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import binnie.core.block.IBlockMetadata; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; +import java.util.List; public class BlockFence extends net.minecraft.block.BlockFence implements IBlockMetadata, IBlockFence { @@ -77,8 +78,8 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override @@ -109,8 +110,8 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - return TileEntityMetadata.getItemDamage(stack); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override @@ -119,13 +120,13 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.woodfence.name", this.getDescription(meta).getPlankType().getName()); } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockGate.java b/src/main/java/binnie/extratrees/block/decor/BlockGate.java index dd19f3a4..a10e7cdd 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockGate.java @@ -64,8 +64,8 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { - this.dropBlockAsItem(world, x, y, z, drop); + public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + this.dropBlockAsItem(world, x, y, z, itemStack); } @Override @@ -96,8 +96,8 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - return TileEntityMetadata.getItemDamage(stack); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + return TileEntityMetadata.getItemDamage(itemStack); } @Override @@ -106,13 +106,13 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName()); } @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 3290e0be..67ab6d7a 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -36,8 +36,8 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata } @Override - public String getBlockName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getBlockName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); final IPlankType type1 = this.getDescription(meta).getPlankType(); final IPlankType type2 = this.getDescription(meta).getSecondaryPlankType(); final boolean twoTypes = type1 != type2; diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index adfab20b..ecda81f3 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -76,8 +76,8 @@ public class BlockCarpentryPanel extends BlockCarpentry } @Override - public String getBlockName(final ItemStack stack) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); + public String getBlockName(final ItemStack itemStack) { + final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); return Binnie.Language.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName()); } @@ -120,8 +120,8 @@ public class BlockCarpentryPanel extends BlockCarpentry } @Override - public int getPlacedMeta(final ItemStack item, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - final DesignBlock block = ModuleCarpentry.getCarpentryPanel(this.getDesignSystem(), TileEntityMetadata.getItemDamage(item)); + public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { + final DesignBlock block = ModuleCarpentry.getCarpentryPanel(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); ForgeDirection facing = clickedBlock; boolean valid = true; if (!isValidPanelPlacement(world, x, y, z, facing)) { diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index df33f924..1119ee10 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -90,8 +90,8 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } @Override - public String getBlockName(final ItemStack stack) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); + public String getBlockName(final ItemStack itemStack) { + final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); return this.getBlockName(block); } @@ -122,13 +122,13 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } @Override - public void getBlockTooltip(final ItemStack stack, final List par3List) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); + public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { + final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { - par3List.add(block.getPrimaryMaterial().getName() + " and " + block.getSecondaryMaterial().getName()); + tooltip.add(block.getPrimaryMaterial().getName() + " and " + block.getSecondaryMaterial().getName()); } else { - par3List.add(block.getPrimaryMaterial().getName()); + tooltip.add(block.getPrimaryMaterial().getName()); } } diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index c2291441..4b1b03af 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -38,7 +38,7 @@ public enum ExtraTreeItems implements IItemMisc } @Override - public IIcon getIcon(final ItemStack stack) { + public IIcon getIcon(final ItemStack itemStack) { return this.icon; } @@ -48,11 +48,11 @@ public enum ExtraTreeItems implements IItemMisc } @Override - public void addInformation(final List par3List) { + public void addInformation(final List data) { } @Override - public String getName(final ItemStack stack) { + public String getName(final ItemStack itemStack) { return this.name; } @@ -62,7 +62,7 @@ public enum ExtraTreeItems implements IItemMisc } @Override - public ItemStack get(final int i) { - return new ItemStack(ExtraTrees.itemMisc, i, this.ordinal()); + public ItemStack get(final int count) { + return new ItemStack(ExtraTrees.itemMisc, count, this.ordinal()); } } diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java index 10967ec5..c0744e5a 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java @@ -57,8 +57,8 @@ public enum ExtraTreeLiquid implements ILiquidType } @Override - public FluidStack get(final int i) { - return Binnie.Liquid.getLiquidStack(this.ident, i); + public FluidStack get(final int amount) { + return Binnie.Liquid.getLiquidStack(this.ident, amount); } @Override diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index fac04505..a5dabd01 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -108,17 +108,17 @@ public enum Food implements IItemMisc } @Override - public String getName(final ItemStack stack) { + public String getName(final ItemStack itemStack) { return ExtraTrees.proxy.localise("item.food." + this.name().toLowerCase()); } @Override - public ItemStack get(final int i) { - return new ItemStack(ExtraTrees.itemFood, i, this.ordinal()); + public ItemStack get(final int count) { + return new ItemStack(ExtraTrees.itemFood, count, this.ordinal()); } @Override - public IIcon getIcon(final ItemStack stack) { + public IIcon getIcon(final ItemStack itemStack) { return this.icon; } @@ -128,7 +128,7 @@ public enum Food implements IItemMisc } @Override - public void addInformation(final List par3List) { + public void addInformation(final List data) { } public void addJuice(final Juice juice, final int time, final int amount, final int mulch) { diff --git a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java index feafbec2..c5ce4bc0 100644 --- a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java +++ b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java @@ -66,8 +66,8 @@ public enum KitchenMachine implements IMachineType } @Override - public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { - MachineRendererKitchen.instance.renderMachine(machine, this.textureName, x, y, z, var8, renderer); + public void renderMachine(final Machine machine, final double x, final double y, final double z, final float partialTick, final RenderBlocks renderer) { + MachineRendererKitchen.instance.renderMachine(machine, this.textureName, x, y, z, partialTick, renderer); } } } diff --git a/src/main/java/binnie/extratrees/machines/Brewery.java b/src/main/java/binnie/extratrees/machines/Brewery.java index 2d470c7e..325c4eca 100644 --- a/src/main/java/binnie/extratrees/machines/Brewery.java +++ b/src/main/java/binnie/extratrees/machines/Brewery.java @@ -4,39 +4,34 @@ package binnie.extratrees.machines; -import binnie.core.liquid.IFluidType; -import binnie.extratrees.alcohol.Alcohol; import binnie.Binnie; -import net.minecraftforge.oredict.OreDictionary; -import java.util.HashMap; -import binnie.extratrees.item.ExtraTreeItems; -import binnie.core.machines.inventory.TankValidator; -import binnie.core.machines.inventory.SlotValidator; -import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.relauncher.Side; -import java.util.Map; -import binnie.core.machines.power.ErrorState; -import binnie.core.machines.network.INetwork; -import binnie.core.machines.power.IProcess; -import binnie.core.machines.power.ComponentProcessSetCost; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import forestry.api.core.INBTTagable; -import binnie.core.machines.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; -import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.core.machines.inventory.MachineSide; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.extratrees.core.ExtraTreesGUID; +import binnie.core.liquid.IFluidType; import binnie.core.machines.Machine; -import binnie.extratrees.core.ExtraTreeTexture; +import binnie.core.machines.TileEntityMachine; +import binnie.core.machines.inventory.*; +import binnie.core.machines.network.INetwork; +import binnie.core.machines.power.ComponentPowerReceptor; +import binnie.core.machines.power.ComponentProcessSetCost; +import binnie.core.machines.power.ErrorState; +import binnie.core.machines.power.IProcess; import binnie.craftgui.minecraft.IMachineInformation; -import java.util.ArrayList; -import net.minecraftforge.fluids.FluidStack; +import binnie.extratrees.alcohol.Alcohol; +import binnie.extratrees.core.ExtraTreeTexture; +import binnie.extratrees.core.ExtraTreesGUID; +import binnie.extratrees.item.ExtraTreeItems; +import cpw.mods.fml.relauncher.Side; +import forestry.api.core.INBTTagable; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class Brewery { @@ -302,7 +297,7 @@ public class Brewery } @Override - public void sendGuiNBT(final Map data) { + public void sendGuiNBT(final Map nbts) { final NBTTagCompound nbt = new NBTTagCompound(); if (this.currentCrafting == null) { nbt.setBoolean("null", true); @@ -310,7 +305,7 @@ public class Brewery else { this.currentCrafting.writeToNBT(nbt); } - data.put("brewery-recipe", nbt); + nbts.put("brewery-recipe", nbt); } @Override @@ -388,8 +383,8 @@ public class Brewery public static class TankValidatorFermentInput extends TankValidator { @Override - public boolean isValid(final FluidStack itemStack) { - return Brewery.isValidInputLiquid(itemStack); + public boolean isValid(final FluidStack liquid) { + return Brewery.isValidInputLiquid(liquid); } @Override @@ -401,8 +396,8 @@ public class Brewery public static class TankValidatorFermentOutput extends TankValidator { @Override - public boolean isValid(final FluidStack itemStack) { - return Brewery.isValidOutputLiquid(itemStack); + public boolean isValid(final FluidStack liquid) { + return Brewery.isValidOutputLiquid(liquid); } @Override diff --git a/src/main/java/binnie/extratrees/machines/Designer.java b/src/main/java/binnie/extratrees/machines/Designer.java index 9ac6074b..034e410b 100644 --- a/src/main/java/binnie/extratrees/machines/Designer.java +++ b/src/main/java/binnie/extratrees/machines/Designer.java @@ -204,10 +204,10 @@ public abstract class Designer } @Override - public void sendGuiNBT(final Map nbt) { + public void sendGuiNBT(final Map nbts) { final NBTTagCompound tag = new NBTTagCompound(); tag.setShort("d", (short) CarpentryManager.carpentryInterface.getDesignIndex(this.getDesign())); - nbt.put("design", tag); + nbts.put("design", tag); } public DesignerType getDesignerType() { diff --git a/src/main/java/binnie/extratrees/machines/Distillery.java b/src/main/java/binnie/extratrees/machines/Distillery.java index 63e9be10..713c6cc9 100644 --- a/src/main/java/binnie/extratrees/machines/Distillery.java +++ b/src/main/java/binnie/extratrees/machines/Distillery.java @@ -4,30 +4,31 @@ package binnie.extratrees.machines; -import binnie.core.machines.inventory.TankValidator; -import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.relauncher.Side; -import binnie.core.machines.power.ErrorState; -import net.minecraft.nbt.NBTTagCompound; -import binnie.core.machines.network.INetwork; -import binnie.core.machines.power.IProcess; -import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; -import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.core.machines.inventory.MachineSide; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.extratrees.core.ExtraTreesGUID; import binnie.core.machines.Machine; -import binnie.extratrees.core.ExtraTreeTexture; +import binnie.core.machines.TileEntityMachine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.MachineSide; +import binnie.core.machines.inventory.TankValidator; +import binnie.core.machines.network.INetwork; +import binnie.core.machines.power.ComponentPowerReceptor; +import binnie.core.machines.power.ComponentProcessSetCost; +import binnie.core.machines.power.ErrorState; +import binnie.core.machines.power.IProcess; import binnie.craftgui.minecraft.IMachineInformation; -import java.util.HashMap; -import java.util.ArrayList; -import net.minecraftforge.fluids.FluidStack; +import binnie.extratrees.core.ExtraTreeTexture; +import binnie.extratrees.core.ExtraTreesGUID; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; -import java.util.Map; +import net.minecraftforge.fluids.FluidStack; + +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class Distillery { @@ -194,7 +195,7 @@ public class Distillery } @Override - public void sendGuiNBT(final Map data) { + public void sendGuiNBT(final Map nbts) { final NBTTagCompound nbt = new NBTTagCompound(); if (this.currentFluid == null) { nbt.setBoolean("null", true); @@ -202,10 +203,10 @@ public class Distillery else { this.currentFluid.writeToNBT(nbt); } - data.put("still-recipe", nbt); + nbts.put("still-recipe", nbt); final NBTTagCompound nbt2 = new NBTTagCompound(); nbt.setByte("i", (byte) this.level); - data.put("still-level", nbt); + nbts.put("still-level", nbt); } @Override @@ -229,8 +230,8 @@ public class Distillery public static class TankValidatorDistilleryInput extends TankValidator { @Override - public boolean isValid(final FluidStack itemStack) { - return Distillery.isValidInputLiquid(itemStack); + public boolean isValid(final FluidStack liquid) { + return Distillery.isValidInputLiquid(liquid); } @Override @@ -242,8 +243,8 @@ public class Distillery public static class TankValidatorDistilleryOutput extends TankValidator { @Override - public boolean isValid(final FluidStack itemStack) { - return Distillery.isValidOutputLiquid(itemStack); + public boolean isValid(final FluidStack liquid) { + return Distillery.isValidOutputLiquid(liquid); } @Override diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index e6d7daca..0281b5bf 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -96,8 +96,8 @@ public enum ExtraTreeMachine implements IMachineType } @Override - public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { - MachineRendererForestry.renderMachine(this.textureName.getShortPath(), x, y, z, var8); + public void renderMachine(final Machine machine, final double x, final double y, final double z, final float partialTick, final RenderBlocks renderer) { + MachineRendererForestry.renderMachine(this.textureName.getShortPath(), x, y, z, partialTick); } } } diff --git a/src/main/java/binnie/extratrees/machines/Infuser.java b/src/main/java/binnie/extratrees/machines/Infuser.java index 899af451..1a573cae 100644 --- a/src/main/java/binnie/extratrees/machines/Infuser.java +++ b/src/main/java/binnie/extratrees/machines/Infuser.java @@ -152,8 +152,8 @@ public class Infuser public static class TankValidatorInfuserInput extends TankValidator { @Override - public boolean isValid(final FluidStack itemStack) { - return Infuser.isValidInputLiquid(itemStack); + public boolean isValid(final FluidStack liquid) { + return Infuser.isValidInputLiquid(liquid); } @Override @@ -165,8 +165,8 @@ public class Infuser public static class TankValidatorInfuserOutput extends TankValidator { @Override - public boolean isValid(final FluidStack itemStack) { - return Infuser.isValidOutputLiquid(itemStack); + public boolean isValid(final FluidStack liquid) { + return Infuser.isValidOutputLiquid(liquid); } @Override diff --git a/src/main/java/binnie/extratrees/machines/Nursery.java b/src/main/java/binnie/extratrees/machines/Nursery.java index d2a533e5..27f9ef16 100644 --- a/src/main/java/binnie/extratrees/machines/Nursery.java +++ b/src/main/java/binnie/extratrees/machines/Nursery.java @@ -36,7 +36,7 @@ public class Nursery } @Override - public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { + public void renderMachine(final Machine machine, final double x, final double y, final double z, final float partialTick, final RenderBlocks renderer) { } } } diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index a5f779eb..97e6c0f8 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -152,7 +152,7 @@ public class WindowAnalyst extends Window CraftGUI.Render.colour(1140850688 + syst.getColour()); CraftGUI.Render.texture(CraftGUITexture.TabSolid, this.getArea().outset(outset)); } - CraftGUI.Render.item(new IPoint(2.0f, 2.0f), syst.getItemStackRepresentitive()); + CraftGUI.Render.item(new IPoint(2.0f, 2.0f), syst.getItemStackRepresentative()); } }; x += 22; diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index a2d1fc70..1bf6e604 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -36,7 +36,7 @@ public enum GeneticsItems implements IItemMisc } @Override - public IIcon getIcon(final ItemStack stack) { + public IIcon getIcon(final ItemStack itemStack) { return this.icon; } @@ -46,17 +46,17 @@ public enum GeneticsItems implements IItemMisc } @Override - public void addInformation(final List par3List) { + public void addInformation(final List data) { } @Override - public String getName(final ItemStack stack) { + public String getName(final ItemStack itemStack) { return this.name; } @Override - public ItemStack get(final int size) { - return (Genetics.itemGenetics == null) ? null : new ItemStack(Genetics.itemGenetics, size, this.ordinal()); + public ItemStack get(final int count) { + return (Genetics.itemGenetics == null) ? null : new ItemStack(Genetics.itemGenetics, count, this.ordinal()); } @Override diff --git a/src/main/java/binnie/genetics/machine/Analyser.java b/src/main/java/binnie/genetics/machine/Analyser.java index 38c728c1..3e54d9bb 100644 --- a/src/main/java/binnie/genetics/machine/Analyser.java +++ b/src/main/java/binnie/genetics/machine/Analyser.java @@ -260,7 +260,7 @@ public class Analyser @SideOnly(Side.CLIENT) @Override - public void renderInWorld(final RenderItem customRenderItem, final double x, final double y, final double z) { + public void renderInWorld(final RenderItem renderItem, final double x, final double y, final double z) { if (!this.getUtil().getProcess().isInProgress()) { return; } @@ -280,7 +280,7 @@ public class Analyser GL11.glPushMatrix(); GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f); GL11.glTranslatef(0.0f, -0.2f, 0.0f); - customRenderItem.doRender(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f); + renderItem.doRender(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f); GL11.glPopMatrix(); } diff --git a/src/main/java/binnie/genetics/machine/Genepool.java b/src/main/java/binnie/genetics/machine/Genepool.java index f5575b4e..91fa03d0 100644 --- a/src/main/java/binnie/genetics/machine/Genepool.java +++ b/src/main/java/binnie/genetics/machine/Genepool.java @@ -85,8 +85,8 @@ public class Genepool } @Override - public boolean isValid(final FluidStack stack) { - return stack.getFluid().getName() == "bioethanol"; + public boolean isValid(final FluidStack liquid) { + return liquid.getFluid().getName() == "bioethanol"; } }); final ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); diff --git a/src/main/java/binnie/genetics/machine/GeneticMachine.java b/src/main/java/binnie/genetics/machine/GeneticMachine.java index 938fe7a6..485038ce 100644 --- a/src/main/java/binnie/genetics/machine/GeneticMachine.java +++ b/src/main/java/binnie/genetics/machine/GeneticMachine.java @@ -64,8 +64,8 @@ public enum GeneticMachine implements IMachineType } @Override - public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { - MachineRendererGenetics.instance.renderMachine(machine, this.colour, this.renderTexture, x, y, z, var8); + public void renderMachine(final Machine machine, final double x, final double y, final double z, final float partialTick, final RenderBlocks renderer) { + MachineRendererGenetics.instance.renderMachine(machine, this.colour, this.renderTexture, x, y, z, partialTick); } } } diff --git a/src/main/java/binnie/genetics/machine/Inoculator.java b/src/main/java/binnie/genetics/machine/Inoculator.java index b61ece5b..aa298306 100644 --- a/src/main/java/binnie/genetics/machine/Inoculator.java +++ b/src/main/java/binnie/genetics/machine/Inoculator.java @@ -352,7 +352,7 @@ public class Inoculator @SideOnly(Side.CLIENT) @Override - public void renderInWorld(final RenderItem customRenderItem, final double x, final double y, final double z) { + public void renderInWorld(final RenderItem renderItem, final double x, final double y, final double z) { if (!this.getUtil().getProcess().isInProgress()) { return; } @@ -372,7 +372,7 @@ public class Inoculator GL11.glPushMatrix(); GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f); GL11.glTranslatef(0.0f, -0.25f, 0.0f); - customRenderItem.doRender(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f); + renderItem.doRender(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f); GL11.glPopMatrix(); } diff --git a/src/main/java/binnie/genetics/machine/Isolator.java b/src/main/java/binnie/genetics/machine/Isolator.java index 902b552b..1e9ec7df 100644 --- a/src/main/java/binnie/genetics/machine/Isolator.java +++ b/src/main/java/binnie/genetics/machine/Isolator.java @@ -99,8 +99,8 @@ public class Isolator } @Override - public boolean isValid(final FluidStack stack) { - return stack.getFluid().getName() == "bioethanol"; + public boolean isValid(final FluidStack liquid) { + return liquid.getFluid().getName() == "bioethanol"; } }); final ComponentChargedSlots chargedSlots = new ComponentChargedSlots(machine); diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index de8feead..590b4d5a 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -71,8 +71,8 @@ public enum LaboratoryMachine implements IMachineType } @Override - public void renderMachine(final Machine machine, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { - MachineRendererLab.instance.renderMachine(machine, this.colour, this.renderTexture, x, y, z, var8); + public void renderMachine(final Machine machine, final double x, final double y, final double z, final float partialTick, final RenderBlocks renderer) { + MachineRendererLab.instance.renderMachine(machine, this.colour, this.renderTexture, x, y, z, partialTick); } } diff --git a/src/main/java/binnie/genetics/machine/Splicer.java b/src/main/java/binnie/genetics/machine/Splicer.java index 77675c30..08043962 100644 --- a/src/main/java/binnie/genetics/machine/Splicer.java +++ b/src/main/java/binnie/genetics/machine/Splicer.java @@ -366,7 +366,7 @@ public class Splicer @SideOnly(Side.CLIENT) @Override - public void renderInWorld(final RenderItem customRenderItem, final double x, final double y, final double z) { + public void renderInWorld(final RenderItem renderItem, final double x, final double y, final double z) { if (!this.getUtil().getProcess().isInProgress()) { return; } @@ -386,7 +386,7 @@ public class Splicer GL11.glPushMatrix(); GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f); GL11.glTranslatef(0.0f, -0.25f, 0.0f); - customRenderItem.doRender(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f); + renderItem.doRender(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f); GL11.glPopMatrix(); }