From ba71a82288b7eaee181465ea5080a7fda9761270 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sat, 27 Jun 2020 16:18:20 +0200 Subject: [PATCH] Migrations --- api/build.gradle | 1 - .../api/definitions/IBlockDefinition.java | 4 +- .../api/features/IWirelessTermRegistry.java | 4 +- .../items/IGrowableCrystal.java | 2 +- .../implementations/items/IMemoryCard.java | 6 +-- .../api/implementations/parts/ICablePart.java | 2 +- .../implementations/tiles/IColorableTile.java | 2 +- .../tiles/ICraftingMachine.java | 2 +- .../api/implementations/tiles/ICrankable.java | 2 +- .../appeng/api/networking/IGridBlock.java | 2 +- .../java/appeng/api/networking/IGridNode.java | 6 +-- .../appeng/api/networking/IGridStorage.java | 6 +-- .../networking/crafting/ICraftingLink.java | 4 +- .../appeng/api/parts/IFacadeContainer.java | 6 +-- api/src/main/java/appeng/api/parts/IPart.java | 12 ++--- .../api/parts/IPartCollisionHelper.java | 2 +- .../java/appeng/api/parts/IPartHelper.java | 6 +-- .../main/java/appeng/api/parts/IPartHost.java | 2 +- .../main/java/appeng/api/parts/IPartItem.java | 2 +- .../main/java/appeng/api/parts/LayerBase.java | 2 +- .../appeng/api/recipes/ResolverResult.java | 6 +-- .../appeng/api/storage/IStorageChannel.java | 4 +- .../appeng/api/storage/IStorageHelper.java | 6 +-- .../appeng/api/storage/data/IAEStack.java | 6 +-- .../java/appeng/api/util/AEPartLocation.java | 2 +- .../java/appeng/api/util/IConfigManager.java | 6 +-- .../java/appeng/api/util/IOrientable.java | 2 +- .../appeng/api/util/IOrientableBlock.java | 4 +- build.gradle | 25 ++++++---- src/main/java/appeng/block/AEBaseBlock.java | 48 ++++++++++--------- .../java/appeng/block/AEBaseBlockItem.java | 16 +++---- .../block/AEBaseBlockItemChargeable.java | 8 ++-- .../java/appeng/block/AEBaseTileBlock.java | 38 +++++++-------- .../crafting/AbstractCraftingUnitBlock.java | 8 ++-- .../crafting/MolecularAssemblerBlock.java | 8 ++-- .../appeng/block/grindstone/CrankBlock.java | 28 +++++------ .../appeng/block/grindstone/GrinderBlock.java | 8 ++-- .../appeng/block/misc/CellWorkbenchBlock.java | 12 ++--- .../java/appeng/block/misc/ChargerBlock.java | 28 +++++------ .../appeng/block/misc/CondenserBlock.java | 12 ++--- .../appeng/block/misc/InscriberBlock.java | 12 ++--- .../appeng/block/misc/InterfaceBlock.java | 14 +++--- .../appeng/block/misc/LightDetectorBlock.java | 24 +++++----- .../appeng/block/misc/QuartzFixtureBlock.java | 20 ++++---- .../misc/QuartzGrowthAcceleratorBlock.java | 8 ++-- .../block/misc/SecurityStationBlock.java | 14 +++--- .../appeng/block/misc/SkyCompassBlock.java | 20 ++++---- .../java/appeng/block/misc/TinyTNTBlock.java | 20 ++++---- .../block/misc/VibrationChamberBlock.java | 14 +++--- .../block/networking/CableBusBlock.java | 40 ++++++++-------- .../block/networking/ControllerBlock.java | 4 +- .../block/networking/EnergyAcceptorBlock.java | 2 +- .../block/networking/EnergyCellBlock.java | 4 +- .../block/networking/WirelessBlock.java | 22 ++++----- .../block/paint/PaintSplotchesBakedModel.java | 2 +- .../block/paint/PaintSplotchesBlock.java | 18 +++---- .../appeng/block/qnb/QnbFormedBakedModel.java | 2 +- .../java/appeng/block/qnb/QnbFormedState.java | 2 +- .../appeng/block/qnb/QuantumBaseBlock.java | 12 ++--- .../block/qnb/QuantumLinkChamberBlock.java | 20 ++++---- .../appeng/block/qnb/QuantumRingBlock.java | 12 ++--- .../block/spatial/MatrixFrameBlock.java | 24 +++++----- .../block/spatial/SpatialIOPortBlock.java | 12 ++--- .../block/spatial/SpatialPylonBlock.java | 4 +- .../java/appeng/block/storage/ChestBlock.java | 12 ++--- .../java/appeng/block/storage/DriveBlock.java | 12 ++--- .../appeng/block/storage/IOPortBlock.java | 12 ++--- .../appeng/block/storage/SkyChestBlock.java | 24 +++++----- .../appeng/capabilities/Capabilities.java | 2 +- .../InterfaceTerminalScreen.java | 8 ++-- .../client/render/DelegateBakedModel.java | 2 +- .../client/render/DummyFluidBakedModel.java | 2 +- .../DummyFluidDispatcherBakedModel.java | 2 +- .../client/render/FacadeBakedItemModel.java | 2 +- .../client/render/FacingToRotation.java | 2 +- .../client/render/TesrRenderHelper.java | 2 +- .../client/render/cablebus/CableBuilder.java | 2 +- .../render/cablebus/CableBusBakedModel.java | 2 +- .../render/cablebus/CableBusRenderState.java | 2 +- .../client/render/cablebus/CubeBuilder.java | 2 +- .../render/cablebus/FacadeBlockAccess.java | 2 +- .../client/render/cablebus/FacadeBuilder.java | 4 +- .../P2PTunnelFrequencyBakedModel.java | 2 +- .../client/render/cablebus/QuadRotator.java | 2 +- .../crafting/CraftingCubeBakedModel.java | 2 +- .../render/crafting/CraftingMonitorTESR.java | 2 +- .../render/crafting/LightBakedModel.java | 2 +- .../render/crafting/MonitorBakedModel.java | 2 +- .../render/crafting/UnitBakedModel.java | 2 +- .../client/render/model/AEModelData.java | 2 +- .../render/model/AutoRotatingBakedModel.java | 2 +- .../render/model/AutoRotatingCacheKey.java | 2 +- .../render/model/BiometricCardBakedModel.java | 2 +- .../model/ColorApplicatorBakedModel.java | 2 +- .../client/render/model/DriveBakedModel.java | 2 +- .../client/render/model/DriveModelData.java | 2 +- .../client/render/model/GlassBakedModel.java | 6 +-- .../render/model/MatrixVertexTransformer.java | 2 +- .../render/model/MemoryCardBakedModel.java | 2 +- .../client/render/model/RenderHelper.java | 2 +- .../render/model/SkyCompassBakedModel.java | 2 +- .../client/render/model/UVLModelLoader.java | 2 +- .../spatial/SpatialPylonBakedModel.java | 2 +- .../client/render/tesr/InscriberTESR.java | 2 +- .../client/render/tesr/SkyCompassTESR.java | 2 +- .../appeng/container/ContainerLocator.java | 2 +- .../InterfaceTerminalContainer.java | 14 +++--- .../implementations/NetworkToolContainer.java | 6 +-- .../implementations/PatternTermContainer.java | 6 +-- .../implementations/QuartzKnifeContainer.java | 4 +- src/main/java/appeng/core/api/ApiPart.java | 6 +-- src/main/java/appeng/core/api/ApiStorage.java | 8 ++-- .../core/api/definitions/ApiBlocks.java | 14 +++--- .../appeng/core/features/BlockDefinition.java | 4 +- .../registries/P2PTunnelRegistry.java | 2 +- .../features/registries/WirelessRegistry.java | 4 +- .../packets/BlockTransitionEffectPacket.java | 4 +- .../appeng/core/sync/packets/ClickPacket.java | 2 +- .../sync/packets/CompressedNBTPacket.java | 6 +-- .../core/sync/packets/FluidSlotPacket.java | 8 ++-- .../core/sync/packets/JEIRecipePacket.java | 6 +-- .../sync/packets/PartPlacementPacket.java | 2 +- .../core/worlddata/IWorldSpawnData.java | 6 +-- .../appeng/core/worlddata/PlayerData.java | 6 +-- .../appeng/core/worlddata/StorageData.java | 14 +++--- .../java/appeng/crafting/CraftingJob.java | 4 +- .../java/appeng/crafting/CraftingLink.java | 8 ++-- .../java/appeng/debug/ChunkLoaderBlock.java | 2 +- .../java/appeng/debug/CubeGeneratorBlock.java | 8 ++-- .../appeng/debug/CubeGeneratorTileEntity.java | 2 +- src/main/java/appeng/debug/DebugCardItem.java | 12 ++--- .../appeng/debug/DebugPartPlacerItem.java | 18 +++---- .../appeng/debug/EnergyGeneratorBlock.java | 2 +- .../debug/EnergyGeneratorTileEntity.java | 2 +- src/main/java/appeng/debug/EraserItem.java | 10 ++-- src/main/java/appeng/debug/ItemGenBlock.java | 2 +- .../java/appeng/debug/ItemGenTileEntity.java | 2 +- .../appeng/debug/MeteoritePlacerItem.java | 24 +++++----- .../java/appeng/debug/PhantomNodeBlock.java | 8 ++-- .../appeng/debug/PhantomNodeTileEntity.java | 2 +- .../java/appeng/debug/ReplicatorCardItem.java | 20 ++++---- .../appeng/decorative/solid/GlassState.java | 2 +- .../decorative/solid/QuartzGlassBlock.java | 4 +- .../decorative/solid/QuartzPillarBlock.java | 6 +-- .../decorative/solid/SkyStoneBlock.java | 2 +- .../appeng/entity/ChargedQuartzEntity.java | 2 +- .../appeng/entity/GrowingCrystalEntity.java | 2 +- .../java/appeng/entity/SingularityEntity.java | 4 +- .../appeng/entity/TinyTNTPrimedEntity.java | 2 +- .../java/appeng/facade/FacadeContainer.java | 10 ++-- .../fluids/block/FluidInterfaceBlock.java | 12 ++--- .../fluids/helper/DualityFluidInterface.java | 8 ++-- .../fluids/helper/IFluidInterfaceHost.java | 2 +- .../appeng/fluids/items/FluidDummyItem.java | 6 +-- .../parts/FluidAnnihilationPlanePart.java | 6 +-- .../fluids/parts/FluidFormationPlanePart.java | 6 +-- .../fluids/parts/FluidInterfacePart.java | 8 ++-- .../fluids/parts/FluidLevelEmitterPart.java | 6 +-- .../fluids/parts/FluidStorageBusPart.java | 8 ++-- .../fluids/parts/SharedFluidBusPart.java | 10 ++-- .../fluids/tile/FluidInterfaceTileEntity.java | 8 ++-- .../appeng/fluids/util/AEFluidInventory.java | 18 +++---- .../java/appeng/fluids/util/AEFluidStack.java | 14 +++--- .../java/appeng/helpers/AEGlassMaterial.java | 2 +- .../java/appeng/helpers/DualityInterface.java | 12 ++--- .../java/appeng/helpers/IInterfaceHost.java | 2 +- .../appeng/helpers/InvalidPatternHelper.java | 8 ++-- .../java/appeng/helpers/LocationRotation.java | 8 ++-- .../java/appeng/helpers/MetaRotation.java | 10 ++-- .../appeng/helpers/MultiCraftingTracker.java | 10 ++-- .../java/appeng/helpers/NullRotation.java | 2 +- .../java/appeng/helpers/PatternHelper.java | 8 ++-- src/main/java/appeng/helpers/Splotch.java | 2 +- .../hooks/BlockToolDispenseItemBehavior.java | 2 +- src/main/java/appeng/hooks/IBlockTool.java | 6 +-- .../MatterCannonDispenseItemBehavior.java | 2 +- .../hooks/TinyTNTDispenseItemBehavior.java | 2 +- .../integration/abstraction/IAEFacade.java | 10 ++-- .../modules/jei/RecipeTransferHandler.java | 6 +-- .../theoneprobe/part/ChannelInfoProvider.java | 4 +- .../items/contents/PortableCellViewer.java | 4 +- .../appeng/items/materials/MaterialItem.java | 12 ++--- .../appeng/items/misc/CrystalSeedItem.java | 6 +-- .../appeng/items/misc/EncodedPatternItem.java | 10 ++-- .../java/appeng/items/parts/FacadeItem.java | 12 ++--- .../java/appeng/items/parts/PartItem.java | 6 +-- .../items/storage/AbstractStorageCell.java | 12 ++--- .../items/storage/SpatialStorageCellItem.java | 6 +-- .../appeng/items/tools/BiometricCardItem.java | 24 +++++----- .../appeng/items/tools/MemoryCardItem.java | 26 +++++----- .../appeng/items/tools/NetworkToolItem.java | 18 +++---- .../tools/powered/ColorApplicatorItem.java | 26 +++++----- .../tools/powered/EntropyManipulatorItem.java | 30 ++++++------ .../items/tools/powered/MatterCannonItem.java | 18 +++---- .../items/tools/powered/PortableCellItem.java | 6 +-- .../tools/powered/WirelessTerminalItem.java | 16 +++---- .../powered/powersink/AEBasePoweredItem.java | 14 +++--- .../powersink/PoweredItemCapabilities.java | 2 +- .../tools/quartz/QuartzCuttingKnifeItem.java | 10 ++-- .../items/tools/quartz/QuartzWrenchItem.java | 10 ++-- src/main/java/appeng/me/GridNode.java | 12 ++--- src/main/java/appeng/me/GridStorage.java | 12 ++--- .../implementations/CraftingCPUCluster.java | 22 ++++----- .../implementations/QuantumCalculator.java | 4 +- .../appeng/me/helpers/AENetworkProxy.java | 10 ++-- .../me/storage/AbstractCellInventory.java | 10 ++-- .../appeng/me/storage/BasicCellInventory.java | 4 +- .../me/storage/BasicCellInventoryHandler.java | 4 +- src/main/java/appeng/parts/AEBasePart.java | 22 ++++----- .../java/appeng/parts/BusCollisionHelper.java | 2 +- .../java/appeng/parts/CableBusContainer.java | 24 +++++----- .../java/appeng/parts/ICableBusContainer.java | 6 +-- .../appeng/parts/NullCableBusContainer.java | 6 +-- src/main/java/appeng/parts/PartPlacement.java | 48 +++++++++---------- .../AbstractFormationPlanePart.java | 12 ++--- .../automation/AnnihilationPlanePart.java | 8 ++-- .../parts/automation/ExportBusPart.java | 6 +-- .../parts/automation/FormationPlanePart.java | 16 +++---- .../parts/automation/LevelEmitterPart.java | 6 +-- .../parts/automation/PlaneBakedModel.java | 2 +- .../parts/automation/SharedItemBusPart.java | 8 ++-- .../parts/automation/UpgradeInventory.java | 4 +- .../parts/automation/UpgradeablePart.java | 4 +- .../appeng/parts/misc/CableAnchorPart.java | 10 ++-- .../java/appeng/parts/misc/InterfacePart.java | 8 ++-- .../parts/misc/SharedStorageBusPart.java | 10 ++-- .../appeng/parts/misc/StorageBusPart.java | 12 ++--- .../java/appeng/parts/misc/ToggleBusPart.java | 10 ++-- .../appeng/parts/networking/CablePart.java | 6 +-- .../parts/networking/QuartzFiberPart.java | 6 +-- .../appeng/parts/p2p/FluidP2PTunnelPart.java | 4 +- .../appeng/parts/p2p/ItemP2PTunnelPart.java | 6 +-- .../appeng/parts/p2p/LightP2PTunnelPart.java | 10 ++-- .../appeng/parts/p2p/MEP2PTunnelPart.java | 6 +-- .../java/appeng/parts/p2p/P2PTunnelPart.java | 10 ++-- .../parts/p2p/RedstoneP2PTunnelPart.java | 12 ++--- .../parts/reporting/AbstractMonitorPart.java | 12 ++--- .../reporting/AbstractReportingPart.java | 10 ++-- .../parts/reporting/AbstractTerminalPart.java | 6 +-- .../parts/reporting/CraftingTerminalPart.java | 6 +-- .../parts/reporting/PatternTerminalPart.java | 6 +-- src/main/java/appeng/server/AECommand.java | 12 ++--- src/main/java/appeng/server/ISubCommand.java | 6 +-- src/main/java/appeng/server/ServerHelper.java | 4 +- .../server/subcommands/ChunkLogger.java | 4 +- .../appeng/server/subcommands/Supporters.java | 4 +- .../subcommands/TestMeteoritesCommand.java | 12 ++--- .../server/subcommands/TestOreGenCommand.java | 8 ++-- .../services/compass/CompassRegion.java | 6 +-- .../codechicken/lib/model/Quad.java | 2 +- .../lib/model/pipeline/BakedPipeline.java | 2 +- .../lib/model/pipeline/QuadTransformer.java | 2 +- .../transformers/QuadCornerKicker.java | 8 ++-- .../transformers/QuadFaceStripper.java | 4 +- .../transformers/QuadMatrixTransformer.java | 2 +- .../java/appeng/tile/AEBaseInvTileEntity.java | 16 +++---- .../java/appeng/tile/AEBaseTileEntity.java | 28 +++++------ .../tile/crafting/CraftingCubeModelData.java | 2 +- .../crafting/CraftingMonitorModelData.java | 2 +- .../crafting/CraftingMonitorTileEntity.java | 8 ++-- .../tile/crafting/CraftingTileEntity.java | 18 +++---- .../MolecularAssemblerTileEntity.java | 10 ++-- .../tile/grid/AENetworkInvTileEntity.java | 6 +-- .../tile/grid/AENetworkPowerTileEntity.java | 6 +-- .../appeng/tile/grid/AENetworkTileEntity.java | 6 +-- .../tile/grindstone/CrankTileEntity.java | 2 +- .../tile/grindstone/GrinderTileEntity.java | 2 +- .../inventory/AppEngInternalAEInventory.java | 18 +++---- .../inventory/AppEngInternalInventory.java | 10 ++-- .../tile/misc/CellWorkbenchTileEntity.java | 6 +-- .../appeng/tile/misc/ChargerTileEntity.java | 2 +- .../appeng/tile/misc/CondenserTileEntity.java | 8 ++-- .../appeng/tile/misc/InscriberRecipes.java | 6 +-- .../appeng/tile/misc/InscriberTileEntity.java | 8 ++-- .../appeng/tile/misc/InterfaceTileEntity.java | 8 ++-- .../tile/misc/PaintSplotchesTileEntity.java | 8 ++-- .../QuartzGrowthAcceleratorTileEntity.java | 2 +- .../tile/misc/SecurityStationTileEntity.java | 18 +++---- .../tile/misc/VibrationChamberTileEntity.java | 8 ++-- .../appeng/tile/networking/CableBusTESR.java | 2 +- .../tile/networking/CableBusTileEntity.java | 8 ++-- .../tile/networking/ControllerTileEntity.java | 2 +- .../tile/networking/EnergyCellTileEntity.java | 12 ++--- .../tile/networking/WirelessTileEntity.java | 2 +- .../powersink/AEBasePoweredTileEntity.java | 8 ++-- .../tile/qnb/QuantumBridgeTileEntity.java | 6 +-- .../tile/spatial/SpatialIOPortTileEntity.java | 8 ++-- .../tile/spatial/SpatialPylonTileEntity.java | 2 +- .../appeng/tile/storage/ChestTileEntity.java | 8 ++-- .../appeng/tile/storage/DriveTileEntity.java | 6 +-- .../appeng/tile/storage/IOPortTileEntity.java | 8 ++-- src/main/java/appeng/util/ConfigManager.java | 6 +-- .../java/appeng/util/InventoryAdaptor.java | 2 +- src/main/java/appeng/util/Platform.java | 2 +- .../util/helpers/ItemComparisonHelper.java | 4 +- .../java/appeng/util/item/AEItemStack.java | 8 ++-- .../appeng/util/item/AESharedItemStack.java | 8 ++-- .../worldgen/meteorite/MeteoritePlacer.java | 2 +- .../meteorite/MeteoriteSpawnData.java | 30 ++++++------ .../meteorite/MeteoriteStructurePiece.java | 6 +-- .../meteorite/PlacedMeteoriteSettings.java | 6 +-- .../meteorite/debug/MeteoriteSpawner.java | 2 +- .../java/team/chisel/ctm/api/IFacade.java | 10 ++-- 303 files changed, 1216 insertions(+), 1210 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index 18b811c78..191cebea9 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -1,2 +1 @@ - archivesBaseName = artifact_basename + '-api' diff --git a/api/src/main/java/appeng/api/definitions/IBlockDefinition.java b/api/src/main/java/appeng/api/definitions/IBlockDefinition.java index 5d37e4bc6..cf225cef3 100644 --- a/api/src/main/java/appeng/api/definitions/IBlockDefinition.java +++ b/api/src/main/java/appeng/api/definitions/IBlockDefinition.java @@ -23,7 +23,7 @@ import java.util.Optional; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; public interface IBlockDefinition extends IItemDefinition { /** @@ -52,5 +52,5 @@ public interface IBlockDefinition extends IItemDefinition { * * @return if the block is placed in the world at the specific location. */ - boolean isSameAs(IBlockReader world, BlockPos pos); + boolean isSameAs(BlockView world, BlockPos pos); } diff --git a/api/src/main/java/appeng/api/features/IWirelessTermRegistry.java b/api/src/main/java/appeng/api/features/IWirelessTermRegistry.java index b0e8655dd..10f3fba1d 100644 --- a/api/src/main/java/appeng/api/features/IWirelessTermRegistry.java +++ b/api/src/main/java/appeng/api/features/IWirelessTermRegistry.java @@ -26,7 +26,7 @@ package appeng.api.features; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; /** * Registration record for a Custom Cell handler. @@ -58,5 +58,5 @@ public interface IWirelessTermRegistry { * opens the wireless terminal gui, the wireless terminal item, must be in the * active slot on the tool bar. */ - void openWirelessTerminalGui(ItemStack item, IBlockReader world, PlayerEntity player, Hand hand); + void openWirelessTerminalGui(ItemStack item, BlockView world, PlayerEntity player, Hand hand); } diff --git a/api/src/main/java/appeng/api/implementations/items/IGrowableCrystal.java b/api/src/main/java/appeng/api/implementations/items/IGrowableCrystal.java index a76c2b0e7..79964c18a 100644 --- a/api/src/main/java/appeng/api/implementations/items/IGrowableCrystal.java +++ b/api/src/main/java/appeng/api/implementations/items/IGrowableCrystal.java @@ -24,7 +24,7 @@ package appeng.api.implementations.items; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.item.ItemStack; public interface IGrowableCrystal { diff --git a/api/src/main/java/appeng/api/implementations/items/IMemoryCard.java b/api/src/main/java/appeng/api/implementations/items/IMemoryCard.java index 0de3bbcf0..51cd903a4 100644 --- a/api/src/main/java/appeng/api/implementations/items/IMemoryCard.java +++ b/api/src/main/java/appeng/api/implementations/items/IMemoryCard.java @@ -25,7 +25,7 @@ package appeng.api.implementations.items; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import appeng.api.util.AEColor; @@ -53,7 +53,7 @@ public interface IMemoryCard { * @param data the NBT tag, refer to the normal comment for special * keys. */ - void setMemoryCardContents(ItemStack is, String settingsName, CompoundNBT data); + void setMemoryCardContents(ItemStack is, String settingsName, CompoundTag data); /** * returns the settings name provided by a previous call to @@ -72,7 +72,7 @@ public interface IMemoryCard { * @return the NBT Data previously saved by setMemoryCardContents, or an empty * NBTCompound */ - CompoundNBT getData(ItemStack is); + CompoundTag getData(ItemStack is); /** * This represent as 4x2 grid of {@link AEColor} without transparent/fluix diff --git a/api/src/main/java/appeng/api/implementations/parts/ICablePart.java b/api/src/main/java/appeng/api/implementations/parts/ICablePart.java index 28c183af7..ec5c70d8d 100644 --- a/api/src/main/java/appeng/api/implementations/parts/ICablePart.java +++ b/api/src/main/java/appeng/api/implementations/parts/ICablePart.java @@ -26,7 +26,7 @@ package appeng.api.implementations.parts; import java.util.EnumSet; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.networking.IGridHost; import appeng.api.parts.BusSupport; diff --git a/api/src/main/java/appeng/api/implementations/tiles/IColorableTile.java b/api/src/main/java/appeng/api/implementations/tiles/IColorableTile.java index e55314bc0..11fc955e4 100644 --- a/api/src/main/java/appeng/api/implementations/tiles/IColorableTile.java +++ b/api/src/main/java/appeng/api/implementations/tiles/IColorableTile.java @@ -24,7 +24,7 @@ package appeng.api.implementations.tiles; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.util.AEColor; diff --git a/api/src/main/java/appeng/api/implementations/tiles/ICraftingMachine.java b/api/src/main/java/appeng/api/implementations/tiles/ICraftingMachine.java index adbaa75d6..881b9db02 100644 --- a/api/src/main/java/appeng/api/implementations/tiles/ICraftingMachine.java +++ b/api/src/main/java/appeng/api/implementations/tiles/ICraftingMachine.java @@ -24,7 +24,7 @@ package appeng.api.implementations.tiles; import net.minecraft.inventory.CraftingInventory; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.networking.crafting.ICraftingPatternDetails; diff --git a/api/src/main/java/appeng/api/implementations/tiles/ICrankable.java b/api/src/main/java/appeng/api/implementations/tiles/ICrankable.java index 85e76463c..a9b20b151 100644 --- a/api/src/main/java/appeng/api/implementations/tiles/ICrankable.java +++ b/api/src/main/java/appeng/api/implementations/tiles/ICrankable.java @@ -23,7 +23,7 @@ package appeng.api.implementations.tiles; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; /** * Crank/Crankable API, diff --git a/api/src/main/java/appeng/api/networking/IGridBlock.java b/api/src/main/java/appeng/api/networking/IGridBlock.java index 28b5ae88f..5b7c026cf 100644 --- a/api/src/main/java/appeng/api/networking/IGridBlock.java +++ b/api/src/main/java/appeng/api/networking/IGridBlock.java @@ -29,7 +29,7 @@ import javax.annotation.Nonnegative; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.parts.IPart; import appeng.api.util.AEColor; diff --git a/api/src/main/java/appeng/api/networking/IGridNode.java b/api/src/main/java/appeng/api/networking/IGridNode.java index fb6b19032..6604880a1 100644 --- a/api/src/main/java/appeng/api/networking/IGridNode.java +++ b/api/src/main/java/appeng/api/networking/IGridNode.java @@ -27,7 +27,7 @@ import java.util.EnumSet; import javax.annotation.Nonnull; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.world.IWorld; import appeng.api.IAppEngApi; @@ -130,7 +130,7 @@ public interface IGridNode { * @param name nbt name * @param nodeData to be loaded data */ - void loadFromNBT(@Nonnull String name, @Nonnull CompoundNBT nodeData); + void loadFromNBT(@Nonnull String name, @Nonnull CompoundTag nodeData); /** * this should be called for each node you maintain, you can save all your nodes @@ -140,7 +140,7 @@ public interface IGridNode { * @param name nbt name * @param nodeData to be saved data */ - void saveToNBT(@Nonnull String name, @Nonnull CompoundNBT nodeData); + void saveToNBT(@Nonnull String name, @Nonnull CompoundTag nodeData); /** * @return if the node's channel requirements are currently met, use this for diff --git a/api/src/main/java/appeng/api/networking/IGridStorage.java b/api/src/main/java/appeng/api/networking/IGridStorage.java index 3f1b08a37..d31ee5b6e 100644 --- a/api/src/main/java/appeng/api/networking/IGridStorage.java +++ b/api/src/main/java/appeng/api/networking/IGridStorage.java @@ -25,15 +25,15 @@ package appeng.api.networking; import javax.annotation.Nonnull; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; public interface IGridStorage { /** - * @return an CompoundNBT that can be read, and written too. + * @return an CompoundTag that can be read, and written too. */ @Nonnull - CompoundNBT dataObject(); + CompoundTag dataObject(); /** * @return the id for this grid storage object, used internally diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingLink.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingLink.java index 4a6a21c9b..4d420f3b7 100644 --- a/api/src/main/java/appeng/api/networking/crafting/ICraftingLink.java +++ b/api/src/main/java/appeng/api/networking/crafting/ICraftingLink.java @@ -23,7 +23,7 @@ package appeng.api.networking.crafting; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; public interface ICraftingLink { @@ -53,7 +53,7 @@ public interface ICraftingLink { * * @param tag to be written data */ - void writeToNBT(CompoundNBT tag); + void writeToNBT(CompoundTag tag); /** * @return the crafting ID for this link. diff --git a/api/src/main/java/appeng/api/parts/IFacadeContainer.java b/api/src/main/java/appeng/api/parts/IFacadeContainer.java index b5576b70e..1615b5cc2 100644 --- a/api/src/main/java/appeng/api/parts/IFacadeContainer.java +++ b/api/src/main/java/appeng/api/parts/IFacadeContainer.java @@ -25,7 +25,7 @@ package appeng.api.parts; import java.io.IOException; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import appeng.api.util.AEPartLocation; @@ -64,7 +64,7 @@ public interface IFacadeContainer { * * @param data to be written data */ - void writeToNBT(CompoundNBT data); + void writeToNBT(CompoundTag data); /** * read from stream @@ -82,7 +82,7 @@ public interface IFacadeContainer { * * @param data to be read data */ - void readFromNBT(CompoundNBT data); + void readFromNBT(CompoundTag data); /** * write to stream diff --git a/api/src/main/java/appeng/api/parts/IPart.java b/api/src/main/java/appeng/api/parts/IPart.java index 05db17b45..4c8d0cb3a 100644 --- a/api/src/main/java/appeng/api/parts/IPart.java +++ b/api/src/main/java/appeng/api/parts/IPart.java @@ -36,13 +36,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -110,14 +110,14 @@ public interface IPart extends ICustomCableConnection { * * @param data to be written nbt data */ - void writeToNBT(CompoundNBT data); + void writeToNBT(CompoundTag data); /** * Read the previously written NBT Data. this is the mirror for writeToNBT * * @param data to be read nbt data */ - void readFromNBT(CompoundNBT data); + void readFromNBT(CompoundTag data); /** * @return get the amount of light produced by the bus @@ -136,7 +136,7 @@ public interface IPart extends ICustomCableConnection { /** * a block around the bus's host has been changed. */ - void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor); + void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor); /** * @return output redstone on facing side @@ -345,7 +345,7 @@ public interface IPart extends ICustomCableConnection { * capabilities on the cable bus will be forwarded to parts on the appropriate * side. * - * @see TileEntity#getCapability(Capability, net.minecraft.util.Direction) + * @see TileEntity#getCapability(Capability, net.minecraft.util.math.Direction) * * @return The capability or null. */ diff --git a/api/src/main/java/appeng/api/parts/IPartCollisionHelper.java b/api/src/main/java/appeng/api/parts/IPartCollisionHelper.java index d85a82260..477000866 100644 --- a/api/src/main/java/appeng/api/parts/IPartCollisionHelper.java +++ b/api/src/main/java/appeng/api/parts/IPartCollisionHelper.java @@ -23,7 +23,7 @@ package appeng.api.parts; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; public interface IPartCollisionHelper { diff --git a/api/src/main/java/appeng/api/parts/IPartHelper.java b/api/src/main/java/appeng/api/parts/IPartHelper.java index 82ee0eb5b..a17f202fc 100644 --- a/api/src/main/java/appeng/api/parts/IPartHelper.java +++ b/api/src/main/java/appeng/api/parts/IPartHelper.java @@ -25,8 +25,8 @@ package appeng.api.parts; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -44,7 +44,7 @@ public interface IPartHelper { * @return true if placing was successful */ // TODO, this should probably take ItemStack + ItemUseContext - ActionResultType placeBus(ItemStack is, BlockPos pos, Direction side, PlayerEntity player, Hand hand, World world); + ActionResult placeBus(ItemStack is, BlockPos pos, Direction side, PlayerEntity player, Hand hand, World world); /** * @return the render mode diff --git a/api/src/main/java/appeng/api/parts/IPartHost.java b/api/src/main/java/appeng/api/parts/IPartHost.java index 4291e047a..94175fc78 100644 --- a/api/src/main/java/appeng/api/parts/IPartHost.java +++ b/api/src/main/java/appeng/api/parts/IPartHost.java @@ -28,7 +28,7 @@ import java.util.Set; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; diff --git a/api/src/main/java/appeng/api/parts/IPartItem.java b/api/src/main/java/appeng/api/parts/IPartItem.java index 890a3ccd7..773ba9f19 100644 --- a/api/src/main/java/appeng/api/parts/IPartItem.java +++ b/api/src/main/java/appeng/api/parts/IPartItem.java @@ -40,7 +40,7 @@ import net.minecraft.item.ItemStack; * * * {@literal @}Override - * public default ActionResultType onItemUse(ItemStack is, PlayerEntity player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) + * public default ActionResult onItemUse(ItemStack is, PlayerEntity player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) * { * return Api.INSTANCE.partHelper().placeBus( is, pos, side, player, hand, world ); * } diff --git a/api/src/main/java/appeng/api/parts/LayerBase.java b/api/src/main/java/appeng/api/parts/LayerBase.java index 1dcd4c278..13655caeb 100644 --- a/api/src/main/java/appeng/api/parts/LayerBase.java +++ b/api/src/main/java/appeng/api/parts/LayerBase.java @@ -27,7 +27,7 @@ import java.util.Set; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.util.AEPartLocation; diff --git a/api/src/main/java/appeng/api/recipes/ResolverResult.java b/api/src/main/java/appeng/api/recipes/ResolverResult.java index e02c33ed7..c26cfac7c 100644 --- a/api/src/main/java/appeng/api/recipes/ResolverResult.java +++ b/api/src/main/java/appeng/api/recipes/ResolverResult.java @@ -23,13 +23,13 @@ package appeng.api.recipes; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; public class ResolverResult { public final String itemName; public final int damageValue; - public final CompoundNBT compound; + public final CompoundTag compound; public ResolverResult(final String name, final int damage) { this.itemName = name; @@ -37,7 +37,7 @@ public class ResolverResult { this.compound = null; } - public ResolverResult(final String name, final int damage, final CompoundNBT data) { + public ResolverResult(final String name, final int damage, final CompoundTag data) { this.itemName = name; this.damageValue = damage; this.compound = data; diff --git a/api/src/main/java/appeng/api/storage/IStorageChannel.java b/api/src/main/java/appeng/api/storage/IStorageChannel.java index a400fdc7a..f2cd9e486 100644 --- a/api/src/main/java/appeng/api/storage/IStorageChannel.java +++ b/api/src/main/java/appeng/api/storage/IStorageChannel.java @@ -29,7 +29,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fluids.FluidStack; @@ -101,5 +101,5 @@ public interface IStorageChannel> { * @return */ @Nullable - T createFromNBT(@Nonnull CompoundNBT nbt); + T createFromNBT(@Nonnull CompoundTag nbt); } diff --git a/api/src/main/java/appeng/api/storage/IStorageHelper.java b/api/src/main/java/appeng/api/storage/IStorageHelper.java index 642a32eda..83c30204d 100644 --- a/api/src/main/java/appeng/api/storage/IStorageHelper.java +++ b/api/src/main/java/appeng/api/storage/IStorageHelper.java @@ -28,7 +28,7 @@ import java.util.Collection; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import appeng.api.config.Actionable; import appeng.api.networking.crafting.ICraftingLink; @@ -97,7 +97,7 @@ public interface IStorageHelper { * * @return crafting link */ - ICraftingLink loadCraftingLink(CompoundNBT data, ICraftingRequester req); + ICraftingLink loadCraftingLink(CompoundTag data, ICraftingRequester req); /** * Extracts items from a {@link IMEInventory} respecting power requirements. @@ -117,7 +117,7 @@ public interface IStorageHelper { * * @param energy Energy source. * @param inv Inventory to insert into. - * @param request Items to insert. + * @param input Items to insert. * @param src Action source. * @param mode Simulate or modulate * @return items not inserted or {@code null} if everything was inserted. diff --git a/api/src/main/java/appeng/api/storage/data/IAEStack.java b/api/src/main/java/appeng/api/storage/data/IAEStack.java index 345405e2a..453c702da 100644 --- a/api/src/main/java/appeng/api/storage/data/IAEStack.java +++ b/api/src/main/java/appeng/api/storage/data/IAEStack.java @@ -26,7 +26,7 @@ package appeng.api.storage.data; import java.io.IOException; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import appeng.api.config.FuzzyMode; @@ -122,11 +122,11 @@ public interface IAEStack> { void decCountRequestable(long i); /** - * write to a CompoundNBT. + * write to a CompoundTag. * * @param i to be written data */ - void writeToNBT(CompoundNBT i); + void writeToNBT(CompoundTag i); /** * Compare stacks using precise logic. diff --git a/api/src/main/java/appeng/api/util/AEPartLocation.java b/api/src/main/java/appeng/api/util/AEPartLocation.java index 7fe61eb72..10f0b756c 100644 --- a/api/src/main/java/appeng/api/util/AEPartLocation.java +++ b/api/src/main/java/appeng/api/util/AEPartLocation.java @@ -18,7 +18,7 @@ package appeng.api.util; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; /** * Stand in for previous Forge Direction, Several uses of this class are simply diff --git a/api/src/main/java/appeng/api/util/IConfigManager.java b/api/src/main/java/appeng/api/util/IConfigManager.java index 2bffe50df..7754b53ba 100644 --- a/api/src/main/java/appeng/api/util/IConfigManager.java +++ b/api/src/main/java/appeng/api/util/IConfigManager.java @@ -25,7 +25,7 @@ package appeng.api.util; import java.util.Set; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import appeng.api.config.Settings; @@ -76,12 +76,12 @@ public interface IConfigManager { * * @param destination to be written nbt tag */ - void writeToNBT(CompoundNBT destination); + void writeToNBT(CompoundTag destination); /** * Only works after settings have been registered * * @param src to be read nbt tag */ - void readFromNBT(CompoundNBT src); + void readFromNBT(CompoundTag src); } diff --git a/api/src/main/java/appeng/api/util/IOrientable.java b/api/src/main/java/appeng/api/util/IOrientable.java index e9280d0eb..a49c5d522 100644 --- a/api/src/main/java/appeng/api/util/IOrientable.java +++ b/api/src/main/java/appeng/api/util/IOrientable.java @@ -23,7 +23,7 @@ package appeng.api.util; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; /** * Nearly all of AE's Tile Entities implement IOrientable. diff --git a/api/src/main/java/appeng/api/util/IOrientableBlock.java b/api/src/main/java/appeng/api/util/IOrientableBlock.java index 3d68b062b..365b93cf9 100644 --- a/api/src/main/java/appeng/api/util/IOrientableBlock.java +++ b/api/src/main/java/appeng/api/util/IOrientableBlock.java @@ -24,7 +24,7 @@ package appeng.api.util; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; /** * Implemented on many of AE's non Tile Entity Blocks as a way to get a @@ -38,5 +38,5 @@ public interface IOrientableBlock { * * @return a IOrientable if applicable */ - IOrientable getOrientable(IBlockReader world, BlockPos pos); + IOrientable getOrientable(BlockView world, BlockPos pos); } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0f4a276f0..0e52b9fad 100644 --- a/build.gradle +++ b/build.gradle @@ -17,12 +17,16 @@ */ plugins { - id 'fabric-loom' apply false + id 'java' + id 'fabric-loom' id 'maven-publish' id "org.jetbrains.kotlin.jvm" apply false } allprojects { + + apply plugin: 'fabric-loom' + // Maven group and artifact name group = artifact_group @@ -48,15 +52,6 @@ allprojects { repositories { maven { url = "http://maven.fabricmc.net/" } } -} - -subprojects { - - apply plugin: 'fabric-loom' - apply plugin: 'kotlin-platform-jvm' - - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 minecraft { } @@ -70,7 +65,17 @@ subprojects { modImplementation "net.fabricmc.fabric-api:fabric-api:0.14.0+build.371-1.16" modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" + + compile 'com.google.code.findbugs:jsr305:3.0.2' } +} + +subprojects { + + apply plugin: 'kotlin-platform-jvm' + + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 processResources { inputs.property "version", project.version diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index b9a7993ab..6ed9ca97f 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -20,21 +20,23 @@ package appeng.block; import javax.annotation.Nullable; +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialColor; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.world.IBlockReader; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraftforge.common.ToolType; @@ -50,7 +52,7 @@ public abstract class AEBaseBlock extends Block { private boolean isFullSize = true; private boolean isInventory = false; - protected AEBaseBlock(final Block.Properties props) { + protected AEBaseBlock(final Settings props) { super(props); } @@ -58,7 +60,7 @@ public abstract class AEBaseBlock extends Block { * Utility function to create block properties with some sensible defaults for * AE blocks. */ - public static Block.Properties defaultProps(Material material) { + public static Settings defaultProps(Material material) { return defaultProps(material, material.getColor()); } @@ -66,37 +68,37 @@ public abstract class AEBaseBlock extends Block { * Utility function to create block properties with some sensible defaults for * AE blocks. */ - public static Block.Properties defaultProps(Material material, MaterialColor color) { - return Block.Properties.create(material, color) + public static Settings defaultProps(Material material, MaterialColor color) { + return Settings.create(material, color) // These values previousls were encoded in AEBaseBlock .hardnessAndResistance(2.2f, 11.f).harvestTool(ToolType.PICKAXE).harvestLevel(0) .sound(getDefaultSoundByMaterial(material)); } - private static SoundType getDefaultSoundByMaterial(Material mat) { + private static BlockSoundGroup getDefaultSoundByMaterial(Material mat) { if (mat == AEGlassMaterial.INSTANCE || mat == Material.GLASS) { - return SoundType.GLASS; + return BlockSoundGroup.GLASS; } else if (mat == Material.ROCK) { - return SoundType.STONE; + return BlockSoundGroup.STONE; } else if (mat == Material.WOOD) { - return SoundType.WOOD; + return BlockSoundGroup.WOOD; } else { - return SoundType.METAL; + return BlockSoundGroup.METAL; } } @Override - public boolean isNormalCube(BlockState state, IBlockReader worldIn, BlockPos pos) { + public boolean isNormalCube(BlockState state, BlockView worldIn, BlockPos pos) { return this.isFullSize() && this.isOpaque(); } @Override - public boolean hasComparatorInputOverride(BlockState state) { + public boolean hasComparatorOutput(BlockState state) { return this.isInventory(); } @Override - public int getComparatorInputOverride(BlockState state, final World worldIn, final BlockPos pos) { + public int getComparatorOutput(BlockState state, final World worldIn, final BlockPos pos) { return 0; } @@ -129,9 +131,9 @@ public abstract class AEBaseBlock extends Block { return false; } - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - return ActionResultType.PASS; + return ActionResult.PASS; } public final Direction mapRotation(final IOrientable ori, final Direction dir) { @@ -206,7 +208,7 @@ public abstract class AEBaseBlock extends Block { } - protected IOrientable getOrientable(final IBlockReader w, final BlockPos pos) { + protected IOrientable getOrientable(final BlockView w, final BlockPos pos) { if (this instanceof IOrientableBlock) { IOrientableBlock orientable = (IOrientableBlock) this; return orientable.getOrientable(w, pos); diff --git a/src/main/java/appeng/block/AEBaseBlockItem.java b/src/main/java/appeng/block/AEBaseBlockItem.java index 93d124b3a..a527b2c6b 100644 --- a/src/main/java/appeng/block/AEBaseBlockItem.java +++ b/src/main/java/appeng/block/AEBaseBlockItem.java @@ -27,8 +27,8 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -75,7 +75,7 @@ public class AEBaseBlockItem extends BlockItem { } @Override - public ActionResultType tryPlace(BlockItemUseContext context) { + public ActionResult tryPlace(BlockItemUseContext context) { Direction up = null; Direction forward = null; @@ -125,11 +125,11 @@ public class AEBaseBlockItem extends BlockItem { } if (!this.blockType.isValidOrientation(context.getWorld(), context.getPos(), forward, up)) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } - ActionResultType result = super.tryPlace(context); - if (result != ActionResultType.SUCCESS) { + ActionResult result = super.tryPlace(context); + if (result != ActionResult.SUCCESS) { return result; } @@ -139,7 +139,7 @@ public class AEBaseBlockItem extends BlockItem { ori = tile; if (tile == null) { - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } if (ori.canBeRotated() && !this.blockType.hasCustomRotation()) { @@ -155,7 +155,7 @@ public class AEBaseBlockItem extends BlockItem { ori.setOrientation(forward, up); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } diff --git a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java index 010fca5cb..0410a6b74 100644 --- a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java +++ b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java @@ -24,7 +24,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; @@ -61,7 +61,7 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte final double internalMaxPower = this.getMaxEnergyCapacity(); if (internalMaxPower > 0) { - final CompoundNBT tag = stack.getTag(); + final CompoundTag tag = stack.getTag(); if (tag != null) { internalCurrentPower = tag.getDouble("internalCurrentPower"); } @@ -135,12 +135,12 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte } private double getInternal(final ItemStack is) { - final CompoundNBT nbt = is.getOrCreateTag(); + final CompoundTag nbt = is.getOrCreateTag(); return nbt.getDouble("internalCurrentPower"); } private void setInternal(final ItemStack is, final double amt) { - final CompoundNBT nbt = is.getOrCreateTag(); + final CompoundTag nbt = is.getOrCreateTag(); nbt.putDouble("internalCurrentPower", amt); } diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index da13512ff..da3d36137 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -33,16 +33,16 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraftforge.items.ItemHandlerHelper; @@ -67,7 +67,7 @@ public abstract class AEBaseTileBlock extends AEBase @Nonnull private Supplier tileEntityFactory; - public AEBaseTileBlock(final Block.Properties props) { + public AEBaseTileBlock(final Settings props) { super(props); } @@ -92,12 +92,12 @@ public abstract class AEBaseTileBlock extends AEBase } @Nullable - public T getTileEntity(final IBlockReader w, final int x, final int y, final int z) { + public T getTileEntity(final BlockView w, final int x, final int y, final int z) { return this.getTileEntity(w, new BlockPos(x, y, z)); } @Nullable - public T getTileEntity(final IBlockReader w, final BlockPos pos) { + public T getTileEntity(final BlockView w, final BlockPos pos) { if (!this.hasBlockTileEntity()) { return null; } @@ -112,7 +112,7 @@ public abstract class AEBaseTileBlock extends AEBase } @Override - public final TileEntity createTileEntity(BlockState state, IBlockReader world) { + public final TileEntity createTileEntity(BlockState state, BlockView world) { return this.tileEntityFactory.get(); } @@ -165,7 +165,7 @@ public abstract class AEBaseTileBlock extends AEBase } @Override - public int getComparatorInputOverride(BlockState state, final World w, final BlockPos pos) { + public int getComparatorOutput(BlockState state, final World w, final BlockPos pos) { final TileEntity te = this.getTileEntity(w, pos); if (te instanceof AEBaseInvTileEntity) { AEBaseInvTileEntity invTile = (AEBaseInvTileEntity) te; @@ -202,7 +202,7 @@ public abstract class AEBaseTileBlock extends AEBase } @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, + public ActionResult onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ItemStack heldItem; if (player != null && !player.getHeldItem(hand).isEmpty()) { @@ -215,11 +215,11 @@ public abstract class AEBaseTileBlock extends AEBase final AEBaseTileEntity tile = this.getTileEntity(world, pos); if (tile == null) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } if (tile instanceof CableBusTileEntity || tile instanceof SkyChestTileEntity) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } final ItemStack[] itemDropCandidates = Platform.getBlockDrops(world, pos); @@ -227,7 +227,7 @@ public abstract class AEBaseTileBlock extends AEBase for (final ItemStack ol : itemDropCandidates) { if (Platform.itemComparisons().isEqualItemType(ol, op)) { - final CompoundNBT tag = tile.downloadSettings(SettingsFrom.DISMANTLE_ITEM); + final CompoundTag tag = tile.downloadSettings(SettingsFrom.DISMANTLE_ITEM); if (tag != null) { ol.setTag(tag); } @@ -240,7 +240,7 @@ public abstract class AEBaseTileBlock extends AEBase world.removeBlock(pos, false); } - return ActionResultType.FAIL; + return ActionResult.FAIL; } if (heldItem.getItem() instanceof IMemoryCard && !(this instanceof CableBusBlock)) { @@ -248,20 +248,20 @@ public abstract class AEBaseTileBlock extends AEBase final AEBaseTileEntity tileEntity = this.getTileEntity(world, pos); if (tileEntity == null) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } final String name = this.getTranslationKey(); if (player.isCrouching()) { - final CompoundNBT data = tileEntity.downloadSettings(SettingsFrom.MEMORY_CARD); + final CompoundTag data = tileEntity.downloadSettings(SettingsFrom.MEMORY_CARD); if (data != null) { memoryCard.setMemoryCardContents(heldItem, name, data); memoryCard.notifyUser(player, MemoryCardMessages.SETTINGS_SAVED); } } else { final String savedName = memoryCard.getSettingsName(heldItem); - final CompoundNBT data = memoryCard.getData(heldItem); + final CompoundTag data = memoryCard.getData(heldItem); if (this.getTranslationKey().equals(savedName)) { tileEntity.uploadSettings(SettingsFrom.MEMORY_CARD, data); @@ -271,7 +271,7 @@ public abstract class AEBaseTileBlock extends AEBase } } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } @@ -279,7 +279,7 @@ public abstract class AEBaseTileBlock extends AEBase } @Override - public IOrientable getOrientable(final IBlockReader w, final BlockPos pos) { + public IOrientable getOrientable(final BlockView w, final BlockPos pos) { return this.getTileEntity(w, pos); } diff --git a/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java b/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java index dec8ba807..3b2a8aa60 100644 --- a/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java +++ b/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java @@ -23,7 +23,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -41,7 +41,7 @@ public abstract class AbstractCraftingUnitBlock ex public final CraftingUnitType type; - public AbstractCraftingUnitBlock(Block.Properties props, final CraftingUnitType type) { + public AbstractCraftingUnitBlock(Settings props, final CraftingUnitType type) { super(props); this.type = type; this.setDefaultState(getDefaultState().with(FORMED, false).with(POWERED, false)); @@ -78,7 +78,7 @@ public abstract class AbstractCraftingUnitBlock ex } @Override - public ActionResultType onBlockActivated(BlockState state, World w, BlockPos pos, PlayerEntity p, Hand hand, + public ActionResult onBlockActivated(BlockState state, World w, BlockPos pos, PlayerEntity p, Hand hand, BlockRayTraceResult hit) { final CraftingTileEntity tg = this.getTileEntity(w, pos); @@ -88,7 +88,7 @@ public abstract class AbstractCraftingUnitBlock ex ContainerLocator.forTileEntitySide(tg, hit.getFace())); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } return super.onBlockActivated(state, w, pos, p, hand, hit); diff --git a/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java b/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java index 6d1bb6361..38ba66c44 100644 --- a/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java +++ b/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java @@ -23,7 +23,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -39,7 +39,7 @@ public class MolecularAssemblerBlock extends AEBaseTileBlock { } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (player instanceof FakePlayer || player == null) { this.dropCrank(w, pos); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } final CrankTileEntity tile = this.getTileEntity(w, pos); @@ -67,10 +67,10 @@ public class CrankBlock extends AEBaseTileBlock { if (tile.power()) { AeStats.TurnedCranks.addToPlayer(player, 1); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } - return ActionResultType.PASS; + return ActionResult.PASS; } private void dropCrank(final World world, final BlockPos pos) { @@ -100,7 +100,7 @@ public class CrankBlock extends AEBaseTileBlock { return !(te instanceof CrankTileEntity) || this.isCrankable(w, pos, up.getOpposite()); } - private Direction findCrankable(final IBlockReader world, final BlockPos pos) { + private Direction findCrankable(final BlockView world, final BlockPos pos) { for (final Direction dir : Direction.values()) { if (this.isCrankable(world, pos, dir)) { return dir; @@ -109,7 +109,7 @@ public class CrankBlock extends AEBaseTileBlock { return null; } - private boolean isCrankable(final IBlockReader world, final BlockPos pos, final Direction offset) { + private boolean isCrankable(final BlockView world, final BlockPos pos, final Direction offset) { final BlockPos o = pos.offset(offset); final TileEntity te = world.getTileEntity(o); @@ -139,13 +139,13 @@ public class CrankBlock extends AEBaseTileBlock { return this.findCrankable(w, pos) != null; } - private Direction getUp(IBlockReader world, BlockPos pos) { + private Direction getUp(BlockView world, BlockPos pos) { CrankTileEntity crank = getTileEntity(world, pos); return crank != null ? crank.getUp() : null; } @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { + public VoxelShape getShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { Direction up = getUp(world, pos); if (up == null) { diff --git a/src/main/java/appeng/block/grindstone/GrinderBlock.java b/src/main/java/appeng/block/grindstone/GrinderBlock.java index 7ceedba54..006d84536 100644 --- a/src/main/java/appeng/block/grindstone/GrinderBlock.java +++ b/src/main/java/appeng/block/grindstone/GrinderBlock.java @@ -23,7 +23,7 @@ import javax.annotation.Nullable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -42,7 +42,7 @@ public class GrinderBlock extends AEBaseTileBlock { } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { final GrinderTileEntity tg = this.getTileEntity(w, pos); if (tg != null && !p.isCrouching()) { @@ -50,8 +50,8 @@ public class GrinderBlock extends AEBaseTileBlock { ContainerOpener.openContainer(GrinderContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } - return ActionResultType.PASS; + return ActionResult.PASS; } } diff --git a/src/main/java/appeng/block/misc/CellWorkbenchBlock.java b/src/main/java/appeng/block/misc/CellWorkbenchBlock.java index d77da04f0..89a7cc4d0 100644 --- a/src/main/java/appeng/block/misc/CellWorkbenchBlock.java +++ b/src/main/java/appeng/block/misc/CellWorkbenchBlock.java @@ -20,10 +20,10 @@ package appeng.block.misc; import javax.annotation.Nullable; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -42,10 +42,10 @@ public class CellWorkbenchBlock extends AEBaseTileBlock } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (p.isCrouching()) { - return ActionResultType.PASS; + return ActionResult.PASS; } final CellWorkbenchTileEntity tg = this.getTileEntity(w, pos); @@ -53,8 +53,8 @@ public class CellWorkbenchBlock extends AEBaseTileBlock if (Platform.isServer()) { CellWorkbenchContainer.open(p, ContainerLocator.forTileEntity(tg)); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } - return ActionResultType.PASS; + return ActionResult.PASS; } } diff --git a/src/main/java/appeng/block/misc/ChargerBlock.java b/src/main/java/appeng/block/misc/ChargerBlock.java index 9e9b388a0..79385ef05 100644 --- a/src/main/java/appeng/block/misc/ChargerBlock.java +++ b/src/main/java/appeng/block/misc/ChargerBlock.java @@ -27,7 +27,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.TransformationMatrix; import net.minecraft.client.renderer.Vector3f; @@ -35,16 +35,16 @@ import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.world.IBlockReader; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -69,15 +69,15 @@ public class ChargerBlock extends AEBaseTileBlock { } @Override - public int getOpacity(BlockState state, IBlockReader worldIn, BlockPos pos) { + public int getOpacity(BlockState state, BlockView worldIn, BlockPos pos) { return 2; // FIXME Double check this (esp. value range) } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (player.isCrouching()) { - return ActionResultType.PASS; + return ActionResult.PASS; } if (Platform.isServer()) { @@ -87,7 +87,7 @@ public class ChargerBlock extends AEBaseTileBlock { } } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } @Override @@ -120,7 +120,7 @@ public class ChargerBlock extends AEBaseTileBlock { } @Override - public VoxelShape getShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { + public VoxelShape getShape(BlockState state, BlockView w, BlockPos pos, ShapeContext context) { final ChargerTileEntity tile = this.getTileEntity(w, pos); if (tile != null) { @@ -172,8 +172,8 @@ public class ChargerBlock extends AEBaseTileBlock { } @Override - public VoxelShape getCollisionShape(BlockState state, IBlockReader worldIn, BlockPos pos, - ISelectionContext context) { + public VoxelShape getCollisionShape(BlockState state, BlockView worldIn, BlockPos pos, + ShapeContext context) { return VoxelShapes.create(new AxisAlignedBB(0.0, 0.0, 0.0, 1.0, 1.0, 1.0)); } diff --git a/src/main/java/appeng/block/misc/CondenserBlock.java b/src/main/java/appeng/block/misc/CondenserBlock.java index 9303c2f7f..cfee80939 100644 --- a/src/main/java/appeng/block/misc/CondenserBlock.java +++ b/src/main/java/appeng/block/misc/CondenserBlock.java @@ -20,10 +20,10 @@ package appeng.block.misc; import javax.annotation.Nullable; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -43,10 +43,10 @@ public class CondenserBlock extends AEBaseTileBlock { } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (player.isCrouching()) { - return ActionResultType.PASS; + return ActionResult.PASS; } if (Platform.isServer()) { @@ -54,10 +54,10 @@ public class CondenserBlock extends AEBaseTileBlock { if (tc != null && !player.isCrouching()) { ContainerOpener.openContainer(CondenserContainer.TYPE, player, ContainerLocator.forTileEntitySide(tc, hit.getFace())); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } diff --git a/src/main/java/appeng/block/misc/InscriberBlock.java b/src/main/java/appeng/block/misc/InscriberBlock.java index 85c796b66..a81c9dfba 100644 --- a/src/main/java/appeng/block/misc/InscriberBlock.java +++ b/src/main/java/appeng/block/misc/InscriberBlock.java @@ -23,11 +23,11 @@ import javax.annotation.Nullable; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -43,13 +43,13 @@ public class InscriberBlock extends AEBaseTileBlock { } @Override - public int getOpacity(BlockState state, IBlockReader worldIn, BlockPos pos) { + public int getOpacity(BlockState state, BlockView worldIn, BlockPos pos) { return 2; // FIXME validate this. a) possibly not required because of getShape b) value // range. was 2 in 1.10 } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (!p.isCrouching()) { final InscriberTileEntity tg = this.getTileEntity(w, pos); @@ -58,10 +58,10 @@ public class InscriberBlock extends AEBaseTileBlock { ContainerOpener.openContainer(InscriberContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } - return ActionResultType.PASS; + return ActionResult.PASS; } diff --git a/src/main/java/appeng/block/misc/InterfaceBlock.java b/src/main/java/appeng/block/misc/InterfaceBlock.java index d722325df..6def3dc62 100644 --- a/src/main/java/appeng/block/misc/InterfaceBlock.java +++ b/src/main/java/appeng/block/misc/InterfaceBlock.java @@ -22,13 +22,13 @@ import javax.annotation.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -62,10 +62,10 @@ public class InterfaceBlock extends AEBaseTileBlock { } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (p.isCrouching()) { - return ActionResultType.PASS; + return ActionResult.PASS; } final InterfaceTileEntity tg = this.getTileEntity(w, pos); @@ -74,9 +74,9 @@ public class InterfaceBlock extends AEBaseTileBlock { ContainerOpener.openContainer(InterfaceContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } - return ActionResultType.PASS; + return ActionResult.PASS; } @Override diff --git a/src/main/java/appeng/block/misc/LightDetectorBlock.java b/src/main/java/appeng/block/misc/LightDetectorBlock.java index b22e3e8d2..52399142c 100644 --- a/src/main/java/appeng/block/misc/LightDetectorBlock.java +++ b/src/main/java/appeng/block/misc/LightDetectorBlock.java @@ -22,17 +22,17 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.world.IBlockReader; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; @@ -62,7 +62,7 @@ public class LightDetectorBlock extends AEBaseTileBlock } @Override - public int getWeakPower(final BlockState state, final IBlockReader w, final BlockPos pos, final Direction side) { + public int getWeakPower(final BlockState state, final BlockView w, final BlockPos pos, final Direction side) { if (w instanceof World && this.getTileEntity(w, pos).isReady()) { // FIXME: This is ... uhm... fishy return ((World) w).getLight(pos) - 6; @@ -91,14 +91,14 @@ public class LightDetectorBlock extends AEBaseTileBlock return this.canPlaceAt(w, pos, up.getOpposite()); } - private boolean canPlaceAt(final IBlockReader w, final BlockPos pos, final Direction dir) { + private boolean canPlaceAt(final BlockView w, final BlockPos pos, final Direction dir) { final BlockPos test = pos.offset(dir); BlockState blockstate = w.getBlockState(test); return blockstate.isSolidSide(w, test, dir.getOpposite()); } @Override - public VoxelShape getShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { + public VoxelShape getShape(BlockState state, BlockView w, BlockPos pos, ShapeContext context) { // FIXME: We should / rather MUST use state here because at startup, this gets // called without a world @@ -112,8 +112,8 @@ public class LightDetectorBlock extends AEBaseTileBlock } @Override - public VoxelShape getCollisionShape(BlockState state, IBlockReader worldIn, BlockPos pos, - ISelectionContext context) { + public VoxelShape getCollisionShape(BlockState state, BlockView worldIn, BlockPos pos, + ShapeContext context) { return VoxelShapes.empty(); } @@ -143,7 +143,7 @@ public class LightDetectorBlock extends AEBaseTileBlock } @Override - public IOrientable getOrientable(final IBlockReader w, final BlockPos pos) { + public IOrientable getOrientable(final BlockView w, final BlockPos pos) { return new MetaRotation(w, pos, BlockStateProperties.FACING); } diff --git a/src/main/java/appeng/block/misc/QuartzFixtureBlock.java b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java index 26872af8c..a870ec324 100644 --- a/src/main/java/appeng/block/misc/QuartzFixtureBlock.java +++ b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java @@ -27,20 +27,20 @@ import javax.annotation.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.block.Material; import net.minecraft.item.BlockItemUseContext; import net.minecraft.state.BooleanProperty; import net.minecraft.state.DirectionProperty; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.world.IBlockReader; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; @@ -81,7 +81,7 @@ public class QuartzFixtureBlock extends AEBaseBlock implements IOrientableBlock public QuartzFixtureBlock() { super(defaultProps(Material.MISCELLANEOUS).doesNotBlockMovement().hardnessAndResistance(0).lightValue(14) - .sound(SoundType.GLASS)); + .sound(BlockSoundGroup.GLASS)); this.setDefaultState(getDefaultState().with(FACING, Direction.UP).with(ODD, false)); } @@ -140,7 +140,7 @@ public class QuartzFixtureBlock extends AEBaseBlock implements IOrientableBlock } @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + public VoxelShape getShape(BlockState state, BlockView worldIn, BlockPos pos, ShapeContext context) { Direction facing = state.get(FACING); return SHAPES.get(facing); } @@ -195,7 +195,7 @@ public class QuartzFixtureBlock extends AEBaseBlock implements IOrientableBlock } @Override - public IOrientable getOrientable(final IBlockReader w, final BlockPos pos) { + public IOrientable getOrientable(final BlockView w, final BlockPos pos) { return new MetaRotation(w, pos, FACING); } diff --git a/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java b/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java index 80a793291..ee8c93af5 100644 --- a/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java +++ b/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java @@ -22,12 +22,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.block.Material; import net.minecraft.client.Minecraft; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -47,7 +47,7 @@ public class QuartzGrowthAcceleratorBlock extends AEBaseTileBlock { - public SkyCompassBlock(Block.Properties props) { + public SkyCompassBlock(Settings props) { super(props); } @@ -50,7 +50,7 @@ public class SkyCompassBlock extends AEBaseTileBlock { return this.canPlaceAt(w, pos, forward.getOpposite()); } - private boolean canPlaceAt(final IBlockReader w, final BlockPos pos, final Direction dir) { + private boolean canPlaceAt(final BlockView w, final BlockPos pos, final Direction dir) { final BlockPos test = pos.offset(dir); BlockState blockstate = w.getBlockState(test); return blockstate.isSolidSide(w, test, dir.getOpposite()); @@ -83,7 +83,7 @@ public class SkyCompassBlock extends AEBaseTileBlock { } @Override - public VoxelShape getShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { + public VoxelShape getShape(BlockState state, BlockView w, BlockPos pos, ShapeContext context) { // TODO: This definitely needs to be memoized @@ -145,8 +145,8 @@ public class SkyCompassBlock extends AEBaseTileBlock { } @Override - public VoxelShape getCollisionShape(BlockState state, IBlockReader worldIn, BlockPos pos, - ISelectionContext context) { + public VoxelShape getCollisionShape(BlockState state, BlockView worldIn, BlockPos pos, + ShapeContext context) { return VoxelShapes.empty(); } diff --git a/src/main/java/appeng/block/misc/TinyTNTBlock.java b/src/main/java/appeng/block/misc/TinyTNTBlock.java index 8efc2d908..4b00f7ffc 100644 --- a/src/main/java/appeng/block/misc/TinyTNTBlock.java +++ b/src/main/java/appeng/block/misc/TinyTNTBlock.java @@ -28,18 +28,18 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.AbstractArrowEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.Explosion; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; @@ -51,23 +51,23 @@ public class TinyTNTBlock extends AEBaseBlock { private static final VoxelShape SHAPE = VoxelShapes .create(new AxisAlignedBB(0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f)); - public TinyTNTBlock(Block.Properties props) { + public TinyTNTBlock(Settings props) { super(props); setFullSize(setOpaque(false)); } @Override - public int getOpacity(BlockState state, IBlockReader worldIn, BlockPos pos) { + public int getOpacity(BlockState state, BlockView worldIn, BlockPos pos) { return 2; // FIXME: Validate that this is the correct value range } @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + public VoxelShape getShape(BlockState state, BlockView worldIn, BlockPos pos, ShapeContext context) { return SHAPE; } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (heldItem != null && heldItem.getItem() == Items.FLINT_AND_STEEL) { this.startFuse(w, pos, player); @@ -75,7 +75,7 @@ public class TinyTNTBlock extends AEBaseBlock { heldItem.damageItem(1, player, p -> { p.sendBreakAnimation(hand); }); // FIXME Check if onBroken is equivalent - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } else { return super.onActivated(w, pos, player, hand, heldItem, hit); } diff --git a/src/main/java/appeng/block/misc/VibrationChamberBlock.java b/src/main/java/appeng/block/misc/VibrationChamberBlock.java index 4f1f5c466..969976fea 100644 --- a/src/main/java/appeng/block/misc/VibrationChamberBlock.java +++ b/src/main/java/appeng/block/misc/VibrationChamberBlock.java @@ -24,14 +24,14 @@ import javax.annotation.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.particles.ParticleTypes; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -68,10 +68,10 @@ public final class VibrationChamberBlock extends AEBaseTileBlock implement } @Override - public boolean propagatesSkylightDown(BlockState state, IBlockReader reader, BlockPos pos) { + public boolean propagatesSkylightDown(BlockState state, BlockView reader, BlockPos pos) { return true; } @@ -100,7 +100,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - public int getWeakPower(final BlockState state, final IBlockReader w, final BlockPos pos, final Direction side) { + public int getWeakPower(final BlockState state, final BlockView w, final BlockPos pos, final Direction side) { return this.cb(w, pos).isProvidingWeakPower(side.getOpposite()); // TODO: // IS // OPPOSITE!? @@ -117,14 +117,14 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - public int getStrongPower(final BlockState state, final IBlockReader w, final BlockPos pos, final Direction side) { + public int getStrongPower(final BlockState state, final BlockView w, final BlockPos pos, final Direction side) { return this.cb(w, pos).isProvidingStrongPower(side.getOpposite()); // TODO: // IS // OPPOSITE!? } @Override - public int getLightValue(final BlockState state, final IBlockReader world, final BlockPos pos) { + public int getLightValue(final BlockState state, final BlockView world, final BlockPos pos) { if (state.getBlock() != this) { return state.getBlock().getLightValue(state, world, pos); } @@ -156,7 +156,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - public boolean canConnectRedstone(final BlockState state, final IBlockReader w, final BlockPos pos, + public boolean canConnectRedstone(final BlockState state, final BlockView w, final BlockPos pos, Direction side) { if (side == null) { side = Direction.UP; @@ -166,7 +166,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockReader world, BlockPos pos, + public ItemStack getPickBlock(BlockState state, RayTraceResult target, BlockView world, BlockPos pos, PlayerEntity player) { final Vec3d v3 = target.getHitVec().subtract(pos.getX(), pos.getY(), pos.getZ()); final SelectedPart sp = this.cb(world, pos).selectPart(v3); @@ -280,7 +280,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } } - private ICableBusContainer cb(final IBlockReader w, final BlockPos pos) { + private ICableBusContainer cb(final BlockView w, final BlockPos pos) { final TileEntity te = w.getTileEntity(pos); ICableBusContainer out = null; @@ -292,7 +292,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Nullable - private IFacadeContainer fc(final IBlockReader w, final BlockPos pos) { + private IFacadeContainer fc(final BlockView w, final BlockPos pos) { final TileEntity te = w.getTileEntity(pos); IFacadeContainer out = null; @@ -326,12 +326,12 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { // Transform from world into block space Vec3d hitVec = hit.getHitVec(); Vec3d hitInBlock = new Vec3d(hitVec.x - pos.getX(), hitVec.y - pos.getY(), hitVec.z - pos.getZ()); - return this.cb(w, pos).activate(player, hand, hitInBlock) ? ActionResultType.SUCCESS : ActionResultType.PASS; + return this.cb(w, pos).activate(player, hand, hitInBlock) ? ActionResult.SUCCESS : ActionResult.PASS; } @Override @@ -339,7 +339,7 @@ public class CableBusBlock extends AEBaseTileBlock implement return recolorBlock(world, pos, side, color, null); } - public boolean recolorBlock(final IBlockReader world, final BlockPos pos, final Direction side, + public boolean recolorBlock(final BlockView world, final BlockPos pos, final Direction side, final DyeColor color, final PlayerEntity who) { try { return this.cb(world, pos).recolourBlock(side, AEColor.values()[color.ordinal()], who); @@ -355,7 +355,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - public BlockState getFacadeState(IBlockReader world, BlockPos pos, Direction side) { + public BlockState getFacadeState(BlockView world, BlockPos pos, Direction side) { if (side != null) { IFacadeContainer container = this.fc(world, pos); if (container != null) { @@ -369,7 +369,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - public VoxelShape getShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { + public VoxelShape getShape(BlockState state, BlockView w, BlockPos pos, ShapeContext context) { CableBusTileEntity te = getTileEntity(w, pos); if (te == null) { return VoxelShapes.empty(); @@ -379,7 +379,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - public VoxelShape getCollisionShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { + public VoxelShape getCollisionShape(BlockState state, BlockView w, BlockPos pos, ShapeContext context) { CableBusTileEntity te = getTileEntity(w, pos); if (te == null) { return VoxelShapes.empty(); diff --git a/src/main/java/appeng/block/networking/ControllerBlock.java b/src/main/java/appeng/block/networking/ControllerBlock.java index afb5fc2c3..431145dee 100644 --- a/src/main/java/appeng/block/networking/ControllerBlock.java +++ b/src/main/java/appeng/block/networking/ControllerBlock.java @@ -20,10 +20,10 @@ package appeng.block.networking; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.state.EnumProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; diff --git a/src/main/java/appeng/block/networking/EnergyAcceptorBlock.java b/src/main/java/appeng/block/networking/EnergyAcceptorBlock.java index c31bd8c3c..aa8a02e79 100644 --- a/src/main/java/appeng/block/networking/EnergyAcceptorBlock.java +++ b/src/main/java/appeng/block/networking/EnergyAcceptorBlock.java @@ -18,7 +18,7 @@ package appeng.block.networking; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import appeng.block.AEBaseTileBlock; import appeng.tile.networking.EnergyAcceptorTileEntity; diff --git a/src/main/java/appeng/block/networking/EnergyCellBlock.java b/src/main/java/appeng/block/networking/EnergyCellBlock.java index fbe05cdfa..8cf356c58 100644 --- a/src/main/java/appeng/block/networking/EnergyCellBlock.java +++ b/src/main/java/appeng/block/networking/EnergyCellBlock.java @@ -22,7 +22,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.state.IntegerProperty; import net.minecraft.state.StateContainer; import net.minecraft.util.NonNullList; @@ -47,7 +47,7 @@ public class EnergyCellBlock extends AEBaseTileBlock { super.fillItemGroup(group, itemStacks); final ItemStack charged = new ItemStack(this, 1); - final CompoundNBT tag = charged.getOrCreateTag(); + final CompoundTag tag = charged.getOrCreateTag(); tag.putDouble("internalCurrentPower", this.getMaxPower()); tag.putDouble("internalMaxPower", this.getMaxPower()); diff --git a/src/main/java/appeng/block/networking/WirelessBlock.java b/src/main/java/appeng/block/networking/WirelessBlock.java index c24c49191..9e3fccdfd 100644 --- a/src/main/java/appeng/block/networking/WirelessBlock.java +++ b/src/main/java/appeng/block/networking/WirelessBlock.java @@ -23,17 +23,17 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.state.EnumProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.world.IBlockReader; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -84,7 +84,7 @@ public class WirelessBlock extends AEBaseTileBlock { } @Override - public ActionResultType onBlockActivated(BlockState state, World w, BlockPos pos, PlayerEntity player, Hand hand, + public ActionResult onBlockActivated(BlockState state, World w, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { final WirelessTileEntity tg = this.getTileEntity(w, pos); @@ -93,14 +93,14 @@ public class WirelessBlock extends AEBaseTileBlock { ContainerOpener.openContainer(WirelessContainer.TYPE, player, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } return super.onBlockActivated(state, w, pos, player, hand, hit); } @Override - public VoxelShape getShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { + public VoxelShape getShape(BlockState state, BlockView w, BlockPos pos, ShapeContext context) { final WirelessTileEntity tile = this.getTileEntity(w, pos); if (tile != null) { final Direction forward = tile.getForward(); @@ -159,7 +159,7 @@ public class WirelessBlock extends AEBaseTileBlock { } @Override - public VoxelShape getCollisionShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { + public VoxelShape getCollisionShape(BlockState state, BlockView w, BlockPos pos, ShapeContext context) { final WirelessTileEntity tile = this.getTileEntity(w, pos); if (tile != null) { @@ -220,7 +220,7 @@ public class WirelessBlock extends AEBaseTileBlock { } @Override - public boolean propagatesSkylightDown(BlockState state, IBlockReader reader, BlockPos pos) { + public boolean propagatesSkylightDown(BlockState state, BlockView reader, BlockPos pos) { return true; } diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java index 7d6cd06dd..82e6d42b2 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java @@ -18,7 +18,7 @@ import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.model.Material; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.data.IDynamicBakedModel; import net.minecraftforge.client.model.data.IModelData; diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java index 52353d59c..6d020e6be 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java @@ -20,18 +20,18 @@ package appeng.block.paint; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialColor; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; import net.minecraft.fluid.Fluid; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.world.IBlockReader; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -54,7 +54,7 @@ public class PaintSplotchesBlock extends AEBaseTileBlock } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (p.isCrouching()) { - return ActionResultType.PASS; + return ActionResult.PASS; } final SpatialIOPortTileEntity tg = this.getTileEntity(w, pos); @@ -66,8 +66,8 @@ public class SpatialIOPortBlock extends AEBaseTileBlock ContainerOpener.openContainer(SpatialIOPortContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } - return ActionResultType.PASS; + return ActionResult.PASS; } } diff --git a/src/main/java/appeng/block/spatial/SpatialPylonBlock.java b/src/main/java/appeng/block/spatial/SpatialPylonBlock.java index 58221ad6f..78f8a0c7b 100644 --- a/src/main/java/appeng/block/spatial/SpatialPylonBlock.java +++ b/src/main/java/appeng/block/spatial/SpatialPylonBlock.java @@ -21,7 +21,7 @@ package appeng.block.spatial; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -44,7 +44,7 @@ public class SpatialPylonBlock extends AEBaseTileBlock { } @Override - public int getLightValue(final BlockState state, final IBlockReader w, final BlockPos pos) { + public int getLightValue(final BlockState state, final BlockView w, final BlockPos pos) { final SpatialPylonTileEntity tsp = this.getTileEntity(w, pos); if (tsp != null) { return tsp.getLightValue(); diff --git a/src/main/java/appeng/block/storage/ChestBlock.java b/src/main/java/appeng/block/storage/ChestBlock.java index 91e6b117f..3d3adafcd 100644 --- a/src/main/java/appeng/block/storage/ChestBlock.java +++ b/src/main/java/appeng/block/storage/ChestBlock.java @@ -22,12 +22,12 @@ import javax.annotation.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.state.EnumProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -72,12 +72,12 @@ public class ChestBlock extends AEBaseTileBlock { } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { final ChestTileEntity tg = this.getTileEntity(w, pos); if (tg != null && !p.isCrouching()) { if (w.isRemote()) { - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } if (hit.getFace() == tg.getUp()) { @@ -89,9 +89,9 @@ public class ChestBlock extends AEBaseTileBlock { ContainerLocator.forTileEntitySide(tg, hit.getFace())); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } - return ActionResultType.PASS; + return ActionResult.PASS; } } diff --git a/src/main/java/appeng/block/storage/DriveBlock.java b/src/main/java/appeng/block/storage/DriveBlock.java index 69d9d5b36..f3b11c97c 100644 --- a/src/main/java/appeng/block/storage/DriveBlock.java +++ b/src/main/java/appeng/block/storage/DriveBlock.java @@ -20,10 +20,10 @@ package appeng.block.storage; import javax.annotation.Nullable; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -43,10 +43,10 @@ public class DriveBlock extends AEBaseTileBlock { } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (p.isCrouching()) { - return ActionResultType.PASS; + return ActionResult.PASS; } final DriveTileEntity tg = this.getTileEntity(w, pos); @@ -54,8 +54,8 @@ public class DriveBlock extends AEBaseTileBlock { if (Platform.isServer()) { ContainerOpener.openContainer(DriveContainer.TYPE, p, ContainerLocator.forTileEntity(tg)); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } - return ActionResultType.PASS; + return ActionResult.PASS; } } diff --git a/src/main/java/appeng/block/storage/IOPortBlock.java b/src/main/java/appeng/block/storage/IOPortBlock.java index e5b51a7a6..3ba1da395 100644 --- a/src/main/java/appeng/block/storage/IOPortBlock.java +++ b/src/main/java/appeng/block/storage/IOPortBlock.java @@ -22,10 +22,10 @@ import javax.annotation.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -54,10 +54,10 @@ public class IOPortBlock extends AEBaseTileBlock { } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (p.isCrouching()) { - return ActionResultType.PASS; + return ActionResult.PASS; } final IOPortTileEntity tg = this.getTileEntity(w, pos); @@ -66,8 +66,8 @@ public class IOPortBlock extends AEBaseTileBlock { ContainerOpener.openContainer(IOPortContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } - return ActionResultType.PASS; + return ActionResult.PASS; } } diff --git a/src/main/java/appeng/block/storage/SkyChestBlock.java b/src/main/java/appeng/block/storage/SkyChestBlock.java index 7c3d1ebab..769374ef1 100644 --- a/src/main/java/appeng/block/storage/SkyChestBlock.java +++ b/src/main/java/appeng/block/storage/SkyChestBlock.java @@ -24,16 +24,16 @@ import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.world.IBlockReader; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -66,33 +66,33 @@ public class SkyChestBlock extends AEBaseTileBlock { } @Override - public boolean propagatesSkylightDown(BlockState state, IBlockReader reader, BlockPos pos) { + public boolean propagatesSkylightDown(BlockState state, BlockView reader, BlockPos pos) { return true; } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (Platform.isServer()) { SkyChestTileEntity tile = getTileEntity(w, pos); if (tile == null) { - return ActionResultType.PASS; + return ActionResult.PASS; } ContainerOpener.openContainer(SkyChestContainer.TYPE, player, ContainerLocator.forTileEntity(tile)); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + public VoxelShape getShape(BlockState state, BlockView worldIn, BlockPos pos, ShapeContext context) { // TODO Cache this! It can't be that hard! AxisAlignedBB aabb = computeAABB(worldIn, pos); return VoxelShapes.create(aabb); } - private AxisAlignedBB computeAABB(final IBlockReader w, final BlockPos pos) { + private AxisAlignedBB computeAABB(final BlockView w, final BlockPos pos) { final SkyChestTileEntity sk = this.getTileEntity(w, pos); Direction o = Direction.UP; diff --git a/src/main/java/appeng/capabilities/Capabilities.java b/src/main/java/appeng/capabilities/Capabilities.java index 58a9b477b..894214568 100644 --- a/src/main/java/appeng/capabilities/Capabilities.java +++ b/src/main/java/appeng/capabilities/Capabilities.java @@ -19,7 +19,7 @@ package appeng.capabilities; import net.minecraft.nbt.INBT; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java index b3112f7d3..e10fec30b 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java @@ -35,7 +35,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; @@ -205,7 +205,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen diList = new HashMap<>(); private final Map byId = new HashMap<>(); private IGrid grid; - private CompoundNBT data = new CompoundNBT(); + private CompoundTag data = new CompoundTag(); public InterfaceTerminalContainer(int id, final PlayerInventory ip, final InterfaceTerminalPart anchor) { super(TYPE, id, ip, anchor); @@ -183,7 +183,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { // :P } - this.data = new CompoundNBT(); + this.data = new CompoundTag(); } } @@ -280,7 +280,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { } } - private void regenList(final CompoundNBT data) { + private void regenList(final CompoundTag data) { this.byId.clear(); this.diList.clear(); @@ -327,9 +327,9 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { return !ItemStack.areItemStacksEqual(a, b); } - private void addItems(final CompoundNBT data, final InvTracker inv, final int offset, final int length) { + private void addItems(final CompoundTag data, final InvTracker inv, final int offset, final int length) { final String name = '=' + Long.toString(inv.which, Character.MAX_RADIX); - final CompoundNBT tag = data.getCompound(name); + final CompoundTag tag = data.getCompound(name); if (tag.isEmpty()) { tag.putLong("sortBy", inv.sortBy); @@ -337,7 +337,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { } for (int x = 0; x < length; x++) { - final CompoundNBT itemNBT = new CompoundNBT(); + final CompoundTag itemNBT = new CompoundTag(); final ItemStack is = inv.server.getStackInSlot(x + offset); diff --git a/src/main/java/appeng/container/implementations/NetworkToolContainer.java b/src/main/java/appeng/container/implementations/NetworkToolContainer.java index 4f1cb40a6..ca7b33245 100644 --- a/src/main/java/appeng/container/implementations/NetworkToolContainer.java +++ b/src/main/java/appeng/container/implementations/NetworkToolContainer.java @@ -22,7 +22,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import appeng.api.implementations.guiobjects.INetworkTool; @@ -68,7 +68,7 @@ public class NetworkToolContainer extends AEBaseContainer { } public void toggleFacadeMode() { - final CompoundNBT data = this.toolInv.getItemStack().getOrCreateTag(); + final CompoundTag data = this.toolInv.getItemStack().getOrCreateTag(); data.putBoolean("hideFacades", !data.getBoolean("hideFacades")); this.detectAndSendChanges(); } @@ -91,7 +91,7 @@ public class NetworkToolContainer extends AEBaseContainer { } if (this.isValidContainer()) { - final CompoundNBT data = currentItem.getOrCreateTag(); + final CompoundTag data = currentItem.getOrCreateTag(); this.setFacadeMode(data.getBoolean("hideFacades")); } diff --git a/src/main/java/appeng/container/implementations/PatternTermContainer.java b/src/main/java/appeng/container/implementations/PatternTermContainer.java index 2205c9243..cebca7eb1 100644 --- a/src/main/java/appeng/container/implementations/PatternTermContainer.java +++ b/src/main/java/appeng/container/implementations/PatternTermContainer.java @@ -34,7 +34,7 @@ import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.INBT; import net.minecraft.nbt.ListNBT; import net.minecraft.network.PacketBuffer; @@ -235,7 +235,7 @@ public class PatternTermContainer extends MEMonitorableContainer } // encode the slot. - final CompoundNBT encodedValue = new CompoundNBT(); + final CompoundTag encodedValue = new CompoundTag(); final ListNBT tagIn = new ListNBT(); final ListNBT tagOut = new ListNBT(); @@ -316,7 +316,7 @@ public class PatternTermContainer extends MEMonitorableContainer } private INBT createItemTag(final ItemStack i) { - final CompoundNBT c = new CompoundNBT(); + final CompoundTag c = new CompoundTag(); if (!i.isEmpty()) { i.write(c); diff --git a/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java index 077205b5e..3b92cc26e 100644 --- a/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java +++ b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java @@ -24,7 +24,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; @@ -120,7 +120,7 @@ public class QuartzKnifeContainer extends AEBaseContainer { if (RestrictedInputSlot.isMetalIngot(input)) { if (QuartzKnifeContainer.this.myName.length() > 0) { return AEApi.instance().definitions().materials().namePress().maybeStack(1).map(namePressStack -> { - final CompoundNBT compound = namePressStack.getOrCreateTag(); + final CompoundTag compound = namePressStack.getOrCreateTag(); compound.putString(MaterialItem.TAG_INSCRIBE_NAME, QuartzKnifeContainer.this.myName); return namePressStack; diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index df9d064e1..f74a5efeb 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -20,8 +20,8 @@ package appeng.core.api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -34,7 +34,7 @@ import appeng.parts.PartPlacement; public class ApiPart implements IPartHelper { @Override - public ActionResultType placeBus(final ItemStack is, final BlockPos pos, final Direction side, + public ActionResult placeBus(final ItemStack is, final BlockPos pos, final Direction side, final PlayerEntity player, final Hand hand, final World w) { return PartPlacement.place(is, pos, side, player, hand, w, PartPlacement.PlaceType.PLACE_ITEM, 0); } diff --git a/src/main/java/appeng/core/api/ApiStorage.java b/src/main/java/appeng/core/api/ApiStorage.java index 7d7168b63..4dfdc8846 100644 --- a/src/main/java/appeng/core/api/ApiStorage.java +++ b/src/main/java/appeng/core/api/ApiStorage.java @@ -26,7 +26,7 @@ import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.MutableClassToInstanceMap; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; @@ -92,7 +92,7 @@ public class ApiStorage implements IStorageHelper { } @Override - public ICraftingLink loadCraftingLink(final CompoundNBT data, final ICraftingRequester req) { + public ICraftingLink loadCraftingLink(final CompoundTag data, final ICraftingRequester req) { Preconditions.checkNotNull(data); Preconditions.checkNotNull(req); @@ -140,7 +140,7 @@ public class ApiStorage implements IStorageHelper { } @Override - public IAEItemStack createFromNBT(CompoundNBT nbt) { + public IAEItemStack createFromNBT(CompoundTag nbt) { Preconditions.checkNotNull(nbt); return AEItemStack.fromNBT(nbt); } @@ -197,7 +197,7 @@ public class ApiStorage implements IStorageHelper { } @Override - public IAEFluidStack createFromNBT(CompoundNBT nbt) { + public IAEFluidStack createFromNBT(CompoundTag nbt) { Preconditions.checkNotNull(nbt); return AEFluidStack.fromNBT(nbt); } diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 968800608..cfafa48c6 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -23,9 +23,9 @@ import static appeng.block.AEBaseBlock.defaultProps; import net.minecraft.block.Block; import net.minecraft.block.DispenserBlock; import net.minecraft.block.SlabBlock; -import net.minecraft.block.SoundType; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.block.StairsBlock; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.client.renderer.RenderType; import net.minecraft.entity.EntityClassification; import net.minecraftforge.api.distmarker.Dist; @@ -237,9 +237,9 @@ public final class ApiBlocks implements IBlocks { private final IBlockDefinition cubeGenerator; private final IBlockDefinition energyGenerator; - private static final Block.Properties QUARTZ_PROPERTIES = defaultProps(Material.ROCK).hardnessAndResistance(3, 5); + private static final AbstractBlock.Settings QUARTZ_PROPERTIES = defaultProps(Material.ROCK).hardnessAndResistance(3, 5); - private static final Block.Properties SKYSTONE_PROPERTIES = defaultProps(Material.ROCK).hardnessAndResistance(50, + private static final AbstractBlock.Settings SKYSTONE_PROPERTIES = defaultProps(Material.ROCK).hardnessAndResistance(50, 150); public ApiBlocks(FeatureFactory registry) { @@ -311,7 +311,7 @@ public final class ApiBlocks implements IBlocks { .block("sky_stone_small_brick", () -> new SkyStoneBlock(SkystoneType.SMALL_BRICK, SKYSTONE_PROPERTIES)) .addFeatures(AEFeature.SKY_STONE).build(); - Block.Properties skyStoneChestProps = defaultProps(Material.ROCK).hardnessAndResistance(50, 150).notSolid(); + AbstractBlock.Settings skyStoneChestProps = defaultProps(Material.ROCK).hardnessAndResistance(50, 150).notSolid(); TileEntityDefinition skyChestTile = registry .tileEntity("sky_chest", SkyChestTileEntity.class, SkyChestTileEntity::new) @@ -383,7 +383,7 @@ public final class ApiBlocks implements IBlocks { this.tinyTNT = registry .block("tiny_tnt", () -> new TinyTNTBlock( - defaultProps(Material.TNT).sound(SoundType.GROUND).hardnessAndResistance(0).notSolid())) + defaultProps(Material.TNT).sound(BlockSoundGroup.GROUND).hardnessAndResistance(0).notSolid())) .features(AEFeature.TINY_TNT).bootstrap((block, item) -> (IInitComponent) () -> DispenserBlock .registerDispenseBehavior(item, new TinyTNTDispenseItemBehavior())) .build(); @@ -482,7 +482,7 @@ public final class ApiBlocks implements IBlocks { .tileEntity("crafting_unit", CraftingTileEntity.class, CraftingTileEntity::new).build(); FeatureFactory crafting = registry.features(AEFeature.CRAFTING_CPU); - Block.Properties craftingBlockProps = defaultProps(Material.IRON); + AbstractBlock.Settings craftingBlockProps = defaultProps(Material.IRON); this.craftingUnit = crafting .block("crafting_unit", () -> new CraftingUnitBlock(craftingBlockProps, CraftingUnitType.UNIT)) .rendering(new CraftingCubeRendering()).tileEntity(craftingUnit).build(); diff --git a/src/main/java/appeng/core/features/BlockDefinition.java b/src/main/java/appeng/core/features/BlockDefinition.java index a5b128e13..fc12f6613 100644 --- a/src/main/java/appeng/core/features/BlockDefinition.java +++ b/src/main/java/appeng/core/features/BlockDefinition.java @@ -26,7 +26,7 @@ import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import appeng.api.definitions.IBlockDefinition; import appeng.api.features.AEFeature; @@ -60,7 +60,7 @@ public class BlockDefinition extends ItemDefinition implements IBlockDefinition } @Override - public final boolean isSameAs(final IBlockReader world, final BlockPos pos) { + public final boolean isSameAs(final BlockView world, final BlockPos pos) { return world.getBlockState(pos).getBlock() == this.block; } } diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index e97c429ac..b42d18a5d 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -29,7 +29,7 @@ import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; diff --git a/src/main/java/appeng/core/features/registries/WirelessRegistry.java b/src/main/java/appeng/core/features/registries/WirelessRegistry.java index c4725b487..1786a3e33 100644 --- a/src/main/java/appeng/core/features/registries/WirelessRegistry.java +++ b/src/main/java/appeng/core/features/registries/WirelessRegistry.java @@ -24,7 +24,7 @@ import java.util.List; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import appeng.api.AEApi; import appeng.api.features.ILocatable; @@ -71,7 +71,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry { } @Override - public void openWirelessTerminalGui(ItemStack item, IBlockReader world, PlayerEntity player, Hand hand) { + public void openWirelessTerminalGui(ItemStack item, BlockView world, PlayerEntity player, Hand hand) { if (Platform.isClient()) { return; } diff --git a/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java b/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java index a75dbc5f0..c6414cbc8 100644 --- a/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java +++ b/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java @@ -22,7 +22,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.SoundType; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SimpleSound; import net.minecraft.entity.player.PlayerEntity; @@ -140,7 +140,7 @@ public class BlockTransitionEffectPacket extends BasePacket { volume = 1; pitch = 1; } else if (soundMode == SoundMode.BLOCK) { - SoundType soundType = blockState.getSoundType(); + BlockSoundGroup soundType = blockState.getSoundType(); soundEvent = soundType.getBreakSound(); volume = soundType.volume; pitch = soundType.pitch; diff --git a/src/main/java/appeng/core/sync/packets/ClickPacket.java b/src/main/java/appeng/core/sync/packets/ClickPacket.java index 1e3fa6d9f..05e95338e 100644 --- a/src/main/java/appeng/core/sync/packets/ClickPacket.java +++ b/src/main/java/appeng/core/sync/packets/ClickPacket.java @@ -25,7 +25,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java index 42dedfa75..5e31aee4c 100644 --- a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java +++ b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java @@ -31,7 +31,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.network.PacketBuffer; import net.minecraftforge.api.distmarker.Dist; @@ -45,7 +45,7 @@ import appeng.core.sync.network.INetworkInfo; public class CompressedNBTPacket extends BasePacket { // input. - private final CompoundNBT in; + private final CompoundTag in; // output... private final PacketBuffer data; private final GZIPOutputStream compressFrame; @@ -72,7 +72,7 @@ public class CompressedNBTPacket extends BasePacket { } // api - public CompressedNBTPacket(final CompoundNBT din) throws IOException { + public CompressedNBTPacket(final CompoundTag din) throws IOException { this.data = new PacketBuffer(Unpooled.buffer(2048)); this.data.writeInt(this.getPacketID()); diff --git a/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java b/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java index b397ac282..5a3dd3cb3 100644 --- a/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java +++ b/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java @@ -25,7 +25,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import appeng.api.storage.data.IAEFluidStack; @@ -39,7 +39,7 @@ public class FluidSlotPacket extends BasePacket { public FluidSlotPacket(final PacketBuffer stream) { this.list = new HashMap<>(); - CompoundNBT tag = stream.readCompoundTag(); + CompoundTag tag = stream.readCompoundTag(); for (final String key : tag.keySet()) { this.list.put(Integer.parseInt(key), AEFluidStack.fromNBT(tag.getCompound(key))); @@ -49,9 +49,9 @@ public class FluidSlotPacket extends BasePacket { // api public FluidSlotPacket(final Map list) { this.list = list; - final CompoundNBT sendTag = new CompoundNBT(); + final CompoundTag sendTag = new CompoundTag(); for (Map.Entry fs : list.entrySet()) { - final CompoundNBT tag = new CompoundNBT(); + final CompoundTag tag = new CompoundTag(); if (fs.getValue() != null) { fs.getValue().writeToNBT(tag); } diff --git a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java index f4fae638b..e41b8aaa1 100644 --- a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java +++ b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java @@ -24,7 +24,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; import net.minecraft.network.PacketBuffer; import net.minecraftforge.items.IItemHandler; @@ -57,7 +57,7 @@ public class JEIRecipePacket extends BasePacket { private ItemStack[][] recipe; public JEIRecipePacket(final PacketBuffer stream) { - final CompoundNBT comp = stream.readCompoundTag(); + final CompoundTag comp = stream.readCompoundTag(); if (comp != null) { this.recipe = new ItemStack[9][]; for (int x = 0; x < this.recipe.length; x++) { @@ -73,7 +73,7 @@ public class JEIRecipePacket extends BasePacket { } // api - public JEIRecipePacket(final CompoundNBT recipe) { + public JEIRecipePacket(final CompoundTag recipe) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); data.writeInt(this.getPacketID()); diff --git a/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java b/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java index 6ba7a1307..0b44f2819 100644 --- a/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java +++ b/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java @@ -23,7 +23,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/appeng/core/worlddata/IWorldSpawnData.java b/src/main/java/appeng/core/worlddata/IWorldSpawnData.java index a0f964cb8..467f0564e 100644 --- a/src/main/java/appeng/core/worlddata/IWorldSpawnData.java +++ b/src/main/java/appeng/core/worlddata/IWorldSpawnData.java @@ -20,7 +20,7 @@ package appeng.core.worlddata; import java.util.Collection; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.world.dimension.Dimension; /** @@ -33,7 +33,7 @@ public interface IWorldSpawnData { boolean hasGenerated(Dimension dim, int chunkX, int chunkZ); - boolean addNearByMeteorites(Dimension dim, int chunkX, int chunkZ, CompoundNBT newData); + boolean addNearByMeteorites(Dimension dim, int chunkX, int chunkZ, CompoundTag newData); - Collection getNearByMeteorites(Dimension dim, int chunkX, int chunkZ); + Collection getNearByMeteorites(Dimension dim, int chunkX, int chunkZ); } diff --git a/src/main/java/appeng/core/worlddata/PlayerData.java b/src/main/java/appeng/core/worlddata/PlayerData.java index 9bf181bf4..5366e7443 100644 --- a/src/main/java/appeng/core/worlddata/PlayerData.java +++ b/src/main/java/appeng/core/worlddata/PlayerData.java @@ -29,7 +29,7 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.mojang.authlib.GameProfile; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.world.storage.WorldSavedData; import appeng.core.AELog; @@ -85,7 +85,7 @@ final class PlayerData extends WorldSavedData implements IWorldPlayerData { } @Override - public void read(CompoundNBT nbt) { + public void read(CompoundTag nbt) { int[] playerIds = nbt.getIntArray(TAG_PLAYER_IDS); long[] profileIds = nbt.getLongArray(TAG_PROFILE_IDS); @@ -107,7 +107,7 @@ final class PlayerData extends WorldSavedData implements IWorldPlayerData { } @Override - public CompoundNBT write(CompoundNBT compound) { + public CompoundTag write(CompoundTag compound) { int index = 0; int[] playerIds = new int[mapping.size()]; long[] profileIds = new long[mapping.size() * 2]; diff --git a/src/main/java/appeng/core/worlddata/StorageData.java b/src/main/java/appeng/core/worlddata/StorageData.java index cfe8b2de0..27553b1ee 100644 --- a/src/main/java/appeng/core/worlddata/StorageData.java +++ b/src/main/java/appeng/core/worlddata/StorageData.java @@ -23,7 +23,7 @@ import java.util.Map; import javax.annotation.Nonnull; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.world.storage.WorldSavedData; import appeng.core.AELog; @@ -97,12 +97,12 @@ final class StorageData extends WorldSavedData implements IWorldGridStorageData } @Override - public void read(CompoundNBT tag) { + public void read(CompoundTag tag) { nextGridId = tag.getLong(TAG_NEXT_ID); // Load serialized grid storage - CompoundNBT storageTag = tag.getCompound(TAG_STORAGE); + CompoundTag storageTag = tag.getCompound(TAG_STORAGE); for (String storageIdStr : storageTag.keySet()) { long storageId; try { @@ -115,7 +115,7 @@ final class StorageData extends WorldSavedData implements IWorldGridStorageData } // Load ordered values map - CompoundNBT orderedValuesTag = tag.getCompound(TAG_ORDERED_VALUES); + CompoundTag orderedValuesTag = tag.getCompound(TAG_ORDERED_VALUES); this.orderedValues.clear(); for (String key : orderedValuesTag.keySet()) { this.orderedValues.put(key, orderedValuesTag.getInt(key)); @@ -124,12 +124,12 @@ final class StorageData extends WorldSavedData implements IWorldGridStorageData } @Override - public CompoundNBT write(CompoundNBT tag) { + public CompoundTag write(CompoundTag tag) { tag.putLong(TAG_NEXT_ID, nextGridId); // Save serialized grid storage - CompoundNBT storageTag = new CompoundNBT(); + CompoundTag storageTag = new CompoundTag(); for (Map.Entry entry : storage.entrySet()) { GridStorage gridStorage = entry.getValue(); @@ -148,7 +148,7 @@ final class StorageData extends WorldSavedData implements IWorldGridStorageData tag.put(TAG_STORAGE, storageTag); // Save ordered values - CompoundNBT orderedValuesTag = new CompoundNBT(); + CompoundTag orderedValuesTag = new CompoundTag(); for (Map.Entry entry : orderedValues.entrySet()) { orderedValuesTag.putInt(entry.getKey(), entry.getValue()); } diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index a7fcb7594..45fbf7da9 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Stopwatch; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.world.World; import appeng.api.AEApi; @@ -104,7 +104,7 @@ public class CraftingJob implements Runnable, ICraftingJob { return this.availableCheck.extractItems(available, Actionable.MODULATE, this.actionSrc); } - public void writeToNBT(final CompoundNBT out) { + public void writeToNBT(final CompoundTag out) { } diff --git a/src/main/java/appeng/crafting/CraftingLink.java b/src/main/java/appeng/crafting/CraftingLink.java index d19df4950..044ecfe58 100644 --- a/src/main/java/appeng/crafting/CraftingLink.java +++ b/src/main/java/appeng/crafting/CraftingLink.java @@ -18,7 +18,7 @@ package appeng.crafting; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import appeng.api.config.Actionable; import appeng.api.networking.crafting.ICraftingCPU; @@ -36,7 +36,7 @@ public class CraftingLink implements ICraftingLink { private boolean done = false; private CraftingLinkNexus tie; - public CraftingLink(final CompoundNBT data, final ICraftingRequester req) { + public CraftingLink(final CompoundTag data, final ICraftingRequester req) { this.CraftID = data.getString("CraftID"); this.setCanceled(data.getBoolean("canceled")); this.setDone(data.getBoolean("done")); @@ -50,7 +50,7 @@ public class CraftingLink implements ICraftingLink { this.cpu = null; } - public CraftingLink(final CompoundNBT data, final ICraftingCPU cpu) { + public CraftingLink(final CompoundTag data, final ICraftingCPU cpu) { this.CraftID = data.getString("CraftID"); this.setCanceled(data.getBoolean("canceled")); this.setDone(data.getBoolean("done")); @@ -119,7 +119,7 @@ public class CraftingLink implements ICraftingLink { } @Override - public void writeToNBT(final CompoundNBT tag) { + public void writeToNBT(final CompoundTag tag) { tag.putString("CraftID", this.CraftID); tag.putBoolean("canceled", this.isCanceled()); tag.putBoolean("done", this.isDone()); diff --git a/src/main/java/appeng/debug/ChunkLoaderBlock.java b/src/main/java/appeng/debug/ChunkLoaderBlock.java index 88c185ec7..6768ff3b1 100644 --- a/src/main/java/appeng/debug/ChunkLoaderBlock.java +++ b/src/main/java/appeng/debug/ChunkLoaderBlock.java @@ -18,7 +18,7 @@ package appeng.debug; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/debug/CubeGeneratorBlock.java b/src/main/java/appeng/debug/CubeGeneratorBlock.java index 4ca4182c2..f3b09edb2 100644 --- a/src/main/java/appeng/debug/CubeGeneratorBlock.java +++ b/src/main/java/appeng/debug/CubeGeneratorBlock.java @@ -20,10 +20,10 @@ package appeng.debug; import javax.annotation.Nullable; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -38,14 +38,14 @@ public class CubeGeneratorBlock extends AEBaseTileBlock } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { final CubeGeneratorTileEntity tcg = this.getTileEntity(w, pos); if (tcg != null) { tcg.click(player); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } diff --git a/src/main/java/appeng/debug/CubeGeneratorTileEntity.java b/src/main/java/appeng/debug/CubeGeneratorTileEntity.java index a69e174f5..a1cd6e979 100644 --- a/src/main/java/appeng/debug/CubeGeneratorTileEntity.java +++ b/src/main/java/appeng/debug/CubeGeneratorTileEntity.java @@ -25,7 +25,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.StringTextComponent; diff --git a/src/main/java/appeng/debug/DebugCardItem.java b/src/main/java/appeng/debug/DebugCardItem.java index 287810531..304b20914 100644 --- a/src/main/java/appeng/debug/DebugCardItem.java +++ b/src/main/java/appeng/debug/DebugCardItem.java @@ -26,8 +26,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; @@ -58,9 +58,9 @@ public class DebugCardItem extends AEBaseItem { } @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { if (context.getWorld().isRemote()) { - return ActionResultType.PASS; + return ActionResult.PASS; } PlayerEntity player = context.getPlayer(); @@ -69,7 +69,7 @@ public class DebugCardItem extends AEBaseItem { Direction side = context.getFace(); if (player == null) { - return ActionResultType.PASS; + return ActionResult.PASS; } if (player.isCrouching()) { @@ -182,7 +182,7 @@ public class DebugCardItem extends AEBaseItem { } } } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } private void outputMsg(final Entity player, final String string) { diff --git a/src/main/java/appeng/debug/DebugPartPlacerItem.java b/src/main/java/appeng/debug/DebugPartPlacerItem.java index bb7476378..86a75762b 100644 --- a/src/main/java/appeng/debug/DebugPartPlacerItem.java +++ b/src/main/java/appeng/debug/DebugPartPlacerItem.java @@ -7,8 +7,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3i; import net.minecraft.util.text.StringTextComponent; @@ -35,34 +35,34 @@ public class DebugPartPlacerItem extends AEBaseItem { } @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { World world = context.getWorld(); if (world.isRemote()) { - return ActionResultType.PASS; + return ActionResult.PASS; } PlayerEntity player = context.getPlayer(); BlockPos pos = context.getPos(); if (player == null) { - return ActionResultType.PASS; + return ActionResult.PASS; } if (!player.abilities.isCreativeMode) { player.sendMessage(new StringTextComponent("Only usable in creative mode")); - return ActionResultType.FAIL; + return ActionResult.FAIL; } TileEntity te = world.getTileEntity(pos); if (!(te instanceof IPartHost)) { player.sendMessage(new StringTextComponent("Right-click something that will accept parts")); - return ActionResultType.FAIL; + return ActionResult.FAIL; } IPartHost center = (IPartHost) te; IPart cable = center.getPart(AEPartLocation.INTERNAL); if (cable == null) { player.sendMessage(new StringTextComponent("Clicked part host must have an INSIDE part")); - return ActionResultType.FAIL; + return ActionResult.FAIL; } Direction face = context.getFace(); @@ -101,7 +101,7 @@ public class DebugPartPlacerItem extends AEBaseItem { } } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } diff --git a/src/main/java/appeng/debug/EnergyGeneratorBlock.java b/src/main/java/appeng/debug/EnergyGeneratorBlock.java index 052098777..cf18899e5 100644 --- a/src/main/java/appeng/debug/EnergyGeneratorBlock.java +++ b/src/main/java/appeng/debug/EnergyGeneratorBlock.java @@ -18,7 +18,7 @@ package appeng.debug; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java b/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java index f07e7a539..893ec3647 100644 --- a/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java +++ b/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java @@ -25,7 +25,7 @@ import com.google.common.math.IntMath; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/appeng/debug/EraserItem.java b/src/main/java/appeng/debug/EraserItem.java index b2d62ae68..08c07468d 100644 --- a/src/main/java/appeng/debug/EraserItem.java +++ b/src/main/java/appeng/debug/EraserItem.java @@ -29,7 +29,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.tags.BlockTags; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -47,9 +47,9 @@ public class EraserItem extends AEBaseItem { } @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { if (context.getWorld().isRemote()) { - return ActionResultType.PASS; + return ActionResult.PASS; } final PlayerEntity player = context.getPlayer(); @@ -57,7 +57,7 @@ public class EraserItem extends AEBaseItem { final BlockPos pos = context.getPos(); if (player == null) { - return ActionResultType.PASS; + return ActionResult.PASS; } final Block state = world.getBlockState(pos).getBlock(); @@ -101,7 +101,7 @@ public class EraserItem extends AEBaseItem { AELog.info("Delete " + blocks + " blocks"); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } private boolean isInsideBox(BlockPos pos, BlockPos origin) { diff --git a/src/main/java/appeng/debug/ItemGenBlock.java b/src/main/java/appeng/debug/ItemGenBlock.java index b9732893a..90fd154c6 100644 --- a/src/main/java/appeng/debug/ItemGenBlock.java +++ b/src/main/java/appeng/debug/ItemGenBlock.java @@ -18,7 +18,7 @@ package appeng.debug; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/debug/ItemGenTileEntity.java b/src/main/java/appeng/debug/ItemGenTileEntity.java index 40127ff6f..ce96d9435 100644 --- a/src/main/java/appeng/debug/ItemGenTileEntity.java +++ b/src/main/java/appeng/debug/ItemGenTileEntity.java @@ -28,7 +28,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/appeng/debug/MeteoritePlacerItem.java b/src/main/java/appeng/debug/MeteoritePlacerItem.java index c26eb3763..ec790daec 100644 --- a/src/main/java/appeng/debug/MeteoritePlacerItem.java +++ b/src/main/java/appeng/debug/MeteoritePlacerItem.java @@ -22,10 +22,10 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.play.server.SChunkDataPacket; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; @@ -51,14 +51,14 @@ public class MeteoritePlacerItem extends AEBaseItem { } @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { + public TypedActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { if (world.isRemote()) { - return ActionResult.resultPass(player.getHeldItem(hand)); + return TypedActionResult.resultPass(player.getHeldItem(hand)); } if (player.isSneaking()) { final ItemStack itemStack = player.getHeldItem(hand); - final CompoundNBT tag = itemStack.getOrCreateTag(); + final CompoundTag tag = itemStack.getOrCreateTag(); if (tag.contains(MODE_TAG)) { final byte mode = tag.getByte("mode"); @@ -71,16 +71,16 @@ public class MeteoritePlacerItem extends AEBaseItem { player.sendMessage(new StringTextComponent(craterType.name())); - return ActionResult.resultSuccess(itemStack); + return TypedActionResult.resultSuccess(itemStack); } return super.onItemRightClick(world, player, hand); } @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { if (context.getWorld().isRemote()) { - return ActionResultType.PASS; + return ActionResult.PASS; } ServerPlayerEntity player = (ServerPlayerEntity) context.getPlayer(); @@ -88,10 +88,10 @@ public class MeteoritePlacerItem extends AEBaseItem { BlockPos pos = context.getPos(); if (player == null) { - return ActionResultType.PASS; + return ActionResult.PASS; } - CompoundNBT tag = stack.getOrCreateTag(); + CompoundTag tag = stack.getOrCreateTag(); if (!tag.contains(MODE_TAG)) { tag.putByte(MODE_TAG, (byte) CraterType.NORMAL.ordinal()); } @@ -107,7 +107,7 @@ public class MeteoritePlacerItem extends AEBaseItem { if (spawned == null) { player.sendMessage(new StringTextComponent("Un-suitable Location.")); - return ActionResultType.FAIL; + return ActionResult.FAIL; } // Since we don't know yet if the meteorite will be underground or not, @@ -131,6 +131,6 @@ public class MeteoritePlacerItem extends AEBaseItem { player.connection.sendPacket(new SChunkDataPacket(c, 65535)); // 65535 == full chunk }); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } diff --git a/src/main/java/appeng/debug/PhantomNodeBlock.java b/src/main/java/appeng/debug/PhantomNodeBlock.java index 610b4d24e..03966ae39 100644 --- a/src/main/java/appeng/debug/PhantomNodeBlock.java +++ b/src/main/java/appeng/debug/PhantomNodeBlock.java @@ -20,10 +20,10 @@ package appeng.debug; import javax.annotation.Nullable; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -38,11 +38,11 @@ public class PhantomNodeBlock extends AEBaseTileBlock { } @Override - public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, + public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { final PhantomNodeTileEntity tpn = this.getTileEntity(w, pos); tpn.triggerCrashMode(); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } diff --git a/src/main/java/appeng/debug/PhantomNodeTileEntity.java b/src/main/java/appeng/debug/PhantomNodeTileEntity.java index 492cddb3b..29a599b5a 100644 --- a/src/main/java/appeng/debug/PhantomNodeTileEntity.java +++ b/src/main/java/appeng/debug/PhantomNodeTileEntity.java @@ -21,7 +21,7 @@ package appeng.debug; import java.util.EnumSet; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; diff --git a/src/main/java/appeng/debug/ReplicatorCardItem.java b/src/main/java/appeng/debug/ReplicatorCardItem.java index b3ca0a0b5..6423a7c46 100644 --- a/src/main/java/appeng/debug/ReplicatorCardItem.java +++ b/src/main/java/appeng/debug/ReplicatorCardItem.java @@ -24,10 +24,10 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.StringTextComponent; @@ -49,9 +49,9 @@ public class ReplicatorCardItem extends AEBaseItem { } @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { if (context.getWorld().isRemote()) { - return ActionResultType.PASS; + return ActionResult.PASS; } PlayerEntity player = context.getPlayer(); @@ -61,7 +61,7 @@ public class ReplicatorCardItem extends AEBaseItem { Hand hand = context.getHand(); if (player == null) { - return ActionResultType.PASS; + return ActionResult.PASS; } int x = pos.getX(); @@ -70,7 +70,7 @@ public class ReplicatorCardItem extends AEBaseItem { if (player.isCrouching()) { if (world.getTileEntity(pos) instanceof IGridHost) { - final CompoundNBT tag = new CompoundNBT(); + final CompoundTag tag = new CompoundTag(); tag.putInt("x", x); tag.putInt("y", y); tag.putInt("z", z); @@ -81,7 +81,7 @@ public class ReplicatorCardItem extends AEBaseItem { this.outputMsg(player, "This is not a Grid Tile."); } } else { - final CompoundNBT ish = player.getHeldItem(hand).getTag(); + final CompoundTag ish = player.getHeldItem(hand).getTag(); if (ish != null) { final int src_x = ish.getInt("x"); final int src_y = ish.getInt("y"); @@ -133,7 +133,7 @@ public class ReplicatorCardItem extends AEBaseItem { if (blk != null && blk.hasTileEntity(state)) { final TileEntity ote = src_w.getTileEntity(p); final TileEntity nte = blk.createTileEntity(state, world); - final CompoundNBT data = new CompoundNBT(); + final CompoundTag data = new CompoundTag(); ote.write(data); nte.read(data.copy()); world.setTileEntity(d, nte); @@ -158,7 +158,7 @@ public class ReplicatorCardItem extends AEBaseItem { this.outputMsg(player, "No Source Defined"); } } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } private void outputMsg(final Entity player, final String string) { diff --git a/src/main/java/appeng/decorative/solid/GlassState.java b/src/main/java/appeng/decorative/solid/GlassState.java index 432c86419..aec5fbbbe 100644 --- a/src/main/java/appeng/decorative/solid/GlassState.java +++ b/src/main/java/appeng/decorative/solid/GlassState.java @@ -20,7 +20,7 @@ package appeng.decorative.solid; import java.util.EnumSet; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; /** * Immutable (and thus thread-safe) class that encapsulates the rendering state diff --git a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java index f8d063852..d837ceb33 100644 --- a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java @@ -20,8 +20,8 @@ package appeng.decorative.solid; import net.minecraft.block.AbstractGlassBlock; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.util.Direction; +import net.minecraft.block.Material; +import net.minecraft.util.math.Direction; import appeng.helpers.AEGlassMaterial; diff --git a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java index 5398eb59f..8dca366b9 100644 --- a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java @@ -23,9 +23,9 @@ import net.minecraft.block.BlockState; import net.minecraft.state.EnumProperty; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; @@ -49,7 +49,7 @@ public class QuartzPillarBlock extends AEDecorativeBlock implements IOrientableB } @Override - public IOrientable getOrientable(final IBlockReader w, final BlockPos pos) { + public IOrientable getOrientable(final BlockView w, final BlockPos pos) { return new MetaRotation(w, pos, null); } diff --git a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java index 853e344c6..2e519b318 100644 --- a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java +++ b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java @@ -21,7 +21,7 @@ package appeng.decorative.solid; import net.minecraft.block.BlockState; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.IWorld; diff --git a/src/main/java/appeng/entity/ChargedQuartzEntity.java b/src/main/java/appeng/entity/ChargedQuartzEntity.java index 0581023f9..3a4c73052 100644 --- a/src/main/java/appeng/entity/ChargedQuartzEntity.java +++ b/src/main/java/appeng/entity/ChargedQuartzEntity.java @@ -21,7 +21,7 @@ package appeng.entity; import java.util.List; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.item.ItemEntity; diff --git a/src/main/java/appeng/entity/GrowingCrystalEntity.java b/src/main/java/appeng/entity/GrowingCrystalEntity.java index f2ba87ef5..72719cfbe 100644 --- a/src/main/java/appeng/entity/GrowingCrystalEntity.java +++ b/src/main/java/appeng/entity/GrowingCrystalEntity.java @@ -19,7 +19,7 @@ package appeng.entity; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.EntityType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/entity/SingularityEntity.java b/src/main/java/appeng/entity/SingularityEntity.java index cbb4cbd80..c9f872356 100644 --- a/src/main/java/appeng/entity/SingularityEntity.java +++ b/src/main/java/appeng/entity/SingularityEntity.java @@ -25,7 +25,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; @@ -93,7 +93,7 @@ public final class SingularityEntity extends AEBaseItemEntity { } materials.qESingularity().maybeStack(2).ifPresent(singularityStack -> { - final CompoundNBT cmp = singularityStack.getOrCreateTag(); + final CompoundTag cmp = singularityStack.getOrCreateTag(); cmp.putLong("freq", (new Date()).getTime() * 100 + (randTickSeed) % 100); randTickSeed++; item.grow(-1); diff --git a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java index 2e97668d3..1e9ebeacd 100644 --- a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java @@ -22,7 +22,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/appeng/facade/FacadeContainer.java b/src/main/java/appeng/facade/FacadeContainer.java index 283ac5118..3283de57b 100644 --- a/src/main/java/appeng/facade/FacadeContainer.java +++ b/src/main/java/appeng/facade/FacadeContainer.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.Optional; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import appeng.api.AEApi; @@ -87,10 +87,10 @@ public class FacadeContainer implements IFacadeContainer { } @Override - public void writeToNBT(final CompoundNBT c) { + public void writeToNBT(final CompoundTag c) { for (int x = 0; x < this.facades; x++) { if (this.storage.getFacade(x) != null) { - final CompoundNBT data = new CompoundNBT(); + final CompoundTag data = new CompoundTag(); this.storage.getFacade(x).getItemStack().write(data); c.put("facade:" + x, data); } @@ -129,11 +129,11 @@ public class FacadeContainer implements IFacadeContainer { } @Override - public void readFromNBT(final CompoundNBT c) { + public void readFromNBT(final CompoundTag c) { for (int x = 0; x < this.facades; x++) { this.storage.setFacade(x, null); - final CompoundNBT t = c.getCompound("facade:" + x); + final CompoundTag t = c.getCompound("facade:" + x); if (t != null) { final ItemStack is = ItemStack.read(t); if (!is.isEmpty()) { diff --git a/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java b/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java index 443e56b47..27a6f4e8c 100644 --- a/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java +++ b/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java @@ -20,11 +20,11 @@ package appeng.fluids.block; import javax.annotation.Nullable; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -43,10 +43,10 @@ public class FluidInterfaceBlock extends AEBaseTileBlock implements IAEFlu private static final String NBT_FLUID_TAG = "ft"; private final Fluid fluid; - private CompoundNBT tagCompound; + private CompoundTag tagCompound; private AEFluidStack(final AEFluidStack fluidStack) { this.fluid = fluidStack.fluid; @@ -66,7 +66,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu } } - private AEFluidStack(@Nonnull Fluid fluid, long amount, @Nullable CompoundNBT tag) { + private AEFluidStack(@Nonnull Fluid fluid, long amount, @Nullable CompoundTag tag) { if (fluid == Fluids.EMPTY) { System.out.println(); } @@ -88,21 +88,21 @@ public final class AEFluidStack extends AEStack implements IAEFlu } long amount = input.getAmount(); - CompoundNBT tag = null; + CompoundTag tag = null; if (input.getTag() != null) { tag = input.getTag().copy(); } return new AEFluidStack(fluid, amount, tag); } - public static IAEFluidStack fromNBT(final CompoundNBT data) { + public static IAEFluidStack fromNBT(final CompoundTag data) { ResourceLocation fluidId = new ResourceLocation(data.getString(NBT_FLUID_ID)); Fluid fluid = ForgeRegistries.FLUIDS.getValue(fluidId); if (fluid == null || fluid == Fluids.EMPTY) { return null; } - CompoundNBT tag = null; + CompoundTag tag = null; if (data.contains(NBT_FLUID_TAG, Constants.NBT.TAG_COMPOUND)) { tag = data.getCompound(NBT_FLUID_TAG); } @@ -126,7 +126,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { data.putString(NBT_FLUID_ID, this.fluid.getRegistryName().toString()); if (this.hasTagCompound()) { data.put(NBT_FLUID_TAG, this.tagCompound); diff --git a/src/main/java/appeng/helpers/AEGlassMaterial.java b/src/main/java/appeng/helpers/AEGlassMaterial.java index f5b5b91d1..639027ca5 100644 --- a/src/main/java/appeng/helpers/AEGlassMaterial.java +++ b/src/main/java/appeng/helpers/AEGlassMaterial.java @@ -18,7 +18,7 @@ package appeng.helpers; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.block.material.MaterialColor; import net.minecraft.block.material.PushReaction; diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index bdfd3a176..5846708d3 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -36,10 +36,10 @@ import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.Vec3d; @@ -200,7 +200,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } } - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { this.config.writeToNBT(data, "config"); this.patterns.writeToNBT(data, "patterns"); this.storage.writeToNBT(data, "storage"); @@ -212,7 +212,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn final ListNBT waitingToSend = new ListNBT(); if (this.waitingToSend != null) { for (final ItemStack is : this.waitingToSend) { - final CompoundNBT item = new CompoundNBT(); + final CompoundTag item = new CompoundTag(); is.write(item); waitingToSend.add(item); } @@ -220,12 +220,12 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn data.put("waitingToSend", waitingToSend); } - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { this.waitingToSend = null; final ListNBT waitingList = data.getList("waitingToSend", 10); if (waitingList != null) { for (int x = 0; x < waitingList.size(); x++) { - final CompoundNBT c = waitingList.getCompound(x); + final CompoundTag c = waitingList.getCompound(x); if (c != null) { final ItemStack is = ItemStack.read(c); this.addToSendList(is); diff --git a/src/main/java/appeng/helpers/IInterfaceHost.java b/src/main/java/appeng/helpers/IInterfaceHost.java index 8d8dff9bd..78beeab6c 100644 --- a/src/main/java/appeng/helpers/IInterfaceHost.java +++ b/src/main/java/appeng/helpers/IInterfaceHost.java @@ -21,7 +21,7 @@ package appeng.helpers; import java.util.EnumSet; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.implementations.IUpgradeableHost; import appeng.api.networking.crafting.ICraftingProvider; diff --git a/src/main/java/appeng/helpers/InvalidPatternHelper.java b/src/main/java/appeng/helpers/InvalidPatternHelper.java index b1d1d90e9..bb755518d 100644 --- a/src/main/java/appeng/helpers/InvalidPatternHelper.java +++ b/src/main/java/appeng/helpers/InvalidPatternHelper.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; @@ -38,7 +38,7 @@ public class InvalidPatternHelper { private final boolean canSubstitute; public InvalidPatternHelper(final ItemStack is) { - final CompoundNBT encodedValue = is.getTag(); + final CompoundTag encodedValue = is.getTag(); if (encodedValue == null) { throw new IllegalArgumentException("No pattern here!"); @@ -55,7 +55,7 @@ public class InvalidPatternHelper { } for (int i = 0; i < inTag.size(); i++) { - CompoundNBT in = inTag.getCompound(i); + CompoundTag in = inTag.getCompound(i); // skip empty slots in the crafting grid if (in.isEmpty()) { @@ -89,7 +89,7 @@ public class InvalidPatternHelper { private ItemStack stack; - public PatternIngredient(CompoundNBT tag) { + public PatternIngredient(CompoundTag tag) { this.stack = ItemStack.read(tag); if (this.stack.isEmpty()) { diff --git a/src/main/java/appeng/helpers/LocationRotation.java b/src/main/java/appeng/helpers/LocationRotation.java index d2b4cc499..88311fb4f 100644 --- a/src/main/java/appeng/helpers/LocationRotation.java +++ b/src/main/java/appeng/helpers/LocationRotation.java @@ -18,19 +18,19 @@ package appeng.helpers; -import net.minecraft.util.Direction; -import net.minecraft.world.IBlockReader; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; import appeng.api.util.IOrientable; public class LocationRotation implements IOrientable { - private final IBlockReader w; + private final BlockView w; private final int x; private final int y; private final int z; - public LocationRotation(final IBlockReader world, final int x, final int y, final int z) { + public LocationRotation(final BlockView world, final int x, final int y, final int z) { this.w = world; this.x = x; this.y = y; diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index fe68fc092..b4a62c859 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -20,10 +20,10 @@ package appeng.helpers; import net.minecraft.block.BlockState; import net.minecraft.state.Property; -import net.minecraft.util.Direction; -import net.minecraft.util.Direction.Axis; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Direction.Axis; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.api.util.IOrientable; @@ -32,10 +32,10 @@ import appeng.decorative.solid.QuartzPillarBlock; public class MetaRotation implements IOrientable { private final Property facingProp; - private final IBlockReader w; + private final BlockView w; private final BlockPos pos; - public MetaRotation(final IBlockReader world, final BlockPos pos, final Property facingProp) { + public MetaRotation(final BlockView world, final BlockPos pos, final Property facingProp) { this.w = world; this.pos = pos; this.facingProp = facingProp; diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index e8edf1ae9..a00e769d7 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -23,7 +23,7 @@ import java.util.concurrent.Future; import com.google.common.collect.ImmutableSet; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.world.World; import appeng.api.AEApi; @@ -49,9 +49,9 @@ public class MultiCraftingTracker { this.size = size; } - public void readFromNBT(final CompoundNBT extra) { + public void readFromNBT(final CompoundTag extra) { for (int x = 0; x < this.size; x++) { - final CompoundNBT link = extra.getCompound("links-" + x); + final CompoundTag link = extra.getCompound("links-" + x); if (link != null && !link.isEmpty()) { this.setLink(x, AEApi.instance().storage().loadCraftingLink(link, this.owner)); @@ -59,12 +59,12 @@ public class MultiCraftingTracker { } } - public void writeToNBT(final CompoundNBT extra) { + public void writeToNBT(final CompoundTag extra) { for (int x = 0; x < this.size; x++) { final ICraftingLink link = this.getLink(x); if (link != null) { - final CompoundNBT ln = new CompoundNBT(); + final CompoundTag ln = new CompoundTag(); link.writeToNBT(ln); extra.put("links-" + x, ln); } diff --git a/src/main/java/appeng/helpers/NullRotation.java b/src/main/java/appeng/helpers/NullRotation.java index 233f7ada3..4bfd8c3dc 100644 --- a/src/main/java/appeng/helpers/NullRotation.java +++ b/src/main/java/appeng/helpers/NullRotation.java @@ -18,7 +18,7 @@ package appeng.helpers; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.util.IOrientable; diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index 383ba4355..259d2ad7f 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -30,7 +30,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ICraftingRecipe; import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; import net.minecraft.world.World; @@ -61,7 +61,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable out = new ArrayList<>(); for (int x = 0; x < inTag.size(); x++) { - CompoundNBT ingredient = inTag.getCompound(x); + CompoundTag ingredient = inTag.getCompound(x); final ItemStack gs = ItemStack.read(ingredient); if (!ingredient.isEmpty() && gs.isEmpty()) { @@ -111,7 +111,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable implements IRecipeTransferHandl Map> ingredients = recipeLayout.getItemStacks() .getGuiIngredients(); - final CompoundNBT recipe = new CompoundNBT(); + final CompoundTag recipe = new CompoundTag(); int slotIndex = 0; for (Map.Entry> ingredientEntry : ingredients.entrySet()) { @@ -97,7 +97,7 @@ class RecipeTransferHandler implements IRecipeTransferHandl } for (final ItemStack is : list) { - final CompoundNBT tag = new CompoundNBT(); + final CompoundTag tag = new CompoundTag(); is.write(tag); tags.add(tag); } diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java index 3b8358914..af32a94c1 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java @@ -20,7 +20,7 @@ package appeng.integration.modules.theoneprobe.part; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.world.World; import mcjty.theoneprobe.api.IProbeHitData; @@ -42,7 +42,7 @@ public class ChannelInfoProvider implements IPartProbInfoProvider { final int maxChannels = (part instanceof SmartDenseCablePart) ? 32 : 8; if (part.getGridNode().isActive()) { - final CompoundNBT tmp = new CompoundNBT(); + final CompoundTag tmp = new CompoundTag(); part.writeToNBT(tmp); usedChannels = tmp.getByte("usedChannels"); } else { diff --git a/src/main/java/appeng/items/contents/PortableCellViewer.java b/src/main/java/appeng/items/contents/PortableCellViewer.java index 2d23feae6..f2f034053 100644 --- a/src/main/java/appeng/items/contents/PortableCellViewer.java +++ b/src/main/java/appeng/items/contents/PortableCellViewer.java @@ -19,7 +19,7 @@ package appeng.items.contents; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -86,7 +86,7 @@ public class PortableCellViewer extends MEMonitorHandler implement @Override public IConfigManager getConfigManager() { final ConfigManager out = new ConfigManager((manager, settingName, newValue) -> { - final CompoundNBT data = this.target.getOrCreateTag(); + final CompoundTag data = this.target.getOrCreateTag(); manager.writeToNBT(data); }); diff --git a/src/main/java/appeng/items/materials/MaterialItem.java b/src/main/java/appeng/items/materials/MaterialItem.java index 8bd4add1f..e31b07efd 100644 --- a/src/main/java/appeng/items/materials/MaterialItem.java +++ b/src/main/java/appeng/items/materials/MaterialItem.java @@ -31,9 +31,9 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; @@ -78,7 +78,7 @@ public final class MaterialItem extends AEBaseItem implements IStorageComponent, super.addInformation(stack, world, lines, advancedTooltips); if (materialType == MaterialType.NAME_PRESS) { - final CompoundNBT c = stack.getOrCreateTag(); + final CompoundTag c = stack.getOrCreateTag(); if (c.contains(TAG_INSCRIBE_NAME)) { lines.add(new StringTextComponent(c.getString(TAG_INSCRIBE_NAME))); } @@ -138,7 +138,7 @@ public final class MaterialItem extends AEBaseItem implements IStorageComponent, } @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { PlayerEntity player = context.getPlayer(); Hand hand = context.getHand(); if (player.isCrouching()) { @@ -161,12 +161,12 @@ public final class MaterialItem extends AEBaseItem implements IStorageComponent, if (u != null) { if (player.world.isRemote) { - return ActionResultType.PASS; + return ActionResult.PASS; } final InventoryAdaptor ad = new AdaptorItemHandler(upgrades); player.setHeldItem(hand, ad.addItems(player.getHeldItem(hand))); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } } diff --git a/src/main/java/appeng/items/misc/CrystalSeedItem.java b/src/main/java/appeng/items/misc/CrystalSeedItem.java index d83572a75..e3ddc99a5 100644 --- a/src/main/java/appeng/items/misc/CrystalSeedItem.java +++ b/src/main/java/appeng/items/misc/CrystalSeedItem.java @@ -25,12 +25,12 @@ import javax.annotation.Nullable; import com.google.common.base.Preconditions; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.IItemProvider; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; @@ -88,7 +88,7 @@ public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal { } private static int getGrowthTicks(final ItemStack is) { - CompoundNBT tag = is.getTag(); + CompoundTag tag = is.getTag(); return tag != null ? tag.getInt(TAG_GROWTH_TICKS) : 0; } diff --git a/src/main/java/appeng/items/misc/EncodedPatternItem.java b/src/main/java/appeng/items/misc/EncodedPatternItem.java index e1963d7e6..a7ffab199 100644 --- a/src/main/java/appeng/items/misc/EncodedPatternItem.java +++ b/src/main/java/appeng/items/misc/EncodedPatternItem.java @@ -27,8 +27,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; @@ -57,15 +57,15 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt } @Override - public ActionResult onItemRightClick(final World w, final PlayerEntity player, final Hand hand) { + public TypedActionResult onItemRightClick(final World w, final PlayerEntity player, final Hand hand) { this.clearPattern(player.getHeldItem(hand), player); - return new ActionResult<>(ActionResultType.SUCCESS, player.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, player.getHeldItem(hand)); } @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { - return this.clearPattern(stack, context.getPlayer()) ? ActionResultType.SUCCESS : ActionResultType.PASS; + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { + return this.clearPattern(stack, context.getPlayer()) ? ActionResult.SUCCESS : ActionResult.PASS; } private boolean clearPattern(final ItemStack stack, final PlayerEntity player) { diff --git a/src/main/java/appeng/items/parts/FacadeItem.java b/src/main/java/appeng/items/parts/FacadeItem.java index d696748e5..0c7399358 100644 --- a/src/main/java/appeng/items/parts/FacadeItem.java +++ b/src/main/java/appeng/items/parts/FacadeItem.java @@ -25,10 +25,10 @@ import net.minecraft.block.Blocks; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.item.*; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tags.BlockTags; import net.minecraft.tags.Tag; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -62,7 +62,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte } @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { return AEApi.instance().partHelper().placeBus(stack, context.getPos(), context.getFace(), context.getPlayer(), context.getHand(), context.getWorld()); } @@ -117,7 +117,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte } final ItemStack is = new ItemStack(this); - final CompoundNBT data = new CompoundNBT(); + final CompoundTag data = new CompoundTag(); data.putString(NBT_ITEM_ID, itemStack.getItem().getRegistryName().toString()); is.setTag(data); return is; @@ -136,7 +136,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte @Override public ItemStack getTextureItem(ItemStack is) { - CompoundNBT nbt = is.getTag(); + CompoundTag nbt = is.getTag(); if (nbt == null) { return ItemStack.EMPTY; @@ -180,7 +180,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte return ItemStack.EMPTY; } - final CompoundNBT facadeTag = new CompoundNBT(); + final CompoundTag facadeTag = new CompoundTag(); facadeTag.putString(NBT_ITEM_ID, item.getRegistryName().toString()); facadeStack.setTag(facadeTag); diff --git a/src/main/java/appeng/items/parts/PartItem.java b/src/main/java/appeng/items/parts/PartItem.java index 6af3ba4ef..00929c0f4 100644 --- a/src/main/java/appeng/items/parts/PartItem.java +++ b/src/main/java/appeng/items/parts/PartItem.java @@ -26,7 +26,7 @@ import javax.annotation.Nullable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import appeng.api.AEApi; import appeng.api.implementations.items.IItemGroup; @@ -47,11 +47,11 @@ public class PartItem extends AEBaseItem implements IPartItem> extends AEBaseI } @Override - public ActionResult onItemRightClick(final World world, final PlayerEntity player, final Hand hand) { + public TypedActionResult onItemRightClick(final World world, final PlayerEntity player, final Hand hand) { this.disassembleDrive(player.getHeldItem(hand), world, player); - return new ActionResult<>(ActionResultType.SUCCESS, player.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, player.getHeldItem(hand)); } private boolean disassembleDrive(final ItemStack stack, final World world, final PlayerEntity player) { @@ -193,9 +193,9 @@ public abstract class AbstractStorageCell> extends AEBaseI protected abstract void dropEmptyStorageCellCase(final InventoryAdaptor ia, final PlayerEntity player); @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { - return this.disassembleDrive(stack, context.getWorld(), context.getPlayer()) ? ActionResultType.SUCCESS - : ActionResultType.PASS; + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { + return this.disassembleDrive(stack, context.getWorld(), context.getPlayer()) ? ActionResult.SUCCESS + : ActionResult.PASS; } @Override diff --git a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java index ca7305c1c..17be0a5ab 100644 --- a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java +++ b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java @@ -22,7 +22,7 @@ import java.util.List; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; @@ -84,7 +84,7 @@ public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorag @Override public DimensionType getStoredDimension(final ItemStack is) { - final CompoundNBT c = is.getTag(); + final CompoundTag c = is.getTag(); if (c != null && c.contains(TAG_DIMENSION_ID)) { try { ResourceLocation dimTypeId = new ResourceLocation(c.getString(TAG_DIMENSION_ID)); @@ -146,7 +146,7 @@ public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorag } private void setStoredDimension(final ItemStack is, DimensionType dim) { - final CompoundNBT c = is.getOrCreateTag(); + final CompoundTag c = is.getOrCreateTag(); c.putString(TAG_DIMENSION_ID, dim.getRegistryName().toString()); } } diff --git a/src/main/java/appeng/items/tools/BiometricCardItem.java b/src/main/java/appeng/items/tools/BiometricCardItem.java index ef7152b2f..c4d93558e 100644 --- a/src/main/java/appeng/items/tools/BiometricCardItem.java +++ b/src/main/java/appeng/items/tools/BiometricCardItem.java @@ -27,9 +27,9 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NBTUtil; -import net.minecraft.util.ActionResult; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.Hand; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; @@ -50,14 +50,14 @@ public class BiometricCardItem extends AEBaseItem implements IBiometricCard { } @Override - public ActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { + public TypedActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { if (p.isCrouching()) { this.encode(p.getHeldItem(hand), p); p.swingArm(hand); - return ActionResult.resultSuccess(p.getHeldItem(hand)); + return TypedActionResult.resultSuccess(p.getHeldItem(hand)); } - return ActionResult.resultPass(p.getHeldItem(hand)); + return TypedActionResult.resultPass(p.getHeldItem(hand)); } @Override @@ -93,10 +93,10 @@ public class BiometricCardItem extends AEBaseItem implements IBiometricCard { @Override public void setProfile(final ItemStack itemStack, final GameProfile profile) { - final CompoundNBT tag = itemStack.getOrCreateTag(); + final CompoundTag tag = itemStack.getOrCreateTag(); if (profile != null) { - final CompoundNBT pNBT = new CompoundNBT(); + final CompoundTag pNBT = new CompoundTag(); NBTUtil.writeGameProfile(pNBT, profile); tag.put("profile", pNBT); } else { @@ -106,7 +106,7 @@ public class BiometricCardItem extends AEBaseItem implements IBiometricCard { @Override public GameProfile getProfile(final ItemStack is) { - final CompoundNBT tag = is.getOrCreateTag(); + final CompoundTag tag = is.getOrCreateTag(); if (tag.contains("profile")) { return NBTUtil.readGameProfile(tag.getCompound("profile")); } @@ -115,7 +115,7 @@ public class BiometricCardItem extends AEBaseItem implements IBiometricCard { @Override public EnumSet getPermissions(final ItemStack is) { - final CompoundNBT tag = is.getOrCreateTag(); + final CompoundTag tag = is.getOrCreateTag(); final EnumSet result = EnumSet.noneOf(SecurityPermissions.class); for (final SecurityPermissions sp : SecurityPermissions.values()) { @@ -129,13 +129,13 @@ public class BiometricCardItem extends AEBaseItem implements IBiometricCard { @Override public boolean hasPermission(final ItemStack is, final SecurityPermissions permission) { - final CompoundNBT tag = is.getOrCreateTag(); + final CompoundTag tag = is.getOrCreateTag(); return tag.getBoolean(permission.name()); } @Override public void removePermission(final ItemStack itemStack, final SecurityPermissions permission) { - final CompoundNBT tag = itemStack.getOrCreateTag(); + final CompoundTag tag = itemStack.getOrCreateTag(); if (tag.contains(permission.name())) { tag.remove(permission.name()); } @@ -143,7 +143,7 @@ public class BiometricCardItem extends AEBaseItem implements IBiometricCard { @Override public void addPermission(final ItemStack itemStack, final SecurityPermissions permission) { - final CompoundNBT tag = itemStack.getOrCreateTag(); + final CompoundTag tag = itemStack.getOrCreateTag(); tag.putBoolean(permission.name(), true); } diff --git a/src/main/java/appeng/items/tools/MemoryCardItem.java b/src/main/java/appeng/items/tools/MemoryCardItem.java index 3fcb71284..89bafa491 100644 --- a/src/main/java/appeng/items/tools/MemoryCardItem.java +++ b/src/main/java/appeng/items/tools/MemoryCardItem.java @@ -25,9 +25,9 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; @@ -64,7 +64,7 @@ public class MemoryCardItem extends AEBaseItem implements IMemoryCard { this.getSettingsName(stack)); lines.add(new TranslationTextComponent(firstLineKey)); - final CompoundNBT data = this.getData(stack); + final CompoundTag data = this.getData(stack); if (data.contains("tooltip")) { String tooltipKey = getFirstValidTranslationKey(data.getString("tooltip") + ".name", data.getString("tooltip")); @@ -101,29 +101,29 @@ public class MemoryCardItem extends AEBaseItem implements IMemoryCard { } @Override - public void setMemoryCardContents(final ItemStack is, final String settingsName, final CompoundNBT data) { - final CompoundNBT c = is.getOrCreateTag(); + public void setMemoryCardContents(final ItemStack is, final String settingsName, final CompoundTag data) { + final CompoundTag c = is.getOrCreateTag(); c.putString("Config", settingsName); c.put("Data", data); } @Override public String getSettingsName(final ItemStack is) { - final CompoundNBT c = is.getOrCreateTag(); + final CompoundTag c = is.getOrCreateTag(); final String name = c.getString("Config"); return name.isEmpty() ? GuiText.Blank.getTranslationKey() : name; } @Override - public CompoundNBT getData(final ItemStack is) { - final CompoundNBT c = is.getOrCreateTag(); - CompoundNBT o = c.getCompound("Data"); + public CompoundTag getData(final ItemStack is) { + final CompoundTag c = is.getOrCreateTag(); + CompoundTag o = c.getCompound("Data"); return o.copy(); } @Override public AEColor[] getColorCode(ItemStack is) { - final CompoundNBT tag = this.getData(is); + final CompoundTag tag = this.getData(is); if (tag.contains("colorCode")) { final int[] frequency = tag.getIntArray("colorCode"); @@ -164,19 +164,19 @@ public class MemoryCardItem extends AEBaseItem implements IMemoryCard { } @Override - public ActionResultType onItemUse(ItemUseContext context) { + public ActionResult onItemUse(ItemUseContext context) { if (context.getPlayer().isCrouching()) { if (!context.getPlayer().world.isRemote) { this.clearCard(context.getPlayer(), context.getWorld(), context.getHand()); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } else { return super.onItemUse(context); } } @Override - public ActionResult onItemRightClick(World w, PlayerEntity player, Hand hand) { + public TypedActionResult onItemRightClick(World w, PlayerEntity player, Hand hand) { if (player.isCrouching()) { if (!w.isRemote) { this.clearCard(player, w, hand); diff --git a/src/main/java/appeng/items/tools/NetworkToolItem.java b/src/main/java/appeng/items/tools/NetworkToolItem.java index dfe524a89..bb0c8ddd9 100644 --- a/src/main/java/appeng/items/tools/NetworkToolItem.java +++ b/src/main/java/appeng/items/tools/NetworkToolItem.java @@ -24,9 +24,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; @@ -72,7 +72,7 @@ public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench { } @Override - public ActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { + public TypedActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { if (Platform.isClient()) { final RayTraceResult mop = AppEng.proxy.getRTR(); @@ -81,11 +81,11 @@ public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench { } } - return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, p.getHeldItem(hand)); } @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { final BlockRayTraceResult mop = new BlockRayTraceResult(context.getHitVec(), context.getFace(), context.getPos(), context.isInside()); final TileEntity te = context.getWorld().getTileEntity(context.getPos()); @@ -95,20 +95,20 @@ public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench { if (part.part != null || part.facade != null) { if (part.part instanceof INetworkToolAgent && !((INetworkToolAgent) part.part).showNetworkInfo(mop)) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } else if (context.getPlayer().isCrouching()) { - return ActionResultType.PASS; + return ActionResult.PASS; } } } else if (te instanceof INetworkToolAgent && !((INetworkToolAgent) te).showNetworkInfo(mop)) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } if (Platform.isClient()) { NetworkHandler.instance().sendToServer(new ClickPacket(context)); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } @Override diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java index 915ae12ec..19b66aa76 100644 --- a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java +++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java @@ -32,13 +32,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.item.SnowballItem; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.state.IProperty; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; @@ -115,7 +115,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem } @Override - public ActionResultType onItemUse(ItemUseContext context) { + public ActionResult onItemUse(ItemUseContext context) { World w = context.getWorld(); BlockPos pos = context.getPos(); ItemStack is = context.getItem(); @@ -143,7 +143,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem } if (p != null && !Platform.hasPermissions(new DimensionalCoord(w, pos), p)) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } final double powerPerUse = 100; @@ -157,7 +157,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem inv.extractItems(AEItemStack.fromItemStack(paintBall), Actionable.MODULATE, new BaseActionSource()); this.extractAEPower(is, powerPerUse, Actionable.MODULATE); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } } @@ -170,7 +170,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem inv.extractItems(AEItemStack.fromItemStack(paintBall), Actionable.MODULATE, new BaseActionSource()); this.extractAEPower(is, powerPerUse, Actionable.MODULATE); ((PaintSplotchesTileEntity) painted).cleanSide(side.getOpposite()); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } else if (!paintBall.isEmpty()) { final AEColor color = this.getColorFromItem(paintBall); @@ -180,7 +180,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem inv.extractItems(AEItemStack.fromItemStack(paintBall), Actionable.MODULATE, new BaseActionSource()); this.extractAEPower(is, powerPerUse, Actionable.MODULATE); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } } @@ -190,7 +190,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem this.cycleColors(is, paintBall, 1); } - return ActionResultType.FAIL; + return ActionResult.FAIL; } @Override @@ -235,9 +235,9 @@ public class ColorApplicatorItem extends AEBasePoweredItem } public ItemStack getColor(final ItemStack is) { - final CompoundNBT c = is.getTag(); + final CompoundTag c = is.getTag(); if (c != null && c.contains(TAG_COLOR)) { - final CompoundNBT color = c.getCompound(TAG_COLOR); + final CompoundTag color = c.getCompound(TAG_COLOR); final ItemStack oldColor = ItemStack.read(color); if (!oldColor.isEmpty()) { return oldColor; @@ -307,11 +307,11 @@ public class ColorApplicatorItem extends AEBasePoweredItem } private void setColor(final ItemStack is, final ItemStack newColor) { - final CompoundNBT data = is.getOrCreateTag(); + final CompoundTag data = is.getOrCreateTag(); if (newColor.isEmpty()) { data.remove(TAG_COLOR); } else { - final CompoundNBT color = new CompoundNBT(); + final CompoundTag color = new CompoundTag(); newColor.write(color); data.put(TAG_COLOR, color); } diff --git a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java index 2eb1c251e..fc68ddad3 100644 --- a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java +++ b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java @@ -24,7 +24,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.TNTBlock; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; @@ -202,11 +202,11 @@ public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockT // Overridden to allow use of the item on WATER and LAVA which are otherwise not // considered for onItemUse @Override - public ActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { + public TypedActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { final RayTraceResult target = rayTrace(w, p, RayTraceContext.FluidMode.ANY); if (target.getType() != RayTraceResult.Type.BLOCK) { - return new ActionResult<>(ActionResultType.FAIL, p.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.FAIL, p.getHeldItem(hand)); } else { BlockPos pos = ((BlockRayTraceResult) target).getPos(); final BlockState state = w.getBlockState(pos); @@ -218,11 +218,11 @@ public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockT } } - return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, p.getHeldItem(hand)); } @Override - public ActionResultType onItemUse(ItemUseContext context) { + public ActionResult onItemUse(ItemUseContext context) { World w = context.getWorld(); ItemStack item = context.getItem(); BlockPos pos = context.getPos(); @@ -231,7 +231,7 @@ public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockT boolean tryBoth = false; if (p == null) { if (w.isRemote) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } p = Platform.getPlayer((ServerWorld) w); // Fake players cannot crouch and we cannot communicate whether they want to @@ -241,7 +241,7 @@ public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockT if (this.getAECurrentPower(item) > 1600) { if (!p.canPlayerEdit(pos, side, item)) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } final Block block = w.getBlockState(pos).getBlock(); @@ -251,26 +251,26 @@ public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockT if (this.canCool(block, fluid)) { this.extractAEPower(item, 1600, Actionable.MODULATE); this.cool(block, fluid, w, pos); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } if (tryBoth || !p.isCrouching()) { if (block instanceof TNTBlock) { w.removeBlock(pos, false); block.catchFire(w.getBlockState(pos), w, pos, context.getFace(), p); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } if (block instanceof TinyTNTBlock) { w.removeBlock(pos, false); ((TinyTNTBlock) block).startFuse(w, pos, p); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } if (this.canHeat(block, fluid)) { this.extractAEPower(item, 1600, Actionable.MODULATE); this.heat(block, fluid, w, pos); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } final ItemStack[] stack = Platform.getBlockDrops(w, pos); @@ -317,12 +317,12 @@ public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockT Platform.spawnDrops(w, pos, or.getDrops()); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } else { final BlockPos offsetPos = pos.offset(side); if (!p.canPlayerEdit(offsetPos, side, item)) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } if (w.isAirBlock(offsetPos)) { @@ -333,11 +333,11 @@ public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockT w.setBlockState(offsetPos, Blocks.FIRE.getDefaultState()); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } } - return ActionResultType.PASS; + return ActionResult.PASS; } } diff --git a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java index 187cb4bb6..76d093f2f 100644 --- a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java +++ b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java @@ -32,10 +32,10 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; import net.minecraft.util.DamageSource; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; @@ -105,7 +105,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< } @Override - public ActionResult onItemRightClick(final World w, final PlayerEntity p, final @Nullable Hand hand) { + public TypedActionResult onItemRightClick(final World w, final PlayerEntity p, final @Nullable Hand hand) { if (this.getAECurrentPower(p.getHeldItem(hand)) > ENERGY_PER_SHOT) { int shots = 1; @@ -127,18 +127,18 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< this.extractAEPower(p.getHeldItem(hand), ENERGY_PER_SHOT, Actionable.MODULATE); if (Platform.isClient()) { - return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, p.getHeldItem(hand)); } aeAmmo.setStackSize(1); final ItemStack ammo = aeAmmo.createItemStack(); if (ammo.isEmpty()) { - return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, p.getHeldItem(hand)); } aeAmmo = inv.extractItems(aeAmmo, Actionable.MODULATE, new PlayerSource(p, null)); if (aeAmmo == null) { - return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, p.getHeldItem(hand)); } final LookDirection dir = Platform.getPlayerRay(p, 32); @@ -158,7 +158,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< if (type.getItem() instanceof PaintBallItem) { this.shootPaintBalls(type, w, p, rayFrom, rayTo, direction, d0, d1, d2); } - return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, p.getHeldItem(hand)); } else { this.standardAmmo(penetration, w, p, rayFrom, rayTo, direction, d0, d1, d2); } @@ -167,11 +167,11 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< if (Platform.isServer()) { p.sendMessage(PlayerMessages.AmmoDepleted.get()); } - return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, p.getHeldItem(hand)); } } } - return new ActionResult<>(ActionResultType.FAIL, p.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.FAIL, p.getHeldItem(hand)); } private void shootPaintBalls(final ItemStack type, final World w, final PlayerEntity p, final Vec3d Vec3d, diff --git a/src/main/java/appeng/items/tools/powered/PortableCellItem.java b/src/main/java/appeng/items/tools/powered/PortableCellItem.java index 305e8d1b6..35dcad66b 100644 --- a/src/main/java/appeng/items/tools/powered/PortableCellItem.java +++ b/src/main/java/appeng/items/tools/powered/PortableCellItem.java @@ -25,8 +25,8 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; @@ -61,9 +61,9 @@ public class PortableCellItem extends AEBasePoweredItem implements IStorageCell< } @Override - public ActionResult onItemRightClick(final World w, final PlayerEntity player, final Hand hand) { + public TypedActionResult onItemRightClick(final World w, final PlayerEntity player, final Hand hand) { ContainerOpener.openContainer(MEPortableCellContainer.TYPE, player, ContainerLocator.forHand(player, hand)); - return new ActionResult<>(ActionResultType.SUCCESS, player.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, player.getHeldItem(hand)); } @Override diff --git a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java index 2c78defd0..197a033a7 100644 --- a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java +++ b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java @@ -24,9 +24,9 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; @@ -54,9 +54,9 @@ public class WirelessTerminalItem extends AEBasePoweredItem implements IWireless } @Override - public ActionResult onItemRightClick(final World w, final PlayerEntity player, final Hand hand) { + public TypedActionResult onItemRightClick(final World w, final PlayerEntity player, final Hand hand) { AEApi.instance().registries().wireless().openWirelessTerminalGui(player.getHeldItem(hand), w, player, hand); - return new ActionResult<>(ActionResultType.SUCCESS, player.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, player.getHeldItem(hand)); } @Override @@ -66,7 +66,7 @@ public class WirelessTerminalItem extends AEBasePoweredItem implements IWireless super.addInformation(stack, world, lines, advancedTooltips); if (stack.hasTag()) { - final CompoundNBT tag = stack.getOrCreateTag(); + final CompoundTag tag = stack.getOrCreateTag(); if (tag != null) { final String encKey = tag.getString("encryptionKey"); @@ -99,7 +99,7 @@ public class WirelessTerminalItem extends AEBasePoweredItem implements IWireless @Override public IConfigManager getConfigManager(final ItemStack target) { final ConfigManager out = new ConfigManager((manager, settingName, newValue) -> { - final CompoundNBT data = target.getOrCreateTag(); + final CompoundTag data = target.getOrCreateTag(); manager.writeToNBT(data); }); @@ -113,13 +113,13 @@ public class WirelessTerminalItem extends AEBasePoweredItem implements IWireless @Override public String getEncryptionKey(final ItemStack item) { - final CompoundNBT tag = item.getOrCreateTag(); + final CompoundTag tag = item.getOrCreateTag(); return tag.getString("encryptionKey"); } @Override public void setEncryptionKey(final ItemStack item, final String encKey, final String name) { - final CompoundNBT tag = item.getOrCreateTag(); + final CompoundTag tag = item.getOrCreateTag(); tag.putString("encryptionKey", encKey); tag.putString("name", name); } diff --git a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java index 0f47a8bca..610e6083b 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java @@ -25,7 +25,7 @@ import java.util.function.DoubleSupplier; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.NonNullList; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; @@ -57,7 +57,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow @Override public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { - final CompoundNBT tag = stack.getTag(); + final CompoundTag tag = stack.getTag(); double internalCurrentPower = 0; final double internalMaxPower = this.getAEMaxPower(stack); @@ -84,7 +84,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow if (this.isInGroup(group)) { final ItemStack charged = new ItemStack(this, 1); - final CompoundNBT tag = charged.getOrCreateTag(); + final CompoundTag tag = charged.getOrCreateTag(); tag.putDouble(CURRENT_POWER_NBT_KEY, this.getAEMaxPower(charged)); tag.putDouble(MAX_POWER_NBT_KEY, this.getAEMaxPower(charged)); @@ -115,7 +115,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow final double overflow = amount - required; if (mode == Actionable.MODULATE) { - final CompoundNBT data = is.getOrCreateTag(); + final CompoundTag data = is.getOrCreateTag(); final double toAdd = Math.min(amount, required); data.putDouble(CURRENT_POWER_NBT_KEY, currentStorage + toAdd); @@ -130,7 +130,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow final double fulfillable = Math.min(amount, currentStorage); if (mode == Actionable.MODULATE) { - final CompoundNBT data = is.getOrCreateTag(); + final CompoundTag data = is.getOrCreateTag(); data.putDouble(CURRENT_POWER_NBT_KEY, currentStorage - fulfillable); } @@ -145,7 +145,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow @Override public double getAECurrentPower(final ItemStack is) { - final CompoundNBT data = is.getOrCreateTag(); + final CompoundTag data = is.getOrCreateTag(); return data.getDouble(CURRENT_POWER_NBT_KEY); } @@ -156,7 +156,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow } @Override - public ICapabilityProvider initCapabilities(ItemStack stack, CompoundNBT nbt) { + public ICapabilityProvider initCapabilities(ItemStack stack, CompoundTag nbt) { return new PoweredItemCapabilities(stack, this); } } diff --git a/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java b/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java index fa60aad55..9cc833075 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java +++ b/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java @@ -21,7 +21,7 @@ package appeng.items.tools.powered.powersink; import javax.annotation.Nullable; import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java b/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java index 9d070f2f4..9fd819abf 100644 --- a/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java @@ -22,8 +22,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -47,22 +47,22 @@ public class QuartzCuttingKnifeItem extends AEBaseItem implements IGuiItem { } @Override - public ActionResultType onItemUse(ItemUseContext context) { + public ActionResult onItemUse(ItemUseContext context) { PlayerEntity player = context.getPlayer(); if (Platform.isServer() && player != null) { ContainerOpener.openContainer(QuartzKnifeContainer.TYPE, context.getPlayer(), ContainerLocator.forItemUseContext(context)); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } @Override - public ActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { + public TypedActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { if (Platform.isServer()) { ContainerOpener.openContainer(QuartzKnifeContainer.TYPE, p, ContainerLocator.forHand(p, hand)); } p.swingArm(hand); - return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand)); + return new TypedActionResult<>(ActionResult.SUCCESS, p.getHeldItem(hand)); } @Override diff --git a/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java b/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java index f6c476ccb..d2aa16ead 100644 --- a/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java @@ -23,7 +23,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.util.ActionResultType; +import net.minecraft.util.ActionResult; import net.minecraft.util.math.BlockPos; import appeng.api.implementations.items.IAEWrench; @@ -39,7 +39,7 @@ public class QuartzWrenchItem extends AEBaseItem implements IAEWrench { } @Override - public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context) { + public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { if (!context.getPlayer().isCrouching() && Platform .hasPermissions(new DimensionalCoord(context.getWorld(), context.getPos()), context.getPlayer())) { @@ -48,17 +48,17 @@ public class QuartzWrenchItem extends AEBaseItem implements IAEWrench { if (Platform.isClient()) { // TODO 1.10-R - if we return FAIL on client, action will not be sent to server. // Fix that in all Block#onItemUseFirst overrides. - return !context.getWorld().isRemote ? ActionResultType.SUCCESS : ActionResultType.PASS; + return !context.getWorld().isRemote ? ActionResult.SUCCESS : ActionResult.PASS; } AEBaseBlock aeBlock = (AEBaseBlock) block; if (aeBlock.rotateAroundFaceAxis(context.getWorld(), context.getPos(), context.getFace())) { context.getPlayer().swingArm(context.getHand()); - return !context.getWorld().isRemote ? ActionResultType.SUCCESS : ActionResultType.FAIL; + return !context.getWorld().isRemote ? ActionResult.SUCCESS : ActionResult.FAIL; } } } - return ActionResultType.PASS; + return ActionResult.PASS; } @Override diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 4c8a31c9c..34a8eb7cf 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -26,9 +26,9 @@ import java.util.Deque; import java.util.EnumSet; import java.util.List; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; import net.minecraft.world.World; @@ -281,9 +281,9 @@ public class GridNode implements IGridNode, IPathItem { } @Override - public void loadFromNBT(final String name, final CompoundNBT nodeData) { + public void loadFromNBT(final String name, final CompoundTag nodeData) { if (this.myGrid == null) { - final CompoundNBT node = nodeData.getCompound(name); + final CompoundTag node = nodeData.getCompound(name); this.playerID = node.getInt("p"); this.setLastSecurityKey(node.getLong("k")); @@ -296,9 +296,9 @@ public class GridNode implements IGridNode, IPathItem { } @Override - public void saveToNBT(final String name, final CompoundNBT nodeData) { + public void saveToNBT(final String name, final CompoundTag nodeData) { if (this.myStorage != null) { - final CompoundNBT node = new CompoundNBT(); + final CompoundTag node = new CompoundTag(); node.putInt("p", this.playerID); node.putLong("k", this.getLastSecurityKey()); diff --git a/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java index 3e2de69b0..e08476e1e 100644 --- a/src/main/java/appeng/me/GridStorage.java +++ b/src/main/java/appeng/me/GridStorage.java @@ -21,7 +21,7 @@ package appeng.me; import java.lang.ref.WeakReference; import java.util.WeakHashMap; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import appeng.api.networking.IGrid; import appeng.api.networking.IGridStorage; @@ -30,7 +30,7 @@ import appeng.core.worlddata.WorldData; public class GridStorage implements IGridStorage { private final long myID; - private final CompoundNBT data; + private final CompoundTag data; private final WeakHashMap divided = new WeakHashMap<>(); private WeakReference internalGrid = null; @@ -41,7 +41,7 @@ public class GridStorage implements IGridStorage { */ public GridStorage(final long id) { this.myID = id; - this.data = new CompoundNBT(); + this.data = new CompoundTag(); } /** @@ -50,7 +50,7 @@ public class GridStorage implements IGridStorage { * @param data The Grid data. * @param id ID of grid storage */ - public GridStorage(final long id, final CompoundNBT data) { + public GridStorage(final long id, final CompoundTag data) { this.myID = id; this.data = data; } @@ -60,7 +60,7 @@ public class GridStorage implements IGridStorage { */ public GridStorage() { this.myID = 0; - this.data = new CompoundNBT(); + this.data = new CompoundTag(); } public void saveState() { @@ -79,7 +79,7 @@ public class GridStorage implements IGridStorage { } @Override - public CompoundNBT dataObject() { + public CompoundTag dataObject() { return this.data; } diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index fb67e777d..f72cbc8df 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableList; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; @@ -862,8 +862,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { + Integer.toString(hmm, Character.MAX_RADIX); } - private CompoundNBT generateLinkData(final String craftingID, final boolean standalone, final boolean req) { - final CompoundNBT tag = new CompoundNBT(); + private CompoundTag generateLinkData(final String craftingID, final boolean standalone, final boolean req) { + final CompoundTag tag = new CompoundTag(); tag.putString("CraftID", craftingID); tag.putBoolean("canceled", false); @@ -976,21 +976,21 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { return is; } - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { data.put("finalOutput", this.writeItem(this.finalOutput)); data.put("inventory", this.writeList(this.inventory.getItemList())); data.putBoolean("waiting", this.waiting); data.putBoolean("isComplete", this.isComplete); if (this.myLastLink != null) { - final CompoundNBT link = new CompoundNBT(); + final CompoundTag link = new CompoundTag(); this.myLastLink.writeToNBT(link); data.put("link", link); } final ListNBT list = new ListNBT(); for (final Entry e : this.tasks.entrySet()) { - final CompoundNBT item = this.writeItem(AEItemStack.fromItemStack(e.getKey().getPattern())); + final CompoundTag item = this.writeItem(AEItemStack.fromItemStack(e.getKey().getPattern())); item.putLong("craftingProgress", e.getValue().value); list.add(item); } @@ -1003,8 +1003,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { data.putLong("remainingItemCount", this.getRemainingItemCount()); } - private CompoundNBT writeItem(final IAEItemStack finalOutput2) { - final CompoundNBT out = new CompoundNBT(); + private CompoundTag writeItem(final IAEItemStack finalOutput2) { + final CompoundTag out = new CompoundTag(); if (finalOutput2 != null) { finalOutput2.writeToNBT(out); @@ -1037,7 +1037,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { this.updateName(); } - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { this.finalOutput = AEItemStack.fromNBT(data.getCompound("finalOutput")); for (final IAEItemStack ais : this.readList(data.getList("inventory", 10))) { this.inventory.injectItems(ais, Actionable.MODULATE, this.machineSrc); @@ -1047,14 +1047,14 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { this.isComplete = data.getBoolean("isComplete"); if (data.contains("link")) { - final CompoundNBT link = data.getCompound("link"); + final CompoundTag link = data.getCompound("link"); this.myLastLink = new CraftingLink(link, this); this.submitLink(this.myLastLink); } final ListNBT list = data.getList("tasks", 10); for (int x = 0; x < list.size(); x++) { - final CompoundNBT item = list.getCompound(x); + final CompoundTag item = list.getCompound(x); final IAEItemStack pattern = AEItemStack.fromNBT(item); if (pattern != null && pattern.getItem() instanceof ICraftingPatternItem) { final ICraftingPatternItem cpi = (ICraftingPatternItem) pattern.getItem(); diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java index 66a34aa44..b3b50821a 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java @@ -20,7 +20,7 @@ package appeng.me.cluster.implementations; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.api.AEApi; @@ -135,7 +135,7 @@ public class QuantumCalculator extends MBCalculator { return te instanceof QuantumBridgeTileEntity; } - private boolean isBlockAtLocation(final IBlockReader w, final BlockPos pos, final IBlockDefinition def) { + private boolean isBlockAtLocation(final BlockView w, final BlockPos pos, final IBlockDefinition def) { return def.maybeBlock().map(block -> block == w.getBlockState(pos).getBlock()).orElse(false); } } diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index 252418c2a..baa9a7b52 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -25,8 +25,8 @@ import com.mojang.authlib.GameProfile; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.math.Direction; import appeng.api.AEApi; import appeng.api.networking.GridFlags; @@ -59,7 +59,7 @@ public class AENetworkProxy implements IGridBlock { private final boolean worldNode; private final String nbtName; // name private AEColor myColor = AEColor.TRANSPARENT; - private CompoundNBT data = null; // input + private CompoundTag data = null; // input private ItemStack myRepInstance = ItemStack.EMPTY; private boolean isReady = false; private IGridNode node = null; @@ -81,7 +81,7 @@ public class AENetworkProxy implements IGridBlock { this.myRepInstance = is; } - public void writeToNBT(final CompoundNBT tag) { + public void writeToNBT(final CompoundTag tag) { if (this.node != null) { this.node.saveToNBT(this.nbtName, tag); } @@ -137,7 +137,7 @@ public class AENetworkProxy implements IGridBlock { return this.node; } - public void readFromNBT(final CompoundNBT tag) { + public void readFromNBT(final CompoundTag tag) { this.data = tag; if (this.node != null && this.data != null) { this.node.loadFromNBT(this.nbtName, this.data); diff --git a/src/main/java/appeng/me/storage/AbstractCellInventory.java b/src/main/java/appeng/me/storage/AbstractCellInventory.java index 694d404f2..da5e1b950 100644 --- a/src/main/java/appeng/me/storage/AbstractCellInventory.java +++ b/src/main/java/appeng/me/storage/AbstractCellInventory.java @@ -19,7 +19,7 @@ package appeng.me.storage; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraftforge.items.IItemHandler; import appeng.api.config.FuzzyMode; @@ -47,7 +47,7 @@ public abstract class AbstractCellInventory> implements IC protected static final String ITEM_PRE_FORMATTED_FUZZY = "FP"; private static final String[] ITEM_SLOT_KEYS = new String[MAX_ITEM_TYPES]; private static final String[] ITEM_SLOT_COUNT_KEYS = new String[MAX_ITEM_TYPES]; - private final CompoundNBT tagCompound; + private final CompoundTag tagCompound; protected final ISaveProvider container; private int maxItemTypes = MAX_ITEM_TYPES; private short storedItems = 0; @@ -107,7 +107,7 @@ public abstract class AbstractCellInventory> implements IC for (final T v : this.cellItems) { itemCount += v.getStackSize(); - final CompoundNBT g = new CompoundNBT(); + final CompoundTag g = new CompoundTag(); v.writeToNBT(g); this.tagCompound.put(ITEM_SLOT_KEYS[x], g); this.tagCompound.putInt(ITEM_SLOT_COUNT_KEYS[x], (int) v.getStackSize()); @@ -168,7 +168,7 @@ public abstract class AbstractCellInventory> implements IC boolean needsUpdate = false; for (int slot = 0; slot < types; slot++) { - CompoundNBT compoundTag = this.tagCompound.getCompound(ITEM_SLOT_KEYS[slot]); + CompoundTag compoundTag = this.tagCompound.getCompound(ITEM_SLOT_KEYS[slot]); int stackSize = this.tagCompound.getInt(ITEM_SLOT_COUNT_KEYS[slot]); needsUpdate |= !this.loadCellItem(compoundTag, stackSize); } @@ -185,7 +185,7 @@ public abstract class AbstractCellInventory> implements IC * @param stackSize * @return true when successfully loaded */ - protected abstract boolean loadCellItem(CompoundNBT compoundTag, int stackSize); + protected abstract boolean loadCellItem(CompoundTag compoundTag, int stackSize); @Override public IItemList getAvailableItems(final IItemList out) { diff --git a/src/main/java/appeng/me/storage/BasicCellInventory.java b/src/main/java/appeng/me/storage/BasicCellInventory.java index c8edc7308..d11c052b1 100644 --- a/src/main/java/appeng/me/storage/BasicCellInventory.java +++ b/src/main/java/appeng/me/storage/BasicCellInventory.java @@ -3,7 +3,7 @@ package appeng.me.storage; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import appeng.api.config.Actionable; import appeng.api.exceptions.AppEngException; @@ -208,7 +208,7 @@ public class BasicCellInventory> extends AbstractCellInven } @Override - protected boolean loadCellItem(CompoundNBT compoundTag, int stackSize) { + protected boolean loadCellItem(CompoundTag compoundTag, int stackSize) { // Now load the item stack final T t; try { diff --git a/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java b/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java index a769908e5..e953734b5 100644 --- a/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java +++ b/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java @@ -19,7 +19,7 @@ package appeng.me.storage; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraftforge.items.IItemHandler; import appeng.api.config.FuzzyMode; @@ -122,7 +122,7 @@ public class BasicCellInventoryHandler> extends MEInventor return this.getWhitelist(); } - CompoundNBT openNbtData() { + CompoundTag openNbtData() { return this.getCellInv().getItemStack().getOrCreateTag(); } } diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 8bd1c8910..f312e6350 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -33,15 +33,15 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -202,7 +202,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { } @@ -212,12 +212,12 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { this.proxy.readFromNBT(data); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { this.proxy.writeToNBT(data); } @@ -316,7 +316,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, * @param from source of settings * @param compound compound of source */ - private void uploadSettings(final SettingsFrom from, final CompoundNBT compound) { + private void uploadSettings(final SettingsFrom from, final CompoundTag compound) { if (compound != null) { final IConfigManager cm = this.getConfigManager(); if (cm != null) { @@ -347,8 +347,8 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, * * @return compound of source */ - private CompoundNBT downloadSettings(final SettingsFrom from) { - final CompoundNBT output = new CompoundNBT(); + private CompoundTag downloadSettings(final SettingsFrom from) { + final CompoundTag output = new CompoundTag(); final IConfigManager cm = this.getConfigManager(); if (cm != null) { @@ -392,14 +392,14 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, final String name = is.getTranslationKey(); if (player.isCrouching()) { - final CompoundNBT data = this.downloadSettings(SettingsFrom.MEMORY_CARD); + final CompoundTag data = this.downloadSettings(SettingsFrom.MEMORY_CARD); if (data != null) { memoryCard.setMemoryCardContents(memCardIS, name, data); memoryCard.notifyUser(player, MemoryCardMessages.SETTINGS_SAVED); } } else { final String storedName = memoryCard.getSettingsName(memCardIS); - final CompoundNBT data = memoryCard.getData(memCardIS); + final CompoundTag data = memoryCard.getData(memCardIS); if (name.equals(storedName)) { this.uploadSettings(SettingsFrom.MEMORY_CARD, data); memoryCard.notifyUser(player, MemoryCardMessages.SETTINGS_LOADED); diff --git a/src/main/java/appeng/parts/BusCollisionHelper.java b/src/main/java/appeng/parts/BusCollisionHelper.java index 93d1a65c6..9abfa0b27 100644 --- a/src/main/java/appeng/parts/BusCollisionHelper.java +++ b/src/main/java/appeng/parts/BusCollisionHelper.java @@ -20,7 +20,7 @@ package appeng.parts; import java.util.List; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.AxisAlignedBB; import appeng.api.parts.IPartCollisionHelper; diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 2f4741ffa..c08dc219c 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -29,17 +29,17 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.world.IBlockReader; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; @@ -671,7 +671,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { this.hasRedstone = YesNo.UNDECIDED; for (final AEPartLocation s : AEPartLocation.values()) { @@ -790,7 +790,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return updateBlock; } - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { data.putInt("hasRedstone", this.hasRedstone.ordinal()); final IFacadeContainer fc = this.getFacadeContainer(); @@ -799,10 +799,10 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I final IPart part = this.getPart(s); if (part != null) { - final CompoundNBT def = new CompoundNBT(); + final CompoundTag def = new CompoundTag(); part.getItemStack(PartItemStack.WORLD).write(def); - final CompoundNBT extra = new CompoundNBT(); + final CompoundTag extra = new CompoundTag(); part.writeToNBT(extra); data.put("def:" + this.getSide(part).ordinal(), def); @@ -825,7 +825,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I throw new IllegalStateException("Uhh Bad Part (" + part + ") on Side."); } - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { invalidateShapes(); if (data.contains("hasRedstone")) { @@ -839,8 +839,8 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I String extraKey = "extra:" + side.ordinal(); if (data.contains(defKey, Constants.NBT.TAG_COMPOUND) && data.contains(extraKey, Constants.NBT.TAG_COMPOUND)) { - final CompoundNBT def = data.getCompound(defKey); - final CompoundNBT extra = data.getCompound(extraKey); + final CompoundTag def = data.getCompound(defKey); + final CompoundTag extra = data.getCompound(extraKey); IPart p = this.getPart(side); final ItemStack iss = ItemStack.read(def); if (iss.isEmpty()) { diff --git a/src/main/java/appeng/parts/ICableBusContainer.java b/src/main/java/appeng/parts/ICableBusContainer.java index 06f7207d6..4eade0951 100644 --- a/src/main/java/appeng/parts/ICableBusContainer.java +++ b/src/main/java/appeng/parts/ICableBusContainer.java @@ -24,11 +24,11 @@ import java.util.Random; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -51,7 +51,7 @@ public interface ICableBusContainer { boolean clicked(PlayerEntity player, Hand hand, Vec3d hitVec); - void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor); + void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor); boolean isEmpty(); diff --git a/src/main/java/appeng/parts/NullCableBusContainer.java b/src/main/java/appeng/parts/NullCableBusContainer.java index 0b853e001..7cdbc599d 100644 --- a/src/main/java/appeng/parts/NullCableBusContainer.java +++ b/src/main/java/appeng/parts/NullCableBusContainer.java @@ -24,11 +24,11 @@ import java.util.Random; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.api.parts.SelectedPart; @@ -63,7 +63,7 @@ public class NullCableBusContainer implements ICableBusContainer { } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { } diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index c1491de02..76e98a7f0 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -24,7 +24,7 @@ import java.util.Optional; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItem; @@ -33,8 +33,8 @@ import net.minecraft.item.DirectionalPlaceContext; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; @@ -73,10 +73,10 @@ public class PartPlacement { private final ThreadLocal placing = new ThreadLocal<>(); private boolean wasCanceled = false; - public static ActionResultType place(final ItemStack held, final BlockPos pos, Direction side, + public static ActionResult place(final ItemStack held, final BlockPos pos, Direction side, final PlayerEntity player, final Hand hand, final World world, PlaceType pass, final int depth) { if (depth > 3) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } // FIXME: This was changed alot. @@ -88,7 +88,7 @@ public class PartPlacement { if (!held.isEmpty() && Platform.isWrench(player, held, pos) && player.isCrouching()) { if (!Platform.hasPermissions(new DimensionalCoord(world, pos), player)) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } final TileEntity tile = world.getTileEntity(pos); @@ -130,10 +130,10 @@ public class PartPlacement { NetworkHandler.instance() .sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand)); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } - return ActionResultType.FAIL; + return ActionResult.FAIL; } TileEntity tile = world.getTileEntity(pos); @@ -149,7 +149,7 @@ public class PartPlacement { if (host != null) { if (!world.isRemote) { if (host.getPart(AEPartLocation.INTERNAL) == null) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } if (host.canAddPart(held, AEPartLocation.fromFacing(side))) { @@ -165,17 +165,17 @@ public class PartPlacement { MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(player, held, hand)); } } - return ActionResultType.CONSUME; + return ActionResult.CONSUME; } } } else { player.swingArm(hand); NetworkHandler.instance() .sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand)); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } - return ActionResultType.FAIL; + return ActionResult.FAIL; } } @@ -191,7 +191,7 @@ public class PartPlacement { NetworkHandler.instance() .sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand)); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } } @@ -199,7 +199,7 @@ public class PartPlacement { } if (held.isEmpty() || !(held.getItem() instanceof IPartItem)) { - return ActionResultType.PASS; + return ActionResult.PASS; } BlockPos te_pos = pos; @@ -242,7 +242,7 @@ public class PartPlacement { // FIXME: This is super-fishy and all needs to be re-checked. what does this // even do??? if (hostIsNotPresent && multiPartPresent && canMultiPartBePlaced - && maybeMultiPartBlockItem.get().tryPlace(mpUseCtx) == ActionResultType.SUCCESS) { + && maybeMultiPartBlockItem.get().tryPlace(mpUseCtx) == ActionResult.SUCCESS) { if (!world.isRemote) { tile = world.getTileEntity(te_pos); @@ -255,15 +255,15 @@ public class PartPlacement { player.swingArm(hand); NetworkHandler.instance() .sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand)); - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } } else if (host != null && !host.canAddPart(held, AEPartLocation.fromFacing(side))) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } } if (host == null) { - return ActionResultType.PASS; + return ActionResult.PASS; } if (!host.canAddPart(held, AEPartLocation.fromFacing(side))) { @@ -280,7 +280,7 @@ public class PartPlacement { depth + 1); } } - return ActionResultType.PASS; + return ActionResult.PASS; } if (!world.isRemote) { @@ -290,21 +290,21 @@ public class PartPlacement { if (sp.part != null) { if (!player.isCrouching() && sp.part.onActivate(player, hand, mop.getHitVec())) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } } } final DimensionalCoord dc = host.getLocation(); if (!Platform.hasPermissions(dc, player)) { - return ActionResultType.FAIL; + return ActionResult.FAIL; } final AEPartLocation mySide = host.addPart(held, AEPartLocation.fromFacing(side), player, hand); if (mySide != null) { multiPart.maybeBlock().ifPresent(multiPartBlock -> { BlockState blockState = world.getBlockState(pos); - final SoundType ss = multiPartBlock.getSoundType(blockState, world, pos, player); + final BlockSoundGroup ss = multiPartBlock.getSoundType(blockState, world, pos, player); world.playSound(null, pos, ss.getPlaceSound(), SoundCategory.BLOCKS, (ss.getVolume() + 1.0F) / 2.0F, ss.getPitch() * 0.8F); @@ -321,7 +321,7 @@ public class PartPlacement { } else { player.swingArm(hand); } - return ActionResultType.SUCCESS; + return ActionResult.SUCCESS; } private static float getEyeOffset(final PlayerEntity p) { @@ -398,7 +398,7 @@ public class PartPlacement { final ItemStack held = event.getPlayer().getHeldItem(event.getHand()); if (place(held, event.getPos(), event.getFace(), event.getPlayer(), event.getHand(), - event.getPlayer().world, PlaceType.INTERACT_FIRST_PASS, 0) == ActionResultType.SUCCESS) { + event.getPlayer().world, PlaceType.INTERACT_FIRST_PASS, 0) == ActionResult.SUCCESS) { event.setCanceled(true); this.wasCanceled = true; } diff --git a/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java b/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java index ef60254f3..92481971d 100644 --- a/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java +++ b/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java @@ -2,11 +2,11 @@ package appeng.parts.automation; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import appeng.api.config.Actionable; import appeng.api.config.Settings; @@ -164,7 +164,7 @@ public abstract class AbstractFormationPlanePart> extends } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { if (pos.offset(this.getSide().getFacing()).equals(neighbor)) { final TileEntity te = this.getHost().getTile(); final AEPartLocation side = this.getSide(); @@ -199,13 +199,13 @@ public abstract class AbstractFormationPlanePart> extends } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.priority = data.getInt("priority"); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); data.putInt("priority", this.getPriority()); } diff --git a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java index 6f43ed5d6..a24583cdf 100644 --- a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java +++ b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java @@ -25,7 +25,7 @@ import javax.annotation.Nonnull; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; +import net.minecraft.block.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.Item; @@ -35,11 +35,11 @@ import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.client.model.data.IModelData; @@ -214,7 +214,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { if (pos.offset(this.getSide().getFacing()).equals(neighbor)) { this.refresh(); } diff --git a/src/main/java/appeng/parts/automation/ExportBusPart.java b/src/main/java/appeng/parts/automation/ExportBusPart.java index 22e17bee7..1d737ad43 100644 --- a/src/main/java/appeng/parts/automation/ExportBusPart.java +++ b/src/main/java/appeng/parts/automation/ExportBusPart.java @@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.Vec3d; @@ -102,14 +102,14 @@ public class ExportBusPart extends SharedItemBusPart implements ICraftingRequest } @Override - public void readFromNBT(final CompoundNBT extra) { + public void readFromNBT(final CompoundTag extra) { super.readFromNBT(extra); this.craftingTracker.readFromNBT(extra); this.nextSlot = extra.getInt("nextSlot"); } @Override - public void writeToNBT(final CompoundNBT extra) { + public void writeToNBT(final CompoundTag extra) { super.writeToNBT(extra); this.craftingTracker.writeToNBT(extra); extra.putInt("nextSlot", this.nextSlot); diff --git a/src/main/java/appeng/parts/automation/FormationPlanePart.java b/src/main/java/appeng/parts/automation/FormationPlanePart.java index e766c192a..78d9858f3 100644 --- a/src/main/java/appeng/parts/automation/FormationPlanePart.java +++ b/src/main/java/appeng/parts/automation/FormationPlanePart.java @@ -37,10 +37,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.item.WallOrFloorItem; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -150,14 +150,14 @@ public class FormationPlanePart extends AbstractFormationPlanePart } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.Config.readFromNBT(data, "config"); this.updateHandler(); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); this.Config.writeToNBT(data, "config"); } @@ -243,20 +243,20 @@ public class FormationPlanePart extends AbstractFormationPlanePart // Up or Down, Attempt 1?? if (side.xOffset == 0 && side.zOffset == 0) { Worked = i.onItemUse(new DirectionalPlaceContext(w, placePos.offset(side.getFacing()), - lookDirection, is, side.getFacing())) == ActionResultType.SUCCESS; + lookDirection, is, side.getFacing())) == ActionResult.SUCCESS; } // Up or Down, Attempt 2?? if (!Worked && side.xOffset == 0 && side.zOffset == 0) { Worked = i.onItemUse(new DirectionalPlaceContext(w, placePos.offset(side.getFacing().getOpposite()), lookDirection, is, - side.getFacing().getOpposite())) == ActionResultType.SUCCESS; + side.getFacing().getOpposite())) == ActionResult.SUCCESS; } // Horizontal, attempt 1?? if (!Worked && side.yOffset == 0) { Worked = i.onItemUse(new DirectionalPlaceContext(w, placePos.offset(Direction.DOWN), - lookDirection, is, Direction.DOWN)) == ActionResultType.SUCCESS; + lookDirection, is, Direction.DOWN)) == ActionResult.SUCCESS; } if (!Worked) { diff --git a/src/main/java/appeng/parts/automation/LevelEmitterPart.java b/src/main/java/appeng/parts/automation/LevelEmitterPart.java index be5262c64..b56725e37 100644 --- a/src/main/java/appeng/parts/automation/LevelEmitterPart.java +++ b/src/main/java/appeng/parts/automation/LevelEmitterPart.java @@ -24,7 +24,7 @@ import java.util.Random; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.particles.RedstoneParticleData; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; @@ -437,7 +437,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.lastReportedValue = data.getLong("lastReportedValue"); this.reportingValue = data.getLong("reportingValue"); @@ -446,7 +446,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); data.putLong("lastReportedValue", this.lastReportedValue); data.putLong("reportingValue", this.reportingValue); diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/main/java/appeng/parts/automation/PlaneBakedModel.java index 24d84489e..ab35ca25f 100644 --- a/src/main/java/appeng/parts/automation/PlaneBakedModel.java +++ b/src/main/java/appeng/parts/automation/PlaneBakedModel.java @@ -33,7 +33,7 @@ import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.IDynamicBakedModel; import net.minecraftforge.client.model.data.IModelData; diff --git a/src/main/java/appeng/parts/automation/SharedItemBusPart.java b/src/main/java/appeng/parts/automation/SharedItemBusPart.java index c5a1ca553..043803c6c 100644 --- a/src/main/java/appeng/parts/automation/SharedItemBusPart.java +++ b/src/main/java/appeng/parts/automation/SharedItemBusPart.java @@ -22,7 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; @@ -49,13 +49,13 @@ public abstract class SharedItemBusPart extends UpgradeablePart implements IGrid } @Override - public void readFromNBT(final net.minecraft.nbt.CompoundNBT extra) { + public void readFromNBT(final net.minecraft.nbt.CompoundTag extra) { super.readFromNBT(extra); this.getConfig().readFromNBT(extra, "config"); } @Override - public void writeToNBT(final net.minecraft.nbt.CompoundNBT extra) { + public void writeToNBT(final net.minecraft.nbt.CompoundTag extra) { super.writeToNBT(extra); this.getConfig().writeToNBT(extra, "config"); } @@ -70,7 +70,7 @@ public abstract class SharedItemBusPart extends UpgradeablePart implements IGrid } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { this.updateState(); if (this.lastRedstone != this.getHost().hasRedstone(this.getSide())) { this.lastRedstone = !this.lastRedstone; diff --git a/src/main/java/appeng/parts/automation/UpgradeInventory.java b/src/main/java/appeng/parts/automation/UpgradeInventory.java index 82c6e5034..07a859181 100644 --- a/src/main/java/appeng/parts/automation/UpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/UpgradeInventory.java @@ -21,7 +21,7 @@ package appeng.parts.automation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraftforge.items.IItemHandler; import appeng.api.config.Upgrades; @@ -123,7 +123,7 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement } @Override - public void readFromNBT(final CompoundNBT target) { + public void readFromNBT(final CompoundTag target) { super.readFromNBT(target); this.updateUpgradeInfo(); } diff --git a/src/main/java/appeng/parts/automation/UpgradeablePart.java b/src/main/java/appeng/parts/automation/UpgradeablePart.java index 5576126fe..b17b1841d 100644 --- a/src/main/java/appeng/parts/automation/UpgradeablePart.java +++ b/src/main/java/appeng/parts/automation/UpgradeablePart.java @@ -106,14 +106,14 @@ public abstract class UpgradeablePart extends BasicStatePart implements IAEAppEn } @Override - public void readFromNBT(final net.minecraft.nbt.CompoundNBT extra) { + public void readFromNBT(final net.minecraft.nbt.CompoundTag extra) { super.readFromNBT(extra); this.manager.readFromNBT(extra); this.upgrades.readFromNBT(extra, "upgrades"); } @Override - public void writeToNBT(final net.minecraft.nbt.CompoundNBT extra) { + public void writeToNBT(final net.minecraft.nbt.CompoundTag extra) { super.writeToNBT(extra); this.manager.writeToNBT(extra); this.upgrades.writeToNBT(extra, "upgrades"); diff --git a/src/main/java/appeng/parts/misc/CableAnchorPart.java b/src/main/java/appeng/parts/misc/CableAnchorPart.java index b32b32da2..5b614b4d7 100644 --- a/src/main/java/appeng/parts/misc/CableAnchorPart.java +++ b/src/main/java/appeng/parts/misc/CableAnchorPart.java @@ -26,14 +26,14 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.api.networking.IGridNode; @@ -97,12 +97,12 @@ public class CableAnchorPart implements IPart { } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { } @@ -117,7 +117,7 @@ public class CableAnchorPart implements IPart { } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { } diff --git a/src/main/java/appeng/parts/misc/InterfacePart.java b/src/main/java/appeng/parts/misc/InterfacePart.java index 2d5dbaaef..4a506dccb 100644 --- a/src/main/java/appeng/parts/misc/InterfacePart.java +++ b/src/main/java/appeng/parts/misc/InterfacePart.java @@ -27,9 +27,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.Vec3d; @@ -126,13 +126,13 @@ public class InterfacePart extends BasicStatePart implements IGridTickable, ISto } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.duality.readFromNBT(data); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); this.duality.writeToNBT(data); } diff --git a/src/main/java/appeng/parts/misc/SharedStorageBusPart.java b/src/main/java/appeng/parts/misc/SharedStorageBusPart.java index 84db2810e..4c5b462b0 100644 --- a/src/main/java/appeng/parts/misc/SharedStorageBusPart.java +++ b/src/main/java/appeng/parts/misc/SharedStorageBusPart.java @@ -22,9 +22,9 @@ import java.util.Collections; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import appeng.api.AEApi; import appeng.api.config.Settings; @@ -134,20 +134,20 @@ public abstract class SharedStorageBusPart extends UpgradeablePart } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { if (pos.offset(this.getSide().getFacing()).equals(neighbor)) { this.resetCache(false); } } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.priority = data.getInt("priority"); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); data.putInt("priority", this.priority); } diff --git a/src/main/java/appeng/parts/misc/StorageBusPart.java b/src/main/java/appeng/parts/misc/StorageBusPart.java index b2dbe491a..d5eadb659 100644 --- a/src/main/java/appeng/parts/misc/StorageBusPart.java +++ b/src/main/java/appeng/parts/misc/StorageBusPart.java @@ -25,14 +25,14 @@ import java.util.Objects; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; @@ -183,14 +183,14 @@ public class StorageBusPart extends UpgradeablePart } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.Config.readFromNBT(data, "config"); this.priority = data.getInt("priority"); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); this.Config.writeToNBT(data, "config"); data.putInt("priority", this.priority); @@ -255,7 +255,7 @@ public class StorageBusPart extends UpgradeablePart } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { if (pos.offset(this.getSide().getFacing()).equals(neighbor)) { final TileEntity te = w.getTileEntity(neighbor); diff --git a/src/main/java/appeng/parts/misc/ToggleBusPart.java b/src/main/java/appeng/parts/misc/ToggleBusPart.java index 5bb363b1a..8f9cb6fe6 100644 --- a/src/main/java/appeng/parts/misc/ToggleBusPart.java +++ b/src/main/java/appeng/parts/misc/ToggleBusPart.java @@ -22,12 +22,12 @@ import java.util.EnumSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import appeng.api.AEApi; import appeng.api.exceptions.FailedConnectionException; @@ -103,7 +103,7 @@ public class ToggleBusPart extends BasicStatePart { } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { final boolean oldHasRedstone = this.hasRedstone; this.hasRedstone = this.getHost().hasRedstone(this.getSide()); @@ -114,13 +114,13 @@ public class ToggleBusPart extends BasicStatePart { } @Override - public void readFromNBT(final CompoundNBT extra) { + public void readFromNBT(final CompoundTag extra) { super.readFromNBT(extra); this.getOuterProxy().readFromNBT(extra); } @Override - public void writeToNBT(final CompoundNBT extra) { + public void writeToNBT(final CompoundTag extra) { super.writeToNBT(extra); this.getOuterProxy().writeToNBT(extra); } diff --git a/src/main/java/appeng/parts/networking/CablePart.java b/src/main/java/appeng/parts/networking/CablePart.java index d977cddc4..3c43b8ff1 100644 --- a/src/main/java/appeng/parts/networking/CablePart.java +++ b/src/main/java/appeng/parts/networking/CablePart.java @@ -23,9 +23,9 @@ import java.util.EnumSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; @@ -220,7 +220,7 @@ public class CablePart extends AEBasePart implements ICablePart { } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); if (Platform.isServer()) { diff --git a/src/main/java/appeng/parts/networking/QuartzFiberPart.java b/src/main/java/appeng/parts/networking/QuartzFiberPart.java index f071de90e..4f9d869cc 100644 --- a/src/main/java/appeng/parts/networking/QuartzFiberPart.java +++ b/src/main/java/appeng/parts/networking/QuartzFiberPart.java @@ -24,7 +24,7 @@ import java.util.EnumSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; @@ -73,13 +73,13 @@ public class QuartzFiberPart extends AEBasePart implements IEnergyGridProvider { } @Override - public void readFromNBT(final CompoundNBT extra) { + public void readFromNBT(final CompoundTag extra) { super.readFromNBT(extra); this.outerProxy.readFromNBT(extra); } @Override - public void writeToNBT(final CompoundNBT extra) { + public void writeToNBT(final CompoundTag extra) { super.writeToNBT(extra); this.outerProxy.writeToNBT(extra); } diff --git a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java index 82ac67fb1..1cff034b1 100644 --- a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java @@ -30,7 +30,7 @@ import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; @@ -69,7 +69,7 @@ public class FluidP2PTunnelPart extends P2PTunnelPart implem } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { this.cachedTank = null; if (this.isOutput()) { diff --git a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java index c4454ac31..8d8525b93 100644 --- a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java @@ -25,9 +25,9 @@ import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; @@ -69,7 +69,7 @@ public class ItemP2PTunnelPart extends P2PTunnelPart implemen } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { this.cachedInv = null; final ItemP2PTunnelPart input = this.getInput(); if (input != null && this.isOutput()) { diff --git a/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java index da0ec7d5b..74235abcf 100644 --- a/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java @@ -22,11 +22,11 @@ import java.io.IOException; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.api.networking.IGridNode; @@ -113,7 +113,7 @@ public class LightP2PTunnelPart extends P2PTunnelPart implem } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { if (this.isOutput() && pos.offset(this.getSide().getFacing()).equals(neighbor)) { this.opacity = -1; this.getHost().markForUpdate(); @@ -146,13 +146,13 @@ public class LightP2PTunnelPart extends P2PTunnelPart implem } @Override - public void readFromNBT(final CompoundNBT tag) { + public void readFromNBT(final CompoundTag tag) { super.readFromNBT(tag); this.lastValue = tag.getInt("lastValue"); } @Override - public void writeToNBT(final CompoundNBT tag) { + public void writeToNBT(final CompoundTag tag) { super.writeToNBT(tag); tag.putInt("lastValue", this.lastValue); } diff --git a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java index abe9d20d6..f6672e33d 100644 --- a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java @@ -25,7 +25,7 @@ import java.util.List; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; @@ -68,13 +68,13 @@ public class MEP2PTunnelPart extends P2PTunnelPart implements I } @Override - public void readFromNBT(final CompoundNBT extra) { + public void readFromNBT(final CompoundTag extra) { super.readFromNBT(extra); this.outerProxy.readFromNBT(extra); } @Override - public void writeToNBT(final CompoundNBT extra) { + public void writeToNBT(final CompoundTag extra) { super.writeToNBT(extra); this.outerProxy.writeToNBT(extra); } diff --git a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java index a0ce7c22e..6df6618da 100644 --- a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java @@ -25,7 +25,7 @@ import java.util.Optional; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; @@ -119,14 +119,14 @@ public abstract class P2PTunnelPart extends BasicStateP } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.setOutput(data.getBoolean("output")); this.freq = data.getShort("freq"); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); data.putBoolean("output", this.isOutput()); data.putShort("freq", this.getFrequency()); @@ -171,7 +171,7 @@ public abstract class P2PTunnelPart extends BasicStateP final TunnelType tt = AEApi.instance().registries().p2pTunnel().getTunnelTypeByItem(is); if (!is.isEmpty() && is.getItem() instanceof IMemoryCard) { final IMemoryCard mc = (IMemoryCard) is.getItem(); - final CompoundNBT data = mc.getData(is); + final CompoundTag data = mc.getData(is); final ItemStack newType = ItemStack.read(data); final short freq = data.getShort("freq"); @@ -288,7 +288,7 @@ public abstract class P2PTunnelPart extends BasicStateP } final IMemoryCard mc = (IMemoryCard) is.getItem(); - final CompoundNBT data = mc.getData(is); + final CompoundTag data = mc.getData(is); final short storedFrequency = data.getShort("freq"); short newFreq = this.getFrequency(); diff --git a/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java index 28ab67696..0051d00f3 100644 --- a/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java @@ -24,10 +24,10 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.RedstoneWireBlock; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.api.networking.events.MENetworkBootingStatusChange; @@ -107,13 +107,13 @@ public class RedstoneP2PTunnelPart extends P2PTunnelPart } @Override - public void readFromNBT(final CompoundNBT tag) { + public void readFromNBT(final CompoundTag tag) { super.readFromNBT(tag); this.power = tag.getInt("power"); } @Override - public void writeToNBT(final CompoundNBT tag) { + public void writeToNBT(final CompoundTag tag) { super.writeToNBT(tag); tag.putInt("power", this.power); } @@ -128,7 +128,7 @@ public class RedstoneP2PTunnelPart extends P2PTunnelPart } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { if (!this.isOutput()) { final BlockPos target = this.getTile().getPos().offset(this.getSide().getFacing()); diff --git a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java index 2f38ee34b..2dd07ff59 100644 --- a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java @@ -25,9 +25,9 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; @@ -82,22 +82,22 @@ public abstract class AbstractMonitorPart extends AbstractDisplayPart } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.isLocked = data.getBoolean("isLocked"); - final CompoundNBT myItem = data.getCompound("configuredItem"); + final CompoundTag myItem = data.getCompound("configuredItem"); this.configuredItem = AEItemStack.fromNBT(myItem); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); data.putBoolean("isLocked", this.isLocked); - final CompoundNBT myItem = new CompoundNBT(); + final CompoundTag myItem = new CompoundTag(); if (this.configuredItem != null) { this.configuredItem.writeToNBT(myItem); } diff --git a/src/main/java/appeng/parts/reporting/AbstractReportingPart.java b/src/main/java/appeng/parts/reporting/AbstractReportingPart.java index 59f46c7a9..63eaa5752 100644 --- a/src/main/java/appeng/parts/reporting/AbstractReportingPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractReportingPart.java @@ -22,14 +22,14 @@ import java.io.IOException; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.api.implementations.IPowerChannelState; @@ -105,7 +105,7 @@ public abstract class AbstractReportingPart extends AEBasePart implements IMonit } @Override - public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { + public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { if (pos.offset(this.getSide().getFacing()).equals(neighbor)) { this.opacity = -1; this.getHost().markForUpdate(); @@ -113,13 +113,13 @@ public abstract class AbstractReportingPart extends AEBasePart implements IMonit } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.spin = data.getByte("spin"); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); data.putByte("spin", this.getSpin()); } diff --git a/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java b/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java index 306718efd..d2dbcb253 100644 --- a/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java @@ -23,7 +23,7 @@ import java.util.List; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; import net.minecraftforge.items.IItemHandler; @@ -90,14 +90,14 @@ public abstract class AbstractTerminalPart extends AbstractDisplayPart } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.cm.readFromNBT(data); this.viewCell.readFromNBT(data, "viewCell"); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); this.cm.writeToNBT(data); this.viewCell.writeToNBT(data, "viewCell"); diff --git a/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java b/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java index cbf27cee8..cfbd8f9d6 100644 --- a/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java @@ -23,7 +23,7 @@ import java.util.List; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.ResourceLocation; import net.minecraftforge.items.IItemHandler; @@ -68,13 +68,13 @@ public class CraftingTerminalPart extends AbstractTerminalPart { } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.craftingGrid.readFromNBT(data, "craftingGrid"); } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); this.craftingGrid.writeToNBT(data, "craftingGrid"); } diff --git a/src/main/java/appeng/parts/reporting/PatternTerminalPart.java b/src/main/java/appeng/parts/reporting/PatternTerminalPart.java index 89ab7a99d..2ca0401c8 100644 --- a/src/main/java/appeng/parts/reporting/PatternTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/PatternTerminalPart.java @@ -23,7 +23,7 @@ import java.util.List; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.ResourceLocation; import net.minecraftforge.items.IItemHandler; @@ -75,7 +75,7 @@ public class PatternTerminalPart extends AbstractTerminalPart { } @Override - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { super.readFromNBT(data); this.setCraftingRecipe(data.getBoolean("craftingMode")); this.setSubstitution(data.getBoolean("substitute")); @@ -85,7 +85,7 @@ public class PatternTerminalPart extends AbstractTerminalPart { } @Override - public void writeToNBT(final CompoundNBT data) { + public void writeToNBT(final CompoundTag data) { super.writeToNBT(data); data.putBoolean("craftingMode", this.craftingMode); data.putBoolean("substitute", this.substitute); diff --git a/src/main/java/appeng/server/AECommand.java b/src/main/java/appeng/server/AECommand.java index cb0033909..211f94322 100644 --- a/src/main/java/appeng/server/AECommand.java +++ b/src/main/java/appeng/server/AECommand.java @@ -18,12 +18,12 @@ package appeng.server; -import static net.minecraft.command.Commands.literal; +import static net.minecraft.server.command.CommandManager.literal; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import net.minecraft.command.CommandSource; +import net.minecraft.server.command.ServerCommandSource; import net.minecraftforge.fml.server.ServerLifecycleHooks; import appeng.api.features.AEFeature; @@ -31,9 +31,9 @@ import appeng.core.AEConfig; public final class AECommand { - public void register(CommandDispatcher dispatcher) { + public void register(CommandDispatcher dispatcher) { - LiteralArgumentBuilder builder = literal("ae2"); + LiteralArgumentBuilder builder = literal("ae2"); for (Commands command : Commands.values()) { if (command.test && !AEConfig.instance().isFeatureEnabled(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS)) { continue; @@ -44,9 +44,9 @@ public final class AECommand { dispatcher.register(builder); } - private void add(LiteralArgumentBuilder builder, Commands subCommand) { + private void add(LiteralArgumentBuilder builder, Commands subCommand) { - LiteralArgumentBuilder subCommandBuilder = literal(subCommand.name().toLowerCase()) + LiteralArgumentBuilder subCommandBuilder = literal(subCommand.name().toLowerCase()) .requires(src -> src.hasPermissionLevel(subCommand.level)); subCommand.command.addArguments(subCommandBuilder); subCommandBuilder.executes(ctx -> { diff --git a/src/main/java/appeng/server/ISubCommand.java b/src/main/java/appeng/server/ISubCommand.java index adc1d885b..06927c91e 100644 --- a/src/main/java/appeng/server/ISubCommand.java +++ b/src/main/java/appeng/server/ISubCommand.java @@ -21,13 +21,13 @@ package appeng.server; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; -import net.minecraft.command.CommandSource; +import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.MinecraftServer; public interface ISubCommand { - default void addArguments(LiteralArgumentBuilder builder) { + default void addArguments(LiteralArgumentBuilder builder) { } - void call(MinecraftServer srv, CommandContext ctx, CommandSource sender); + void call(MinecraftServer srv, CommandContext ctx, ServerCommandSource sender); } diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/main/java/appeng/server/ServerHelper.java index 72d37e1b4..890657eee 100644 --- a/src/main/java/appeng/server/ServerHelper.java +++ b/src/main/java/appeng/server/ServerHelper.java @@ -27,7 +27,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.RayTraceResult; @@ -136,7 +136,7 @@ public class ServerHelper extends CommonHelper { final ItemStack is = player.inventory.getStackInSlot(x); if (!is.isEmpty() && is.getItem() instanceof NetworkToolItem) { - final CompoundNBT c = is.getTag(); + final CompoundTag c = is.getTag(); if (c != null && c.getBoolean("hideFacades")) { return CableRenderMode.CABLE_VIEW; } diff --git a/src/main/java/appeng/server/subcommands/ChunkLogger.java b/src/main/java/appeng/server/subcommands/ChunkLogger.java index abad21e4c..d811245ab 100644 --- a/src/main/java/appeng/server/subcommands/ChunkLogger.java +++ b/src/main/java/appeng/server/subcommands/ChunkLogger.java @@ -20,7 +20,7 @@ package appeng.server.subcommands; import com.mojang.brigadier.context.CommandContext; -import net.minecraft.command.CommandSource; +import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.common.MinecraftForge; @@ -67,7 +67,7 @@ public class ChunkLogger implements ISubCommand { } @Override - public void call(final MinecraftServer srv, final CommandContext data, final CommandSource sender) { + public void call(final MinecraftServer srv, final CommandContext data, final ServerCommandSource sender) { this.enabled = !this.enabled; if (this.enabled) { diff --git a/src/main/java/appeng/server/subcommands/Supporters.java b/src/main/java/appeng/server/subcommands/Supporters.java index 514a9d913..1c28c268d 100644 --- a/src/main/java/appeng/server/subcommands/Supporters.java +++ b/src/main/java/appeng/server/subcommands/Supporters.java @@ -21,7 +21,7 @@ package appeng.server.subcommands; import com.google.common.base.Joiner; import com.mojang.brigadier.context.CommandContext; -import net.minecraft.command.CommandSource; +import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.StringTextComponent; @@ -30,7 +30,7 @@ import appeng.server.ISubCommand; public class Supporters implements ISubCommand { @Override - public void call(final MinecraftServer srv, final CommandContext data, final CommandSource sender) { + public void call(final MinecraftServer srv, final CommandContext data, final ServerCommandSource sender) { final String[] who = { "Stig Halvorsen", "Josh Ricker", "Jenny \"Othlon\" Sutherland", "Hristo Bogdanov", "BevoLJ" }; sender.sendFeedback(new StringTextComponent("Special thanks to " + Joiner.on(", ").join(who)), true); diff --git a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java index 7dda63889..019581e6b 100644 --- a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java +++ b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java @@ -18,7 +18,7 @@ package appeng.server.subcommands; -import static net.minecraft.command.Commands.literal; +import static net.minecraft.server.command.CommandManager.literal; import java.util.ArrayList; import java.util.Comparator; @@ -30,7 +30,7 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.minecraft.command.CommandSource; +import net.minecraft.server.command.ServerCommandSource; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; @@ -60,7 +60,7 @@ import appeng.worldgen.meteorite.PlacedMeteoriteSettings; public class TestMeteoritesCommand implements ISubCommand { @Override - public void addArguments(LiteralArgumentBuilder builder) { + public void addArguments(LiteralArgumentBuilder builder) { builder.then(literal("force").executes(ctx -> { test(ServerLifecycleHooks.getCurrentServer(), ctx.getSource(), true); return 1; @@ -68,11 +68,11 @@ public class TestMeteoritesCommand implements ISubCommand { } @Override - public void call(final MinecraftServer srv, final CommandContext ctx, final CommandSource sender) { + public void call(final MinecraftServer srv, final CommandContext ctx, final ServerCommandSource sender) { test(srv, sender, false); } - private static void test(MinecraftServer srv, final CommandSource sender, boolean force) { + private static void test(MinecraftServer srv, final ServerCommandSource sender, boolean force) { int radius = 100; ServerPlayerEntity player = null; @@ -205,7 +205,7 @@ public class TestMeteoritesCommand implements ISubCommand { return null; } - private static void sendLine(CommandSource sender, String text, Object... args) { + private static void sendLine(ServerCommandSource sender, String text, Object... args) { sender.sendFeedback(new StringTextComponent(String.format(Locale.ROOT, text, args)), true); } diff --git a/src/main/java/appeng/server/subcommands/TestOreGenCommand.java b/src/main/java/appeng/server/subcommands/TestOreGenCommand.java index 467939d30..dad0d927e 100644 --- a/src/main/java/appeng/server/subcommands/TestOreGenCommand.java +++ b/src/main/java/appeng/server/subcommands/TestOreGenCommand.java @@ -29,7 +29,7 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.block.BlockState; -import net.minecraft.command.CommandSource; +import net.minecraft.server.command.ServerCommandSource; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; @@ -57,7 +57,7 @@ public class TestOreGenCommand implements ISubCommand { } @Override - public void call(final MinecraftServer srv, final CommandContext data, final CommandSource sender) { + public void call(final MinecraftServer srv, final CommandContext data, final ServerCommandSource sender) { int radius = 1000; @@ -97,7 +97,7 @@ public class TestOreGenCommand implements ISubCommand { sendLine(sender, " Sub-Type Count: %s", chargedCount); } - private void checkChunk(CommandSource sender, ServerWorld world, ChunkPos cp, Stats stats) { + private void checkChunk(ServerCommandSource sender, ServerWorld world, ChunkPos cp, Stats stats) { IChunk chunk = world.getChunk(cp.x, cp.z, ChunkStatus.FULL, false); if (chunk == null) { sendLine(sender, "Skipping chunk %s", cp); @@ -129,7 +129,7 @@ public class TestOreGenCommand implements ISubCommand { stats.chunks.add(chunkStats); } - private static void sendLine(CommandSource sender, String text, Object... args) { + private static void sendLine(ServerCommandSource sender, String text, Object... args) { sender.sendFeedback(new StringTextComponent(String.format(Locale.ROOT, text, args)), true); } diff --git a/src/main/java/appeng/services/compass/CompassRegion.java b/src/main/java/appeng/services/compass/CompassRegion.java index 02b25e69a..8438c43b1 100644 --- a/src/main/java/appeng/services/compass/CompassRegion.java +++ b/src/main/java/appeng/services/compass/CompassRegion.java @@ -20,7 +20,7 @@ package appeng.services.compass; import com.google.common.base.Preconditions; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.world.server.ServerWorld; import net.minecraft.world.storage.WorldSavedData; @@ -125,7 +125,7 @@ final class CompassRegion { } @Override - public void read(CompoundNBT nbt) { + public void read(CompoundTag nbt) { this.bitmap = nbt.getByteArray("b"); if (this.bitmap.length != BITMAP_LENGTH) { throw new IllegalStateException("Invalid bitmap length: " + bitmap.length); @@ -133,7 +133,7 @@ final class CompassRegion { } @Override - public CompoundNBT write(CompoundNBT compound) { + public CompoundTag write(CompoundTag compound) { compound.putByteArray("b", bitmap); return compound; } diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java index 9c002376d..71705f8ac 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java @@ -23,7 +23,7 @@ import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.MathHelper; import net.minecraftforge.client.model.pipeline.IVertexConsumer; diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/BakedPipeline.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/BakedPipeline.java index 8318e439a..18a434b80 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/BakedPipeline.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/BakedPipeline.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import appeng.thirdparty.codechicken.lib.model.CachedFormat; diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/QuadTransformer.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/QuadTransformer.java index c2f60eb58..290aa4df7 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/QuadTransformer.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/QuadTransformer.java @@ -22,7 +22,7 @@ import javax.annotation.OverridingMethodsMustInvokeSuper; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import appeng.thirdparty.codechicken.lib.model.CachedFormat; diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java index b2e5be753..be63e844b 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java @@ -18,11 +18,11 @@ package appeng.thirdparty.codechicken.lib.model.pipeline.transformers; -import static net.minecraft.util.Direction.AxisDirection.NEGATIVE; -import static net.minecraft.util.Direction.AxisDirection.POSITIVE; +import static net.minecraft.util.math.Direction.AxisDirection.NEGATIVE; +import static net.minecraft.util.math.Direction.AxisDirection.POSITIVE; -import net.minecraft.util.Direction; -import net.minecraft.util.Direction.AxisDirection; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Direction.AxisDirection; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3i; diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java index ed7bd03d2..090fd65a6 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java @@ -18,9 +18,9 @@ package appeng.thirdparty.codechicken.lib.model.pipeline.transformers; -import static net.minecraft.util.Direction.AxisDirection.POSITIVE; +import static net.minecraft.util.math.Direction.AxisDirection.POSITIVE; -import net.minecraft.util.Direction.AxisDirection; +import net.minecraft.util.math.Direction.AxisDirection; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.client.model.pipeline.IVertexConsumer; diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadMatrixTransformer.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadMatrixTransformer.java index 34211862d..6dbaedfa8 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadMatrixTransformer.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadMatrixTransformer.java @@ -20,7 +20,7 @@ package appeng.thirdparty.codechicken.lib.model.pipeline.transformers; import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.Vector4f; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import appeng.thirdparty.codechicken.lib.model.Quad; diff --git a/src/main/java/appeng/tile/AEBaseInvTileEntity.java b/src/main/java/appeng/tile/AEBaseInvTileEntity.java index a72434816..debb8dd93 100644 --- a/src/main/java/appeng/tile/AEBaseInvTileEntity.java +++ b/src/main/java/appeng/tile/AEBaseInvTileEntity.java @@ -23,9 +23,9 @@ import java.util.List; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; @@ -45,13 +45,13 @@ public abstract class AEBaseInvTileEntity extends AEBaseTileEntity implements IA } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); final IItemHandler inv = this.getInternalInventory(); if (inv != EmptyHandler.INSTANCE) { - final CompoundNBT opt = data.getCompound("inv"); + final CompoundTag opt = data.getCompound("inv"); for (int x = 0; x < inv.getSlots(); x++) { - final CompoundNBT item = opt.getCompound("item" + x); + final CompoundTag item = opt.getCompound("item" + x); ItemHandlerUtil.setStackInSlot(inv, x, ItemStack.read(item)); } } @@ -60,13 +60,13 @@ public abstract class AEBaseInvTileEntity extends AEBaseTileEntity implements IA public abstract @Nonnull IItemHandler getInternalInventory(); @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); final IItemHandler inv = this.getInternalInventory(); if (inv != EmptyHandler.INSTANCE) { - final CompoundNBT opt = new CompoundNBT(); + final CompoundTag opt = new CompoundTag(); for (int x = 0; x < inv.getSlots(); x++) { - final CompoundNBT item = new CompoundNBT(); + final CompoundTag item = new CompoundTag(); final ItemStack is = inv.getStackInSlot(x); if (!is.isEmpty()) { is.write(item); diff --git a/src/main/java/appeng/tile/AEBaseTileEntity.java b/src/main/java/appeng/tile/AEBaseTileEntity.java index 768d6b762..8e6e594f2 100644 --- a/src/main/java/appeng/tile/AEBaseTileEntity.java +++ b/src/main/java/appeng/tile/AEBaseTileEntity.java @@ -32,13 +32,13 @@ import io.netty.buffer.Unpooled; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.NetworkManager; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.server.SUpdateTileEntityPacket; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; @@ -105,7 +105,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); if (data.contains("customName")) { @@ -124,7 +124,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); if (this.canBeRotated()) { @@ -159,8 +159,8 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon * This builds a tag with the actual data that should be sent to the client for * update syncs. If the tile entity doesn't need update syncs, it returns null. */ - private CompoundNBT writeUpdateData() { - final CompoundNBT data = new CompoundNBT(); + private CompoundTag writeUpdateData() { + final CompoundTag data = new CompoundTag(); final PacketBuffer stream = new PacketBuffer(Unpooled.buffer()); @@ -202,11 +202,11 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon * chunk. */ @Override - public CompoundNBT getUpdateTag() { - final CompoundNBT data = this.writeUpdateData(); + public CompoundTag getUpdateTag() { + final CompoundTag data = this.writeUpdateData(); if (data == null) { - return new CompoundNBT(); + return new CompoundTag(); } data.putInt("x", this.pos.getX()); @@ -220,7 +220,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon * chunk. */ @Override - public void handleUpdateTag(CompoundNBT tag) { + public void handleUpdateTag(CompoundTag tag) { final PacketBuffer stream = new PacketBuffer(Unpooled.copiedBuffer(tag.getByteArray("X"))); if (this.readUpdateData(stream)) { @@ -320,7 +320,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon * @param from source of settings * @param compound compound of source */ - public void uploadSettings(final SettingsFrom from, final CompoundNBT compound) { + public void uploadSettings(final SettingsFrom from, final CompoundTag compound) { if (this instanceof IConfigurableObject) { final IConfigManager cm = ((IConfigurableObject) this).getConfigManager(); if (cm != null) { @@ -370,11 +370,11 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon * * @return compound of source */ - public CompoundNBT downloadSettings(final SettingsFrom from) { - final CompoundNBT output = new CompoundNBT(); + public CompoundTag downloadSettings(final SettingsFrom from) { + final CompoundTag output = new CompoundTag(); if (this.hasCustomInventoryName()) { - final CompoundNBT dsp = new CompoundNBT(); + final CompoundTag dsp = new CompoundTag(); dsp.putString("Name", this.customName); output.put("display", dsp); } diff --git a/src/main/java/appeng/tile/crafting/CraftingCubeModelData.java b/src/main/java/appeng/tile/crafting/CraftingCubeModelData.java index b453b5459..32c559d18 100644 --- a/src/main/java/appeng/tile/crafting/CraftingCubeModelData.java +++ b/src/main/java/appeng/tile/crafting/CraftingCubeModelData.java @@ -5,7 +5,7 @@ import java.util.Objects; import com.google.common.base.Preconditions; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.client.render.model.AEModelData; diff --git a/src/main/java/appeng/tile/crafting/CraftingMonitorModelData.java b/src/main/java/appeng/tile/crafting/CraftingMonitorModelData.java index 13e393ff4..5086eea17 100644 --- a/src/main/java/appeng/tile/crafting/CraftingMonitorModelData.java +++ b/src/main/java/appeng/tile/crafting/CraftingMonitorModelData.java @@ -5,7 +5,7 @@ import java.util.Objects; import com.google.common.base.Preconditions; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.util.AEColor; diff --git a/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java index 743a30ebe..a5aec4368 100644 --- a/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java @@ -25,10 +25,10 @@ import javax.annotation.Nonnull; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.model.data.IModelData; @@ -86,7 +86,7 @@ public class CraftingMonitorTileEntity extends CraftingTileEntity implements ICo } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); if (data.contains("paintedColor")) { this.paintedColor = AEColor.values()[data.getByte("paintedColor")]; @@ -94,7 +94,7 @@ public class CraftingMonitorTileEntity extends CraftingTileEntity implements ICo } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); data.putByte("paintedColor", (byte) this.paintedColor.ordinal()); return data; diff --git a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java index 1b48cf870..f50fb808b 100644 --- a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java @@ -28,12 +28,12 @@ import javax.annotation.Nonnull; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.common.util.Constants; @@ -64,7 +64,7 @@ import appeng.util.Platform; public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiBlock, IPowerChannelState { private final CraftingCPUCalculator calc = new CraftingCPUCalculator(this); - private CompoundNBT previousState = null; + private CompoundTag previousState = null; private boolean isCoreBlock = false; private CraftingCPUCluster cluster; @@ -181,7 +181,7 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); data.putBoolean("core", this.isCoreBlock()); if (this.isCoreBlock() && this.cluster != null) { @@ -191,7 +191,7 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.setCoreBlock(data.getBoolean("core")); if (this.isCoreBlock()) { @@ -323,11 +323,11 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB this.isCoreBlock = isCoreBlock; } - public CompoundNBT getPreviousState() { + public CompoundTag getPreviousState() { return this.previousState; } - public void setPreviousState(final CompoundNBT previousState) { + public void setPreviousState(final CompoundTag previousState) { this.previousState = previousState; } @@ -353,7 +353,7 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB return connections; } - private boolean isConnected(IBlockReader world, BlockPos pos, Direction side) { + private boolean isConnected(BlockView world, BlockPos pos, Direction side) { BlockPos adjacentPos = pos.offset(side); return world.getBlockState(adjacentPos).getBlock() instanceof AbstractCraftingUnitBlock; } diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java index b26c87db0..72de9bb41 100644 --- a/src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java +++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java @@ -25,11 +25,11 @@ import javax.annotation.Nullable; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; @@ -201,12 +201,12 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); if (this.forcePlan && this.myPlan != null) { final ItemStack pattern = this.myPlan.getPattern(); if (!pattern.isEmpty()) { - final CompoundNBT compound = new CompoundNBT(); + final CompoundTag compound = new CompoundTag(); pattern.write(compound); data.put("myPlan", compound); data.putInt("pushDirection", this.pushDirection.ordinal()); @@ -219,7 +219,7 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); if (data.contains("myPlan")) { final ItemStack myPat = ItemStack.read(data.getCompound("myPlan")); diff --git a/src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java b/src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java index db0894c24..c5441fcaf 100644 --- a/src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java +++ b/src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java @@ -18,7 +18,7 @@ package appeng.tile.grid; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntityType; import appeng.api.networking.IGridNode; @@ -37,13 +37,13 @@ public abstract class AENetworkInvTileEntity extends AEBaseInvTileEntity impleme } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.getProxy().readFromNBT(data); } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); this.getProxy().writeToNBT(data); return data; diff --git a/src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java b/src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java index f2bee8aa6..4ddfd3297 100644 --- a/src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java +++ b/src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java @@ -18,7 +18,7 @@ package appeng.tile.grid; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntityType; import appeng.api.networking.IGridNode; @@ -39,13 +39,13 @@ public abstract class AENetworkPowerTileEntity extends AEBasePoweredTileEntity i } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.getProxy().readFromNBT(data); } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); this.getProxy().writeToNBT(data); return data; diff --git a/src/main/java/appeng/tile/grid/AENetworkTileEntity.java b/src/main/java/appeng/tile/grid/AENetworkTileEntity.java index 8180d4640..ae06b56d2 100644 --- a/src/main/java/appeng/tile/grid/AENetworkTileEntity.java +++ b/src/main/java/appeng/tile/grid/AENetworkTileEntity.java @@ -18,7 +18,7 @@ package appeng.tile.grid; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntityType; import appeng.api.networking.IGridNode; @@ -39,13 +39,13 @@ public class AENetworkTileEntity extends AEBaseTileEntity implements IActionHost } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.getProxy().readFromNBT(data); } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); this.getProxy().writeToNBT(data); return data; diff --git a/src/main/java/appeng/tile/grindstone/CrankTileEntity.java b/src/main/java/appeng/tile/grindstone/CrankTileEntity.java index a2aaf9ec0..5f0372b8c 100644 --- a/src/main/java/appeng/tile/grindstone/CrankTileEntity.java +++ b/src/main/java/appeng/tile/grindstone/CrankTileEntity.java @@ -25,7 +25,7 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.implementations.tiles.ICrankable; import appeng.tile.AEBaseTileEntity; diff --git a/src/main/java/appeng/tile/grindstone/GrinderTileEntity.java b/src/main/java/appeng/tile/grindstone/GrinderTileEntity.java index 66fe1a50a..45ca57cd7 100644 --- a/src/main/java/appeng/tile/grindstone/GrinderTileEntity.java +++ b/src/main/java/appeng/tile/grindstone/GrinderTileEntity.java @@ -24,7 +24,7 @@ import java.util.List; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.RangedWrapper; diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index e2529307a..bbd0b61f2 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -23,7 +23,7 @@ import java.util.Iterator; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; @@ -60,16 +60,16 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab return this.inv[var1]; } - public void writeToNBT(final CompoundNBT data, final String name) { - final CompoundNBT c = new CompoundNBT(); + public void writeToNBT(final CompoundTag data, final String name) { + final CompoundTag c = new CompoundTag(); this.writeToNBT(c); data.put(name, c); } - private void writeToNBT(final CompoundNBT target) { + private void writeToNBT(final CompoundTag target) { for (int x = 0; x < this.size; x++) { try { - final CompoundNBT c = new CompoundNBT(); + final CompoundTag c = new CompoundTag(); if (this.inv[x] != null) { this.inv[x].writeToNBT(c); @@ -81,17 +81,17 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab } } - public void readFromNBT(final CompoundNBT data, final String name) { - final CompoundNBT c = data.getCompound(name); + public void readFromNBT(final CompoundTag data, final String name) { + final CompoundTag c = data.getCompound(name); if (c != null) { this.readFromNBT(c); } } - private void readFromNBT(final CompoundNBT target) { + private void readFromNBT(final CompoundTag target) { for (int x = 0; x < this.size; x++) { try { - final CompoundNBT c = target.getCompound("#" + x); + final CompoundTag c = target.getCompound("#" + x); if (c != null) { this.inv[x] = AEItemStack.fromNBT(c); diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java index abcb70f25..ae8107d68 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java @@ -25,7 +25,7 @@ import java.util.Iterator; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraftforge.items.ItemStackHandler; import appeng.util.Platform; @@ -146,18 +146,18 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl return true; } - public void writeToNBT(final CompoundNBT data, final String name) { + public void writeToNBT(final CompoundTag data, final String name) { data.put(name, this.serializeNBT()); } - public void readFromNBT(final CompoundNBT data, final String name) { - final CompoundNBT c = data.getCompound(name); + public void readFromNBT(final CompoundTag data, final String name) { + final CompoundTag c = data.getCompound(name); if (c != null) { this.readFromNBT(c); } } - public void readFromNBT(final CompoundNBT data) { + public void readFromNBT(final CompoundTag data) { this.deserializeNBT(data); } diff --git a/src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java b/src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java index 8129c832e..81dc6b4fb 100644 --- a/src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java +++ b/src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java @@ -21,7 +21,7 @@ package appeng.tile.misc; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -94,7 +94,7 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); this.cell.writeToNBT(data, "cell"); this.config.writeToNBT(data, "config"); @@ -103,7 +103,7 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.cell.readFromNBT(data, "cell"); this.config.readFromNBT(data, "config"); diff --git a/src/main/java/appeng/tile/misc/ChargerTileEntity.java b/src/main/java/appeng/tile/misc/ChargerTileEntity.java index 257dccba0..08faf482e 100644 --- a/src/main/java/appeng/tile/misc/ChargerTileEntity.java +++ b/src/main/java/appeng/tile/misc/ChargerTileEntity.java @@ -27,7 +27,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; diff --git a/src/main/java/appeng/tile/misc/CondenserTileEntity.java b/src/main/java/appeng/tile/misc/CondenserTileEntity.java index 054c52500..246502c2c 100644 --- a/src/main/java/appeng/tile/misc/CondenserTileEntity.java +++ b/src/main/java/appeng/tile/misc/CondenserTileEntity.java @@ -22,9 +22,9 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidAttributes; @@ -86,7 +86,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); this.cm.writeToNBT(data); data.putDouble("storedPower", this.getStoredPower()); @@ -94,7 +94,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.cm.readFromNBT(data); this.setStoredPower(data.getDouble("storedPower")); diff --git a/src/main/java/appeng/tile/misc/InscriberRecipes.java b/src/main/java/appeng/tile/misc/InscriberRecipes.java index a3a4cac3d..2e3e00a2c 100644 --- a/src/main/java/appeng/tile/misc/InscriberRecipes.java +++ b/src/main/java/appeng/tile/misc/InscriberRecipes.java @@ -10,7 +10,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; @@ -77,12 +77,12 @@ public final class InscriberRecipes { String name = ""; if (!plateA.isEmpty()) { - final CompoundNBT tag = plateA.getOrCreateTag(); + final CompoundTag tag = plateA.getOrCreateTag(); name += tag.getString(MaterialItem.TAG_INSCRIBE_NAME); } if (!plateB.isEmpty()) { - final CompoundNBT tag = plateB.getOrCreateTag(); + final CompoundTag tag = plateB.getOrCreateTag(); name += " " + tag.getString(MaterialItem.TAG_INSCRIBE_NAME); } diff --git a/src/main/java/appeng/tile/misc/InscriberTileEntity.java b/src/main/java/appeng/tile/misc/InscriberTileEntity.java index 5d5ed177a..bccbec6a7 100644 --- a/src/main/java/appeng/tile/misc/InscriberTileEntity.java +++ b/src/main/java/appeng/tile/misc/InscriberTileEntity.java @@ -26,10 +26,10 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; @@ -127,7 +127,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); this.upgrades.writeToNBT(data, "upgrades"); this.settings.writeToNBT(data); @@ -135,7 +135,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.upgrades.readFromNBT(data, "upgrades"); this.settings.readFromNBT(data); diff --git a/src/main/java/appeng/tile/misc/InterfaceTileEntity.java b/src/main/java/appeng/tile/misc/InterfaceTileEntity.java index a1d3761b5..b3df88a0c 100644 --- a/src/main/java/appeng/tile/misc/InterfaceTileEntity.java +++ b/src/main/java/appeng/tile/misc/InterfaceTileEntity.java @@ -29,11 +29,11 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; @@ -150,7 +150,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); data.putBoolean("omniDirectional", this.omniDirectional); this.duality.writeToNBT(data); @@ -158,7 +158,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.omniDirectional = data.getBoolean("omniDirectional"); diff --git a/src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java b/src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java index 2528c60d0..0c3fca774 100644 --- a/src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java +++ b/src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java @@ -31,10 +31,10 @@ import io.netty.buffer.Unpooled; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.LightType; @@ -67,7 +67,7 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity { } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); final PacketBuffer myDat = new PacketBuffer(Unpooled.buffer()); this.writeBuffer(myDat); @@ -91,7 +91,7 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity { } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); if (data.contains("dots")) { this.readBuffer(new PacketBuffer(Unpooled.copiedBuffer(data.getByteArray("dots")))); diff --git a/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java b/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java index 5c6bcb88e..8fdb8b119 100644 --- a/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java +++ b/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java @@ -23,7 +23,7 @@ import java.util.EnumSet; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.implementations.IPowerChannelState; import appeng.api.implementations.tiles.ICrystalGrowthAccelerator; diff --git a/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java b/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java index 83c756b9e..fd83e9bd8 100644 --- a/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java +++ b/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java @@ -26,11 +26,11 @@ import java.util.Map; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.INBT; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -149,7 +149,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); this.cm.writeToNBT(data); data.putByte("paintedColor", (byte) this.paintedColor.ordinal()); @@ -157,11 +157,11 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT data.putLong("securityKey", this.securityKey); this.getConfigSlot().writeToNBT(data, "config"); - final CompoundNBT storedItems = new CompoundNBT(); + final CompoundTag storedItems = new CompoundTag(); int offset = 0; for (final IAEItemStack ais : this.inventory.getStoredItems()) { - final CompoundNBT it = new CompoundNBT(); + final CompoundTag it = new CompoundTag(); ais.createItemStack().write(it); storedItems.put(String.valueOf(offset), it); offset++; @@ -172,7 +172,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.cm.readFromNBT(data); if (data.contains("paintedColor")) { @@ -182,11 +182,11 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT this.securityKey = data.getLong("securityKey"); this.getConfigSlot().readFromNBT(data, "config"); - final CompoundNBT storedItems = data.getCompound("storedItems"); + final CompoundTag storedItems = data.getCompound("storedItems"); for (final Object key : storedItems.keySet()) { final INBT obj = storedItems.get((String) key); - if (obj instanceof CompoundNBT) { - this.inventory.getStoredItems().add(AEItemStack.fromItemStack(ItemStack.read((CompoundNBT) obj))); + if (obj instanceof CompoundTag) { + this.inventory.getStoredItems().add(AEItemStack.fromItemStack(ItemStack.read((CompoundTag) obj))); } } } diff --git a/src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java b/src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java index 67970cbdd..91800e5a9 100644 --- a/src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java +++ b/src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java @@ -24,10 +24,10 @@ import javax.annotation.Nonnull; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.items.IItemHandler; @@ -92,7 +92,7 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); data.putDouble("burnTime", this.getBurnTime()); data.putDouble("maxBurnTime", this.getMaxBurnTime()); @@ -101,7 +101,7 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.setBurnTime(data.getDouble("burnTime")); this.setMaxBurnTime(data.getDouble("maxBurnTime")); diff --git a/src/main/java/appeng/tile/networking/CableBusTESR.java b/src/main/java/appeng/tile/networking/CableBusTESR.java index 42648462d..c870357cb 100644 --- a/src/main/java/appeng/tile/networking/CableBusTESR.java +++ b/src/main/java/appeng/tile/networking/CableBusTESR.java @@ -23,7 +23,7 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import appeng.api.parts.IPart; diff --git a/src/main/java/appeng/tile/networking/CableBusTileEntity.java b/src/main/java/appeng/tile/networking/CableBusTileEntity.java index 22da703d4..dbeb3f333 100644 --- a/src/main/java/appeng/tile/networking/CableBusTileEntity.java +++ b/src/main/java/appeng/tile/networking/CableBusTileEntity.java @@ -27,10 +27,10 @@ import javax.annotation.Nullable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -68,13 +68,13 @@ public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.getCableBus().readFromNBT(data); } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); this.getCableBus().writeToNBT(data); return data; diff --git a/src/main/java/appeng/tile/networking/ControllerTileEntity.java b/src/main/java/appeng/tile/networking/ControllerTileEntity.java index d5f3e9da8..db484e90a 100644 --- a/src/main/java/appeng/tile/networking/ControllerTileEntity.java +++ b/src/main/java/appeng/tile/networking/ControllerTileEntity.java @@ -22,7 +22,7 @@ import java.util.EnumSet; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/appeng/tile/networking/EnergyCellTileEntity.java b/src/main/java/appeng/tile/networking/EnergyCellTileEntity.java index 56673f07f..09fb37f7d 100644 --- a/src/main/java/appeng/tile/networking/EnergyCellTileEntity.java +++ b/src/main/java/appeng/tile/networking/EnergyCellTileEntity.java @@ -18,7 +18,7 @@ package appeng.tile.networking; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntityType; import appeng.api.config.AccessRestriction; @@ -90,14 +90,14 @@ public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowe } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); data.putDouble("internalCurrentPower", this.internalCurrentPower); return data; } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.internalCurrentPower = data.getDouble("internalCurrentPower"); } @@ -108,16 +108,16 @@ public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowe } @Override - public void uploadSettings(final SettingsFrom from, final CompoundNBT compound) { + public void uploadSettings(final SettingsFrom from, final CompoundTag compound) { if (from == SettingsFrom.DISMANTLE_ITEM) { this.internalCurrentPower = compound.getDouble("internalCurrentPower"); } } @Override - public CompoundNBT downloadSettings(final SettingsFrom from) { + public CompoundTag downloadSettings(final SettingsFrom from) { if (from == SettingsFrom.DISMANTLE_ITEM) { - final CompoundNBT tag = new CompoundNBT(); + final CompoundTag tag = new CompoundTag(); tag.putDouble("internalCurrentPower", this.internalCurrentPower); tag.putDouble("internalMaxPower", this.getInternalMaxPower()); // used for tool tip. return tag; diff --git a/src/main/java/appeng/tile/networking/WirelessTileEntity.java b/src/main/java/appeng/tile/networking/WirelessTileEntity.java index 8253e732b..fb6d44b1e 100644 --- a/src/main/java/appeng/tile/networking/WirelessTileEntity.java +++ b/src/main/java/appeng/tile/networking/WirelessTileEntity.java @@ -24,7 +24,7 @@ import java.util.EnumSet; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; diff --git a/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java b/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java index 6d89ee440..0c4eaba75 100644 --- a/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java +++ b/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java @@ -25,9 +25,9 @@ import javax.annotation.Nonnull; import com.google.common.collect.ImmutableSet; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.energy.IEnergyStorage; @@ -78,14 +78,14 @@ public abstract class AEBasePoweredTileEntity extends AEBaseInvTileEntity } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); data.putDouble("internalCurrentPower", this.getInternalCurrentPower()); return data; } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.setInternalCurrentPower(data.getDouble("internalCurrentPower")); } diff --git a/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java b/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java index 8d7e4bde0..c76d75865 100644 --- a/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java +++ b/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java @@ -26,12 +26,12 @@ import javax.annotation.Nonnull; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.client.model.data.ModelProperty; @@ -241,7 +241,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I public long getQEFrequency() { final ItemStack is = this.internalInventory.getStackInSlot(0); if (!is.isEmpty()) { - final CompoundNBT c = is.getTag(); + final CompoundTag c = is.getTag(); if (c != null) { return c.getLong("freq"); } diff --git a/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java b/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java index b58658372..72f31716c 100644 --- a/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java +++ b/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java @@ -21,9 +21,9 @@ package appeng.tile.spatial; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; @@ -63,14 +63,14 @@ public class SpatialIOPortTileEntity extends AENetworkInvTileEntity implements I } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); data.putInt("lastRedstoneState", this.lastRedstoneState.ordinal()); return data; } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); if (data.contains("lastRedstoneState")) { this.lastRedstoneState = YesNo.values()[data.getInt("lastRedstoneState")]; diff --git a/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java b/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java index 5f4441950..c319bb1f4 100644 --- a/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java +++ b/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java @@ -25,7 +25,7 @@ import javax.annotation.Nonnull; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.client.model.data.ModelProperty; diff --git a/src/main/java/appeng/tile/storage/ChestTileEntity.java b/src/main/java/appeng/tile/storage/ChestTileEntity.java index 57db14c31..06e8e11ac 100644 --- a/src/main/java/appeng/tile/storage/ChestTileEntity.java +++ b/src/main/java/appeng/tile/storage/ChestTileEntity.java @@ -29,11 +29,11 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidAttributes; @@ -384,7 +384,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.config.readFromNBT(data); this.priority = data.getInt("priority"); @@ -394,7 +394,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); this.config.writeToNBT(data); data.putInt("priority", this.priority); diff --git a/src/main/java/appeng/tile/storage/DriveTileEntity.java b/src/main/java/appeng/tile/storage/DriveTileEntity.java index c4dd5cfd6..707309d3c 100644 --- a/src/main/java/appeng/tile/storage/DriveTileEntity.java +++ b/src/main/java/appeng/tile/storage/DriveTileEntity.java @@ -32,7 +32,7 @@ import javax.annotation.Nullable; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; @@ -242,14 +242,14 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.isCached = false; this.priority = data.getInt("priority"); } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); data.putInt("priority", this.priority); return data; diff --git a/src/main/java/appeng/tile/storage/IOPortTileEntity.java b/src/main/java/appeng/tile/storage/IOPortTileEntity.java index 339420d8f..0a5a2858f 100644 --- a/src/main/java/appeng/tile/storage/IOPortTileEntity.java +++ b/src/main/java/appeng/tile/storage/IOPortTileEntity.java @@ -24,9 +24,9 @@ import java.util.Map; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; @@ -111,7 +111,7 @@ public class IOPortTileEntity extends AENetworkInvTileEntity } @Override - public CompoundNBT write(final CompoundNBT data) { + public CompoundTag write(final CompoundTag data) { super.write(data); this.manager.writeToNBT(data); this.upgrades.writeToNBT(data, "upgrades"); @@ -120,7 +120,7 @@ public class IOPortTileEntity extends AENetworkInvTileEntity } @Override - public void read(final CompoundNBT data) { + public void read(final CompoundTag data) { super.read(data); this.manager.readFromNBT(data); this.upgrades.readFromNBT(data, "upgrades"); diff --git a/src/main/java/appeng/util/ConfigManager.java b/src/main/java/appeng/util/ConfigManager.java index 39004623f..815d46ad7 100644 --- a/src/main/java/appeng/util/ConfigManager.java +++ b/src/main/java/appeng/util/ConfigManager.java @@ -22,7 +22,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Set; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import appeng.api.config.LevelEmitterMode; import appeng.api.config.Settings; @@ -73,7 +73,7 @@ public final class ConfigManager implements IConfigManager { * @param tagCompound to be written to compound */ @Override - public void writeToNBT(final CompoundNBT tagCompound) { + public void writeToNBT(final CompoundTag tagCompound) { for (final Map.Entry> entry : this.settings.entrySet()) { tagCompound.putString(entry.getKey().name(), this.settings.get(entry.getKey()).toString()); } @@ -85,7 +85,7 @@ public final class ConfigManager implements IConfigManager { * @param tagCompound to be read from compound */ @Override - public void readFromNBT(final CompoundNBT tagCompound) { + public void readFromNBT(final CompoundTag tagCompound) { for (final Map.Entry> entry : this.settings.entrySet()) { try { if (tagCompound.contains(entry.getKey().name())) { diff --git a/src/main/java/appeng/util/InventoryAdaptor.java b/src/main/java/appeng/util/InventoryAdaptor.java index 7f7cc9a6a..cb90f634f 100644 --- a/src/main/java/appeng/util/InventoryAdaptor.java +++ b/src/main/java/appeng/util/InventoryAdaptor.java @@ -21,7 +21,7 @@ package appeng.util; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 4e4fffa71..1f4955e00 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -46,7 +46,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java index d76ddd684..f85d0857f 100644 --- a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java +++ b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java @@ -22,7 +22,7 @@ import javax.annotation.Nonnull; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import appeng.api.config.FuzzyMode; @@ -109,7 +109,7 @@ public class ItemComparisonHelper { * performance wise, so try an use shared tag compounds as long as the system * remains in AE. */ - public boolean isNbtTagEqual(final CompoundNBT left, final CompoundNBT right) { + public boolean isNbtTagEqual(final CompoundTag left, final CompoundTag right) { if (left == right) { return true; } diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index 1e2cfcbb5..f7a7e13ee 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -26,7 +26,7 @@ import javax.annotation.Nullable; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketBuffer; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; @@ -76,7 +76,7 @@ public final class AEItemStack extends AEStack implements IAEItemS return new AEItemStack(AEItemStackRegistry.getRegisteredStack(stack), stack.getCount()); } - public static IAEItemStack fromNBT(final CompoundNBT i) { + public static IAEItemStack fromNBT(final CompoundTag i) { if (i == null) { return null; } @@ -94,8 +94,8 @@ public final class AEItemStack extends AEStack implements IAEItemS } @Override - public void writeToNBT(final CompoundNBT i) { - final CompoundNBT itemStack = new CompoundNBT(); + public void writeToNBT(final CompoundTag i) { + final CompoundTag itemStack = new CompoundTag(); this.getDefinition().write(itemStack); i.put(NBT_ITEMSTACK, itemStack); diff --git a/src/main/java/appeng/util/item/AESharedItemStack.java b/src/main/java/appeng/util/item/AESharedItemStack.java index 9e5f2c8ee..9ed512eaa 100644 --- a/src/main/java/appeng/util/item/AESharedItemStack.java +++ b/src/main/java/appeng/util/item/AESharedItemStack.java @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import appeng.api.config.FuzzyMode; @@ -121,7 +121,7 @@ final class AESharedItemStack implements Comparable { Preconditions.checkState(!stack.isEmpty(), "ItemStack#isEmpty() has to be false"); Preconditions.checkState(stack.getCount() == 1, "ItemStack#getCount() has to be 1"); - final CompoundNBT tag = stack.hasTag() ? stack.getTag() : null; + final CompoundTag tag = stack.hasTag() ? stack.getTag() : null; this.lower = this.makeLowerBound(stack, tag, fuzzy); this.upper = this.makeUpperBound(stack, tag, fuzzy); @@ -135,7 +135,7 @@ final class AESharedItemStack implements Comparable { return this.upper; } - private AESharedItemStack makeLowerBound(final ItemStack itemStack, final CompoundNBT tag, + private AESharedItemStack makeLowerBound(final ItemStack itemStack, final CompoundTag tag, final FuzzyMode fuzzy) { final ItemStack newDef = itemStack.copy(); @@ -158,7 +158,7 @@ final class AESharedItemStack implements Comparable { return new AESharedItemStack(newDef); } - private AESharedItemStack makeUpperBound(final ItemStack itemStack, final CompoundNBT tag, + private AESharedItemStack makeUpperBound(final ItemStack itemStack, final CompoundTag tag, final FuzzyMode fuzzy) { final ItemStack newDef = itemStack.copy(); diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java index 78bd20d26..98b702162 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java @@ -29,7 +29,7 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MutableBoundingBox; diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java index caa3eaf26..97ff5f09e 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java @@ -5,7 +5,7 @@ import java.util.Collection; import javax.annotation.Nullable; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.INBT; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; @@ -45,21 +45,21 @@ public final class MeteoriteSpawnData { } @Nullable - private CompoundNBT getSpawnData(int chunkX, int chunkZ, boolean create) { + private CompoundTag getSpawnData(int chunkX, int chunkZ, boolean create) { chunkX /= 16; chunkZ /= 16; String key = chunkX + "," + chunkZ; INBT inbt = data.spawns.get(key); - if (!(inbt instanceof CompoundNBT)) { + if (!(inbt instanceof CompoundTag)) { if (create) { - inbt = new CompoundNBT(); + inbt = new CompoundTag(); data.spawns.put(key, inbt); data.markDirty(); } else { return null; } } - return (CompoundNBT) inbt; + return (CompoundTag) inbt; } /** @@ -69,13 +69,13 @@ public final class MeteoriteSpawnData { public boolean isMeteoriteSpawnInRange(BlockPos pos, int rangeSquared) { synchronized (data) { ChunkPos chunkPos = new ChunkPos(pos); - CompoundNBT spawnData = getSpawnData(chunkPos.x, chunkPos.z, false); + CompoundTag spawnData = getSpawnData(chunkPos.x, chunkPos.z, false); if (spawnData == null) { return false; } final int size = spawnData.getInt("num"); for (int i = 0; i < size; i++) { - CompoundNBT existingSettingsNbt = spawnData.getCompound(String.valueOf(i)); + CompoundTag existingSettingsNbt = spawnData.getCompound(String.valueOf(i)); BlockPos existingPos = PlacedMeteoriteSettings.read(existingSettingsNbt).getPos(); int deltaX = (existingPos.getX() - pos.getX()); int deltaZ = (existingPos.getZ() - pos.getZ()); @@ -101,9 +101,9 @@ public final class MeteoriteSpawnData { public void addSpawnedMeteorite(PlacedMeteoriteSettings settings) { synchronized (data) { ChunkPos chunkPos = new ChunkPos(settings.getPos()); - CompoundNBT spawnData = getSpawnData(chunkPos.x, chunkPos.z, true); + CompoundTag spawnData = getSpawnData(chunkPos.x, chunkPos.z, true); final int size = spawnData.getInt("num"); - spawnData.put(String.valueOf(size), settings.write(new CompoundNBT())); + spawnData.put(String.valueOf(size), settings.write(new CompoundTag())); spawnData.putInt("num", size + 1); data.markDirty(); } @@ -118,13 +118,13 @@ public final class MeteoriteSpawnData { final int cx = x + (chunkX >> 4); final int cz = z + (chunkZ >> 4); - final CompoundNBT data = getSpawnData(cx << 4, cz << 4, false); + final CompoundTag data = getSpawnData(cx << 4, cz << 4, false); if (data != null) { // edit. final int size = data.getInt("num"); for (int s = 0; s < size; s++) { - CompoundNBT settingsNbt = data.getCompound(String.valueOf(s)); + CompoundTag settingsNbt = data.getCompound(String.valueOf(s)); ll.add(PlacedMeteoriteSettings.read(settingsNbt)); } } @@ -151,22 +151,22 @@ public final class MeteoriteSpawnData { private static class SavedData extends WorldSavedData { private LongOpenHashSet generated; - private CompoundNBT spawns; + private CompoundTag spawns; public SavedData() { super(NAME); this.generated = new LongOpenHashSet(); - this.spawns = new CompoundNBT(); + this.spawns = new CompoundTag(); } @Override - public synchronized void read(CompoundNBT nbt) { + public synchronized void read(CompoundTag nbt) { this.generated = new LongOpenHashSet(nbt.getLongArray("generated")); this.spawns = nbt.getCompound("spawns"); } @Override - public synchronized CompoundNBT write(CompoundNBT compound) { + public synchronized CompoundTag write(CompoundTag compound) { compound.putLongArray("generated", generated.toLongArray()); compound.put("spawns", spawns); return compound; diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java index c29cd77dc..c00ffacd2 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java @@ -19,7 +19,7 @@ package appeng.worldgen.meteorite; import java.util.Random; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MutableBoundingBox; @@ -53,7 +53,7 @@ public class MeteoriteStructurePiece extends StructurePiece { chunkPos.getZStart() - range, chunkPos.getXEnd() + range, center.getY(), chunkPos.getZEnd() + range); } - public MeteoriteStructurePiece(TemplateManager templateManager, CompoundNBT tag) { + public MeteoriteStructurePiece(TemplateManager templateManager, CompoundTag tag) { super(TYPE, tag); BlockPos center = BlockPos.fromLong(tag.getLong(Constants.TAG_POS)); @@ -75,7 +75,7 @@ public class MeteoriteStructurePiece extends StructurePiece { } @Override - protected void readAdditional(CompoundNBT tag) { + protected void readAdditional(CompoundTag tag) { tag.putFloat(Constants.TAG_RADIUS, settings.getMeteoriteRadius()); tag.putLong(Constants.TAG_POS, settings.getPos().toLong()); tag.putByte(Constants.TAG_CRATER, (byte) settings.getCraterType().ordinal()); diff --git a/src/main/java/appeng/worldgen/meteorite/PlacedMeteoriteSettings.java b/src/main/java/appeng/worldgen/meteorite/PlacedMeteoriteSettings.java index 73ecb830b..abbcbdf01 100644 --- a/src/main/java/appeng/worldgen/meteorite/PlacedMeteoriteSettings.java +++ b/src/main/java/appeng/worldgen/meteorite/PlacedMeteoriteSettings.java @@ -18,7 +18,7 @@ package appeng.worldgen.meteorite; -import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; import appeng.worldgen.meteorite.fallout.FalloutMode; @@ -70,7 +70,7 @@ public final class PlacedMeteoriteSettings { return craterLake; } - public CompoundNBT write(CompoundNBT tag) { + public CompoundTag write(CompoundTag tag) { tag.putLong(Constants.TAG_POS, pos.toLong()); tag.putFloat(Constants.TAG_RADIUS, meteoriteRadius); @@ -81,7 +81,7 @@ public final class PlacedMeteoriteSettings { return tag; } - public static PlacedMeteoriteSettings read(CompoundNBT tag) { + public static PlacedMeteoriteSettings read(CompoundTag tag) { BlockPos pos = BlockPos.fromLong(tag.getLong(Constants.TAG_POS)); float meteoriteRadius = tag.getFloat(Constants.TAG_RADIUS); CraterType craterType = CraterType.values()[tag.getByte(Constants.TAG_CRATER)]; diff --git a/src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java b/src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java index 6ca79e220..93298d54c 100644 --- a/src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java +++ b/src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java @@ -20,7 +20,7 @@ package appeng.worldgen.meteorite.debug; import javax.annotation.Nullable; import net.minecraft.block.Block; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorldReader; diff --git a/src/main/java/team/chisel/ctm/api/IFacade.java b/src/main/java/team/chisel/ctm/api/IFacade.java index 6b31f30d1..f7c11b6fc 100644 --- a/src/main/java/team/chisel/ctm/api/IFacade.java +++ b/src/main/java/team/chisel/ctm/api/IFacade.java @@ -1,9 +1,9 @@ package team.chisel.ctm.api; import net.minecraft.block.BlockState; -import net.minecraft.util.Direction; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import javax.annotation.Nonnull; @@ -15,11 +15,11 @@ import javax.annotation.Nullable; public interface IFacade { /** - * @deprecated Use {@link #getFacade(IBlockReader, BlockPos, Direction, BlockPos)} + * @deprecated Use {@link #getFacade(BlockView, BlockPos, Direction, BlockPos)} */ @Nonnull @Deprecated - BlockState getFacade(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nullable Direction side); + BlockState getFacade(@Nonnull BlockView world, @Nonnull BlockPos pos, @Nullable Direction side); /** * Gets the blockstate this facade appears as. @@ -37,7 +37,7 @@ public interface IFacade { * @return The blockstate which your block appears as. */ @Nonnull - default BlockState getFacade(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nullable Direction side, @Nonnull BlockPos connection) { + default BlockState getFacade(@Nonnull BlockView world, @Nonnull BlockPos pos, @Nullable Direction side, @Nonnull BlockPos connection) { return getFacade(world, pos, side); }