From cbe0e497be8e466c380a5b4fa781b314ede9ada3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 6 Nov 2016 19:32:27 +1000 Subject: Revert "$ Cleaned up the entire project." This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747. # Conflicts: # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java Revert "% Cleaned up Imports." This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966. --- .../xmod/Computronics/HANDLER_Computronics.java | 40 +- src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 38 +- .../forestry/bees/alveary/AlvearyBeeListener.java | 8 +- .../bees/alveary/FR_AlvearyFrameBlock.java | 26 +- .../forestry/bees/alveary/FR_BlockAlveary.java | 391 +- .../xmod/forestry/bees/alveary/FR_TileAlveary.java | 175 +- .../bees/alveary/IAlvearyComponentAdvanced.java | 22 +- .../bees/alveary/IAlvearyFrameHousing.java | 1 - .../bees/alveary/ISidedFrameWearingInventory.java | 8 +- .../bees/alveary/TileAlvearyFrameHousing.java | 459 ++- .../bees/alveary/gui/CONTAINER_FrameHousing.java | 103 +- .../bees/alveary/gui/GUI_FrameHousing.java | 74 +- .../bees/alveary/gui/InventoryFrameHousing.java | 98 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 137 +- .../xmod/forestry/bees/items/FR_StringUtil.java | 15 +- .../xmod/forestry/bees/items/MB_FrameType.java | 126 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 141 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 118 +- src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 40 +- .../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 | 402 +- .../gregtech/api/enums/GregtechOreDictNames.java | 16 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 1932 +++------ .../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 | 111 +- .../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 | 178 +- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 139 +- .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 172 +- .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 47 +- .../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 | 33 +- .../internal/Interface_OreRecipeRegistrator.java | 25 +- .../Interface_OreRecipeRegistrator_GT.java | 22 +- .../api/interfaces/internal/Interface_Texture.java | 14 +- .../interfaces/internal/Interface_ToolStats.java | 186 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 303 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 605 ++- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 1213 +++--- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 378 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 728 ++-- .../gregtech/api/items/tools/GT_MetaGenTool.java | 741 ++-- .../gregtech/api/items/types/ToolType_Base.java | 123 +- .../api/items/types/ToolType_HardHammer.java | 213 +- .../gregtech/api/items/types/ToolType_Wrench.java | 292 +- .../GT_MetaTileEntity_DeluxeTank.java | 418 +- .../implementations/GregtechMetaCondensor.java | 301 +- .../implementations/GregtechMetaEnergyBuffer.java | 563 ++- .../GregtechMetaPipeEntityFluid.java | 563 ++- .../GregtechMetaPipeEntity_Cable.java | 460 +-- .../GregtechMetaPipeEntity_SuperConductor.java | 466 +-- .../implementations/GregtechMetaSafeBlock.java | 110 +- .../GregtechMetaSuperConductorNodeBase.java | 614 ++- .../base/GregtechMetaPipeEntityBase_Cable.java | 559 +-- .../base/GregtechMetaTileEntity.java | 85 +- .../base/GregtechMeta_MultiBlockBase.java | 1849 ++++----- .../GregtechDoubleFuelGeneratorBase.java | 601 ++- .../base/generators/GregtechMetaBoilerBase.java | 625 ++- .../generators/GregtechMetaSolarGenerator.java | 376 +- .../GregtechRocketFuelGeneratorBase.java | 558 ++- .../GregtechBaseMetaTileEntityLossless.java | 4189 +++++++++----------- .../GregtechMetaPipeEntity_BaseSuperConductor.java | 1312 +++--- .../lossless/GregtechMetaTileEntityLossless.java | 85 +- .../GregtechMetaTileEntityLosslessBasicTank.java | 494 ++- ...chMetaTileEntityLosslessTieredMachineBlock.java | 110 +- .../base/lossless/MetaTileEntityLossless.java | 1779 ++++----- .../base/machines/GregtechMetaSafeBlockBase.java | 483 +-- .../creative/GregtechMetaCreativeEnergyBuffer.java | 388 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 33 +- .../gregtech/api/objects/GregtechItemData.java | 265 +- .../api/objects/GregtechMaterialStack.java | 84 +- .../api/objects/GregtechRenderedTexture.java | 314 +- .../ProcessingSkookumChoocherToolRecipes.java | 24 +- .../api/util/GregtechOreDictUnificator.java | 814 ++-- .../api/util/GregtechRecipeRegistrator.java | 966 ++--- .../xmod/gregtech/common/Meta_GT_Proxy.java | 1234 +++--- .../common/blocks/GregtechMetaCasingBlocks.java | 71 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 56 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 232 +- .../common/blocks/GregtechMetaCasingItems.java | 9 +- .../common/blocks/GregtechMetaItemCasings1.java | 40 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 81 +- .../common/blocks/fluid/GregtechFluidHandler.java | 343 +- .../blocks/textures/CasingTextureHandler.java | 125 +- .../blocks/textures/CasingTextureHandler2.java | 108 +- .../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 | 979 +---- .../common/items/MetaGeneratedGregtechTools.java | 26 +- .../items/behaviours/Behaviour_Choocher.java | 81 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 203 +- .../GT_MetaTileEntity_TesseractGenerator.java | 736 ++-- .../GT_MetaTileEntity_TesseractTerminal.java | 634 +-- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 267 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 261 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 162 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 259 +- .../GregtechMetaTileEntitySolarGenerator.java | 233 +- .../GregtechMetaTileEntitySuperCondensor.java | 212 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 252 +- .../machines/multi/GregtechMTE_NuclearReactor.java | 354 +- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 445 +-- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 360 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 486 ++- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 355 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 353 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 290 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 336 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 294 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 778 ++-- .../GregtechMetaTileEntity_MassFabricator.java | 547 ++- .../multi/GregtechMetaTileEntity_MultiTank.java | 609 ++- ...chMetaTileEntity_PowerSubStationController.java | 274 +- .../storage/GT_MetaTileEntity_TieredTank.java | 258 +- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 162 +- .../common/tools/TOOL_Gregtech_Choocher.java | 326 +- .../xmod/gregtech/loaders/Gregtech_Blocks.java | 36 +- .../loaders/ProcessingToolHeadChoocher.java | 141 +- .../loaders/Processing_Textures_Items.java | 5 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 270 +- .../gregtech/loaders/RecipeGen_BlastSmelterGT.java | 229 +- .../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 | 581 ++- .../registration/gregtech/GregtechDehydrator.java | 123 +- .../gregtech/GregtechEnergyBuffer.java | 203 +- .../GregtechGeothermalThermalGenerator.java | 80 +- .../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 | 80 +- .../registration/gregtech/GregtechSafeBlock.java | 154 +- .../gregtech/GregtechSolarGenerators.java | 54 +- .../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 | 98 +- .../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 | 241 +- .../xmod/ic2/block/RTGGenerator/TileEntityRTG.java | 76 +- .../ic2/block/RTGGenerator/gui/CONTAINER_RTG.java | 23 +- .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 79 +- .../kieticgenerator/IC2_BlockKineticGenerator.java | 109 +- .../ic2/block/kieticgenerator/IC2_TEComponent.java | 76 +- .../container/ContainerKineticWindgenerator.java | 33 +- .../gui/GuiKineticWindGenerator.java | 129 +- .../tileentity/TileEntityKineticWindGenerator.java | 488 ++- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 37 +- .../xmod/ic2/item/IC2_ItemGradualInteger.java | 81 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 130 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 134 +- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 84 +- src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 85 +- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 159 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 251 +- .../xmod/psychedelicraft/HANDLER_Psych.java | 23 +- .../xmod/thermalfoundation/HANDLER_TF.java | 38 +- .../block/TF_Block_Fluid_Cryotheum.java | 339 +- .../block/TF_Block_Fluid_Pyrotheum.java | 337 +- .../xmod/thermalfoundation/block/TF_Blocks.java | 39 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 84 +- .../xmod/thermalfoundation/item/TF_Items.java | 109 +- .../recipe/TF_Gregtech_Recipes.java | 73 +- 201 files changed, 24217 insertions(+), 30011 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 385cf0ae08..c83441c350 100644 --- a/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java +++ b/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java @@ -1,43 +1,41 @@ package gtPlusPlus.xmod.Computronics; import gregtech.GT_Mod; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.LoadedMods; public class HANDLER_Computronics { - public static void init() { - if (LoadedMods.Computronics) { + public static void preInit(){ + 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 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 preInit() { - if (LoadedMods.Computronics) { + public static void postInit(){ + if (LoadedMods.Computronics){ } } + } diff --git a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java index 8052b98dac..ff26064e98 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java @@ -1,34 +1,34 @@ package gtPlusPlus.xmod.forestry; -import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.forestry.bees.alveary.TileAlvearyFrameHousing; import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; +import cpw.mods.fml.common.registry.GameRegistry; public class HANDLER_FR { - 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 preInit() { - if (LoadedMods.Forestry) { + public static void preInit(){ + if (LoadedMods.Forestry){ FR_ItemRegistry.Register(); - if (CORE.configSwitches.enableCustomAlvearyBlocks) { + if (CORE.configSwitches.enableCustomAlvearyBlocks){ GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing"); } - // FR_BlockRegistryApiculture.RegistryApiculture(); - } + //FR_BlockRegistryApiculture.RegistryApiculture(); + } + } + + public static void Init(){ + if (LoadedMods.Forestry){ + //FR_TileHandler.init(); + //new FR_GuiIDRegistry(); + } } + + public static void postInit(){ + if (LoadedMods.Forestry){ + FR_Gregtech_Recipes.registerItems(); + } + } } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java index 039c80fe00..6736c54309 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(final IAlvearyFrameHousing apiary) { + public AlvearyBeeListener(IAlvearyFrameHousing apiary) { this.apiary = apiary; } @Override - public void wearOutEquipment(final int amount) { - final InventoryFrameHousing apiaryInventory = this.apiary.getAlvearyInventory(); - apiaryInventory.wearOutFrames(this.apiary, amount); + public void wearOutEquipment(int amount) { + InventoryFrameHousing apiaryInventory = apiary.getAlvearyInventory(); + apiaryInventory.wearOutFrames(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 5c6956ec86..2f4437afd1 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java @@ -1,11 +1,15 @@ package gtPlusPlus.xmod.forestry.bees.alveary; +import net.minecraft.util.ChunkCoordinates; + import com.mojang.authlib.GameProfile; -import forestry.api.multiblock.*; -import net.minecraft.util.ChunkCoordinates; +import forestry.api.multiblock.IAlvearyComponent; +import forestry.api.multiblock.IMultiblockComponent; +import forestry.api.multiblock.IMultiblockController; +import forestry.api.multiblock.IMultiblockLogicAlveary; -public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockComponent { +public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockComponent{ @Override public ChunkCoordinates getCoordinates() { @@ -14,28 +18,28 @@ public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockCompo } @Override - public IMultiblockLogicAlveary getMultiblockLogic() { + public GameProfile getOwner() { // TODO Auto-generated method stub return null; } @Override - public GameProfile getOwner() { + public void onMachineAssembled(IMultiblockController arg0, + ChunkCoordinates arg1, ChunkCoordinates arg2) { // TODO Auto-generated method stub - return null; + } @Override - public void onMachineAssembled(final IMultiblockController arg0, final ChunkCoordinates arg1, - final ChunkCoordinates arg2) { + public void onMachineBroken() { // TODO Auto-generated method stub - + } @Override - public void onMachineBroken() { + public IMultiblockLogicAlveary getMultiblockLogic() { // 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 d4fce6465b..f087ad75f4 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java @@ -3,15 +3,6 @@ package gtPlusPlus.xmod.forestry.bees.alveary; import java.util.ArrayList; import java.util.List; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.apiculture.MaterialBeehive; -import forestry.apiculture.multiblock.TileAlvearyPlain; -import forestry.core.blocks.BlockStructure; -import forestry.core.render.TextureManager; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.core.creative.AddToCreativeTab; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -22,250 +13,262 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.apiculture.MaterialBeehive; +import forestry.apiculture.multiblock.TileAlvearyPlain; +import forestry.core.blocks.BlockStructure; +import forestry.core.render.TextureManager; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.core.creative.AddToCreativeTab; -public class FR_BlockAlveary extends BlockStructure { - - public static enum Type { - PLAIN, ERROR, FRAME, MUTATOR, +public class FR_BlockAlveary extends BlockStructure +{ - // Placeholder Values + public static enum Type + { + PLAIN, + ERROR, + FRAME, + MUTATOR, + + //Placeholder Values HEATER, HYGRO, STABILIZER, SIEVE; - public static final Type[] VALUES = Type.values(); + public static final Type[] VALUES = values(); - private Type() { - } + private Type() {} } - /* 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 FR_BlockAlveary() + { + super(new MaterialBeehive(false)); + setHardness(1.0F); + setCreativeTab(AddToCreativeTab.tabBlock); + setHarvestLevel("axe", 0); + + } - public static final int ALVEARY_MUTATOR_ON = 8; + @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; + } + @Override @SideOnly(Side.CLIENT) - private IIcon[] icons; + 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 FR_BlockAlveary() { - super(new MaterialBeehive(false)); - this.setHardness(1.0F); - this.setCreativeTab(AddToCreativeTab.tabBlock); - this.setHarvestLevel("axe", 0); + @Override + public int getRenderType() + { + return 0; + } + + @Override + public boolean renderAsNormalBlock() + { + return true; + } + @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; } + @Override - public TileEntity createNewTileEntity(final World world, final int meta) { - return this.createTileEntity(world, meta); + public int getDamageValue(World world, int x, int y, int z) + { + int meta = world.getBlockMetadata(x, y, z); + return meta != 1 ? meta : 0; } + @Override - public TileEntity createTileEntity(final World world, final int metadata) { - if (metadata < 0 || metadata > Type.VALUES.length) { + public TileEntity createTileEntity(World world, int metadata) + { + if ((metadata < 0) || (metadata > Type.VALUES.length)) { return null; } - - 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"); + + + + 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(); } } - public ItemStack get(final Type type) { - return new ItemStack(this, 1, type.ordinal()); + + @Override + public Block setBlockName(String name) { + //int meta = this. + return super.setBlockName(name); } - @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 TileEntity createNewTileEntity(World world, int meta) + { + return createTileEntity(world, meta); } + + /* 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) @Override - 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; + 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"); } + @SideOnly(Side.CLIENT) @Override - 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; + 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; + } } @SideOnly(Side.CLIENT) @Override - 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); + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + 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); } - 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); + Block blockXP = world.getBlock(x + 1, y, z); + 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 this.switchForSide(42, side); + return switchForSide(42, side); } - return this.switchForSide(41, side); + return 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 this.switchForSide(41, side); + return switchForSide(41, side); } - return this.switchForSide(42, side); + return switchForSide(42, side); } return this.getIcon(side, meta); } return this.getIcon(side, meta); } @SideOnly(Side.CLIENT) - @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; + 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); } + return icons[((FR_TileAlveary) tile).getIcon(side)]; } - @Override - public int getRenderType() { - return 0; - } - - @Override @SideOnly(Side.CLIENT) - 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)); + private IIcon switchForSide(int textureId, int side) { + if (side == 4 || side == 5) { + if (textureId == 41) { + return icons[LEFT]; } + 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(final World world, final int x, final int y, final int z, final Block block) { + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { super.onNeighborBlockChange(world, x, y, z, block); - final TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(x, y, z); if (tileEntity instanceof FR_TileAlveary) { - final FR_TileAlveary tileAlveary = (FR_TileAlveary) tileEntity; + FR_TileAlveary tileAlveary = (FR_TileAlveary) tileEntity; // We must check that the slabs on top were not removed tileAlveary.getMultiblockLogic().getController().reassemble(); } } - - @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]; - } + public ItemStack get(Type type) { + return new ItemStack(this, 1, type.ordinal()); } } \ 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 2db809ae90..b5b3b73e6b 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java @@ -3,160 +3,197 @@ package gtPlusPlus.xmod.forestry.bees.alveary; import java.io.IOException; import java.util.List; -import forestry.api.apiculture.*; -import forestry.api.core.*; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.Vec3; +import net.minecraft.world.biome.BiomeGenBase; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeHousingInventory; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IBeekeepingLogic; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorLogic; import forestry.api.multiblock.IAlvearyComponent; import forestry.api.multiblock.IMultiblockController; import forestry.apiculture.multiblock.MultiblockLogicAlveary; -import forestry.core.access.*; +import forestry.core.access.EnumAccess; +import forestry.core.access.IAccessHandler; +import forestry.core.access.IRestrictedAccess; import forestry.core.config.Config; import forestry.core.gui.IGuiHandlerForestry; import forestry.core.gui.IHintSource; import forestry.core.inventory.IInventoryAdapter; import forestry.core.multiblock.MultiblockTileEntityForestry; -import forestry.core.network.*; +import forestry.core.network.DataInputStreamForestry; +import forestry.core.network.DataOutputStreamForestry; +import forestry.core.network.IStreamableGui; import forestry.core.tiles.IClimatised; import forestry.core.tiles.ITitled; -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(final FR_BlockAlveary.Type type) { + protected FR_TileAlveary(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"); + } - @Override - public boolean canBlockSeeTheSky() { - return this.getMultiblockLogic().getController().canBlockSeeTheSky(); + public int getIcon(int side) + { + return 0; } @Override - public IAccessHandler getAccessHandler() { - return this.getMultiblockLogic().getController().getAccessHandler(); + 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(); } @Override - public Vec3 getBeeFXCoordinates() { - return this.getMultiblockLogic().getController().getBeeFXCoordinates(); + 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(); } @Override - public IBeeHousingInventory getBeeInventory() { - return this.getMultiblockLogic().getController().getBeeInventory(); + public BiomeGenBase getBiome() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBiome(); } @Override - public IBeekeepingLogic getBeekeepingLogic() { - return this.getMultiblockLogic().getController().getBeekeepingLogic(); + public Iterable getBeeModifiers() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeModifiers(); } @Override - public Iterable getBeeListeners() { - return this.getMultiblockLogic().getController().getBeeListeners(); + public Iterable getBeeListeners() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeListeners(); } @Override - public Iterable getBeeModifiers() { - return this.getMultiblockLogic().getController().getBeeModifiers(); + public IBeeHousingInventory getBeeInventory() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory(); } @Override - public BiomeGenBase getBiome() { - return this.getMultiblockLogic().getController().getBiome(); + public IBeekeepingLogic getBeekeepingLogic() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeekeepingLogic(); } @Override - public int getBlockLightValue() { - return this.getMultiblockLogic().getController().getBlockLightValue(); + public Vec3 getBeeFXCoordinates() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeFXCoordinates(); } @Override - public IErrorLogic getErrorLogic() { - return this.getMultiblockLogic().getController().getErrorLogic(); + public EnumTemperature getTemperature() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getTemperature(); } @Override - public float getExactHumidity() { - return this.getMultiblockLogic().getController().getExactHumidity(); + public EnumHumidity getHumidity() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getHumidity(); } @Override - public float getExactTemperature() { - return this.getMultiblockLogic().getController().getExactTemperature(); + public int getBlockLightValue() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBlockLightValue(); } @Override - public List getHints() { - return Config.hints.get("apiary"); + public boolean canBlockSeeTheSky() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().canBlockSeeTheSky(); } @Override - public EnumHumidity getHumidity() { - return this.getMultiblockLogic().getController().getHumidity(); + public IErrorLogic getErrorLogic() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getErrorLogic(); } - public int getIcon(final int side) { - return 0; + @Override + public IAccessHandler getAccessHandler() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getAccessHandler(); } @Override - public IInventoryAdapter getInternalInventory() { - return this.getMultiblockLogic().getController().getInternalInventory(); + public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) + { + ((MultiblockLogicAlveary)getMultiblockLogic()).getController().onSwitchAccess(oldAccess, newAccess); } @Override - public EnumTemperature getTemperature() { - return this.getMultiblockLogic().getController().getTemperature(); + public IInventoryAdapter getInternalInventory() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getInternalInventory(); } @Override - public String getUnlocalizedTitle() { + public String getUnlocalizedTitle() + { return this.unlocalizedTitle; } @Override - 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(); + public List getHints() + { + return Config.hints.get("apiary"); } @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, this.getBlockType()); - this.markDirty(); + public float getExactTemperature() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getExactTemperature(); } @Override - public void onSwitchAccess(final EnumAccess oldAccess, final EnumAccess newAccess) { - this.getMultiblockLogic().getController().onSwitchAccess(oldAccess, newAccess); + public float getExactHumidity() + { + return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getExactHumidity(); } @Override - public void readGuiData(final DataInputStreamForestry data) throws IOException { - this.getMultiblockLogic().getController().readGuiData(data); + public void writeGuiData(DataOutputStreamForestry data) + throws IOException + { + ((MultiblockLogicAlveary)getMultiblockLogic()).getController().writeGuiData(data); } @Override - public void writeGuiData(final DataOutputStreamForestry data) throws IOException { - this.getMultiblockLogic().getController().writeGuiData(data); + public void readGuiData(DataInputStreamForestry data) + throws IOException + { + ((MultiblockLogicAlveary)getMultiblockLogic()).getController().readGuiData(data); } } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java index c5c2e0c8f4..b55d2d37a6 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java @@ -5,16 +5,24 @@ import forestry.api.core.IClimateControlled; import forestry.api.multiblock.IMultiblockComponent; import forestry.api.multiblock.IMultiblockLogicAlveary; -public abstract interface IAlvearyComponentAdvanced extends IMultiblockComponent { - public static abstract interface BeeModifier extends IAlvearyComponentAdvanced { - public abstract IBeeModifier getBeeModifier(); - } +public abstract interface IAlvearyComponentAdvanced +extends IMultiblockComponent +{ + @Override + public abstract T getMultiblockLogic(); - public static abstract interface FrameHouse extends IAlvearyComponentAdvanced { + + public static abstract interface FrameHouse + extends IAlvearyComponentAdvanced + { public abstract void changeClimate(int paramInt, IClimateControlled paramIClimateControlled); } - @Override - public abstract T getMultiblockLogic(); + + public static abstract interface BeeModifier + extends IAlvearyComponentAdvanced + { + public abstract IBeeModifier getBeeModifier(); + } } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyFrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyFrameHousing.java index d4166b00c9..6eeefa2696 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyFrameHousing.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyFrameHousing.java @@ -5,6 +5,5 @@ 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 f8724fc840..523c3e2434 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java @@ -1,8 +1,10 @@ package gtPlusPlus.xmod.forestry.bees.alveary; -import forestry.api.apiculture.IBeeHousing; import net.minecraft.inventory.ISidedInventory; +import forestry.api.apiculture.IBeeHousing; -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 af1e0b95b3..794b5d1be8 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java @@ -1,14 +1,37 @@ package gtPlusPlus.xmod.forestry.bees.alveary; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Stack; -import forestry.api.apiculture.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.DefaultBeeListener; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IBeekeepingMode; +import forestry.api.apiculture.IHiveFrame; import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; 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.apiculture.worldgen.Hive; +import forestry.apiculture.worldgen.HiveDecorator; +import forestry.apiculture.worldgen.HiveDescriptionSwarmer; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; @@ -16,52 +39,21 @@ import forestry.core.proxy.Proxies; import forestry.core.tiles.IActivatable; import forestry.core.utils.ItemStackUtil; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.xmod.forestry.bees.alveary.gui.*; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -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 { - 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() { +import gtPlusPlus.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing; +import gtPlusPlus.xmod.forestry.bees.alveary.gui.GUI_FrameHousing; +import gtPlusPlus.xmod.forestry.bees.alveary.gui.InventoryFrameHousing; + +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() + { super(FR_BlockAlveary.Type.FRAME); this.inventory = new InventoryFrameHousing(this); this.beeListener = new AlvearyFrameHousingBeeListener(this.inventory); @@ -69,101 +61,113 @@ public class TileAlvearyFrameHousing extends FR_TileAlveary implements ISidedFra } @Override - public boolean allowsAutomation() { + public IInventoryAdapter getInternalInventory() + { + return this.inventory; + } + + @Override + public boolean allowsAutomation() + { return true; } - private int consumeInducerAndGetChance() { - if (this.getInternalInventory() == null) { - return 0; + @Override + public void updateServer(int tickCount) + { + + if (getInternalInventory() == null) { + return; } - 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(); + + if (this.inventory.getStackInSlot(0) != null) + { + if (((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeekeepingLogic().canWork()){ + setActive(true); + if (tickCount % 1000 == 0) { + wearOutFrames(this, 1); } } - } - final IInvSlot slot; - final ItemStack stack; - return 0; - } + else { + Utils.LOG_INFO("Cannot work - Probably no queen alive."); + } - @Override - protected void decodeDescriptionPacket(final NBTTagCompound packetData) { - super.decodeDescriptionPacket(packetData); - this.setActive(packetData.getBoolean("Active")); - } + } + else + { + setActive(false); + } + if (tickCount % 500 != 0) { + return; + } - @Override - protected void encodeDescriptionPacket(final NBTTagCompound packetData) { - super.encodeDescriptionPacket(packetData); - packetData.setBoolean("Active", this.active); } @Override - public InventoryFrameHousing getAlvearyInventory() { - return this.inventory; - } + public void updateClient(int tickCount) {} - @Override - public IBeeListener getBeeListener() { - return this.beeListener; + private ItemStack getPrincessStack() + { + ItemStack princessStack = ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory().getQueen(); + if (BeeManager.beeRoot.isMated(princessStack)) { + return princessStack; + } + return null; } - @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()); + private int consumeInducerAndGetChance() + { + if (getInternalInventory() == null) { + return 0; } - return beeModifiers.get(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(); + } + } + } + IInvSlot slot; + ItemStack stack; + return 0; } - @Override - public Collection getBeeModifiers() { - final List beeModifiers = new ArrayList(); + private void trySpawnSwarm() + { + ItemStack toSpawn = (ItemStack)this.pendingSpawns.peek(); + HiveDescriptionSwarmer hiveDescription = new HiveDescriptionSwarmer(new ItemStack[] { toSpawn }); + Hive hive = new Hive(hiveDescription); - beeModifiers.add(this.beeModifier); - for (final IHiveFrame frame : this.getFrames(this.inventory)) { - beeModifiers.add(frame.getBeeModifier()); + 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(); } - return beeModifiers; } @Override - 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; + protected void encodeDescriptionPacket(NBTTagCompound packetData) + { + super.encodeDescriptionPacket(packetData); + packetData.setBoolean("Active", this.active); } @Override - public Object getGui(final EntityPlayer player, final int data) { - return new GUI_FrameHousing(this, player); + protected void decodeDescriptionPacket(NBTTagCompound packetData) + { + super.decodeDescriptionPacket(packetData); + setActive(packetData.getBoolean("Active")); } @Override - public int getIcon(final int side) { - if (side == 0 || side == 1) { + public int getIcon(int side) + { + if ((side == 0) || (side == 1)) { return 2; } if (this.active) { @@ -173,41 +177,48 @@ public class TileAlvearyFrameHousing extends FR_TileAlveary implements ISidedFra } @Override - public IInventoryAdapter getInternalInventory() { - return this.inventory; - } + public void readFromNBT(NBTTagCompound nbttagcompound) + { + super.readFromNBT(nbttagcompound); + setActive(nbttagcompound.getBoolean("Active")); - private ItemStack getPrincessStack() { - final ItemStack princessStack = this.getMultiblockLogic().getController().getBeeInventory().getQueen(); - if (BeeManager.beeRoot.isMated(princessStack)) { - return princessStack; + 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)); } - return null; - } - private ItemStack getQueenStack() { - final ItemStack queenStack = this.getMultiblockLogic().getController().getBeeInventory().getQueen(); - return queenStack; } @Override - public boolean isActive() { - return this.active; + 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); } @Override - 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)); - } + public boolean isActive() + { + return this.active; } @Override - public void setActive(final boolean active) { + public void setActive(boolean active) + { if (this.active == active) { return; } @@ -217,91 +228,133 @@ public class TileAlvearyFrameHousing extends FR_TileAlveary implements ISidedFra } } - 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 getGui(EntityPlayer player, int data) + { + return new GUI_FrameHousing(this, player); } @Override - public void updateClient(final int tickCount) { + public Object getContainer(EntityPlayer player, int data) + { + return new CONTAINER_FrameHousing(this, player); } + private final IBeeModifier beeModifier = new AlvearyBeeModifier(); + //private final IBeeListener beeListener = new AlvearyBeeListener(this); + private final Iterable beeListenerList = ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeListeners(); + @Override - public void updateServer(final int tickCount) { + public Collection getBeeModifiers() + { + List beeModifiers = new ArrayList(); - if (this.getInternalInventory() == null) { - return; + beeModifiers.add(this.beeModifier); + for (IHiveFrame frame : getFrames(this.inventory)) { + beeModifiers.add(frame.getBeeModifier()); } + return beeModifiers; + } - if (this.inventory.getStackInSlot(0) != null) { - if (this.getMultiblockLogic().getController().getBeekeepingLogic().canWork()) { - this.setActive(true); - if (tickCount % 1000 == 0) { - this.wearOutFrames(this, 1); + 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); } } - else { - Utils.LOG_INFO("Cannot work - Probably no queen alive."); - } - } - else { - this.setActive(false); - } - if (tickCount % 500 != 0) { - return; + return hiveFrames; + } + + @Override + public IBeeModifier getBeeModifier() { + List beeModifiers = new ArrayList(); + + //beeModifiers.add(this.beeModifier); + for (IHiveFrame frame : getFrames(this.inventory)) { + beeModifiers.add(frame.getBeeModifier()); } + return beeModifiers.get(0); + } + private ItemStack getQueenStack() + { + ItemStack queenStack = ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInvent