From ae21012d216df71f31aed6fbc9d76215fc24ceed Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 12:58:47 +1000 Subject: + New texture for the slow builders ring. + Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project. --- src/Java/gtPlusPlus/xmod/forestry/Forestry.java | 66 +- src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 28 +- .../forestry/bees/alveary/AlvearyBeeListener.java | 8 +- .../xmod/forestry/bees/alveary/AlvearyHandler.java | 18 +- .../bees/alveary/FR_AlvearyFrameBlock.java | 11 +- .../forestry/bees/alveary/FR_BlockAlveary.java | 200 +- .../xmod/forestry/bees/alveary/FR_TileAlveary.java | 64 +- .../bees/alveary/IAlvearyComponentAdvanced.java | 4 +- .../bees/alveary/ISidedFrameWearingInventory.java | 6 +- .../bees/alveary/TileAlvearyFrameHousing.java | 197 +- .../bees/alveary/gui/CONTAINER_FrameHousing.java | 38 +- .../bees/alveary/gui/GUI_FrameHousing.java | 70 +- .../bees/alveary/gui/InventoryFrameHousing.java | 51 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 10 +- .../xmod/forestry/bees/items/FR_StringUtil.java | 4 +- .../xmod/forestry/bees/items/MB_FrameType.java | 56 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 95 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 68 +- .../xmod/forestry/trees/TreefarmManager.java | 36 +- src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 14 +- .../api/energy/IC2ElectricItemManager.java | 6 +- .../xmod/gregtech/api/enums/CustomGtTextures.java | 156 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 295 +- .../gregtech/api/enums/GregtechOreDictNames.java | 36 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 723 ++-- .../gregtech/api/enums/GregtechTextureSet.java | 270 +- .../xmod/gregtech/api/enums/GregtechTextures.java | 294 +- .../gregtech/api/enums/GregtechToolDictNames.java | 6 +- .../gregtech/api/gui/CONTAINER_DeluxeTank.java | 104 +- .../api/gui/CONTAINER_IndustrialCentrifuge.java | 48 +- .../api/gui/CONTAINER_IronBlastFurnace.java | 32 +- .../xmod/gregtech/api/gui/CONTAINER_MatterFab.java | 18 +- .../gregtech/api/gui/CONTAINER_MultiMachine.java | 14 +- .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 55 +- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 132 +- .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 43 +- .../gregtech/api/gui/CONTAINER_TreeFarmer.java | 91 +- .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 43 +- .../gregtech/api/gui/GUI_IndustrialCentrifuge.java | 68 +- .../gregtech/api/gui/GUI_IronBlastFurnace.java | 38 +- .../xmod/gregtech/api/gui/GUI_MatterFab.java | 105 +- .../xmod/gregtech/api/gui/GUI_MultiMachine.java | 89 +- .../xmod/gregtech/api/gui/GUI_SafeBlock.java | 78 +- .../xmod/gregtech/api/gui/GUI_SolarGenerator.java | 64 +- .../xmod/gregtech/api/gui/GUI_SteamCondenser.java | 88 +- .../xmod/gregtech/api/gui/GUI_TreeFarmer.java | 34 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 22 +- .../internal/Interface_IconContainer.java | 24 +- .../internal/Interface_ItemBehaviour.java | 29 +- .../internal/Interface_OreRecipeRegistrator.java | 16 +- .../Interface_OreRecipeRegistrator_GT.java | 16 +- .../api/interfaces/internal/Interface_Texture.java | 14 +- .../interfaces/internal/Interface_ToolStats.java | 37 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 272 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 566 +-- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 1129 +++--- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 301 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 440 ++- .../gregtech/api/items/tools/GT_MetaGenTool.java | 417 ++- .../gregtech/api/items/types/ToolType_Base.java | 107 +- .../api/items/types/ToolType_HardHammer.java | 191 +- .../gregtech/api/items/types/ToolType_Wrench.java | 251 +- .../GT_MetaTileEntity_DeluxeTank.java | 239 +- .../implementations/GregtechMetaCondensor.java | 279 +- .../implementations/GregtechMetaEnergyBuffer.java | 278 +- .../GregtechMetaPipeEntityFluid.java | 291 +- .../GregtechMetaPipeEntity_Cable.java | 258 +- .../GregtechMetaPipeEntity_SuperConductor.java | 260 +- .../implementations/GregtechMetaSafeBlock.java | 70 +- .../GregtechMetaSuperConductorNodeBase.java | 580 +-- .../GregtechMetaTreeFarmerStructural.java | 52 +- .../base/GregtechMetaPipeEntityBase_Cable.java | 306 +- .../base/GregtechMetaTileEntity.java | 59 +- .../base/GregtechMeta_MultiBlockBase.java | 1745 +++++---- .../GregtechDoubleFuelGeneratorBase.java | 288 +- .../base/generators/GregtechMetaBoilerBase.java | 637 ++-- .../generators/GregtechMetaSolarGenerator.java | 341 +- .../GregtechRocketFuelGeneratorBase.java | 530 +-- .../GregtechBaseMetaTileEntityLossless.java | 3865 +++++++++++--------- .../GregtechMetaPipeEntity_BaseSuperConductor.java | 1225 ++++--- .../lossless/GregtechMetaTileEntityLossless.java | 59 +- .../GregtechMetaTileEntityLosslessBasicTank.java | 472 +-- ...chMetaTileEntityLosslessTieredMachineBlock.java | 102 +- .../base/lossless/MetaTileEntityLossless.java | 1677 ++++----- .../base/machines/GregtechMetaSafeBlockBase.java | 184 +- .../base/machines/GregtechMetaTreeFarmerBase.java | 80 +- .../creative/GregtechMetaCreativeEnergyBuffer.java | 141 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 32 +- .../gregtech/api/objects/GregtechItemData.java | 250 +- .../api/objects/GregtechMaterialStack.java | 79 +- .../gtPlusPlus/xmod/gregtech/api/objects/XSTR.java | 387 +- .../ProcessingSkookumChoocherToolRecipes.java | 14 +- .../api/util/GregtechOreDictUnificator.java | 766 ++-- .../api/util/GregtechRecipeRegistrator.java | 646 ++-- .../xmod/gregtech/common/Meta_GT_Proxy.java | 31 +- .../common/blocks/GregtechMetaCasingBlocks.java | 54 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 42 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 211 +- .../common/blocks/GregtechMetaCasingItems.java | 8 +- .../common/blocks/GregtechMetaItemCasings1.java | 8 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 23 +- .../common/blocks/fluid/GregtechFluidHandler.java | 12 +- .../blocks/textures/CasingTextureHandler.java | 20 +- .../blocks/textures/CasingTextureHandler2.java | 44 +- .../textures/TexturesCentrifugeMultiblock.java | 84 +- .../common/blocks/textures/TexturesGregtech58.java | 78 +- .../common/blocks/textures/TexturesGregtech59.java | 718 ++-- .../common/blocks/textures/TexturesGtBlock.java | 114 +- .../common/blocks/textures/TexturesGtTools.java | 86 +- .../gregtech/common/helpers/TreeFarmHelper.java | 97 +- .../common/items/MetaGeneratedGregtechItems.java | 354 +- .../common/items/MetaGeneratedGregtechTools.java | 18 +- .../items/behaviours/Behaviour_Choocher.java | 33 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 182 +- .../GT_MetaTileEntity_TesseractGenerator.java | 225 +- .../GT_MetaTileEntity_TesseractTerminal.java | 220 +- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 237 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 210 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 52 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 210 +- .../GregtechMetaTileEntitySolarGenerator.java | 77 +- .../GregtechMetaTileEntitySuperCondensor.java | 160 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 228 +- .../machines/multi/GregtechMTE_NuclearReactor.java | 233 +- .../multi/GregtechMetaTileEntityAnimalFarm.java | 157 +- .../multi/GregtechMetaTileEntityTreeFarm.java | 404 +- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 405 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 118 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 406 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 255 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 105 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 218 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 115 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 139 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 660 ++-- .../GregtechMetaTileEntity_MassFabricator.java | 131 +- .../multi/GregtechMetaTileEntity_MultiTank.java | 328 +- ...chMetaTileEntity_PowerSubStationController.java | 82 +- .../multi/GregtechMetaTileEntity_Refinery.java | 193 +- .../storage/GT_MetaTileEntity_TieredTank.java | 200 +- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 44 +- .../common/tools/TOOL_Gregtech_Choocher.java | 249 +- .../xmod/gregtech/loaders/Gregtech_Blocks.java | 2 +- .../loaders/ProcessingToolHeadChoocher.java | 107 +- .../loaders/Processing_Textures_Items.java | 4 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 22 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 30 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 102 +- .../gregtech/loaders/RecipeGen_BlastSmelterGT.java | 70 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 60 +- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 24 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 52 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 28 +- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 60 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 109 +- .../recipes/machines/RECIPEHANDLER_CokeOven.java | 10 +- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 22 +- .../machines/RECIPEHANDLER_MatterFabricator.java | 14 +- .../registration/gregtech/Gregtech4Content.java | 8 +- .../registration/gregtech/GregtechConduits.java | 105 +- .../registration/gregtech/GregtechDehydrator.java | 16 +- .../gregtech/GregtechEnergyBuffer.java | 28 +- .../GregtechGeothermalThermalGenerator.java | 51 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 6 +- .../gregtech/GregtechIndustrialCentrifuge.java | 6 +- .../gregtech/GregtechIndustrialCokeOven.java | 6 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 6 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 6 +- .../gregtech/GregtechIndustrialMacerator.java | 6 +- .../gregtech/GregtechIndustrialMassFabricator.java | 6 +- .../gregtech/GregtechIndustrialMultiTank.java | 6 +- .../gregtech/GregtechIndustrialPlatePress.java | 6 +- .../gregtech/GregtechIndustrialTreeFarm.java | 6 +- .../gregtech/GregtechIndustrialWiremill.java | 6 +- .../gregtech/GregtechIronBlastFurnace.java | 4 +- .../registration/gregtech/GregtechLFTR.java | 6 +- .../gregtech/GregtechPowerSubStation.java | 6 +- .../gregtech/GregtechRocketFuelGenerator.java | 51 +- .../registration/gregtech/GregtechSafeBlock.java | 4 +- .../gregtech/GregtechSolarGenerators.java | 29 +- .../gregtech/GregtechSteamCondenser.java | 6 +- .../gregtech/GregtechSuperConductionPoint.java | 2 +- .../gregtech/GregtechTieredFluidTanks.java | 6 +- .../gregtech/GregtechTreeFarmerTE.java | 4 +- .../gtPlusPlus/xmod/growthcraft/HANDLER_GC.java | 2 +- .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 60 +- .../xmod/growthcraft/fishtrap/Growthcraft_New.java | 10 +- .../xmod/growthcraft/fishtrap/Growthcraft_Old.java | 10 +- src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java | 10 +- .../xmod/ic2/block/RTGGenerator/BlockRTG.java | 108 +- .../xmod/ic2/block/RTGGenerator/TileEntityRTG.java | 42 +- .../ic2/block/RTGGenerator/gui/CONTAINER_RTG.java | 15 +- .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 75 +- .../kieticgenerator/IC2_BlockKineticGenerator.java | 117 +- .../ic2/block/kieticgenerator/IC2_TEComponent.java | 71 +- .../container/ContainerKineticWindgenerator.java | 34 +- .../gui/GuiKineticWindGenerator.java | 126 +- .../tileentity/TileEntityKineticWindGenerator.java | 132 +- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 21 +- .../xmod/ic2/item/IC2_ItemGradualInteger.java | 84 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 26 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 2 +- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 85 +- src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 28 +- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 138 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 48 +- .../xmod/thermalfoundation/HANDLER_TF.java | 14 +- .../block/TF_Block_Fluid_Cryotheum.java | 333 +- .../block/TF_Block_Fluid_Pyrotheum.java | 333 +- .../xmod/thermalfoundation/block/TF_Blocks.java | 38 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 50 +- .../xmod/thermalfoundation/item/TF_Items.java | 10 +- .../recipe/TF_Gregtech_Recipes.java | 22 +- 213 files changed, 18479 insertions(+), 16949 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod') diff --git a/src/Java/gtPlusPlus/xmod/forestry/Forestry.java b/src/Java/gtPlusPlus/xmod/forestry/Forestry.java index 698e6a8d01..8f5b36f6e3 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/Forestry.java +++ b/src/Java/gtPlusPlus/xmod/forestry/Forestry.java @@ -2,10 +2,6 @@ package gtPlusPlus.xmod.forestry; import static cpw.mods.fml.common.registry.GameRegistry.findBlock; import static cpw.mods.fml.common.registry.GameRegistry.findItem; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import net.minecraft.block.Block; -import net.minecraft.item.Item; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -16,6 +12,10 @@ import cpw.mods.fml.common.Mod.CustomProperty; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import net.minecraft.block.Block; +import net.minecraft.item.Item; @ChildMod(parent = CORE.MODID, mod = @Mod(modid = "Gregtech++|CompatForestry", name = "GT++ Compat: Forestry", @@ -27,12 +27,12 @@ public class Forestry { private static final String name = "Forestry"; @EventHandler - public void load(FMLInitializationEvent e) { + public void load(final FMLInitializationEvent e) { try { initForestry(); - } catch (Throwable $) { - ModContainer This = FMLCommonHandler.instance().findContainerFor(this); + } catch (final Throwable $) { + final ModContainer This = FMLCommonHandler.instance().findContainerFor(this); LogManager.getLogger(This.getModId()).log(Level.ERROR, "There was a problem loading " + This.getName(), $); } } @@ -43,47 +43,45 @@ public class Forestry { item = findItem(name, "sapling"); Block block = findBlock(name, "saplingGE"); - if (item != null && block != null) { + if ((item != null) && (block != null)) { //ForestrySapling sapling = new ForestrySapling(item, block); //MFRRegistry.registerPlantable(sapling); //MFRRegistry.registerFertilizable(sapling); - } else - //Utils.LOG_WARNING("Forestry sapling/block null!"); - - block = findBlock(name, "soil"); + } else { + block = findBlock(name, "soil"); + } if (block != null) { //ForestryBogEarth bog = new ForestryBogEarth(block); //MFRRegistry.registerPlantable(bog); //MFRRegistry.registerFertilizable(bog); //MFRRegistry.registerHarvestable(bog); //MFRRegistry.registerFruit(bog); - } else - //Utils.LOG_WARNING("Forestry bog earth null!"); - - for (int i = 1; true; ++i) { - block = findBlock(name, "log" + i); - l: if (block == null) { - if (i > 1) - Utils.LOG_WARNING("Forestry logs null at " + i + "."); - else { - block = findBlock(name, "logs"); - if (block != null) { - break l; + } else { + for (int i = 1; true; ++i) { + block = findBlock(name, "log" + i); + l: if (block == null) { + if (i > 1) { + Utils.LOG_WARNING("Forestry logs null at " + i + "."); + } else { + block = findBlock(name, "logs"); + if (block != null) { + break l; + } + Utils.LOG_WARNING("Forestry logs null!"); } - Utils.LOG_WARNING("Forestry logs null!"); + break; } - break; + //MFRRegistry.registerHarvestable(new HarvestableWood(block)); + //MFRRegistry.registerFruitLogBlock(block); } - //MFRRegistry.registerHarvestable(new HarvestableWood(block)); - //MFRRegistry.registerFruitLogBlock(block); } for (int i = 1; true; ++i) { block = findBlock(name, "fireproofLog" + i); l: if (block == null) { - if (i > 1) + if (i > 1) { Utils.LOG_WARNING("Forestry logs null at " + i + "."); - else { + } else { block = findBlock(name, "logsFireproof"); if (block != null) { break l; @@ -102,8 +100,9 @@ public class Forestry { //MFRRegistry.registerFertilizable(leaf); //MFRRegistry.registerHarvestable(leaf); //MFRRegistry.registerFruit(leaf); - } else + } else { Utils.LOG_WARNING("Forestry leaves null!"); + } block = findBlock(name, "pods"); item = findItem(name, "grafterProven"); @@ -112,12 +111,13 @@ public class Forestry { //MFRRegistry.registerFertilizable(pod); //MFRRegistry.registerHarvestable(pod); //MFRRegistry.registerFruit(pod); - } else + } else { Utils.LOG_WARNING("Forestry pods null!"); + } } @EventHandler - public static void postInit(FMLPostInitializationEvent e) { + public static void postInit(final FMLPostInitializationEvent e) { //MFRRegistry.registerLiquidDrinkHandler("bioethanol", new DrinkHandlerBiofuel()); //TileEntityUnifier.updateUnifierLiquids(); } diff --git a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java index e92aa40ca2..9d19af17b8 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.forestry; +import cpw.mods.fml.common.Optional; import forestry.core.proxy.Proxies; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; @@ -8,43 +9,42 @@ import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; import net.minecraft.block.Block; import net.minecraft.world.World; -import cpw.mods.fml.common.Optional; public class HANDLER_FR { - public static void preInit(){ + public static void preInit(){ if (LoadedMods.Forestry){ FR_ItemRegistry.Register(); if (CORE.configSwitches.enableCustomAlvearyBlocks){ AlvearyHandler.run(); } - } + } } public static void Init(){ if (LoadedMods.Forestry){ - - } + + } } public static void postInit(){ if (LoadedMods.Forestry){ - FR_Gregtech_Recipes.registerItems(); - } - } - - public static boolean createBlockBreakParticles(World world, int x, int y, int z, Block block){ + FR_Gregtech_Recipes.registerItems(); + } + } + + public static boolean createBlockBreakParticles(final World world, final int x, final int y, final int z, final Block block){ if (LoadedMods.Forestry){ createBlockBreakParticles_INTERNAL(world, x, y, z, block); } return false; } - + @Optional.Method(modid = "Forestry") - private static void createBlockBreakParticles_INTERNAL(World world, int x, int y, int z, Block block){ + private static void createBlockBreakParticles_INTERNAL(final World world, final int x, final int y, final int z, final Block block){ Proxies.common.addBlockDestroyEffects(world, x, y, z, block, 0); } - - + + } 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/AlvearyHandler.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java index fd18f069cf..ab093645b6 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java @@ -1,28 +1,28 @@ package gtPlusPlus.xmod.forestry.bees.alveary; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.registry.GameRegistry; import forestry.core.items.ItemBlockForestry; import forestry.core.utils.StringUtil; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; public class AlvearyHandler { @Optional.Method(modid = "Forestry") public static void run(){ if (!LoadedMods.ExtraBees){ - if (CORE.configSwitches.enableCustomAlvearyBlocks){//Alveary Stuff - FR_BlockAlveary alveary; - alveary = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary"); - GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing"); - } + if (CORE.configSwitches.enableCustomAlvearyBlocks){//Alveary Stuff + FR_BlockAlveary alveary; + alveary = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary"); + GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing"); + } } - } + } - protected static T registerBlock(T block, Class itemClass, String name, Object... itemCtorArgs) { + protected static T registerBlock(final T block, final Class itemClass, final String name, final Object... itemCtorArgs) { block.setBlockName("for." + name); GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs); return block; 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 a322311434..06162f7dc1 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java @@ -1,10 +1,9 @@ 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; public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockComponent{ @@ -21,16 +20,16 @@ public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockCompo } @Override - public void onMachineAssembled(IMultiblockController arg0, - ChunkCoordinates arg1, ChunkCoordinates arg2) { + public void onMachineAssembled(final IMultiblockController arg0, + final ChunkCoordinates arg1, final ChunkCoordinates arg2) { // TODO Auto-generated method stub - + } @Override public void onMachineBroken() { // TODO Auto-generated method stub - + } @Override 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 bf632ef039..cd74ec0e81 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java @@ -3,6 +3,15 @@ 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.BlockForestry; +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; @@ -13,15 +22,6 @@ 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.BlockForestry; -import forestry.core.render.TextureManager; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.core.creative.AddToCreativeTab; public class FR_BlockAlveary extends BlockForestry { @@ -31,8 +31,8 @@ public class FR_BlockAlveary extends BlockForestry PLAIN, ERROR, FRAME, - MUTATOR, - + MUTATOR, + //Placeholder Values HEATER, HYGRO, STABILIZER, SIEVE; @@ -44,37 +44,39 @@ public class FR_BlockAlveary extends BlockForestry public FR_BlockAlveary() { super(new MaterialBeehive(false)); - setHardness(1.0F); - setCreativeTab(AddToCreativeTab.tabBlock); - setHarvestLevel("axe", 0); - + this.setHardness(1.0F); + this.setCreativeTab(AddToCreativeTab.tabBlock); + this.setHarvestLevel("axe", 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) + 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; - } + return false; + } @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) + public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { for (int i = 0; i < 4; i++) { - if (i != 1 && i != 0) { + if ((i != 1) && (i != 0)) { list.add(new ItemStack(item, 1, i)); } } @@ -93,64 +95,64 @@ public class FR_BlockAlveary extends BlockForestry } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) + public ArrayList getDrops(final World world, final int x, final int y, final int z, final int metadata, final int fortune) { - ArrayList drop = new ArrayList(); + final ArrayList drop = new ArrayList<>(); drop.add(new ItemStack(this, 1, metadata != 1 ? metadata : 0)); return drop; } @Override - public int getDamageValue(World world, int x, int y, int z) + public int getDamageValue(final World world, final int x, final int y, final int z) { - int meta = world.getBlockMetadata(x, y, z); + final int meta = world.getBlockMetadata(x, y, z); return meta != 1 ? meta : 0; } @Override - public TileEntity createTileEntity(World world, int metadata) + public TileEntity createTileEntity(final World world, final int metadata) { if ((metadata < 0) || (metadata > Type.VALUES.length)) { return null; } - - - - Type type = Type.VALUES[metadata]; + + + + final Type type = Type.VALUES[metadata]; switch (type) { - case FRAME: + case FRAME: LanguageRegistry.addName(this, "Alveary Frame Housing"); - case MUTATOR: + case MUTATOR: LanguageRegistry.addName(this, "Alveary Mutator Block"); - case ERROR: + case ERROR: LanguageRegistry.addName(this, "Invalid Alveary Block"); default: - LanguageRegistry.addName(this, "Unnamed Alveary Block"); + LanguageRegistry.addName(this, "Unnamed Alveary Block"); } switch (type) { - case FRAME: + case FRAME: return new TileAlvearyFrameHousing(); - case MUTATOR: + case MUTATOR: return new TileAlvearyPlain(); - case ERROR: + case ERROR: return new TileAlvearyPlain(); default: - return new TileAlvearyPlain(); + return new TileAlvearyPlain(); } } @Override - public Block setBlockName(String name) { + public Block setBlockName(final String name) { //int meta = this. return super.setBlockName(name); } @Override - public TileEntity createNewTileEntity(World world, int meta) + public TileEntity createNewTileEntity(final World world, final int meta) { - return createTileEntity(world, meta); + return this.createTileEntity(world, meta); } /* ICONS */ @@ -167,108 +169,108 @@ public class FR_BlockAlveary extends BlockForestry private IIcon[] icons; @SideOnly(Side.CLIENT) @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 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"); } @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]; + 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[BOTTOM]; } - Type type = Type.VALUES[metadata]; + final Type type = Type.VALUES[metadata]; switch (type) { case ERROR: - return icons[PLAIN]; + return this.icons[PLAIN]; case FRAME: - return icons[ALVEARY_FRAME_OFF]; + return this.icons[ALVEARY_FRAME_OFF]; case MUTATOR: - return icons[ALVEARY_MUTATOR_OFF]; + return this.icons[ALVEARY_MUTATOR_OFF]; case HEATER: - return icons[ALVEARY_MUTATOR_OFF]; + return this.icons[ALVEARY_MUTATOR_OFF]; case HYGRO: - return icons[ALVEARY_MUTATOR_OFF]; + return this.icons[ALVEARY_MUTATOR_OFF]; case STABILIZER: - return icons[PLAIN]; + return this.icons[PLAIN]; case SIEVE: - return icons[PLAIN]; + return this.icons[PLAIN]; default: return null; } } @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); + return this.getBlockTextureFromSideAndTile(world, x, y, z, side); } - Block blockXP = world.getBlock(x + 1, y, z); - Block blockXM = world.getBlock(x - 1, y, z); - if (blockXP == this && blockXM != this) { + 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); + 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 getIcon(side, 0); + return this.getIcon(side, 0); } - return icons[((FR_TileAlveary) tile).getIcon(side)]; + return this.icons[((FR_TileAlveary) tile).getIcon(side)]; } @SideOnly(Side.CLIENT) - private IIcon switchForSide(int textureId, int side) { - if (side == 4 || side == 5) { + private IIcon switchForSide(final int textureId, final int side) { + if ((side == 4) || (side == 5)) { if (textureId == 41) { - return icons[LEFT]; + return this.icons[LEFT]; } - return icons[RIGHT]; + return this.icons[RIGHT]; } else if (textureId == 41) { - return icons[RIGHT]; + return this.icons[RIGHT]; } else { - return icons[LEFT]; + return this.icons[LEFT]; } } @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) { + public ItemStack get(final 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 62b54ade3c..b5e7845dab 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java @@ -3,9 +3,6 @@ package gtPlusPlus.xmod.forestry.bees.alveary; import java.io.IOException; import java.util.List; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.Vec3; -import net.minecraft.world.biome.BiomeGenBase; import forestry.api.apiculture.*; import forestry.api.core.*; import forestry.api.multiblock.IAlvearyComponent; @@ -20,6 +17,9 @@ import forestry.core.multiblock.MultiblockTileEntityForestry; import forestry.core.network.*; 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 @@ -32,26 +32,26 @@ implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, IT 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"); - + } - public int getIcon(int side) + public int getIcon(final int side) { return 0; } @Override - public void onMachineAssembled(IMultiblockController multiblockController, ChunkCoordinates minCoord, ChunkCoordinates maxCoord) + 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, getBlockType()); - markDirty(); + this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); + this.markDirty(); } @Override @@ -60,92 +60,92 @@ implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, IT if (this.worldObj.isRemote) { this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } - this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, getBlockType()); - markDirty(); + this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); + this.markDirty(); } @Override public BiomeGenBase getBiome() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBiome(); + return this.getMultiblockLogic().getController().getBiome(); } @Override public Iterable getBeeModifiers() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeModifiers(); + return this.getMultiblockLogic().getController().getBeeModifiers(); } @Override public Iterable getBeeListeners() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeListeners(); + return this.getMultiblockLogic().getController().getBeeListeners(); } @Override public IBeeHousingInventory getBeeInventory() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory(); + return this.getMultiblockLogic().getController().getBeeInventory(); } @Override public IBeekeepingLogic getBeekeepingLogic() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeekeepingLogic(); + return this.getMultiblockLogic().getController().getBeekeepingLogic(); } @Override public Vec3 getBeeFXCoordinates() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeFXCoordinates(); + return this.getMultiblockLogic().getController().getBeeFXCoordinates(); } @Override public EnumTemperature getTemperature() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getTemperature(); + return this.getMultiblockLogic().getController().getTemperature(); } @Override public EnumHumidity getHumidity() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getHumidity(); + return this.getMultiblockLogic().getController().getHumidity(); } @Override public int getBlockLightValue() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBlockLightValue(); + return this.getMultiblockLogic().getController().getBlockLightValue(); } @Override public boolean canBlockSeeTheSky() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().canBlockSeeTheSky(); + return this.getMultiblockLogic().getController().canBlockSeeTheSky(); } @Override public IErrorLogic getErrorLogic() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getErrorLogic(); + return this.getMultiblockLogic().getController().getErrorLogic(); } @Override public IAccessHandler getAccessHandler() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getAccessHandler(); + return this.getMultiblockLogic().getController().getAccessHandler(); } @Override - public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) + public void onSwitchAccess(final EnumAccess oldAccess, final EnumAccess newAccess) { - ((MultiblockLogicAlveary)getMultiblockLogic()).getController().onSwitchAccess(oldAccess, newAccess); + this.getMultiblockLogic().getController().onSwitchAccess(oldAccess, newAccess); } @Override public IInventoryAdapter getInternalInventory() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getInternalInventory(); + return this.getMultiblockLogic().getController().getInternalInventory(); } @Override @@ -163,27 +163,27 @@ implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, IT @Override public float getExactTemperature() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getExactTemperature(); + return this.getMultiblockLogic().getController().getExactTemperature(); } @Override public float getExactHumidity() { - return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getExactHumidity(); + return this.getMultiblockLogic().getController().getExactHumidity(); } @Override - public void writeGuiData(DataOutputStreamForestry data) + public void writeGuiData(final DataOutputStreamForestry data) throws IOException { - ((MultiblockLogicAlveary)getMultiblockLogic()).getController().writeGuiData(data); + this.getMultiblockLogic().getController().writeGuiData(data); } @Override - public void readGuiData(DataInputStreamForestry data) + public void readGuiData(final DataInputStreamForestry data) throws IOException { - ((MultiblockLogicAlveary)getMultiblockLogic()).getController().readGuiData(data); + this.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 b55d2d37a6..a214263d0b 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java @@ -11,14 +11,14 @@ extends IMultiblockComponent @Override public abstract T getMultiblockLogic(); - + public static abstract interface FrameHouse extends IAlvearyComponentAdvanced { public abstract void changeClimate(int paramInt, IClimateControlled paramIClimateControlled); } - + public static abstract interface BeeModifier extends IAlvearyComponentAdvanced { diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java index 523c3e2434..2cc5e58ef7 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java @@ -1,10 +1,10 @@ package gtPlusPlus.xmod.forestry.bees.alveary; -import net.minecraft.inventory.ISidedInventory; import forestry.api.apiculture.IBeeHousing; +import net.minecraft.inventory.ISidedInventory; public abstract interface ISidedFrameWearingInventory - extends ISidedInventory +extends ISidedInventory { - public abstract void wearOutFrames(IBeeHousing paramIBeeHousing, int paramInt); + 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 3b09fc80e1..ff323632f5 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java @@ -2,18 +2,11 @@ package gtPlusPlus.xmod.forestry.bees.alveary; import java.util.*; -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.*; 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; @@ -24,6 +17,12 @@ 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 @@ -31,7 +30,7 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, { private final InventoryFrameHousing inventory; private final IBeeListener beeListener; - private final Stack pendingSpawns = new Stack(); + private final Stack pendingSpawns = new Stack<>(); private boolean active; public TileAlvearyFrameHousing() @@ -55,19 +54,19 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, } @Override - public void updateServer(int tickCount) + public void updateServer(final int tickCount) { - if (getInternalInventory() == null) { + if (this.getInternalInventory() == null) { return; } if (this.inventory.getStackInSlot(0) != null) { - if (((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeekeepingLogic().canWork()){ - setActive(true); - if (tickCount % 1000 == 0) { - wearOutFrames(this, 1); + if (this.getMultiblockLogic().getController().getBeekeepingLogic().canWork()){ + this.setActive(true); + if ((tickCount % 1000) == 0) { + this.wearOutFrames(this, 1); } } else { @@ -77,20 +76,20 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, } else { - setActive(false); + this.setActive(false); } - if (tickCount % 500 != 0) { + if ((tickCount % 500) != 0) { return; } } @Override - public void updateClient(int tickCount) {} + public void updateClient(final int tickCount) {} private ItemStack getPrincessStack() { - ItemStack princessStack = ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory().getQueen(); + final ItemStack princessStack = this.getMultiblockLogic().getController().getBeeInventory().getQueen(); if (BeeManager.beeRoot.isMated(princessStack)) { return princessStack; } @@ -99,55 +98,55 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, private int consumeInducerAndGetChance() { - if (getInternalInventory() == null) { + if (this.getInternalInventory() == null) { return 0; } - for (Iterator i$ = InventoryIterator.getIterable(getInternalInventory()).iterator(); i$.hasNext();) + for (final Iterator i$ = InventoryIterator.getIterable(this.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)) + 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 ((Integer)entry.getValue()).intValue(); + return entry.getValue().intValue(); } } } - IInvSlot slot; - ItemStack stack; + final IInvSlot slot; + final ItemStack stack; return 0; } private void trySpawnSwarm() { - ItemStack toSpawn = (ItemStack)this.pendingSpawns.peek(); - HiveDescriptionSwarmer hiveDescription = new HiveDescriptionSwarmer(new ItemStack[] { toSpawn }); - Hive hive = new Hive(hiveDescription); + final ItemStack toSpawn = this.pendingSpawns.peek(); + final HiveDescriptionSwarmer hiveDescription = new HiveDescriptionSwarmer(new ItemStack[] { toSpawn }); + final Hive hive = new Hive(hiveDescription); - int chunkX = (this.xCoord + this.worldObj.rand.nextInt(80) - 40) / 16; - int chunkZ = (this.zCoord + this.worldObj.rand.nextInt(80) - 40) / 16; + 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 - protected void encodeDescriptionPacket(NBTTagCompound packetData) + protected void encodeDescriptionPacket(final NBTTagCompound packetData) { super.encodeDescriptionPacket(packetData); packetData.setBoolean("Active", this.active); } @Override - protected void decodeDescriptionPacket(NBTTagCompound packetData) + protected void decodeDescriptionPacket(final NBTTagCompound packetData) { super.decodeDescriptionPacket(packetData); - setActive(packetData.getBoolean("Active")); + this.setActive(packetData.getBoolean("Active")); } @Override - public int getIcon(int side) + public int getIcon(final int side) { if ((side == 0) || (side == 1)) { return 2; @@ -159,31 +158,31 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, } @Override - public void readFromNBT(NBTTagCompound nbttagcompound) + public void readFromNBT(final NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); - setActive(nbttagcompound.getBoolean("Active")); + this.setActive(nbttagcompound.getBoolean("Active")); - NBTTagList nbttaglist = nbttagcompound.getTagList("PendingSpawns", 10); + final NBTTagList nbttaglist = nbttagcompound.getTagList("PendingSpawns", 10); for (int i = 0; i < nbttaglist.tagCount(); i++) { - NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); + final NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); this.pendingSpawns.add(ItemStack.loadItemStackFromNBT(nbttagcompound1)); } } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) + public void writeToNBT(final 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()]); + 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) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + final NBTTagCompound nbttagcompound1 = new NBTTagCompound(); nbttagcompound1.setByte("Slot", (byte)i); offspring[i].writeToNBT(nbttagcompound1); nbttaglist.appendTag(nbttagcompound1); @@ -199,7 +198,7 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, } @Override - public void setActive(boolean active) + public void setActive(final boolean active) { if (this.active == active) { return; @@ -211,42 +210,42 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, } @Override - public Object getGui(EntityPlayer player, int data) + public Object getGui(final EntityPlayer player, final int data) { return new GUI_FrameHousing(this, player); } @Override - public Object getContainer(EntityPlayer player, int data) + public Object getContainer(final EntityPlayer player, final 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(); + //private final IBeeListener beeListener = new AlvearyBeeListener(this); + private final Iterable beeListenerList = this.getMultiblockLogic().getController().getBeeListeners(); @Override public Collection getBeeModifiers() { - List beeModifiers = new ArrayList(); + final List beeModifiers = new ArrayList<>(); beeModifiers.add(this.beeModifier); - for (IHiveFrame frame : getFrames(this.inventory)) { + for (final IHiveFrame frame : this.getFrames(this.inventory)) { beeModifiers.add(frame.getBeeModifier()); } return beeModifiers; } - public Collection getFrames(IInventory inventory) + public Collection getFrames(final IInventory inventory) { - Collection hiveFrames = new ArrayList(inventory.getSizeInventory()); + final Collection hiveFrames = new ArrayList<>(inventory.getSizeInventory()); for (int i = 0; i < inventory.getSizeInventory(); i++) { - ItemStack stackInSlot = getStackInSlot(i); + final ItemStack stackInSlot = this.getStackInSlot(i); if (stackInSlot != null) { - Item itemInSlot = stackInSlot.getItem(); + final Item itemInSlot = stackInSlot.getItem(); if ((itemInSlot instanceof IHiveFrame)) { hiveFrames.add((IHiveFrame)itemInSlot); } @@ -257,10 +256,10 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, @Override public IBeeModifier getBeeModifier() { - List beeModifiers = new ArrayList(); + final List beeModifiers = new ArrayList<>(); //beeModifiers.add(this.beeModifier); - for (IHiveFrame frame : getFrames(this.inventory)) { + for (final IHiveFrame frame : this.getFrames(this.inventory)) { beeModifiers.add(frame.getBeeModifier()); } return beeModifiers.get(0); @@ -268,32 +267,32 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, private ItemStack getQueenStack() { - ItemStack queenStack = ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory().getQueen(); + final ItemStack queenStack = this.getMultiblockLogic().getController().getBeeInventory().getQueen(); return queenStack; } @Override - public void wearOutFrames(IBeeHousing beeHousing, int amount) + public void wearOutFrames(final IBeeHousing beeHousing, final int amount) { - IBeekeepingMode beekeepingMode = BeeManager.beeRoot.getBeekeepingMode(beeHousing.getWorld()); - int wear = Math.round(amount * beekeepingMode.getWearModifier()); + 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++) { - ItemStack hiveFrameStack = getStackInSlot(i); + final ItemStack hiveFrameStack = this.getStackInSlot(i); if (hiveFrameStack != null) { - Item hiveFrameItem = hiveFrameStack.getItem(); + final Item hiveFrameItem = hiveFrameStack.getItem(); if ((hiveFrameItem instanceof IHiveFrame)) { - IHiveFrame hiveFrame = (IHiveFrame)hiveFrameItem; + final 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); + 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(). - - setInventorySlotContents(i, usedFrame); + + this.setInventorySlotContents(i, usedFrame); } } } @@ -301,42 +300,42 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active, @Override public InventoryFrameHousing getAlvearyInventory() { - return inventory; + return this.inventory; } @Override public IBeeListener getBeeListener() { - return beeListener; + return this.beeListener; } - + 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()) { + 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; }*/ - 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; - } - } - - - + 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; + } + } + + + } 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..b1c94ddc47 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 @@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation; public class CONTAINER_FrameHousing extends Container { - private TileAlvearyFrameHousing te; + private final TileAlvearyFrameHousing te; public static final int INPUT_1 = 0; private final ResourceLocation beeFrameIcon = new ResourceLocation(CORE.MODID, "textures/items/machine_Charger.png"); @@ -22,58 +22,58 @@ public class CONTAINER_FrameHousing extends Container 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); + this.beeFrameSlot.setBackgroundIconTexture(this.beeFrameIcon); + + this.addSlotToContainer(this.beeFrameSlot); //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.addSlotToContainer(new Slot(player.inventory, j + (i * 9) + 9, 8 + (j * 18), 84 + (i * 18))); } } // Hotbar for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142)); + this.addSlotToContainer(new Slot(player.inventory, i, 8 + (i * 18), 142)); } } @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw) + public ItemStack transferStackInSlot(final EntityPlayer player, final int slotRaw) { ItemStack stack = null; - Slot slot = (Slot)inventorySlots.get(slotRaw); + final Slot slot = (Slot)this.inventorySlots.get(slotRaw); - if (slot != null && slot.getHasStack()) + if ((slot != null) && slot.getHasStack()) { - ItemStack stackInSlot = slot.getStack(); + final ItemStack stackInSlot = slot.getStack(); stack = stackInSlot.copy(); - - + + //If your inventory only stores certain instances of Items, //you can implement shift-clicking to your inventory like this: // Check that the item is the right type if (!(stack.getItem() instanceof IHiveFrame)){ - return null; + return null; } if (slotRaw < 1) { - if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true)) + if (!this.mergeItemStack(stackInSlot, 3 * 9, this.inventorySlots.size(), true)) { return null; } } - else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false)) + else if (!this.mergeItemStack(stackInSlot, 0, 3 * 9, false)) { return null; } @@ -91,8 +91,8 @@ public class CONTAINER_FrameHousing extends Container } @Override - public boolean canInteractWith(EntityPlayer player) + public boolean canInteractWith(final EntityPlayer player) { - return te.isUseableByPlayer(player); + return this.te.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/GUI_F