From 69ce418e29e22391f60cdd55815727762a78c33a Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Fri, 24 May 2024 19:04:17 +0100 Subject: Apply updated GT5u spotless configs --- .../xmod/bartcrops/abstracts/BaseCrop.java | 2 +- .../gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java | 26 +- .../xmod/bop/blocks/BOP_Block_Registrator.java | 116 +- .../xmod/bop/blocks/base/LeavesBase.java | 4 +- .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 8 +- .../xmod/bop/blocks/base/SaplingBase.java | 4 +- .../xmod/bop/blocks/pine/LeavesPineTree.java | 10 +- .../blocks/rainforest/SaplingRainforestTree.java | 14 +- .../bop/world/features/trees/WorldGenPineTree.java | 7 +- .../features/trees/WorldGenRainForestTree_Ex.java | 172 +-- .../xmod/forestry/bees/custom/CustomCombs.java | 63 +- .../forestry/bees/custom/GTPP_Bee_Definition.java | 77 +- .../xmod/forestry/bees/custom/GTPP_Bees.java | 12 +- .../bees/custom/GTPP_Branch_Definition.java | 4 +- .../xmod/forestry/bees/custom/ItemCustomComb.java | 9 +- .../xmod/forestry/bees/handler/GTPP_CombType.java | 7 +- .../xmod/forestry/bees/handler/GTPP_DropType.java | 7 +- .../forestry/bees/handler/GTPP_PollenType.java | 7 +- .../forestry/bees/handler/GTPP_PropolisType.java | 7 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 74 +- .../xmod/forestry/bees/items/MB_FrameType.java | 6 +- .../xmod/forestry/bees/items/output/GTPP_Comb.java | 45 +- .../xmod/forestry/bees/items/output/GTPP_Drop.java | 27 +- .../forestry/bees/items/output/GTPP_Pollen.java | 9 +- .../forestry/bees/items/output/GTPP_Propolis.java | 25 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 144 +- .../bees/registry/GTPP_AlleleBeeSpecies.java | 21 +- .../forestry/bees/registry/GTPP_BeeDefinition.java | 136 +- .../forestry/bees/registry/GTPP_Bee_Mutation.java | 9 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 4 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 795 ++++++----- .../xmod/gregtech/api/gui/GTPP_UITextures.java | 132 +- .../api/gui/widget/ElectricSlotWidget.java | 6 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 102 +- .../internal/Interface_ItemBehaviour.java | 8 +- .../internal/Interface_OreRecipeRegistrator.java | 4 +- .../interfaces/internal/Interface_ToolStats.java | 6 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 55 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 44 +- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 169 +-- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 112 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 394 +++--- .../GT_MetaTileEntity_ChiselBus.java | 23 +- .../GT_MetaTileEntity_Hatch_AirIntake.java | 57 +- .../GT_MetaTileEntity_Hatch_AirIntake_Extreme.java | 12 +- .../GT_MetaTileEntity_Hatch_DynamoBuffer.java | 8 +- ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 45 +- .../GT_MetaTileEntity_Hatch_FluidGenerator.java | 29 +- .../GT_MetaTileEntity_Hatch_InputBattery.java | 52 +- .../GT_MetaTileEntity_Hatch_Muffler_Adv.java | 82 +- .../GT_MetaTileEntity_Hatch_Naquadah.java | 38 +- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 59 +- .../GT_MetaTileEntity_Hatch_Reservoir.java | 4 +- .../GT_MetaTileEntity_Hatch_Solidifier.java | 26 +- .../GT_MetaTileEntity_Hatch_Steam_BusInput.java | 112 +- .../GT_MetaTileEntity_Hatch_Steam_BusOutput.java | 84 +- .../GT_MetaTileEntity_Hatch_Turbine.java | 89 +- .../GT_MetaTileEntity_Hatch_TurbineProvider.java | 30 +- .../GT_MetaTileEntity_SuperBus_Input.java | 10 +- .../GT_MetaTileEntity_SuperBus_Output.java | 28 +- .../GregtechMetaPipeEntityFluid.java | 76 +- .../GregtechMetaPipeEntity_Cable.java | 141 +- .../GregtechMetaTreeFarmerStructural.java | 14 +- .../GT_MetaTileEntity_Hatch_CustomFluidBase.java | 49 +- .../base/GregtechMetaTileEntity.java | 4 +- .../base/GregtechMetaTransformerHiAmp.java | 32 +- .../base/GregtechMeta_MultiBlockBase.java | 902 ++++++------ .../base/GregtechMeta_SteamMultiBase.java | 80 +- .../base/generators/GregtechMetaBoilerBase.java | 109 +- .../generators/GregtechMetaSolarGenerator.java | 52 +- .../GregtechRocketFuelGeneratorBase.java | 69 +- .../base/machines/GregtechMetaTreeFarmerBase.java | 21 +- .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 101 +- .../gregtech/api/objects/GregtechItemData.java | 12 +- .../api/objects/GregtechMaterialStack.java | 10 +- .../xmod/gregtech/api/util/GTPP_Config.java | 38 +- .../xmod/gregtech/common/Meta_GT_Proxy.java | 29 +- .../common/blocks/GregtechMetaCasingBlocks.java | 10 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 4 +- .../common/blocks/GregtechMetaCasingBlocks3.java | 38 +- .../common/blocks/GregtechMetaCasingBlocks4.java | 2 +- .../common/blocks/GregtechMetaCasingBlocks5.java | 6 +- .../common/blocks/GregtechMetaCasingBlocks6.java | 26 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 8 +- .../GregtechMetaCasingBlocksPipeGearbox.java | 2 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 14 +- .../blocks/GregtechMetaSpecialMachineCasings.java | 6 +- .../blocks/GregtechMetaSpecialMultiCasings.java | 20 +- .../blocks/GregtechMetaSpecialMultiCasings2.java | 2 +- .../common/blocks/fluid/GregtechFluidHandler.java | 164 +-- .../blocks/textures/CasingTextureHandler.java | 2 +- .../textures/TexturesCentrifugeMultiblock.java | 24 +- .../blocks/textures/TexturesGrinderMultiblock.java | 17 +- .../common/blocks/textures/TexturesGtBlock.java | 154 ++- .../turbine/LargeTurbineTextureHandler.java | 215 ++- .../common/covers/GTPP_Cover_Overflow.java | 49 +- .../common/covers/GTPP_Cover_ToggleVisual.java | 22 +- .../gregtech/common/helpers/ChargingHelper.java | 59 +- .../common/helpers/tesseract/TesseractHelper.java | 46 +- .../gregtech/common/items/MetaCustomCoverItem.java | 20 +- .../common/items/MetaGeneratedGregtechItems.java | 341 +++-- .../common/items/MetaGeneratedGregtechTools.java | 38 +- .../items/behaviours/Behaviour_Choocher.java | 25 +- .../behaviours/Behaviour_Electric_Lighter.java | 59 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 41 +- .../common/items/covers/MetaItemCoverCasings.java | 15 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 119 +- .../gregtech/common/render/GTPP_FlaskRenderer.java | 22 +- .../common/render/GTPP_Render_MachineBlock.java | 1096 +++++++-------- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 221 +-- .../GT_MetaTileEntity_TesseractGenerator.java | 350 +++-- .../GT_MetaTileEntity_TesseractTerminal.java | 250 ++-- .../generators/GT_MetaTileEntity_Boiler_Base.java | 52 +- .../generators/GT_MetaTileEntity_Boiler_HV.java | 6 +- .../generators/GT_MetaTileEntity_Boiler_LV.java | 6 +- .../generators/GT_MetaTileEntity_Boiler_MV.java | 6 +- .../GT_MetaTileEntity_SemiFluidGenerator.java | 45 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 63 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 41 +- .../generators/GregtechMetaTileEntity_RTG.java | 98 +- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 20 +- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 2 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 214 +-- .../GregtechMetaAtmosphericReconditioner.java | 292 ++-- .../basic/GregtechMetaPollutionCreator.java | 70 +- .../basic/GregtechMetaPollutionDetector.java | 83 +- .../basic/GregtechMetaTileEntity_AutoChisel.java | 56 +- .../basic/GregtechMetaWirelessCharger.java | 142 +- .../machines/multi/misc/GMTE_AmazonPackager.java | 62 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 86 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 170 +-- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 61 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 86 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 93 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 60 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 81 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 59 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 60 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 89 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 77 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 264 ++-- .../GregtechMetaTileEntity_IndustrialMixer.java | 61 +- ...aTileEntity_IndustrialMolecularTransformer.java | 91 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 108 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 57 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 72 +- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 69 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 92 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 93 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 62 +- .../processing/GregtechMetaTileEntity_IsaMill.java | 99 +- ...hMetaTileEntity_NuclearSaltProcessingPlant.java | 137 +- .../GregtechMetaTileEntity_SpargeTower.java | 226 +-- ...egtechMetaTileEntity_Adv_DistillationTower.java | 202 +-- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 117 +- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 61 +- .../GregtechMetaTileEntity_Adv_Fusion_MK5.java | 61 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 243 ++-- .../GregtechMetaTileEntity_Adv_Implosion.java | 55 +- .../GregtechMetaTileEntity_SteamCompressor.java | 57 +- .../GregtechMetaTileEntity_SteamMacerator.java | 59 +- .../multi/production/GT4Entity_AutoCrafter.java | 55 +- .../multi/production/GT4Entity_ThermalBoiler.java | 70 +- .../GregtechMTE_ElementalDuplicator.java | 159 ++- .../production/GregtechMTE_FrothFlotationCell.java | 72 +- .../production/GregtechMTE_NuclearReactor.java | 207 +-- .../production/GregtechMetaTileEntityTreeFarm.java | 206 +-- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 69 +- .../GregtechMetaTileEntity_Cyclotron.java | 114 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 124 +- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 145 +- .../GregtechMetaTileEntity_LargeRocketEngine.java | 135 +- ...techMetaTileEntity_LargeSemifluidGenerator.java | 77 +- .../GregtechMetaTileEntity_MassFabricator.java | 91 +- ...techMetaTileEntity_QuantumForceTransformer.java | 466 +++---- .../GregtechMetaTileEntity_Refinery.java | 97 +- .../GregtechMetaTileEntity_SolarTower.java | 435 +++--- .../algae/GregtechMTE_AlgaePondBase.java | 98 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 228 +-- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 343 ++--- .../turbines/GT_MTE_LargeTurbine_Gas.java | 7 +- .../turbines/GT_MTE_LargeTurbine_Plasma.java | 36 +- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 23 +- .../turbines/GT_MTE_LargeTurbine_Steam.java | 19 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 333 ++--- ...chMetaTileEntity_PowerSubStationController.java | 453 +++--- .../tileentities/misc/TileEntitySolarHeater.java | 52 +- .../storage/GT_MetaTileEntity_TieredChest.java | 98 +- .../storage/GT_MetaTileEntity_TieredTank.java | 58 +- .../storage/GregtechMetaEnergyBuffer.java | 87 +- .../GT_MetaTileEntity_InfiniteItemHolder.java | 21 +- .../common/tools/TOOL_Gregtech_AngleGrinder.java | 23 +- .../common/tools/TOOL_Gregtech_ElectricSnips.java | 12 +- .../gregtech/loaders/ProcessingAngleGrinder.java | 64 +- .../gregtech/loaders/ProcessingElectricSnips.java | 70 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 34 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 56 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 147 +- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 69 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 169 +-- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 92 +- .../gregtech/loaders/RecipeGen_FluidCanning.java | 79 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 156 +-- .../xmod/gregtech/loaders/RecipeGen_Fluorite.java | 260 ++-- .../loaders/RecipeGen_MaterialProcessing.java | 206 +-- .../gregtech/loaders/RecipeGen_MetalRecipe.java | 94 +- .../RecipeGen_MultisUsingFluidInsteadOfCells.java | 32 +- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 560 ++++---- .../xmod/gregtech/loaders/RecipeGen_Plasma.java | 12 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 221 ++- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 107 +- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 180 +-- .../loaders/recipe/RecipeLoader_AlgaeFarm.java | 26 +- .../loaders/recipe/RecipeLoader_ChemicalSkips.java | 950 +++++++------ .../gregtech/loaders/recipe/RecipeLoader_GTNH.java | 46 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 491 ++++--- .../gregtech/loaders/recipe/RecipeLoader_LFTR.java | 119 +- .../recipe/RecipeLoader_MolecularTransformer.java | 64 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 832 +++++------ .../recipe/RecipeLoader_NuclearFuelProcessing.java | 337 ++--- .../loaders/recipe/RecipeLoader_TreeFarm.java | 717 +++++----- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 1020 +++++++------- .../registration/gregtech/Gregtech4Content.java | 72 +- .../gregtech/GregtechAdvancedBoilers.java | 109 +- .../gregtech/GregtechAlgaeContent.java | 10 +- .../gregtech/GregtechAmazonWarehouse.java | 4 +- .../gregtech/GregtechBufferDynamos.java | 180 +-- .../registration/gregtech/GregtechConduits.java | 1458 ++++++++++---------- .../gregtech/GregtechCustomHatches.java | 297 ++-- .../registration/gregtech/GregtechCyclotron.java | 4 +- .../registration/gregtech/GregtechDehydrator.java | 253 ++-- .../gregtech/GregtechEnergyBuffer.java | 174 ++- .../GregtechFactoryGradeReplacementMultis.java | 32 +- .../GregtechGeothermalThermalGenerator.java | 82 +- .../gregtech/GregtechHiAmpTransformer.java | 224 +-- .../gregtech/GregtechIndustrialAlloySmelter.java | 8 +- .../gregtech/GregtechIndustrialArcFurnace.java | 8 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 16 +- .../gregtech/GregtechIndustrialCentrifuge.java | 8 +- .../gregtech/GregtechIndustrialChisel.java | 18 +- .../gregtech/GregtechIndustrialCokeOven.java | 8 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 8 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 8 +- .../GregtechIndustrialElementDuplicator.java | 14 +- .../gregtech/GregtechIndustrialExtruder.java | 8 +- .../gregtech/GregtechIndustrialFishPond.java | 8 +- .../gregtech/GregtechIndustrialFluidHeater.java | 8 +- .../gregtech/GregtechIndustrialForgeHammer.java | 8 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 8 +- .../gregtech/GregtechIndustrialMacerator.java | 8 +- .../gregtech/GregtechIndustrialMassFabricator.java | 130 +- .../gregtech/GregtechIndustrialMixer.java | 8 +- .../gregtech/GregtechIndustrialMultiMachine.java | 8 +- .../gregtech/GregtechIndustrialPlatePress.java | 8 +- .../gregtech/GregtechIndustrialRockBreaker.java | 8 +- .../gregtech/GregtechIndustrialSifter.java | 8 +- .../GregtechIndustrialThermalCentrifuge.java | 8 +- .../gregtech/GregtechIndustrialTreeFarm.java | 4 +- .../gregtech/GregtechIndustrialWashPlant.java | 8 +- .../gregtech/GregtechIndustrialWiremill.java | 8 +- .../registration/gregtech/GregtechIsaMill.java | 12 +- .../registration/gregtech/GregtechLFTR.java | 119 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 30 +- .../gregtech/GregtechMolecularTransformer.java | 8 +- .../GregtechNuclearSaltProcessingPlant.java | 8 +- .../gregtech/GregtechPollutionDevices.java | 112 +- .../gregtech/GregtechPowerSubStation.java | 54 +- .../gregtech/GregtechQuantumForceTransformer.java | 8 +- .../registration/gregtech/GregtechRTG.java | 10 +- .../gregtech/GregtechRocketFuelGenerator.java | 112 +- .../gregtech/GregtechSemiFluidgenerators.java | 58 +- .../gregtech/GregtechSimpleWasher.java | 146 +- .../registration/gregtech/GregtechSolarTower.java | 38 +- .../registration/gregtech/GregtechSteamMultis.java | 21 +- .../registration/gregtech/GregtechSuperChests.java | 20 +- .../gregtech/GregtechThaumcraftDevices.java | 14 +- .../gregtech/GregtechThreadedBuffers.java | 4 +- .../gregtech/GregtechTieredFluidTanks.java | 14 +- .../gregtech/GregtechTreeFarmerTE.java | 4 +- .../gregtech/GregtechWirelessChargers.java | 130 +- .../gtPlusPlus/xmod/ic2/CustomInternalName.java | 6 +- .../xmod/ic2/item/CustomKineticRotor.java | 30 +- .../java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 60 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 396 +++--- .../xmod/pamsharvest/fishtrap/FishTrapHandler.java | 68 +- .../xmod/railcraft/HANDLER_Railcraft.java | 240 ++-- .../xmod/railcraft/utils/RailcraftUtils.java | 10 +- .../thaumcraft/commands/CommandDumpAspects.java | 10 +- .../thaumcraft/objects/ThreadAspectScanner.java | 25 +- .../block/TF_Block_Fluid_Cryotheum.java | 28 +- .../block/TF_Block_Fluid_Ender.java | 6 +- .../block/TF_Block_Fluid_Pyrotheum.java | 57 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 21 +- .../xmod/thermalfoundation/item/TF_Items.java | 10 +- .../recipe/TF_Gregtech_Recipes.java | 79 +- .../xmod/tinkers/material/BaseTinkersMaterial.java | 13 +- .../xmod/tinkers/util/TinkersDryingRecipe.java | 42 +- .../gtPlusPlus/xmod/tinkers/util/TinkersUtils.java | 114 +- 298 files changed, 15810 insertions(+), 14554 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod') diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java index 22fce2ae5a..405c1ef1e1 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java @@ -25,7 +25,7 @@ public abstract class BaseCrop extends CropCard implements ICropCardInfo { this.textures = new IIcon[this.maxSize()]; for (int i = 1; i <= this.textures.length; ++i) { this.textures[i - 1] = iconRegister - .registerIcon(GTPlusPlus.ID + ":crop/blockCrop." + this.name() + "." + i); + .registerIcon(GTPlusPlus.ID + ":crop/blockCrop." + this.name() + "." + i); } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java index 918ec9621d..7727eaef38 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java +++ b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java @@ -62,35 +62,35 @@ public class HANDLER_BiomesOPlenty { private static void setFields() { Field aBopMiscItem = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCItems"), "misc"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCItems"), "misc"); Field aBopBlock1 = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs1"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs1"); Field aBopBlock2 = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs2"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs2"); Field aBopBlock3 = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs3"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs3"); Field aBopBlock4 = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs4"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs4"); Field aBopLeaves1 = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves1"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves1"); Field aBopLeaves2 = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves2"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves2"); Field aBopLeaves3 = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves3"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves3"); Field aBopLeaves4 = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves4"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves4"); Field aBopColouredLeaves1 = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedLeaves1"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedLeaves1"); Field aBopColouredLeaves2 = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedLeaves2"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedLeaves2"); Field aBopSapling = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "saplings"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "saplings"); Field aBopColouredSapling = ReflectionUtils - .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedSaplings"); + .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedSaplings"); if (aBopMiscItem != null) { Item aMiscItem = ReflectionUtils.getFieldValue(aBopMiscItem); diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java index e8c50641aa..4a3c91e9cb 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java @@ -69,38 +69,37 @@ public class BOP_Block_Registrator { public static void addLogRecipes(final ItemStack aStack) { RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { aStack }, - ItemUtils.getSimpleStack( - Item.getItemFromBlock(Blocks.planks), - GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 4)); + new ItemStack[] { aStack }, + ItemUtils + .getSimpleStack(Item.getItemFromBlock(Blocks.planks), GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 4)); RecipeUtils.recipeBuilder( - CI.craftingToolSaw, - null, - null, - aStack, - null, - null, - null, - null, - null, - ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), 4)); + CI.craftingToolSaw, + null, + null, + aStack, + null, + null, + null, + null, + null, + ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), 4)); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) }); + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) }); final short aMeta = (short) aStack.getItemDamage(); if (GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), - new ItemStack(Items.coal, 1, 1))) { + GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), + new ItemStack(Items.coal, 1, 1))) { addPyrolyeOvenRecipes(aStack); GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); } if (aMeta == 32767) { for (int i = 0; i < 32767; ++i) { if (GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), - new ItemStack(Items.coal, 1, 1))) { + GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), + new ItemStack(Items.coal, 1, 1))) { addPyrolyeOvenRecipes(aStack); GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } @@ -112,26 +111,28 @@ public class BOP_Block_Registrator { } else { final ItemStack tPlanks = GT_Utility.copy(tStack); tPlanks.stackSize = tPlanks.stackSize * 3 / 2; - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(aStack.getItem(), 1, i)) - .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) - : (((long) tStack.stackSize) * 5L / 4), - tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) - .duration(10 * SECONDS).eut(8).addTo(cutterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(aStack.getItem(), 1, i)) + .itemOutputs( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) + : (((long) tStack.stackSize) * 5L / 4), + tStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + .duration(10 * SECONDS) + .eut(8) + .addTo(cutterRecipes); GT_ModHandler.removeRecipe(new ItemStack(aStack.getItem(), 1, i)); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) - : (((long) tStack.stackSize) * 5L / 4), - tStack), - new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) + : (((long) tStack.stackSize) * 5L / 4), + tStack), + new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount( - tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), - tStack), - new Object[] { new ItemStack(aStack.getItem(), 1, i) }); + GT_Utility + .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + new Object[] { new ItemStack(aStack.getItem(), 1, i) }); } } } else { @@ -139,31 +140,32 @@ public class BOP_Block_Registrator { if (tStack2 != null) { final ItemStack tPlanks2 = GT_Utility.copy(tStack2); tPlanks2.stackSize = tPlanks2.stackSize * 3 / 2; - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) - : (((long) tStack2.stackSize) * 5L / 4), - tStack2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) - .duration(10 * SECONDS).eut(8).addTo(cutterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemOutputs( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) + : (((long) tStack2.stackSize) * 5L / 4), + tStack2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + .duration(10 * SECONDS) + .eut(8) + .addTo(cutterRecipes); GT_ModHandler.removeRecipe(GT_Utility.copyAmount(1L, aStack)); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) - : (((long) tStack2.stackSize) * 5L / 4), - tStack2), - new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) }); + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) + : (((long) tStack2.stackSize) * 5L / 4), + tStack2), + new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount( - tStack2.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), - tStack2), - new Object[] { GT_Utility.copyAmount(1L, aStack) }); + GT_Utility.copyAmount(tStack2.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack2), + new Object[] { GT_Utility.copyAmount(1L, aStack) }); } } if (GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), - new ItemStack(Items.coal, 1, 1))) { + GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), + new ItemStack(Items.coal, 1, 1))) { addPyrolyeOvenRecipes(aStack); GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index 3e7a6a0105..171bb9a58c 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -78,7 +78,7 @@ public class LeavesBase extends BlockLeaves { @SideOnly(Side.CLIENT) public IIcon getIcon(int ordinalSide, int metaID) { return (metaID & 3) == 1 ? this.leafTextures[this.field_150127_b][1] - : this.leafTextures[this.field_150127_b][0]; + : this.leafTextures[this.field_150127_b][0]; } @Override @@ -93,7 +93,7 @@ public class LeavesBase extends BlockLeaves { this.leafTextures[i] = new IIcon[leafType[i].length]; for (int j = 0; j < leafType[i].length; ++j) { this.leafTextures[i][j] = iIcon - .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]); } } setVanillaVariable(this.field_150129_M, this.leafTextures); diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 3270fea55b..2cf8ba1fbc 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -32,9 +32,9 @@ public abstract class LogBase extends BlockLog { GameRegistry.registerBlock(this, ItemBlock.class, blockName); this.setBlockName(blockName); ItemUtils.addItemToOreDictionary( - ItemUtils.getSimpleStack(this), - "log" + Utils.sanitizeString(blockNameLocalized), - true); + ItemUtils.getSimpleStack(this), + "log" + Utils.sanitizeString(blockNameLocalized), + true); ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), "logWood", true); this.setCreativeTab(AddToCreativeTab.tabBOP); Blocks.fire.setFireInfo(this, 20, 100); @@ -76,7 +76,7 @@ public abstract class LogBase extends BlockLog { for (int i = 0; i < this.textureSide.length; ++i) { this.textureSide[i] = iIcon.registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i]); this.textureTop[i] = iIcon - .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top"); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top"); } setVanillaVariable(this.field_150167_a, this.textureSide); diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java index 51dd580ab4..ff5c8770d4 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java @@ -133,7 +133,7 @@ public class SaplingBase extends BlockSapling { @Override public boolean func_149880_a(World world, int p_149880_2_, int p_149880_3_, int p_149880_4_, int p_149880_5_) { return world.getBlock(p_149880_2_, p_149880_3_, p_149880_4_) == this - && (world.getBlockMetadata(p_149880_2_, p_149880_3_, p_149880_4_) & 7) == p_149880_5_; + && (world.getBlockMetadata(p_149880_2_, p_149880_3_, p_149880_4_) & 7) == p_149880_5_; } /** @@ -160,7 +160,7 @@ public class SaplingBase extends BlockSapling { public void registerBlockIcons(IIconRegister iIcon) { for (int i = 0; i < saplingTextures.length; ++i) { saplingTextures[i] = iIcon - .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]); } } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java index d03473d0f7..93f7e59a1e 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java @@ -31,11 +31,11 @@ public class LeavesPineTree extends LeavesBase { Logger.INFO("Dropping Bonus Drops"); if (MathUtils.randInt(0, 10) >= 9) { this.dropBlockAsItem( - world, - x, - y, - z, - ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, MathUtils.randInt(1, 4))); + world, + x, + y, + z, + ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, MathUtils.randInt(1, 4))); } } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java index bc5cadc4bb..362eb2f541 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java @@ -43,13 +43,13 @@ public class SaplingRainforestTree extends SaplingBase { world.setBlock(x, y, z, block, 0, 4); } Object o = new WorldGenRainForestTree_Ex( - BOP_Block_Registrator.log_Rainforest, - BOP_Block_Registrator.leaves_Rainforest, - 0, - 0, - true, - 50, - 75); + BOP_Block_Registrator.log_Rainforest, + BOP_Block_Registrator.leaves_Rainforest, + 0, + 0, + true, + 50, + 75); if (!((WorldGenerator) o).generate(world, rand, x + i1, y, z + j1)) { if (flag) { diff --git a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java index 4d8e61c2ac..bc97042c82 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java @@ -34,8 +34,8 @@ public class WorldGenPineTree extends WorldGenAbstractTree { for (height = -2; height <= 2; ++height) { for (branches = -2; branches <= 2; ++branches) { if (world.isAirBlock(x + height, y - 1, z + branches) - && world.isAirBlock(x + height, y - 2, z + branches) - && !world.isAirBlock(x + height, y, z + branches)) { + && world.isAirBlock(x + height, y - 2, z + branches) + && !world.isAirBlock(x + height, y, z + branches)) { return false; } } @@ -160,7 +160,8 @@ public class WorldGenPineTree extends WorldGenAbstractTree { } public void buildBlock(World world, int x, int y, int z, Block block, int meta) { - if (world.isAirBlock(x, y, z) || world.getBlock(x, y, z).isLeaves(world, x, y, z)) { + if (world.isAirBlock(x, y, z) || world.getBlock(x, y, z) + .isLeaves(world, x, y, z)) { world.setBlock(x, y, z, block, meta, 2); } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java index 225e639ede..d3ad2efaea 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java @@ -24,7 +24,7 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree { // WorldGenRainforestTree1(BOPCBlocks.logs4, BOPCBlocks.colorizedLeaves2, 3, 2, false, 8, 8); public WorldGenRainForestTree_Ex(Block wood, Block leaves, int woodMeta, int leavesMeta, boolean doBlockNotify, - int minTreeHeight, int randomTreeHeight) { + int minTreeHeight, int randomTreeHeight) { super(doBlockNotify); this.wood = wood; this.leaves = leaves; @@ -66,15 +66,15 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree { Block block2 = world.getBlock(x, y - 1, z); boolean isSoil = block2 - .canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling) Blocks.sapling); + .canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling) Blocks.sapling); if ((isSoil) && (y < 256 - treeHeight - 1)) { block2.onPlantGrow(world, x, y - 1, z, x, y, z); byte b0 = 3; byte b1 = 0; Logger.WARNING("Sapling located at X:" + x + " | Y:" + y + " | Z:" + z); for (int k1 = y - b0 + treeHeight; k1 <= y + treeHeight; k1++) { - Logger.WARNING( - "[1]| k1 = " + k1 + " | y = " + y + " | b0 = " + b0 + " | l = " + treeHeight + " | "); + Logger + .WARNING("[1]| k1 = " + k1 + " | y = " + y + " | b0 = " + b0 + " | l = " + treeHeight + " | "); int i3 = k1 - (y + treeHeight); int l1 = b1 + 1 - i3; for (int i2 = x - l1; i2 <= x + l1; i2++) { @@ -82,10 +82,10 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree { Logger.WARNING("[2]| i2 = " + i2 + " | x = " + x + " | l1 = " + l1 + " | j2 = " + j2 + " | "); for (int k2 = z - l1; k2 <= z + l1; k2++) { int l2 = k2 - z; - Logger.WARNING( - "[3]| k2 = " + k2 + " | z = " + z + " | l1 = " + l1 + " | l2 = " + l2 + " | "); + Logger + .WARNING("[3]| k2 = " + k2 + " | z = " + z + " | l1 = " + l1 + " | l2 = " + l2 + " | "); if ((Math.abs(j2) != l1) || (Math.abs(l2) != l1) - || ((random.nextInt(2) != 0) && (i3 != 0))) { + || ((random.nextInt(2) != 0) && (i3 != 0))) { Block block1 = world.getBlock(i2, k1, k2); if ((block1.isAir(world, i2, k1, k2)) || (block1.isLeaves(world, i2, k1, k2))) { Logger.WARNING("Setting something as leaves?"); @@ -115,24 +115,24 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree { for (int zDir = -5; zDir <= 5; zDir++) { if (canRemoveLeafBlockLayer2(-5, 5, xDir, -5, 5, zDir)) { Logger.WARNING( - "Doing Nothing at " + "x=" + xDir + " | y=" + y + " z=" + zDir); + "Doing Nothing at " + "x=" + xDir + " | y=" + y + " z=" + zDir); } else { Logger.WARNING( - "Trying to place leaves at " + "x=" - + xDir - + " | y=" - + y - + " z=" - + zDir); + "Trying to place leaves at " + "x=" + + xDir + + " | y=" + + y + + " z=" + + zDir); block5 = world.getBlock(x + xDir, y + k1, z + zDir); if (block5.isAir(world, x + xDir, y + k1, x + zDir)) { setBlockAndNotifyAdequately( - world, - x + xDir, - y + k1, - z + zDir, - this.leaves, - this.leavesMeta); + world, + x + xDir, + y + k1, + z + zDir, + this.leaves, + this.leavesMeta); } } } @@ -142,33 +142,33 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree { for (int zDir = -4; zDir <= 4; zDir++) { if (canRemoveLeafBlockLayer2(-4, 4, xDir, -4, 4, zDir)) { Logger.WARNING( - "Doing Nothing at " + "x=" - + xDir - + " | y=" - + y - + k1 - + 1 - + " z=" - + zDir); + "Doing Nothing at " + "x=" + + xDir + + " | y=" + + y + + k1 + + 1 + + " z=" + + zDir); } else { Logger.WARNING( - "Trying to place leaves at " + "x=" - + xDir - + " | y=" - + y - + k1 - + 1 - + " z=" - + zDir); + "Trying to place leaves at " + "x=" + + xDir + + " | y=" + + y + + k1 + + 1 + + " z=" + + zDir); block5 = world.getBlock(x + xDir, y + k1 + 1, z + zDir); if (block5.isAir(world, x + xDir, y + k1 + 1, x + zDir)) { setBlockAndNotifyAdequately( - world, - x + xDir, - y + k1 + 1, - z + zDir, - this.leaves, - this.leavesMeta); + world, + x + xDir, + y + k1 + 1, + z + zDir, + this.leaves, + this.leavesMeta); } } } @@ -179,33 +179,33 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree { for (int zDir = -3; zDir <= 3; zDir++) { if (canRemoveLeafBlockLayer2(-3, 3, xDir, -3, 3, zDir)) { Logger.WARNING( - "Doing Nothing at " + "x=" - + xDir - + " | y=" - + y - + k1 - + 2 - + " z=" - + zDir); + "Doing Nothing at " + "x=" + + xDir + + " | y=" + + y + + k1 + + 2 + + " z=" + + zDir); } else { Logger.WARNING( - "Trying to place leaves at " + "x=" - + xDir - + " | y=" - + y - + k1 - + 2 - + " z=" - + zDir); + "Trying to place leaves at " + "x=" + + xDir + + " | y=" + + y + + k1 + + 2 + + " z=" + + zDir); block5 = world.getBlock(x + xDir, y + k1 + 2, z + zDir); if (block5.isAir(world, x + xDir, y + k1 + 2, x + zDir)) { setBlockAndNotifyAdequately( - world, - x + xDir, - y + k1 + 2, - z + zDir, - this.leaves, - this.leavesMeta); + world, + x + xDir, + y + k1 + 2, + z + zDir, + this.leaves, + this.leavesMeta); } } } @@ -216,33 +216,33 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree { for (int zDir = -2; zDir <= 2; zDir++) { if (canRemoveLeafBlockLayer2(-2, 2, xDir, -2, 2, zDir)) { Logger.WARNING( - "Doing Nothing at " + "x=" - + xDir - + " | y=" - + y - + k1 - + 3 - + " z=" - + zDir); + "Doing Nothing at " + "x=" + + xDir + + " | y=" + + y + + k1 + + 3 + + " z=" + + zDir); } else { Logger.WARNING( - "Trying to place leaves at " + "x=" - + xDir - + " | y=" - + y - + k1 - + 3 - + " z=" - + zDir); + "Trying to place leaves at " + "x=" + + xDir + + " | y=" + + y + + k1 + + 3 + + " z=" + + zDir); block5 = world.getBlock(x + xDir, y + k1 + 3, z + zDir); if (block5.isAir(world, x + xDir, y + k1 + 3, x + zDir)) { setBlockAndNotifyAdequately( - world, - x + xDir, - y + k1 + 3, - z + zDir, - this.leaves, - this.leavesMeta); + world, + x + xDir, + y + k1 + 3, + z + zDir, + this.leaves, + this.leavesMeta); } } } diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java index 94f61296d6..3c00c79fcb 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java @@ -35,35 +35,35 @@ public enum CustomCombs { SAND("sand", true, Materials.Sand, 100),; private static final int[][] colours = new int[][] { - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // SILICON - { Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75) }, // RUBBER - { Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175) }, // PLASTIC - { Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75) }, // PTFE - { Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14) }, // PBS - // Unused - { Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14) }, // Biofuel - { Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32) }, // Ethanol - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // - { Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150) }, // Fluorine - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // - { Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5) }, // Force - { Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170) }, // Nikolite - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // - { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, { 0x666666, 0x525252 }, - { 0x2E8F5B, 0xDCC289 }, { 0x4C4C4C, 0x333333 }, { 0x808080, 0x999999 }, { 0x57CFFB, 0xBBEEFF }, - { 0x7D0F0F, 0xD11919 }, { 0x1947D1, 0x476CDA }, { 0xE6005C, 0xCC0052 }, { 0x0033CC, 0x00248F }, - { 0xCCFFFF, 0xA3CCCC }, { 0x248F24, 0xCCFFCC }, { 0x248F24, 0x2EB82E }, { 0xD4D4D4, 0x58300B }, - { 0xFF6600, 0xE65C00 }, { 0xD4D4D4, 0xDDDDDD }, { 0x666699, 0xA3A3CC }, { 0xDA9147, 0xDE9C59 }, - { 0x808080, 0x999999 }, { 0x8585AD, 0x9D9DBD }, { 0xF0DEF0, 0xF2E1F2 }, { 0xC2C2D6, 0xCECEDE }, - { 0xE6B800, 0xCFA600 }, { 0x008AB8, 0xD6D6FF }, { 0xD5D5D5, 0xAAAAAA }, { 0xCC99FF, 0xDBB8FF }, - { 0xEBA1EB, 0xF2C3F2 }, { 0x62626D, 0x161620 }, { 0xE6E6E6, 0xFFFFCC }, { 0xDADADA, 0xD1D1E0 }, - { 0x19AF19, 0x169E16 }, { 0x335C33, 0x6B8F00 }, { 0x003300, 0x002400 }, }; + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // SILICON + { Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75) }, // RUBBER + { Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175) }, // PLASTIC + { Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75) }, // PTFE + { Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14) }, // PBS + // Unused + { Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14) }, // Biofuel + { Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32) }, // Ethanol + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // + { Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150) }, // Fluorine + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // + { Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5) }, // Force + { Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170) }, // Nikolite + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // + { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, { 0x666666, 0x525252 }, + { 0x2E8F5B, 0xDCC289 }, { 0x4C4C4C, 0x333333 }, { 0x808080, 0x999999 }, { 0x57CFFB, 0xBBEEFF }, + { 0x7D0F0F, 0xD11919 }, { 0x1947D1, 0x476CDA }, { 0xE6005C, 0xCC0052 }, { 0x0033CC, 0x00248F }, + { 0xCCFFFF, 0xA3CCCC }, { 0x248F24, 0xCCFFCC }, { 0x248F24, 0x2EB82E }, { 0xD4D4D4, 0x58300B }, + { 0xFF6600, 0xE65C00 }, { 0xD4D4D4, 0xDDDDDD }, { 0x666699, 0xA3A3CC }, { 0xDA9147, 0xDE9C59 }, + { 0x808080, 0x999999 }, { 0x8585AD, 0x9D9DBD }, { 0xF0DEF0, 0xF2E1F2 }, { 0xC2C2D6, 0xCECEDE }, + { 0xE6B800, 0xCFA600 }, { 0x008AB8, 0xD6D6FF }, { 0xD5D5D5, 0xAAAAAA }, { 0xCC99FF, 0xDBB8FF }, + { 0xEBA1EB, 0xF2C3F2 }, { 0x62626D, 0x161620 }, { 0xE6E6E6, 0xFFFFCC }, { 0xDADADA, 0xD1D1E0 }, + { 0x19AF19, 0x169E16 }, { 0x335C33, 0x6B8F00 }, { 0x003300, 0x002400 }, }; public boolean showInList; public final Materials material; public final int chance; @@ -83,8 +83,9 @@ public enum CustomCombs { public String getName() { // return "gt.comb."+this.name; return GT_LanguageManager.addStringLocalization( - "comb." + this.name, - this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb"); + "comb." + this.name, + this.name.substring(0, 1) + .toUpperCase() + this.name.substring(1) + " Comb"); } public int[] getColours() { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java index 4c8912b21e..0cdb49a9b5 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java @@ -36,7 +36,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public enum GTPP_Bee_Definition implements IBeeDefinition { SILICON(GTPP_Branch_Definition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75), - Utils.rgbtoHexValue(125, 125, 1