From b2c8cfb4ec8b82337a95f51364277964ec968b52 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 1 May 2023 02:45:56 -0700 Subject: ForgeDirection (#608) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ForgeDirection WIP * Fix GTPP_Render_MachineBlock Fix handling of getTexture with facing mask for pipes Kill a bunch of magic numbers * spotlessApply (#612) Co-authored-by: GitHub GTNH Actions <> * Bump bw/tt deps --------- Co-authored-by: Léa Gris Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../Ic2ExpReactorPlanner/ComponentFactory.java | 5 +- .../gtPlusPlus/api/interfaces/IGregtechPower.java | 26 +- .../gtPlusPlus/api/interfaces/ILazyCoverable.java | 24 +- .../gtPlusPlus/api/interfaces/ITexturedBlock.java | 6 +- .../java/gtPlusPlus/api/objects/data/AutoMap.java | 7 + .../api/objects/data/ReverseAutoMap.java | 1 + .../gtPlusPlus/api/objects/data/TypeCounter.java | 1 + .../api/objects/minecraft/BTF_FluidTank.java | 6 + .../api/objects/minecraft/BTF_Inventory.java | 64 +- .../api/objects/minecraft/CubicObject.java | 18 +- .../api/objects/minecraft/FakeBlockPos.java | 18 + .../api/objects/minecraft/FakeWorld.java | 2 + .../objects/minecraft/NoConflictGTRecipeMap.java | 1 + .../api/thermal/energy/IThermalHandler.java | 4 + .../api/thermal/energy/ThermalStorage.java | 4 + .../api/thermal/sample/ItemThermalContainer.java | 4 + .../api/thermal/sample/TileThermalHandler.java | 7 + .../core/block/base/BasicTileBlockWithTooltip.java | 16 +- .../gtPlusPlus/core/block/base/BlockBaseFluid.java | 4 +- .../gtPlusPlus/core/block/base/BlockBaseNBT.java | 8 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 38 +- .../block/general/BlockCompressedObsidian.java | 2 +- .../core/block/general/BlockSuperLight.java | 5 +- .../core/block/general/BlockTankXpConverter.java | 8 +- .../gtPlusPlus/core/block/general/FirePit.java | 2 +- .../core/block/general/FluidTankInfinite.java | 8 +- .../gtPlusPlus/core/block/general/HellFire.java | 2 +- .../core/block/general/MiningExplosives.java | 4 +- .../gtPlusPlus/core/block/general/PlayerDoors.java | 22 +- .../core/block/general/antigrief/TowerDevice.java | 14 +- .../block/general/fluids/BlockFluidSludge.java | 4 +- .../general/redstone/BlockGenericRedstone.java | 5 +- .../redstone/BlockGenericRedstoneDetector.java | 11 +- .../general/redstone/BlockGenericRedstoneTest.java | 11 +- .../core/block/machine/DecayablesChest.java | 8 +- .../java/gtPlusPlus/core/block/machine/EggBox.java | 6 +- .../gtPlusPlus/core/block/machine/FishTrap.java | 8 +- .../core/block/machine/HeliumGenerator.java | 8 +- .../block/machine/Machine_ModularityTable.java | 8 +- .../core/block/machine/Machine_PestKiller.java | 4 +- .../core/block/machine/Machine_PooCollector.java | 6 +- .../core/block/machine/Machine_ProjectTable.java | 8 +- .../core/block/machine/Machine_RoundRobinator.java | 9 +- .../core/block/machine/Machine_SuperJukebox.java | 5 +- .../gtPlusPlus/core/client/model/ModelBatKing.java | 1 + .../gtPlusPlus/core/client/model/ModelEggBox.java | 1 + .../core/client/model/ModelGiantChicken.java | 2 + .../client/renderer/CustomOreBlockRenderer.java | 77 +- .../core/client/renderer/RenderBatKing.java | 7 + .../core/client/renderer/RenderDecayChest.java | 1 + .../core/client/renderer/RenderPlasmaBolt.java | 2 + .../client/renderer/tabula/RenderTabulaBase.java | 1 + .../core/container/Container_RoundRobinator.java | 7 +- .../core/entity/EntityTeslaTowerLightning.java | 4 + .../core/entity/monster/EntityBatKing.java | 27 + .../entity/monster/EntityGiantChickenBase.java | 12 + .../entity/projectile/EntityLightningAttack.java | 1 + .../gtPlusPlus/core/fluids/BlockFluidBase.java | 4 +- .../core/fluids/ItemGenericFluidBucket.java | 1 + .../gtPlusPlus/core/gui/item/GuiBaseGrindle.java | 1 + .../gtPlusPlus/core/gui/item/box/GuiBaseBox.java | 3 + .../core/gui/machine/GUI_ScrollTest.java | 5 + .../gui/machine/GUI_VolumetricFlaskSetter.java | 5 + .../gtPlusPlus/core/item/bauble/BaseBauble.java | 7 +- .../core/item/bauble/HealthBoostBauble.java | 4 +- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 3 +- .../core/item/food/BaseItemMetaFood.java | 3 + .../gtPlusPlus/core/item/general/ItemGiantEgg.java | 1 + .../core/item/general/ItemMagicFeather.java | 1 + .../core/item/tool/misc/box/ContainerBoxBase.java | 1 + .../item/wearable/armour/hazmat/ArmourHazmat.java | 5 + .../wearable/armour/tinfoil/ArmourTinFoilHat.java | 5 + .../handler/AbstractClientMessageHandler.java | 1 + .../handler/AbstractServerMessageHandler.java | 1 + .../java/gtPlusPlus/core/players/FakeFarmer.java | 1 + .../core/tileentities/base/TileBasicTank.java | 96 +- .../core/tileentities/base/TileEntityBase.java | 471 +++++---- .../core/tileentities/base/TilePoweredGT.java | 2 +- .../general/TileEntityDecayablesChest.java | 3 + .../tileentities/general/TileEntityEggBox.java | 3 + .../general/TileEntityXpConverter.java | 40 +- .../machines/TileEntityAdvPooCollector.java | 3 + .../machines/TileEntityPooCollector.java | 2 + .../machines/TileEntityRoundRobinator.java | 87 +- .../machines/TileEntityTradeTable.java | 4 +- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 15 +- .../core/util/minecraft/network/CustomPacket.java | 2 +- .../util/minecraft/network/PacketTileEntity.java | 6 +- .../core/world/damage/BaseCustomDamageSource.java | 1 + .../everglades/block/BlockEvergladesPortal.java | 16 +- .../gtPlusPlus/nei/DecayableRecipeHandler.java | 11 + .../java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java | 9 + .../gtPlusPlus/plugin/fishing/item/BaseFish.java | 8 + .../fixes/vanilla/VanillaBackgroundMusicFix.java | 1 + .../plugin/fixes/vanilla/VanillaBedHeightFix.java | 1 + .../villagers/block/BlockGenericSpawner.java | 1 + ...ClassTransformer_COFH_OreDictionaryArbiter.java | 5 +- .../Preloader_Transformer_Handler.java | 1 + .../bartcrops/abstracts/BaseAestheticCrop.java | 4 + .../xmod/bartcrops/abstracts/BaseCrop.java | 9 +- .../bartcrops/abstracts/BaseHarvestableCrop.java | 10 + .../xmod/bartcrops/crops/Crop_Force.java | 7 + .../gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java | 7 + .../java/gtPlusPlus/xmod/bartworks/BW_Utils.java | 1 + .../xmod/bop/blocks/base/LeavesBase.java | 2 +- .../xmod/bop/blocks/base/SaplingBase.java | 2 +- .../xmod/gregtech/api/interfaces/IHeatEntity.java | 2 + .../interfaces/internal/Interface_ToolStats.java | 1 + .../gregtech/api/items/Gregtech_MetaItem_Base.java | 9 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 4 +- .../gregtech/api/items/tools/GT_MetaGenTool.java | 5 + .../gregtech/api/items/types/ToolType_Wrench.java | 130 +-- .../api/metatileentity/BaseCustomTileEntity.java | 7 + .../custom/power/BaseCustomPower_MTE.java | 21 +- .../power/GTPP_MTE_BasicLosslessGenerator.java | 50 +- .../custom/power/GTPP_MTE_BasicMachine.java | 103 +- .../custom/power/GTPP_MTE_BasicTank.java | 7 +- .../custom/power/MetaTileEntityCustomPower.java | 2 + .../GT_MetaTileEntity_BasicBreaker.java | 53 +- .../GT_MetaTileEntity_Dehydrator.java | 10 +- .../GT_MetaTileEntity_DeluxeMachine.java | 97 +- .../GT_MetaTileEntity_DeluxeTank.java | 9 +- .../GT_MetaTileEntity_Hatch_AirIntake.java | 3 +- .../GT_MetaTileEntity_Hatch_AirIntake_Extreme.java | 1 + .../GT_MetaTileEntity_Hatch_ControlCore.java | 11 +- .../GT_MetaTileEntity_Hatch_DynamoBuffer.java | 2 + ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 22 +- .../GT_MetaTileEntity_Hatch_Energy_RTG.java | 13 +- .../GT_MetaTileEntity_Hatch_FluidGenerator.java | 21 +- .../GT_MetaTileEntity_Hatch_InputBattery.java | 17 +- .../GT_MetaTileEntity_Hatch_Muffler_Adv.java | 14 +- .../GT_MetaTileEntity_Hatch_Naquadah.java | 20 +- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 17 +- .../GT_MetaTileEntity_Hatch_Plasma.java | 20 +- .../GT_MetaTileEntity_Hatch_Reservoir.java | 3 + .../GT_MetaTileEntity_Hatch_Steam_BusInput.java | 14 +- .../GT_MetaTileEntity_Hatch_Steam_BusOutput.java | 11 +- .../GT_MetaTileEntity_Hatch_Turbine.java | 35 +- .../GT_MetaTileEntity_Hatch_TurbineProvider.java | 11 +- .../GT_MetaTileEntity_SuperBus_Input.java | 1 + .../GT_MetaTileEntity_SuperBus_Output.java | 3 + .../GregtechMetaPipeEntityFluid.java | 19 +- .../GregtechMetaPipeEntity_Cable.java | 13 +- .../implementations/base/CustomMetaTileBase.java | 2 + .../GT_MetaTileEntity_Hatch_CustomFluidBase.java | 17 +- .../base/GregtechMetaPipeEntityBase_Cable.java | 214 ++-- .../base/GregtechMetaTransformerHiAmp.java | 3 +- .../base/GregtechMeta_MultiBlockBase.java | 35 +- .../base/GregtechMeta_SteamMultiBase.java | 8 +- .../GregtechDoubleFuelGeneratorBase.java | 25 +- .../base/generators/GregtechMetaBoilerBase.java | 41 +- .../generators/GregtechMetaSolarGenerator.java | 22 +- .../GregtechRocketFuelGeneratorBase.java | 27 +- .../base/machines/GregtechMetaSafeBlockBase.java | 84 +- .../base/machines/GregtechMetaTreeFarmerBase.java | 32 +- .../GT_MetaTileEntity_Hatch_Catalysts.java | 3 +- .../GT_MetaTileEntity_Hatch_MillingBalls.java | 3 +- .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 9 +- .../common/blocks/GTPP_Block_Machines.java | 111 ++- .../gregtech/common/blocks/GTPP_Item_Machines.java | 5 + .../common/blocks/GregtechMetaCasingBlocks.java | 10 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 4 +- .../common/blocks/GregtechMetaCasingBlocks3.java | 12 +- .../common/blocks/GregtechMetaCasingBlocks4.java | 13 +- .../common/blocks/GregtechMetaCasingBlocks5.java | 20 +- .../common/blocks/GregtechMetaCasingBlocks6.java | 12 +- .../GregtechMetaCasingBlocksPipeGearbox.java | 6 +- .../blocks/GregtechMetaSpecialMachineCasings.java | 3 +- .../blocks/GregtechMetaSpecialMultiCasings.java | 12 +- .../blocks/GregtechMetaSpecialMultiCasings2.java | 8 +- .../blocks/GregtechMetaTieredCasingBlocks1.java | 3 +- .../blocks/textures/CasingTextureHandler.java | 12 +- .../blocks/textures/CasingTextureHandler2.java | 4 +- .../blocks/textures/CasingTextureHandler3.java | 2 +- .../blocks/textures/CasingTextureHandler6.java | 2 +- .../textures/TexturesCentrifugeMultiblock.java | 26 +- .../common/blocks/textures/TexturesGregtech58.java | 509 ---------- .../common/blocks/textures/TexturesGregtech59.java | 96 +- .../blocks/textures/TexturesGrinderMultiblock.java | 20 +- .../turbine/LargeTurbineTextureHandler.java | 81 +- .../common/covers/GTPP_Cover_Overflow.java | 38 +- .../common/covers/GTPP_Cover_Overflow_Item.java | 39 +- .../common/covers/GTPP_Cover_ToggleVisual.java | 70 +- .../gregtech/common/helpers/GT_MethodHelper.java | 5 +- .../gregtech/common/helpers/TreeFarmHelper.java | 12 +- .../items/behaviours/Behaviour_Choocher.java | 8 +- .../behaviours/Behaviour_Electric_Lighter.java | 17 +- .../common/items/behaviours/Behaviour_Grinder.java | 3 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 10 +- .../common/items/covers/MetaItemCoverCasings.java | 1 + .../gregtech/common/render/GTPP_FlaskRenderer.java | 3 + .../common/render/GTPP_Render_MachineBlock.java | 1019 +++++++++++++++----- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 33 +- ...GT_MetaTileEntity_ElectricInventoryManager.java | 105 +- .../GT_MetaTileEntity_TesseractGenerator.java | 52 +- .../GT_MetaTileEntity_TesseractTerminal.java | 50 +- .../generators/GT_MetaTileEntity_Boiler_Base.java | 33 +- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 21 +- .../generators/GT_MetaTileEntity_RfConvertor.java | 51 +- .../GT_MetaTileEntity_SemiFluidGenerator.java | 12 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 5 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 6 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 5 +- .../GregtechMetaTileEntitySolarGenerator.java | 8 +- .../generators/GregtechMetaTileEntity_RTG.java | 8 +- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 1 + .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 1 + .../creative/GregtechMetaCreativeEnergyBuffer.java | 19 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 21 +- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 26 +- .../GregtechMetaAtmosphericReconditioner.java | 18 +- .../machines/basic/GregtechMetaCondensor.java | 17 +- .../basic/GregtechMetaGarbageCollector.java | 36 +- .../basic/GregtechMetaPollutionCreator.java | 36 +- .../basic/GregtechMetaPollutionDetector.java | 58 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 26 +- ...GregtechMetaTileEntityThaumcraftResearcher.java | 38 +- .../basic/GregtechMetaTileEntity_AutoChisel.java | 8 +- .../basic/GregtechMetaTileEntity_BasicWasher.java | 6 +- .../GregtechMetaTileEntity_ChemicalReactor.java | 60 +- ...regtechMetaTileEntity_CompactFusionReactor.java | 65 +- .../basic/GregtechMetaTileEntity_PocketFusion.java | 65 +- .../GregtechMetaTileEntity_ReactorColdTrap.java | 6 +- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 6 +- .../basic/GregtechMetaWirelessCharger.java | 42 +- .../multi/misc/GregtechMTE_TeslaTower.java | 4 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 7 + ...regtechMetaTileEntity_IndustrialArcFurnace.java | 4 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 3 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 11 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 3 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 9 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 6 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 3 +- ...aTileEntity_IndustrialMolecularTransformer.java | 7 + ...gtechMetaTileEntity_IndustrialMultiMachine.java | 3 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 3 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 10 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 27 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 8 + ...GregtechMetaTileEntity_IndustrialWashPlant.java | 10 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 3 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 30 +- .../processing/GregtechMetaTileEntity_IsaMill.java | 10 +- .../GregtechMetaTileEntity_SpargeTower.java | 2 +- ...egtechMetaTileEntity_Adv_DistillationTower.java | 9 +- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 10 +- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 8 +- .../GregtechMetaTileEntity_Adv_Fusion_MK5.java | 8 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 9 + .../GregtechMetaTileEntity_SteamCompressor.java | 1 + .../GregtechMetaTileEntity_SteamMacerator.java | 1 + .../multi/production/GT4Entity_AutoCrafter.java | 1 + .../multi/production/GT4Entity_ThermalBoiler.java | 1 + .../GregtechMTE_ElementalDuplicator.java | 13 +- .../production/GregtechMTE_FastNeutronReactor.java | 4 +- .../production/GregtechMTE_FrothFlotationCell.java | 5 +- .../production/GregtechMTE_LargeNaqReactor.java | 2 +- .../production/GregtechMTE_MiniFusionPlant.java | 14 +- .../production/GregtechMTE_NuclearReactor.java | 13 +- .../production/GregtechMetaTileEntityTreeFarm.java | 1 + .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 3 +- .../GregtechMetaTileEntity_Cyclotron.java | 5 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 9 +- ...techMetaTileEntity_LargeSemifluidGenerator.java | 1 + .../GregtechMetaTileEntity_MassFabricator.java | 3 +- ...techMetaTileEntity_QuantumForceTransformer.java | 14 +- .../GregtechMetaTileEntity_Refinery.java | 1 + .../GregtechMetaTileEntity_SolarTower.java | 13 +- .../algae/GregtechMTE_AlgaePondBase.java | 14 +- ...chMetaTileEntity_BedrockMiningPlatformBase.java | 20 +- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 12 +- .../turbines/GT_MTE_LargeTurbine_Gas.java | 1 + .../turbines/GT_MTE_LargeTurbine_Plasma.java | 1 + .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 8 +- .../turbines/GT_MTE_LargeTurbine_Steam.java | 9 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 19 +- .../storage/GregtechMetaTileEntity_MultiTank.java | 8 +- ...chMetaTileEntity_PowerSubStationController.java | 18 +- .../misc/GT_TileEntity_ComputerCube.java | 18 +- .../tileentities/misc/TileEntitySolarHeater.java | 32 +- .../redstone/GT_MetaTileEntity_RedstoneBase.java | 17 +- .../GT_MetaTileEntity_RedstoneButtonPanel.java | 78 +- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 99 +- .../redstone/GT_MetaTileEntity_RedstoneLamp.java | 5 +- .../GT_MetaTileEntity_RedstoneStrengthDisplay.java | 30 +- .../GT_MetaTileEntity_RedstoneStrengthScale.java | 20 +- .../GT_MetaTileEntity_AdvancedCraftingTable.java | 23 +- .../GT_MetaTileEntity_BronzeCraftingTable.java | 6 +- .../GT_MetaTileEntity_ConnectableCrate.java | 44 +- .../storage/GT_MetaTileEntity_TieredChest.java | 32 +- .../storage/GT_MetaTileEntity_TieredTank.java | 9 +- .../storage/GregtechMetaEnergyBuffer.java | 41 +- .../GT_MetaTileEntity_InfiniteItemHolder.java | 8 +- .../storage/shelving/GT4Entity_Shelf.java | 35 +- .../shelving/GT4Entity_Shelf_Compartment.java | 5 +- .../storage/shelving/GT4Entity_Shelf_Desk.java | 4 + .../shelving/GT4Entity_Shelf_FileCabinet.java | 9 +- .../storage/shelving/GT4Entity_Shelf_Iron.java | 5 + .../storage/shelving/GT4Entity_Shelf_Large.java | 21 +- .../common/tools/TOOL_Gregtech_AngleGrinder.java | 3 + .../gregtech/common/tools/TOOL_Gregtech_Base.java | 1 + .../common/tools/TOOL_Gregtech_Choocher.java | 1 + .../tools/TOOL_Gregtech_ElectricButcherKnife.java | 3 + .../tools/TOOL_Gregtech_ElectricLighter.java | 3 + .../common/tools/TOOL_Gregtech_ElectricSnips.java | 2 + .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 6 + .../xmod/ic2/item/CustomKineticRotor.java | 3 + .../xmod/railcraft/utils/RailcraftUtils.java | 6 +- .../xmod/sc2/modules/ModuleExoticSeeds.java | 2 +- .../vswe/stevescarts/ModuleData/GppModuleData.java | 4 +- 311 files changed, 3864 insertions(+), 3036 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java (limited to 'src/main/java') diff --git a/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java b/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java index c7a3bc7b46..9a43ca0056 100644 --- a/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java +++ b/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java @@ -12,6 +12,8 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; +import com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems; + import Ic2ExpReactorPlanner.components.Condensator; import Ic2ExpReactorPlanner.components.CoolantCell; import Ic2ExpReactorPlanner.components.Exchanger; @@ -20,9 +22,6 @@ import Ic2ExpReactorPlanner.components.Plating; import Ic2ExpReactorPlanner.components.ReactorItem; import Ic2ExpReactorPlanner.components.Reflector; import Ic2ExpReactorPlanner.components.Vent; - -import com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems; - import gregtech.api.enums.ItemList; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_ModHandler; diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java index 205ff05dc1..f121926005 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.IDescribable; import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; @@ -41,7 +42,7 @@ public abstract interface IGregtechPower public boolean increaseStoredEnergyUnits(long p0, boolean p1); @Override - public boolean drainEnergyUnits(byte p0, long p1, long p2); + public boolean drainEnergyUnits(ForgeDirection side, long p1, long p2); @Override public long getAverageElectricInput(); @@ -65,10 +66,10 @@ public abstract interface IGregtechPower public boolean increaseStoredSteam(long p0, boolean p1); @Override - public Block getBlockAtSide(byte p0); + public Block getBlockAtSide(ForgeDirection side); @Override - public Block getBlockAtSideAndDistance(byte p0, int p1); + public Block getBlockAtSideAndDistance(ForgeDirection side, int p1); @Override public Block getBlockOffset(int p0, int p1, int p2); @@ -77,10 +78,10 @@ public abstract interface IGregtechPower public TileEntity getTileEntity(int p0, int p1, int p2); @Override - public TileEntity getTileEntityAtSide(byte p0); + public TileEntity getTileEntityAtSide(ForgeDirection side); @Override - public TileEntity getTileEntityAtSideAndDistance(byte p0, int p1); + public TileEntity getTileEntityAtSideAndDistance(ForgeDirection side, int p1); @Override public TileEntity getTileEntityOffset(int p0, int p1, int p2); @@ -116,19 +117,19 @@ public abstract interface IGregtechPower public void writeToNBT(NBTTagCompound p0); @Override - public boolean acceptsRotationalEnergy(byte p0); + public boolean acceptsRotationalEnergy(ForgeDirection side); @Override - public boolean injectRotationalEnergy(byte p0, long p1, long p2); + public boolean injectRotationalEnergy(ForgeDirection side, long p1, long p2); @Override - public long injectEnergyUnits(byte p0, long p1, long p2); + public long injectEnergyUnits(ForgeDirection side, long p1, long p2); @Override - public boolean inputEnergyFrom(byte p0); + public boolean inputEnergyFrom(ForgeDirection side); @Override - public boolean outputsEnergyTo(byte p0); + public boolean outputsEnergyTo(ForgeDirection side); @Override public String[] getInfoData(); @@ -138,9 +139,4 @@ public abstract interface IGregtechPower return true; } - /* - * boolean onPreTick(TilePoweredGT tilePoweredGT, long mTickTimer2); boolean onTick(TilePoweredGT - * iGregTechTileEntity, long mTickTimer2); boolean onPostTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2); - */ - } diff --git a/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java b/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java index a643c86292..d2a1e34f99 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java +++ b/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java @@ -1,5 +1,7 @@ package gtPlusPlus.api.interfaces; +import net.minecraftforge.common.util.ForgeDirection; + import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -16,7 +18,7 @@ public interface ILazyCoverable extends ICoverable { } @Override - default byte getInputRedstoneSignal(byte arg0) { + default byte getInputRedstoneSignal(ForgeDirection side) { return 0; } @@ -32,7 +34,7 @@ public interface ILazyCoverable extends ICoverable { } @Override - default boolean getRedstone(byte arg0) { + default boolean getRedstone(ForgeDirection side) { return false; } @@ -67,23 +69,23 @@ public interface ILazyCoverable extends ICoverable { } @Override - default byte getOutputRedstoneSignal(byte arg0) { + default byte getOutputRedstoneSignal(ForgeDirection side) { return 0; } @Override - default void setOutputRedstoneSignal(byte arg0, byte arg1) {} + default void setOutputRedstoneSignal(ForgeDirection side, byte strength) {} @Override - default byte getStrongOutputRedstoneSignal(byte arg0) { + default byte getStrongOutputRedstoneSignal(ForgeDirection side) { return 0; } @Override - default void setStrongOutputRedstoneSignal(byte arg0, byte arg1) {} + default void setStrongOutputRedstoneSignal(ForgeDirection side, byte arg1) {} @Override - default byte getComparatorValue(byte arg0) { + default byte getComparatorValue(ForgeDirection side) { return 0; } @@ -98,12 +100,12 @@ public interface ILazyCoverable extends ICoverable { } @Override - default IGregTechTileEntity getIGregTechTileEntityAtSide(byte arg0) { + default IGregTechTileEntity getIGregTechTileEntityAtSide(ForgeDirection side) { return null; } @Override - default IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte arg0, int arg1) { + default IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(ForgeDirection side, int arg1) { return null; } @@ -118,12 +120,12 @@ public interface ILazyCoverable extends ICoverable { } @Override - default byte getMetaIDAtSide(byte arg0) { + default byte getMetaIDAtSide(ForgeDirection side) { return 0; } @Override - default byte getMetaIDAtSideAndDistance(byte arg0, int arg1) { + default byte getMetaIDAtSideAndDistance(ForgeDirection side, int arg1) { return 0; } diff --git a/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java index 5f45964ca8..a6179ce2bf 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java +++ b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java @@ -1,13 +1,15 @@ package gtPlusPlus.api.interfaces; import net.minecraft.block.Block; +import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ITexturedTileEntity; public interface ITexturedBlock extends ITexturedTileEntity { - ITexture[] getTexture(byte side); + ITexture[] getTexture(ForgeDirection side); - ITexture[] getTexture(Block block, byte side); + @Override + ITexture[] getTexture(Block block, ForgeDirection side); } diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java index 9e26ea9174..f4b2550b5a 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java @@ -118,6 +118,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return set(object); } + @Override public synchronized boolean add(V object) { return set(object) != null; } @@ -130,6 +131,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return mInternalMap.put(mInternalID++, object); } + @Override public synchronized V get(int id) { return mInternalMap.get(id); } @@ -138,6 +140,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return mInternalMap.values(); } + @Override public synchronized int size() { return mInternalMap.size(); } @@ -154,10 +157,12 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return mInternalMap.containsValue(value); } + @Override public synchronized boolean isEmpty() { return mInternalMap.isEmpty(); } + @Override public synchronized void clear() { this.mInternalID = 0; this.mInternalMap.clear(); @@ -165,6 +170,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return; } + @Override @SuppressWarnings("unchecked") public V[] toArray() { V[] toR = (V[]) java.lang.reflect.Array.newInstance(mInternalMap.get(0).getClass(), mInternalMap.size()); @@ -178,6 +184,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return mInternalID; } + @Override public final synchronized boolean remove(Object value) { value.getClass(); if (this.mInternalMap.containsValue(value)) { diff --git a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java index da6fc7d181..275dad9d42 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java @@ -24,6 +24,7 @@ public class ReverseAutoMap extends AutoMap { return values().iterator(); } + @Override public synchronized boolean setValue(N object) { int mOriginalID = this.mInternalID; put(object); diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java index c282ce1eb3..e4b4e0db88 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java +++ b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java @@ -46,6 +46,7 @@ public class TypeCounter implements Set { } } + @Override public boolean add(V arg0) { return add(arg0, null); } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java index 56a134716b..ac061c44fd 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java @@ -18,14 +18,17 @@ public class BTF_FluidTank extends FluidTank { * * @author Alkalus/GregoriusT */ + @Override public FluidStack getFluid() { return this.getDrainableStack(); } + @Override public int getFluidAmount() { return this.getDrainableStack() != null ? this.getDrainableStack().amount : 0; } + @Override public NBTTagCompound writeToNBT(NBTTagCompound aNBT) { super.writeToNBT(aNBT); if (this.mFluid != null) { @@ -34,6 +37,7 @@ public class BTF_FluidTank extends FluidTank { return aNBT; } + @Override public FluidTank readFromNBT(NBTTagCompound aNBT) { this.mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid")); return this; @@ -82,6 +86,7 @@ public class BTF_FluidTank extends FluidTank { return true; } + @Override public int fill(FluidStack aFluid, boolean doFill) { if (aFluid != null && aFluid.getFluid().getID() > 0 && aFluid.amount > 0 @@ -126,6 +131,7 @@ public class BTF_FluidTank extends FluidTank { } } + @Override public FluidStack drain(int maxDrain, boolean doDrain) { if (this.getDrainableStack() != null && this.canTankBeEmptied()) { if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java index 6dac3a7acd..cc3c2cd36e 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.tileentities.base.TileEntityBase; @@ -25,14 +26,17 @@ public class BTF_Inventory implements ISidedInventory { return this.mInventory; } + @Override public int getSizeInventory() { return this.mInventory.length; } + @Override public ItemStack getStackInSlot(int aIndex) { return aIndex >= 0 && aIndex < this.mInventory.length ? this.mInventory[aIndex] : null; } + @Override public void setInventorySlotContents(int aIndex, ItemStack aStack) { if (aIndex >= 0 && aIndex < this.mInventory.length) { this.mInventory[aIndex] = aStack; @@ -47,6 +51,7 @@ public class BTF_Inventory implements ISidedInventory { return true; } + @Override public int getInventoryStackLimit() { return 64; } @@ -55,10 +60,12 @@ public class BTF_Inventory implements ISidedInventory { return false; } + @Override public boolean isItemValidForSlot(int aIndex, ItemStack aStack) { return isValidSlot(aIndex); } + @Override public ItemStack decrStackSize(int aIndex, int aAmount) { ItemStack tStack = this.getStackInSlot(aIndex); ItemStack rStack = GT_Utility.copy(new Object[] { tStack }); @@ -80,34 +87,36 @@ public class BTF_Inventory implements ISidedInventory { return rStack; } - public int[] getAccessibleSlotsFromSide(int aSide) { + @Override + public int[] getAccessibleSlotsFromSide(int ordinalSide) { + final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); ArrayList tList = new ArrayList(); TileEntityBase tTileEntity = this.mTile; - boolean tSkip = tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsIn( - (byte) aSide, - tTileEntity.getCoverIDAtSide((byte) aSide), - tTileEntity.getCoverDataAtSide((byte) aSide), + boolean tSkip = tTileEntity.getCoverBehaviorAtSide(side).letsItemsIn( + side, + tTileEntity.getCoverIDAtSide(side), + tTileEntity.getCoverDataAtSide(side), -2, tTileEntity) - || tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsOut( - (byte) aSide, - tTileEntity.getCoverIDAtSide((byte) aSide), - tTileEntity.getCoverDataAtSide((byte) aSide), + || tTileEntity.getCoverBehaviorAtSide(side).letsItemsOut( + side, + tTileEntity.getCoverIDAtSide(side), + tTileEntity.getCoverDataAtSide(side), -2, tTileEntity); for (int rArray = 0; rArray < this.getSizeInventory(); ++rArray) { if (this.isValidSlot(rArray) && (tSkip - || tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsOut( - (byte) aSide, - tTileEntity.getCoverIDAtSide((byte) aSide), - tTileEntity.getCoverDataAtSide((byte) aSide), + || tTileEntity.getCoverBehaviorAtSide(side).letsItemsOut( + side, + tTileEntity.getCoverIDAtSide(side), + tTileEntity.getCoverDataAtSide(side), rArray, tTileEntity) - || tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsIn( - (byte) aSide, - tTileEntity.getCoverIDAtSide((byte) aSide), - tTileEntity.getCoverDataAtSide((byte) aSide), + || tTileEntity.getCoverBehaviorAtSide(side).letsItemsIn( + side, + tTileEntity.getCoverIDAtSide(side), + tTileEntity.getCoverDataAtSide(side), rArray, tTileEntity))) { tList.add(Integer.valueOf(rArray)); @@ -123,36 +132,42 @@ public class BTF_Inventory implements ISidedInventory { return arg6; } - public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) { + @Override + public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { return this.isValidSlot(aIndex) && aStack != null && aIndex < this.mInventory.length && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, this.mInventory[aIndex])) - && this.allowPutStack(this.mTile, aIndex, (byte) aSide, aStack); + && this.allowPutStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); } - public boolean canExtractItem(int aIndex, ItemStack aStack, int aSide) { + @Override + public boolean canExtractItem(int aIndex, ItemStack aStack, int ordinalSide) { return this.isValidSlot(aIndex) && aStack != null && aIndex < this.mInventory.length - && this.allowPullStack(this.mTile, aIndex, (byte) aSide, aStack); + && this.allowPullStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); } - public boolean allowPullStack(TileEntityBase mTile2, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPullStack(TileEntityBase mTile2, int aIndex, ForgeDirection side, ItemStack aStack) { return aIndex >= 0 && aIndex < this.getSizeInventory(); } - public boolean allowPutStack(TileEntityBase aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPutStack(TileEntityBase aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { return (aIndex >= 0 && aIndex < this.getSizeInventory()) && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(this.mInventory[aIndex], aStack)); } + @Override public ItemStack getStackInSlotOnClosing(int i) { return null; } + @Override public final boolean hasCustomInventoryName() { return mTile != null ? mTile.hasCustomInventoryName() : false; } + @Override public void markDirty() { if (mTile != null) { purgeNulls(); @@ -160,12 +175,15 @@ public class BTF_Inventory implements ISidedInventory { } } + @Override public boolean isUseableByPlayer(EntityPlayer entityplayer) { return true; } + @Override public void openInventory() {} + @Override public void closeInventory() {} @Override diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java index 5799a12822..5620b76895 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java @@ -32,22 +32,22 @@ public class CubicObject { EAST = aEAST; } - public T get(int aSide) { - return get(ForgeDirection.getOrientation(aSide)); + public T get(int ordinalSide) { + return get(ForgeDirection.getOrientation(ordinalSide)); } - public T get(ForgeDirection aSide) { - if (aSide == ForgeDirection.DOWN) { + public T get(ForgeDirection side) { + if (side == ForgeDirection.DOWN) { return DOWN; - } else if (aSide == ForgeDirection.UP) { + } else if (side == ForgeDirection.UP) { return UP; - } else if (aSide == ForgeDirection.NORTH) { + } else if (side == ForgeDirection.NORTH) { return NORTH; - } else if (aSide == ForgeDirection.SOUTH) { + } else if (side == ForgeDirection.SOUTH) { return SOUTH; - } else if (aSide == ForgeDirection.WEST) { + } else if (side == ForgeDirection.WEST) { return WEST; - } else if (aSide == ForgeDirection.EAST) { + } else if (side == ForgeDirection.EAST) { return EAST; } else { return null; diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java index d627d47349..4af3df18ba 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java @@ -39,11 +39,13 @@ public class FakeBlockPos extends BlockPos { super(x, y, z, null); } + @Override public String getLocationString() { String S = "" + this.xPos + "@" + this.yPos + "@" + this.zPos; return S; } + @Override public String getUniqueIdentifier() { String S = "" + this.xPos + "@" @@ -95,6 +97,7 @@ public class FakeBlockPos extends BlockPos { * @param z Z coordinate of target. * @return square of distance */ + @Override public int distanceFrom(int x, int y, int z) { int distanceX = this.xPos - x; int distanceY = this.yPos - y; @@ -109,34 +112,42 @@ public class FakeBlockPos extends BlockPos { return isWithinRange(target.xPos, target.yPos, target.zPos, range); } + @Override public boolean isWithinRange(int x, int y, int z, int range) { return distanceFrom(x, y, z) <= (range * range); } + @Override public FakeBlockPos getUp() { return new FakeBlockPos(this.xPos, this.yPos + 1, this.zPos, this.dim); } + @Override public FakeBlockPos getDown() { return new FakeBlockPos(this.xPos, this.yPos - 1, this.zPos, this.dim); } + @Override public FakeBlockPos getXPos() { return new FakeBlockPos(this.xPos + 1, this.yPos, this.zPos, this.dim); } + @Override public FakeBlockPos getXNeg() { return new FakeBlockPos(this.xPos - 1, this.yPos, this.zPos, this.dim); } + @Override public FakeBlockPos getZPos() { return new FakeBlockPos(this.xPos, this.yPos, this.zPos + 1, this.dim); } + @Override public FakeBlockPos getZNeg() { return new FakeBlockPos(this.xPos, this.yPos, this.zPos - 1, this.dim); } + @Override public AutoMap getSurroundingBlocks() { AutoMap sides = new AutoMap(); sides.put(getUp()); @@ -148,6 +159,7 @@ public class FakeBlockPos extends BlockPos { return sides; } + @Override public Block getBlockAtPos() { return getBlockAtPos(this); } @@ -160,6 +172,7 @@ public class FakeBlockPos extends BlockPos { return aBlockAtPos; } + @Override public int getMetaAtPos() { return getMetaAtPos(this); } @@ -172,6 +185,7 @@ public class FakeBlockPos extends BlockPos { return aBlockMetaAtPos; } + @Override public boolean hasSimilarNeighbour() { return hasSimilarNeighbour(false); } @@ -180,6 +194,7 @@ public class FakeBlockPos extends BlockPos { * @param strict - Does this check Meta Data? * @return - Does this block have a neighbour that is the same? */ + @Override public boolean hasSimilarNeighbour(boolean strict) { for (BlockPos g : getSurroundingBlocks().values()) { if (getBlockAtPos(g) == getBlockAtPos()) { @@ -195,6 +210,7 @@ public class FakeBlockPos extends BlockPos { return false; } + @Override public AutoMap getSimilarNeighbour() { return getSimilarNeighbour(false); } @@ -203,6 +219,7 @@ public class FakeBlockPos extends BlockPos { * @param strict - Does this check Meta Data? * @return - Does this block have a neighbour that is the same? */ + @Override public AutoMap getSimilarNeighbour(boolean strict) { AutoMap sides = new AutoMap(); for (BlockPos g : getSurroundingBlocks().values()) { @@ -219,6 +236,7 @@ public class FakeBlockPos extends BlockPos { return sides; } + @Override public Set getValidNeighboursAndSelf() { AutoMap h = getSimilarNeighbour(true); h.put(this); diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java index d294326ff3..be158a38cd 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java @@ -97,11 +97,13 @@ public class FakeWorld implements IBlockAccess { return aOutput; } + @Override public Block getBlock(int x, int y, int z) { FakeBlockPos aPos = getBlockAtCoords(x, y, z); return aPos.getBlockAtPos(); } + @Override public boolean isAirBlock(int x, int y, int z) { Block aBlock = getBlock(x, y, z); return aBlock == Blocks.air || aBlock.getMaterial() == Material.air; diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java b/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java index e8b4a19031..df48c24c06 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java @@ -24,6 +24,7 @@ public class NoConflictGTRecipeMap implements Collection { return add(recipe); } + @Override public boolean add(GT_Recipe recipe) { return mRecipeCache.setValue(recipe); } diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java index 6f0235f4d7..e50ae45003 100644 --- a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java @@ -4,11 +4,15 @@ import net.minecraftforge.common.util.ForgeDirection; public interface IThermalHandler extends IThermalProvider, IThermalReceiver { + @Override int receiveThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2); + @Override int extractThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2); + @Override int getThermalEnergyStored(ForgeDirection arg0); + @Override int getMaxThermalEnergyStored(ForgeDirection arg0); } diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java index 60efc687dc..a2c29ba76a 100644 --- a/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java @@ -85,6 +85,7 @@ public class ThermalStorage implements IThermalStorage { } } + @Override public int receiveThermalEnergy(int arg0, boolean arg1) { int arg2 = Math.min(this.capacity - this.thermal_energy, Math.min(this.maxReceive, arg0)); if (!arg1) { @@ -94,6 +95,7 @@ public class ThermalStorage implements IThermalStorage { return arg2; } + @Override public int extractThermalEnergy(int arg0, boolean arg1) { int arg2 = Math.min(this.thermal_energy, Math.min(this.maxExtract, arg0)); if (!arg1) { @@ -103,10 +105,12 @@ public class ThermalStorage implements IThermalStorage { return arg2; } + @Override public int getThermalEnergyStored() { return this.thermal_energy; } + @Override public int getMaxThermalEnergyStored() { return this.capacity; } diff --git a/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java b/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java index 57eb1d2c43..ff0cf06188 100644 --- a/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java +++ b/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java @@ -46,6 +46,7 @@ public class ItemThermalContainer extends Item implements IThermalContainerItem this.maxExtract = arg0; } + @Override public int receiveThermalEnergy(ItemStack arg0, int arg1, boolean arg2) { if (arg0.getTagCompound() == null) { arg0.stackTagCompound = new NBTTagCompound(); @@ -59,6 +60,7 @@ public class ItemThermalContainer extends Item implements IThermalContainerItem return arg4; } + @Override public int extractThermalEnergy(ItemStack arg0, int arg1, boolean arg2) { if (arg0.stackTagCompound != null && arg0.stackTagCompound.hasKey("ThermalEnergy")) { int arg3 = arg0.stackTagCompound.getInteger("ThermalEnergy"); @@ -73,12 +75,14 @@ public class ItemThermalContainer extends Item implements IThermalContainerItem } } + @Override public int getThermalEnergyStored(ItemStack arg0) { return arg0.stackTagCompound != null && arg0.stackTagCompound.hasKey("ThermalEnergy") ? arg0.stackTagCompound.getInteger("ThermalEnergy") : 0; } + @Override public int getMaxThermalEnergyStored(ItemStack arg0) { return this.capacity; } diff --git a/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java b/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java index 8ee401c474..a41b6428cb 100644 --- a/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java +++ b/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java @@ -11,32 +11,39 @@ public class TileThermalHandler extends TileEntity implements IThermalHandler { protected ThermalStorage storage = new ThermalStorage(32000); + @Override public void readFromNBT(NBTTagCompound arg0) { super.readFromNBT(arg0); this.storage.readFromNBT(arg0); } + @Override public void writeToNBT(NBTTagCompound arg0) { super.writeToNBT(arg0); this.storage.writeToNBT(arg0); } + @Override public boolean canConnectThermalEnergy(ForgeDirection arg0) { return true; } + @Override public int receiveThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2) { return this.storage.receiveThermalEnergy(arg1, arg2); } + @Override public int extractThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2) { return this.storage.extractThermalEnergy(arg1, arg2); } + @Override public int getThermalEnergyStored(ForgeDirection arg0) { return this.storage.getThermalEnergyStored(); } + @Override public int getMaxThermalEnergyStored(ForgeDirection arg0) { return this.storage.getMaxThermalEnergyStored(); } diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index d370940b41..7f0a504a79 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -19,7 +19,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import appeng.core.CreativeTab; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -163,13 +165,13 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override @SideOnly(Side.CLIENT) - public final IIcon getIcon(final int aSide, final int aMeta) { - return mSidedTextureArray.get(aMeta).get(aSide).getIcon(); + public final IIcon getIcon(final int ordinalSide, final int aMeta) { + return mSidedTextureArray.get(aMeta).get(ForgeDirection.getOrientation(ordinalSide)).getIcon(); } @Override - public IIcon getIcon(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) { - return super.getIcon(aWorld, aX, aY, aZ, aSide); + public IIcon getIcon(IBlockAccess aWorld, int aX, int aY, int aZ, int ordinalSide) { + return super.getIcon(aWorld, aX, aY, aZ, ordinalSide); } @SideOnly(Side.CLIENT) @@ -178,8 +180,8 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement Logger.INFO("[TeTexture] Building Texture Maps for " + getTileEntityName() + "."); // Init on the Client side only, to prevent Field initialisers existing in the Server side bytecode. - mSidedTextureArray = new AutoMap>(); - mSidedTexturePathArray = new AutoMap>(); + mSidedTextureArray = new AutoMap<>(); + mSidedTexturePathArray = new AutoMap<>(); // Store them in forge order // DOWN, UP, NORTH, SOUTH, WEST, EAST @@ -325,10 +327,12 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement return l; } + @Override public Item getItemDropped(int meta, Random rand, int p_149650_3_) { return ItemUtils.getSimpleStack(this, 1).getItem(); } + @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { ArrayList drops = new ArrayList(); drops.add(ItemUtils.simpleMetaStack(this, metadata, 1)); diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java index a0cdd88193..e992d01d60 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java @@ -66,8 +66,8 @@ public class BlockBaseFluid extends BlockFluidClassic { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return side <= 1 ? this.textureArray[0] : this.textureArray[1]; + public IIcon getIcon(int ordinalSide, int meta) { + return ordinalSide <= 1 ? this.textureArray[0] : this.textureArray[1]; } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java index a3527059ab..08462c6c65 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java @@ -42,10 +42,10 @@ public abstract class BlockBaseNBT extends BlockContainer { */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 ? this.textureTop - : (p_149691_1_ == 0 ? this.textureBottom - : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); + public IIcon getIcon(final int ordinalSide, final int meta) { + return ordinalSide == 1 ? this.textureTop + : (ordinalSide == 0 ? this.textureBottom + : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront)); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index 88ee9a8986..c7d8866ec5 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -8,6 +8,7 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.OrePrefixes; @@ -80,12 +81,12 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { } @Override - public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) { + public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int ordinalSide) { return Blocks.stone.getIcon(0, 0); } @Override - public IIcon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int ordinalSide, int aMeta) { return Blocks.stone.getIcon(0, 0); } @@ -96,11 +97,13 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { // .08 compat public static IIconContainer[] hiddenTextureArray; - public ITexture[] getTexture(byte arg0) { - return getTexture(null, arg0); + @Override + public ITexture[] getTexture(ForgeDirection side) { + return getTexture(null, side); } - public ITexture[] getTexture(Block block, byte side) { + @Override + public ITexture[] getTexture(Block block, ForgeDirection side) { if (this.blockMaterial != null) { GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture( blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], @@ -140,19 +143,6 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); } - /* - * @Override - * @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { this.blockIcon = - * iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); //this.base = - * iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(GTPlusPlus.ID + - * ":" + "blockOre_Overlay"); } - * @Override public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, - * final int par4){ if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } return - * this.blockColour; } - * @Override public int getRenderColor(final int aMeta) { if (this.blockColour == 0){ return - * MathUtils.generateSingularRandomHexValue(); } return this.blockColour; } - */ - @Override public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { @@ -168,12 +158,12 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { } @Override - public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) { + public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int ordinalSide) { return Blocks.stone.getIcon(0, 0); } @Override - public IIcon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int ordinalSide, int aMeta) { return Blocks.stone.getIcon(0, 0); } @@ -184,11 +174,13 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { // .08 compat IIconContainer[] hiddenTextureArray; - public ITexture[] getTexture(byte arg0) { - return getTexture(null, arg0); + @Override + public ITexture[] getTexture(ForgeDirection side) { + return getTexture(null, side); } - public ITexture[] getTexture(Block block, byte side) { + @Override + public ITexture[] getTexture(Block block, ForgeDirection side) { if (this.blockMaterial != null) { GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture( blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java index 2966404a67..d80c056d65 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java @@ -67,7 +67,7 @@ public class BlockCompressedObsidian extends BlockObsidian { */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int side, final int meta) { + public IIcon getIcon(final int ordinalSide, final int meta) { return this.textureArray[meta]; } diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index fee8176262..a9c309d5c7 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -41,7 +41,7 @@ public class BlockSuperLight extends BlockContainer { */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { + public IIcon getIcon(final int ordinalSide, final int meta) { return this.blockIcon; } @@ -54,6 +54,7 @@ public class BlockSuperLight extends BlockContainer { /** * Returns a new instance of a block's tile entity class. Called on placing the block. */ + @Override public TileEntity createNewTileEntity(World aWorld, int p_149915_2_) { return new TileEntitySuperLight(); } @@ -75,6 +76,7 @@ public class BlockSuperLight extends BlockContainer { Logger.INFO("Created Super-Lamp"); } + @Override public void readFromNBT(NBTTagCompound aNBT) { super.readFromNBT(aNBT); mCreated = aNBT.getLong("mCreated"); @@ -90,6 +92,7 @@ public class BlockSuperLight extends BlockContainer { } } + @Override public void writeToNBT(NBTTagCompound aNBT) { super.writeToNBT(aNBT); aNBT.setLong("mCreated", mCreated); diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index 61e6b71b57..79b24e2405 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -48,10 +48,10 @@ public class BlockTankXpConverter extends BlockContainer { */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 ? this.textureTop - : (p_149691_1_ == 0 ? this.textureBottom - : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); + public IIcon getIcon(final int ordinalSide, final int meta) { + return ordinalSide == 1 ? this.textureTop + : (ordinalSide == 0 ? this.textureBottom + : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront)); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java index 25210df133..e73c88bee0 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java @@ -220,7 +220,7 @@ public class FirePit extends BasicBlock { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { + public IIcon getIcon(final int ordinalSide, final int meta) { return FirePit.TEXTU