From 0669f5eb9d5029a8b94ec552171b0837605f7747 Mon Sep 17 00:00:00 2001 From: draknyte1 Date: Fri, 4 Nov 2016 15:23:26 +1000 Subject: $ Cleaned up the entire project. > Much neat, very nices. --- .../xmod/Computronics/HANDLER_Computronics.java | 35 +- src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 36 +- .../forestry/bees/alveary/AlvearyBeeListener.java | 8 +- .../bees/alveary/FR_AlvearyFrameBlock.java | 18 +- .../forestry/bees/alveary/FR_BlockAlveary.java | 373 +- .../xmod/forestry/bees/alveary/FR_TileAlveary.java | 151 +- .../bees/alveary/IAlvearyComponentAdvanced.java | 22 +- .../bees/alveary/IAlvearyFrameHousing.java | 1 + .../bees/alveary/ISidedFrameWearingInventory.java | 6 +- .../bees/alveary/TileAlvearyFrameHousing.java | 417 +- .../bees/alveary/gui/CONTAINER_FrameHousing.java | 93 +- .../bees/alveary/gui/GUI_FrameHousing.java | 72 +- .../bees/alveary/gui/InventoryFrameHousing.java | 76 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 126 +- .../xmod/forestry/bees/items/FR_StringUtil.java | 15 +- .../xmod/forestry/bees/items/MB_FrameType.java | 126 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 127 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 118 +- src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 36 +- .../xmod/gregtech/api/energy/IC2ElectricItem.java | 7 +- .../api/energy/IC2ElectricItemManager.java | 142 +- .../xmod/gregtech/api/enums/CustomGtTextures.java | 146 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 399 +- .../gregtech/api/enums/GregtechOreDictNames.java | 16 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 1908 ++++++--- .../gregtech/api/enums/GregtechTextureSet.java | 284 +- .../xmod/gregtech/api/enums/GregtechTextures.java | 323 +- .../gregtech/api/enums/GregtechToolDictNames.java | 6 +- .../gregtech/api/gui/CONTAINER_DeluxeTank.java | 98 +- .../api/gui/CONTAINER_IndustrialCentrifuge.java | 50 +- .../api/gui/CONTAINER_IronBlastFurnace.java | 36 +- .../xmod/gregtech/api/gui/CONTAINER_MatterFab.java | 44 +- .../gregtech/api/gui/CONTAINER_MultiMachine.java | 36 +- .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 173 +- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 130 +- .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 163 +- .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 48 +- .../gregtech/api/gui/GUI_IndustrialCentrifuge.java | 96 +- .../gregtech/api/gui/GUI_IronBlastFurnace.java | 43 +- .../xmod/gregtech/api/gui/GUI_MatterFab.java | 110 +- .../xmod/gregtech/api/gui/GUI_MultiMachine.java | 96 +- .../xmod/gregtech/api/gui/GUI_SafeBlock.java | 86 +- .../xmod/gregtech/api/gui/GUI_SolarGenerator.java | 67 +- .../xmod/gregtech/api/gui/GUI_SteamCondenser.java | 89 +- .../api/interfaces/GregtechItemContainer.java | 37 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 151 +- .../internal/Interface_IconContainer.java | 24 +- .../internal/Interface_ItemBehaviour.java | 28 +- .../internal/Interface_OreRecipeRegistrator.java | 25 +- .../Interface_OreRecipeRegistrator_GT.java | 22 +- .../api/interfaces/internal/Interface_Texture.java | 14 +- .../interfaces/internal/Interface_ToolStats.java | 181 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 283 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 581 +-- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 1197 +++--- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 359 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 712 ++-- .../gregtech/api/items/tools/GT_MetaGenTool.java | 723 ++-- .../gregtech/api/items/types/ToolType_Base.java | 114 +- .../api/items/types/ToolType_HardHammer.java | 201 +- .../gregtech/api/items/types/ToolType_Wrench.java | 281 +- .../GT_MetaTileEntity_DeluxeTank.java | 418 +- .../implementations/GregtechMetaCondensor.java | 301 +- .../implementations/GregtechMetaEnergyBuffer.java | 564 +-- .../GregtechMetaPipeEntityFluid.java | 547 +-- .../GregtechMetaPipeEntity_Cable.java | 443 ++- .../GregtechMetaPipeEntity_SuperConductor.java | 450 ++- .../implementations/GregtechMetaSafeBlock.java | 110 +- .../GregtechMetaSuperConductorNodeBase.java | 610 +-- .../base/GregtechMetaPipeEntityBase_Cable.java | 541 ++- .../base/GregtechMetaTileEntity.java | 86 +- .../base/GregtechMeta_MultiBlockBase.java | 1826 +++++---- .../GregtechDoubleFuelGeneratorBase.java | 597 +-- .../base/generators/GregtechMetaBoilerBase.java | 621 +-- .../generators/GregtechMetaSolarGenerator.java | 377 +- .../GregtechRocketFuelGeneratorBase.java | 554 +-- .../GregtechBaseMetaTileEntityLossless.java | 4173 +++++++++++--------- .../GregtechMetaPipeEntity_BaseSuperConductor.java | 1292 +++--- .../lossless/GregtechMetaTileEntityLossless.java | 86 +- .../GregtechMetaTileEntityLosslessBasicTank.java | 494 +-- ...chMetaTileEntityLosslessTieredMachineBlock.java | 111 +- .../base/lossless/MetaTileEntityLossless.java | 1758 +++++---- .../base/machines/GregtechMetaSafeBlockBase.java | 479 ++- .../creative/GregtechMetaCreativeEnergyBuffer.java | 380 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 33 +- .../gregtech/api/objects/GregtechItemData.java | 256 +- .../api/objects/GregtechMaterialStack.java | 84 +- .../api/objects/GregtechRenderedTexture.java | 310 +- .../ProcessingSkookumChoocherToolRecipes.java | 20 +- .../api/util/GregtechOreDictUnificator.java | 798 ++-- .../api/util/GregtechRecipeRegistrator.java | 955 +++-- .../xmod/gregtech/common/Meta_GT_Proxy.java | 1198 +++--- .../common/blocks/GregtechMetaCasingBlocks.java | 67 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 52 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 217 +- .../common/blocks/GregtechMetaCasingItems.java | 9 +- .../common/blocks/GregtechMetaItemCasings1.java | 40 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 78 +- .../common/blocks/fluid/GregtechFluidHandler.java | 339 +- .../blocks/textures/CasingTextureHandler.java | 125 +- .../blocks/textures/CasingTextureHandler2.java | 105 +- .../textures/TexturesCentrifugeMultiblock.java | 791 ++-- .../common/blocks/textures/TexturesGregtech58.java | 802 ++-- .../common/blocks/textures/TexturesGregtech59.java | 901 +++-- .../common/blocks/textures/TexturesGtBlock.java | 285 +- .../common/blocks/textures/TexturesGtTools.java | 77 +- .../common/items/MetaGeneratedGregtechItems.java | 965 ++++- .../common/items/MetaGeneratedGregtechTools.java | 26 +- .../items/behaviours/Behaviour_Choocher.java | 76 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 194 +- .../GT_MetaTileEntity_TesseractGenerator.java | 726 ++-- .../GT_MetaTileEntity_TesseractTerminal.java | 628 ++- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 267 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 255 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 156 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 253 +- .../GregtechMetaTileEntitySolarGenerator.java | 234 +- .../GregtechMetaTileEntitySuperCondensor.java | 212 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 253 +- .../machines/multi/GregtechMTE_NuclearReactor.java | 329 +- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 434 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 351 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 476 +-- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 347 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 346 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 284 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 327 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 289 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 778 ++-- .../GregtechMetaTileEntity_MassFabricator.java | 528 +-- .../multi/GregtechMetaTileEntity_MultiTank.java | 602 +-- ...chMetaTileEntity_PowerSubStationController.java | 274 +- .../storage/GT_MetaTileEntity_TieredTank.java | 258 +- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 152 +- .../common/tools/TOOL_Gregtech_Choocher.java | 315 +- .../xmod/gregtech/loaders/Gregtech_Blocks.java | 32 +- .../loaders/ProcessingToolHeadChoocher.java | 136 +- .../loaders/Processing_Textures_Items.java | 5 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 265 +- .../gregtech/loaders/RecipeGen_BlastSmelterGT.java | 225 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 153 +- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 126 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 162 +- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 259 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 460 ++- .../recipes/machines/RECIPEHANDLER_CokeOven.java | 47 +- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 66 +- .../machines/RECIPEHANDLER_MatterFabricator.java | 49 +- .../registration/gregtech/Gregtech4Content.java | 46 +- .../registration/gregtech/GregtechConduits.java | 564 +-- .../registration/gregtech/GregtechDehydrator.java | 123 +- .../gregtech/GregtechEnergyBuffer.java | 199 +- .../GregtechGeothermalThermalGenerator.java | 76 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 19 +- .../gregtech/GregtechIndustrialCentrifuge.java | 22 +- .../gregtech/GregtechIndustrialCokeOven.java | 22 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 22 +- .../gregtech/GregtechIndustrialMacerator.java | 22 +- .../gregtech/GregtechIndustrialMassFabricator.java | 22 +- .../gregtech/GregtechIndustrialMultiTank.java | 26 +- .../gregtech/GregtechIndustrialPlatePress.java | 22 +- .../gregtech/GregtechIndustrialWiremill.java | 22 +- .../gregtech/GregtechIronBlastFurnace.java | 18 +- .../registration/gregtech/GregtechLFTR.java | 23 +- .../gregtech/GregtechPowerSubStation.java | 22 +- .../gregtech/GregtechRocketFuelGenerator.java | 76 +- .../registration/gregtech/GregtechSafeBlock.java | 149 +- .../gregtech/GregtechSolarGenerators.java | 52 +- .../gregtech/GregtechSteamCondenser.java | 22 +- .../gregtech/GregtechSuperConductionPoint.java | 22 +- .../gregtech/GregtechTieredFluidTanks.java | 54 +- .../gtPlusPlus/xmod/growthcraft/HANDLER_GC.java | 19 +- .../xmod/growthcraft/booze/Register_Booze.java | 94 +- .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 191 +- .../xmod/growthcraft/fishtrap/Growthcraft_Old.java | 12 +- src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java | 26 +- .../xmod/ic2/block/RTGGenerator/BlockRTG.java | 219 +- .../xmod/ic2/block/RTGGenerator/TileEntityRTG.java | 72 +- .../ic2/block/RTGGenerator/gui/CONTAINER_RTG.java | 18 +- .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 72 +- .../kieticgenerator/IC2_BlockKineticGenerator.java | 106 +- .../ic2/block/kieticgenerator/IC2_TEComponent.java | 73 +- .../container/ContainerKineticWindgenerator.java | 30 +- .../gui/GuiKineticWindGenerator.java | 122 +- .../tileentity/TileEntityKineticWindGenerator.java | 472 +-- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 26 +- .../xmod/ic2/item/IC2_ItemGradualInteger.java | 81 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 120 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 134 +- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 81 +- src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 80 +- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 154 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 242 +- .../xmod/psychedelicraft/HANDLER_Psych.java | 23 +- .../xmod/thermalfoundation/HANDLER_TF.java | 38 +- .../block/TF_Block_Fluid_Cryotheum.java | 315 +- .../block/TF_Block_Fluid_Pyrotheum.java | 320 +- .../xmod/thermalfoundation/block/TF_Blocks.java | 39 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 80 +- .../xmod/thermalfoundation/item/TF_Items.java | 99 +- .../recipe/TF_Gregtech_Recipes.java | 69 +- 201 files changed, 29635 insertions(+), 23502 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod') diff --git a/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java b/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java index 5362f13437..385cf0ae08 100644 --- a/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java +++ b/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java @@ -7,32 +7,37 @@ import gtPlusPlus.core.lib.LoadedMods; public class HANDLER_Computronics { - public static void preInit(){ - if (LoadedMods.Computronics){ + public static void init() { + if (LoadedMods.Computronics) { } - + else { + GT_Mod.gregtechproxy.addFluid("Argon", "Argon", Materials.Argon, 2, 295, + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), 1000); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L), + Materials.Air.getGas(1000L), Materials.Nitrogen.getGas(780L), 1600, 32, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L), + Materials.Air.getGas(1000L), Materials.Oxygen.getGas(210L), 1600, 128, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 3L), + Materials.Air.getGas(1000L), Materials.Argon.getGas(5L), 6000, 512, false); + GT_Values.RA.addElectrolyzerRecipe(ItemList.Cell_Air.get(1), null, null, Materials.Air.getGas(2000L), + ItemList.Cell_Empty.get(1), null, null, null, null, null, null, 800, 30); + } } - public static void init(){ - if (LoadedMods.Computronics){ + public static void postInit() { + if (LoadedMods.Computronics) { } - else { - GT_Mod.gregtechproxy.addFluid("Argon", "Argon", Materials.Argon, 2, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), 1000); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L), Materials.Air.getGas(1000L), Materials.Nitrogen.getGas(780L), 1600, 32, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L), Materials.Air.getGas(1000L), Materials.Oxygen.getGas(210L), 1600, 128, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 3L), Materials.Air.getGas(1000L), Materials.Argon.getGas(5L), 6000, 512, false); - GT_Values.RA.addElectrolyzerRecipe(ItemList.Cell_Air.get(1), null, null, Materials.Air.getGas(2000L), ItemList.Cell_Empty.get(1), null, null, null, null, null, null, 800, 30); - } + } - public static void postInit(){ - if (LoadedMods.Computronics){ + public static void preInit() { + if (LoadedMods.Computronics) { } } - } diff --git a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java index 0d8c85068e..8052b98dac 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java @@ -9,26 +9,26 @@ import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; public class HANDLER_FR { - public static void preInit(){ - if (LoadedMods.Forestry){ - FR_ItemRegistry.Register(); - if (CORE.configSwitches.enableCustomAlvearyBlocks){ - GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing"); - } - //FR_BlockRegistryApiculture.RegistryApiculture(); - } + public static void Init() { + if (LoadedMods.Forestry) { + // FR_TileHandler.init(); + // new FR_GuiIDRegistry(); + } } - public static void Init(){ - if (LoadedMods.Forestry){ - //FR_TileHandler.init(); - //new FR_GuiIDRegistry(); - } + public static void postInit() { + if (LoadedMods.Forestry) { + FR_Gregtech_Recipes.registerItems(); + } } - public static void postInit(){ - if (LoadedMods.Forestry){ - FR_Gregtech_Recipes.registerItems(); - } - } + public static void preInit() { + if (LoadedMods.Forestry) { + FR_ItemRegistry.Register(); + if (CORE.configSwitches.enableCustomAlvearyBlocks) { + GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing"); + } + // FR_BlockRegistryApiculture.RegistryApiculture(); + } + } } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java index 6736c54309..039c80fe00 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java @@ -6,13 +6,13 @@ import gtPlusPlus.xmod.forestry.bees.alveary.gui.InventoryFrameHousing; public class AlvearyBeeListener extends DefaultBeeListener { private final IAlvearyFrameHousing apiary; - public AlvearyBeeListener(IAlvearyFrameHousing apiary) { + public AlvearyBeeListener(final IAlvearyFrameHousing apiary) { this.apiary = apiary; } @Override - public void wearOutEquipment(int amount) { - InventoryFrameHousing apiaryInventory = apiary.getAlvearyInventory(); - apiaryInventory.wearOutFrames(apiary, amount); + public void wearOutEquipment(final int amount) { + final InventoryFrameHousing apiaryInventory = this.apiary.getAlvearyInventory(); + apiaryInventory.wearOutFrames(this.apiary, amount); } } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java index a304647f72..5c6956ec86 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java @@ -5,7 +5,7 @@ import com.mojang.authlib.GameProfile; import forestry.api.multiblock.*; import net.minecraft.util.ChunkCoordinates; -public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockComponent{ +public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockComponent { @Override public ChunkCoordinates getCoordinates() { @@ -14,28 +14,28 @@ public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockCompo } @Override - public GameProfile getOwner() { + public IMultiblockLogicAlveary getMultiblockLogic() { // TODO Auto-generated method stub return null; } @Override - public void onMachineAssembled(IMultiblockController arg0, - ChunkCoordinates arg1, ChunkCoordinates arg2) { + public GameProfile getOwner() { // TODO Auto-generated method stub - + return null; } @Override - public void onMachineBroken() { + public void onMachineAssembled(final IMultiblockController arg0, final ChunkCoordinates arg1, + final ChunkCoordinates arg2) { // TODO Auto-generated method stub - + } @Override - public IMultiblockLogicAlveary getMultiblockLogic() { + public void onMachineBroken() { // TODO Auto-generated method stub - return null; + } } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java index b3eaa94566..d4fce6465b 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java @@ -23,252 +23,249 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class FR_BlockAlveary extends BlockStructure -{ +public class FR_BlockAlveary extends BlockStructure { - public static enum Type - { - PLAIN, - ERROR, - FRAME, - MUTATOR, - - //Placeholder Values + public static enum Type { + PLAIN, ERROR, FRAME, MUTATOR, + + // Placeholder Values HEATER, HYGRO, STABILIZER, SIEVE; - public static final Type[] VALUES = values(); + public static final Type[] VALUES = Type.values(); - private Type() {} + private Type() { + } } - public FR_BlockAlveary() - { - super(new MaterialBeehive(false)); - setHardness(1.0F); - setCreativeTab(AddToCreativeTab.tabBlock); - setHarvestLevel("axe", 0); - - } + /* ICONS */ + public static final int PLAIN = 0; - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) - { - if (world.isRemote) return true; - - TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te instanceof TileAlvearyFrameHousing) - { - player.openGui(GTplusplus.instance, 0, world, x, y, z); - return true; - } - /*else if (te != null && te instanceof TileAlvearyFrameHousing) - { - player.openGui(GTplusplus.instance, 0, world, x, y, z); - return true; - }*/ - return false; - } + public static final int ENTRANCE = 1; - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) - { - for (int i = 0; i < 4; i++) { - if (i != 1 && i != 0) { - list.add(new ItemStack(item, 1, i)); - } - } - } + public static final int BOTTOM = 2; - @Override - public int getRenderType() - { - return 0; - } + public static final int LEFT = 3; - @Override - public boolean renderAsNormalBlock() - { - return true; - } + public static final int RIGHT = 4; - @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) - { - ArrayList drop = new ArrayList(); - drop.add(new ItemStack(this, 1, metadata != 1 ? metadata : 0)); - return drop; - } + public static final int ALVEARY_FRAME_OFF = 5; + + public static final int ALVEARY_FRAME_ON = 6; + + public static final int ALVEARY_MUTATOR_OFF = 7; + public static final int ALVEARY_MUTATOR_ON = 8; + + @SideOnly(Side.CLIENT) + private IIcon[] icons; + + public FR_BlockAlveary() { + super(new MaterialBeehive(false)); + this.setHardness(1.0F); + this.setCreativeTab(AddToCreativeTab.tabBlock); + this.setHarvestLevel("axe", 0); + + } @Override - public int getDamageValue(World world, int x, int y, int z) - { - int meta = world.getBlockMetadata(x, y, z); - return meta != 1 ? meta : 0; + public TileEntity createNewTileEntity(final World world, final int meta) { + return this.createTileEntity(world, meta); } - @Override - public TileEntity createTileEntity(World world, int metadata) - { - if ((metadata < 0) || (metadata > Type.VALUES.length)) { + public TileEntity createTileEntity(final World world, final int metadata) { + if (metadata < 0 || metadata > Type.VALUES.length) { return null; } - - - - Type type = Type.VALUES[metadata]; - switch (type) - { - case FRAME: - LanguageRegistry.addName(this, "Alveary Frame Housing"); - case MUTATOR: - LanguageRegistry.addName(this, "Alveary Mutator Block"); - case ERROR: - LanguageRegistry.addName(this, "Invalid Alveary Block"); - default: - LanguageRegistry.addName(this, "Unnamed Alveary Block"); + + final Type type = Type.VALUES[metadata]; + switch (type) { + case FRAME: + LanguageRegistry.addName(this, "Alveary Frame Housing"); + case MUTATOR: + LanguageRegistry.addName(this, "Alveary Mutator Block"); + case ERROR: + LanguageRegistry.addName(this, "Invalid Alveary Block"); + default: + LanguageRegistry.addName(this, "Unnamed Alveary Block"); } - switch (type) - { - case FRAME: - return new TileAlvearyFrameHousing(); - case MUTATOR: - return new TileAlvearyPlain(); - case ERROR: - return new TileAlvearyPlain(); - default: - return new TileAlvearyPlain(); + switch (type) { + case FRAME: + return new TileAlvearyFrameHousing(); + case MUTATOR: + return new TileAlvearyPlain(); + case ERROR: + return new TileAlvearyPlain(); + default: + return new TileAlvearyPlain(); } } - - @Override - public Block setBlockName(String name) { - //int meta = this. - return super.setBlockName(name); - } - - @Override - public TileEntity createNewTileEntity(World world, int meta) - { - return createTileEntity(world, meta); + public ItemStack get(final Type type) { + return new ItemStack(this, 1, type.ordinal()); } - - /* ICONS */ - public static final int PLAIN = 0; - public static final int ENTRANCE = 1; - public static final int BOTTOM = 2; - public static final int LEFT = 3; - public static final int RIGHT = 4; - public static final int ALVEARY_FRAME_OFF = 5; - public static final int ALVEARY_FRAME_ON = 6; - public static final int ALVEARY_MUTATOR_OFF = 7; - public static final int ALVEARY_MUTATOR_ON = 8; - @SideOnly(Side.CLIENT) - private IIcon[] icons; @SideOnly(Side.CLIENT) + private IIcon getBlockTextureFromSideAndTile(final IBlockAccess world, final int x, final int y, final int z, + final int side) { + final TileEntity tile = world.getTileEntity(x, y, z); + if (!(tile instanceof FR_TileAlveary)) { + return this.getIcon(side, 0); + } + return this.icons[((FR_TileAlveary) tile).getIcon(side)]; + } @Override - public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[9]; - icons[0] = TextureManager.registerTex(register, "apiculture/alveary.plain"); - icons[1] = TextureManager.registerTex(register, "apiculture/alveary.entrance"); - icons[2] = TextureManager.registerTex(register, "apiculture/alveary.bottom"); - icons[3] = TextureManager.registerTex(register, "apiculture/alveary.left"); - icons[4] = TextureManager.registerTex(register, "apiculture/alveary.right"); - icons[5] = TextureManager.registerTex(register, "apiculture/alveary.framehousing.off"); - icons[6] = TextureManager.registerTex(register, "apiculture/alveary.framehousing.on"); - icons[7] = TextureManager.registerTex(register, "apiculture/alveary.mutator.off"); - icons[8] = TextureManager.registerTex(register, "apiculture/alveary.mutator.on"); + public int getDamageValue(final World world, final int x, final int y, final int z) { + final int meta = world.getBlockMetadata(x, y, z); + return meta != 1 ? meta : 0; } - @SideOnly(Side.CLIENT) @Override - public IIcon getIcon(int side, int metadata) { - if ((metadata <= 1 - || metadata == Type.FRAME.ordinal() || metadata == Type.MUTATOR.ordinal()) - && (side == 1 || side == 0)) { - return icons[BOTTOM]; - } - Type type = Type.VALUES[metadata]; - switch (type) { - case ERROR: - return icons[PLAIN]; - case FRAME: - return icons[ALVEARY_FRAME_OFF]; - case MUTATOR: - return icons[ALVEARY_MUTATOR_OFF]; - case HEATER: - return icons[ALVEARY_MUTATOR_OFF]; - case HYGRO: - return icons[ALVEARY_MUTATOR_OFF]; - case STABILIZER: - return icons[PLAIN]; - case SIEVE: - return icons[PLAIN]; - default: - return null; - } + public ArrayList getDrops(final World world, final int x, final int y, final int z, final int metadata, + final int fortune) { + final ArrayList drop = new ArrayList(); + drop.add(new ItemStack(this, 1, metadata != 1 ? metadata : 0)); + return drop; } @SideOnly(Side.CLIENT) @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - int meta = world.getBlockMetadata(x, y, z); + public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { + final int meta = world.getBlockMetadata(x, y, z); if (meta == 1) { return this.getIcon(side, meta); - } else if (meta > 1) { - return getBlockTextureFromSideAndTile(world, x, y, z, side); } - Block blockXP = world.getBlock(x + 1, y, z); - Block blockXM = world.getBlock(x - 1, y, z); + else if (meta > 1) { + return this.getBlockTextureFromSideAndTile(world, x, y, z, side); + } + final Block blockXP = world.getBlock(x + 1, y, z); + final Block blockXM = world.getBlock(x - 1, y, z); if (blockXP == this && blockXM != this) { if (world.getBlockMetadata(x + 1, y, z) == 1) { if (world.getBlock(x, y, z + 1) != this) { - return switchForSide(42, side); + return this.switchForSide(42, side); } - return switchForSide(41, side); + return this.switchForSide(41, side); } return this.getIcon(side, meta); - } else if (blockXP != this && blockXM == this) { + } + else if (blockXP != this && blockXM == this) { if (world.getBlockMetadata(x - 1, y, z) == 1) { if (world.getBlock(x, y, z + 1) != this) { - return switchForSide(41, side); + return this.switchForSide(41, side); } - return switchForSide(42, side); + return this.switchForSide(42, side); } return this.getIcon(side, meta); } return this.getIcon(side, meta); } @SideOnly(Side.CLIENT) - private IIcon getBlockTextureFromSideAndTile(IBlockAccess world, int x, int y, int z, int side) { - TileEntity tile = world.getTileEntity(x, y, z); - if (!(tile instanceof FR_TileAlveary)) { - return getIcon(side, 0); + @Override + public IIcon getIcon(final int side, final int metadata) { + if ((metadata <= 1 || metadata == Type.FRAME.ordinal() || metadata == Type.MUTATOR.ordinal()) + && (side == 1 || side == 0)) { + return this.icons[FR_BlockAlveary.BOTTOM]; + } + final Type type = Type.VALUES[metadata]; + switch (type) { + case ERROR: + return this.icons[FR_BlockAlveary.PLAIN]; + case FRAME: + return this.icons[FR_BlockAlveary.ALVEARY_FRAME_OFF]; + case MUTATOR: + return this.icons[FR_BlockAlveary.ALVEARY_MUTATOR_OFF]; + case HEATER: + return this.icons[FR_BlockAlveary.ALVEARY_MUTATOR_OFF]; + case HYGRO: + return this.icons[FR_BlockAlveary.ALVEARY_MUTATOR_OFF]; + case STABILIZER: + return this.icons[FR_BlockAlveary.PLAIN]; + case SIEVE: + return this.icons[FR_BlockAlveary.PLAIN]; + default: + return null; } - return icons[((FR_TileAlveary) tile).getIcon(side)]; } + @Override + public int getRenderType() { + return 0; + } + + @Override @SideOnly(Side.CLIENT) - private IIcon switchForSide(int textureId, int side) { - if (side == 4 || side == 5) { - if (textureId == 41) { - return icons[LEFT]; + public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { + for (int i = 0; i < 4; i++) { + if (i != 1 && i != 0) { + list.add(new ItemStack(item, 1, i)); } - return icons[RIGHT]; - } else if (textureId == 41) { - return icons[RIGHT]; - } else { - return icons[LEFT]; } } + + @Override + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { + if (world.isRemote) { + return true; + } + + final TileEntity te = world.getTileEntity(x, y, z); + if (te != null && te instanceof TileAlvearyFrameHousing) { + player.openGui(GTplusplus.instance, 0, world, x, y, z); + return true; + } + /* + * else if (te != null && te instanceof TileAlvearyFrameHousing) { + * player.openGui(GTplusplus.instance, 0, world, x, y, z); return true; + * } + */ + return false; + } + @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + public void onNeighborBlockChange(final World world, final int x, final int y, final int z, final Block block) { super.onNeighborBlockChange(world, x, y, z, block); - TileEntity tileEntity = world.getTileEntity(x, y, z); + final TileEntity tileEntity = world.getTileEntity(x, y, z); if (tileEntity instanceof FR_TileAlveary) { - FR_TileAlveary tileAlveary = (FR_TileAlveary) tileEntity; + final FR_TileAlveary tileAlveary = (FR_TileAlveary) tileEntity; // We must check that the slabs on top were not removed tileAlveary.getMultiblockLogic().getController().reassemble(); } } - public ItemStack get(Type type) { - return new ItemStack(this, 1, type.ordinal()); + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(final IIconRegister register) { + this.icons = new IIcon[9]; + this.icons[0] = TextureManager.registerTex(register, "apiculture/alveary.plain"); + this.icons[1] = TextureManager.registerTex(register, "apiculture/alveary.entrance"); + this.icons[2] = TextureManager.registerTex(register, "apiculture/alveary.bottom"); + this.icons[3] = TextureManager.registerTex(register, "apiculture/alveary.left"); + this.icons[4] = TextureManager.registerTex(register, "apiculture/alveary.right"); + this.icons[5] = TextureManager.registerTex(register, "apiculture/alveary.framehousing.off"); + this.icons[6] = TextureManager.registerTex(register, "apiculture/alveary.framehousing.on"); + this.icons[7] = TextureManager.registerTex(register, "apiculture/alveary.mutator.off"); + this.icons[8] = TextureManager.registerTex(register, "apiculture/alveary.mutator.on"); + } + + @Override + public boolean renderAsNormalBlock() { + return true; + } + + @Override + public Block setBlockName(final String name) { + // int meta = this. + return super.setBlockName(name); + } + + @SideOnly(Side.CLIENT) + private IIcon switchForSide(final int textureId, final int side) { + if (side == 4 || side == 5) { + if (textureId == 41) { + return this.icons[FR_BlockAlveary.LEFT]; + } + return this.icons[FR_BlockAlveary.RIGHT]; + } + else if (textureId == 41) { + return this.icons[FR_BlockAlveary.RIGHT]; + } + else { + return this.icons[FR_BlockAlveary.LEFT]; + } } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java index 5c456916f0..2db809ae90 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java @@ -21,169 +21,142 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.Vec3; import net.minecraft.world.biome.BiomeGenBase; -public abstract class FR_TileAlveary -extends MultiblockTileEntityForestry -implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, ITitled, IClimatised, IHintSource, IGuiHandlerForestry -{ +public abstract class FR_TileAlveary extends MultiblockTileEntityForestry + implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, ITitled, IClimatised, IHintSource, + IGuiHandlerForestry { private final String unlocalizedTitle; - protected FR_TileAlveary() - { + protected FR_TileAlveary() { this(FR_BlockAlveary.Type.ERROR); } - protected FR_TileAlveary(FR_BlockAlveary.Type type) - { + protected FR_TileAlveary(final FR_BlockAlveary.Type type) { super(new MultiblockLogicAlveary()); - this.unlocalizedTitle = ("advanced.tile.for.alveary." + type.ordinal() + ".name"); - - } + this.unlocalizedTitle = "advanced.tile.for.alveary." + type.ordinal() + ".name"; - public int getIcon(int side) - { - return 0; } @Override - public void onMachineAssembled(IMultiblockController multiblockController, ChunkCoordinates minCoord, ChunkCoordinates maxCoord) - { - if (this.worldObj.isRemote) { - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - } - this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, getBlockType()); - markDirty(); + public boolean canBlockSeeTheSky() { + return this.getMultiblockLogic().getController().canBlockSeeTheSky(); } @Override - public void onMachineBroken() - { - if (this.worldObj.isRemote) { - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - } - this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, getBlockType()); - markDirty(); + public IAccessHandler getAccessHandler() { + return this.getMultiblockLogic().getController().getAccessHandler(); } @Override - public BiomeGenBase getBiome() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBiome(); + public Vec3 getBeeFXCoordinates() { + return this.getMultiblockLogic().getController().getBeeFXCoordinates(); } @Override - public Iterable getBeeModifiers() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeModifiers(); + public IBeeHousingInventory getBeeInventory() { + return this.getMultiblockLogic().getController().getBeeInventory(); } @Override - public Iterable getBeeListeners() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeListeners(); + public IBeekeepingLogic getBeekeepingLogic() { + return this.getMultiblockLogic().getController().getBeekeepingLogic(); } @Override - public IBeeHousingInventory getBeeInventory() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory(); + public Iterable getBeeListeners() { + return this.getMultiblockLogic().getController().getBeeListeners(); } @Override - public IBeekeepingLogic getBeekeepingLogic() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeekeepingLogic(); + public Iterable getBeeModifiers() { + return this.getMultiblockLogic().getController().getBeeModifiers(); } @Override - public Vec3 getBeeFXCoordinates() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeFXCoordinates(); + public BiomeGenBase getBiome() { + return this.getMultiblockLogic().getController().getBiome(); } @Override - public EnumTemperature getTemperature() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getTemperature(); + public int getBlockLightValue() { + return this.getMultiblockLogic().getController().getBlockLightValue(); } @Override - public EnumHumidity getHumidity() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getHumidity(); + public IErrorLogic getErrorLogic() { + return this.getMultiblockLogic().getController().getErrorLogic(); } @Override - public int getBlockLightValue() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBlockLightValue(); + public float getExactHumidity() { + return this.getMultiblockLogic().getController().getExactHumidity(); } @Override - public boolean canBlockSeeTheSky() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().canBlockSeeTheSky(); + public float getExactTemperature() { + return this.getMultiblockLogic().getController().getExactTemperature(); } @Override - public IErrorLogic getErrorLogic() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getErrorLogic(); + public List getHints() { + return Config.hints.get("apiary"); } @Override - public IAccessHandler getAccessHandler() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getAccessHandler(); + public EnumHumidity getHumidity() { + return this.getMultiblockLogic().getController().getHumidity(); + } + + public int getIcon(final int side) { + return 0; } @Override - public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) - { - ((MultiblockLogicAlveary)getMultiblockLogic()).getController().onSwitchAccess(oldAccess, newAccess); + public IInventoryAdapter getInternalInventory() { + return this.getMultiblockLogic().getController().getInternalInventory(); } @Override - public IInventoryAdapter getInternalInventory() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getInternalInventory(); + public EnumTemperature getTemperature() { + return this.getMultiblockLogic().getController().getTemperature(); } @Override - public String getUnlocalizedTitle() - { + public String getUnlocalizedTitle() { return this.unlocalizedTitle; } @Override - public List getHints() - { - return Config.hints.get("apiary"); + public void onMachineAssembled(final IMultiblockController multiblockController, final ChunkCoordinates minCoord, + final ChunkCoordinates maxCoord) { + if (this.worldObj.isRemote) { + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + } + this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); + this.markDirty(); } @Override - public float getExactTemperature() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getExactTemperature(); + public void onMachineBroken() { + if (this.worldObj.isRemote) { + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + } + this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); + this.markDirty(); } @Override - public float getExactHumidity() - { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getExactHumidity(); + public void onSwitchAccess(final EnumAccess oldAccess, final EnumAccess newAccess) { + this.getMultiblockLogic().getController().onSwitchAccess(oldAccess, newAccess); } @Override - public void writeGuiData(DataOutputStreamForestry data) - throws IOException - { - ((MultiblockLogicAlveary)getMultiblockLogic()).getController().writeGuiData(data); + public void readGuiData(final DataInputStreamForestry data) throws IOException { + this.getMultiblockLogic().getController().readGuiData(data); } @Override - public void readGuiData(DataInputStreamForestry data) - throws IOException - { - ((MultiblockLogicAlveary)getMultiblockLogic()).getController().readGuiData(data); + public void writeGuiData(final DataOutputStreamForestry data) throws IOException { + this.getMultiblockLogic().getController().writeGuiData(data); } } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java index b55d2d37a6..c5c2e0c8f4 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java @@ -5,24 +5,16 @@ import forestry.api.core.IClimateControlled; import forestry.api.multiblock.IMultiblockComponent; import forestry.api.multiblock.IMultiblockLogicAlveary; -public abstract interface IAlvearyComponentAdvanced -extends IMultiblockComponent -{ - @Override - public abstract T getMultiblockLogic(); +public abstract interface IAlvearyComponentAdvanced extends IMultiblockComponent { + public static abstract interface BeeModifier extends IAlvearyComponentAdvanced { + public abstract IBeeModifier getBeeModifier(); + } - - public static abstract interface FrameHouse - extends IAlvearyComponentAdvanced - { + public static abstract interface FrameHouse extends IAlvearyComponentAdvanced { public abstract void changeClimate(int paramInt, IClimateControlled paramIClimateControlled); } - - public static abstract interface BeeModifier - extends IAlvearyComponentAdvanced - { - public abstract IBeeModifier getBeeModifier(); - } + @Override + public abstract T getMultiblockLogic(); } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyFrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyFrameHousing.java index 6eeefa2696..d4166b00c9 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyFrameHousing.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyFrameHousing.java @@ -5,5 +5,6 @@ import gtPlusPlus.xmod.forestry.bees.alveary.gui.InventoryFrameHousing; public interface IAlvearyFrameHousing extends IBeeHousing { InventoryFrameHousing getAlvearyInventory(); + void wearOutFrames(IBeeHousing beeHousing, int amount); } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java index 5c485a9618..f8724fc840 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java @@ -3,8 +3,6 @@ package gtPlusPlus.xmod.forestry.bees.alveary; import forestry.api.apiculture.IBeeHousing; import net.minecraft.inventory.ISidedInventory; -public abstract interface ISidedFrameWearingInventory - extends ISidedInventory -{ - public abstract void wearOutFrames(IBeeHousing paramIBeeHousing, int paramInt); +public abstract interface ISidedFrameWearingInventory extends ISidedInventory { + public abstract void wearOutFrames(IBeeHousing paramIBeeHousing, int paramInt); } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java index 1e6507208c..af1e0b95b3 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java @@ -7,7 +7,6 @@ import forestry.api.arboriculture.EnumGermlingType; import forestry.api.genetics.*; import forestry.api.multiblock.IAlvearyComponent; import forestry.apiculture.AlvearyBeeModifier; -import forestry.apiculture.multiblock.MultiblockLogicAlveary; import forestry.apiculture.network.packets.PacketActiveUpdate; import forestry.apiculture.worldgen.*; import forestry.core.inventory.IInventoryAdapter; @@ -25,17 +24,44 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public class TileAlvearyFrameHousing -extends FR_TileAlveary -implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, IAlvearyComponent.BeeModifier, IAlvearyFrameHousing, IAlvearyComponent.BeeListener -{ - private final InventoryFrameHousing inventory; - private final IBeeListener beeListener; - private final Stack pendingSpawns = new Stack(); - private boolean active; - - public TileAlvearyFrameHousing() - { +public class TileAlvearyFrameHousing extends FR_TileAlveary implements ISidedFrameWearingInventory, IActivatable, + IAlvearyComponent.Active, IAlvearyComponent.BeeModifier, IAlvearyFrameHousing, IAlvearyComponent.BeeListener { + static class AlvearyFrameHousingBeeListener extends DefaultBeeListener { + private final InventoryFrameHousing inventory; + + public AlvearyFrameHousingBeeListener(final InventoryFrameHousing inventory) { + this.inventory = inventory; + } + + @Override + public boolean onPollenRetrieved(final IIndividual pollen) { + /* + * if (!((Object) this.inventory).canStorePollen()) { return false; + * } + */ + final ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(pollen.getClass()); + + final ItemStack pollenStack = speciesRoot.getMemberStack(pollen, EnumGermlingType.POLLEN.ordinal()); + if (pollenStack != null) { + // ((Object) this.inventory).storePollenStack(pollenStack); + return true; + } + return false; + } + } + private final InventoryFrameHousing inventory; + private final IBeeListener beeListener; + private final Stack pendingSpawns = new Stack(); + + private boolean active; + + private final IBeeModifier beeModifier = new AlvearyBeeModifier(); + + // private final IBeeListener beeListener = new AlvearyBeeListener(this); + private final Iterable beeListenerList = this.getMultiblockLogic().getController() + .getBeeListeners(); + + public TileAlvearyFrameHousing() { super(FR_BlockAlveary.Type.FRAME); this.inventory = new InventoryFrameHousing(this); this.beeListener = new AlvearyFrameHousingBeeListener(this.inventory); @@ -43,113 +69,101 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, } @Override - public IInventoryAdapter getInternalInventory() - { - return this.inventory; - } - - @Override - public boolean allowsAutomation() - { + public boolean allowsAutomation() { return true; } - @Override - public void updateServer(int tickCount) - { - - if (getInternalInventory() == null) { - return; + private int consumeInducerAndGetChance() { + if (this.getInternalInventory() == null) { + return 0; } - - if (this.inventory.getStackInSlot(0) != null) - { - if (((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeekeepingLogic().canWork()){ - setActive(true); - if (tickCount % 1000 == 0) { - wearOutFrames(this, 1); + for (final Iterator i$ = InventoryIterator.getIterable(this.getInternalInventory()).iterator(); i$ + .hasNext();) { + final IInvSlot slot = (IInvSlot) i$.next(); + final ItemStack stack = slot.getStackInSlot(); + for (final Map.Entry entry : BeeManager.inducers.entrySet()) { + if (ItemStackUtil.isIdenticalItem(entry.getKey(), stack)) { + slot.decreaseStackInSlot(); + return entry.getValue().intValue(); } } - else { - Utils.LOG_INFO("Cannot work - Probably no queen alive."); - } - - } - else - { - setActive(false); - } - if (tickCount % 500 != 0) { - return; } + final IInvSlot slot; + final ItemStack stack; + return 0; + } + @Override + protected void decodeDescriptionPacket(final NBTTagCompound packetData) { + super.decodeDescriptionPacket(packetData); + this.setActive(packetData.getBoolean("Active")); + } + + @Override + protected void encodeDescriptionPacket(final NBTTagCompound packetData) { + super.encodeDescriptionPacket(packetData); + packetData.setBoolean("Active", this.active); } @Override - public void updateClient(int tickCount) {} + public InventoryFrameHousing getAlvearyInventory() { + return this.inventory; + } - private ItemStack getPrincessStack() - { - ItemStack princessStack = ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory().getQueen(); - if (BeeManager.beeRoot.isMated(princessStack)) { - return princessStack; - } - return null; + @Override + public IBeeListener getBeeListener() { + return this.beeListener; } - private int consumeInducerAndGetChance() - { - if (getInternalInventory() == null) { - return 0; - } - for (Iterator i$ = InventoryIterator.getIterable(getInternalInventory()).iterator(); i$.hasNext();) - { - IInvSlot slot = (IInvSlot)i$.next(); - ItemStack stack = slot.getStackInSlot(); - for (Map.Entry entry : BeeManager.inducers.entrySet()) { - if (ItemStackUtil.isIdenticalItem((ItemStack)entry.getKey(), stack)) - { - slot.decreaseStackInSlot(); - return ((Integer)entry.getValue()).intValue(); - } - } + @Override + public IBeeModifier getBeeModifier() { + final List beeModifiers = new ArrayList(); + + // beeModifiers.add(this.beeModifier); + for (final IHiveFrame frame : this.getFrames(this.inventory)) { + beeModifiers.add(frame.getBeeModifier()); } - IInvSlot slot; - ItemStack stack; - return 0; + return beeModifiers.get(0); } - private void trySpawnSwarm() - { - ItemStack toSpawn = (ItemStack)this.pendingSpawns.peek(); - HiveDescriptionSwarmer hiveDescription = new HiveDescriptionSwarmer(new ItemStack[] { toSpawn }); - Hive hive = new Hive(hiveDescription); + @Override + public Collection getBeeModifiers() { + final List beeModifiers = new ArrayList(); - int chunkX = (this.xCoord + this.worldObj.rand.nextInt(80) - 40) / 16; - int chunkZ = (this.zCoord + this.worldObj.rand.nextInt(80) - 40) / 16; - if (HiveDecorator.genHive(this.worldObj, this.worldObj.rand, chunkX, chunkZ, hive)) { - this.pendingSpawns.pop(); + beeModifiers.add(this.beeModifier); + for (final IHiveFrame frame : this.getFrames(this.inventory)) { + beeModifiers.add(frame.getBeeModifier()); } + return beeModifiers; } @Override - protected void encodeDescriptionPacket(NBTTagCompound packetData) - { - super.encodeDescriptionPacket(packetData); - packetData.setBoolean("Active", this.active); + public Object getContainer(final EntityPlayer player, final int data) { + return new CONTAINER_FrameHousing(this, player); + } + + public Collection getFrames(final IInventory inventory) { + final Collection hiveFrames = new ArrayList(inventory.getSizeInventory()); + for (int i = 0; i < inventory.getSizeInventory(); i++) { + final ItemStack stackInSlot = this.getStackInSlot(i); + if (stackInSlot != null) { + final Item itemInSlot = stackInSlot.getItem(); + if (itemInSlot instanceof IHiveFrame) { + hiveFrames.add((IHiveFrame) itemInSlot); + } + } + } + return hiveFrames; } @Override - protected void decodeDescriptionPacket(NBTTagCompound packetData) - { - super.decodeDescriptionPacket(packetData); - setActive(packetData.getBoolean("Active")); + public Object getGui(final EntityPlayer player, final int data) { + return new GUI_FrameHousing(this, player); } @Override - public int getIcon(int side) - { - if ((side == 0) || (side == 1)) { + public int getIcon(final int side) { + if (side == 0 || side == 1) { return 2; } if (this.active) { @@ -159,48 +173,41 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, } @Override - public void readFromNBT(NBTTagCompound nbttagcompound) - { - super.readFromNBT(nbttagcompound); - setActive(nbttagcompound.getBoolean("Active")); + public IInventoryAdapter getInternalInventory() { + return this.inventory; + } - NBTTagList nbttaglist = nbttagcompound.getTagList("PendingSpawns", 10); - for (int i = 0; i < nbttaglist.tagCount(); i++) - { - NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); - this.pendingSpawns.add(ItemStack.loadItemStackFromNBT(nbttagcompound1)); + private ItemStack getPrincessStack() { + final ItemStack princessStack = this.getMultiblockLogic().getController().getBeeInventory().getQueen(); + if (BeeManager.beeRoot.isMated(princessStack)) { + return princessStack; } + return null; + } + private ItemStack getQueenStack() { + final ItemStack queenStack = this.getMultiblockLogic().getController().getBeeInventory().getQueen(); + return queenStack; } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) - { - super.writeToNBT(nbttagcompound); - nbttagcompound.setBoolean("Active", this.active); - - NBTTagList nbttaglist = new NBTTagList(); - ItemStack[] offspring = (ItemStack[])this.pendingSpawns.toArray(new ItemStack[this.pendingSpawns.size()]); - for (int i = 0; i < offspring.length; i++) { - if (offspring[i] != null) - { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte)i); - offspring[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - } - nbttagcompound.setTag("PendingSpawns", nbttaglist); + public boolean isActive() { + return this.active; } @Override - public boolean isActive() - { - return this.active; + public void readFromNBT(final NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + this.setActive(nbttagcompound.getBoolean("Active")); + + final NBTTagList nbttaglist = nbttagcompound.getTagList("PendingSpawns", 10); + for (int i = 0; i < nbttaglist.tagCount(); i++) { + final NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); + this.pendingSpawns.add(ItemStack.loadItemStackFromNBT(nbttagcompound1)); + } } @Override - public void setActive(boolean active) - { + public void setActive(final boolean active) { if (this.active == active) { return; } @@ -210,133 +217,91 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, } } - @Override - public Object getGui(EntityPlayer player, int data) - { - return new GUI_FrameHousing(this, player); + private void trySpawnSwarm() { + final ItemStack toSpawn = this.pendingSpawns.peek(); + final HiveDescriptionSwarmer hiveDescription = new HiveDescriptionSwarmer(new ItemStack[] { + toSpawn + }); + final Hive hive = new Hive(hiveDescription); + + final int chunkX = (this.xCoord + this.worldObj.rand.nextInt(80) - 40) / 16; + final int chunkZ = (this.zCoord + this.worldObj.rand.nextInt(80) - 40) / 16; + if (HiveDecorator.genHive(this.worldObj, this.worldObj.rand, chunkX, chunkZ, hive)) { + this.pendingSpawns.pop(); + } } @Override - public Object getContainer(EntityPlayer player, int data) - { - return new CONTAINER_FrameHousing(this, player); + public void updateClient(final int tickCount) { } - private final IBeeModifier beeModifier = new AlvearyBeeModifier(); - //private final IBeeListener beeListener = new AlvearyBeeListener(this); - private final Iterable beeListenerList = ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeListeners(); - @Override - public Collection getBeeModifiers() - { - List beeModifiers = new ArrayList(); + public void updateServer(final int tickCount) { - beeModifiers.add(this.beeModifier); - for (IHiveFrame frame : getFrames(this.inventory)) { - beeModifiers.add(frame.getBeeModifier()); + if (this.getInternalInventory() == null) { + return; } - return beeModifiers; - } - public Collection getFrames(IInventory inventory) - { - Collection hiveFrames = new ArrayList(inventory.getSizeInventory()); - for (int i = 0; i < inventory.getSizeInventory(); i++) - { - ItemStack stackInSlot = getStackInSlot(i); - if (stackInSlot != null) - { - Item itemInSlot = stackInSlot.getItem(); - if ((itemInSlot instanceof IHiveFrame)) { - hiveFrames.add((IHiveFrame)itemInSlot); + if (this.inventory.getStackInSlot(0) != null) { + if (this.getMultiblockLogic().getController().getBeekeepingLogic().canWork()) { + this.setActive(true); + if (tickCount % 1000 == 0) { + this.wearOutFrames(this, 1); } } - } - return hiveFrames; - } - - @Override - public IBeeModifier getBeeModifier() { - List beeModifiers = new ArrayList(); + else { + Utils.LOG_INFO("Cannot work - Probably no queen alive."); + } - //beeModifiers.add(this.beeModifier); - for (IHiveFrame frame : getFrames(this.inventory)) { - beeModifiers.add(frame.getBeeModifier()); } - return beeModifiers.get(0); - } + else { + this.setActive(false); + } + if (tickCount % 500 != 0) { + return; + } - private ItemStack getQueenStack() - { - ItemStack queenStack = ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory().getQueen(); - return queenStack; } @Override - public void wearOutFrames(IBeeHousing beeHousing, int amount) - { - IBeekeepingMode beekeepingMode = BeeManager.beeRoot.getBeekeepingMode(beeHousing.getWorld()); - int wear = Math.round(amount * beekeepingMode.getWearModifier()); - for (int i = 0; i < this.inventory.getSizeInventory(); i++) - { - ItemStack hiveFrameStack = getStackInSlot(i); - if (hiveFrameStack != null) - { - Item hiveFrameItem = hiveFrameStack.getItem(); - if ((hiveFrameItem instanceof IHiveFrame)) - { - IHiveFrame hiveFrame = (IHiveFrame)hiveFrameItem; - Utils.LOG_INFO("Wearing out frame by "+amount); - ItemStack queenStack = getQueenStack(); - IBee queen = BeeManager.beeRoot.getMember(queenStack); - ItemStack usedFrame = hiveFrame.frameUsed(beeHousing, hiveFrameStack, queen, wear); - - //((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeListeners(). - - setInventorySlotContents(i, usedFrame); + public void wearOutFrames(final IBeeHousing beeHousing, final int amount) { + final IBeekeepingMode beekeepingMode = BeeManager.beeRoot.getBeekeepingMode(beeHousing.getWorld()); + final int wear = Math.round(amount * beekeepingMode.getWearModifier()); + for (int i = 0; i < this.inventory.getSizeInventory(); i++) { + final ItemStack hiveFrameStack = this.getStackInSlot(i); + if (hiveFrameStack != null) { + final Item hiveFrameItem = hiveFrameStack.getItem(); + if (hiveFrameItem instanceof IHiveFrame) { + final IHiveFrame hiveFrame = (IHiveFrame) hiveFrameItem; + Utils.LOG_INFO("Wearing out frame by " + amount); + final ItemStack queenStack = this.getQueenStack(); + final IBee queen = BeeManager.beeRoot.getMember(queenStack); + final ItemStack usedFrame = hiveFrame.frameUsed(beeHousing, hiveFrameStack, queen, wear); + + // ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeListeners(). + + this.setInventorySlotContents(i, usedFrame); } } } } @Override - public InventoryFrameHousing getAlvearyInventory() { - return inventory; - } + public void writeToNBT(final NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + nbttagcompound.setBoolean("Active", this.active); - @Override - public IBeeListener getBeeListener() { - return beeListener; + final NBTTagList nbttaglist = new NBTTagList(); + final ItemStack[] offspring = this.pendingSpawns.toArray(new ItemStack[this.pendingSpawns.size()]); + for (int i = 0; i < offspring.length; i++) { + if (offspring[i] != null) { + final NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + nbttagcompound1.setByte("Slot", (byte) i); + offspring[i].writeToNBT(nbttagcompound1); + nbttaglist.appendTag(nbttagcompound1); + } + } + nbttagcompound.setTag("PendingSpawns", nbttaglist); } - - static class AlvearyFrameHousingBeeListener - extends DefaultBeeListener - { - private final InventoryFrameHousing inventory; - - public AlvearyFrameHousingBeeListener(InventoryFrameHousing inventory) - { - this.inventory = inventory; - } - - @Override - public boolean onPollenRetrieved(IIndividual pollen) - { - /*if (!((Object) this.inventory).canStorePollen()) { - return false; - }*/ - ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(pollen.getClass()); - - ItemStack pollenStack = speciesRoot.getMemberStack(pollen, EnumGermlingType.POLLEN.ordinal()); - if (pollenStack != null) - { - // ((Object) this.inventory).storePollenStack(pollenStack); - return true; - } - return false; - } - } - - - + } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java index 5e218667f6..c8e4081ee3 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java @@ -11,88 +11,75 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -public class CONTAINER_FrameHousing extends Container -{ - private TileAlvearyFrameHousing te; +public class CONTAINER_FrameHousing extends Container { + public static final int INPUT_1 = 0; - public static final int INPUT_1 = 0; - private final ResourceLocation beeFrameIcon = new ResourceLocation(CORE.MODID, "textures/items/machine_Charger.png"); - public ToolTip newTip = new ToolTip(); - private final SlotFrame beeFrameSlot; + private final TileAlvearyFrameHousing te; + private final ResourceLocation beeFrameIcon = new ResourceLocation(CORE.MODID, + "textures/items/machine_Charger.png"); + public ToolTip newTip = new ToolTip(); + private final SlotFrame beeFrameSlot; - private int slotID = 0; + private int slotID = 0; - public CONTAINER_FrameHousing(TileAlvearyFrameHousing te, EntityPlayer player) - { + public CONTAINER_FrameHousing(final TileAlvearyFrameHousing te, final EntityPlayer player) { this.te = te; - this.beeFrameSlot = new SlotFrame(te, slotID++, 80, 35); + this.beeFrameSlot = new SlotFrame(te, this.slotID++, 80, 35); - //Fuel Slot A - beeFrameSlot.setBackgroundIconTexture(beeFrameIcon); - - addSlotToContainer(beeFrameSlot); + // Fuel Slot A + this.beeFrameSlot.setBackgroundIconTexture(this.beeFrameIcon); - //Inventory - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 9; j++) - { - addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + this.addSlotToContain