From 96ede30356f74ea5e69121b00cf09e29bc965850 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 29 Aug 2019 14:27:55 +0200 Subject: [PATCH] Fix errors in apiimpl pkg, but not in apiimpl/network/node pkg yet --- .../refinedstorage/api/IRSAPI.java | 10 - .../preview/ICraftingPreviewElement.java | 3 +- .../api/network/grid/IGridFactory.java | 5 +- .../refinedstorage/api/util/IComparer.java | 9 +- .../api/util/IOneSixMigrationHelper.java | 59 ---- .../refinedstorage/apiimpl/API.java | 85 +++--- .../apiimpl/autocrafting/CraftingManager.java | 34 +-- .../apiimpl/autocrafting/CraftingPattern.java | 36 +-- .../CraftingPatternChainList.java | 9 +- .../autocrafting/CraftingRequestInfo.java | 18 +- .../CraftingMonitorElementError.java | 6 +- .../CraftingMonitorElementFluidRender.java | 15 +- .../CraftingMonitorElementItemRender.java | 13 +- .../preview/CraftingPreviewElementError.java | 23 +- .../CraftingPreviewElementFluidStack.java | 34 ++- .../CraftingPreviewElementItemStack.java | 37 +-- .../registry/CraftingTaskFactory.java | 4 +- .../apiimpl/autocrafting/task/Crafting.java | 32 +-- .../autocrafting/task/CraftingTask.java | 176 ++++++------ .../apiimpl/autocrafting/task/Processing.java | 34 +-- .../apiimpl/network/NetworkNodeGraph.java | 72 +++-- .../apiimpl/network/NetworkNodeListener.java | 8 +- .../apiimpl/network/NetworkNodeManager.java | 28 +- .../network/grid/GridFactoryGridBlock.java | 8 +- .../network/grid/GridFactoryPortableGrid.java | 6 +- .../grid/GridFactoryPortableGridBlock.java | 6 +- .../grid/GridFactoryWirelessFluidGrid.java | 6 +- .../network/grid/GridFactoryWirelessGrid.java | 6 +- .../apiimpl/network/grid/GridManager.java | 18 +- .../apiimpl/network/grid/GridOpenHandler.java | 11 +- .../apiimpl/network/grid/GridTab.java | 4 +- .../grid/handler/FluidGridHandler.java | 56 ++-- .../handler/FluidGridHandlerPortable.java | 48 ++-- .../network/grid/handler/ItemGridHandler.java | 32 +-- .../grid/handler/ItemGridHandlerPortable.java | 22 +- .../network/item/NetworkItemHandler.java | 18 +- .../NetworkItemWirelessCraftingMonitor.java | 30 ++- .../item/NetworkItemWirelessFluidGrid.java | 33 +-- .../network/item/NetworkItemWirelessGrid.java | 32 +-- .../apiimpl/network/node/NetworkNode.java | 12 +- .../network/node/NetworkNodeCable.java | 10 +- .../network/node/NetworkNodeConstructor.java | 28 +- .../network/node/NetworkNodeCrafter.java | 12 +- .../node/NetworkNodeCrafterManager.java | 14 +- .../node/NetworkNodeCraftingMonitor.java | 16 +- .../network/node/NetworkNodeDestructor.java | 26 +- .../network/node/NetworkNodeDetector.java | 18 +- .../network/node/NetworkNodeExporter.java | 22 +- .../node/NetworkNodeExternalStorage.java | 26 +- .../node/NetworkNodeFluidInterface.java | 22 +- .../apiimpl/network/node/NetworkNodeGrid.java | 56 ++-- .../network/node/NetworkNodeImporter.java | 24 +- .../network/node/NetworkNodeInterface.java | 12 +- .../node/NetworkNodeNetworkTransmitter.java | 6 +- .../network/node/NetworkNodeReader.java | 10 +- .../node/NetworkNodeSecurityManager.java | 6 +- .../node/NetworkNodeStorageMonitor.java | 16 +- .../node/NetworkNodeWirelessTransmitter.java | 6 +- .../network/node/NetworkNodeWriter.java | 10 +- .../network/node/cover/CoverManager.java | 26 +- .../node/diskdrive/NetworkNodeDiskDrive.java | 22 +- .../StorageDiskFluidDriveWrapper.java | 4 +- .../StorageDiskItemDriveWrapper.java | 4 +- .../NetworkNodeDiskManipulator.java | 22 +- .../StorageDiskFluidManipulatorWrapper.java | 4 +- .../StorageDiskItemManipulatorWrapper.java | 4 +- .../node/storage/NetworkNodeFluidStorage.java | 20 +- .../node/storage/NetworkNodeStorage.java | 16 +- .../StorageDiskFluidStorageWrapper.java | 4 +- .../StorageDiskItemStorageWrapper.java | 4 +- .../readerwriter/ReaderWriterChannel.java | 12 +- .../ReaderWriterHandlerFluids.java | 10 +- .../ReaderWriterHandlerItems.java | 16 +- .../ReaderWriterHandlerRedstone.java | 8 +- .../readerwriter/ReaderWriterManager.java | 26 +- .../network/security/SecurityManager.java | 9 +- .../apiimpl/storage/StorageCacheFluid.java | 10 +- .../apiimpl/storage/StorageCacheItem.java | 8 +- .../StorageCacheListenerGridFluid.java | 10 +- .../storage/StorageCacheListenerGridItem.java | 12 +- .../StorageCacheListenerGridPortable.java | 14 +- ...StorageCacheListenerGridPortableFluid.java | 12 +- .../apiimpl/storage/StorageTrackerEntry.java | 5 +- .../apiimpl/storage/StorageTrackerFluid.java | 42 ++- .../apiimpl/storage/StorageTrackerItem.java | 42 ++- .../storage/disk/StorageDiskFactoryFluid.java | 17 +- .../storage/disk/StorageDiskFactoryItem.java | 15 +- .../storage/disk/StorageDiskFluid.java | 36 +-- .../disk/StorageDiskFluidPortable.java | 6 +- .../apiimpl/storage/disk/StorageDiskItem.java | 18 +- .../storage/disk/StorageDiskItemPortable.java | 4 +- .../storage/disk/StorageDiskManager.java | 34 +-- .../apiimpl/storage/disk/StorageDiskSync.java | 2 +- .../ExternalStorageCacheFluid.java | 37 ++- .../ExternalStorageProviderFluid.java | 6 +- .../ExternalStorageProviderItem.java | 11 +- .../externalstorage/StorageExternalFluid.java | 46 ++-- .../refinedstorage/apiimpl/util/Comparer.java | 43 ++- .../apiimpl/util/OneSixMigrationHelper.java | 254 ------------------ .../apiimpl/util/QuantityFormatter.java | 6 +- .../refinedstorage/block/BlockBase.java | 6 +- .../block/BlockConstructor.java | 4 +- .../refinedstorage/block/BlockController.java | 12 +- .../refinedstorage/block/BlockCrafter.java | 4 +- .../block/BlockCrafterManager.java | 8 +- .../block/BlockCraftingMonitor.java | 4 +- .../refinedstorage/block/BlockDestructor.java | 4 +- .../refinedstorage/block/BlockDetector.java | 4 +- .../refinedstorage/block/BlockDiskDrive.java | 4 +- .../block/BlockDiskManipulator.java | 4 +- .../refinedstorage/block/BlockExporter.java | 4 +- .../block/BlockExternalStorage.java | 4 +- .../block/BlockFluidInterface.java | 4 +- .../block/BlockFluidStorage.java | 8 +- .../refinedstorage/block/BlockGrid.java | 8 +- .../refinedstorage/block/BlockImporter.java | 4 +- .../refinedstorage/block/BlockInterface.java | 4 +- .../block/BlockNetworkTransmitter.java | 4 +- .../refinedstorage/block/BlockNode.java | 6 +- .../refinedstorage/block/BlockNodeProxy.java | 12 +- .../block/BlockPortableGrid.java | 8 +- .../refinedstorage/block/BlockReader.java | 4 +- .../refinedstorage/block/BlockRelay.java | 4 +- .../block/BlockSecurityManager.java | 4 +- .../refinedstorage/block/BlockStorage.java | 8 +- .../block/BlockStorageMonitor.java | 8 +- .../block/BlockWirelessTransmitter.java | 4 +- .../refinedstorage/block/BlockWriter.java | 4 +- .../command/CommandCreateDisk.java | 4 +- .../container/ContainerAmount.java | 4 +- .../container/ContainerBase.java | 26 +- .../container/ContainerConstructor.java | 4 +- .../container/ContainerController.java | 4 +- .../container/ContainerCrafter.java | 4 +- .../container/ContainerCrafterManager.java | 18 +- .../container/ContainerCraftingMonitor.java | 12 +- .../container/ContainerCraftingSettings.java | 4 +- .../container/ContainerDestructor.java | 4 +- .../container/ContainerDetector.java | 4 +- .../container/ContainerDiskDrive.java | 4 +- .../container/ContainerDiskManipulator.java | 4 +- .../container/ContainerExporter.java | 4 +- .../container/ContainerExternalStorage.java | 4 +- .../container/ContainerFilter.java | 4 +- .../container/ContainerFluidAmount.java | 4 +- .../container/ContainerFluidInterface.java | 4 +- .../container/ContainerFluidStorage.java | 4 +- .../container/ContainerGrid.java | 20 +- .../container/ContainerImporter.java | 4 +- .../container/ContainerInterface.java | 4 +- .../ContainerNetworkTransmitter.java | 4 +- .../container/ContainerReaderWriter.java | 10 +- .../container/ContainerRelay.java | 4 +- .../container/ContainerSecurityManager.java | 4 +- .../container/ContainerStorage.java | 4 +- .../container/ContainerStorageMonitor.java | 4 +- .../ContainerWirelessTransmitter.java | 4 +- .../slot/grid/SlotGridCraftingResult.java | 6 +- .../slot/legacy/SlotLegacyFilter.java | 4 +- .../refinedstorage/gui/GuiAmount.java | 4 +- .../gui/GuiCraftingPreview.java | 4 +- .../refinedstorage/gui/GuiFluidAmount.java | 4 +- .../refinedstorage/gui/GuiHandler.java | 16 +- .../refinedstorage/gui/GuiPriority.java | 4 +- .../gui/grid/GuiGridCraftingSettings.java | 4 +- .../IntegrationCraftingTweaks.java | 2 +- .../forgeenergy/ItemEnergyForge.java | 4 +- .../ReaderWriterHandlerForgeEnergy.java | 8 +- .../MoveFactoryNetworkNode.java | 18 +- .../jei/RecipeTransferHandlerGrid.java | 4 +- .../inventory/fluid/FluidInventory.java | 12 +- .../inventory/fluid/FluidInventoryFilter.java | 8 +- .../fluid/FluidInventoryFilterIcon.java | 4 +- .../inventory/item/ItemHandlerBase.java | 4 +- .../item/ItemHandlerFilterItems.java | 4 +- .../refinedstorage/item/ItemCover.java | 12 +- .../refinedstorage/item/ItemEnergyItem.java | 4 +- .../refinedstorage/item/ItemFilter.java | 36 +-- .../item/ItemFluidStorageDisk.java | 8 +- .../refinedstorage/item/ItemNetworkCard.java | 16 +- .../refinedstorage/item/ItemNetworkItem.java | 20 +- .../refinedstorage/item/ItemPattern.java | 40 +-- .../refinedstorage/item/ItemSecurityCard.java | 12 +- .../refinedstorage/item/ItemStorageDisk.java | 8 +- .../item/ItemWirelessCraftingMonitor.java | 12 +- .../item/ItemWirelessFluidGrid.java | 4 +- .../refinedstorage/item/ItemWirelessGrid.java | 4 +- .../refinedstorage/item/ItemWrench.java | 4 +- .../item/itemblock/ItemBlockBase.java | 4 +- .../item/itemblock/ItemBlockController.java | 12 +- .../item/itemblock/ItemBlockEnergyItem.java | 4 +- .../item/itemblock/ItemBlockFluidStorage.java | 4 +- .../item/itemblock/ItemBlockPortableGrid.java | 10 +- .../item/itemblock/ItemBlockStorage.java | 4 +- .../MessageCrafterManagerRequestSlotData.java | 4 +- .../network/MessageCraftingMonitorCancel.java | 4 +- .../network/MessageFilterUpdate.java | 4 +- .../network/MessageGridClear.java | 4 +- .../network/MessageGridCraftingPreview.java | 4 +- .../network/MessageGridCraftingStart.java | 4 +- .../network/MessageGridFluidInsertHeld.java | 4 +- .../network/MessageGridFluidPull.java | 4 +- .../network/MessageGridItemInsertHeld.java | 4 +- .../network/MessageGridItemPull.java | 4 +- .../network/MessageGridPatternCreate.java | 4 +- .../MessageGridProcessingTransfer.java | 4 +- .../network/MessageGridSettingsUpdate.java | 22 +- .../network/MessageGridTransfer.java | 4 +- .../network/MessageHandlerPlayerToServer.java | 6 +- .../network/MessageNetworkItemOpen.java | 4 +- .../MessageReaderWriterChannelAdd.java | 4 +- .../MessageReaderWriterChannelRemove.java | 4 +- .../network/MessageSecurityManagerUpdate.java | 4 +- .../MessageSlotFilterFluidSetAmount.java | 4 +- .../network/MessageSlotFilterSet.java | 4 +- .../network/MessageSlotFilterSetFluid.java | 4 +- .../MessageStorageDiskSizeRequest.java | 4 +- .../MessageTileDataParameterUpdate.java | 4 +- ...essageWirelessCraftingMonitorSettings.java | 4 +- ...essageWirelessFluidGridSettingsUpdate.java | 16 +- .../refinedstorage/proxy/ProxyCommon.java | 4 +- .../RecipeUpgradeWithEnchantedBook.java | 10 +- .../render/collision/AdvancedRayTracer.java | 10 +- .../collision/BlockHighlightListener.java | 4 +- .../refinedstorage/tile/TileBase.java | 22 +- .../refinedstorage/tile/TileController.java | 22 +- .../refinedstorage/tile/TileDetector.java | 8 +- .../refinedstorage/tile/TileDiskDrive.java | 12 +- .../tile/TileDiskManipulator.java | 6 +- .../refinedstorage/tile/TileNode.java | 14 +- .../tile/TileStorageMonitor.java | 14 +- .../tile/config/RedstoneMode.java | 8 +- .../craftingmonitor/ICraftingMonitor.java | 8 +- .../WirelessCraftingMonitor.java | 8 +- .../tile/data/TileDataWatcher.java | 8 +- .../DirectionHandlerNetworkNode.java | 6 +- .../tile/direction/DirectionHandlerTile.java | 8 +- .../tile/direction/IDirectionHandler.java | 6 +- .../tile/grid/WirelessFluidGrid.java | 18 +- .../tile/grid/WirelessGrid.java | 18 +- .../tile/grid/portable/PortableGrid.java | 34 +-- .../tile/grid/portable/TilePortableGrid.java | 86 +++--- .../refinedstorage/util/AccessTypeUtils.java | 8 +- .../refinedstorage/util/StackUtils.java | 78 +++--- .../refinedstorage/util/WorldUtils.java | 9 +- 245 files changed, 1614 insertions(+), 1960 deletions(-) delete mode 100644 src/main/java/com/raoulvdberge/refinedstorage/api/util/IOneSixMigrationHelper.java delete mode 100644 src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OneSixMigrationHelper.java diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java b/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java index faa11677d..55543a09d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java @@ -21,7 +21,6 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskRegistry; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSync; import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.IOneSixMigrationHelper; import com.raoulvdberge.refinedstorage.api.util.IQuantityFormatter; import com.raoulvdberge.refinedstorage.api.util.IStackList; import net.minecraft.item.ItemStack; @@ -196,15 +195,6 @@ public interface IRSAPI { */ ICraftingRequestInfo createCraftingRequestInfo(CompoundNBT tag) throws CraftingTaskReadException; - /** - * Returns a helper for the 1.6.x migration. - * Will be removed in 1.7.x! - * - * @return the 1.6.x migration helper - */ - @Nonnull - IOneSixMigrationHelper getOneSixMigrationHelper(); - /** * @param renderHandler the render handler to add */ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java index 7f48bff6a..cadfd1e77 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.api.autocrafting.preview; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import io.netty.buffer.ByteBuf; +import net.minecraft.network.PacketBuffer; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -42,7 +43,7 @@ public interface ICraftingPreviewElement { /** * @param buf buffer to write to */ - void writeToByteBuf(ByteBuf buf); + void writeToByteBuf(PacketBuffer buf); /** * Returns the id of this element, used for serialization and deserialization over the network. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridFactory.java index 295b11f27..887a884ee 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridFactory.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.api.network.grid; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -20,7 +21,7 @@ public interface IGridFactory { * @return the grid, or null if a problem occurred */ @Nullable - IGrid createFromStack(ServerPlayerEntity player, ItemStack stack); + IGrid createFromStack(PlayerEntity player, ItemStack stack); /** * Creates a grid from a block. Used when {@link #getType()} is BLOCK. @@ -30,7 +31,7 @@ public interface IGridFactory { * @return the grid, or null if a problem occurred */ @Nullable - IGrid createFromBlock(ServerPlayerEntity player, BlockPos pos); + IGrid createFromBlock(PlayerEntity player, BlockPos pos); /** * Returns a possible tile for this grid if {@link #getType()} is BLOCK. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java index 4bd6451d0..a77394625 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java @@ -9,9 +9,8 @@ import javax.annotation.Nullable; * Utilities for comparing item and fluid stacks. */ public interface IComparer { - int COMPARE_DAMAGE = 1; - int COMPARE_NBT = 2; - int COMPARE_QUANTITY = 4; + int COMPARE_NBT = 1; + int COMPARE_QUANTITY = 2; /** * Compares two stacks by the given flags. @@ -31,7 +30,7 @@ public interface IComparer { * @return true if the left and right stack are the same, false otherwise */ default boolean isEqual(@Nullable ItemStack left, @Nullable ItemStack right) { - return isEqual(left, right, COMPARE_NBT | COMPARE_DAMAGE | COMPARE_QUANTITY); + return isEqual(left, right, COMPARE_NBT | COMPARE_QUANTITY); } /** @@ -42,7 +41,7 @@ public interface IComparer { * @return true if the left and right stack are the same, false otherwise */ default boolean isEqualNoQuantity(@Nullable ItemStack left, @Nullable ItemStack right) { - return isEqual(left, right, COMPARE_NBT | COMPARE_DAMAGE); + return isEqual(left, right, COMPARE_NBT); } /** diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IOneSixMigrationHelper.java b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IOneSixMigrationHelper.java deleted file mode 100644 index e70335c57..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IOneSixMigrationHelper.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.raoulvdberge.refinedstorage.api.util; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.IItemHandlerModifiable; - -import java.util.UUID; - -/** - * A helper for the changes in 1.6. - */ -public interface IOneSixMigrationHelper { - /** - * Migrates this disk over to the new 1.6 format *IF POSSIBLE*. - * The given disk item needs to implement {@link com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider}! - * This will call {@link com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider#setId(ItemStack, UUID)} on the disk, so make sure - * a call to this method clears previous 1.5 and lower data, or this method will keep migrating constantly! - *

- * This will *ONLY* work with disks that were made using the IStorageDiskBehavior 1.5 API. - * If you were using another method, you'll have to implement the migration code yourself. - * - * @param world the world - * @param disk the disk to attempt to migrate - * @return true if it migrated, false otherwise - */ - boolean migrateDisk(World world, ItemStack disk); - - /** - * Migrates an entire disk inventory. - * Loops over every slot in the inventory and calls {@link #migrateDisk(World, ItemStack)}. - * All the docs from {@link #migrateDisk(World, ItemStack)} apply here as well! - * Don't forget to mark your tile dirty if this call returns true! - * - * @param world the world - * @param handler the inventory - * @return true if it migrated something in the inventory, false otherwise - */ - boolean migrateDiskInventory(World world, IItemHandlerModifiable handler); - - /** - * Migrates an entire pattern inventory. - * Returns true if there were changes, and the caller should then mark their inventory dirty. - * - * @param handler the pattern inventory - * @return true if a pattern has been converted, false otherwise - */ - boolean migratePatternInventory(IItemHandler handler); - - /** - * Migrates a single pattern stack. - * Returns true if the stack was modified, and the caller should then mark their inventory dirty. - * You most likely need {@link #migratePatternInventory(IItemHandler)}. - * - * @param pattern the pattern - * @return true if the pattern has been converted, false otherwise - */ - boolean migratePattern(ItemStack pattern); -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java index fc2f96867..1a5328338 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java @@ -13,7 +13,6 @@ import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.network.grid.IGridManager; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeRegistry; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandlerRegistry; @@ -38,16 +37,14 @@ import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.*; import com.raoulvdberge.refinedstorage.apiimpl.util.*; import com.raoulvdberge.refinedstorage.capability.CapabilityNetworkNodeProxy; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.INBT; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.storage.MapStorage; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.discovery.ASMDataTable; import javax.annotation.Nonnull; import java.lang.reflect.Field; @@ -66,7 +63,6 @@ public class API implements IRSAPI { private IGridManager gridManager = new GridManager(); private IStorageDiskRegistry storageDiskRegistry = new StorageDiskRegistry(); private IStorageDiskSync storageDiskSync = new StorageDiskSync(); - private IOneSixMigrationHelper oneSixMigrationHelper = new OneSixMigrationHelper(); private Map> externalStorageProviders = new HashMap<>(); private List patternRenderHandlers = new LinkedList<>(); @@ -74,7 +70,7 @@ public class API implements IRSAPI { return INSTANCE; } - public static void deliver(ASMDataTable asmDataTable) { + /* TODO API DELIVERY public static void deliver(ASMDataTable asmDataTable) { String annotationClassName = RSAPIInject.class.getCanonicalName(); Set asmDataSet = asmDataTable.getAll(annotationClassName); @@ -91,7 +87,7 @@ public class API implements IRSAPI { throw new RuntimeException("Failed to set: {}" + asmData.getClassName() + "." + asmData.getObjectName(), e); } } - } + }*/ @Nonnull @Override @@ -117,6 +113,7 @@ public class API implements IRSAPI { throw new IllegalArgumentException("Attempting to access network node manager on the client"); } + /* TODO: Saving MapStorage storage = world.getPerWorldStorage(); NetworkNodeManager instance = (NetworkNodeManager) storage.getOrLoadData(NetworkNodeManager.class, NetworkNodeManager.NAME); @@ -126,9 +123,9 @@ public class API implements IRSAPI { storage.setData(NetworkNodeManager.NAME, instance); } else { instance.tryReadNodes(world); - } + }*/ - return instance; + return new NetworkNodeManager("ABC"); } @Override @@ -197,7 +194,7 @@ public class API implements IRSAPI { if (world.isRemote) { throw new IllegalArgumentException("Attempting to access storage disk manager on the client"); } - + /* TODO: Saving! MapStorage storage = world.getMapStorage(); StorageDiskManager instance = (StorageDiskManager) storage.getOrLoadData(StorageDiskManager.class, StorageDiskManager.NAME); @@ -207,9 +204,9 @@ public class API implements IRSAPI { storage.setData(StorageDiskManager.NAME, instance); } else { instance.tryReadDisks(world); - } + } */ - return instance; + return new StorageDiskManager("ABC"); } @Nonnull @@ -253,16 +250,10 @@ public class API implements IRSAPI { } @Override - public ICraftingRequestInfo createCraftingRequestInfo(NBTTagCompound tag) throws CraftingTaskReadException { + public ICraftingRequestInfo createCraftingRequestInfo(CompoundNBT tag) throws CraftingTaskReadException { return new CraftingRequestInfo(tag); } - @Override - @Nonnull - public IOneSixMigrationHelper getOneSixMigrationHelper() { - return oneSixMigrationHelper; - } - @Override public void addPatternRenderHandler(ICraftingPatternRenderHandler renderHandler) { patternRenderHandlers.add(renderHandler); @@ -275,18 +266,19 @@ public class API implements IRSAPI { @Override public void discoverNode(World world, BlockPos pos) { - for (EnumFacing facing : EnumFacing.VALUES) { + for (Direction facing : Direction.values()) { TileEntity tile = world.getTileEntity(pos.offset(facing)); - if (tile != null && tile.hasCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, facing.getOpposite())) { - INetworkNodeProxy nodeProxy = tile.getCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, facing.getOpposite()); - INetworkNode node = nodeProxy.getNode(); + if (tile != null) { + tile.getCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, facing.getOpposite()).ifPresent(nodeProxy -> { + INetworkNode node = nodeProxy.getNode(); - if (node.getNetwork() != null) { - node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().world(), node.getNetwork().getPosition()); + if (node.getNetwork() != null) { + node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().world(), node.getNetwork().getPosition()); - return; - } + return; + } + }); } } } @@ -294,20 +286,19 @@ public class API implements IRSAPI { @Override public int getItemStackHashCode(ItemStack stack) { int result = stack.getItem().hashCode(); - result = 31 * result + (stack.getItemDamage() + 1); - if (stack.hasTagCompound()) { - result = getHashCode(stack.getTagCompound(), result); + if (stack.hasTag()) { + result = getHashCode(stack.getTag(), result); } return result; } - private int getHashCode(NBTBase tag, int result) { - if (tag instanceof NBTTagCompound) { - result = getHashCode((NBTTagCompound) tag, result); - } else if (tag instanceof NBTTagList) { - result = getHashCode((NBTTagList) tag, result); + private int getHashCode(INBT tag, int result) { + if (tag instanceof CompoundNBT) { + result = getHashCode((CompoundNBT) tag, result); + } else if (tag instanceof ListNBT) { + result = getHashCode((ListNBT) tag, result); } else { result = 31 * result + tag.hashCode(); } @@ -315,17 +306,17 @@ public class API implements IRSAPI { return result; } - private int getHashCode(NBTTagCompound tag, int result) { - for (String key : tag.getKeySet()) { + private int getHashCode(CompoundNBT tag, int result) { + for (String key : tag.keySet()) { result = 31 * result + key.hashCode(); - result = getHashCode(tag.getTag(key), result); + result = getHashCode(tag.get(key), result); } return result; } - private int getHashCode(NBTTagList tag, int result) { - for (int i = 0; i < tag.tagCount(); ++i) { + private int getHashCode(ListNBT tag, int result) { + for (int i = 0; i < tag.size(); ++i) { result = getHashCode(tag.get(i), result); } @@ -336,8 +327,8 @@ public class API implements IRSAPI { public int getFluidStackHashCode(FluidStack stack) { int result = stack.getFluid().hashCode(); - if (stack.tag != null) { - result = getHashCode(stack.tag, result); + if (stack.getTag() != null) { + result = getHashCode(stack.getTag(), result); } return result; @@ -346,7 +337,7 @@ public class API implements IRSAPI { @Override public int getNetworkNodeHashCode(INetworkNode node) { int result = node.getPos().hashCode(); - result = 31 * result + node.getWorld().provider.getDimension(); + result = 31 * result + node.getWorld().getDimension().getType().getId(); return result; } @@ -363,7 +354,7 @@ public class API implements IRSAPI { INetworkNode rightNode = (INetworkNode) right; - if (left.getWorld().provider.getDimension() != rightNode.getWorld().provider.getDimension()) { + if (left.getWorld().getDimension().getType().getId() != rightNode.getWorld().getDimension().getType().getId()) { return false; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java index be2fe6b02..eff071376 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java @@ -15,8 +15,8 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.util.OneSixMigrationHelper; import com.raoulvdberge.refinedstorage.tile.TileController; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.FluidStack; @@ -42,7 +42,7 @@ public class CraftingManager implements ICraftingManager { private Map tasks = new LinkedHashMap<>(); private List tasksToAdd = new ArrayList<>(); private List tasksToCancel = new ArrayList<>(); - private NBTTagList tasksToRead; + private ListNBT tasksToRead; private Map throttledRequesters = new HashMap<>(); @@ -127,11 +127,11 @@ public class CraftingManager implements ICraftingManager { public void update() { if (network.canRun()) { if (tasksToRead != null) { - for (int i = 0; i < tasksToRead.tagCount(); ++i) { - NBTTagCompound taskTag = tasksToRead.getCompoundTagAt(i); + for (int i = 0; i < tasksToRead.size(); ++i) { + CompoundNBT taskTag = tasksToRead.getCompound(i); String taskType = taskTag.getString(NBT_TASK_TYPE); - NBTTagCompound taskData = taskTag.getCompoundTag(NBT_TASK_DATA); + CompoundNBT taskData = taskTag.getCompound(NBT_TASK_DATA); ICraftingTaskFactory factory = API.instance().getCraftingTaskRegistry().get(taskType); if (factory != null) { @@ -187,24 +187,24 @@ public class CraftingManager implements ICraftingManager { } @Override - public void readFromNbt(NBTTagCompound tag) { - this.tasksToRead = tag.getTagList(NBT_TASKS, Constants.NBT.TAG_COMPOUND); + public void readFromNbt(CompoundNBT tag) { + this.tasksToRead = tag.getList(NBT_TASKS, Constants.NBT.TAG_COMPOUND); } @Override - public NBTTagCompound writeToNbt(NBTTagCompound tag) { - NBTTagList list = new NBTTagList(); + public CompoundNBT writeToNbt(CompoundNBT tag) { + ListNBT list = new ListNBT(); for (ICraftingTask task : tasks.values()) { - NBTTagCompound taskTag = new NBTTagCompound(); + CompoundNBT taskTag = new CompoundNBT(); - taskTag.setString(NBT_TASK_TYPE, task.getPattern().getId()); - taskTag.setTag(NBT_TASK_DATA, task.writeToNbt(new NBTTagCompound())); + taskTag.putString(NBT_TASK_TYPE, task.getPattern().getId()); + taskTag.put(NBT_TASK_DATA, task.writeToNbt(new CompoundNBT())); - list.appendTag(taskTag); + list.add(taskTag); } - tag.setTag(NBT_TASKS, list); + tag.put(NBT_TASKS, list); return tag; } @@ -302,7 +302,7 @@ public class CraftingManager implements ICraftingManager { OneSixMigrationHelper.removalHook(); // Remove @Nullable source if (source != null) { - throttledRequesters.put(source, MinecraftServer.getCurrentTimeMillis()); + throttledRequesters.put(source, System.currentTimeMillis()); } } @@ -318,7 +318,7 @@ public class CraftingManager implements ICraftingManager { return false; } - return MinecraftServer.getCurrentTimeMillis() - throttledSince < THROTTLE_DELAY_MS; + return System.currentTimeMillis() - throttledSince < THROTTLE_DELAY_MS; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java index aec32e0b2..5b0e65997 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java @@ -7,17 +7,15 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory; import com.raoulvdberge.refinedstorage.apiimpl.util.OneSixMigrationHelper; import com.raoulvdberge.refinedstorage.item.ItemPattern; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.inventory.container.Container; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; import java.util.ArrayList; import java.util.List; @@ -58,7 +56,8 @@ public class CraftingPattern implements ICraftingPattern { ores.add(input.copy()); - for (int id : OreDictionary.getOreIDs(input)) { + // TODO: OREDICT + /*for (int id : OreDictionary.getOreIDs(input)) { String name = OreDictionary.getOreName(id); for (ItemStack ore : OreDictionary.getOres(name)) { @@ -68,10 +67,10 @@ public class CraftingPattern implements ICraftingPattern { ores.add(ore.copy()); } } - } + }*/ // Fix item count - for (ItemStack ore: ores) { + for (ItemStack ore : ores) { ore.setCount(input.getCount()); } @@ -102,7 +101,7 @@ public class CraftingPattern implements ICraftingPattern { } } } else { - InventoryCrafting inv = new InventoryCraftingDummy(); + CraftingInventory inv = new CraftingInventoryDummy(); for (int i = 0; i < 9; ++i) { ItemStack input = ItemPattern.getInputSlot(stack, i); @@ -114,7 +113,8 @@ public class CraftingPattern implements ICraftingPattern { } } - for (IRecipe r : CraftingManager.REGISTRY) { + // TODO: better way of collecting recipes + for (IRecipe r : world.getRecipeManager().getRecipes()) { if (r.matches(inv, world)) { this.recipe = r; @@ -132,7 +132,7 @@ public class CraftingPattern implements ICraftingPattern { inputs.clear(); for (int i = 0; i < recipe.getIngredients().size(); ++i) { - inputs.add(i, NonNullList.from(ItemStack.EMPTY, recipe.getIngredients().get(i).getMatchingStacks())); + inputs.add(i, NonNullList.from(ItemStack.EMPTY, ((Ingredient) recipe.getIngredients().get(i)).getMatchingStacks())); } } else { this.valid = false; @@ -190,7 +190,7 @@ public class CraftingPattern implements ICraftingPattern { throw new IllegalArgumentException("The items that are taken (" + took.size() + ") should match the inputs for this pattern (" + inputs.size() + ")"); } - InventoryCrafting inv = new InventoryCraftingDummy(); + CraftingInventory inv = new CraftingInventoryDummy(); for (int i = 0; i < took.size(); ++i) { inv.setInventorySlotContents(i, took.get(i)); @@ -223,7 +223,7 @@ public class CraftingPattern implements ICraftingPattern { throw new IllegalArgumentException("The items that are taken (" + took.size() + ") should match the inputs for this pattern (" + inputs.size() + ")"); } - InventoryCrafting inv = new InventoryCraftingDummy(); + CraftingInventory inv = new CraftingInventoryDummy(); for (int i = 0; i < took.size(); ++i) { inv.setInventorySlotContents(i, took.get(i)); @@ -349,11 +349,11 @@ public class CraftingPattern implements ICraftingPattern { return result; } - private class InventoryCraftingDummy extends InventoryCrafting { - public InventoryCraftingDummy() { - super(new Container() { + class CraftingInventoryDummy extends CraftingInventory { + public CraftingInventoryDummy() { + super(new Container(null, 0) { @Override - public boolean canInteractWith(EntityPlayer player) { + public boolean canInteractWith(PlayerEntity player) { return true; } }, 3, 3); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java index 4a8a982ec..c28dec052 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java @@ -3,14 +3,13 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChainList; -import gnu.trove.map.hash.TCustomHashMap; -import gnu.trove.strategy.HashingStrategy; +import java.util.HashMap; import java.util.List; import java.util.Map; public class CraftingPatternChainList implements ICraftingPatternChainList { - private Map map = new TCustomHashMap<>(new HashingStrategy() { + /*private Map map = new TCustomHashMap<>(new HashingStrategy() { @Override public int computeHashCode(ICraftingPattern pattern) { return pattern.getChainHashCode(); @@ -20,7 +19,9 @@ public class CraftingPatternChainList implements ICraftingPatternChainList { public boolean equals(ICraftingPattern left, ICraftingPattern right) { return left.canBeInChainWith(right); } - }); + });*/ + // TODO: broken + private Map map = new HashMap<>(); public CraftingPatternChainList(List patterns) { for (ICraftingPattern pattern : patterns) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingRequestInfo.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingRequestInfo.java index 9548cd168..71fde9e3b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingRequestInfo.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingRequestInfo.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadExc import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nullable; @@ -16,15 +16,15 @@ public class CraftingRequestInfo implements ICraftingRequestInfo { private ItemStack item; private FluidStack fluid; - public CraftingRequestInfo(NBTTagCompound tag) throws CraftingTaskReadException { + public CraftingRequestInfo(CompoundNBT tag) throws CraftingTaskReadException { if (!tag.getBoolean(NBT_FLUID)) { - item = StackUtils.deserializeStackFromNbt(tag.getCompoundTag(NBT_STACK)); + item = StackUtils.deserializeStackFromNbt(tag.getCompound(NBT_STACK)); if (item.isEmpty()) { throw new CraftingTaskReadException("Extractor stack is empty"); } } else { - fluid = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag(NBT_STACK)); + fluid = FluidStack.loadFluidStackFromNBT(tag.getCompound(NBT_STACK)); if (fluid == null) { throw new CraftingTaskReadException("Extractor fluid stack is emty"); @@ -53,15 +53,15 @@ public class CraftingRequestInfo implements ICraftingRequestInfo { } @Override - public NBTTagCompound writeToNbt() { - NBTTagCompound tag = new NBTTagCompound(); + public CompoundNBT writeToNbt() { + CompoundNBT tag = new CompoundNBT(); - tag.setBoolean(NBT_FLUID, fluid != null); + tag.putBoolean(NBT_FLUID, fluid != null); if (fluid != null) { - tag.setTag(NBT_STACK, fluid.writeToNBT(new NBTTagCompound())); + tag.put(NBT_STACK, fluid.writeToNBT(new CompoundNBT())); } else { - tag.setTag(NBT_STACK, StackUtils.serializeStackToNbt(item)); + tag.put(NBT_STACK, StackUtils.serializeStackToNbt(item)); } return tag; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java index 63bde4710..3a6bd304c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java @@ -3,9 +3,9 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufUtil; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.common.network.ByteBufUtils; import javax.annotation.Nullable; @@ -41,8 +41,8 @@ public class CraftingMonitorElementError implements ICraftingMonitorElement { @Override public void write(ByteBuf buf) { - ByteBufUtils.writeUTF8String(buf, base.getId()); - ByteBufUtils.writeUTF8String(buf, message); + ByteBufUtil.writeUtf8(buf, base.getId()); + ByteBufUtil.writeUtf8(buf, message); base.write(buf); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java index 2f0ed7dcb..c13e65711 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java @@ -1,16 +1,16 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.util.RenderUtils; import com.raoulvdberge.refinedstorage.util.StackUtils; import io.netty.buffer.ByteBuf; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -39,7 +39,7 @@ public class CraftingMonitorElementFluidRender implements ICraftingMonitorElemen } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void draw(int x, int y, IElementDrawers drawers) { if (missing > 0) { drawers.getOverlayDrawer().draw(x, y, COLOR_MISSING); @@ -53,10 +53,11 @@ public class CraftingMonitorElementFluidRender implements ICraftingMonitorElemen drawers.getFluidDrawer().draw(x + 4, y + 6, stack); - float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; + // TODO float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; + float scale = 1F; GlStateManager.pushMatrix(); - GlStateManager.scale(scale, scale, 1); + GlStateManager.scalef(scale, scale, 1); int yy = y + 7; @@ -99,7 +100,7 @@ public class CraftingMonitorElementFluidRender implements ICraftingMonitorElemen @Nullable @Override public String getTooltip() { - return stack.getLocalizedName(); + return I18n.format(stack.getTranslationKey()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java index 3b2d5e0d7..a3ea4cba5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java @@ -1,16 +1,16 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.util.RenderUtils; import com.raoulvdberge.refinedstorage.util.StackUtils; import io.netty.buffer.ByteBuf; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nullable; import java.util.stream.Collectors; @@ -40,7 +40,7 @@ public class CraftingMonitorElementItemRender implements ICraftingMonitorElement } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void draw(int x, int y, IElementDrawers drawers) { if (missing > 0) { drawers.getOverlayDrawer().draw(x, y, COLOR_MISSING); @@ -54,10 +54,11 @@ public class CraftingMonitorElementItemRender implements ICraftingMonitorElement drawers.getItemDrawer().draw(x + 4, y + 6, stack); - float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; + // TODO float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; + float scale = 1F; GlStateManager.pushMatrix(); - GlStateManager.scale(scale, scale, 1); + GlStateManager.scalef(scale, scale, 1); int yy = y + 7; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementError.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementError.java index d6697c418..44f5c06cd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementError.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementError.java @@ -3,11 +3,10 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskErrorType; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import io.netty.buffer.ByteBuf; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.common.network.ByteBufUtils; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.network.PacketBuffer; public class CraftingPreviewElementError implements ICraftingPreviewElement { public static final String ID = "error"; @@ -45,28 +44,30 @@ public class CraftingPreviewElementError implements ICraftingPreviewElement= 0 && errorIdx < CraftingTaskErrorType.values().length ? CraftingTaskErrorType.values()[errorIdx] : CraftingTaskErrorType.TOO_COMPLEX; + // TODO can't we use readItemStack here? Item item = Item.getItemById(buf.readInt()); - int meta = buf.readInt(); - NBTTagCompound tag = ByteBufUtils.readTag(buf); + CompoundNBT tag = buf.readCompoundTag(); - ItemStack stack = new ItemStack(item, 1, meta); - stack.setTagCompound(tag); + ItemStack stack = new ItemStack(item, 1); + stack.put(tag); return new CraftingPreviewElementError(error, stack); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java index e25ad1497..818c1afec 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java @@ -1,19 +1,15 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; +import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.util.RenderUtils; -import io.netty.buffer.ByteBuf; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; +import net.minecraft.network.PacketBuffer; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class CraftingPreviewElementFluidStack implements ICraftingPreviewElement { public static final String ID = "fluid_renderer"; @@ -35,23 +31,23 @@ public class CraftingPreviewElementFluidStack implements ICraftingPreviewElement this.toCraft = toCraft; } + // TODO ren @Override - public void writeToByteBuf(ByteBuf buf) { - ByteBufUtils.writeUTF8String(buf, FluidRegistry.getFluidName(stack)); - ByteBufUtils.writeTag(buf, stack.tag); + public void writeToByteBuf(PacketBuffer buf) { + stack.writeToPacket(buf); buf.writeInt(available); buf.writeBoolean(missing); buf.writeInt(toCraft); } - public static CraftingPreviewElementFluidStack fromByteBuf(ByteBuf buf) { - Fluid fluid = FluidRegistry.getFluid(ByteBufUtils.readUTF8String(buf)); - NBTTagCompound tag = ByteBufUtils.readTag(buf); + //TODO ren + public static CraftingPreviewElementFluidStack fromByteBuf(PacketBuffer buf) { + FluidStack stack = FluidStack.readFromPacket(buf); int available = buf.readInt(); boolean missing = buf.readBoolean(); int toCraft = buf.readInt(); - return new CraftingPreviewElementFluidStack(new FluidStack(fluid, 1, tag), available, missing, toCraft); + return new CraftingPreviewElementFluidStack(stack, available, missing, toCraft); } @Override @@ -60,7 +56,7 @@ public class CraftingPreviewElementFluidStack implements ICraftingPreviewElement } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void draw(int x, int y, IElementDrawers drawers) { if (missing) { drawers.getOverlayDrawer().draw(x, y, 0xFFF2DEDE); @@ -71,12 +67,14 @@ public class CraftingPreviewElementFluidStack implements ICraftingPreviewElement drawers.getFluidDrawer().draw(x, y, getElement()); - float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; + // TODO + //float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; + float scale = 1F; y += 2; GlStateManager.pushMatrix(); - GlStateManager.scale(scale, scale, 1); + GlStateManager.scalef(scale, scale, 1); if (getToCraft() > 0) { String format = hasMissing() ? "gui.refinedstorage:crafting_preview.missing" : "gui.refinedstorage:crafting_preview.to_craft"; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java index 8d43abb28..c7c317e0a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java @@ -1,17 +1,16 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; +import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.util.RenderUtils; -import io.netty.buffer.ByteBuf; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.network.PacketBuffer; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; public class CraftingPreviewElementItemStack implements ICraftingPreviewElement { @@ -34,26 +33,29 @@ public class CraftingPreviewElementItemStack implements ICraftingPreviewElement< this.toCraft = toCraft; } + // TODO ren @Override - public void writeToByteBuf(ByteBuf buf) { + public void writeToByteBuf(PacketBuffer buf) { + // TODO can't we use writeItemSTack buf.writeInt(Item.getIdFromItem(stack.getItem())); - buf.writeInt(stack.getMetadata()); - ByteBufUtils.writeTag(buf, stack.getTagCompound()); + buf.writeCompoundTag(stack.getTag()); buf.writeInt(available); buf.writeBoolean(missing); buf.writeInt(toCraft); } - public static CraftingPreviewElementItemStack fromByteBuf(ByteBuf buf) { + // TODO ren + public static CraftingPreviewElementItemStack fromByteBuf(PacketBuffer buf) { + // TODO readItemStack + Item item = Item.getItemById(buf.readInt()); - int meta = buf.readInt(); - NBTTagCompound tag = ByteBufUtils.readTag(buf); + CompoundNBT tag = buf.readCompoundTag(); int available = buf.readInt(); boolean missing = buf.readBoolean(); int toCraft = buf.readInt(); - ItemStack stack = new ItemStack(item, 1, meta); - stack.setTagCompound(tag); + ItemStack stack = new ItemStack(item, 1); + stack.put(tag); return new CraftingPreviewElementItemStack(stack, available, missing, toCraft); } @@ -64,7 +66,7 @@ public class CraftingPreviewElementItemStack implements ICraftingPreviewElement< } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void draw(int x, int y, IElementDrawers drawers) { if (missing) { drawers.getOverlayDrawer().draw(x, y, 0xFFF2DEDE); @@ -75,12 +77,13 @@ public class CraftingPreviewElementItemStack implements ICraftingPreviewElement< drawers.getItemDrawer().draw(x, y, getElement()); - float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; + // TODO float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; + float scale = 1F; y += 2; GlStateManager.pushMatrix(); - GlStateManager.scale(scale, scale, 1); + GlStateManager.scalef(scale, scale, 1); if (getToCraft() > 0) { String format = hasMissing() ? "gui.refinedstorage:crafting_preview.missing" : "gui.refinedstorage:crafting_preview.to_craft"; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java index 7b87a9b54..37018b86d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInf import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTask; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import javax.annotation.Nonnull; @@ -21,7 +21,7 @@ public class CraftingTaskFactory implements ICraftingTaskFactory { } @Override - public ICraftingTask createFromNbt(INetwork network, NBTTagCompound tag) throws CraftingTaskReadException { + public ICraftingTask createFromNbt(INetwork network, CompoundNBT tag) throws CraftingTaskReadException { return new CraftingTask(network, tag); } } \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Crafting.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Crafting.java index 79a17af61..c5cfef4b8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Crafting.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Crafting.java @@ -6,8 +6,8 @@ import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.util.IStackList; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.util.NonNullList; import net.minecraftforge.common.util.Constants; @@ -29,16 +29,16 @@ class Crafting { this.root = root; } - public Crafting(INetwork network, NBTTagCompound tag) throws CraftingTaskReadException { - this.pattern = CraftingTask.readPatternFromNbt(tag.getCompoundTag(NBT_PATTERN), network.world()); - this.toExtract = CraftingTask.readItemStackList(tag.getTagList(NBT_TO_EXTRACT, Constants.NBT.TAG_COMPOUND)); + public Crafting(INetwork network, CompoundNBT tag) throws CraftingTaskReadException { + this.pattern = CraftingTask.readPatternFromNbt(tag.getCompound(NBT_PATTERN), network.world()); + this.toExtract = CraftingTask.readItemStackList(tag.getList(NBT_TO_EXTRACT, Constants.NBT.TAG_COMPOUND)); this.root = tag.getBoolean(NBT_ROOT); this.took = NonNullList.create(); - NBTTagList tookList = tag.getTagList(NBT_TOOK, Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < tookList.tagCount(); ++i) { - ItemStack stack = StackUtils.deserializeStackFromNbt(tookList.getCompoundTagAt(i)); + ListNBT tookList = tag.getList(NBT_TOOK, Constants.NBT.TAG_COMPOUND); + for (int i = 0; i < tookList.size(); ++i) { + ItemStack stack = StackUtils.deserializeStackFromNbt(tookList.getCompound(i)); // Can be empty. took.add(stack); @@ -61,19 +61,19 @@ class Crafting { return toExtract; } - public NBTTagCompound writeToNbt() { - NBTTagCompound tag = new NBTTagCompound(); + public CompoundNBT writeToNbt() { + CompoundNBT tag = new CompoundNBT(); - tag.setTag(NBT_PATTERN, CraftingTask.writePatternToNbt(pattern)); - tag.setTag(NBT_TO_EXTRACT, CraftingTask.writeItemStackList(toExtract)); - tag.setBoolean(NBT_ROOT, root); + tag.put(NBT_PATTERN, CraftingTask.writePatternToNbt(pattern)); + tag.put(NBT_TO_EXTRACT, CraftingTask.writeItemStackList(toExtract)); + tag.putBoolean(NBT_ROOT, root); - NBTTagList tookList = new NBTTagList(); + ListNBT tookList = new ListNBT(); for (ItemStack took : this.took) { - tookList.appendTag(StackUtils.serializeStackToNbt(took)); + tookList.add(StackUtils.serializeStackToNbt(took)); } - tag.setTag(NBT_TOOK, tookList); + tag.put(NBT_TOOK, tookList); return tag; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java index e120b408b..cafefe007 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java @@ -26,13 +26,15 @@ import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskItem; import com.raoulvdberge.refinedstorage.apiimpl.util.OneSixMigrationHelper; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.IItemHandler; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -105,98 +107,98 @@ public class CraftingTask implements ICraftingTask { this.internalFluidStorage = new StorageDiskFluid(network.world(), -1); } - public CraftingTask(INetwork network, NBTTagCompound tag) throws CraftingTaskReadException { + public CraftingTask(INetwork network, CompoundNBT tag) throws CraftingTaskReadException { OneSixMigrationHelper.removalHook(); - if (!tag.hasKey(NBT_INTERNAL_STORAGE)) { + if (!tag.contains(NBT_INTERNAL_STORAGE)) { throw new CraftingTaskReadException("Couldn't read crafting task from before RS v1.6.4, skipping..."); } this.network = network; - this.requested = API.instance().createCraftingRequestInfo(tag.getCompoundTag(NBT_REQUESTED)); - this.quantity = tag.getInteger(NBT_QUANTITY); - this.pattern = readPatternFromNbt(tag.getCompoundTag(NBT_PATTERN), network.world()); - this.ticks = tag.getInteger(NBT_TICKS); + this.requested = API.instance().createCraftingRequestInfo(tag.getCompound(NBT_REQUESTED)); + this.quantity = tag.getInt(NBT_QUANTITY); + this.pattern = readPatternFromNbt(tag.getCompound(NBT_PATTERN), network.world()); + this.ticks = tag.getInt(NBT_TICKS); this.id = tag.getUniqueId(NBT_ID); this.executionStarted = tag.getLong(NBT_EXECUTION_STARTED); - if (tag.hasKey(NBT_TOTAL_STEPS)) { - this.totalSteps = tag.getInteger(NBT_TOTAL_STEPS); + if (tag.contains(NBT_TOTAL_STEPS)) { + this.totalSteps = tag.getInt(NBT_TOTAL_STEPS); } StorageDiskFactoryItem factoryItem = new StorageDiskFactoryItem(); StorageDiskFactoryFluid factoryFluid = new StorageDiskFactoryFluid(); - this.internalStorage = factoryItem.createFromNbt(network.world(), tag.getCompoundTag(NBT_INTERNAL_STORAGE)); - this.internalFluidStorage = factoryFluid.createFromNbt(network.world(), tag.getCompoundTag(NBT_INTERNAL_FLUID_STORAGE)); + this.internalStorage = factoryItem.createFromNbt(network.world(), tag.getCompound(NBT_INTERNAL_STORAGE)); + this.internalFluidStorage = factoryFluid.createFromNbt(network.world(), tag.getCompound(NBT_INTERNAL_FLUID_STORAGE)); - this.toExtractInitial = readItemStackList(tag.getTagList(NBT_TO_EXTRACT_INITIAL, Constants.NBT.TAG_COMPOUND)); - this.toExtractInitialFluids = readFluidStackList(tag.getTagList(NBT_TO_EXTRACT_INITIAL_FLUIDS, Constants.NBT.TAG_COMPOUND)); + this.toExtractInitial = readItemStackList(tag.getList(NBT_TO_EXTRACT_INITIAL, Constants.NBT.TAG_COMPOUND)); + this.toExtractInitialFluids = readFluidStackList(tag.getList(NBT_TO_EXTRACT_INITIAL_FLUIDS, Constants.NBT.TAG_COMPOUND)); - NBTTagList craftingList = tag.getTagList(NBT_CRAFTING, Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < craftingList.tagCount(); ++i) { - crafting.add(new Crafting(network, craftingList.getCompoundTagAt(i))); + ListNBT craftingList = tag.getList(NBT_CRAFTING, Constants.NBT.TAG_COMPOUND); + for (int i = 0; i < craftingList.size(); ++i) { + crafting.add(new Crafting(network, craftingList.getCompound(i))); } - NBTTagList processingList = tag.getTagList(NBT_PROCESSING, Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < processingList.tagCount(); ++i) { - processing.add(new Processing(network, processingList.getCompoundTagAt(i))); + ListNBT processingList = tag.getList(NBT_PROCESSING, Constants.NBT.TAG_COMPOUND); + for (int i = 0; i < processingList.size(); ++i) { + processing.add(new Processing(network, processingList.getCompound(i))); } - this.missing = readItemStackList(tag.getTagList(NBT_MISSING, Constants.NBT.TAG_COMPOUND)); - this.missingFluids = readFluidStackList(tag.getTagList(NBT_MISSING_FLUIDS, Constants.NBT.TAG_COMPOUND)); + this.missing = readItemStackList(tag.getList(NBT_MISSING, Constants.NBT.TAG_COMPOUND)); + this.missingFluids = readFluidStackList(tag.getList(NBT_MISSING_FLUIDS, Constants.NBT.TAG_COMPOUND)); } @Override - public NBTTagCompound writeToNbt(NBTTagCompound tag) { - tag.setTag(NBT_REQUESTED, requested.writeToNbt()); - tag.setInteger(NBT_QUANTITY, quantity); - tag.setTag(NBT_PATTERN, writePatternToNbt(pattern)); - tag.setInteger(NBT_TICKS, ticks); - tag.setUniqueId(NBT_ID, id); - tag.setLong(NBT_EXECUTION_STARTED, executionStarted); - tag.setTag(NBT_INTERNAL_STORAGE, internalStorage.writeToNbt()); - tag.setTag(NBT_INTERNAL_FLUID_STORAGE, internalFluidStorage.writeToNbt()); - tag.setTag(NBT_TO_EXTRACT_INITIAL, writeItemStackList(toExtractInitial)); - tag.setTag(NBT_TO_EXTRACT_INITIAL_FLUIDS, writeFluidStackList(toExtractInitialFluids)); - tag.setInteger(NBT_TOTAL_STEPS, totalSteps); + public CompoundNBT writeToNbt(CompoundNBT tag) { + tag.put(NBT_REQUESTED, requested.writeToNbt()); + tag.putInt(NBT_QUANTITY, quantity); + tag.put(NBT_PATTERN, writePatternToNbt(pattern)); + tag.putInt(NBT_TICKS, ticks); + tag.putUniqueId(NBT_ID, id); + tag.putLong(NBT_EXECUTION_STARTED, executionStarted); + tag.put(NBT_INTERNAL_STORAGE, internalStorage.writeToNbt()); + tag.put(NBT_INTERNAL_FLUID_STORAGE, internalFluidStorage.writeToNbt()); + tag.put(NBT_TO_EXTRACT_INITIAL, writeItemStackList(toExtractInitial)); + tag.put(NBT_TO_EXTRACT_INITIAL_FLUIDS, writeFluidStackList(toExtractInitialFluids)); + tag.putInt(NBT_TOTAL_STEPS, totalSteps); - NBTTagList craftingList = new NBTTagList(); + ListNBT craftingList = new ListNBT(); for (Crafting crafting : this.crafting) { - craftingList.appendTag(crafting.writeToNbt()); + craftingList.add(crafting.writeToNbt()); } - tag.setTag(NBT_CRAFTING, craftingList); + tag.put(NBT_CRAFTING, craftingList); - NBTTagList processingList = new NBTTagList(); + ListNBT processingList = new ListNBT(); for (Processing processing : this.processing) { - processingList.appendTag(processing.writeToNbt()); + processingList.add(processing.writeToNbt()); } - tag.setTag(NBT_PROCESSING, processingList); + tag.put(NBT_PROCESSING, processingList); - tag.setTag(NBT_MISSING, writeItemStackList(missing)); - tag.setTag(NBT_MISSING_FLUIDS, writeFluidStackList(missingFluids)); + tag.put(NBT_MISSING, writeItemStackList(missing)); + tag.put(NBT_MISSING_FLUIDS, writeFluidStackList(missingFluids)); return tag; } - static NBTTagList writeItemStackList(IStackList stacks) { - NBTTagList list = new NBTTagList(); + static ListNBT writeItemStackList(IStackList stacks) { + ListNBT list = new ListNBT(); for (ItemStack stack : stacks.getStacks()) { - list.appendTag(StackUtils.serializeStackToNbt(stack)); + list.add(StackUtils.serializeStackToNbt(stack)); } return list; } - static IStackList readItemStackList(NBTTagList list) throws CraftingTaskReadException { + static IStackList readItemStackList(ListNBT list) throws CraftingTaskReadException { IStackList stacks = API.instance().createItemStackList(); - for (int i = 0; i < list.tagCount(); ++i) { - ItemStack stack = StackUtils.deserializeStackFromNbt(list.getCompoundTagAt(i)); + for (int i = 0; i < list.size(); ++i) { + ItemStack stack = StackUtils.deserializeStackFromNbt(list.getCompound(i)); if (stack.isEmpty()) { throw new CraftingTaskReadException("Empty stack!"); @@ -208,21 +210,21 @@ public class CraftingTask implements ICraftingTask { return stacks; } - static NBTTagList writeFluidStackList(IStackList stacks) { - NBTTagList list = new NBTTagList(); + static ListNBT writeFluidStackList(IStackList stacks) { + ListNBT list = new ListNBT(); for (FluidStack stack : stacks.getStacks()) { - list.appendTag(stack.writeToNBT(new NBTTagCompound())); + list.add(stack.writeToNBT(new CompoundNBT())); } return list; } - static IStackList readFluidStackList(NBTTagList list) throws CraftingTaskReadException { + static IStackList readFluidStackList(ListNBT list) throws CraftingTaskReadException { IStackList stacks = API.instance().createFluidStackList(); - for (int i = 0; i < list.tagCount(); ++i) { - FluidStack stack = FluidStack.loadFluidStackFromNBT(list.getCompoundTagAt(i)); + for (int i = 0; i < list.size(); ++i) { + FluidStack stack = FluidStack.loadFluidStackFromNBT(list.getCompound(i)); if (stack == null) { throw new CraftingTaskReadException("Empty stack!"); @@ -444,11 +446,11 @@ public class CraftingTask implements ICraftingTask { FluidStack fromSelf = fluidResults.get(input, IComparer.COMPARE_NBT); FluidStack fromNetwork = mutatedFluidStorage.get(input, IComparer.COMPARE_NBT); - int remaining = input.amount; + int remaining = input.getAmount(); while (remaining > 0) { if (fromSelf != null) { - int toTake = Math.min(remaining, fromSelf.amount); + int toTake = Math.min(remaining, fromSelf.getAmount()); fluidsToExtract.add(input, toTake); @@ -458,7 +460,7 @@ public class CraftingTask implements ICraftingTask { fromSelf = fluidResults.get(input, IComparer.COMPARE_NBT); } else if (fromNetwork != null) { - int toTake = Math.min(remaining, fromNetwork.amount); + int toTake = Math.min(remaining, fromNetwork.getAmount()); this.toTakeFluids.add(input, toTake); @@ -477,7 +479,7 @@ public class CraftingTask implements ICraftingTask { if (subPattern != null) { ICraftingPatternChain subPatternChain = patternChainList.getChain(subPattern); - while ((fromSelf == null ? 0 : fromSelf.amount) < remaining) { + while ((fromSelf == null ? 0 : fromSelf.getAmount()) < remaining) { ICraftingTaskError result = calculateInternal(mutatedStorage, mutatedFluidStorage, results, fluidResults, patternChainList, subPatternChain.current(), false); if (result != null) { @@ -495,7 +497,7 @@ public class CraftingTask implements ICraftingTask { } // fromSelf contains the amount crafted after the loop. - this.toCraftFluids.add(input, fromSelf.amount); + this.toCraftFluids.add(input, fromSelf.getAmount()); } else { this.missingFluids.add(input, remaining); @@ -570,10 +572,10 @@ public class CraftingTask implements ICraftingTask { List toRemove = new ArrayList<>(); for (FluidStack toExtract : toExtractInitialFluids.getStacks()) { - FluidStack result = network.extractFluid(toExtract, toExtract.amount, Action.PERFORM); + FluidStack result = network.extractFluid(toExtract, toExtract.getAmount(), Action.PERFORM); if (result != null) { - internalFluidStorage.insert(toExtract, result.amount, Action.PERFORM); + internalFluidStorage.insert(toExtract, result.getAmount(), Action.PERFORM); toRemove.add(result); } @@ -723,13 +725,13 @@ public class CraftingTask implements ICraftingTask { if (p.getPattern().getContainer().getConnectedFluidInventory() == null) { p.setState(ProcessingState.MACHINE_NONE); } else { - FluidStack result = this.internalFluidStorage.extract(need, need.amount, IComparer.COMPARE_NBT, Action.SIMULATE); + FluidStack result = this.internalFluidStorage.extract(need, need.getAmount(), IComparer.COMPARE_NBT, Action.SIMULATE); - if (result == null || result.amount != need.amount) { + if (result == null || result.getAmount() != need.getAmount()) { hasAll = false; break; - } else if (p.getPattern().getContainer().getConnectedFluidInventory().fill(result, false) != result.amount) { + } else if (p.getPattern().getContainer().getConnectedFluidInventory().fill(result, IFluidHandler.FluidAction.SIMULATE) != result.getAmount()) { p.setState(ProcessingState.MACHINE_DOES_NOT_ACCEPT); break; @@ -756,13 +758,13 @@ public class CraftingTask implements ICraftingTask { } for (FluidStack need : p.getFluidsToPut().getStacks()) { - FluidStack result = this.internalFluidStorage.extract(need, need.amount, IComparer.COMPARE_NBT, Action.PERFORM); - if (result == null || result.amount != need.amount) { + FluidStack result = this.internalFluidStorage.extract(need, need.getAmount(), IComparer.COMPARE_NBT, Action.PERFORM); + if (result == null || result.getAmount() != need.getAmount()) { throw new IllegalStateException("The internal crafting inventory reported that " + need + " was available but we got " + result); } - int filled = p.getPattern().getContainer().getConnectedFluidInventory().fill(result, true); - if (filled != result.amount) { + int filled = p.getPattern().getContainer().getConnectedFluidInventory().fill(result, IFluidHandler.FluidAction.EXECUTE); + if (filled != result.getAmount()) { LOGGER.warn(p.getPattern().getContainer().getConnectedFluidInventory() + " unexpectedly didn't accept fluids, the remainder has been voided!"); } } @@ -862,13 +864,13 @@ public class CraftingTask implements ICraftingTask { } for (FluidStack stack : internalFluidStorage.getStacks()) { - FluidStack remainder = network.insertFluid(stack, stack.amount, Action.PERFORM); + FluidStack remainder = network.insertFluid(stack, stack.getAmount(), Action.PERFORM); toPerform.add(() -> { if (remainder == null) { - internalFluidStorage.extract(stack, stack.amount, IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT, Action.PERFORM); + internalFluidStorage.extract(stack, stack.getAmount(), IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT, Action.PERFORM); } else { - internalFluidStorage.extract(stack, stack.amount - remainder.amount, IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT, Action.PERFORM); + internalFluidStorage.extract(stack, stack.getAmount() - remainder.getAmount(), IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT, Action.PERFORM); } }); } @@ -892,7 +894,7 @@ public class CraftingTask implements ICraftingTask { } for (FluidStack remainder : internalFluidStorage.getStacks()) { - network.insertFluid(remainder, remainder.amount, Action.PERFORM); + network.insertFluid(remainder, remainder.getAmount(), Action.PERFORM); } } @@ -918,7 +920,7 @@ public class CraftingTask implements ICraftingTask { } else { for (FluidStack output : pattern.getFluidOutputs()) { if (API.instance().getComparer().isEqual(output, requested.getFluid(), IComparer.COMPARE_NBT)) { - qty += output.amount; + qty += output.getAmount(); } } } @@ -984,7 +986,7 @@ public class CraftingTask implements ICraftingTask { FluidStack content = p.getFluidsToReceive().get(stack); if (content != null) { - int needed = content.amount; + int needed = content.getAmount(); if (needed > size) { needed = size; @@ -1017,22 +1019,22 @@ public class CraftingTask implements ICraftingTask { return size; } - static NBTTagCompound writePatternToNbt(ICraftingPattern pattern) { - NBTTagCompound tag = new NBTTagCompound(); + static CompoundNBT writePatternToNbt(ICraftingPattern pattern) { + CompoundNBT tag = new CompoundNBT(); - tag.setTag(NBT_PATTERN_STACK, pattern.getStack().serializeNBT()); - tag.setLong(NBT_PATTERN_CONTAINER_POS, pattern.getContainer().getPosition().toLong()); + tag.put(NBT_PATTERN_STACK, pattern.getStack().serializeNBT()); + tag.putLong(NBT_PATTERN_CONTAINER_POS, pattern.getContainer().getPosition().toLong()); return tag; } - static ICraftingPattern readPatternFromNbt(NBTTagCompound tag, World world) throws CraftingTaskReadException { + static ICraftingPattern readPatternFromNbt(CompoundNBT tag, World world) throws CraftingTaskReadException { BlockPos containerPos = BlockPos.fromLong(tag.getLong(NBT_PATTERN_CONTAINER_POS)); INetworkNode node = API.instance().getNetworkNodeManager(world).getNode(containerPos); if (node instanceof ICraftingPatternContainer) { - ItemStack stack = new ItemStack(tag.getCompoundTag(NBT_PATTERN_STACK)); + ItemStack stack = ItemStack.read(tag.getCompound(NBT_PATTERN_STACK)); if (stack.getItem() instanceof ICraftingPatternProvider) { return ((ICraftingPatternProvider) stack.getItem()).create(world, stack, (ICraftingPatternContainer) node); @@ -1091,11 +1093,11 @@ public class CraftingTask implements ICraftingTask { elements.commit(); for (FluidStack stack : this.internalFluidStorage.getStacks()) { - elements.add(new CraftingMonitorElementFluidRender(stack, stack.amount, 0, 0, 0, 0)); + elements.add(new CraftingMonitorElementFluidRender(stack, stack.getAmount(), 0, 0, 0, 0)); } for (FluidStack missing : this.missingFluids.getStacks()) { - elements.add(new CraftingMonitorElementFluidRender(missing, 0, missing.amount, 0, 0, 0)); + elements.add(new CraftingMonitorElementFluidRender(missing, 0, missing.getAmount(), 0, 0, 0)); } for (Processing processing : this.processing) { @@ -1105,11 +1107,11 @@ public class CraftingTask implements ICraftingTask { if (processing.getState() == ProcessingState.EXTRACTED_ALL) { for (FluidStack put : processing.getFluidsToPut().getStacks()) { - elements.add(new CraftingMonitorElementFluidRender(put, 0, 0, put.amount, 0, 0)); + elements.add(new CraftingMonitorElementFluidRender(put, 0, 0, put.getAmount(), 0, 0)); } } else if (processing.getState() == ProcessingState.READY || processing.getState() == ProcessingState.MACHINE_DOES_NOT_ACCEPT || processing.getState() == ProcessingState.MACHINE_NONE) { for (FluidStack receive : processing.getFluidsToReceive().getStacks()) { - ICraftingMonitorElement element = new CraftingMonitorElementFluidRender(receive, 0, 0, 0, receive.amount, 0); + ICraftingMonitorElement element = new CraftingMonitorElementFluidRender(receive, 0, 0, 0, receive.getAmount(), 0); if (processing.getState() == ProcessingState.MACHINE_DOES_NOT_ACCEPT) { element = new CraftingMonitorElementError(element, "gui.refinedstorage:crafting_monitor.machine_does_not_accept_fluid"); @@ -1155,7 +1157,7 @@ public class CraftingTask implements ICraftingTask { previewStack = new CraftingPreviewElementFluidStack(stack); } - previewStack.addToCraft(stack.amount); + previewStack.addToCraft(stack.getAmount()); mapFluids.put(hash, previewStack); } @@ -1185,7 +1187,7 @@ public class CraftingTask implements ICraftingTask { } previewStack.setMissing(true); - previewStack.addToCraft(stack.amount); + previewStack.addToCraft(stack.getAmount()); mapFluids.put(hash, previewStack); } @@ -1213,7 +1215,7 @@ public class CraftingTask implements ICraftingTask { previewStack = new CraftingPreviewElementFluidStack(stack); } - previewStack.addAvailable(stack.amount); + previewStack.addAvailable(stack.getAmount()); mapFluids.put(hash, previewStack); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processing.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processing.java index 8d0c2f7b9..e494e9d13 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processing.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processing.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadExc import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.util.IStackList; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.FluidStack; @@ -35,14 +35,14 @@ class Processing { this.root = root; } - public Processing(INetwork network, NBTTagCompound tag) throws CraftingTaskReadException { - this.pattern = CraftingTask.readPatternFromNbt(tag.getCompoundTag(NBT_PATTERN), network.world()); - this.itemsToReceive = CraftingTask.readItemStackList(tag.getTagList(NBT_ITEMS_TO_RECEIVE, Constants.NBT.TAG_COMPOUND)); - this.fluidsToReceive = CraftingTask.readFluidStackList(tag.getTagList(NBT_FLUIDS_TO_RECEIVE, Constants.NBT.TAG_COMPOUND)); + public Processing(INetwork network, CompoundNBT tag) throws CraftingTaskReadException { + this.pattern = CraftingTask.readPatternFromNbt(tag.getCompound(NBT_PATTERN), network.world()); + this.itemsToReceive = CraftingTask.readItemStackList(tag.getList(NBT_ITEMS_TO_RECEIVE, Constants.NBT.TAG_COMPOUND)); + this.fluidsToReceive = CraftingTask.readFluidStackList(tag.getList(NBT_FLUIDS_TO_RECEIVE, Constants.NBT.TAG_COMPOUND)); this.root = tag.getBoolean(NBT_ROOT); - this.itemsToPut = CraftingTask.readItemStackList(tag.getTagList(NBT_ITEMS_TO_PUT, Constants.NBT.TAG_COMPOUND)); - this.fluidsToPut = CraftingTask.readFluidStackList(tag.getTagList(NBT_FLUIDS_TO_PUT, Constants.NBT.TAG_COMPOUND)); - this.state = ProcessingState.values()[tag.getInteger(NBT_STATE)]; + this.itemsToPut = CraftingTask.readItemStackList(tag.getList(NBT_ITEMS_TO_PUT, Constants.NBT.TAG_COMPOUND)); + this.fluidsToPut = CraftingTask.readFluidStackList(tag.getList(NBT_FLUIDS_TO_PUT, Constants.NBT.TAG_COMPOUND)); + this.state = ProcessingState.values()[tag.getInt(NBT_STATE)]; } public ICraftingPattern getPattern() { @@ -77,16 +77,16 @@ class Processing { return root; } - public NBTTagCompound writeToNbt() { - NBTTagCompound tag = new NBTTagCompound(); + public CompoundNBT writeToNbt() { + CompoundNBT tag = new CompoundNBT(); - tag.setTag(NBT_PATTERN, CraftingTask.writePatternToNbt(pattern)); - tag.setTag(NBT_ITEMS_TO_RECEIVE, CraftingTask.writeItemStackList(itemsToReceive)); - tag.setTag(NBT_FLUIDS_TO_RECEIVE, CraftingTask.writeFluidStackList(fluidsToReceive)); - tag.setBoolean(NBT_ROOT, root); - tag.setTag(NBT_ITEMS_TO_PUT, CraftingTask.writeItemStackList(itemsToPut)); - tag.setTag(NBT_FLUIDS_TO_PUT, CraftingTask.writeFluidStackList(fluidsToPut)); - tag.setInteger(NBT_STATE, state.ordinal()); + tag.put(NBT_PATTERN, CraftingTask.writePatternToNbt(pattern)); + tag.put(NBT_ITEMS_TO_RECEIVE, CraftingTask.writeItemStackList(itemsToReceive)); + tag.put(NBT_FLUIDS_TO_RECEIVE, CraftingTask.writeFluidStackList(fluidsToReceive)); + tag.putBoolean(NBT_ROOT, root); + tag.put(NBT_ITEMS_TO_PUT, CraftingTask.writeItemStackList(itemsToPut)); + tag.put(NBT_FLUIDS_TO_PUT, CraftingTask.writeFluidStackList(fluidsToPut)); + tag.putInt(NBT_STATE, state.ordinal()); return tag; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java index d9b85daa5..ca7b97ef7 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java @@ -6,15 +6,14 @@ import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph; import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraphListener; import com.raoulvdberge.refinedstorage.api.network.INetworkNodeVisitor; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.apiimpl.util.OneSixMigrationHelper; import com.raoulvdberge.refinedstorage.capability.CapabilityNetworkNodeProxy; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -45,16 +44,14 @@ public class NetworkNodeGraph implements INetworkNodeGraph { Operator operator = new Operator(action); TileEntity tile = world.getTileEntity(origin); - if (tile != null && tile.hasCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, null)) { - INetworkNodeProxy proxy = tile.getCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, null); - - if (proxy != null) { + if (tile != null) { + tile.getCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, null).ifPresent(proxy -> { INetworkNode node = proxy.getNode(); if (node instanceof INetworkNodeVisitor) { ((INetworkNodeVisitor) node).visit(operator); } - } + }); } Visitor currentVisitor; @@ -125,12 +122,12 @@ public class NetworkNodeGraph implements INetworkNodeGraph { private void dropConflictingBlock(World world, BlockPos pos) { if (!network.getPosition().equals(pos)) { - IBlockState state = world.getBlockState(pos); + BlockState state = world.getBlockState(pos); NonNullList drops = NonNullList.create(); - state.getBlock().getDrops(drops, world, pos, state, 0); + // TODO: state.getBlock().getDrops(drops, world, pos, state, 0); - world.setBlockToAir(pos); + world.removeBlock(pos, false); // TODO: correct? for (ItemStack drop : drops) { InventoryHelper.spawnItemStack(world, pos.getX(), pos.getY(), pos.getZ(), drop); @@ -153,33 +150,34 @@ public class NetworkNodeGraph implements INetworkNodeGraph { } @Override - public void apply(World world, BlockPos pos, @Nullable EnumFacing side) { + public void apply(World world, BlockPos pos, @Nullable Direction side) { TileEntity tile = world.getTileEntity(pos); - if (tile != null && tile.hasCapability(NETWORK_NODE_PROXY_CAPABILITY, side)) { - INetworkNodeProxy otherNodeProxy = NETWORK_NODE_PROXY_CAPABILITY.cast(tile.getCapability(NETWORK_NODE_PROXY_CAPABILITY, side)); - INetworkNode otherNode = otherNodeProxy.getNode(); + if (tile != null) { + tile.getCapability(NETWORK_NODE_PROXY_CAPABILITY, side).ifPresent(otherNodeProxy -> { + INetworkNode otherNode = otherNodeProxy.getNode(); - if (otherNode.getNetwork() != null && !otherNode.getNetwork().equals(network)) { - if (action == Action.PERFORM) { - dropConflictingBlock(world, tile.getPos()); + if (otherNode.getNetwork() != null && !otherNode.getNetwork().equals(network)) { + if (action == Action.PERFORM) { + dropConflictingBlock(world, tile.getPos()); + } + + return; } - return; - } + if (foundNodes.add(otherNode)) { + if (!nodes.contains(otherNode)) { + // We can't let the node connect immediately + // We can only let the node connect AFTER the nodes list has changed in the graph + // This is so that storage nodes can refresh the item/fluid cache, and the item/fluid cache will notice it then (otherwise not) + newNodes.add(otherNode); + } - if (foundNodes.add(otherNode)) { - if (!nodes.contains(otherNode)) { - // We can't let the node connect immediately - // We can only let the node connect AFTER the nodes list has changed in the graph - // This is so that storage nodes can refresh the item/fluid cache, and the item/fluid cache will notice it then (otherwise not) - newNodes.add(otherNode); + previousNodes.remove(otherNode); + + toCheck.add(new Visitor(otherNode, world, pos, side, tile)); } - - previousNodes.remove(otherNode); - - toCheck.add(new Visitor(otherNode, world, pos, side, tile)); - } + }); } } @@ -193,10 +191,10 @@ public class NetworkNodeGraph implements INetworkNodeGraph { private final INetworkNode node; private final World world; private final BlockPos pos; - private final EnumFacing side; + private final Direction side; private final TileEntity tile; - Visitor(INetworkNode node, World world, BlockPos pos, EnumFacing side, TileEntity tile) { + Visitor(INetworkNode node, World world, BlockPos pos, Direction side, TileEntity tile) { this.node = node; this.world = world; this.pos = pos; @@ -209,17 +207,15 @@ public class NetworkNodeGraph implements INetworkNodeGraph { if (node instanceof INetworkNodeVisitor) { ((INetworkNodeVisitor) node).visit(operator); } else { - for (EnumFacing checkSide : EnumFacing.VALUES) { + for (Direction checkSide : Direction.values()) { if (checkSide != side) { // Avoid going backward - INetworkNodeProxy nodeOnSideProxy = NETWORK_NODE_PROXY_CAPABILITY.cast(tile.getCapability(NETWORK_NODE_PROXY_CAPABILITY, checkSide)); - - if (nodeOnSideProxy != null) { + tile.getCapability(NETWORK_NODE_PROXY_CAPABILITY, checkSide).ifPresent(nodeOnSideProxy -> { INetworkNode nodeOnSide = nodeOnSideProxy.getNode(); if (nodeOnSide == node) { operator.apply(world, pos.offset(checkSide), checkSide.getOpposite()); } - } + }); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java index 6acb7cb9d..b3aaeabd9 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java @@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.capability.CapabilityNetworkNodeProxy; import com.raoulvdberge.refinedstorage.util.WorldUtils; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.event.world.BlockEvent; @@ -31,7 +31,7 @@ public class NetworkNodeListener { @SubscribeEvent public void onBlockPlace(BlockEvent.EntityPlaceEvent e) { - if (!e.getWorld().isRemote && e.getEntity() instanceof EntityPlayer) { + if (!e.getWorld().isRemote && e.getEntity() instanceof PlayerEntity) { TileEntity placed = e.getWorld().getTileEntity(e.getPos()); if (placed != null && placed.hasCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, null)) { @@ -42,8 +42,8 @@ public class NetworkNodeListener { INetworkNodeProxy nodeProxy = side.getCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, facing.getOpposite()); INetworkNode node = nodeProxy.getNode(); - if (node.getNetwork() != null && !node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, (EntityPlayer) e.getEntity())) { - WorldUtils.sendNoPermissionMessage((EntityPlayer) e.getEntity()); + if (node.getNetwork() != null && !node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, (PlayerEntity) e.getEntity())) { + WorldUtils.sendNoPermissionMessage((PlayerEntity) e.getEntity()); e.setCanceled(true); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java index e255d7cfd..20f1808d2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java @@ -4,8 +4,8 @@ import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeFactory; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager; import com.raoulvdberge.refinedstorage.apiimpl.API; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.storage.WorldSavedData; @@ -24,7 +24,7 @@ public class NetworkNodeManager extends WorldSavedData implements INetworkNodeMa private static final String NBT_NODE_POS = "Pos"; private boolean canReadNodes; - private NBTTagList nodesTag; + private ListNBT nodesTag; private ConcurrentHashMap nodes = new ConcurrentHashMap<>(); @@ -33,9 +33,9 @@ public class NetworkNodeManager extends WorldSavedData implements INetworkNodeMa } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { if (tag.hasKey(NBT_NODES)) { - this.nodesTag = tag.getTagList(NBT_NODES, Constants.NBT.TAG_COMPOUND); + this.nodesTag = tag.getList(NBT_NODES, Constants.NBT.TAG_COMPOUND); this.canReadNodes = true; } } @@ -46,11 +46,11 @@ public class NetworkNodeManager extends WorldSavedData implements INetworkNodeMa this.nodes.clear(); - for (int i = 0; i < nodesTag.tagCount(); ++i) { - NBTTagCompound nodeTag = nodesTag.getCompoundTagAt(i); + for (int i = 0; i < nodesTag.size(); ++i) { + CompoundNBT nodeTag = nodesTag.getCompound(i); String id = nodeTag.getString(NBT_NODE_ID); - NBTTagCompound data = nodeTag.getCompoundTag(NBT_NODE_DATA); + CompoundNBT data = nodeTag.getCompound(NBT_NODE_DATA); BlockPos pos = BlockPos.fromLong(nodeTag.getLong(NBT_NODE_POS)); INetworkNodeFactory factory = API.instance().getNetworkNodeRegistry().get(id); @@ -73,24 +73,24 @@ public class NetworkNodeManager extends WorldSavedData implements INetworkNodeMa } @Override - public NBTTagCompound writeToNBT(NBTTagCompound tag) { - NBTTagList list = new NBTTagList(); + public CompoundNBT writeToNBT(CompoundNBT tag) { + ListNBT list = new ListNBT(); for (INetworkNode node : all()) { try { - NBTTagCompound nodeTag = new NBTTagCompound(); + CompoundNBT nodeTag = new CompoundNBT(); nodeTag.setString(NBT_NODE_ID, node.getId()); nodeTag.setLong(NBT_NODE_POS, node.getPos().toLong()); - nodeTag.setTag(NBT_NODE_DATA, node.write(new NBTTagCompound())); + nodeTag.put(NBT_NODE_DATA, node.write(new CompoundNBT())); - list.appendTag(nodeTag); + list.add(nodeTag); } catch (Throwable t) { t.printStackTrace(); } } - tag.setTag(NBT_NODES, list); + tag.put(NBT_NODES, list); return tag; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryGridBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryGridBlock.java index 3bf330ee8..02a838488 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryGridBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryGridBlock.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.GridFactoryType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -15,14 +15,14 @@ import javax.annotation.Nullable; public class GridFactoryGridBlock implements IGridFactory { @Override @Nullable - public IGrid createFromStack(EntityPlayer player, ItemStack stack) { + public IGrid createFromStack(PlayerEntity player, ItemStack stack) { return null; } @Override @Nullable - public IGrid createFromBlock(EntityPlayer player, BlockPos pos) { - TileEntity tile = getRelevantTile(player.world, pos); + public IGrid createFromBlock(PlayerEntity player, BlockPos pos) { + TileEntity tile = getRelevantTile(player.getEntityWorld(), pos); if (tile instanceof TileGrid) { return ((TileGrid) tile).getNode(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryPortableGrid.java index af0765606..5f0b36988 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryPortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryPortableGrid.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.GridFactoryType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -15,13 +15,13 @@ import javax.annotation.Nullable; public class GridFactoryPortableGrid implements IGridFactory { @Nullable @Override - public IGrid createFromStack(EntityPlayer player, ItemStack stack) { + public IGrid createFromStack(PlayerEntity player, ItemStack stack) { return new PortableGrid(player, stack); } @Nullable @Override - public IGrid createFromBlock(EntityPlayer player, BlockPos pos) { + public IGrid createFromBlock(PlayerEntity player, BlockPos pos) { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryPortableGridBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryPortableGridBlock.java index 74093edb5..440578129 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryPortableGridBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryPortableGridBlock.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.GridFactoryType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; import com.raoulvdberge.refinedstorage.tile.grid.portable.TilePortableGrid; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -15,13 +15,13 @@ import javax.annotation.Nullable; public class GridFactoryPortableGridBlock implements IGridFactory { @Override @Nullable - public IGrid createFromStack(EntityPlayer player, ItemStack stack) { + public IGrid createFromStack(PlayerEntity player, ItemStack stack) { return null; } @Override @Nullable - public IGrid createFromBlock(EntityPlayer player, BlockPos pos) { + public IGrid createFromBlock(PlayerEntity player, BlockPos pos) { TileEntity tile = getRelevantTile(player.world, pos); if (tile instanceof TilePortableGrid) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryWirelessFluidGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryWirelessFluidGrid.java index b36d4cda6..7cb087864 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryWirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryWirelessFluidGrid.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.GridFactoryType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; import com.raoulvdberge.refinedstorage.tile.grid.WirelessFluidGrid; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -15,13 +15,13 @@ import javax.annotation.Nullable; public class GridFactoryWirelessFluidGrid implements IGridFactory { @Nullable @Override - public IGrid createFromStack(EntityPlayer player, ItemStack stack) { + public IGrid createFromStack(PlayerEntity player, ItemStack stack) { return new WirelessFluidGrid(stack); } @Nullable @Override - public IGrid createFromBlock(EntityPlayer player, BlockPos pos) { + public IGrid createFromBlock(PlayerEntity player, BlockPos pos) { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryWirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryWirelessGrid.java index 2de94328e..4dac15904 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryWirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridFactoryWirelessGrid.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.GridFactoryType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -15,13 +15,13 @@ import javax.annotation.Nullable; public class GridFactoryWirelessGrid implements IGridFactory { @Nullable @Override - public IGrid createFromStack(EntityPlayer player, ItemStack stack) { + public IGrid createFromStack(PlayerEntity player, ItemStack stack) { return new WirelessGrid(stack); } @Nullable @Override - public IGrid createFromBlock(EntityPlayer player, BlockPos pos) { + public IGrid createFromBlock(PlayerEntity player, BlockPos pos) { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridManager.java index 3ee64e171..4f88f3b28 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridManager.java @@ -8,8 +8,8 @@ import com.raoulvdberge.refinedstorage.container.ContainerGrid; import com.raoulvdberge.refinedstorage.gui.ResizableDisplayDummy; import com.raoulvdberge.refinedstorage.network.MessageGridOpen; import com.raoulvdberge.refinedstorage.tile.TileBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -42,16 +42,16 @@ public class GridManager implements IGridManager { } @Override - public void openGrid(int id, EntityPlayerMP player, BlockPos pos) { + public void openGrid(int id, ServerPlayerEntity player, BlockPos pos) { openGrid(id, player, null, pos); } @Override - public void openGrid(int id, EntityPlayerMP player, ItemStack stack) { + public void openGrid(int id, ServerPlayerEntity player, ItemStack stack) { openGrid(id, player, stack, null); } - private void openGrid(int id, EntityPlayerMP player, @Nullable ItemStack stack, @Nullable BlockPos pos) { + private void openGrid(int id, ServerPlayerEntity player, @Nullable ItemStack stack, @Nullable BlockPos pos) { Pair grid = createGrid(id, player, stack, pos); if (grid == null) { return; @@ -65,7 +65,7 @@ public class GridManager implements IGridManager { // We first need to send the grid open packet with the window id. - // Then we set the openContainer so the slots are getting sent (EntityPlayerMP::update -> Container::detectAndSendChanges). + // Then we set the openContainer so the slots are getting sent (ServerPlayerEntity::update -> Container::detectAndSendChanges). // If the client window id mismatches with the server window id this causes problems with slots not being set. // If we would set the openContainer first, the slot packets would be sent first but wouldn't be able to be set @@ -73,18 +73,18 @@ public class GridManager implements IGridManager { // So we first send the window id in MessageGridOpen. // The order is preserved by TCP. - RS.INSTANCE.network.sendTo(new MessageGridOpen(player.currentWindowId, pos, id, stack), player); + /* TODO ! RS.INSTANCE.network.sendTo(new MessageGridOpen(player.currentWindowId, pos, id, stack), player); player.openContainer = new ContainerGrid(grid.getLeft(), new ResizableDisplayDummy(), grid.getRight() instanceof TileBase ? (TileBase) grid.getRight() : null, player); player.openContainer.windowId = player.currentWindowId; player.openContainer.addListener(player); - MinecraftForge.EVENT_BUS.post(new PlayerContainerEvent.Open(player, player.openContainer)); + MinecraftForge.EVENT_BUS.post(new PlayerContainerEvent.Open(player, player.openContainer));*/ } @Override @Nullable - public Pair createGrid(int id, EntityPlayer player, @Nullable ItemStack stack, @Nullable BlockPos pos) { + public Pair createGrid(int id, PlayerEntity player, @Nullable ItemStack stack, @Nullable BlockPos pos) { IGridFactory factory = get(id); if (factory == null) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridOpenHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridOpenHandler.java index 5d2caf245..a16118e38 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridOpenHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridOpenHandler.java @@ -2,14 +2,11 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.grid; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; import com.raoulvdberge.refinedstorage.network.MessageGridOpen; -import com.raoulvdberge.refinedstorage.tile.TileBase; import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.client.FMLClientHandler; import org.apache.commons.lang3.tuple.Pair; public class GridOpenHandler implements Runnable { @@ -21,7 +18,7 @@ public class GridOpenHandler implements Runnable { @Override public void run() { - EntityPlayer player = Minecraft.getMinecraft().player; + PlayerEntity player = Minecraft.getInstance().player; Pair grid = API.instance().getGridManager().createGrid(message.getGridId(), player, message.getStack(), message.getPos()); @@ -32,11 +29,11 @@ public class GridOpenHandler implements Runnable { GuiGrid gui = new GuiGrid(null, grid.getLeft()); // @Volatile: Just set the windowId: from OpenGuiHandler#process - player.openContainer = new ContainerGrid(grid.getLeft(), gui, grid.getRight() instanceof TileBase ? (TileBase) grid.getRight() : null, player); + /*TODO player.openContainer = new ContainerGrid(grid.getLeft(), gui, grid.getRight() instanceof TileBase ? (TileBase) grid.getRight() : null, player); player.openContainer.windowId = message.getWindowId(); gui.inventorySlots = player.openContainer; - FMLClientHandler.instance().showGuiScreen(gui); + FMLClientHandler.instance().showGuiScreen(gui);*/ } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java index 76b264724..b1f7afca2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java @@ -1,10 +1,10 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.grid; +import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; import com.raoulvdberge.refinedstorage.api.util.IFilter; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -51,7 +51,7 @@ public class GridTab implements IGridTab { } else { fluidDrawer.draw(x, y, fluidIcon); - GlStateManager.enableAlpha(); + GlStateManager.enableAlphaTest(); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java index 9c5fb7765..b3746df18 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java @@ -14,12 +14,16 @@ import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPrev import com.raoulvdberge.refinedstorage.network.MessageGridCraftingPreviewResponse; import com.raoulvdberge.refinedstorage.network.MessageGridCraftingStartResponse; import com.raoulvdberge.refinedstorage.util.StackUtils; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.fluid.Fluid; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import org.apache.commons.lang3.tuple.Pair; @@ -34,10 +38,10 @@ public class FluidGridHandler implements IFluidGridHandler { } @Override - public void onExtract(EntityPlayerMP player, int hash, boolean shift) { + public void onExtract(ServerPlayerEntity player, int hash, boolean shift) { FluidStack stack = network.getFluidStorageCache().getList().get(hash); - if (stack == null || stack.amount < Fluid.BUCKET_VOLUME || !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)) { + if (stack == null || stack.getAmount() < FluidAttributes.BUCKET_VOLUME || !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)) { return; } @@ -61,41 +65,41 @@ public class FluidGridHandler implements IFluidGridHandler { } if (bucket != null) { - IFluidHandlerItem fluidHandler = bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); + bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null).ifPresent(fluidHandler -> { + network.getFluidStorageTracker().changed(player, stack.copy()); - network.getFluidStorageTracker().changed(player, stack.copy()); + fluidHandler.fill(network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, Action.PERFORM), IFluidHandler.FluidAction.EXECUTE); - fluidHandler.fill(network.extractFluid(stack, Fluid.BUCKET_VOLUME, Action.PERFORM), true); - - if (shift) { - if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) { - InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), fluidHandler.getContainer()); + if (shift) { + if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) { + InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), fluidHandler.getContainer()); + } + } else { + player.inventory.setItemStack(fluidHandler.getContainer()); + player.updateHeldItem(); } - } else { - player.inventory.setItemStack(fluidHandler.getContainer()); - player.updateHeldItem(); - } - network.getNetworkItemHandler().drainEnergy(player, RS.INSTANCE.config.wirelessFluidGridExtractUsage); + network.getNetworkItemHandler().drainEnergy(player, RS.INSTANCE.config.wirelessFluidGridExtractUsage); + }); } } } @Nullable @Override - public ItemStack onInsert(EntityPlayerMP player, ItemStack container) { + public ItemStack onInsert(ServerPlayerEntity player, ItemStack container) { if (!network.getSecurityManager().hasPermission(Permission.INSERT, player)) { return container; } Pair result = StackUtils.getFluid(container, true); - if (result.getValue() != null && network.insertFluid(result.getValue(), result.getValue().amount, Action.SIMULATE) == null) { + if (result.getValue() != null && network.insertFluid(result.getValue(), result.getValue().getAmount(), Action.SIMULATE) == null) { network.getFluidStorageTracker().changed(player, result.getValue().copy()); result = StackUtils.getFluid(container, false); - network.insertFluid(result.getValue(), result.getValue().amount, Action.PERFORM); + network.insertFluid(result.getValue(), result.getValue().getAmount(), Action.PERFORM); network.getNetworkItemHandler().drainEnergy(player, RS.INSTANCE.config.wirelessFluidGridInsertUsage); @@ -106,18 +110,18 @@ public class FluidGridHandler implements IFluidGridHandler { } @Override - public void onInsertHeldContainer(EntityPlayerMP player) { + public void onInsertHeldContainer(ServerPlayerEntity player) { player.inventory.setItemStack(StackUtils.nullToEmpty(onInsert(player, player.inventory.getItemStack()))); player.updateHeldItem(); } @Override - public ItemStack onShiftClick(EntityPlayerMP player, ItemStack container) { + public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack container) { return StackUtils.nullToEmpty(onInsert(player, container)); } @Override - public void onCraftingPreviewRequested(EntityPlayerMP player, int hash, int quantity, boolean noPreview) { + public void onCraftingPreviewRequested(ServerPlayerEntity player, int hash, int quantity, boolean noPreview) { if (!network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) { return; } @@ -142,13 +146,13 @@ public class FluidGridHandler implements IFluidGridHandler { ICraftingTaskError error = task.calculate(); if (error != null) { - RS.INSTANCE.network.sendTo(new MessageGridCraftingPreviewResponse(Collections.singletonList(new CraftingPreviewElementError(error.getType(), error.getRecursedPattern() == null ? ItemStack.EMPTY : error.getRecursedPattern().getStack())), hash, quantity, true), player); + // TODO: Networking RS.INSTANCE.network.sendTo(new MessageGridCraftingPreviewResponse(Collections.singletonList(new CraftingPreviewElementError(error.getType(), error.getRecursedPattern() == null ? ItemStack.EMPTY : error.getRecursedPattern().getStack())), hash, quantity, true), player); } else if (noPreview && !task.hasMissing()) { network.getCraftingManager().add(task); - RS.INSTANCE.network.sendTo(new MessageGridCraftingStartResponse(), player); + // TODO: Networking RS.INSTANCE.network.sendTo(new MessageGridCraftingStartResponse(), player); } else { - RS.INSTANCE.network.sendTo(new MessageGridCraftingPreviewResponse(task.getPreviewStacks(), hash, quantity, true), player); + // TODO: Networking RS.INSTANCE.network.sendTo(new MessageGridCraftingPreviewResponse(task.getPreviewStacks(), hash, quantity, true), player); } }, "RS crafting preview calculation"); @@ -157,7 +161,7 @@ public class FluidGridHandler implements IFluidGridHandler { } @Override - public void onCraftingRequested(EntityPlayerMP player, int hash, int quantity) { + public void onCraftingRequested(ServerPlayerEntity player, int hash, int quantity) { if (quantity <= 0 || !network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) { return; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandlerPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandlerPortable.java index bcf4043f2..baabd22b4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandlerPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandlerPortable.java @@ -7,13 +7,13 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; import com.raoulvdberge.refinedstorage.util.StackUtils; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandlerItem; +import net.minecraftforge.fluids.capability.IFluidHandler; import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; @@ -26,10 +26,10 @@ public class FluidGridHandlerPortable implements IFluidGridHandler { } @Override - public void onExtract(EntityPlayerMP player, int hash, boolean shift) { + public void onExtract(ServerPlayerEntity player, int hash, boolean shift) { FluidStack stack = portableGrid.getFluidCache().getList().get(hash); - if (stack == null || stack.amount < Fluid.BUCKET_VOLUME) { + if (stack == null || stack.getAmount() < FluidAttributes.BUCKET_VOLUME) { return; } @@ -49,37 +49,37 @@ public class FluidGridHandlerPortable implements IFluidGridHandler { } if (bucket != null) { - IFluidHandlerItem fluidHandler = bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); + bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null).ifPresent(fluidHandler -> { + portableGrid.getFluidStorageTracker().changed(player, stack.copy()); - portableGrid.getFluidStorageTracker().changed(player, stack.copy()); + fluidHandler.fill(portableGrid.getFluidStorage().extract(stack, FluidAttributes.BUCKET_VOLUME, IComparer.COMPARE_NBT, Action.PERFORM), IFluidHandler.FluidAction.EXECUTE); - fluidHandler.fill(portableGrid.getFluidStorage().extract(stack, Fluid.BUCKET_VOLUME, IComparer.COMPARE_NBT, Action.PERFORM), true); - - if (shift) { - if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) { - InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), fluidHandler.getContainer()); + if (shift) { + if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) { + InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), fluidHandler.getContainer()); + } + } else { + player.inventory.setItemStack(fluidHandler.getContainer()); + player.updateHeldItem(); } - } else { - player.inventory.setItemStack(fluidHandler.getContainer()); - player.updateHeldItem(); - } - portableGrid.drainEnergy(RS.INSTANCE.config.portableGridExtractUsage); + portableGrid.drainEnergy(RS.INSTANCE.config.portableGridExtractUsage); + }); } } } @Nullable @Override - public ItemStack onInsert(EntityPlayerMP player, ItemStack container) { + public ItemStack onInsert(ServerPlayerEntity player, ItemStack container) { Pair result = StackUtils.getFluid(container, true); - if (result.getValue() != null && portableGrid.getFluidStorage().insert(result.getValue(), result.getValue().amount, Action.SIMULATE) == null) { + if (result.getValue() != null && portableGrid.getFluidStorage().insert(result.getValue(), result.getValue().getAmount(), Action.SIMULATE) == null) { portableGrid.getFluidStorageTracker().changed(player, result.getValue().copy()); result = StackUtils.getFluid(container, false); - portableGrid.getFluidStorage().insert(result.getValue(), result.getValue().amount, Action.PERFORM); + portableGrid.getFluidStorage().insert(result.getValue(), result.getValue().getAmount(), Action.PERFORM); portableGrid.drainEnergy(RS.INSTANCE.config.portableGridInsertUsage); @@ -90,23 +90,23 @@ public class FluidGridHandlerPortable implements IFluidGridHandler { } @Override - public void onInsertHeldContainer(EntityPlayerMP player) { + public void onInsertHeldContainer(ServerPlayerEntity player) { player.inventory.setItemStack(StackUtils.nullToEmpty(onInsert(player, player.inventory.getItemStack()))); player.updateHeldItem(); } @Override - public ItemStack onShiftClick(EntityPlayerMP player, ItemStack container) { + public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack container) { return StackUtils.nullToEmpty(onInsert(player, container)); } @Override - public void onCraftingPreviewRequested(EntityPlayerMP player, int hash, int quantity, boolean noPreview) { + public void onCraftingPreviewRequested(ServerPlayerEntity player, int hash, int quantity, boolean noPreview) { // NO OP } @Override - public void onCraftingRequested(EntityPlayerMP player, int hash, int quantity) { + public void onCraftingRequested(ServerPlayerEntity player, int hash, int quantity) { // NO OP } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index e160768d4..924a76229 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -10,19 +10,15 @@ import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.IStackList; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementError; -import com.raoulvdberge.refinedstorage.network.MessageGridCraftingPreviewResponse; -import com.raoulvdberge.refinedstorage.network.MessageGridCraftingStartResponse; import com.raoulvdberge.refinedstorage.util.StackUtils; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import javax.annotation.Nullable; -import java.util.Collections; import java.util.UUID; public class ItemGridHandler implements IItemGridHandler { @@ -33,7 +29,7 @@ public class ItemGridHandler implements IItemGridHandler { } @Override - public void onExtract(EntityPlayerMP player, int hash, int flags) { + public void onExtract(ServerPlayerEntity player, int hash, int flags) { ItemStack item = network.getItemStorageCache().getList().get(hash); if (item == null || !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)) { @@ -83,9 +79,9 @@ public class ItemGridHandler implements IItemGridHandler { if (took != null) { if ((flags & EXTRACT_SHIFT) == EXTRACT_SHIFT) { - IItemHandler playerInventory = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP); + IItemHandler playerInventory = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP).orElse(null); - if (ItemHandlerHelper.insertItem(playerInventory, took, true).isEmpty()) { + if (playerInventory != null && ItemHandlerHelper.insertItem(playerInventory, took, true).isEmpty()) { took = network.extractItem(item, size, Action.PERFORM); if (took != null) { @@ -111,7 +107,7 @@ public class ItemGridHandler implements IItemGridHandler { } @Override - public ItemStack onInsert(EntityPlayerMP player, ItemStack stack) { + public ItemStack onInsert(ServerPlayerEntity player, ItemStack stack) { if (!network.getSecurityManager().hasPermission(Permission.INSERT, player)) { return stack; } @@ -126,7 +122,7 @@ public class ItemGridHandler implements IItemGridHandler { } @Override - public void onInsertHeldItem(EntityPlayerMP player, boolean single) { + public void onInsertHeldItem(ServerPlayerEntity player, boolean single) { if (player.inventory.getItemStack().isEmpty() || !network.getSecurityManager().hasPermission(Permission.INSERT, player)) { return; } @@ -156,12 +152,12 @@ public class ItemGridHandler implements IItemGridHandler { } @Override - public ItemStack onShiftClick(EntityPlayerMP player, ItemStack stack) { + public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack stack) { return StackUtils.nullToEmpty(onInsert(player, stack)); } @Override - public void onCraftingPreviewRequested(EntityPlayerMP player, int hash, int quantity, boolean noPreview) { + public void onCraftingPreviewRequested(ServerPlayerEntity player, int hash, int quantity, boolean noPreview) { if (!network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) { return; } @@ -186,13 +182,13 @@ public class ItemGridHandler implements IItemGridHandler { ICraftingTaskError error = task.calculate(); if (error != null) { - RS.INSTANCE.network.sendTo(new MessageGridCraftingPreviewResponse(Collections.singletonList(new CraftingPreviewElementError(error.getType(), error.getRecursedPattern() == null ? ItemStack.EMPTY : error.getRecursedPattern().getStack())), hash, quantity, false), player); + // TODO RS.INSTANCE.network.sendTo(new MessageGridCraftingPreviewResponse(Collections.singletonList(new CraftingPreviewElementError(error.getType(), error.getRecursedPattern() == null ? ItemStack.EMPTY : error.getRecursedPattern().getStack())), hash, quantity, false), player); } else if (noPreview && !task.hasMissing()) { network.getCraftingManager().add(task); - RS.INSTANCE.network.sendTo(new MessageGridCraftingStartResponse(), player); + // TODO RS.INSTANCE.network.sendTo(new MessageGridCraftingStartResponse(), player); } else { - RS.INSTANCE.network.sendTo(new MessageGridCraftingPreviewResponse(task.getPreviewStacks(), hash, quantity, false), player); + // TODO RS.INSTANCE.network.sendTo(new MessageGridCraftingPreviewResponse(task.getPreviewStacks(), hash, quantity, false), player); } }, "RS crafting preview calculation"); @@ -201,7 +197,7 @@ public class ItemGridHandler implements IItemGridHandler { } @Override - public void onCraftingRequested(EntityPlayerMP player, int hash, int quantity) { + public void onCraftingRequested(ServerPlayerEntity player, int hash, int quantity) { if (quantity <= 0 || !network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) { return; } @@ -236,7 +232,7 @@ public class ItemGridHandler implements IItemGridHandler { } @Override - public void onCraftingCancelRequested(EntityPlayerMP player, @Nullable UUID id) { + public void onCraftingCancelRequested(ServerPlayerEntity player, @Nullable UUID id) { if (!network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) { return; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandlerPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandlerPortable.java index 9bf4d944b..a7ce3d706 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandlerPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandlerPortable.java @@ -8,9 +8,9 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; import com.raoulvdberge.refinedstorage.util.StackUtils; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -28,7 +28,7 @@ public class ItemGridHandlerPortable implements IItemGridHandler { } @Override - public void onExtract(EntityPlayerMP player, int hash, int flags) { + public void onExtract(ServerPlayerEntity player, int hash, int flags) { if (portableGrid.getStorage() == null || !grid.isActive()) { return; } @@ -82,9 +82,9 @@ public class ItemGridHandlerPortable implements IItemGridHandler { if (took != null) { if ((flags & EXTRACT_SHIFT) == EXTRACT_SHIFT) { - IItemHandler playerInventory = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP); + IItemHandler playerInventory = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP).orElse(null); - if (ItemHandlerHelper.insertItem(playerInventory, took, true).isEmpty()) { + if (playerInventory != null && ItemHandlerHelper.insertItem(playerInventory, took, true).isEmpty()) { took = portableGrid.getItemStorage().extract(item, size, IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT, Action.PERFORM); ItemHandlerHelper.insertItem(playerInventory, took, false); @@ -107,7 +107,7 @@ public class ItemGridHandlerPortable implements IItemGridHandler { @Nullable @Override - public ItemStack onInsert(EntityPlayerMP player, ItemStack stack) { + public ItemStack onInsert(ServerPlayerEntity player, ItemStack stack) { if (portableGrid.getStorage() == null || !grid.isActive()) { return stack; } @@ -122,7 +122,7 @@ public class ItemGridHandlerPortable implements IItemGridHandler { } @Override - public void onInsertHeldItem(EntityPlayerMP player, boolean single) { + public void onInsertHeldItem(ServerPlayerEntity player, boolean single) { if (player.inventory.getItemStack().isEmpty() || portableGrid.getStorage() == null || !grid.isActive()) { return; } @@ -152,22 +152,22 @@ public class ItemGridHandlerPortable implements IItemGridHandler { } @Override - public ItemStack onShiftClick(EntityPlayerMP player, ItemStack stack) { + public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack stack) { return StackUtils.nullToEmpty(onInsert(player, stack)); } @Override - public void onCraftingPreviewRequested(EntityPlayerMP player, int hash, int quantity, boolean noPreview) { + public void onCraftingPreviewRequested(ServerPlayerEntity player, int hash, int quantity, boolean noPreview) { // NO OP } @Override - public void onCraftingRequested(EntityPlayerMP player, int hash, int quantity) { + public void onCraftingRequested(ServerPlayerEntity player, int hash, int quantity) { // NO OP } @Override - public void onCraftingCancelRequested(EntityPlayerMP player, @Nullable UUID id) { + public void onCraftingCancelRequested(ServerPlayerEntity player, @Nullable UUID id) { // NO OP } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemHandler.java index b09276e5b..8cca6ecd0 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemHandler.java @@ -6,9 +6,9 @@ import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler; import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemProvider; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -16,18 +16,18 @@ import java.util.concurrent.ConcurrentHashMap; public class NetworkItemHandler implements INetworkItemHandler { private INetwork network; - private Map items = new ConcurrentHashMap<>(); + private Map items = new ConcurrentHashMap<>(); public NetworkItemHandler(INetwork network) { this.network = network; } @Override - public void open(EntityPlayer player, ItemStack stack) { + public void open(PlayerEntity player, ItemStack stack) { boolean inRange = false; for (INetworkNode node : network.getNodeGraph().all()) { - if (node instanceof IWirelessTransmitter && node.canUpdate() && ((IWirelessTransmitter) node).getDimension() == player.dimension) { + if (node instanceof IWirelessTransmitter && node.canUpdate() && ((IWirelessTransmitter) node).getDimension() == player.dimension.getId()) { // TODO does that work? IWirelessTransmitter transmitter = (IWirelessTransmitter) node; double distance = Math.sqrt(Math.pow(transmitter.getOrigin().getX() - player.posX, 2) + Math.pow(transmitter.getOrigin().getY() - player.posY, 2) + Math.pow(transmitter.getOrigin().getZ() - player.posZ, 2)); @@ -41,7 +41,7 @@ public class NetworkItemHandler implements INetworkItemHandler { } if (!inRange) { - player.sendMessage(new TextComponentTranslation("misc.refinedstorage:network_item.out_of_range")); + player.sendMessage(new TranslationTextComponent("misc.refinedstorage:network_item.out_of_range")); return; } @@ -54,17 +54,17 @@ public class NetworkItemHandler implements INetworkItemHandler { } @Override - public void close(EntityPlayer player) { + public void close(PlayerEntity player) { items.remove(player); } @Override - public INetworkItem getItem(EntityPlayer player) { + public INetworkItem getItem(PlayerEntity player) { return items.get(player); } @Override - public void drainEnergy(EntityPlayer player, int energy) { + public void drainEnergy(PlayerEntity player, int energy) { INetworkItem item = getItem(player); if (item != null) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessCraftingMonitor.java index dcba8a988..02e36150b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessCraftingMonitor.java @@ -8,18 +8,18 @@ import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler; import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.item.ItemWirelessCraftingMonitor; import com.raoulvdberge.refinedstorage.util.WorldUtils; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; public class NetworkItemWirelessCraftingMonitor implements INetworkItem { private INetworkItemHandler handler; - private EntityPlayer player; + private PlayerEntity player; private ItemStack stack; private int invIndex; - public NetworkItemWirelessCraftingMonitor(INetworkItemHandler handler, EntityPlayer player, ItemStack stack, int invIndex) { + public NetworkItemWirelessCraftingMonitor(INetworkItemHandler handler, PlayerEntity player, ItemStack stack, int invIndex) { this.handler = handler; this.player = player; this.stack = stack; @@ -27,13 +27,15 @@ public class NetworkItemWirelessCraftingMonitor implements INetworkItem { } @Override - public EntityPlayer getPlayer() { + public PlayerEntity getPlayer() { return player; } @Override public boolean onOpen(INetwork network) { - if (RS.INSTANCE.config.wirelessCraftingMonitorUsesEnergy && stack.getItemDamage() != ItemWirelessCraftingMonitor.TYPE_CREATIVE && stack.getCapability(CapabilityEnergy.ENERGY, null).getEnergyStored() <= RS.INSTANCE.config.wirelessCraftingMonitorOpenUsage) { + IEnergyStorage energy = stack.getCapability(CapabilityEnergy.ENERGY, null).orElse(null); + + if (RS.INSTANCE.config.wirelessCraftingMonitorUsesEnergy /* TODO && stack.getItemDamage() != ItemWirelessCraftingMonitor.TYPE_CREATIVE */ && energy != null && energy.getEnergyStored() <= RS.INSTANCE.config.wirelessCraftingMonitorOpenUsage) { return false; } @@ -43,7 +45,7 @@ public class NetworkItemWirelessCraftingMonitor implements INetworkItem { return false; } - player.openGui(RS.INSTANCE, RSGui.WIRELESS_CRAFTING_MONITOR, player.getEntityWorld(), invIndex, 0, 0); + // TODO player.openGui(RS.INSTANCE, RSGui.WIRELESS_CRAFTING_MONITOR, player.getEntityWorld(), invIndex, 0, 0); drainEnergy(RS.INSTANCE.config.wirelessCraftingMonitorOpenUsage); @@ -52,16 +54,16 @@ public class NetworkItemWirelessCraftingMonitor implements INetworkItem { @Override public void drainEnergy(int energy) { - if (RS.INSTANCE.config.wirelessCraftingMonitorUsesEnergy && stack.getItemDamage() != ItemWirelessCraftingMonitor.TYPE_CREATIVE) { - IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY, null); + if (RS.INSTANCE.config.wirelessCraftingMonitorUsesEnergy /* TODO && stack.getItemDamage() != ItemWirelessCraftingMonitor.TYPE_CREATIVE*/) { + stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energyStorage -> { + energyStorage.extractEnergy(energy, false); - energyStorage.extractEnergy(energy, false); + if (energyStorage.getEnergyStored() <= 0) { + handler.close(player); - if (energyStorage.getEnergyStored() <= 0) { - handler.close(player); - - player.closeScreen(); - } + player.closeScreen(); + } + }); } } } \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessFluidGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessFluidGrid.java index 4ad168cec..e82e6763a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessFluidGrid.java @@ -6,34 +6,35 @@ import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler; import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.item.ItemWirelessFluidGrid; import com.raoulvdberge.refinedstorage.tile.grid.WirelessFluidGrid; import com.raoulvdberge.refinedstorage.util.WorldUtils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; public class NetworkItemWirelessFluidGrid implements INetworkItem { private INetworkItemHandler handler; - private EntityPlayer player; + private PlayerEntity player; private ItemStack stack; - public NetworkItemWirelessFluidGrid(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) { + public NetworkItemWirelessFluidGrid(INetworkItemHandler handler, PlayerEntity player, ItemStack stack) { this.handler = handler; this.player = player; this.stack = stack; } @Override - public EntityPlayer getPlayer() { + public PlayerEntity getPlayer() { return player; } @Override public boolean onOpen(INetwork network) { - if (RS.INSTANCE.config.wirelessFluidGridUsesEnergy && stack.getItemDamage() != ItemWirelessFluidGrid.TYPE_CREATIVE && stack.getCapability(CapabilityEnergy.ENERGY, null).getEnergyStored() <= RS.INSTANCE.config.wirelessFluidGridOpenUsage) { + IEnergyStorage energy = stack.getCapability(CapabilityEnergy.ENERGY, null).orElse(null); + + if (RS.INSTANCE.config.wirelessFluidGridUsesEnergy /* TODO && stack.getItemDamage() != ItemWirelessFluidGrid.TYPE_CREATIVE*/ && energy != null && energy.getEnergyStored() <= RS.INSTANCE.config.wirelessFluidGridOpenUsage) { return false; } @@ -43,7 +44,7 @@ public class NetworkItemWirelessFluidGrid implements INetworkItem { return false; } - API.instance().getGridManager().openGrid(WirelessFluidGrid.ID, (EntityPlayerMP) player, stack); + API.instance().getGridManager().openGrid(WirelessFluidGrid.ID, (ServerPlayerEntity) player, stack); drainEnergy(RS.INSTANCE.config.wirelessFluidGridOpenUsage); @@ -52,16 +53,16 @@ public class NetworkItemWirelessFluidGrid implements INetworkItem { @Override public void drainEnergy(int energy) { - if (RS.INSTANCE.config.wirelessFluidGridUsesEnergy && stack.getItemDamage() != ItemWirelessFluidGrid.TYPE_CREATIVE) { - IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY, null); + if (RS.INSTANCE.config.wirelessFluidGridUsesEnergy /* TODO && stack.getItemDamage() != ItemWirelessFluidGrid.TYPE_CREATIVE*/) { + stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energyStorage -> { + energyStorage.extractEnergy(energy, false); - energyStorage.extractEnergy(energy, false); + if (energyStorage.getEnergyStored() <= 0) { + handler.close(player); - if (energyStorage.getEnergyStored() <= 0) { - handler.close(player); - - player.closeScreen(); - } + player.closeScreen(); + } + }); } } } \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessGrid.java index acc96798a..488e78719 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemWirelessGrid.java @@ -6,34 +6,35 @@ import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler; import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid; import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; import com.raoulvdberge.refinedstorage.util.WorldUtils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; public class NetworkItemWirelessGrid implements INetworkItem { private INetworkItemHandler handler; - private EntityPlayer player; + private PlayerEntity player; private ItemStack stack; - public NetworkItemWirelessGrid(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) { + public NetworkItemWirelessGrid(INetworkItemHandler handler, PlayerEntity player, ItemStack stack) { this.handler = handler; this.player = player; this.stack = stack; } @Override - public EntityPlayer getPlayer() { + public PlayerEntity getPlayer() { return player; } @Override public boolean onOpen(INetwork network) { - if (RS.INSTANCE.config.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE && stack.getCapability(CapabilityEnergy.ENERGY, null).getEnergyStored() <= RS.INSTANCE.config.wirelessGridOpenUsage) { + IEnergyStorage energy = stack.getCapability(CapabilityEnergy.ENERGY, null).orElse(null); + + if (RS.INSTANCE.config.wirelessGridUsesEnergy /* TODO && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE */ && energy != null && energy.getEnergyStored() <= RS.INSTANCE.config.wirelessGridOpenUsage) { return false; } @@ -43,7 +44,7 @@ public class NetworkItemWirelessGrid implements INetworkItem { return false; } - API.instance().getGridManager().openGrid(WirelessGrid.ID, (EntityPlayerMP) player, stack); + API.instance().getGridManager().openGrid(WirelessGrid.ID, (ServerPlayerEntity) player, stack); drainEnergy(RS.INSTANCE.config.wirelessGridOpenUsage); @@ -52,16 +53,17 @@ public class NetworkItemWirelessGrid implements INetworkItem { @Override public void drainEnergy(int energy) { - if (RS.INSTANCE.config.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE) { - IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY, null); + if (RS.INSTANCE.config.wirelessGridUsesEnergy /* TODO && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE*/) { + stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energyStorage -> { - energyStorage.extractEnergy(energy, false); + energyStorage.extractEnergy(energy, false); - if (energyStorage.getEnergyStored() <= 0) { - handler.close(player); + if (energyStorage.getEnergyStored() <= 0) { + handler.close(player); - player.closeScreen(); - } + player.closeScreen(); + } + }); } } } \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java index 31bf70272..d5bd9535f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -12,7 +12,7 @@ import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -160,27 +160,27 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { if (owner != null) { tag.setUniqueId(NBT_OWNER, owner); } tag.setString(NBT_VERSION, RS.VERSION); - tag.setInteger(NBT_DIRECTION, direction.ordinal()); + tag.putInt(NBT_DIRECTION, direction.ordinal()); writeConfiguration(tag); return tag; } - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { redstoneMode.write(tag); return tag; } - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { if (tag.hasUniqueId(NBT_OWNER)) { owner = tag.getUniqueId(NBT_OWNER); } @@ -202,7 +202,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { } } - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { redstoneMode = RedstoneMode.read(tag); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCable.java index 163aef4f3..19082962d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCable.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeCable; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -44,20 +44,20 @@ public class NetworkNodeCable extends NetworkNode implements ICoverable, INetwor } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); - tag.setTag(NBT_COVERS, coverManager.writeToNbt()); + tag.put(NBT_COVERS, coverManager.writeToNbt()); return tag; } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); if (tag.hasKey(NBT_COVERS)) { - coverManager.readFromNbt(tag.getTagList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); + coverManager.readFromNbt(tag.getList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java index 586f28532..e3f476cc7 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java @@ -26,7 +26,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.NBTUtil; import net.minecraft.server.management.PlayerProfileCache; import net.minecraft.tileentity.TileEntity; @@ -221,10 +221,10 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, GameProfile playerInfo = null; if (item.hasTagCompound()) { - NBTTagCompound tag = item.getTagCompound(); + CompoundNBT tag = item.getTagCompound(); if (tag.hasKey("SkullOwner", 10)) { - playerInfo = NBTUtil.readGameProfileFromNBT(tag.getCompoundTag("SkullOwner")); + playerInfo = NBTUtil.readGameProfileFromNBT(tag.getCompound("SkullOwner")); } else if (tag.hasKey("SkullOwner", 8) && !tag.getString("SkullOwner").isEmpty()) { playerInfo = new GameProfile(null, tag.getString("SkullOwner")); } @@ -287,7 +287,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(upgrades, 1, tag); @@ -299,33 +299,33 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(upgrades, 1, tag); - tag.setTag(NBT_COVERS, coverManager.writeToNbt()); + tag.put(NBT_COVERS, coverManager.writeToNbt()); return tag; } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); - tag.setInteger(NBT_COMPARE, compare); - tag.setInteger(NBT_TYPE, type); - tag.setBoolean(NBT_DROP, drop); + tag.putInt(NBT_COMPARE, compare); + tag.putInt(NBT_TYPE, type); + tag.putBoolean(NBT_DROP, drop); StackUtils.writeItems(itemFilters, 0, tag); - tag.setTag(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); + tag.put(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); return tag; } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); if (tag.hasKey(NBT_COMPARE)) { @@ -341,13 +341,13 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, } if (tag.hasKey(NBT_COVERS)) { - coverManager.readFromNbt(tag.getTagList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); + coverManager.readFromNbt(tag.getList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); } StackUtils.readItems(itemFilters, 0, tag); if (tag.hasKey(NBT_FLUID_FILTERS)) { - fluidFilters.readFromNbt(tag.getCompoundTag(NBT_FLUID_FILTERS)); + fluidFilters.readFromNbt(tag.getCompound(NBT_FLUID_FILTERS)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java index 3ee67f5d6..f2921b5ef 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java @@ -14,7 +14,7 @@ import com.raoulvdberge.refinedstorage.item.ItemUpgrade; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorldNameable; @@ -172,7 +172,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); // Fix cascading crafter invalidates while reading patterns @@ -217,7 +217,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(patternsInventory, 0, tag); @@ -231,9 +231,9 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC tag.setUniqueId(NBT_UUID, uuid); } - tag.setInteger(NBT_MODE, mode.ordinal()); - tag.setBoolean(NBT_LOCKED, locked); - tag.setBoolean(NBT_WAS_POWERED, wasPowered); + tag.putInt(NBT_MODE, mode.ordinal()); + tag.putBoolean(NBT_LOCKED, locked); + tag.putBoolean(NBT_WAS_POWERED, wasPowered); return tag; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafterManager.java index 47b06cde6..30ec42aa0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafterManager.java @@ -4,8 +4,8 @@ import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.network.MessageCrafterManagerSlotSizes; import com.raoulvdberge.refinedstorage.tile.TileCrafterManager; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -32,7 +32,7 @@ public class NetworkNodeCrafterManager extends NetworkNode { return ID; } - public void sendTo(EntityPlayerMP player) { + public void sendTo(ServerPlayerEntity player) { if (network != null) { RS.INSTANCE.network.sendTo(new MessageCrafterManagerSlotSizes(network.getCraftingManager().getNamedContainers()), player); } @@ -47,17 +47,17 @@ public class NetworkNodeCrafterManager extends NetworkNode { } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); - tag.setInteger(NBT_SIZE, size); - tag.setInteger(NBT_SEARCH_BOX_MODE, searchBoxMode); + tag.putInt(NBT_SIZE, size); + tag.putInt(NBT_SEARCH_BOX_MODE, searchBoxMode); return tag; } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); if (tag.hasKey(NBT_SIZE)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCraftingMonitor.java index 9625d20c3..140173a1e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCraftingMonitor.java @@ -8,9 +8,9 @@ import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.TileCraftingMonitor; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -53,7 +53,7 @@ public class NetworkNodeCraftingMonitor extends NetworkNode implements ICrafting } @Override - public void onCancelled(EntityPlayerMP player, @Nullable UUID id) { + public void onCancelled(ServerPlayerEntity player, @Nullable UUID id) { if (network != null) { network.getItemGridHandler().onCraftingCancelRequested(player, id); } @@ -76,10 +76,10 @@ public class NetworkNodeCraftingMonitor extends NetworkNode implements ICrafting } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); - tag.setInteger(NBT_TAB_PAGE, tabPage); + tag.putInt(NBT_TAB_PAGE, tabPage); if (tabSelected.isPresent()) { tag.setUniqueId(NBT_TAB_SELECTED, tabSelected.get()); @@ -89,7 +89,7 @@ public class NetworkNodeCraftingMonitor extends NetworkNode implements ICrafting } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); if (tag.hasKey(NBT_TAB_PAGE)) { @@ -110,7 +110,7 @@ public class NetworkNodeCraftingMonitor extends NetworkNode implements ICrafting } @Override - public void onClosed(EntityPlayer player) { + public void onClosed(PlayerEntity player) { // NO OP } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java index 0ef5ce3b0..9a7ec3391 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java @@ -24,7 +24,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.server.management.PlayerProfileCache; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityShulkerBox; @@ -234,13 +234,13 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(upgrades, 1, tag); if (tag.hasKey(NBT_COVERS)) { - coverManager.readFromNbt(tag.getTagList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); + coverManager.readFromNbt(tag.getList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); } } @@ -250,34 +250,34 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(upgrades, 1, tag); - tag.setTag(NBT_COVERS, coverManager.writeToNbt()); + tag.put(NBT_COVERS, coverManager.writeToNbt()); return tag; } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); - tag.setInteger(NBT_COMPARE, compare); - tag.setInteger(NBT_MODE, mode); - tag.setInteger(NBT_TYPE, type); - tag.setBoolean(NBT_PICKUP, pickupItem); + tag.putInt(NBT_COMPARE, compare); + tag.putInt(NBT_MODE, mode); + tag.putInt(NBT_TYPE, type); + tag.putBoolean(NBT_PICKUP, pickupItem); StackUtils.writeItems(itemFilters, 0, tag); - tag.setTag(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); + tag.put(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); return tag; } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); if (tag.hasKey(NBT_COMPARE)) { @@ -299,7 +299,7 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I StackUtils.readItems(itemFilters, 0, tag); if (tag.hasKey(NBT_FLUID_FILTERS)) { - fluidFilters.readFromNbt(tag.getCompoundTag(NBT_FLUID_FILTERS)); + fluidFilters.readFromNbt(tag.getCompound(NBT_FLUID_FILTERS)); } OneSixMigrationHelper.migrateEmptyWhitelistToEmptyBlacklist(version, this, itemFilters); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java index b8b7a8d69..0708fad1c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java @@ -14,7 +14,7 @@ import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; @@ -167,23 +167,23 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); - tag.setInteger(NBT_COMPARE, compare); - tag.setInteger(NBT_MODE, mode); - tag.setInteger(NBT_AMOUNT, amount); - tag.setInteger(NBT_TYPE, type); + tag.putInt(NBT_COMPARE, compare); + tag.putInt(NBT_MODE, mode); + tag.putInt(NBT_AMOUNT, amount); + tag.putInt(NBT_TYPE, type); StackUtils.writeItems(itemFilters, 0, tag); - tag.setTag(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); + tag.put(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); return tag; } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); if (tag.hasKey(NBT_COMPARE)) { @@ -205,7 +205,7 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy StackUtils.readItems(itemFilters, 0, tag); if (tag.hasKey(NBT_FLUID_FILTERS)) { - fluidFilters.readFromNbt(tag.getCompoundTag(NBT_FLUID_FILTERS)); + fluidFilters.readFromNbt(tag.getCompound(NBT_FLUID_FILTERS)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java index 9f433e9a7..4fe3cc78e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java @@ -15,7 +15,7 @@ import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -171,43 +171,43 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(upgrades, 1, tag); - tag.setTag(NBT_COVERS, coverManager.writeToNbt()); + tag.put(NBT_COVERS, coverManager.writeToNbt()); return tag; } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); - tag.setInteger(NBT_COMPARE, compare); - tag.setInteger(NBT_TYPE, type); + tag.putInt(NBT_COMPARE, compare); + tag.putInt(NBT_TYPE, type); StackUtils.writeItems(itemFilters, 0, tag); - tag.setTag(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); + tag.put(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); return tag; } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(upgrades, 1, tag); if (tag.hasKey(NBT_COVERS)) { - coverManager.readFromNbt(tag.getTagList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); + coverManager.readFromNbt(tag.getList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); } } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); if (tag.hasKey(NBT_COMPARE)) { @@ -221,7 +221,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy StackUtils.readItems(itemFilters, 0, tag); if (tag.hasKey(NBT_FLUID_FILTERS)) { - fluidFilters.readFromNbt(tag.getCompoundTag(NBT_FLUID_FILTERS)); + fluidFilters.readFromNbt(tag.getCompound(NBT_FLUID_FILTERS)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExternalStorage.java index dfeba81c2..80dbe6abf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExternalStorage.java @@ -24,7 +24,7 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -115,35 +115,35 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); if (tag.hasKey(NBT_COVERS)) { - coverManager.readFromNbt(tag.getTagList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); + coverManager.readFromNbt(tag.getList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); } } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); - tag.setTag(NBT_COVERS, coverManager.writeToNbt()); + tag.put(NBT_COVERS, coverManager.writeToNbt()); return tag; } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); StackUtils.writeItems(itemFilters, 0, tag); - tag.setTag(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); + tag.put(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); - tag.setInteger(NBT_PRIORITY, priority); - tag.setInteger(NBT_COMPARE, compare); - tag.setInteger(NBT_MODE, mode); - tag.setInteger(NBT_TYPE, type); + tag.putInt(NBT_PRIORITY, priority); + tag.putInt(NBT_COMPARE, compare); + tag.putInt(NBT_MODE, mode); + tag.putInt(NBT_TYPE, type); AccessTypeUtils.writeAccessType(tag, accessType); @@ -151,13 +151,13 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); StackUtils.readItems(itemFilters, 0, tag); if (tag.hasKey(NBT_FLUID_FILTERS)) { - fluidFilters.readFromNbt(tag.getCompoundTag(NBT_FLUID_FILTERS)); + fluidFilters.readFromNbt(tag.getCompound(NBT_FLUID_FILTERS)); } if (tag.hasKey(NBT_PRIORITY)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java index e639f55db..c5e33bd42 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java @@ -16,7 +16,7 @@ import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -182,31 +182,31 @@ public class NetworkNodeFluidInterface extends NetworkNode { } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(upgrades, 0, tag); StackUtils.writeItems(in, 1, tag); - tag.setTag(NBT_TANK_IN, tankIn.writeToNBT(new NBTTagCompound())); - tag.setTag(NBT_TANK_OUT, tankOut.writeToNBT(new NBTTagCompound())); + tag.put(NBT_TANK_IN, tankIn.writeToNBT(new CompoundNBT())); + tag.put(NBT_TANK_OUT, tankOut.writeToNBT(new CompoundNBT())); return tag; } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(upgrades, 0, tag); StackUtils.readItems(in, 1, tag); if (tag.hasKey(NBT_TANK_IN)) { - tankIn.readFromNBT(tag.getCompoundTag(NBT_TANK_IN)); + tankIn.readFromNBT(tag.getCompound(NBT_TANK_IN)); } if (tag.hasKey(NBT_TANK_OUT)) { - tankOut.readFromNBT(tag.getCompoundTag(NBT_TANK_OUT)); + tankOut.readFromNBT(tag.getCompound(NBT_TANK_OUT)); } } @@ -216,20 +216,20 @@ public class NetworkNodeFluidInterface extends NetworkNode { } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); - tag.setTag(NBT_OUT, out.writeToNbt()); + tag.put(NBT_OUT, out.writeToNbt()); return tag; } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); if (tag.hasKey(NBT_OUT)) { - out.readFromNbt(tag.getCompoundTag(NBT_OUT)); + out.readFromNbt(tag.getCompound(NBT_OUT)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java index 891306bb9..fa558a893 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java @@ -28,13 +28,13 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -72,7 +72,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I private Container craftingContainer = new Container() { @Override - public boolean canInteractWith(EntityPlayer player) { + public boolean canInteractWith(PlayerEntity player) { return false; } @@ -234,7 +234,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I } @Override - public IStorageCacheListener createListener(EntityPlayerMP player) { + public IStorageCacheListener createListener(ServerPlayerEntity player) { return getGridType() == GridType.FLUID ? new StorageCacheListenerGridFluid(player, network) : new StorageCacheListenerGridItem(player, network); } @@ -337,11 +337,11 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I } @Override - public void onRecipeTransfer(EntityPlayer player, ItemStack[][] recipe) { + public void onRecipeTransfer(PlayerEntity player, ItemStack[][] recipe) { onRecipeTransfer(this, player, recipe); } - public static void onRecipeTransfer(IGridNetworkAware grid, EntityPlayer player, ItemStack[][] recipe) { + public static void onRecipeTransfer(IGridNetworkAware grid, PlayerEntity player, ItemStack[][] recipe) { INetwork network = grid.getNetwork(); if (network != null && grid.getGridType() == GridType.CRAFTING && !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)) { @@ -445,16 +445,16 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I } @Override - public void onClosed(EntityPlayer player) { + public void onClosed(PlayerEntity player) { // NO OP } @Override - public void onCrafted(EntityPlayer player) { + public void onCrafted(PlayerEntity player) { onCrafted(this, world, player); } - public static void onCrafted(IGridNetworkAware grid, World world, EntityPlayer player) { + public static void onCrafted(IGridNetworkAware grid, World world, PlayerEntity player) { NonNullList remainder = CraftingManager.getRemainingItems(grid.getCraftingMatrix(), world); INetwork network = grid.getNetwork(); @@ -498,11 +498,11 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I } @Override - public void onCraftedShift(EntityPlayer player) { + public void onCraftedShift(PlayerEntity player) { onCraftedShift(this, player); } - public static void onCraftedShift(IGridNetworkAware grid, EntityPlayer player) { + public static void onCraftedShift(IGridNetworkAware grid, PlayerEntity player) { List craftedItemsList = new ArrayList<>(); int craftedItems = 0; ItemStack crafted = grid.getCraftingResult().getStackInSlot(0); @@ -723,7 +723,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(matrix, 0, tag); @@ -732,7 +732,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I StackUtils.readItems(processingMatrix, 3, tag); if (tag.hasKey(NBT_PROCESSING_MATRIX_FLUIDS)) { - processingMatrixFluids.readFromNbt(tag.getCompoundTag(NBT_PROCESSING_MATRIX_FLUIDS)); + processingMatrixFluids.readFromNbt(tag.getCompound(NBT_PROCESSING_MATRIX_FLUIDS)); } if (tag.hasKey(NBT_TAB_SELECTED)) { @@ -750,7 +750,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(matrix, 0, tag); @@ -758,32 +758,32 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I StackUtils.writeItems(filter, 2, tag); StackUtils.writeItems(processingMatrix, 3, tag); - tag.setTag(NBT_PROCESSING_MATRIX_FLUIDS, processingMatrixFluids.writeToNbt()); - tag.setInteger(NBT_TAB_SELECTED, tabSelected); - tag.setInteger(NBT_TAB_PAGE, tabPage); + tag.put(NBT_PROCESSING_MATRIX_FLUIDS, processingMatrixFluids.writeToNbt()); + tag.putInt(NBT_TAB_SELECTED, tabSelected); + tag.putInt(NBT_TAB_PAGE, tabPage); return tag; } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); - tag.setInteger(NBT_VIEW_TYPE, viewType); - tag.setInteger(NBT_SORTING_DIRECTION, sortingDirection); - tag.setInteger(NBT_SORTING_TYPE, sortingType); - tag.setInteger(NBT_SEARCH_BOX_MODE, searchBoxMode); - tag.setInteger(NBT_SIZE, size); + tag.putInt(NBT_VIEW_TYPE, viewType); + tag.putInt(NBT_SORTING_DIRECTION, sortingDirection); + tag.putInt(NBT_SORTING_TYPE, sortingType); + tag.putInt(NBT_SEARCH_BOX_MODE, searchBoxMode); + tag.putInt(NBT_SIZE, size); - tag.setBoolean(NBT_OREDICT_PATTERN, oredictPattern); - tag.setBoolean(NBT_PROCESSING_PATTERN, processingPattern); - tag.setInteger(NBT_PROCESSING_TYPE, processingType); + tag.putBoolean(NBT_OREDICT_PATTERN, oredictPattern); + tag.putBoolean(NBT_PROCESSING_PATTERN, processingPattern); + tag.putInt(NBT_PROCESSING_TYPE, processingType); return tag; } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); if (tag.hasKey(NBT_VIEW_TYPE)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java index fb97bf45b..7b0357a26 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java @@ -18,7 +18,7 @@ import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -154,13 +154,13 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(upgrades, 1, tag); if (tag.hasKey(NBT_COVERS)) { - coverManager.readFromNbt(tag.getTagList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); + coverManager.readFromNbt(tag.getList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); } } @@ -170,33 +170,33 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(upgrades, 1, tag); - tag.setTag(NBT_COVERS, coverManager.writeToNbt()); + tag.put(NBT_COVERS, coverManager.writeToNbt()); return tag; } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); - tag.setInteger(NBT_COMPARE, compare); - tag.setInteger(NBT_MODE, mode); - tag.setInteger(NBT_TYPE, type); + tag.putInt(NBT_COMPARE, compare); + tag.putInt(NBT_MODE, mode); + tag.putInt(NBT_TYPE, type); StackUtils.writeItems(itemFilters, 0, tag); - tag.setTag(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); + tag.put(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); return tag; } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); if (tag.hasKey(NBT_COMPARE)) { @@ -214,7 +214,7 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi StackUtils.readItems(itemFilters, 0, tag); if (tag.hasKey(NBT_FLUID_FILTERS)) { - fluidFilters.readFromNbt(tag.getCompoundTag(NBT_FLUID_FILTERS)); + fluidFilters.readFromNbt(tag.getCompound(NBT_FLUID_FILTERS)); } OneSixMigrationHelper.migrateEmptyWhitelistToEmptyBlacklist(version, this, itemFilters); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java index 02a4d204f..2a43e5980 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java @@ -15,7 +15,7 @@ import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -162,7 +162,7 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable { } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(importItems, 0, tag); @@ -176,7 +176,7 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable { } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(importItems, 0, tag); @@ -187,18 +187,18 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable { } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); StackUtils.writeItems(exportFilterItems, 1, tag); - tag.setInteger(NBT_COMPARE, compare); + tag.putInt(NBT_COMPARE, compare); return tag; } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); StackUtils.readItems(exportFilterItems, 1, tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java index d033860b3..85db51e2d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java @@ -9,7 +9,7 @@ import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; import com.raoulvdberge.refinedstorage.item.ItemNetworkCard; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; @@ -48,7 +48,7 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(networkCard, 0, tag); @@ -57,7 +57,7 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(networkCard, 0, tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeReader.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeReader.java index 83cd3928a..da6e72302 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeReader.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeReader.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReader; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; import com.raoulvdberge.refinedstorage.tile.TileReader; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -68,7 +68,7 @@ public class NetworkNodeReader extends NetworkNode implements IReader, IGuiReade } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); if (tag.hasKey(NBT_CHANNEL)) { @@ -76,7 +76,7 @@ public class NetworkNodeReader extends NetworkNode implements IReader, IGuiReade } if (tag.hasKey(NBT_COVERS)) { - coverManager.readFromNbt(tag.getTagList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); + coverManager.readFromNbt(tag.getList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); } } @@ -86,12 +86,12 @@ public class NetworkNodeReader extends NetworkNode implements IReader, IGuiReade } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); tag.setString(NBT_CHANNEL, channel); - tag.setTag(NBT_COVERS, coverManager.writeToNbt()); + tag.put(NBT_COVERS, coverManager.writeToNbt()); return tag; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java index 7bbc0b7d0..85e1b92a7 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java @@ -13,7 +13,7 @@ import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; import com.raoulvdberge.refinedstorage.item.ItemSecurityCard; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; @@ -104,7 +104,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(cardsInv, 0, tag); @@ -117,7 +117,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(cardsInv, 0, tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java index 9fd2b5250..477ca6229 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java @@ -10,10 +10,10 @@ import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.server.MinecraftServer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -64,7 +64,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl } } - public boolean depositAll(EntityPlayer player) { + public boolean depositAll(PlayerEntity player) { if (network == null) { return false; } @@ -95,7 +95,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl return true; } - public boolean deposit(EntityPlayer player, ItemStack toInsert) { + public boolean deposit(PlayerEntity player, ItemStack toInsert) { if (network == null) { return false; } @@ -115,7 +115,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl return true; } - public void extract(EntityPlayer player, EnumFacing side) { + public void extract(PlayerEntity player, EnumFacing side) { if (network == null || getDirection() != side) { return; } @@ -164,10 +164,10 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); - tag.setInteger(NBT_COMPARE, compare); + tag.putInt(NBT_COMPARE, compare); StackUtils.writeItems(itemFilter, 0, tag); @@ -175,7 +175,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); if (tag.hasKey(NBT_COMPARE)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java index 26dec682b..d4ba40479 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; import com.raoulvdberge.refinedstorage.item.ItemUpgrade; import com.raoulvdberge.refinedstorage.util.StackUtils; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -30,7 +30,7 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(upgrades, 0, tag); @@ -42,7 +42,7 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(upgrades, 0, tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWriter.java index 691dc5372..62e0a5255 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWriter.java @@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.api.network.readerwriter.IWriter; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; import com.raoulvdberge.refinedstorage.tile.TileWriter; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -100,7 +100,7 @@ public class NetworkNodeWriter extends NetworkNode implements IWriter, IGuiReade } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); if (tag.hasKey(NBT_CHANNEL)) { @@ -108,7 +108,7 @@ public class NetworkNodeWriter extends NetworkNode implements IWriter, IGuiReade } if (tag.hasKey(NBT_COVERS)) { - coverManager.readFromNbt(tag.getTagList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); + coverManager.readFromNbt(tag.getList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); } } @@ -118,12 +118,12 @@ public class NetworkNodeWriter extends NetworkNode implements IWriter, IGuiReade } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); tag.setString(NBT_CHANNEL, channel); - tag.setTag(NBT_COVERS, coverManager.writeToNbt()); + tag.put(NBT_COVERS, coverManager.writeToNbt()); return tag; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/cover/CoverManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/cover/CoverManager.java index 6c8c67346..621a1abb0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/cover/CoverManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/cover/CoverManager.java @@ -13,8 +13,8 @@ import net.minecraft.block.BlockStainedGlass; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.property.IExtendedBlockState; @@ -90,15 +90,15 @@ public class CoverManager { return false; } - public void readFromNbt(NBTTagList list) { + public void readFromNbt(ListNBT list) { covers.clear(); - for (int i = 0; i < list.tagCount(); ++i) { - NBTTagCompound tag = list.getCompoundTagAt(i); + for (int i = 0; i < list.size(); ++i) { + CompoundNBT tag = list.getCompound(i); if (tag.hasKey(NBT_DIRECTION) && tag.hasKey(NBT_ITEM)) { EnumFacing direction = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION)); - ItemStack item = new ItemStack(tag.getCompoundTag(NBT_ITEM)); + ItemStack item = new ItemStack(tag.getCompound(NBT_ITEM)); int type = tag.hasKey(NBT_TYPE) ? tag.getInteger(NBT_TYPE) : 0; if (type >= CoverType.values().length) { @@ -112,17 +112,17 @@ public class CoverManager { } } - public NBTTagList writeToNbt() { - NBTTagList list = new NBTTagList(); + public ListNBT writeToNbt() { + ListNBT list = new ListNBT(); for (Map.Entry entry : covers.entrySet()) { - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); - tag.setInteger(NBT_DIRECTION, entry.getKey().ordinal()); - tag.setTag(NBT_ITEM, entry.getValue().getStack().serializeNBT()); - tag.setInteger(NBT_TYPE, entry.getValue().getType().ordinal()); + tag.putInt(NBT_DIRECTION, entry.getKey().ordinal()); + tag.put(NBT_ITEM, entry.getValue().getStack().serializeNBT()); + tag.putInt(NBT_TYPE, entry.getValue().getType().ordinal()); - list.appendTag(tag); + list.add(tag); } return list; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java index 6ecbd8346..14345925e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java @@ -25,7 +25,7 @@ import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; @@ -172,7 +172,7 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(disks, 0, tag); @@ -188,7 +188,7 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(disks, 0, tag); @@ -197,16 +197,16 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); StackUtils.writeItems(itemFilters, 1, tag); - tag.setTag(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); - tag.setInteger(NBT_PRIORITY, priority); - tag.setInteger(NBT_COMPARE, compare); - tag.setInteger(NBT_MODE, mode); - tag.setInteger(NBT_TYPE, type); + tag.put(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); + tag.putInt(NBT_PRIORITY, priority); + tag.putInt(NBT_COMPARE, compare); + tag.putInt(NBT_MODE, mode); + tag.putInt(NBT_TYPE, type); AccessTypeUtils.writeAccessType(tag, accessType); @@ -214,13 +214,13 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); StackUtils.readItems(itemFilters, 1, tag); if (tag.hasKey(NBT_FLUID_FILTERS)) { - fluidFilters.readFromNbt(tag.getCompoundTag(NBT_FLUID_FILTERS)); + fluidFilters.readFromNbt(tag.getCompound(NBT_FLUID_FILTERS)); } if (tag.hasKey(NBT_PRIORITY)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/StorageDiskFluidDriveWrapper.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/StorageDiskFluidDriveWrapper.java index 23aee6ce3..5bae07ceb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/StorageDiskFluidDriveWrapper.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/StorageDiskFluidDriveWrapper.java @@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.render.constants.ConstantsDisk; import com.raoulvdberge.refinedstorage.tile.config.IFilterable; import com.raoulvdberge.refinedstorage.util.StackUtils; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; @@ -90,7 +90,7 @@ public class StorageDiskFluidDriveWrapper implements IStorageDisk { } @Override - public NBTTagCompound writeToNbt() { + public CompoundNBT writeToNbt() { return parent.writeToNbt(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/StorageDiskItemDriveWrapper.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/StorageDiskItemDriveWrapper.java index c65bde10f..8ee1e839a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/StorageDiskItemDriveWrapper.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/StorageDiskItemDriveWrapper.java @@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.render.constants.ConstantsDisk; import com.raoulvdberge.refinedstorage.tile.config.IFilterable; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.items.ItemHandlerHelper; import javax.annotation.Nonnull; @@ -90,7 +90,7 @@ public class StorageDiskItemDriveWrapper implements IStorageDisk { } @Override - public NBTTagCompound writeToNbt() { + public CompoundNBT writeToNbt() { return parent.writeToNbt(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java index bc31d921f..a18e808e2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java @@ -23,7 +23,7 @@ import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; @@ -460,7 +460,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); StackUtils.readItems(upgrades, 3, tag); @@ -482,7 +482,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); StackUtils.writeItems(upgrades, 3, tag); @@ -493,28 +493,28 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab } @Override - public NBTTagCompound writeConfiguration(NBTTagCompound tag) { + public CompoundNBT writeConfiguration(CompoundNBT tag) { super.writeConfiguration(tag); StackUtils.writeItems(itemFilters, 1, tag); - tag.setTag(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); - tag.setInteger(NBT_COMPARE, compare); - tag.setInteger(NBT_MODE, mode); - tag.setInteger(NBT_TYPE, type); - tag.setInteger(NBT_IO_MODE, ioMode); + tag.put(NBT_FLUID_FILTERS, fluidFilters.writeToNbt()); + tag.putInt(NBT_COMPARE, compare); + tag.putInt(NBT_MODE, mode); + tag.putInt(NBT_TYPE, type); + tag.putInt(NBT_IO_MODE, ioMode); return tag; } @Override - public void readConfiguration(NBTTagCompound tag) { + public void readConfiguration(CompoundNBT tag) { super.readConfiguration(tag); StackUtils.readItems(itemFilters, 1, tag); if (tag.hasKey(NBT_FLUID_FILTERS)) { - fluidFilters.readFromNbt(tag.getCompoundTag(NBT_FLUID_FILTERS)); + fluidFilters.readFromNbt(tag.getCompound(NBT_FLUID_FILTERS)); } if (tag.hasKey(NBT_COMPARE)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java index 125cc3ec3..c38e6c39a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java @@ -9,7 +9,7 @@ import com.raoulvdberge.refinedstorage.render.constants.ConstantsDisk; import com.raoulvdberge.refinedstorage.tile.config.IFilterable; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; @@ -50,7 +50,7 @@ public class StorageDiskFluidManipulatorWrapper implements IStorageDisk } @Override - public NBTTagCompound writeToNbt() { + public CompoundNBT writeToNbt() { return parent.writeToNbt(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageDiskItemStorageWrapper.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageDiskItemStorageWrapper.java index 664e750c4..9a670875d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageDiskItemStorageWrapper.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageDiskItemStorageWrapper.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.tile.config.IFilterable; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.items.ItemHandlerHelper; import javax.annotation.Nonnull; @@ -76,7 +76,7 @@ public class StorageDiskItemStorageWrapper implements IStorageDisk { } @Override - public NBTTagCompound writeToNbt() { + public CompoundNBT writeToNbt() { return parent.writeToNbt(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterChannel.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterChannel.java index d8afb8a3c..59877e66c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterChannel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterChannel.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter; import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.network.readerwriter.*; import com.raoulvdberge.refinedstorage.apiimpl.API; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import java.util.ArrayList; import java.util.List; @@ -45,24 +45,24 @@ public class ReaderWriterChannel implements IReaderWriterChannel { } @Override - public NBTTagCompound writeToNbt(NBTTagCompound tag) { + public CompoundNBT writeToNbt(CompoundNBT tag) { for (IReaderWriterHandler handler : handlers) { - tag.setTag(String.format(NBT_HANDLER, handler.getId()), handler.writeToNbt(new NBTTagCompound())); + tag.put(String.format(NBT_HANDLER, handler.getId()), handler.writeToNbt(new CompoundNBT())); } return tag; } @Override - public void readFromNbt(NBTTagCompound tag) { + public void readFromNbt(CompoundNBT tag) { for (IReaderWriterHandler handler : handlers) { String id = String.format(NBT_HANDLER, handler.getId()); - if (tag.hasKey(id)) { + if (tag.contains(id)) { IReaderWriterHandlerFactory factory = API.instance().getReaderWriterHandlerRegistry().get(id); if (factory != null) { - handlers.add(factory.create(tag.getCompoundTag(id))); + handlers.add(factory.create(tag.getCompound(id))); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerFluids.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerFluids.java index f6218b1d0..f870d1582 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerFluids.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerFluids.java @@ -1,11 +1,11 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter; - +/* TODO import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReader; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandler; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IWriter; import com.raoulvdberge.refinedstorage.apiimpl.API; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; @@ -49,7 +49,7 @@ public class ReaderWriterHandlerFluids implements IReaderWriterHandler { private FluidTank tank; private FluidTankReaderWriter tankReader, tankWriter; - public ReaderWriterHandlerFluids(@Nullable NBTTagCompound tag) { + public ReaderWriterHandlerFluids(@Nullable CompoundNBT tag) { this.tank = new FluidTank(16 * Fluid.BUCKET_VOLUME); this.tankReader = new FluidTankReaderWriter(tank, true, false); this.tankWriter = new FluidTankReaderWriter(tank, false, true); @@ -103,7 +103,7 @@ public class ReaderWriterHandlerFluids implements IReaderWriterHandler { } @Override - public NBTTagCompound writeToNbt(NBTTagCompound tag) { + public CompoundNBT writeToNbt(CompoundNBT tag) { tank.writeToNBT(tag); return tag; @@ -224,4 +224,4 @@ public class ReaderWriterHandlerFluids implements IReaderWriterHandler { return canDrain ? parent.drain(maxDrain, doDrain) : null; } } -} +}*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java index 956da46d8..23f8be425 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java @@ -1,12 +1,12 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter; - +/* TODO import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReader; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandler; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IWriter; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; @@ -51,12 +51,17 @@ public class ReaderWriterHandlerItems implements IReaderWriterHandler { public int getSlotLimit(int slot) { return 0; } + + @Override + public boolean isItemValid(int slot, @Nonnull ItemStack stack) { + return false; + } }; private ItemStackHandler items; private ItemHandlerReaderWriter itemsReader, itemsWriter; - public ReaderWriterHandlerItems(@Nullable NBTTagCompound tag) { + public ReaderWriterHandlerItems(@Nullable CompoundNBT tag) { this.items = new ItemStackHandler(16); this.itemsWriter = new ItemHandlerReaderWriter(items, false, true); this.itemsReader = new ItemHandlerReaderWriter(items, true, false); @@ -98,7 +103,7 @@ public class ReaderWriterHandlerItems implements IReaderWriterHandler { @Override public T getCapabilityWriter(IWriter writer, Capability capability) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(itemsWriter); + return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.(itemsWriter); } return null; @@ -110,7 +115,7 @@ public class ReaderWriterHandlerItems implements IReaderWriterHandler { } @Override - public NBTTagCompound writeToNbt(NBTTagCompound tag) { + public CompoundNBT writeToNbt(CompoundNBT tag) { StackUtils.writeItems(items, 0, tag); return tag; @@ -184,3 +189,4 @@ public class ReaderWriterHandlerItems implements IReaderWriterHandler { } } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerRedstone.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerRedstone.java index c42f18e42..e6cb9d3ee 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerRedstone.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerRedstone.java @@ -4,9 +4,9 @@ import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReader; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandler; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IWriter; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.common.capabilities.Capability; import java.util.Collections; @@ -65,7 +65,7 @@ public class ReaderWriterHandlerRedstone implements IReaderWriterHandler { } @Override - public NBTTagCompound writeToNbt(NBTTagCompound tag) { + public CompoundNBT writeToNbt(CompoundNBT tag) { return tag; } @@ -91,6 +91,6 @@ public class ReaderWriterHandlerRedstone implements IReaderWriterHandler { return Collections.emptyList(); } - return Collections.singletonList(new TextComponentTranslation("misc.refinedstorage:reader_writer.redstone", strength)); + return Collections.singletonList(new TranslationTextComponent("misc.refinedstorage:reader_writer.redstone", strength)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterManager.java index c8a21b807..13228df74 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterManager.java @@ -6,8 +6,8 @@ import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHan import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterListener; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterManager; import com.raoulvdberge.refinedstorage.apiimpl.API; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraftforge.common.util.Constants; import javax.annotation.Nullable; @@ -79,27 +79,27 @@ public class ReaderWriterManager implements IReaderWriterManager { } @Override - public void writeToNbt(NBTTagCompound tag) { - NBTTagList readerWriterChannelsList = new NBTTagList(); + public void writeToNbt(CompoundNBT tag) { + ListNBT readerWriterChannelsList = new ListNBT(); for (Map.Entry entry : channels.entrySet()) { - NBTTagCompound channelTag = entry.getValue().writeToNbt(new NBTTagCompound()); + CompoundNBT channelTag = entry.getValue().writeToNbt(new CompoundNBT()); - channelTag.setString(NBT_NAME, entry.getKey()); + channelTag.putString(NBT_NAME, entry.getKey()); - readerWriterChannelsList.appendTag(channelTag); + readerWriterChannelsList.add(channelTag); } - tag.setTag(NBT_CHANNELS, readerWriterChannelsList); + tag.put(NBT_CHANNELS, readerWriterChannelsList); } @Override - public void readFromNbt(NBTTagCompound tag) { - if (tag.hasKey(NBT_CHANNELS)) { - NBTTagList readerWriterChannelsList = tag.getTagList(NBT_CHANNELS, Constants.NBT.TAG_COMPOUND); + public void readFromNbt(CompoundNBT tag) { + if (tag.contains(NBT_CHANNELS)) { + ListNBT readerWriterChannelsList = tag.getList(NBT_CHANNELS, Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < readerWriterChannelsList.tagCount(); ++i) { - NBTTagCompound channelTag = readerWriterChannelsList.getCompoundTagAt(i); + for (int i = 0; i < readerWriterChannelsList.size(); ++i) { + CompoundNBT channelTag = readerWriterChannelsList.getCompound(i); String name = channelTag.getString(NBT_NAME); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityManager.java index 881c20a80..b1adf6bc3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityManager.java @@ -6,9 +6,8 @@ import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCard; import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCardContainer; import com.raoulvdberge.refinedstorage.api.network.security.ISecurityManager; import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.management.UserListOps; -import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.management.OpList; import java.util.HashMap; import java.util.Map; @@ -24,8 +23,8 @@ public class SecurityManager implements ISecurityManager { } @Override - public boolean hasPermission(Permission permission, EntityPlayer player) { - UserListOps ops = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getOppedPlayers(); + public boolean hasPermission(Permission permission, PlayerEntity player) { + OpList ops = player.getServer().getPlayerList().getOppedPlayers(); // TODO does that work? if (ops.getEntry(player.getGameProfile()) != null) { return true; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java index bc3edd421..acb4a0b2b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java @@ -28,7 +28,7 @@ public class StorageCacheFluid implements IStorageCache { } @Override - public synchronized void invalidate() { + public void invalidate() { storages.clear(); network.getNodeGraph().all().stream() @@ -45,7 +45,7 @@ public class StorageCacheFluid implements IStorageCache { } for (FluidStack stack : storage.getStacks()) { - add(stack, stack.amount, true, false); + add(stack, stack.getAmount(), true, false); } } @@ -53,7 +53,7 @@ public class StorageCacheFluid implements IStorageCache { } @Override - public synchronized void add(@Nonnull FluidStack stack, int size, boolean rebuilding, boolean batched) { + public void add(@Nonnull FluidStack stack, int size, boolean rebuilding, boolean batched) { list.add(stack, size); if (!rebuilding) { @@ -66,7 +66,7 @@ public class StorageCacheFluid implements IStorageCache { } @Override - public synchronized void remove(@Nonnull FluidStack stack, int size, boolean batched) { + public void remove(@Nonnull FluidStack stack, int size, boolean batched) { if (list.remove(stack, size)) { if (!batched) { listeners.forEach(l -> l.onChanged(stack, -size)); @@ -77,7 +77,7 @@ public class StorageCacheFluid implements IStorageCache { } @Override - public synchronized void flush() { + public void flush() { if (!batchedChanges.isEmpty()) { batchedChanges.forEach(c -> listeners.forEach(l -> l.onChanged(c.getKey(), c.getValue()))); batchedChanges.clear(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java index 801ca8eab..6c550c1a9 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java @@ -28,7 +28,7 @@ public class StorageCacheItem implements IStorageCache { } @Override - public synchronized void invalidate() { + public void invalidate() { storages.clear(); network.getNodeGraph().all().stream() @@ -55,7 +55,7 @@ public class StorageCacheItem implements IStorageCache { } @Override - public synchronized void add(@Nonnull ItemStack stack, int size, boolean rebuilding, boolean batched) { + public void add(@Nonnull ItemStack stack, int size, boolean rebuilding, boolean batched) { list.add(stack, size); if (!rebuilding) { @@ -68,7 +68,7 @@ public class StorageCacheItem implements IStorageCache { } @Override - public synchronized void remove(@Nonnull ItemStack stack, int size, boolean batched) { + public void remove(@Nonnull ItemStack stack, int size, boolean batched) { if (list.remove(stack, size)) { if (!batched) { listeners.forEach(l -> l.onChanged(stack, -size)); @@ -79,7 +79,7 @@ public class StorageCacheItem implements IStorageCache { } @Override - public synchronized void flush() { + public void flush() { if (!batchedChanges.isEmpty()) { if (batchedChanges.size() > 1) { listeners.forEach(l -> l.onChangedBulk(batchedChanges)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridFluid.java index a6a216226..b94d3e268 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridFluid.java @@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; import com.raoulvdberge.refinedstorage.network.MessageGridFluidDelta; import com.raoulvdberge.refinedstorage.network.MessageGridFluidUpdate; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.tuple.Pair; @@ -14,17 +14,17 @@ import javax.annotation.Nonnull; import java.util.List; public class StorageCacheListenerGridFluid implements IStorageCacheListener { - private EntityPlayerMP player; + private ServerPlayerEntity player; private INetwork network; - public StorageCacheListenerGridFluid(EntityPlayerMP player, INetwork network) { + public StorageCacheListenerGridFluid(ServerPlayerEntity player, INetwork network) { this.player = player; this.network = network; } @Override public void onAttached() { - RS.INSTANCE.network.sendTo(new MessageGridFluidUpdate(network, network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)), player); + // TODO: RS.INSTANCE.network.sendTo(new MessageGridFluidUpdate(network, network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)), player); } @Override @@ -34,7 +34,7 @@ public class StorageCacheListenerGridFluid implements IStorageCacheListener { - private EntityPlayerMP player; + private ServerPlayerEntity player; private INetwork network; - public StorageCacheListenerGridItem(EntityPlayerMP player, INetwork network) { + public StorageCacheListenerGridItem(ServerPlayerEntity player, INetwork network) { this.player = player; this.network = network; } @Override public void onAttached() { - RS.INSTANCE.network.sendTo(new MessageGridItemUpdate(network, network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)), player); + // TODO RS.INSTANCE.network.sendTo(new MessageGridItemUpdate(network, network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)), player); } @Override @@ -34,11 +34,11 @@ public class StorageCacheListenerGridItem implements IStorageCacheListener> stacks) { - RS.INSTANCE.network.sendTo(new MessageGridItemDelta(network, network.getItemStorageTracker(), stacks), player); + // TODO RS.INSTANCE.network.sendTo(new MessageGridItemDelta(network, network.getItemStorageTracker(), stacks), player); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortable.java index c6bff599f..5bc86ce32 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortable.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.network.MessageGridItemDelta; import com.raoulvdberge.refinedstorage.network.MessageGridItemUpdate; import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; import com.raoulvdberge.refinedstorage.util.StackUtils; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.ByteBufUtils; import org.apache.commons.lang3.tuple.Pair; @@ -17,16 +17,16 @@ import java.util.List; public class StorageCacheListenerGridPortable implements IStorageCacheListener { private IPortableGrid portableGrid; - private EntityPlayerMP player; + private ServerPlayerEntity player; - public StorageCacheListenerGridPortable(IPortableGrid portableGrid, EntityPlayerMP player) { + public StorageCacheListenerGridPortable(IPortableGrid portableGrid, ServerPlayerEntity player) { this.portableGrid = portableGrid; this.player = player; } @Override public void onAttached() { - RS.INSTANCE.network.sendTo(new MessageGridItemUpdate(buf -> { + /*RS.INSTANCE.network.sendTo(new MessageGridItemUpdate(buf -> { buf.writeInt(portableGrid.getItemCache().getList().getStacks().size()); for (ItemStack stack : portableGrid.getItemCache().getList().getStacks()) { @@ -39,7 +39,7 @@ public class StorageCacheListenerGridPortable implements IStorageCacheListener> stacks) { - RS.INSTANCE.network.sendTo(new MessageGridItemDelta(null, portableGrid.getItemStorageTracker(), stacks), player); + // TODO RS.INSTANCE.network.sendTo(new MessageGridItemDelta(null, portableGrid.getItemStorageTracker(), stacks), player); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortableFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortableFluid.java index 9953349a0..4b8bdfe66 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortableFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortableFluid.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.network.MessageGridFluidDelta; import com.raoulvdberge.refinedstorage.network.MessageGridFluidUpdate; import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; import com.raoulvdberge.refinedstorage.util.StackUtils; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.network.ByteBufUtils; import org.apache.commons.lang3.tuple.Pair; @@ -17,16 +17,16 @@ import java.util.List; public class StorageCacheListenerGridPortableFluid implements IStorageCacheListener { private IPortableGrid portableGrid; - private EntityPlayerMP player; + private ServerPlayerEntity player; - public StorageCacheListenerGridPortableFluid(IPortableGrid portableGrid, EntityPlayerMP player) { + public StorageCacheListenerGridPortableFluid(IPortableGrid portableGrid, ServerPlayerEntity player) { this.portableGrid = portableGrid; this.player = player; } @Override public void onAttached() { - RS.INSTANCE.network.sendTo(new MessageGridFluidUpdate(buf -> { + /*RS.INSTANCE.network.sendTo(new MessageGridFluidUpdate(buf -> { int size = portableGrid.getFluidCache().getList().getStacks().size(); buf.writeInt(size); @@ -44,7 +44,7 @@ public class StorageCacheListenerGridPortableFluid implements IStorageCacheListe buf.writeBoolean(false); buf.writeBoolean(false); } - }, false), player); + }, false), player); TODO */ } @Override @@ -54,7 +54,7 @@ public class StorageCacheListenerGridPortableFluid implements IStorageCacheListe @Override public void onChanged(@Nonnull FluidStack stack, int size) { - RS.INSTANCE.network.sendTo(new MessageGridFluidDelta(null, portableGrid.getFluidStorageTracker(), stack, size), player); + // TODO RS.INSTANCE.network.sendTo(new MessageGridFluidDelta(null, portableGrid.getFluidStorageTracker(), stack, size), player); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerEntry.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerEntry.java index 0ddaa6474..970659a73 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerEntry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerEntry.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.storage; import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; import io.netty.buffer.ByteBuf; +import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.common.network.ByteBufUtils; public class StorageTrackerEntry implements IStorageTracker.IStorageTrackerEntry { @@ -13,9 +14,9 @@ public class StorageTrackerEntry implements IStorageTracker.IStorageTrackerEntry this.name = name; } - public StorageTrackerEntry(ByteBuf buf) { + public StorageTrackerEntry(PacketBuffer buf) { this.time = buf.readLong(); - this.name = ByteBufUtils.readUTF8String(buf); + this.name = buf.readString(); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerFluid.java index 8c05d533e..0fdf0156e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerFluid.java @@ -1,16 +1,12 @@ package com.raoulvdberge.refinedstorage.apiimpl.storage; import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import gnu.trove.map.hash.TCustomHashMap; -import gnu.trove.strategy.HashingStrategy; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.server.MinecraftServer; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraftforge.fluids.FluidStack; +import java.util.HashMap; import java.util.Map; public class StorageTrackerFluid implements IStorageTracker { @@ -18,6 +14,8 @@ public class StorageTrackerFluid implements IStorageTracker { private static final String NBT_NAME = "Name"; private static final String NBT_TIME = "Time"; + private Map changes = new HashMap<>(); // TODO broken + /* private Map changes = new TCustomHashMap<>(new HashingStrategy() { @Override public int computeHashCode(FluidStack stack) { @@ -28,7 +26,7 @@ public class StorageTrackerFluid implements IStorageTracker { public boolean equals(FluidStack left, FluidStack right) { return API.instance().getComparer().isEqual(left, right, IComparer.COMPARE_NBT); } - }); + });*/ private Runnable listener; @@ -37,8 +35,8 @@ public class StorageTrackerFluid implements IStorageTracker { } @Override - public void changed(EntityPlayer player, FluidStack stack) { - changes.put(stack, new StorageTrackerEntry(MinecraftServer.getCurrentTimeMillis(), player.getName())); + public void changed(PlayerEntity player, FluidStack stack) { + changes.put(stack, new StorageTrackerEntry(System.currentTimeMillis(), player.getName().getString())); // TODO: correct? listener.run(); } @@ -48,11 +46,11 @@ public class StorageTrackerFluid implements IStorageTracker { return changes.get(stack); } - public void readFromNbt(NBTTagList list) { - for (int i = 0; i < list.tagCount(); ++i) { - NBTTagCompound tag = list.getCompoundTagAt(i); + public void readFromNbt(ListNBT list) { + for (int i = 0; i < list.size(); ++i) { + CompoundNBT tag = list.getCompound(i); - FluidStack stack = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag(NBT_STACK)); + FluidStack stack = FluidStack.loadFluidStackFromNBT(tag.getCompound(NBT_STACK)); if (stack != null) { changes.put( @@ -63,17 +61,17 @@ public class StorageTrackerFluid implements IStorageTracker { } } - public NBTTagList serializeNbt() { - NBTTagList list = new NBTTagList(); + public ListNBT serializeNbt() { + ListNBT list = new ListNBT(); for (Map.Entry entry : changes.entrySet()) { - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); - tag.setLong(NBT_TIME, entry.getValue().getTime()); - tag.setString(NBT_NAME, entry.getValue().getName()); - tag.setTag(NBT_STACK, entry.getKey().writeToNBT(new NBTTagCompound())); + tag.putLong(NBT_TIME, entry.getValue().getTime()); + tag.putString(NBT_NAME, entry.getValue().getName()); + tag.put(NBT_STACK, entry.getKey().writeToNBT(new CompoundNBT())); - list.appendTag(tag); + list.add(tag); } return list; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerItem.java index d22d8bb80..8d036e0cf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerItem.java @@ -1,16 +1,13 @@ package com.raoulvdberge.refinedstorage.apiimpl.storage; import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; -import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.util.StackUtils; -import gnu.trove.map.hash.TCustomHashMap; -import gnu.trove.strategy.HashingStrategy; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.server.MinecraftServer; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; +import java.util.HashMap; import java.util.Map; public class StorageTrackerItem implements IStorageTracker { @@ -18,7 +15,8 @@ public class StorageTrackerItem implements IStorageTracker { private static final String NBT_NAME = "Name"; private static final String NBT_TIME = "Time"; - private Map changes = new TCustomHashMap<>(new HashingStrategy() { + + private Map changes = new HashMap<>(); /* TODO BROKEN new TCustomHashMap<>(new HashingStrategy() { @Override public int computeHashCode(ItemStack stack) { return API.instance().getItemStackHashCode(stack); @@ -28,7 +26,7 @@ public class StorageTrackerItem implements IStorageTracker { public boolean equals(ItemStack left, ItemStack right) { return API.instance().getComparer().isEqualNoQuantity(left, right); } - }); + });*/ private Runnable listener; @@ -37,8 +35,8 @@ public class StorageTrackerItem implements IStorageTracker { } @Override - public void changed(EntityPlayer player, ItemStack stack) { - changes.put(stack, new StorageTrackerEntry(MinecraftServer.getCurrentTimeMillis(), player.getName())); + public void changed(PlayerEntity player, ItemStack stack) { + changes.put(stack, new StorageTrackerEntry(System.currentTimeMillis(), player.getName().getString())); // TODO correct? listener.run(); } @@ -48,11 +46,11 @@ public class StorageTrackerItem implements IStorageTracker { return changes.get(stack); } - public void readFromNbt(NBTTagList list) { - for (int i = 0; i < list.tagCount(); ++i) { - NBTTagCompound tag = list.getCompoundTagAt(i); + public void readFromNbt(ListNBT list) { + for (int i = 0; i < list.size(); ++i) { + CompoundNBT tag = list.getCompound(i); - ItemStack stack = StackUtils.deserializeStackFromNbt(tag.getCompoundTag(NBT_STACK)); + ItemStack stack = StackUtils.deserializeStackFromNbt(tag.getCompound(NBT_STACK)); if (!stack.isEmpty()) { changes.put( @@ -63,17 +61,17 @@ public class StorageTrackerItem implements IStorageTracker { } } - public NBTTagList serializeNbt() { - NBTTagList list = new NBTTagList(); + public ListNBT serializeNbt() { + ListNBT list = new ListNBT(); for (Map.Entry entry : changes.entrySet()) { - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); - tag.setLong(NBT_TIME, entry.getValue().getTime()); - tag.setString(NBT_NAME, entry.getValue().getName()); - tag.setTag(NBT_STACK, StackUtils.serializeStackToNbt(entry.getKey())); + tag.putLong(NBT_TIME, entry.getValue().getTime()); + tag.putString(NBT_NAME, entry.getValue().getName()); + tag.put(NBT_STACK, StackUtils.serializeStackToNbt(entry.getKey())); - list.appendTag(tag); + list.add(tag); } return list; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryFluid.java index f489ec1f8..671c6d73c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryFluid.java @@ -2,25 +2,26 @@ package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskFactory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.world.World; +import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.FluidStack; public class StorageDiskFactoryFluid implements IStorageDiskFactory { public static final String ID = "normal_fluid"; @Override - public IStorageDisk createFromNbt(World world, NBTTagCompound tag) { - StorageDiskFluid disk = new StorageDiskFluid(world, tag.getInteger(StorageDiskFluid.NBT_CAPACITY)); + public IStorageDisk createFromNbt(World world, CompoundNBT tag) { + StorageDiskFluid disk = new StorageDiskFluid(world, tag.getInt(StorageDiskFluid.NBT_CAPACITY)); - NBTTagList list = (NBTTagList) tag.getTag(StorageDiskFluid.NBT_FLUIDS); + ListNBT list = tag.getList(StorageDiskFluid.NBT_FLUIDS, Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < list.tagCount(); ++i) { - FluidStack stack = FluidStack.loadFluidStackFromNBT(list.getCompoundTagAt(i)); + for (int i = 0; i < list.size(); ++i) { + FluidStack stack = FluidStack.loadFluidStackFromNBT(list.getCompound(i)); if (stack != null) { - disk.getRawStacks().put(stack.getFluid(), stack); + disk.getRawStacks().put(stack.getRawFluid(), stack); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryItem.java index c765d72a0..4385c42a0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryItem.java @@ -4,21 +4,22 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskFactory; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.world.World; +import net.minecraftforge.common.util.Constants; public class StorageDiskFactoryItem implements IStorageDiskFactory { public static final String ID = "normal_item"; @Override - public IStorageDisk createFromNbt(World world, NBTTagCompound tag) { - StorageDiskItem disk = new StorageDiskItem(world, tag.getInteger(StorageDiskItem.NBT_CAPACITY)); + public IStorageDisk createFromNbt(World world, CompoundNBT tag) { + StorageDiskItem disk = new StorageDiskItem(world, tag.getInt(StorageDiskItem.NBT_CAPACITY)); - NBTTagList list = (NBTTagList) tag.getTag(StorageDiskItem.NBT_ITEMS); + ListNBT list = tag.getList(StorageDiskItem.NBT_ITEMS, Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < list.tagCount(); ++i) { - ItemStack stack = StackUtils.deserializeStackFromNbt(list.getCompoundTagAt(i)); + for (int i = 0; i < list.size(); ++i) { + ItemStack stack = StackUtils.deserializeStackFromNbt(list.getCompound(i)); if (!stack.isEmpty()) { disk.getRawStacks().put(stack.getItem(), stack); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java index d01ef6929..503484dba 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java @@ -10,10 +10,10 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.util.StackUtils; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.fluid.Fluid; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.world.World; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; @@ -43,18 +43,18 @@ public class StorageDiskFluid implements IStorageDisk { } @Override - public NBTTagCompound writeToNbt() { - NBTTagCompound tag = new NBTTagCompound(); + public CompoundNBT writeToNbt() { + CompoundNBT tag = new CompoundNBT(); - NBTTagList list = new NBTTagList(); + ListNBT list = new ListNBT(); for (FluidStack stack : stacks.values()) { - list.appendTag(stack.writeToNBT(new NBTTagCompound())); + list.add(stack.writeToNBT(new CompoundNBT())); } - tag.setString(NBT_VERSION, RS.VERSION); - tag.setTag(NBT_FLUIDS, list); - tag.setInteger(NBT_CAPACITY, capacity); + tag.putString(NBT_VERSION, RS.VERSION); + tag.put(NBT_FLUIDS, list); + tag.putInt(NBT_CAPACITY, capacity); return tag; } @@ -77,7 +77,7 @@ public class StorageDiskFluid implements IStorageDisk { } if (action == Action.PERFORM) { - otherStack.amount += remainingSpace; + otherStack.grow(remainingSpace); onChanged(); } @@ -85,7 +85,7 @@ public class StorageDiskFluid implements IStorageDisk { return StackUtils.copy(otherStack, size - remainingSpace); } else { if (action == Action.PERFORM) { - otherStack.amount += size; + otherStack.grow(size); onChanged(); } @@ -125,15 +125,15 @@ public class StorageDiskFluid implements IStorageDisk { public FluidStack extract(@Nonnull FluidStack stack, int size, int flags, Action action) { for (FluidStack otherStack : stacks.get(stack.getFluid())) { if (API.instance().getComparer().isEqual(otherStack, stack, flags)) { - if (size > otherStack.amount) { - size = otherStack.amount; + if (size > otherStack.getAmount()) { + size = otherStack.getAmount(); } if (action == Action.PERFORM) { - if (otherStack.amount - size == 0) { + if (otherStack.getAmount() - size == 0) { stacks.remove(otherStack.getFluid(), otherStack); } else { - otherStack.amount -= size; + otherStack.shrink(size); } onChanged(); @@ -148,7 +148,7 @@ public class StorageDiskFluid implements IStorageDisk { @Override public int getStored() { - return stacks.values().stream().mapToInt(s -> s.amount).sum(); + return stacks.values().stream().mapToInt(s -> s.getAmount()).sum(); } @Override @@ -172,7 +172,7 @@ public class StorageDiskFluid implements IStorageDisk { return 0; } - return remainder == null ? size : (size - remainder.amount); + return remainder == null ? size : (size - remainder.getAmount()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluidPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluidPortable.java index 7d1c1a249..c6e18f862 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluidPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluidPortable.java @@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerCon import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; @@ -33,7 +33,7 @@ public class StorageDiskFluidPortable implements IStorageDisk { } @Override - public NBTTagCompound writeToNbt() { + public CompoundNBT writeToNbt() { return parent.writeToNbt(); } @@ -66,7 +66,7 @@ public class StorageDiskFluidPortable implements IStorageDisk { FluidStack extracted = parent.extract(stack, size, flags, action); if (action == Action.PERFORM && extracted != null) { - portableGrid.getFluidCache().remove(extracted, extracted.amount, false); + portableGrid.getFluidCache().remove(extracted, extracted.getAmount(), false); } return extracted; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java index 72a747fba..fe9e3e683 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java @@ -12,8 +12,8 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.world.World; import net.minecraftforge.items.ItemHandlerHelper; @@ -44,18 +44,18 @@ public class StorageDiskItem implements IStorageDisk { } @Override - public NBTTagCompound writeToNbt() { - NBTTagCompound tag = new NBTTagCompound(); + public CompoundNBT writeToNbt() { + CompoundNBT tag = new CompoundNBT(); - NBTTagList list = new NBTTagList(); + ListNBT list = new ListNBT(); for (ItemStack stack : stacks.values()) { - list.appendTag(StackUtils.serializeStackToNbt(stack)); + list.add(StackUtils.serializeStackToNbt(stack)); } - tag.setString(NBT_VERSION, RS.VERSION); - tag.setTag(NBT_ITEMS, list); - tag.setInteger(NBT_CAPACITY, capacity); + tag.putString(NBT_VERSION, RS.VERSION); + tag.put(NBT_ITEMS, list); + tag.putInt(NBT_CAPACITY, capacity); return tag; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItemPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItemPortable.java index 015b58bcd..07197b390 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItemPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItemPortable.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -33,7 +33,7 @@ public class StorageDiskItemPortable implements IStorageDisk { } @Override - public NBTTagCompound writeToNbt() { + public CompoundNBT writeToNbt() { return parent.writeToNbt(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java index e58a9daf6..f14b25be4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java @@ -6,8 +6,8 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskManager; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.world.World; import net.minecraft.world.storage.WorldSavedData; import net.minecraftforge.common.util.Constants; @@ -26,7 +26,7 @@ public class StorageDiskManager extends WorldSavedData implements IStorageDiskMa private static final String NBT_DISK_DATA = "Data"; private boolean canReadDisks; - private NBTTagList disksTag; + private ListNBT disksTag; private ConcurrentHashMap disks = new ConcurrentHashMap<>(); @@ -93,9 +93,9 @@ public class StorageDiskManager extends WorldSavedData implements IStorageDiskMa } @Override - public void readFromNBT(NBTTagCompound tag) { - if (tag.hasKey(NBT_DISKS)) { - this.disksTag = tag.getTagList(NBT_DISKS, Constants.NBT.TAG_COMPOUND); + public void read(CompoundNBT tag) { + if (tag.contains(NBT_DISKS)) { + this.disksTag = tag.getList(NBT_DISKS, Constants.NBT.TAG_COMPOUND); this.canReadDisks = true; } } @@ -104,11 +104,11 @@ public class StorageDiskManager extends WorldSavedData implements IStorageDiskMa if (this.canReadDisks) { this.canReadDisks = false; - for (int i = 0; i < disksTag.tagCount(); ++i) { - NBTTagCompound diskTag = disksTag.getCompoundTagAt(i); + for (int i = 0; i < disksTag.size(); ++i) { + CompoundNBT diskTag = disksTag.getCompound(i); UUID id = diskTag.getUniqueId(NBT_DISK_ID); - NBTTagCompound data = diskTag.getCompoundTag(NBT_DISK_DATA); + CompoundNBT data = diskTag.getCompound(NBT_DISK_DATA); String type = diskTag.getString(NBT_DISK_TYPE); IStorageDiskFactory factory = API.instance().getStorageDiskRegistry().get(type); @@ -120,20 +120,20 @@ public class StorageDiskManager extends WorldSavedData implements IStorageDiskMa } @Override - public NBTTagCompound writeToNBT(NBTTagCompound tag) { - NBTTagList disks = new NBTTagList(); + public CompoundNBT write(CompoundNBT tag) { + ListNBT disks = new ListNBT(); for (Map.Entry entry : this.disks.entrySet()) { - NBTTagCompound diskTag = new NBTTagCompound(); + CompoundNBT diskTag = new CompoundNBT(); - diskTag.setUniqueId(NBT_DISK_ID, entry.getKey()); - diskTag.setTag(NBT_DISK_DATA, entry.getValue().writeToNbt()); - diskTag.setString(NBT_DISK_TYPE, entry.getValue().getId()); + diskTag.putUniqueId(NBT_DISK_ID, entry.getKey()); + diskTag.put(NBT_DISK_DATA, entry.getValue().writeToNbt()); + diskTag.putString(NBT_DISK_TYPE, entry.getValue().getId()); - disks.appendTag(diskTag); + disks.add(diskTag); } - tag.setTag(NBT_DISKS, disks); + tag.put(NBT_DISKS, disks); return tag; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java index 884c2bb9f..6bdd52862 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java @@ -31,7 +31,7 @@ public class StorageDiskSync implements IStorageDiskSync { long lastSync = syncTime.getOrDefault(id, 0L); if (System.currentTimeMillis() - lastSync > THROTTLE_MS) { - RS.INSTANCE.network.sendToServer(new MessageStorageDiskSizeRequest(id)); + // TODO: Networking: RS.INSTANCE.network.sendToServer(new MessageStorageDiskSizeRequest(id)); syncTime.put(id, System.currentTimeMillis()); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageCacheFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageCacheFluid.java index 1cf623e10..f8eda1d9c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageCacheFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageCacheFluid.java @@ -5,7 +5,6 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidTankProperties; import javax.annotation.Nullable; import java.util.ArrayList; @@ -22,19 +21,19 @@ public class ExternalStorageCacheFluid { if (cache == null) { cache = new ArrayList<>(); - for (IFluidTankProperties properties : handler.getTankProperties()) { - cache.add(properties.getContents() == null ? null : properties.getContents().copy()); + for (int i = 0; i < handler.getTanks(); ++i) { + cache.add(handler.getFluidInTank(i)); } return; } - for (int i = 0; i < handler.getTankProperties().length; ++i) { - FluidStack actual = handler.getTankProperties()[i].getContents(); + for (int i = 0; i < handler.getTanks(); ++i) { + FluidStack actual = handler.getFluidInTank(i); if (i >= cache.size()) { // ENLARGED if (actual != null) { - network.getFluidStorageCache().add(actual, actual.amount, false, true); + network.getFluidStorageCache().add(actual, actual.getAmount(), false, true); cache.add(actual.copy()); } @@ -49,35 +48,35 @@ public class ExternalStorageCacheFluid { } if (actual == null && cached != null) { // REMOVED - network.getFluidStorageCache().remove(cached, cached.amount, true); + network.getFluidStorageCache().remove(cached, cached.getAmount(), true); cache.set(i, null); } else if (actual != null && cached == null) { // ADDED - network.getFluidStorageCache().add(actual, actual.amount, false, true); + network.getFluidStorageCache().add(actual, actual.getAmount(), false, true); cache.set(i, actual.copy()); } else if (!API.instance().getComparer().isEqual(actual, cached, IComparer.COMPARE_NBT)) { // CHANGED - network.getFluidStorageCache().remove(cached, cached.amount, true); - network.getFluidStorageCache().add(actual, actual.amount, false, true); + network.getFluidStorageCache().remove(cached, cached.getAmount(), true); + network.getFluidStorageCache().add(actual, actual.getAmount(), false, true); cache.set(i, actual.copy()); - } else if (actual.amount > cached.amount) { // COUNT_CHANGED - network.getFluidStorageCache().add(actual, actual.amount - cached.amount, false, true); + } else if (actual.getAmount() > cached.getAmount()) { // COUNT_CHANGED + network.getFluidStorageCache().add(actual, actual.getAmount() - cached.getAmount(), false, true); - cached.amount = actual.amount; - } else if (actual.amount < cached.amount) { // COUNT_CHANGED - network.getFluidStorageCache().remove(actual, cached.amount - actual.amount, true); + cached.setAmount(actual.getAmount()); + } else if (actual.getAmount() < cached.getAmount()) { // COUNT_CHANGED + network.getFluidStorageCache().remove(actual, cached.getAmount() - actual.getAmount(), true); - cached.amount = actual.amount; + cached.setAmount(actual.getAmount()); } } - if (cache.size() > handler.getTankProperties().length) { // SHRUNK - for (int i = cache.size() - 1; i >= handler.getTankProperties().length; --i) { // Reverse order for the remove call. + if (cache.size() > handler.getTanks()) { // SHRUNK + for (int i = cache.size() - 1; i >= handler.getTanks(); --i) { // Reverse order for the remove call. FluidStack cached = cache.get(i); if (cached != null) { - network.getFluidStorageCache().remove(cached, cached.amount, true); + network.getFluidStorageCache().remove(cached, cached.getAmount(), true); } cache.remove(i); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageProviderFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageProviderFluid.java index f9fa23de8..48e930229 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageProviderFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageProviderFluid.java @@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IStorageExter import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; @@ -14,13 +14,13 @@ import java.util.function.Supplier; public class ExternalStorageProviderFluid implements IExternalStorageProvider { @Override - public boolean canProvide(TileEntity tile, EnumFacing direction) { + public boolean canProvide(TileEntity tile, Direction direction) { return WorldUtils.getFluidHandler(tile, direction.getOpposite()) != null; } @Nonnull @Override - public IStorageExternal provide(IExternalStorageContext context, Supplier tile, EnumFacing direction) { + public IStorageExternal provide(IExternalStorageContext context, Supplier tile, Direction direction) { return new StorageExternalFluid(context, () -> WorldUtils.getFluidHandler(tile.get(), direction.getOpposite()), tile.get() instanceof TileFluidInterface); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageProviderItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageProviderItem.java index aaf0c19e4..390cd86ea 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageProviderItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ExternalStorageProviderItem.java @@ -10,18 +10,17 @@ import com.raoulvdberge.refinedstorage.tile.TileInterface; import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import javax.annotation.Nonnull; import java.util.function.Supplier; public class ExternalStorageProviderItem implements IExternalStorageProvider { @Override - public boolean canProvide(TileEntity tile, EnumFacing direction) { - boolean isNode = tile.hasCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, direction.getOpposite()); - INetworkNodeProxy nodeProxy = tile.getCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, direction.getOpposite()); + public boolean canProvide(TileEntity tile, Direction direction) { + INetworkNodeProxy nodeProxy = tile.getCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, direction.getOpposite()).orElse(null); - if (!(isNode && nodeProxy.getNode() instanceof IStorageProvider)) { + if (!(nodeProxy != null && nodeProxy.getNode() instanceof IStorageProvider)) { // TODO: Correct if still? return WorldUtils.getItemHandler(tile, direction.getOpposite()) != null; } @@ -30,7 +29,7 @@ public class ExternalStorageProviderItem implements IExternalStorageProvider provide(IExternalStorageContext context, Supplier tile, EnumFacing direction) { + public IStorageExternal provide(IExternalStorageContext context, Supplier tile, Direction direction) { return new StorageExternalItem(context, () -> WorldUtils.getItemHandler(tile.get(), direction.getOpposite()), tile.get() instanceof TileInterface); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/StorageExternalFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/StorageExternalFluid.java index 757e661ae..d9c7aee1d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/StorageExternalFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/StorageExternalFluid.java @@ -8,7 +8,6 @@ import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidTankProperties; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -34,13 +33,6 @@ public class StorageExternalFluid implements IStorageExternal { return connectedToInterface; } - @Nullable - private IFluidTankProperties[] getProperties() { - IFluidHandler handler = handlerSupplier.get(); - - return (handler != null && handler.getTankProperties() != null && handler.getTankProperties().length != 0) ? handler.getTankProperties() : null; - } - @Override public void update(INetwork network) { if (getAccessType() == AccessType.INSERT) { @@ -52,13 +44,13 @@ public class StorageExternalFluid implements IStorageExternal { @Override public int getCapacity() { - IFluidTankProperties[] props = getProperties(); + IFluidHandler fluidHandler = handlerSupplier.get(); - if (props != null) { + if (fluidHandler != null) { int cap = 0; - for (IFluidTankProperties properties : props) { - cap += properties.getCapacity(); + for (int i = 0; i < fluidHandler.getTanks(); ++i) { + cap += fluidHandler.getTankCapacity(i); } return cap; @@ -69,17 +61,13 @@ public class StorageExternalFluid implements IStorageExternal { @Override public Collection getStacks() { - IFluidTankProperties[] props = getProperties(); + IFluidHandler fluidHandler = handlerSupplier.get(); - if (props != null) { + if (fluidHandler != null) { List fluids = new ArrayList<>(); - for (IFluidTankProperties properties : props) { - FluidStack stack = properties.getContents(); - - if (stack != null) { - fluids.add(stack); - } + for (int i = 0; i < fluidHandler.getTanks(); ++i) { + fluids.add(fluidHandler.getFluidInTank(i)); } return fluids; @@ -92,7 +80,7 @@ public class StorageExternalFluid implements IStorageExternal { @Override public FluidStack insert(@Nonnull FluidStack stack, int size, Action action) { if (context.acceptsFluid(stack)) { - int filled = handlerSupplier.get().fill(StackUtils.copy(stack, size), action == Action.PERFORM); + int filled = handlerSupplier.get().fill(StackUtils.copy(stack, size), action == Action.PERFORM ? IFluidHandler.FluidAction.EXECUTE : IFluidHandler.FluidAction.SIMULATE); if (filled == size) { return null; @@ -113,22 +101,18 @@ public class StorageExternalFluid implements IStorageExternal { return null; } - return handler.drain(StackUtils.copy(stack, size), action == Action.PERFORM); + return handler.drain(StackUtils.copy(stack, size), action == Action.PERFORM ? IFluidHandler.FluidAction.EXECUTE : IFluidHandler.FluidAction.SIMULATE); } @Override public int getStored() { - IFluidTankProperties[] props = getProperties(); + IFluidHandler fluidHandler = handlerSupplier.get(); - if (props != null) { + if (fluidHandler != null) { int stored = 0; - for (IFluidTankProperties properties : props) { - FluidStack contents = properties.getContents(); - - if (contents != null) { - stored += contents.amount; - } + for (int i = 0; i < fluidHandler.getTanks(); ++i) { + stored += fluidHandler.getFluidInTank(i).getAmount(); } return stored; @@ -153,6 +137,6 @@ public class StorageExternalFluid implements IStorageExternal { return 0; } - return remainder == null ? size : (size - remainder.amount); + return remainder == null ? size : (size - remainder.getAmount()); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java index e640c351d..302222b61 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java @@ -2,31 +2,24 @@ package com.raoulvdberge.refinedstorage.apiimpl.util; import com.raoulvdberge.refinedstorage.api.util.IComparer; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumActionResult; +import net.minecraft.util.ActionResultType; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; import javax.annotation.Nullable; public class Comparer implements IComparer { @Override public boolean isEqual(@Nullable ItemStack left, @Nullable ItemStack right, int flags) { - EnumActionResult validity = getResult(left, right); + ActionResultType validity = getResult(left, right); - if (validity == EnumActionResult.FAIL || validity == EnumActionResult.SUCCESS) { - return validity == EnumActionResult.SUCCESS; + if (validity == ActionResultType.FAIL || validity == ActionResultType.SUCCESS) { + return validity == ActionResultType.SUCCESS; } if (left.getItem() != right.getItem()) { return false; } - if ((flags & COMPARE_DAMAGE) == COMPARE_DAMAGE && left.getItemDamage() != OreDictionary.WILDCARD_VALUE && right.getItemDamage() != OreDictionary.WILDCARD_VALUE) { - if (left.getItemDamage() != right.getItemDamage()) { - return false; - } - } - if ((flags & COMPARE_NBT) == COMPARE_NBT) { if (!isEqualNbt(left, right)) { return false; @@ -57,13 +50,13 @@ public class Comparer implements IComparer { } if ((flags & COMPARE_QUANTITY) == COMPARE_QUANTITY) { - if (left.amount != right.amount) { + if (left.getAmount() != right.getAmount()) { return false; } } if ((flags & COMPARE_NBT) == COMPARE_NBT) { - if (left.tag != null && !left.tag.equals(right.tag)) { + if (left.getTag() != null && !left.getTag().equals(right.getTag())) { return false; } } @@ -73,18 +66,18 @@ public class Comparer implements IComparer { @Override public boolean isEqualNbt(@Nullable ItemStack left, @Nullable ItemStack right) { - EnumActionResult validity = getResult(left, right); + ActionResultType validity = getResult(left, right); - if (validity == EnumActionResult.FAIL || validity == EnumActionResult.SUCCESS) { - return validity == EnumActionResult.SUCCESS; + if (validity == ActionResultType.FAIL || validity == ActionResultType.SUCCESS) { + return validity == ActionResultType.SUCCESS; } if (!ItemStack.areItemStackTagsEqual(left, right)) { - if (left.hasTagCompound() && !right.hasTagCompound() && left.getTagCompound().isEmpty()) { + if (left.hasTag() && !right.hasTag() && left.getTag().isEmpty()) { return true; - } else if (!left.hasTagCompound() && right.hasTagCompound() && right.getTagCompound().isEmpty()) { + } else if (!left.hasTag() && right.hasTag() && right.getTag().isEmpty()) { return true; - } else if (!left.hasTagCompound() && !right.hasTagCompound()) { + } else if (!left.hasTag() && !right.hasTag()) { return true; } @@ -94,26 +87,26 @@ public class Comparer implements IComparer { return true; } - private EnumActionResult getResult(@Nullable ItemStack left, @Nullable ItemStack right) { + private ActionResultType getResult(@Nullable ItemStack left, @Nullable ItemStack right) { if (left == null && right == null) { - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } if ((left == null && right != null) || (left != null && right == null)) { - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } boolean leftEmpty = left.isEmpty(); boolean rightEmpty = right.isEmpty(); if (leftEmpty && rightEmpty) { - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } if ((leftEmpty && !rightEmpty) || (!leftEmpty && rightEmpty)) { - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } - return EnumActionResult.PASS; + return ActionResultType.PASS; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OneSixMigrationHelper.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OneSixMigrationHelper.java deleted file mode 100644 index a4bda085c..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OneSixMigrationHelper.java +++ /dev/null @@ -1,254 +0,0 @@ -package com.raoulvdberge.refinedstorage.apiimpl.util; - -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.api.util.IOneSixMigrationHelper; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.NetworkNodeFluidStorage; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.NetworkNodeStorage; -import com.raoulvdberge.refinedstorage.block.enums.FluidStorageType; -import com.raoulvdberge.refinedstorage.block.enums.ItemStorageType; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.item.ItemPattern; -import com.raoulvdberge.refinedstorage.tile.config.IFilterable; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.IItemHandlerModifiable; - -import javax.annotation.Nullable; -import java.util.UUID; - -public class OneSixMigrationHelper implements IOneSixMigrationHelper { - // 1.5.x NBT keys - private static final String NBT_ITEMS = "Items"; - private static final String NBT_ITEM_TYPE = "Type"; - private static final String NBT_ITEM_QUANTITY = "Quantity"; - private static final String NBT_ITEM_DAMAGE = "Damage"; - private static final String NBT_ITEM_NBT = "NBT"; - private static final String NBT_ITEM_CAPS = "Caps"; - - private static final String NBT_FLUIDS = "Fluids"; - - private static UUID createItemDisk(World world, int capacity, NBTTagCompound legacyTag) { - UUID id = UUID.randomUUID(); - - IStorageDisk newDisk = API.instance().createDefaultItemDisk(world, capacity); - - NBTTagList list = (NBTTagList) legacyTag.getTag(NBT_ITEMS); - - for (int i = 0; i < list.tagCount(); ++i) { - NBTTagCompound tag = list.getCompoundTagAt(i); - - ItemStack stack = new ItemStack( - Item.getItemById(tag.getInteger(NBT_ITEM_TYPE)), - tag.getInteger(NBT_ITEM_QUANTITY), - tag.getInteger(NBT_ITEM_DAMAGE), - tag.hasKey(NBT_ITEM_CAPS) ? tag.getCompoundTag(NBT_ITEM_CAPS) : null - ); - - stack.setTagCompound(tag.hasKey(NBT_ITEM_NBT) ? tag.getCompoundTag(NBT_ITEM_NBT) : null); - - if (!stack.isEmpty()) { - newDisk.insert(stack, stack.getCount(), Action.PERFORM); - } - } - - API.instance().getStorageDiskManager(world).set(id, newDisk); - API.instance().getStorageDiskManager(world).markForSaving(); - - return id; - } - - private static UUID createFluidDisk(World world, int capacity, NBTTagCompound legacyTag) { - UUID id = UUID.randomUUID(); - - IStorageDisk newDisk = API.instance().createDefaultFluidDisk(world, capacity); - - NBTTagList list = (NBTTagList) legacyTag.getTag(NBT_FLUIDS); - - for (int i = 0; i < list.tagCount(); ++i) { - FluidStack stack = FluidStack.loadFluidStackFromNBT(list.getCompoundTagAt(i)); - - if (stack != null) { - newDisk.insert(stack, stack.amount, Action.PERFORM); - } - } - - API.instance().getStorageDiskManager(world).set(id, newDisk); - API.instance().getStorageDiskManager(world).markForSaving(); - - return id; - } - - @Override - public boolean migrateDisk(World world, ItemStack disk) { - IStorageDiskProvider provider = (IStorageDiskProvider) disk.getItem(); - - switch (provider.getType()) { - case ITEM: - if (disk.hasTagCompound() && disk.getTagCompound().hasKey(NBT_ITEMS)) { - provider.setId(disk, createItemDisk(world, provider.getCapacity(disk), disk.getTagCompound())); - - return true; - } - - break; - case FLUID: - if (disk.hasTagCompound() && disk.getTagCompound().hasKey(NBT_FLUIDS)) { - provider.setId(disk, createFluidDisk(world, provider.getCapacity(disk), disk.getTagCompound())); - - return true; - } - - break; - } - - return false; - } - - @Override - public boolean migrateDiskInventory(World world, IItemHandlerModifiable handler) { - boolean migrated = false; - - for (int i = 0; i < handler.getSlots(); ++i) { - ItemStack disk = handler.getStackInSlot(i); - - if (!disk.isEmpty() && disk.getItem() instanceof IStorageDiskProvider) { - if (migrateDisk(world, disk)) { - handler.setStackInSlot(i, disk); // Trigger a onContentsChanged - - migrated = true; - } - } - } - - return migrated; - } - - private static final String NBT_OUTPUTS = "Outputs"; - private static final String NBT_SLOT = "Slot_%d"; - - @Override - public boolean migratePattern(ItemStack pattern) { - NBTTagCompound tag = pattern.getTagCompound(); - - if (pattern.hasTagCompound() && !tag.hasKey(ItemPattern.NBT_PROCESSING)) { - boolean isProcessing = tag.hasKey(NBT_OUTPUTS); - - // Add "processing" tag - tag.setBoolean(ItemPattern.NBT_PROCESSING, isProcessing); - - // Convert "slot_%d" to "input_%d" - for (int i = 0; i < 9; ++i) { - String id = String.format(NBT_SLOT, i); - - if (tag.hasKey(id)) { - ItemStack slot = new ItemStack(pattern.getTagCompound().getCompoundTag(id)); - - if (!slot.isEmpty()) { - tag.setTag(String.format(ItemPattern.NBT_INPUT_SLOT, i), slot.serializeNBT()); - } - - tag.removeTag(id); - } - } - - // Convert "outputs" to "output_%d" - if (isProcessing) { - NBTTagList list = tag.getTagList(NBT_OUTPUTS, Constants.NBT.TAG_COMPOUND); - - for (int i = 0; i < list.tagCount(); ++i) { - ItemStack output = new ItemStack(list.getCompoundTagAt(i)); - - if (!output.isEmpty()) { - tag.setTag(String.format(ItemPattern.NBT_OUTPUT_SLOT, i), output.serializeNBT()); - } - } - - tag.removeTag(NBT_OUTPUTS); - } - - return true; - } - - return false; - } - - @Override - public boolean migratePatternInventory(IItemHandler handler) { - boolean migrated = false; - - for (int i = 0; i < handler.getSlots(); ++i) { - ItemStack pattern = handler.getStackInSlot(i); - - if (!pattern.isEmpty() && migratePattern(pattern)) { - migrated = true; - } - } - - return migrated; - } - - // We check on NBT_PROCESSING, so it needs to be there for sure to be a valid pattern. - public static boolean isValidOneSixPattern(ItemStack stack) { - return stack.hasTagCompound() && stack.getTagCompound().hasKey(ItemPattern.NBT_PROCESSING); - } - - // If we remove the OneSixMigrationHelper we know where to remove other migration hooks by removing this method. - public static void removalHook() { - } - - public static void migrateEmptyWhitelistToEmptyBlacklist(String version, IFilterable filterable, @Nullable ItemHandlerBase itemFilterInv) { - // Only migrate if we come from a version where the RS version tag stuff in NetworkNode wasn't added yet. - // Otherwise, we would constantly migrate empty whitelists to empty blacklists... - if (version == null && filterable.getMode() == IFilterable.WHITELIST && (itemFilterInv == null || itemFilterInv.isEmpty())) { - filterable.setMode(IFilter.MODE_BLACKLIST); - } - } - - private static final String NBT_STORAGE = "Storage"; - - public static void migrateItemStorageBlock(NetworkNodeStorage storage, NBTTagCompound tag) { - if (tag.hasKey(NBT_STORAGE)) { - NBTTagCompound storageTag = tag.getCompoundTag(NBT_STORAGE); - - storage.setStorageId(createItemDisk(storage.getWorld(), storage.getType().getCapacity(), storageTag)); - storage.loadStorage(); - } - } - - public static void migrateItemStorageBlockItem(World world, ItemStack stack) { - if (stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_STORAGE)) { - NBTTagCompound storageTag = stack.getTagCompound().getCompoundTag(NBT_STORAGE); - - stack.setTagCompound(new NBTTagCompound()); - stack.getTagCompound().setUniqueId(NetworkNodeStorage.NBT_ID, createItemDisk(world, ItemStorageType.getById(stack.getItemDamage()).getCapacity(), storageTag)); - } - } - - public static void migrateFluidStorageBlock(NetworkNodeFluidStorage storage, NBTTagCompound tag) { - if (tag.hasKey(NBT_STORAGE)) { - NBTTagCompound storageTag = tag.getCompoundTag(NBT_STORAGE); - - storage.setStorageId(createFluidDisk(storage.getWorld(), storage.getType().getCapacity(), storageTag)); - storage.loadStorage(); - } - } - - public static void migrateFluidStorageBlockItem(World world, ItemStack stack) { - if (stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_STORAGE)) { - NBTTagCompound storageTag = stack.getTagCompound().getCompoundTag(NBT_STORAGE); - - stack.setTagCompound(new NBTTagCompound()); - stack.getTagCompound().setUniqueId(NetworkNodeStorage.NBT_ID, createFluidDisk(world, FluidStorageType.getById(stack.getItemDamage()).getCapacity(), storageTag)); - } - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java index ec2f55fab..7b4a6aa53 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.util; import com.raoulvdberge.refinedstorage.api.util.IQuantityFormatter; import com.raoulvdberge.refinedstorage.apiimpl.API; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidAttributes; import java.math.RoundingMode; import java.text.DecimalFormat; @@ -60,12 +60,12 @@ public class QuantityFormatter implements IQuantityFormatter { @Override public String formatInBucketForm(int qty) { - return bucketFormatter.format((float) qty / (float) Fluid.BUCKET_VOLUME) + " B"; + return bucketFormatter.format((float) qty / (float) FluidAttributes.BUCKET_VOLUME) + " B"; } @Override public String formatInBucketFormWithOnlyTrailingDigitsIfZero(int qty) { - float amountRaw = ((float) qty / (float) Fluid.BUCKET_VOLUME); + float amountRaw = ((float) qty / (float) FluidAttributes.BUCKET_VOLUME); int amount = (int) amountRaw; if (amount >= 1) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java index ad835a1f5..7c4e04190 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java @@ -15,7 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -146,12 +146,12 @@ public abstract class BlockBase extends Block { } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest) { return willHarvest || super.removedByPlayer(state, world, pos, player, willHarvest); } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity tile, ItemStack stack) { + public void harvestBlock(World world, PlayerEntity player, BlockPos pos, IBlockState state, TileEntity tile, ItemStack stack) { super.harvestBlock(world, player, pos, state, tile, stack); world.setBlockToAir(pos); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java index e56691127..a0b878413 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java @@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.render.constants.ConstantsConstructor; import com.raoulvdberge.refinedstorage.tile.TileConstructor; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -76,7 +76,7 @@ public class BlockConstructor extends BlockCable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!canAccessGui(state, world, pos, hitX, hitY, hitZ)) { return false; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java index 9cd0ba334..67b78d61d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java @@ -16,10 +16,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -90,7 +90,7 @@ public class BlockController extends BlockNodeProxy { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.CONTROLLER, player, world, pos, side); } @@ -99,7 +99,7 @@ public class BlockController extends BlockNodeProxy { if (!world.isRemote) { TileController controller = (TileController) world.getTileEntity(pos); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (tag != null && tag.hasKey(TileController.NBT_ENERGY)) { controller.getEnergy().setStored(tag.getInteger(TileController.NBT_ENERGY)); @@ -113,8 +113,8 @@ public class BlockController extends BlockNodeProxy { public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ItemStack stack = new ItemStack(this, 1, getMetaFromState(state)); - stack.setTagCompound(new NBTTagCompound()); - stack.getTagCompound().setInteger(TileController.NBT_ENERGY, ((TileController) world.getTileEntity(pos)).getEnergy().getStored()); + stack.setTagCompound(new CompoundNBT()); + stack.getTagCompound().putInt(TileController.NBT_ENERGY, ((TileController) world.getTileEntity(pos)).getEnergy().getStored()); drops.add(stack); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java index 4fa72597f..8e9ebf727 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java @@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.tile.TileCrafter; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -72,7 +72,7 @@ public class BlockCrafter extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.CRAFTER, player, world, pos, side); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java index 9b5e350ed..b1a23d208 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java @@ -10,8 +10,8 @@ import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileCrafterManager; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -47,9 +47,9 @@ public class BlockCrafterManager extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote && openNetworkGui(RSGui.CRAFTER_MANAGER, player, world, pos, side, Permission.MODIFY, Permission.AUTOCRAFTING)) { - ((TileCrafterManager) world.getTileEntity(pos)).getNode().sendTo((EntityPlayerMP) player); + ((TileCrafterManager) world.getTileEntity(pos)).getNode().sendTo((ServerPlayerEntity) player); } return true; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java index fa7606d3e..516350b51 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java @@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.TileCraftingMonitor; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -46,7 +46,7 @@ public class BlockCraftingMonitor extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.CRAFTING_MONITOR, player, world, pos, side, Permission.MODIFY, Permission.AUTOCRAFTING); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java index f05302160..bd343a9cc 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java @@ -9,7 +9,7 @@ import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup; import com.raoulvdberge.refinedstorage.tile.TileDestructor; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -46,7 +46,7 @@ public class BlockDestructor extends BlockCable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!canAccessGui(state, world, pos, hitX, hitY, hitZ)) { return false; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java index 90c5699d0..832e1325c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java @@ -13,7 +13,7 @@ import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; @@ -61,7 +61,7 @@ public class BlockDetector extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.DETECTOR, player, world, pos, side); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java index 7f4f7af33..1553e1a3e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java @@ -11,7 +11,7 @@ import com.raoulvdberge.refinedstorage.tile.TileDiskDrive; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -46,7 +46,7 @@ public class BlockDiskDrive extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.DISK_DRIVE, player, world, pos, side); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java index 36969407e..e34929eb6 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java @@ -11,7 +11,7 @@ import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; @@ -52,7 +52,7 @@ public class BlockDiskManipulator extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.DISK_MANIPULATOR, player, world, pos, side); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java index 0fae1284a..e5cc4d70c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java @@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.render.constants.ConstantsExporter; import com.raoulvdberge.refinedstorage.tile.TileExporter; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -68,7 +68,7 @@ public class BlockExporter extends BlockCable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!canAccessGui(state, world, pos, hitX, hitY, hitZ)) { return false; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java index 846a5acb3..be1e7de99 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java @@ -11,7 +11,7 @@ import com.raoulvdberge.refinedstorage.tile.TileExternalStorage; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -77,7 +77,7 @@ public class BlockExternalStorage extends BlockCable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!canAccessGui(state, world, pos, hitX, hitY, hitZ)) { return false; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java index db7a88787..28416a983 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.render.IModelRegistration; import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -27,7 +27,7 @@ public class BlockFluidInterface extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.FLUID_INTERFACE, player, world, pos, side, Permission.MODIFY, Permission.INSERT, Permission.EXTRACT); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java index 4d09cfc75..c5913e811 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java @@ -13,10 +13,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; @@ -68,7 +68,7 @@ public class BlockFluidStorage extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.FLUID_STORAGE, player, world, pos, side); } @@ -99,7 +99,7 @@ public class BlockFluidStorage extends BlockNode { ItemStack stack = new ItemStack(this, 1, getMetaFromState(state)); - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); stack.getTagCompound().setUniqueId(NetworkNodeFluidStorage.NBT_ID, storage.getNode().getStorageId()); drops.add(stack); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java index f10f48841..8fd053f8e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java @@ -15,8 +15,8 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockRenderLayer; @@ -90,8 +90,8 @@ public class BlockGrid extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - return openNetworkGui(player, world, pos, side, () -> API.instance().getGridManager().openGrid(NetworkNodeGrid.FACTORY_ID, (EntityPlayerMP) player, pos)); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + return openNetworkGui(player, world, pos, side, () -> API.instance().getGridManager().openGrid(NetworkNodeGrid.FACTORY_ID, (ServerPlayerEntity) player, pos)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java index b990cce10..035cfaf5e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java @@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.render.constants.ConstantsImporter; import com.raoulvdberge.refinedstorage.tile.TileImporter; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -68,7 +68,7 @@ public class BlockImporter extends BlockCable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!canAccessGui(state, world, pos, hitX, hitY, hitZ)) { return false; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java index cdeccdabb..24b2d6a65 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.render.IModelRegistration; import com.raoulvdberge.refinedstorage.tile.TileInterface; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -27,7 +27,7 @@ public class BlockInterface extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.INTERFACE, player, world, pos, side, Permission.MODIFY, Permission.INSERT, Permission.EXTRACT); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java index 01fddb26d..b90547282 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java @@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -36,7 +36,7 @@ public class BlockNetworkTransmitter extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.NETWORK_TRANSMITTER, player, world, pos, side); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java index c3d1d37d8..6152d678b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java @@ -10,7 +10,7 @@ import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -31,8 +31,8 @@ public abstract class BlockNode extends BlockNodeProxy { if (!world.isRemote) { TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileNode && placer instanceof EntityPlayer) { - ((TileNode) tile).getNode().setOwner(((EntityPlayer) placer).getGameProfile().getId()); + if (tile instanceof TileNode && placer instanceof PlayerEntity) { + ((TileNode) tile).getNode().setOwner(((PlayerEntity) placer).getGameProfile().getId()); } API.instance().discoverNode(world, pos); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNodeProxy.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNodeProxy.java index 209a7fb26..7310489ca 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNodeProxy.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNodeProxy.java @@ -11,7 +11,7 @@ import com.raoulvdberge.refinedstorage.tile.TileNode; import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -31,7 +31,7 @@ public abstract class BlockNodeProxy extends BlockBase { INetworkNode node = tile.getCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, null).getNode(); if (node.getNetwork() != null) { - return entity instanceof EntityPlayer && node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, (EntityPlayer) entity); + return entity instanceof PlayerEntity && node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, (PlayerEntity) entity); } } @@ -53,19 +53,19 @@ public abstract class BlockNodeProxy extends BlockBase { return super.rotateBlock(world, pos, axis); } - protected boolean openNetworkGui(int guiId, EntityPlayer player, World world, BlockPos pos, EnumFacing facing) { + protected boolean openNetworkGui(int guiId, PlayerEntity player, World world, BlockPos pos, EnumFacing facing) { return openNetworkGui(guiId, player, world, pos, facing, Permission.MODIFY); } - protected boolean openNetworkGui(int guiId, EntityPlayer player, World world, BlockPos pos, EnumFacing facing, Permission... permissions) { + protected boolean openNetworkGui(int guiId, PlayerEntity player, World world, BlockPos pos, EnumFacing facing, Permission... permissions) { return openNetworkGui(player, world, pos, facing, () -> player.openGui(info.getModObject(), guiId, world, pos.getX(), pos.getY(), pos.getZ()), permissions); } - protected boolean openNetworkGui(EntityPlayer player, World world, BlockPos pos, EnumFacing facing, Runnable action) { + protected boolean openNetworkGui(PlayerEntity player, World world, BlockPos pos, EnumFacing facing, Runnable action) { return openNetworkGui(player, world, pos, facing, action, Permission.MODIFY); } - protected boolean openNetworkGui(EntityPlayer player, World world, BlockPos pos, EnumFacing facing, Runnable action, Permission... permissions) { + protected boolean openNetworkGui(PlayerEntity player, World world, BlockPos pos, EnumFacing facing, Runnable action, Permission... permissions) { if (world.isRemote) { return true; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java index 220b5eb37..2d6d3e09b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java @@ -20,8 +20,8 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -130,9 +130,9 @@ public class BlockPortableGrid extends BlockBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { - API.instance().getGridManager().openGrid(TilePortableGrid.FACTORY_ID, (EntityPlayerMP) player, pos); + API.instance().getGridManager().openGrid(TilePortableGrid.FACTORY_ID, (ServerPlayerEntity) player, pos); ((TilePortableGrid) world.getTileEntity(pos)).onOpened(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java index fee9b8fbe..791babeb5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java @@ -11,7 +11,7 @@ import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup; import com.raoulvdberge.refinedstorage.tile.TileReader; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -49,7 +49,7 @@ public class BlockReader extends BlockCable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!canAccessGui(state, world, pos, hitX, hitY, hitZ)) { return false; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java index 2622cb594..6c8538648 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java @@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileRelay; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -36,7 +36,7 @@ public class BlockRelay extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.RELAY, player, world, pos, side); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java index 14f8bbe80..88413711c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java @@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileSecurityManager; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -53,7 +53,7 @@ public class BlockSecurityManager extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { if (player.getGameProfile().getId().equals(((TileSecurityManager) world.getTileEntity(pos)).getNode().getOwner())) { player.openGui(RS.INSTANCE, RSGui.SECURITY_MANAGER, world, pos.getX(), pos.getY(), pos.getZ()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java index e455f4787..2c350f9ed 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java @@ -13,10 +13,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; @@ -68,7 +68,7 @@ public class BlockStorage extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.STORAGE, player, world, pos, side); } @@ -99,7 +99,7 @@ public class BlockStorage extends BlockNode { ItemStack stack = new ItemStack(this, 1, getMetaFromState(state)); - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); stack.getTagCompound().setUniqueId(NetworkNodeStorage.NBT_ID, storage.getNode().getStorageId()); drops.add(stack); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorageMonitor.java index 8ab68fd95..f7b4d052c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorageMonitor.java @@ -9,7 +9,7 @@ import com.raoulvdberge.refinedstorage.render.tesr.TileEntitySpecialRendererStor import com.raoulvdberge.refinedstorage.tile.TileStorageMonitor; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -42,7 +42,7 @@ public class BlockStorageMonitor extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { ItemStack held = player.inventory.getCurrentItem(); @@ -63,11 +63,11 @@ public class BlockStorageMonitor extends BlockNode { } @Override - public void onBlockClicked(World world, BlockPos pos, EntityPlayer player) { + public void onBlockClicked(World world, BlockPos pos, PlayerEntity player) { super.onBlockClicked(world, pos, player); if (!world.isRemote) { - RayTraceResult rayResult = ForgeHooks.rayTraceEyes(player, player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).getAttributeValue() + 1); + RayTraceResult rayResult = ForgeHooks.rayTraceEyes(player, player.getEntityAttribute(PlayerEntity.REACH_DISTANCE).getAttributeValue() + 1); if (rayResult == null) { return; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java index 527eaafb6..711481518 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java @@ -17,7 +17,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; @@ -48,7 +48,7 @@ public class BlockWirelessTransmitter extends BlockNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return openNetworkGui(RSGui.WIRELESS_TRANSMITTER, player, world, pos, side); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java index 3ad1438ec..f39d78167 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java @@ -12,7 +12,7 @@ import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup; import com.raoulvdberge.refinedstorage.tile.TileWriter; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -50,7 +50,7 @@ public class BlockWriter extends BlockCable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, PlayerEntity player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!canAccessGui(state, world, pos, hitX, hitY, hitZ)) { return false; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/command/CommandCreateDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/command/CommandCreateDisk.java index a785a5f4c..b9540e168 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/command/CommandCreateDisk.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/command/CommandCreateDisk.java @@ -7,7 +7,7 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -42,7 +42,7 @@ public class CommandCreateDisk extends CommandBase { if (args.length < 4) { throw new WrongUsageException("commands.refinedstorage.createdisk.usage"); } else { - EntityPlayer player = getPlayer(server, sender, args[0]); + PlayerEntity player = getPlayer(server, sender, args[0]); Item item = getItemByText(sender, args[1]); int metadata = parseInt(args[2]); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerAmount.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerAmount.java index af89cac5b..e8abc3e12 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerAmount.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerAmount.java @@ -1,13 +1,13 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.container.slot.SlotDisabled; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; public class ContainerAmount extends ContainerBase { - public ContainerAmount(EntityPlayer player, ItemStack stack) { + public ContainerAmount(PlayerEntity player, ItemStack stack) { super(null, player); ItemStackHandler inventory = new ItemStackHandler(1); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java index 4055c37f4..7655a5e1e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java @@ -12,8 +12,8 @@ import com.raoulvdberge.refinedstorage.network.MessageSlotFilterFluidUpdate; import com.raoulvdberge.refinedstorage.tile.TileBase; import com.raoulvdberge.refinedstorage.tile.data.TileDataWatcher; import invtweaks.api.container.InventoryContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; @@ -30,24 +30,24 @@ public abstract class ContainerBase extends Container { private TileBase tile; @Nullable private TileDataWatcher listener; - private EntityPlayer player; + private PlayerEntity player; protected TransferManager transferManager = new TransferManager(this); private List fluidSlots = new ArrayList<>(); private List fluids = new ArrayList<>(); - public ContainerBase(@Nullable TileBase tile, EntityPlayer player) { + public ContainerBase(@Nullable TileBase tile, PlayerEntity player) { this.tile = tile; - if (tile != null && player instanceof EntityPlayerMP) { - listener = new TileDataWatcher((EntityPlayerMP) player, tile.getDataManager()); + if (tile != null && player instanceof ServerPlayerEntity) { + listener = new TileDataWatcher((ServerPlayerEntity) player, tile.getDataManager()); } this.player = player; } - public EntityPlayer getPlayer() { + public PlayerEntity getPlayer() { return player; } @@ -86,7 +86,7 @@ public abstract class ContainerBase extends Container { } @Override - public ItemStack slotClick(int id, int dragType, ClickType clickType, EntityPlayer player) { + public ItemStack slotClick(int id, int dragType, ClickType clickType, PlayerEntity player) { Slot slot = id >= 0 ? getSlot(id) : null; // Prevent swapping disabled held item with the number keys (dragType is the slot we're swapping with) @@ -138,12 +138,12 @@ public abstract class ContainerBase extends Container { } @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { + public ItemStack transferStackInSlot(PlayerEntity player, int slotIndex) { return transferManager.transfer(slotIndex); } @Override - public boolean canInteractWith(EntityPlayer player) { + public boolean canInteractWith(PlayerEntity player) { return true; } @@ -178,7 +178,7 @@ public abstract class ContainerBase extends Container { listener.detectAndSendChanges(); } - if (this.getPlayer() instanceof EntityPlayerMP) { + if (this.getPlayer() instanceof ServerPlayerEntity) { for (int i = 0; i < this.fluidSlots.size(); ++i) { SlotFilterFluid slot = this.fluidSlots.get(i); @@ -188,14 +188,14 @@ public abstract class ContainerBase extends Container { if (!API.instance().getComparer().isEqual(cached, actual, IComparer.COMPARE_QUANTITY | IComparer.COMPARE_NBT)) { this.fluids.set(i, actual); - RS.INSTANCE.network.sendTo(new MessageSlotFilterFluidUpdate(slot.slotNumber, actual), (EntityPlayerMP) this.getPlayer()); + RS.INSTANCE.network.sendTo(new MessageSlotFilterFluidUpdate(slot.slotNumber, actual), (ServerPlayerEntity) this.getPlayer()); } } } } @Override - public void onContainerClosed(EntityPlayer player) { + public void onContainerClosed(PlayerEntity player) { super.onContainerClosed(player); if (listener != null) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java index fe998cf28..a639f5132 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java @@ -4,11 +4,11 @@ import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileConstructor; import com.raoulvdberge.refinedstorage.tile.config.IType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerConstructor extends ContainerBase { - public ContainerConstructor(TileConstructor constructor, EntityPlayer player) { + public ContainerConstructor(TileConstructor constructor, PlayerEntity player) { super(constructor, player); for (int i = 0; i < 4; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerController.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerController.java index c1477a840..184208017 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerController.java @@ -1,10 +1,10 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.tile.TileController; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; public class ContainerController extends ContainerBase { - public ContainerController(TileController controller, EntityPlayer player) { + public ContainerController(TileController controller, PlayerEntity player) { super(controller, player); addPlayerInventory(8, 99); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafter.java index 6d152d0fc..2313d3a85 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafter.java @@ -1,11 +1,11 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.tile.TileCrafter; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerCrafter extends ContainerBase { - public ContainerCrafter(TileCrafter crafter, EntityPlayer player) { + public ContainerCrafter(TileCrafter crafter, PlayerEntity player) { super(crafter, player); for (int i = 0; i < 9; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java index c42ef0596..9e95b4663 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java @@ -11,8 +11,8 @@ import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import com.raoulvdberge.refinedstorage.item.ItemPattern; import com.raoulvdberge.refinedstorage.tile.TileCrafterManager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.Container; import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; @@ -31,14 +31,14 @@ import java.util.function.Predicate; public class ContainerCrafterManager extends ContainerBase { public class CrafterManagerListener implements IContainerListener { - private EntityPlayerMP base; + private ServerPlayerEntity base; private boolean receivedContainerData; - public CrafterManagerListener(EntityPlayerMP base) { + public CrafterManagerListener(ServerPlayerEntity base) { this.base = base; } - public EntityPlayerMP getPlayer() { + public ServerPlayerEntity getPlayer() { return base; } @@ -80,8 +80,8 @@ public class ContainerCrafterManager extends ContainerBase { @Override public void addListener(IContainerListener listener) { - if (listener instanceof EntityPlayerMP) { - listener = new CrafterManagerListener((EntityPlayerMP) listener); + if (listener instanceof ServerPlayerEntity) { + listener = new CrafterManagerListener((ServerPlayerEntity) listener); } super.addListener(listener); @@ -91,7 +91,7 @@ public class ContainerCrafterManager extends ContainerBase { return listeners; } - public ContainerCrafterManager(TileCrafterManager crafterManager, EntityPlayer player, IResizableDisplay display) { + public ContainerCrafterManager(TileCrafterManager crafterManager, PlayerEntity player, IResizableDisplay display) { super(crafterManager, player); this.display = display; @@ -228,7 +228,7 @@ public class ContainerCrafterManager extends ContainerBase { } @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { + public ItemStack transferStackInSlot(PlayerEntity player, int index) { ItemStack stack = ItemStack.EMPTY; Slot slot = getSlot(index); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingMonitor.java index 0793a5b33..b1281bca5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingMonitor.java @@ -7,8 +7,8 @@ import com.raoulvdberge.refinedstorage.network.MessageCraftingMonitorElements; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.TileCraftingMonitor; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -18,7 +18,7 @@ public class ContainerCraftingMonitor extends ContainerBase implements ICrafting private ICraftingMonitor craftingMonitor; private boolean addedListener; - public ContainerCraftingMonitor(ICraftingMonitor craftingMonitor, @Nullable TileCraftingMonitor craftingMonitorTile, EntityPlayer player) { + public ContainerCraftingMonitor(ICraftingMonitor craftingMonitor, @Nullable TileCraftingMonitor craftingMonitorTile, PlayerEntity player) { super(craftingMonitorTile, player); this.craftingMonitor = craftingMonitor; @@ -41,7 +41,7 @@ public class ContainerCraftingMonitor extends ContainerBase implements ICrafting } @Override - public void onContainerClosed(EntityPlayer player) { + public void onContainerClosed(PlayerEntity player) { super.onContainerClosed(player); ICraftingManager manager = craftingMonitor.getCraftingManager(); @@ -55,7 +55,7 @@ public class ContainerCraftingMonitor extends ContainerBase implements ICrafting } @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { + public ItemStack transferStackInSlot(PlayerEntity player, int index) { ItemStack stack = ItemStack.EMPTY; Slot slot = getSlot(index); @@ -93,6 +93,6 @@ public class ContainerCraftingMonitor extends ContainerBase implements ICrafting @Override public void onChanged() { - RS.INSTANCE.network.sendTo(new MessageCraftingMonitorElements(craftingMonitor), (EntityPlayerMP) getPlayer()); + RS.INSTANCE.network.sendTo(new MessageCraftingMonitorElements(craftingMonitor), (ServerPlayerEntity) getPlayer()); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java index 4560defcd..ec09e1aed 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java @@ -6,12 +6,12 @@ import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackFluid; import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem; import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; public class ContainerCraftingSettings extends ContainerBase { - public ContainerCraftingSettings(EntityPlayer player, IGridStack stack) { + public ContainerCraftingSettings(PlayerEntity player, IGridStack stack) { super(null, player); if (stack instanceof GridStackFluid) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java index 23dd34fcb..c460f8d11 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java @@ -4,11 +4,11 @@ import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileDestructor; import com.raoulvdberge.refinedstorage.tile.config.IType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerDestructor extends ContainerBase { - public ContainerDestructor(TileDestructor destructor, EntityPlayer player) { + public ContainerDestructor(TileDestructor destructor, PlayerEntity player) { super(destructor, player); for (int i = 0; i < 4; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java index c26707695..f8b160f8c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java @@ -4,10 +4,10 @@ import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileDetector; import com.raoulvdberge.refinedstorage.tile.config.IType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; public class ContainerDetector extends ContainerBase { - public ContainerDetector(TileDetector detector, EntityPlayer player) { + public ContainerDetector(TileDetector detector, PlayerEntity player) { super(detector, player); addSlotToContainer(new SlotFilter(detector.getNode().getItemFilters(), 0, 107, 20).setEnableHandler(() -> detector.getNode().getType() == IType.ITEMS)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java index 297013dba..f88ee69b5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java @@ -4,11 +4,11 @@ import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileDiskDrive; import com.raoulvdberge.refinedstorage.tile.config.IType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerDiskDrive extends ContainerBase { - public ContainerDiskDrive(TileDiskDrive diskDrive, EntityPlayer player) { + public ContainerDiskDrive(TileDiskDrive diskDrive, PlayerEntity player) { super(diskDrive, player); int x = 80; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java index 53fd4085c..29d9290a6 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java @@ -4,11 +4,11 @@ import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; import com.raoulvdberge.refinedstorage.tile.config.IType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerDiskManipulator extends ContainerBase { - public ContainerDiskManipulator(TileDiskManipulator diskManipulator, EntityPlayer player) { + public ContainerDiskManipulator(TileDiskManipulator diskManipulator, PlayerEntity player) { super(diskManipulator, player); for (int i = 0; i < 4; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java index d130dd427..8cf6a1d25 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java @@ -4,11 +4,11 @@ import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileExporter; import com.raoulvdberge.refinedstorage.tile.config.IType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerExporter extends ContainerBase { - public ContainerExporter(TileExporter exporter, EntityPlayer player) { + public ContainerExporter(TileExporter exporter, PlayerEntity player) { super(exporter, player); for (int i = 0; i < 4; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java index 3de954b5a..741719124 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java @@ -4,10 +4,10 @@ import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileExternalStorage; import com.raoulvdberge.refinedstorage.tile.config.IType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; public class ContainerExternalStorage extends ContainerBase { - public ContainerExternalStorage(TileExternalStorage externalStorage, EntityPlayer player) { + public ContainerExternalStorage(TileExternalStorage externalStorage, PlayerEntity player) { super(externalStorage, player); for (int i = 0; i < 9; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFilter.java index 71c3fa724..d7a6d1e91 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFilter.java @@ -9,13 +9,13 @@ import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterIcon; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterItems; import com.raoulvdberge.refinedstorage.item.ItemFilter; import com.raoulvdberge.refinedstorage.tile.config.IType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; public class ContainerFilter extends ContainerBase { private ItemStack stack; - public ContainerFilter(EntityPlayer player, ItemStack stack) { + public ContainerFilter(PlayerEntity player, ItemStack stack) { super(null, player); this.stack = stack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidAmount.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidAmount.java index 4800bc7c8..0c078dc59 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidAmount.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidAmount.java @@ -2,11 +2,11 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluidDisabled; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.fluids.FluidStack; public class ContainerFluidAmount extends ContainerBase { - public ContainerFluidAmount(EntityPlayer player, FluidStack stack) { + public ContainerFluidAmount(PlayerEntity player, FluidStack stack) { super(null, player); FluidInventory inventory = new FluidInventory(1); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java index dc98b8733..6643d1929 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java @@ -3,11 +3,11 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerFluidInterface extends ContainerBase { - public ContainerFluidInterface(TileFluidInterface fluidInterface, EntityPlayer player) { + public ContainerFluidInterface(TileFluidInterface fluidInterface, PlayerEntity player) { super(fluidInterface, player); for (int i = 0; i < 4; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java index deba07971..8a18e3d7c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java @@ -2,10 +2,10 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileFluidStorage; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; public class ContainerFluidStorage extends ContainerBase { - public ContainerFluidStorage(TileFluidStorage fluidStorage, EntityPlayer player) { + public ContainerFluidStorage(TileFluidStorage fluidStorage, PlayerEntity player) { super(fluidStorage, player); for (int i = 0; i < 9; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java index ce6c9c88c..599b240f5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java @@ -21,8 +21,8 @@ import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -40,7 +40,7 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene private SlotGridCraftingResult craftingResultSlot; private SlotLegacyBase patternResultSlot; - public ContainerGrid(IGrid grid, IResizableDisplay display, @Nullable TileBase gridTile, EntityPlayer player) { + public ContainerGrid(IGrid grid, IResizableDisplay display, @Nullable TileBase gridTile, PlayerEntity player) { super(gridTile, player); this.grid = grid; @@ -85,13 +85,13 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene IFluidGridHandler fluidHandler = grid.getFluidHandler(); if (fluidHandler != null) { - slot.putStack(fluidHandler.onShiftClick((EntityPlayerMP) getPlayer(), stack)); + slot.putStack(fluidHandler.onShiftClick((ServerPlayerEntity) getPlayer(), stack)); } } else { IItemGridHandler itemHandler = grid.getItemHandler(); if (itemHandler != null) { - slot.putStack(itemHandler.onShiftClick((EntityPlayerMP) getPlayer(), stack)); + slot.putStack(itemHandler.onShiftClick((ServerPlayerEntity) getPlayer(), stack)); } else if (slot instanceof SlotGridCrafting && mergeItemStack(stack, 14, 14 + (9 * 4), false)) { slot.onSlotChanged(); @@ -213,9 +213,9 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene if (slot instanceof SlotGridCrafting || slot == craftingResultSlot || slot == patternResultSlot) { for (IContainerListener listener : listeners) { - // @Volatile: We can't use IContainerListener#sendSlotContents since EntityPlayerMP blocks SlotCrafting changes... - if (listener instanceof EntityPlayerMP) { - ((EntityPlayerMP) listener).connection.sendPacket(new SPacketSetSlot(windowId, i, slot.getStack())); + // @Volatile: We can't use IContainerListener#sendSlotContents since ServerPlayerEntity blocks SlotCrafting changes... + if (listener instanceof ServerPlayerEntity) { + ((ServerPlayerEntity) listener).connection.sendPacket(new SPacketSetSlot(windowId, i, slot.getStack())); } } } @@ -236,7 +236,7 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene cache = null; } } else if (listener == null) { // The grid came online. - listener = grid.createListener((EntityPlayerMP) getPlayer()); + listener = grid.createListener((ServerPlayerEntity) getPlayer()); cache = grid.getStorageCache(); cache.addListener(listener); @@ -247,7 +247,7 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene } @Override - public void onContainerClosed(EntityPlayer player) { + public void onContainerClosed(PlayerEntity player) { super.onContainerClosed(player); if (!player.getEntityWorld().isRemote) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java index 5541b7324..ee3b4f5c1 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java @@ -4,11 +4,11 @@ import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileImporter; import com.raoulvdberge.refinedstorage.tile.config.IType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerImporter extends ContainerBase { - public ContainerImporter(TileImporter importer, EntityPlayer player) { + public ContainerImporter(TileImporter importer, PlayerEntity player) { super(importer, player); for (int i = 0; i < 4; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java index acce99767..53a398ed2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java @@ -3,11 +3,11 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.container.slot.SlotOutput; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.tile.TileInterface; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerInterface extends ContainerBase { - public ContainerInterface(TileInterface tile, EntityPlayer player) { + public ContainerInterface(TileInterface tile, PlayerEntity player) { super(tile, player); for (int i = 0; i < 9; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java index 31cd21497..46e978dc1 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java @@ -1,11 +1,11 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerNetworkTransmitter extends ContainerBase { - public ContainerNetworkTransmitter(TileNetworkTransmitter networkTransmitter, EntityPlayer player) { + public ContainerNetworkTransmitter(TileNetworkTransmitter networkTransmitter, PlayerEntity player) { super(networkTransmitter, player); addSlotToContainer(new SlotItemHandler(networkTransmitter.getNode().getNetworkCard(), 0, 8, 20)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerReaderWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerReaderWriter.java index aed9b347f..3662fe4f6 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerReaderWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerReaderWriter.java @@ -6,14 +6,14 @@ import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterMan import com.raoulvdberge.refinedstorage.apiimpl.network.node.IGuiReaderWriter; import com.raoulvdberge.refinedstorage.network.MessageReaderWriterUpdate; import com.raoulvdberge.refinedstorage.tile.TileBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; public class ContainerReaderWriter extends ContainerBase implements IReaderWriterListener { private IGuiReaderWriter readerWriter; private boolean addedListener; - public ContainerReaderWriter(IGuiReaderWriter readerWriter, TileBase tile, EntityPlayer player) { + public ContainerReaderWriter(IGuiReaderWriter readerWriter, TileBase tile, PlayerEntity player) { super(tile, player); this.readerWriter = readerWriter; @@ -42,7 +42,7 @@ public class ContainerReaderWriter extends ContainerBase implements IReaderWrite } @Override - public void onContainerClosed(EntityPlayer player) { + public void onContainerClosed(PlayerEntity player) { super.onContainerClosed(player); IReaderWriterManager manager = readerWriter.getNetwork() == null ? null : readerWriter.getNetwork().getReaderWriterManager(); @@ -58,6 +58,6 @@ public class ContainerReaderWriter extends ContainerBase implements IReaderWrite @Override public void onChanged() { - RS.INSTANCE.network.sendTo(new MessageReaderWriterUpdate(readerWriter.getNetwork().getReaderWriterManager().getChannels()), (EntityPlayerMP) getPlayer()); + RS.INSTANCE.network.sendTo(new MessageReaderWriterUpdate(readerWriter.getNetwork().getReaderWriterManager().getChannels()), (ServerPlayerEntity) getPlayer()); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerRelay.java index ea6a96979..8fcd4e63d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerRelay.java @@ -1,10 +1,10 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.tile.TileRelay; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; public class ContainerRelay extends ContainerBase { - public ContainerRelay(TileRelay relay, EntityPlayer player) { + public ContainerRelay(TileRelay relay, PlayerEntity player) { super(relay, player); addPlayerInventory(8, 50); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerSecurityManager.java index 1dee26c13..6c32b7808 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerSecurityManager.java @@ -1,11 +1,11 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.tile.TileSecurityManager; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerSecurityManager extends ContainerBase { - public ContainerSecurityManager(TileSecurityManager securityManager, EntityPlayer player) { + public ContainerSecurityManager(TileSecurityManager securityManager, PlayerEntity player) { super(securityManager, player); int x = 8; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java index 6f418e0a9..083328917 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java @@ -2,10 +2,10 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.tile.TileStorage; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; public class ContainerStorage extends ContainerBase { - public ContainerStorage(TileStorage storage, EntityPlayer player) { + public ContainerStorage(TileStorage storage, PlayerEntity player) { super(storage, player); for (int i = 0; i < 9; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorageMonitor.java index 60706fab5..c9cb21370 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorageMonitor.java @@ -2,10 +2,10 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.tile.TileStorageMonitor; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; public class ContainerStorageMonitor extends ContainerBase { - public ContainerStorageMonitor(TileStorageMonitor storageMonitor, EntityPlayer player) { + public ContainerStorageMonitor(TileStorageMonitor storageMonitor, PlayerEntity player) { super(storageMonitor, player); addSlotToContainer(new SlotFilter(storageMonitor.getNode().getItemFilters(), 0, 80, 20)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java index 959418de4..ba599d144 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java @@ -1,11 +1,11 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; public class ContainerWirelessTransmitter extends ContainerBase { - public ContainerWirelessTransmitter(TileWirelessTransmitter wirelessTransmitter, EntityPlayer player) { + public ContainerWirelessTransmitter(TileWirelessTransmitter wirelessTransmitter, PlayerEntity player) { super(wirelessTransmitter, player); for (int i = 0; i < 4; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java index 44d2f26e4..dde94ba77 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.container.slot.grid; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.container.ContainerGrid; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; @@ -12,7 +12,7 @@ public class SlotGridCraftingResult extends SlotCrafting { private ContainerGrid container; private IGrid grid; - public SlotGridCraftingResult(ContainerGrid container, EntityPlayer player, IGrid grid, int inventoryIndex, int x, int y) { + public SlotGridCraftingResult(ContainerGrid container, PlayerEntity player, IGrid grid, int inventoryIndex, int x, int y) { super(player, grid.getCraftingMatrix(), grid.getCraftingResult(), inventoryIndex, x, y); this.container = container; @@ -21,7 +21,7 @@ public class SlotGridCraftingResult extends SlotCrafting { @Override @Nonnull - public ItemStack onTake(EntityPlayer player, @Nonnull ItemStack stack) { + public ItemStack onTake(PlayerEntity player, @Nonnull ItemStack stack) { onCrafting(stack); if (!player.getEntityWorld().isRemote) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyFilter.java index f90c076e8..faf122e3d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyFilter.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.container.slot.legacy; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -13,7 +13,7 @@ public class SlotLegacyFilter extends SlotLegacyBase { } @Override - public boolean canTakeStack(EntityPlayer player) { + public boolean canTakeStack(PlayerEntity player) { return false; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiAmount.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiAmount.java index cb0d24535..e00e8bcec 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiAmount.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiAmount.java @@ -4,7 +4,7 @@ import com.google.common.primitives.Ints; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.container.ContainerAmount; import com.raoulvdberge.refinedstorage.network.MessageSlotFilterSet; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; @@ -13,7 +13,7 @@ public class GuiAmount extends GuiAmountSpecifying { private ItemStack stack; private int maxAmount; - public GuiAmount(GuiBase parent, EntityPlayer player, int containerSlot, ItemStack stack, int maxAmount) { + public GuiAmount(GuiBase parent, PlayerEntity player, int containerSlot, ItemStack stack, int maxAmount) { super(parent, new ContainerAmount(player, stack), 172, 99); this.containerSlot = containerSlot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java index a329b9934..0b70d7255 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java @@ -19,7 +19,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -67,7 +67,7 @@ public class GuiCraftingPreview extends GuiBase { public GuiCraftingPreview(GuiScreen parent, List stacks, int hash, int quantity, boolean fluids) { super(new Container() { @Override - public boolean canInteractWith(EntityPlayer player) { + public boolean canInteractWith(PlayerEntity player) { return false; } }, 254, 201); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidAmount.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidAmount.java index c57036aea..e8903072f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidAmount.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidAmount.java @@ -4,7 +4,7 @@ import com.google.common.primitives.Ints; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.container.ContainerFluidAmount; import com.raoulvdberge.refinedstorage.network.MessageSlotFilterFluidSetAmount; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.fluids.FluidStack; public class GuiFluidAmount extends GuiAmountSpecifying { @@ -12,7 +12,7 @@ public class GuiFluidAmount extends GuiAmountSpecifying { private FluidStack stack; private int maxAmount; - public GuiFluidAmount(GuiBase parent, EntityPlayer player, int containerSlot, FluidStack stack, int maxAmount) { + public GuiFluidAmount(GuiBase parent, PlayerEntity player, int containerSlot, FluidStack stack, int maxAmount) { super(parent, new ContainerFluidAmount(player, stack), 172, 99); this.containerSlot = containerSlot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java index 7d18490cc..5bc697d0a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.container.*; import com.raoulvdberge.refinedstorage.tile.*; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.TileCraftingMonitor; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; @@ -16,7 +16,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { - private Container getContainer(int ID, EntityPlayer player, TileEntity tile) { + private Container getContainer(int ID, PlayerEntity player, TileEntity tile) { switch (ID) { case RSGui.CONTROLLER: return new ContainerController((TileController) tile, player); @@ -68,7 +68,7 @@ public class GuiHandler implements IGuiHandler { } @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + public Object getServerGuiElement(int ID, PlayerEntity player, World world, int x, int y, int z) { if (ID == RSGui.FILTER) { return getFilterContainer(player, x); } else if (ID == RSGui.WIRELESS_CRAFTING_MONITOR) { @@ -79,7 +79,7 @@ public class GuiHandler implements IGuiHandler { } @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + public Object getClientGuiElement(int ID, PlayerEntity player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); switch (ID) { @@ -142,11 +142,11 @@ public class GuiHandler implements IGuiHandler { } } - private WirelessCraftingMonitor getWirelessCraftingMonitor(EntityPlayer player, int invIndex) { + private WirelessCraftingMonitor getWirelessCraftingMonitor(PlayerEntity player, int invIndex) { return new WirelessCraftingMonitor(player.inventory.getStackInSlot(invIndex)); } - private GuiCraftingMonitor getWirelessCraftingMonitorGui(EntityPlayer player, int invIndex) { + private GuiCraftingMonitor getWirelessCraftingMonitorGui(PlayerEntity player, int invIndex) { WirelessCraftingMonitor craftingMonitor = getWirelessCraftingMonitor(player, invIndex); GuiCraftingMonitor gui = new GuiCraftingMonitor(null, craftingMonitor); @@ -154,11 +154,11 @@ public class GuiHandler implements IGuiHandler { return gui; } - private ContainerCraftingMonitor getCraftingMonitorContainer(EntityPlayer player, int invIndex) { + private ContainerCraftingMonitor getCraftingMonitorContainer(PlayerEntity player, int invIndex) { return new ContainerCraftingMonitor(getWirelessCraftingMonitor(player, invIndex), null, player); } - private ContainerFilter getFilterContainer(EntityPlayer player, int hand) { + private ContainerFilter getFilterContainer(PlayerEntity player, int hand) { return new ContainerFilter(player, player.getHeldItem(EnumHand.values()[hand])); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java index 3cb7edbed..3ff713d16 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.gui; import com.google.common.primitives.Ints; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Container; import org.apache.commons.lang3.tuple.Pair; @@ -13,7 +13,7 @@ public class GuiPriority extends GuiAmountSpecifying { public GuiPriority(GuiBase parent, TileDataParameter priority) { super(parent, new Container() { @Override - public boolean canInteractWith(EntityPlayer player) { + public boolean canInteractWith(PlayerEntity player) { return false; } }, 164, 92); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGridCraftingSettings.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGridCraftingSettings.java index 18c46f106..a376ef4fc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGridCraftingSettings.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGridCraftingSettings.java @@ -8,13 +8,13 @@ import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackFluid; import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack; import com.raoulvdberge.refinedstorage.network.MessageGridCraftingPreview; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.fluids.Fluid; public class GuiGridCraftingSettings extends GuiAmountSpecifying { private IGridStack stack; - public GuiGridCraftingSettings(GuiBase parent, EntityPlayer player, IGridStack stack) { + public GuiGridCraftingSettings(GuiBase parent, PlayerEntity player, IGridStack stack) { super(parent, new ContainerCraftingSettings(player, stack), 172, 99); this.stack = stack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java index 4d015c2ec..660c99ca7 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java @@ -9,7 +9,7 @@ public final class IntegrationCraftingTweaks { } public static void register() { - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); tag.setString("ContainerClass", ContainerGrid.class.getName()); tag.setString("ValidContainerPredicate", ValidContainerPredicate.class.getName()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ItemEnergyForge.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ItemEnergyForge.java index 3d548dacb..936a510dc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ItemEnergyForge.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ItemEnergyForge.java @@ -22,7 +22,7 @@ public class ItemEnergyForge extends EnergyStorage { if (received > 0 && !simulate) { if (!stack.hasTag()) { - stack.setTag(new CompoundNBT()); + stack.put(new CompoundNBT()); } stack.getTag().putInt(NBT_ENERGY, getEnergyStored()); @@ -37,7 +37,7 @@ public class ItemEnergyForge extends EnergyStorage { if (extracted > 0 && !simulate) { if (!stack.hasTag()) { - stack.setTag(new CompoundNBT()); + stack.put(new CompoundNBT()); } stack.getTag().putInt(NBT_ENERGY, getEnergyStored()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ReaderWriterHandlerForgeEnergy.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ReaderWriterHandlerForgeEnergy.java index 880a285dc..a3b257a52 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ReaderWriterHandlerForgeEnergy.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ReaderWriterHandlerForgeEnergy.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReader; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandler; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IWriter; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; @@ -58,7 +58,7 @@ public class ReaderWriterHandlerForgeEnergy implements IReaderWriterHandler { private EnergyStorage storage; private EnergyStorageReaderWriter storageReader, storageWriter; - public ReaderWriterHandlerForgeEnergy(@Nullable NBTTagCompound tag) { + public ReaderWriterHandlerForgeEnergy(@Nullable CompoundNBT tag) { this.storage = new EnergyStorage(RS.INSTANCE.config.readerWriterChannelEnergyCapacity); this.storageReader = new EnergyStorageReaderWriter(storage, false, true); this.storageWriter = new EnergyStorageReaderWriter(storage, true, false); @@ -128,8 +128,8 @@ public class ReaderWriterHandlerForgeEnergy implements IReaderWriterHandler { } @Override - public NBTTagCompound writeToNbt(NBTTagCompound tag) { - tag.setInteger(NBT_ENERGY_STORED, storage.getEnergyStored()); + public CompoundNBT writeToNbt(CompoundNBT tag) { + tag.putInt(NBT_ENERGY_STORED, storage.getEnergyStored()); return tag; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java index a40ce41a3..c41aa67c9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java @@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.tile.TileNode; import com.rwtema.funkylocomotion.api.IMoveFactory; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -24,24 +24,24 @@ public class MoveFactoryNetworkNode implements IMoveFactory { private static final String NBT_TILE = "Tile"; @Override - public NBTTagCompound destroyBlock(World world, BlockPos pos) { + public CompoundNBT destroyBlock(World world, BlockPos pos) { INetworkNodeManager manager = API.instance().getNetworkNodeManager(world); INetworkNode node = manager.getNode(pos); TileNode tile = (TileNode) world.getTileEntity(pos); - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); - tag.setInteger(NBT_DIRECTION, tile.getDirection().ordinal()); - tag.setTag(NBT_NODE, node.write(new NBTTagCompound())); + tag.putInt(NBT_DIRECTION, tile.getDirection().ordinal()); + tag.put(NBT_NODE, node.write(new CompoundNBT())); tag.setString(NBT_NODE_ID, node.getId()); // Funky Locomotion requires this IBlockState state = world.getBlockState(pos); tag.setString(NBT_BLOCK, Block.REGISTRY.getNameForObject(state.getBlock()).toString()); - tag.setInteger(NBT_META, state.getBlock().getMetaFromState(state)); - tag.setTag(NBT_TILE, tile.writeToNBT(new NBTTagCompound())); + tag.putInt(NBT_META, state.getBlock().getMetaFromState(state)); + tag.put(NBT_TILE, tile.writeToNBT(new CompoundNBT())); manager.removeNode(pos); // Avoid inventory dropping manager.markForSaving(); @@ -51,8 +51,8 @@ public class MoveFactoryNetworkNode implements IMoveFactory { @Override @SuppressWarnings("deprecation") - public boolean recreateBlock(World world, BlockPos pos, NBTTagCompound tag) { - NetworkNode node = (NetworkNode) API.instance().getNetworkNodeRegistry().get(tag.getString(NBT_NODE_ID)).create(tag.getCompoundTag(NBT_NODE), world, pos); + public boolean recreateBlock(World world, BlockPos pos, CompoundNBT tag) { + NetworkNode node = (NetworkNode) API.instance().getNetworkNodeRegistry().get(tag.getString(NBT_NODE_ID)).create(tag.getCompound(NBT_NODE), world, pos); node.setThrottlingDisabled(); INetworkNodeManager manager = API.instance().getNetworkNodeManager(world); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java index 937602a20..9cda174b8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java @@ -13,7 +13,7 @@ import mezz.jei.api.recipe.VanillaRecipeCategoryUid; import mezz.jei.api.recipe.transfer.IRecipeTransferError; import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -45,7 +45,7 @@ public class RecipeTransferHandlerGrid implements IRecipeTransferHandler { } @Override - public IRecipeTransferError transferRecipe(Container container, IRecipeLayout recipeLayout, EntityPlayer player, boolean maxTransfer, boolean doTransfer) { + public IRecipeTransferError transferRecipe(Container container, IRecipeLayout recipeLayout, PlayerEntity player, boolean maxTransfer, boolean doTransfer) { IGrid grid = ((ContainerGrid) container).getGrid(); if (doTransfer) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventory.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventory.java index 00b33d22a..7d3ba4453 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventory.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.inventory.fluid; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nullable; @@ -61,26 +61,26 @@ public class FluidInventory { updateEmptyState(); } - public NBTTagCompound writeToNbt() { - NBTTagCompound tag = new NBTTagCompound(); + public CompoundNBT writeToNbt() { + CompoundNBT tag = new CompoundNBT(); for (int i = 0; i < getSlots(); ++i) { FluidStack stack = getFluid(i); if (stack != null) { - tag.setTag(String.format(NBT_SLOT, i), stack.writeToNBT(new NBTTagCompound())); + tag.put(String.format(NBT_SLOT, i), stack.writeToNBT(new CompoundNBT())); } } return tag; } - public void readFromNbt(NBTTagCompound tag) { + public void readFromNbt(CompoundNBT tag) { for (int i = 0; i < getSlots(); ++i) { String key = String.format(NBT_SLOT, i); if (tag.hasKey(key)) { - fluids[i] = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag(key)); + fluids[i] = FluidStack.loadFluidStackFromNBT(tag.getCompound(key)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilter.java index 2de1f6264..18c73f3ef 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilter.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.inventory.fluid; import com.raoulvdberge.refinedstorage.item.ItemFilter; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.FluidStack; @@ -12,14 +12,14 @@ public class FluidInventoryFilter extends FluidInventory { this.listener = slot -> { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - stack.getTagCompound().setTag(ItemFilter.NBT_FLUID_FILTERS, writeToNbt()); + stack.getTagCompound().put(ItemFilter.NBT_FLUID_FILTERS, writeToNbt()); }; if (stack.hasTagCompound() && stack.getTagCompound().hasKey(ItemFilter.NBT_FLUID_FILTERS)) { - readFromNbt(stack.getTagCompound().getCompoundTag(ItemFilter.NBT_FLUID_FILTERS)); + readFromNbt(stack.getTagCompound().getCompound(ItemFilter.NBT_FLUID_FILTERS)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilterIcon.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilterIcon.java index 75c2653fc..645ea9f66 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilterIcon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilterIcon.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.inventory.fluid; import com.raoulvdberge.refinedstorage.item.ItemFilter; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fluids.FluidStack; public class FluidInventoryFilterIcon extends FluidInventory { @@ -11,7 +11,7 @@ public class FluidInventoryFilterIcon extends FluidInventory { this.listener = slot -> { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } ItemFilter.setFluidIcon(stack, getFluid(slot)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerBase.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerBase.java index 1d69bf8d9..628418d96 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerBase.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.inventory.item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.items.ItemStackHandler; import javax.annotation.Nonnull; @@ -56,7 +56,7 @@ public class ItemHandlerBase extends ItemStackHandler { } @Override - public void deserializeNBT(NBTTagCompound tag) { + public void deserializeNBT(CompoundNBT tag) { super.deserializeNBT(tag); this.empty = stacks.stream().allMatch(ItemStack::isEmpty); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterItems.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterItems.java index a5441ebf3..bcf5c82c3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterItems.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterItems.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.inventory.item; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraftforge.items.ItemStackHandler; @@ -24,7 +24,7 @@ public class ItemHandlerFilterItems extends ItemStackHandler { super.onContentsChanged(slot); if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } StackUtils.writeItems(this, 0, stack.getTagCompound()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCover.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCover.java index a353b81e1..210c97816 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCover.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCover.java @@ -17,12 +17,12 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -62,10 +62,10 @@ public class ItemCover extends ItemBase { public static void setItem(ItemStack cover, ItemStack item) { if (!cover.hasTagCompound()) { - cover.setTagCompound(new NBTTagCompound()); + cover.setTagCompound(new CompoundNBT()); } - cover.getTagCompound().setTag(NBT_ITEM, item.serializeNBT()); + cover.getTagCompound().put(NBT_ITEM, item.serializeNBT()); } @Nonnull @@ -74,7 +74,7 @@ public class ItemCover extends ItemBase { return ItemStack.EMPTY; } - return new ItemStack(cover.getTagCompound().getCompoundTag(NBT_ITEM)); + return new ItemStack(cover.getTagCompound().getCompound(NBT_ITEM)); } @Override @@ -128,7 +128,7 @@ public class ItemCover extends ItemBase { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java index baf40adbd..c008c9492 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java @@ -6,7 +6,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -34,7 +34,7 @@ public abstract class ItemEnergyItem extends ItemBase { } @Override - public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound tag) { + public ICapabilityProvider initCapabilities(ItemStack stack, CompoundNBT tag) { return new CapabilityProviderEnergy(stack, energyCapacity); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java index 30a723936..c9dc5bc73 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java @@ -14,9 +14,9 @@ import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; @@ -53,7 +53,7 @@ public class ItemFilter extends ItemBase { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); if (!world.isRemote) { @@ -99,10 +99,10 @@ public class ItemFilter extends ItemBase { public static void setCompare(ItemStack stack, int compare) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - stack.getTagCompound().setInteger(NBT_COMPARE, compare); + stack.getTagCompound().putInt(NBT_COMPARE, compare); } public static int getMode(ItemStack stack) { @@ -111,10 +111,10 @@ public class ItemFilter extends ItemBase { public static void setMode(ItemStack stack, int mode) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - stack.getTagCompound().setInteger(NBT_MODE, mode); + stack.getTagCompound().putInt(NBT_MODE, mode); } public static boolean isModFilter(ItemStack stack) { @@ -123,10 +123,10 @@ public class ItemFilter extends ItemBase { public static void setModFilter(ItemStack stack, boolean modFilter) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - stack.getTagCompound().setBoolean(NBT_MOD_FILTER, modFilter); + stack.getTagCompound().putBoolean(NBT_MOD_FILTER, modFilter); } public static String getName(ItemStack stack) { @@ -135,7 +135,7 @@ public class ItemFilter extends ItemBase { public static void setName(ItemStack stack, String name) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } stack.getTagCompound().setString(NBT_NAME, name); @@ -143,32 +143,32 @@ public class ItemFilter extends ItemBase { @Nonnull public static ItemStack getIcon(ItemStack stack) { - return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_ICON) ? new ItemStack(stack.getTagCompound().getCompoundTag(NBT_ICON)) : ItemStack.EMPTY; + return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_ICON) ? new ItemStack(stack.getTagCompound().getCompound(NBT_ICON)) : ItemStack.EMPTY; } public static void setIcon(ItemStack stack, ItemStack icon) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - stack.getTagCompound().setTag(NBT_ICON, icon.serializeNBT()); + stack.getTagCompound().put(NBT_ICON, icon.serializeNBT()); } public static void setFluidIcon(ItemStack stack, @Nullable FluidStack icon) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } if (icon == null) { stack.getTagCompound().removeTag(NBT_FLUID_ICON); } else { - stack.getTagCompound().setTag(NBT_FLUID_ICON, icon.writeToNBT(new NBTTagCompound())); + stack.getTagCompound().put(NBT_FLUID_ICON, icon.writeToNBT(new CompoundNBT())); } } @Nullable public static FluidStack getFluidIcon(ItemStack stack) { - return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_FLUID_ICON) ? FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag(NBT_FLUID_ICON)) : null; + return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_FLUID_ICON) ? FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompound(NBT_FLUID_ICON)) : null; } public static int getType(ItemStack stack) { @@ -177,9 +177,9 @@ public class ItemFilter extends ItemBase { public static void setType(ItemStack stack, int type) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - stack.getTagCompound().setInteger(NBT_TYPE, type); + stack.getTagCompound().putInt(NBT_TYPE, type); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java index 55c589690..1fa84ff8b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java @@ -15,10 +15,10 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -120,7 +120,7 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, EnumHand hand) { ItemStack diskStack = player.getHeldItem(hand); if (!world.isRemote && player.isSneaking() && diskStack.getMetadata() != TYPE_CREATIVE) { @@ -155,7 +155,7 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid @Override public void setId(ItemStack disk, UUID id) { - disk.setTagCompound(new NBTTagCompound()); + disk.setTagCompound(new CompoundNBT()); disk.getTagCompound().setUniqueId(NBT_ID, id); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java index 485d0405d..ba541dc07 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java @@ -8,9 +8,9 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -41,16 +41,16 @@ public class ItemNetworkCard extends ItemBase { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { Block block = world.getBlockState(pos).getBlock(); if (block == RSBlocks.NETWORK_RECEIVER) { - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); - tag.setInteger(NBT_RECEIVER_X, pos.getX()); - tag.setInteger(NBT_RECEIVER_Y, pos.getY()); - tag.setInteger(NBT_RECEIVER_Z, pos.getZ()); - tag.setInteger(NBT_DIMENSION, world.provider.getDimension()); + tag.putInt(NBT_RECEIVER_X, pos.getX()); + tag.putInt(NBT_RECEIVER_Y, pos.getY()); + tag.putInt(NBT_RECEIVER_Z, pos.getZ()); + tag.putInt(NBT_DIMENSION, world.provider.getDimension()); player.getHeldItem(hand).setTagCompound(tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java index d5a89c061..b1f3c4383 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java @@ -8,9 +8,9 @@ import com.raoulvdberge.refinedstorage.render.IModelRegistration; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; @@ -43,7 +43,7 @@ public abstract class ItemNetworkItem extends ItemEnergyItem implements INetwork } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); if (!world.isRemote) { @@ -79,22 +79,22 @@ public abstract class ItemNetworkItem extends ItemEnergyItem implements INetwork } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); Block block = world.getBlockState(pos).getBlock(); if (block == RSBlocks.CONTROLLER) { - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (tag == null) { - tag = new NBTTagCompound(); + tag = new CompoundNBT(); } - tag.setInteger(NBT_CONTROLLER_X, pos.getX()); - tag.setInteger(NBT_CONTROLLER_Y, pos.getY()); - tag.setInteger(NBT_CONTROLLER_Z, pos.getZ()); - tag.setInteger(NBT_DIMENSION_ID, player.dimension); + tag.putInt(NBT_CONTROLLER_X, pos.getX()); + tag.putInt(NBT_CONTROLLER_Y, pos.getY()); + tag.putInt(NBT_CONTROLLER_Z, pos.getZ()); + tag.putInt(NBT_DIMENSION_ID, player.dimension); stack.setTagCompound(tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java index a64dd4550..5fbd4969e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java @@ -17,9 +17,9 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; @@ -106,10 +106,10 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider { public static void setInputSlot(ItemStack pattern, int slot, ItemStack stack) { if (!pattern.hasTagCompound()) { - pattern.setTagCompound(new NBTTagCompound()); + pattern.setTagCompound(new CompoundNBT()); } - pattern.getTagCompound().setTag(String.format(NBT_INPUT_SLOT, slot), stack.serializeNBT()); + pattern.getTagCompound().put(String.format(NBT_INPUT_SLOT, slot), stack.serializeNBT()); } @Nullable @@ -120,7 +120,7 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider { return null; } - ItemStack stack = new ItemStack(pattern.getTagCompound().getCompoundTag(id)); + ItemStack stack = new ItemStack(pattern.getTagCompound().getCompound(id)); if (stack.isEmpty()) { return null; } @@ -130,10 +130,10 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider { public static void setOutputSlot(ItemStack pattern, int slot, ItemStack stack) { if (!pattern.hasTagCompound()) { - pattern.setTagCompound(new NBTTagCompound()); + pattern.setTagCompound(new CompoundNBT()); } - pattern.getTagCompound().setTag(String.format(NBT_OUTPUT_SLOT, slot), stack.serializeNBT()); + pattern.getTagCompound().put(String.format(NBT_OUTPUT_SLOT, slot), stack.serializeNBT()); } @Nullable @@ -144,7 +144,7 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider { return null; } - ItemStack stack = new ItemStack(pattern.getTagCompound().getCompoundTag(id)); + ItemStack stack = new ItemStack(pattern.getTagCompound().getCompound(id)); if (stack.isEmpty()) { return null; } @@ -154,10 +154,10 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider { public static void setFluidInputSlot(ItemStack pattern, int slot, FluidStack stack) { if (!pattern.hasTagCompound()) { - pattern.setTagCompound(new NBTTagCompound()); + pattern.setTagCompound(new CompoundNBT()); } - pattern.getTagCompound().setTag(String.format(NBT_FLUID_INPUT_SLOT, slot), stack.writeToNBT(new NBTTagCompound())); + pattern.getTagCompound().put(String.format(NBT_FLUID_INPUT_SLOT, slot), stack.writeToNBT(new CompoundNBT())); } @Nullable @@ -168,15 +168,15 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider { return null; } - return FluidStack.loadFluidStackFromNBT(pattern.getTagCompound().getCompoundTag(id)); + return FluidStack.loadFluidStackFromNBT(pattern.getTagCompound().getCompound(id)); } public static void setFluidOutputSlot(ItemStack pattern, int slot, FluidStack stack) { if (!pattern.hasTagCompound()) { - pattern.setTagCompound(new NBTTagCompound()); + pattern.setTagCompound(new CompoundNBT()); } - pattern.getTagCompound().setTag(String.format(NBT_FLUID_OUTPUT_SLOT, slot), stack.writeToNBT(new NBTTagCompound())); + pattern.getTagCompound().put(String.format(NBT_FLUID_OUTPUT_SLOT, slot), stack.writeToNBT(new CompoundNBT())); } @Nullable @@ -187,7 +187,7 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider { return null; } - return FluidStack.loadFluidStackFromNBT(pattern.getTagCompound().getCompoundTag(id)); + return FluidStack.loadFluidStackFromNBT(pattern.getTagCompound().getCompound(id)); } public static boolean isProcessing(ItemStack pattern) { @@ -196,10 +196,10 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider { public static void setProcessing(ItemStack pattern, boolean processing) { if (!pattern.hasTagCompound()) { - pattern.setTagCompound(new NBTTagCompound()); + pattern.setTagCompound(new CompoundNBT()); } - pattern.getTagCompound().setBoolean(NBT_PROCESSING, processing); + pattern.getTagCompound().putBoolean(NBT_PROCESSING, processing); } public static boolean isOredict(ItemStack pattern) { @@ -208,22 +208,22 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider { public static void setOredict(ItemStack pattern, boolean oredict) { if (!pattern.hasTagCompound()) { - pattern.setTagCompound(new NBTTagCompound()); + pattern.setTagCompound(new CompoundNBT()); } - pattern.getTagCompound().setBoolean(NBT_OREDICT, oredict); + pattern.getTagCompound().putBoolean(NBT_OREDICT, oredict); } public static void setVersion(ItemStack pattern) { if (!pattern.hasTagCompound()) { - pattern.setTagCompound(new NBTTagCompound()); + pattern.setTagCompound(new CompoundNBT()); } pattern.getTagCompound().setString(NBT_VERSION, RS.VERSION); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, EnumHand hand) { if (!world.isRemote && player.isSneaking()) { return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RSItems.PATTERN, player.getHeldItem(hand).getCount())); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java index 0f1c9beac..cd36ecaf9 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java @@ -7,9 +7,9 @@ import com.raoulvdberge.refinedstorage.render.IModelRegistration; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; @@ -42,11 +42,11 @@ public class ItemSecurityCard extends ItemBase { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); if (!world.isRemote) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); stack.getTagCompound().setString(NBT_OWNER, player.getGameProfile().getId().toString()); stack.getTagCompound().setString(NBT_OWNER_NAME, player.getGameProfile().getName()); @@ -76,10 +76,10 @@ public class ItemSecurityCard extends ItemBase { public static void setPermission(ItemStack stack, Permission permission, boolean state) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - stack.getTagCompound().setBoolean(String.format(NBT_PERMISSION, permission.getId()), state); + stack.getTagCompound().putBoolean(String.format(NBT_PERMISSION, permission.getId()), state); } public static boolean isValid(ItemStack stack) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java index 25f02416a..80f4478bf 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java @@ -15,10 +15,10 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -121,7 +121,7 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, EnumHand hand) { ItemStack diskStack = player.getHeldItem(hand); if (!world.isRemote && player.isSneaking() && diskStack.getMetadata() != TYPE_CREATIVE) { @@ -156,7 +156,7 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider { @Override public void setId(ItemStack disk, UUID id) { - disk.setTagCompound(new NBTTagCompound()); + disk.setTagCompound(new CompoundNBT()); disk.getTagCompound().setUniqueId(NBT_ID, id); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessCraftingMonitor.java index 7b18bd590..8e8359a92 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessCraftingMonitor.java @@ -8,9 +8,9 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.item.NetworkItemWirelessC import com.raoulvdberge.refinedstorage.item.info.ItemInfo; import com.raoulvdberge.refinedstorage.render.IModelRegistration; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -33,7 +33,7 @@ public class ItemWirelessCraftingMonitor extends ItemNetworkItem { @Override @Nonnull - public INetworkItem provide(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) { + public INetworkItem provide(INetworkItemHandler handler, PlayerEntity player, ItemStack stack) { int invIndex = 0; for (int i = 0; i < player.inventory.getSizeInventory(); ++i) { if (player.inventory.getStackInSlot(i) == stack) { @@ -55,7 +55,7 @@ public class ItemWirelessCraftingMonitor extends ItemNetworkItem { public static void setTabSelected(ItemStack stack, Optional tabSelected) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } if (tabSelected.isPresent()) { @@ -76,9 +76,9 @@ public class ItemWirelessCraftingMonitor extends ItemNetworkItem { public static void setTabPage(ItemStack stack, int tabPage) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - stack.getTagCompound().setInteger(NBT_TAB_PAGE, tabPage); + stack.getTagCompound().putInt(NBT_TAB_PAGE, tabPage); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java index 1b1ca0161..f1851bc4e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java @@ -9,7 +9,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; import com.raoulvdberge.refinedstorage.item.info.ItemInfo; import com.raoulvdberge.refinedstorage.render.IModelRegistration; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -29,7 +29,7 @@ public class ItemWirelessFluidGrid extends ItemNetworkItem { @Override @Nonnull - public INetworkItem provide(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) { + public INetworkItem provide(INetworkItemHandler handler, PlayerEntity player, ItemStack stack) { return new NetworkItemWirelessFluidGrid(handler, player, stack); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java index 6c2689df5..cf99759e4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java @@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.item.info.IItemInfo; import com.raoulvdberge.refinedstorage.item.info.ItemInfo; import com.raoulvdberge.refinedstorage.render.IModelRegistration; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -34,7 +34,7 @@ public class ItemWirelessGrid extends ItemNetworkItem { @Override @Nonnull - public INetworkItem provide(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) { + public INetworkItem provide(INetworkItemHandler handler, PlayerEntity player, ItemStack stack) { return new NetworkItemWirelessGrid(handler, player, stack); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java index c39cfeaed..6a65e50bb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java @@ -14,7 +14,7 @@ import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -40,7 +40,7 @@ public class ItemWrench extends ItemBase { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) { return EnumActionResult.FAIL; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java index b061e75ab..11f20a954 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.item.itemblock; import com.raoulvdberge.refinedstorage.block.BlockBase; import com.raoulvdberge.refinedstorage.tile.TileBase; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -42,7 +42,7 @@ public class ItemBlockBase extends ItemBlock { } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { + public boolean placeBlockAt(ItemStack stack, PlayerEntity player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { boolean result = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState); if (result && block.getDirection() != null) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockController.java index eca9573cb..7dedee285 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockController.java @@ -6,9 +6,9 @@ import com.raoulvdberge.refinedstorage.block.enums.ControllerType; import com.raoulvdberge.refinedstorage.tile.TileController; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -51,20 +51,20 @@ public class ItemBlockController extends ItemBlockBase { } @Override - public void onCreated(ItemStack stack, World world, EntityPlayer player) { + public void onCreated(ItemStack stack, World world, PlayerEntity player) { super.onCreated(stack, world, player); createStack(stack, 0); } public static ItemStack createStack(ItemStack stack, int energy) { - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (tag == null) { - tag = new NBTTagCompound(); + tag = new CompoundNBT(); } - tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == ControllerType.CREATIVE.getId() ? RS.INSTANCE.config.controllerCapacity : energy); + tag.putInt(TileController.NBT_ENERGY, stack.getMetadata() == ControllerType.CREATIVE.getId() ? RS.INSTANCE.config.controllerCapacity : energy); stack.setTagCompound(tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockEnergyItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockEnergyItem.java index e23b4291b..ae5168ebb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockEnergyItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockEnergyItem.java @@ -6,7 +6,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -33,7 +33,7 @@ public abstract class ItemBlockEnergyItem extends ItemBlockBase { } @Override - public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound tag) { + public ICapabilityProvider initCapabilities(ItemStack stack, CompoundNBT tag) { return new CapabilityProviderEnergy(stack, energyCapacity); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockFluidStorage.java index ad692114e..a65638043 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockFluidStorage.java @@ -13,7 +13,7 @@ import com.raoulvdberge.refinedstorage.item.ItemProcessor; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; @@ -55,7 +55,7 @@ public class ItemBlockFluidStorage extends ItemBlockBase { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, EnumHand hand) { ItemStack storageStack = player.getHeldItem(hand); if (!world.isRemote && player.isSneaking() && storageStack.getMetadata() != ItemFluidStorageDisk.TYPE_CREATIVE) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockPortableGrid.java index bc5bc9931..82dd92fa3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockPortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockPortableGrid.java @@ -7,8 +7,8 @@ import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid; import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; @@ -26,11 +26,11 @@ public class ItemBlockPortableGrid extends ItemBlockEnergyItem { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); if (!world.isRemote) { - API.instance().getGridManager().openGrid(PortableGrid.ID, (EntityPlayerMP) player, stack); + API.instance().getGridManager().openGrid(PortableGrid.ID, (ServerPlayerEntity) player, stack); } return ActionResult.newResult(EnumActionResult.SUCCESS, stack); @@ -44,7 +44,7 @@ public class ItemBlockPortableGrid extends ItemBlockEnergyItem { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) { return EnumActionResult.FAIL; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockStorage.java index 45a481978..4d064cb18 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockStorage.java @@ -13,7 +13,7 @@ import com.raoulvdberge.refinedstorage.item.ItemStorageDisk; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; @@ -55,7 +55,7 @@ public class ItemBlockStorage extends ItemBlockBase { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, EnumHand hand) { ItemStack storageStack = player.getHeldItem(hand); if (!world.isRemote && player.isSneaking() && storageStack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerRequestSlotData.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerRequestSlotData.java index f995c0728..5551ee1a0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerRequestSlotData.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerRequestSlotData.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.container.ContainerCrafterManager; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.IContainerListener; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; @@ -16,7 +16,7 @@ public class MessageCrafterManagerRequestSlotData extends MessageHandlerPlayerTo } @Override - protected void handle(MessageCrafterManagerRequestSlotData message, EntityPlayerMP player) { + protected void handle(MessageCrafterManagerRequestSlotData message, ServerPlayerEntity player) { if (player.openContainer instanceof ContainerCrafterManager) { for (IContainerListener listener : ((ContainerCrafterManager) player.openContainer).getListeners()) { if (listener instanceof ContainerCrafterManager.CrafterManagerListener) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java index 3ba40d6e5..81dc03b9b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.container.ContainerCraftingMonitor; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; @@ -35,7 +35,7 @@ public class MessageCraftingMonitorCancel extends MessageHandlerPlayerToServer implements IMessage { @@ -56,7 +56,7 @@ public class MessageGridSettingsUpdate extends MessageHandlerPlayerToServer implements IMessageHandler { @Override public IMessage onMessage(final T message, MessageContext context) { - final EntityPlayerMP player = context.getServerHandler().player; + final ServerPlayerEntity player = context.getServerHandler().player; player.getServerWorld().addScheduledTask(() -> handle(message, player)); return null; } - protected abstract void handle(T message, EntityPlayerMP player); + protected abstract void handle(T message, ServerPlayerEntity player); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageNetworkItemOpen.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageNetworkItemOpen.java index 0faaa97e7..930b38060 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageNetworkItemOpen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageNetworkItemOpen.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.item.ItemNetworkItem; import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; @@ -21,7 +21,7 @@ public class MessageNetworkItemOpen extends MessageHandlerPlayerToServer message.stack.getMaxStackSize()) { return; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSetFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSetFluid.java index 7e40e1860..f37f5dad5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSetFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSetFluid.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.util.StackUtils; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraftforge.fluids.FluidStack; @@ -23,7 +23,7 @@ public class MessageSlotFilterSetFluid extends MessageHandlerPlayerToServer { } @Override - public void readUpdate(NBTTagCompound tag) { + public void readUpdate(CompoundNBT tag) { getNode().setPowered(tag.getBoolean(NBT_POWERED)); super.readUpdate(tag); } @Override - public NBTTagCompound writeUpdate(NBTTagCompound tag) { + public CompoundNBT writeUpdate(CompoundNBT tag) { super.writeUpdate(tag); - tag.setBoolean(NBT_POWERED, getNode().isPowered()); + tag.putBoolean(NBT_POWERED, getNode().isPowered()); return tag; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java index 20162a71d..428fc2c96 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.render.constants.ConstantsDisk; import com.raoulvdberge.refinedstorage.tile.config.*; import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -83,7 +83,7 @@ public class TileDiskDrive extends TileNode { } @Override - public NBTTagCompound writeUpdate(NBTTagCompound tag) { + public CompoundNBT writeUpdate(CompoundNBT tag) { super.writeUpdate(tag); writeDiskState(tag, 8, getNode().canUpdate(), getNode().getItemDisks(), getNode().getFluidDisks()); @@ -92,7 +92,7 @@ public class TileDiskDrive extends TileNode { } @Override - public void readUpdate(NBTTagCompound tag) { + public void readUpdate(CompoundNBT tag) { super.readUpdate(tag); readDiskState(tag, diskState); @@ -102,7 +102,7 @@ public class TileDiskDrive extends TileNode { return diskState; } - public static void writeDiskState(NBTTagCompound tag, int disks, boolean connected, IStorageDisk[] itemStorages, IStorageDisk[] fluidStorages) { + public static void writeDiskState(CompoundNBT tag, int disks, boolean connected, IStorageDisk[] itemStorages, IStorageDisk[] fluidStorages) { for (int i = 0; i < disks; ++i) { int state = ConstantsDisk.DISK_STATE_NONE; @@ -117,11 +117,11 @@ public class TileDiskDrive extends TileNode { } } - tag.setInteger(String.format(NBT_DISK_STATE, i), state); + tag.putInt(String.format(NBT_DISK_STATE, i), state); } } - public static void readDiskState(NBTTagCompound tag, Integer[] diskState) { + public static void readDiskState(CompoundNBT tag, Integer[] diskState) { for (int i = 0; i < diskState.length; ++i) { diskState[i] = tag.getInteger(String.format(NBT_DISK_STATE, i)); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java index df08deacd..0587eabc0 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.IFilterable; import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -37,7 +37,7 @@ public class TileDiskManipulator extends TileNode { } @Override - public NBTTagCompound writeUpdate(NBTTagCompound tag) { + public CompoundNBT writeUpdate(CompoundNBT tag) { super.writeUpdate(tag); TileDiskDrive.writeDiskState(tag, 6, getNode().canUpdate(), getNode().getItemDisks(), getNode().getFluidDisks()); @@ -46,7 +46,7 @@ public class TileDiskManipulator extends TileNode { } @Override - public void readUpdate(NBTTagCompound tag) { + public void readUpdate(CompoundNBT tag) { super.readUpdate(tag); TileDiskDrive.readDiskState(tag, diskState); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java index 2874df82d..032bdbb93 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java @@ -12,7 +12,7 @@ import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable; import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import com.raoulvdberge.refinedstorage.tile.direction.DirectionHandlerNetworkNode; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -47,23 +47,23 @@ public abstract class TileNode extends TileBase implement getNode().setRedstoneMode(mode); } - public NBTTagCompound writeUpdate(NBTTagCompound tag) { + public CompoundNBT writeUpdate(CompoundNBT tag) { super.writeUpdate(tag); if (getNode() instanceof ICoverable) { - tag.setTag(NBT_COVERS, ((ICoverable) getNode()).getCoverManager().writeToNbt()); + tag.put(NBT_COVERS, ((ICoverable) getNode()).getCoverManager().writeToNbt()); } - tag.setBoolean(NBT_ACTIVE, getNode().canUpdate()); + tag.putBoolean(NBT_ACTIVE, getNode().canUpdate()); return tag; } - public void readUpdate(NBTTagCompound tag) { + public void readUpdate(CompoundNBT tag) { super.readUpdate(tag); if (getNode() instanceof ICoverable && tag.hasKey(NBT_COVERS)) { - ((ICoverable) getNode()).getCoverManager().readFromNbt(tag.getTagList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); + ((ICoverable) getNode()).getCoverManager().readFromNbt(tag.getList(NBT_COVERS, Constants.NBT.TAG_COMPOUND)); } getNode().setActive(tag.getBoolean(NBT_ACTIVE)); @@ -72,7 +72,7 @@ public abstract class TileNode extends TileBase implement private EnumFacing directionToMigrate; @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); OneSixMigrationHelper.removalHook(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java index 33c5e545a..0c736ee22 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeStorageMo import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -36,30 +36,30 @@ public class TileStorageMonitor extends TileNode { } @Override - public NBTTagCompound writeUpdate(NBTTagCompound tag) { + public CompoundNBT writeUpdate(CompoundNBT tag) { super.writeUpdate(tag); ItemStack stack = getNode().getItemFilters().getStackInSlot(0); if (!stack.isEmpty()) { - tag.setTag(NBT_STACK, stack.writeToNBT(new NBTTagCompound())); + tag.put(NBT_STACK, stack.writeToNBT(new CompoundNBT())); } - tag.setInteger(NBT_AMOUNT, getNode().getAmount()); + tag.putInt(NBT_AMOUNT, getNode().getAmount()); return tag; } @Override - public void readUpdate(NBTTagCompound tag) { + public void readUpdate(CompoundNBT tag) { super.readUpdate(tag); - itemStack = tag.hasKey(NBT_STACK) ? new ItemStack(tag.getCompoundTag(NBT_STACK)) : null; + itemStack = tag.hasKey(NBT_STACK) ? new ItemStack(tag.getCompound(NBT_STACK)) : null; amount = tag.getInteger(NBT_AMOUNT); } @Override - protected boolean canCauseRenderUpdate(NBTTagCompound tag) { + protected boolean canCauseRenderUpdate(CompoundNBT tag) { EnumFacing receivedDirection = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION)); boolean receivedActive = tag.getBoolean(NBT_ACTIVE); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/RedstoneMode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/RedstoneMode.java index df75d22c0..8b1592d3a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/RedstoneMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/RedstoneMode.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.tile.config; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -25,11 +25,11 @@ public enum RedstoneMode { } } - public void write(NBTTagCompound tag) { - tag.setInteger(NBT, ordinal()); + public void write(CompoundNBT tag) { + tag.putInt(NBT, ordinal()); } - public static RedstoneMode read(NBTTagCompound tag) { + public static RedstoneMode read(CompoundNBT tag) { if (tag.hasKey(RedstoneMode.NBT)) { return getById(tag.getInteger(NBT)); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java index b263868af..2c05d732b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java @@ -4,8 +4,8 @@ import com.google.common.base.Optional; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import javax.annotation.Nullable; import java.util.Collection; @@ -16,7 +16,7 @@ public interface ICraftingMonitor { String getGuiTitle(); - void onCancelled(EntityPlayerMP player, @Nullable UUID id); + void onCancelled(ServerPlayerEntity player, @Nullable UUID id); TileDataParameter getRedstoneModeParameter(); @@ -27,7 +27,7 @@ public interface ICraftingMonitor { boolean isActive(); - void onClosed(EntityPlayer player); + void onClosed(PlayerEntity player); Optional getTabSelected(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java index 1fb44a4e7..6535796d1 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java @@ -8,8 +8,8 @@ import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.item.ItemWirelessCraftingMonitor; import com.raoulvdberge.refinedstorage.network.MessageWirelessCraftingMonitorSettings; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -43,7 +43,7 @@ public class WirelessCraftingMonitor implements ICraftingMonitor { } @Override - public void onCancelled(EntityPlayerMP player, @Nullable UUID id) { + public void onCancelled(ServerPlayerEntity player, @Nullable UUID id) { INetwork network = getNetwork(); if (network != null) { @@ -101,7 +101,7 @@ public class WirelessCraftingMonitor implements ICraftingMonitor { } @Override - public void onClosed(EntityPlayer player) { + public void onClosed(PlayerEntity player) { INetwork network = getNetwork(); if (network != null) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java index 93cd92433..3c59e2e2a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java @@ -2,16 +2,16 @@ package com.raoulvdberge.refinedstorage.tile.data; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.network.MessageTileDataParameter; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; public class TileDataWatcher { private boolean sentInitial; - private EntityPlayerMP player; + private ServerPlayerEntity player; private TileDataManager manager; private Object[] cache; - public TileDataWatcher(EntityPlayerMP player, TileDataManager manager) { + public TileDataWatcher(ServerPlayerEntity player, TileDataManager manager) { this.player = player; this.manager = manager; @@ -21,7 +21,7 @@ public class TileDataWatcher { } } - public EntityPlayerMP getPlayer() { + public ServerPlayerEntity getPlayer() { return player; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerNetworkNode.java index 9709c8b33..25c129e5a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerNetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerNetworkNode.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.tile.direction; import com.raoulvdberge.refinedstorage.tile.TileNode; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; public class DirectionHandlerNetworkNode implements IDirectionHandler { @@ -22,12 +22,12 @@ public class DirectionHandlerNetworkNode implements IDirectionHandler { } @Override - public void writeToTileNbt(NBTTagCompound tag) { + public void writeToTileNbt(CompoundNBT tag) { // NO OP } @Override - public void readFromTileNbt(NBTTagCompound tag) { + public void readFromTileNbt(CompoundNBT tag) { // NO OP } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerTile.java index 03507a7d6..a79796a6b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerTile.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.tile.direction; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; public class DirectionHandlerTile implements IDirectionHandler { @@ -19,12 +19,12 @@ public class DirectionHandlerTile implements IDirectionHandler { } @Override - public void writeToTileNbt(NBTTagCompound tag) { - tag.setInteger(NBT_DIRECTION, direction.ordinal()); + public void writeToTileNbt(CompoundNBT tag) { + tag.putInt(NBT_DIRECTION, direction.ordinal()); } @Override - public void readFromTileNbt(NBTTagCompound tag) { + public void readFromTileNbt(CompoundNBT tag) { if (tag.hasKey(NBT_DIRECTION)) { direction = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION)); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/IDirectionHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/IDirectionHandler.java index 9ebf93916..e744a40d1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/IDirectionHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/IDirectionHandler.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.tile.direction; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumFacing; public interface IDirectionHandler { @@ -8,7 +8,7 @@ public interface IDirectionHandler { EnumFacing getDirection(); - void writeToTileNbt(NBTTagCompound tag); + void writeToTileNbt(CompoundNBT tag); - void readFromTileNbt(NBTTagCompound tag); + void readFromTileNbt(CompoundNBT tag); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java index 1e8fa82a8..a635e685d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -16,12 +16,12 @@ import com.raoulvdberge.refinedstorage.item.ItemWirelessFluidGrid; import com.raoulvdberge.refinedstorage.network.MessageWirelessFluidGridSettingsUpdate; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -55,7 +55,7 @@ public class WirelessFluidGrid implements IGridNetworkAware { super.onContentsChanged(slot); if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } StackUtils.writeItems(this, 0, stack.getTagCompound()); @@ -104,7 +104,7 @@ public class WirelessFluidGrid implements IGridNetworkAware { } @Override - public IStorageCacheListener createListener(EntityPlayerMP player) { + public IStorageCacheListener createListener(ServerPlayerEntity player) { return new StorageCacheListenerGridFluid(player, getNetwork()); } @@ -275,17 +275,17 @@ public class WirelessFluidGrid implements IGridNetworkAware { } @Override - public void onCrafted(EntityPlayer player) { + public void onCrafted(PlayerEntity player) { // NO OP } @Override - public void onCraftedShift(EntityPlayer player) { + public void onCraftedShift(PlayerEntity player) { // NO OP } @Override - public void onRecipeTransfer(EntityPlayer player, ItemStack[][] recipe) { + public void onRecipeTransfer(PlayerEntity player, ItemStack[][] recipe) { // NO OP } @@ -295,7 +295,7 @@ public class WirelessFluidGrid implements IGridNetworkAware { } @Override - public void onClosed(EntityPlayer player) { + public void onClosed(PlayerEntity player) { INetwork network = getNetwork(); if (network != null) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java index 440d63b4a..8dfb16c66 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java @@ -16,12 +16,12 @@ import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid; import com.raoulvdberge.refinedstorage.network.MessageGridSettingsUpdate; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -56,7 +56,7 @@ public class WirelessGrid implements IGridNetworkAware { super.onContentsChanged(slot); if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } StackUtils.writeItems(this, 0, stack.getTagCompound()); @@ -106,7 +106,7 @@ public class WirelessGrid implements IGridNetworkAware { } @Override - public IStorageCacheListener createListener(EntityPlayerMP player) { + public IStorageCacheListener createListener(ServerPlayerEntity player) { return new StorageCacheListenerGridItem(player, getNetwork()); } @@ -281,17 +281,17 @@ public class WirelessGrid implements IGridNetworkAware { } @Override - public void onCrafted(EntityPlayer player) { + public void onCrafted(PlayerEntity player) { // NO OP } @Override - public void onCraftedShift(EntityPlayer player) { + public void onCraftedShift(PlayerEntity player) { // NO OP } @Override - public void onRecipeTransfer(EntityPlayer player, ItemStack[][] recipe) { + public void onRecipeTransfer(PlayerEntity player, ItemStack[][] recipe) { // NO OP } @@ -301,7 +301,7 @@ public class WirelessGrid implements IGridNetworkAware { } @Override - public void onClosed(EntityPlayer player) { + public void onClosed(PlayerEntity player) { INetwork network = getNetwork(); if (network != null) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java index 8b9055d75..3ea65101f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java @@ -31,12 +31,12 @@ import com.raoulvdberge.refinedstorage.item.itemblock.ItemBlockPortableGrid; import com.raoulvdberge.refinedstorage.network.MessageGridSettingsUpdate; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.common.util.Constants; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -61,7 +61,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer private ItemGridHandlerPortable itemHandler = new ItemGridHandlerPortable(this, this); private FluidGridHandlerPortable fluidHandler = new FluidGridHandlerPortable(this); - private EntityPlayer player; + private PlayerEntity player; private ItemStack stack; private int sortingType; @@ -71,8 +71,8 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer private int tabPage; private int size; - private StorageTrackerItem storageTracker = new StorageTrackerItem(() -> stack.getTagCompound().setTag(NBT_STORAGE_TRACKER, getItemStorageTracker().serializeNbt())); - private StorageTrackerFluid fluidStorageTracker = new StorageTrackerFluid(() -> stack.getTagCompound().setTag(NBT_FLUID_STORAGE_TRACKER, getFluidStorageTracker().serializeNbt())); + private StorageTrackerItem storageTracker = new StorageTrackerItem(() -> stack.getTagCompound().put(NBT_STORAGE_TRACKER, getItemStorageTracker().serializeNbt())); + private StorageTrackerFluid fluidStorageTracker = new StorageTrackerFluid(() -> stack.getTagCompound().put(NBT_FLUID_STORAGE_TRACKER, getFluidStorageTracker().serializeNbt())); private List filters = new ArrayList<>(); private List tabs = new ArrayList<>(); @@ -82,7 +82,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer super.onContentsChanged(slot); if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } StackUtils.writeItems(this, 0, stack.getTagCompound()); @@ -132,7 +132,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer } }; - public PortableGrid(EntityPlayer player, ItemStack stack) { + public PortableGrid(PlayerEntity player, ItemStack stack) { this.player = player; this.stack = stack; @@ -146,15 +146,15 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer } if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } if (stack.getTagCompound().hasKey(NBT_STORAGE_TRACKER)) { - storageTracker.readFromNbt(stack.getTagCompound().getTagList(NBT_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); + storageTracker.readFromNbt(stack.getTagCompound().getList(NBT_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); } if (stack.getTagCompound().hasKey(NBT_FLUID_STORAGE_TRACKER)) { - fluidStorageTracker.readFromNbt(stack.getTagCompound().getTagList(NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); + fluidStorageTracker.readFromNbt(stack.getTagCompound().getList(NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); } StackUtils.readItems(disk, 4, stack.getTagCompound()); @@ -205,7 +205,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer return disk; } - public EntityPlayer getPlayer() { + public PlayerEntity getPlayer() { return player; } @@ -221,7 +221,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer } @Override - public IStorageCacheListener createListener(EntityPlayerMP player) { + public IStorageCacheListener createListener(ServerPlayerEntity player) { return getGridType() == GridType.FLUID ? new StorageCacheListenerGridPortableFluid(this, player) : new StorageCacheListenerGridPortable(this, player); } @@ -392,22 +392,22 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer } @Override - public void onCrafted(EntityPlayer player) { + public void onCrafted(PlayerEntity player) { // NO OP } @Override - public void onCraftedShift(EntityPlayer player) { + public void onCraftedShift(PlayerEntity player) { // NO OP } @Override - public void onRecipeTransfer(EntityPlayer player, ItemStack[][] recipe) { + public void onRecipeTransfer(PlayerEntity player, ItemStack[][] recipe) { // NO OP } @Override - public void onClosed(EntityPlayer player) { + public void onClosed(PlayerEntity player) { if (!player.getEntityWorld().isRemote) { StackUtils.writeItems(disk, 4, stack.getTagCompound()); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java index 142e0207f..edeec8029 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java @@ -41,13 +41,13 @@ import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; @@ -149,7 +149,7 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, private StorageTrackerItem storageTracker = new StorageTrackerItem(this::markDirty); private StorageTrackerFluid fluidStorageTracker = new StorageTrackerFluid(this::markDirty); - private NBTTagList enchants = null; + private ListNBT enchants = null; public TilePortableGrid() { dataManager.addWatchedParameter(REDSTONE_MODE); @@ -241,15 +241,15 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, this.redstoneMode = RedstoneMode.read(stack.getTagCompound()); if (stack.getTagCompound().hasKey(PortableGrid.NBT_STORAGE_TRACKER)) { - storageTracker.readFromNbt(stack.getTagCompound().getTagList(PortableGrid.NBT_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); + storageTracker.readFromNbt(stack.getTagCompound().getList(PortableGrid.NBT_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); } if (stack.getTagCompound().hasKey(PortableGrid.NBT_FLUID_STORAGE_TRACKER)) { - fluidStorageTracker.readFromNbt(stack.getTagCompound().getTagList(PortableGrid.NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); + fluidStorageTracker.readFromNbt(stack.getTagCompound().getList(PortableGrid.NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); } if (stack.getTagCompound().hasKey(NBT_ENCHANTMENTS)) { - enchants = stack.getTagCompound().getTagList(NBT_ENCHANTMENTS, Constants.NBT.TAG_COMPOUND); + enchants = stack.getTagCompound().getList(NBT_ENCHANTMENTS, Constants.NBT.TAG_COMPOUND); } } @@ -265,20 +265,20 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, public ItemStack getAsItem() { ItemStack stack = new ItemStack(RSBlocks.PORTABLE_GRID, 1, getPortableType() == PortableGridType.NORMAL ? ItemBlockPortableGrid.TYPE_NORMAL : ItemBlockPortableGrid.TYPE_CREATIVE); - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); - stack.getTagCompound().setInteger(NetworkNodeGrid.NBT_SORTING_DIRECTION, sortingDirection); - stack.getTagCompound().setInteger(NetworkNodeGrid.NBT_SORTING_TYPE, sortingType); - stack.getTagCompound().setInteger(NetworkNodeGrid.NBT_SEARCH_BOX_MODE, searchBoxMode); - stack.getTagCompound().setInteger(NetworkNodeGrid.NBT_SIZE, size); - stack.getTagCompound().setInteger(NetworkNodeGrid.NBT_TAB_SELECTED, tabSelected); - stack.getTagCompound().setInteger(NetworkNodeGrid.NBT_TAB_PAGE, tabPage); + stack.getTagCompound().putInt(NetworkNodeGrid.NBT_SORTING_DIRECTION, sortingDirection); + stack.getTagCompound().putInt(NetworkNodeGrid.NBT_SORTING_TYPE, sortingType); + stack.getTagCompound().putInt(NetworkNodeGrid.NBT_SEARCH_BOX_MODE, searchBoxMode); + stack.getTagCompound().putInt(NetworkNodeGrid.NBT_SIZE, size); + stack.getTagCompound().putInt(NetworkNodeGrid.NBT_TAB_SELECTED, tabSelected); + stack.getTagCompound().putInt(NetworkNodeGrid.NBT_TAB_PAGE, tabPage); - stack.getTagCompound().setTag(PortableGrid.NBT_STORAGE_TRACKER, storageTracker.serializeNbt()); - stack.getTagCompound().setTag(PortableGrid.NBT_FLUID_STORAGE_TRACKER, fluidStorageTracker.serializeNbt()); + stack.getTagCompound().put(PortableGrid.NBT_STORAGE_TRACKER, storageTracker.serializeNbt()); + stack.getTagCompound().put(PortableGrid.NBT_FLUID_STORAGE_TRACKER, fluidStorageTracker.serializeNbt()); if (enchants != null) { - stack.getTagCompound().setTag(NBT_ENCHANTMENTS, enchants); + stack.getTagCompound().put(NBT_ENCHANTMENTS, enchants); } stack.getCapability(CapabilityEnergy.ENERGY, null).receiveEnergy(energyStorage.getEnergyStored(), false); @@ -310,7 +310,7 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, } @Override - public IStorageCacheListener createListener(EntityPlayerMP player) { + public IStorageCacheListener createListener(ServerPlayerEntity player) { return getServerGridType() == GridType.FLUID ? new StorageCacheListenerGridPortableFluid(this, player) : new StorageCacheListenerGridPortable(this, player); } @@ -483,22 +483,22 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, } @Override - public void onCrafted(EntityPlayer player) { + public void onCrafted(PlayerEntity player) { // NO OP } @Override - public void onCraftedShift(EntityPlayer player) { + public void onCraftedShift(PlayerEntity player) { // NO OP } @Override - public void onRecipeTransfer(EntityPlayer player, ItemStack[][] recipe) { + public void onRecipeTransfer(PlayerEntity player, ItemStack[][] recipe) { // NO OP } @Override - public void onClosed(EntityPlayer player) { + public void onClosed(PlayerEntity player) { // NO OP } @@ -592,35 +592,35 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, } @Override - public NBTTagCompound write(NBTTagCompound tag) { + public CompoundNBT write(CompoundNBT tag) { super.write(tag); - tag.setInteger(NetworkNodeGrid.NBT_SORTING_DIRECTION, sortingDirection); - tag.setInteger(NetworkNodeGrid.NBT_SORTING_TYPE, sortingType); - tag.setInteger(NetworkNodeGrid.NBT_SEARCH_BOX_MODE, searchBoxMode); - tag.setInteger(NetworkNodeGrid.NBT_SIZE, size); - tag.setInteger(NetworkNodeGrid.NBT_TAB_SELECTED, tabSelected); - tag.setInteger(NetworkNodeGrid.NBT_TAB_PAGE, tabPage); + tag.putInt(NetworkNodeGrid.NBT_SORTING_DIRECTION, sortingDirection); + tag.putInt(NetworkNodeGrid.NBT_SORTING_TYPE, sortingType); + tag.putInt(NetworkNodeGrid.NBT_SEARCH_BOX_MODE, searchBoxMode); + tag.putInt(NetworkNodeGrid.NBT_SIZE, size); + tag.putInt(NetworkNodeGrid.NBT_TAB_SELECTED, tabSelected); + tag.putInt(NetworkNodeGrid.NBT_TAB_PAGE, tabPage); StackUtils.writeItems(disk, 0, tag); StackUtils.writeItems(filter, 1, tag); - tag.setInteger(NBT_ENERGY, energyStorage.getEnergyStored()); + tag.putInt(NBT_ENERGY, energyStorage.getEnergyStored()); redstoneMode.write(tag); - tag.setTag(NBT_STORAGE_TRACKER, storageTracker.serializeNbt()); - tag.setTag(NBT_FLUID_STORAGE_TRACKER, fluidStorageTracker.serializeNbt()); + tag.put(NBT_STORAGE_TRACKER, storageTracker.serializeNbt()); + tag.put(NBT_FLUID_STORAGE_TRACKER, fluidStorageTracker.serializeNbt()); if (enchants != null) { - tag.setTag(NBT_ENCHANTMENTS, enchants); + tag.put(NBT_ENCHANTMENTS, enchants); } return tag; } @Override - public void read(NBTTagCompound tag) { + public void read(CompoundNBT tag) { super.read(tag); if (tag.hasKey(NetworkNodeGrid.NBT_SORTING_DIRECTION)) { @@ -657,15 +657,15 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, redstoneMode = RedstoneMode.read(tag); if (tag.hasKey(NBT_STORAGE_TRACKER)) { - storageTracker.readFromNbt(tag.getTagList(NBT_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); + storageTracker.readFromNbt(tag.getList(NBT_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); } if (tag.hasKey(NBT_FLUID_STORAGE_TRACKER)) { - fluidStorageTracker.readFromNbt(tag.getTagList(NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); + fluidStorageTracker.readFromNbt(tag.getList(NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); } if (tag.hasKey(NBT_ENCHANTMENTS)) { - enchants = tag.getTagList(NBT_ENCHANTMENTS, Constants.NBT.TAG_COMPOUND); + enchants = tag.getList(NBT_ENCHANTMENTS, Constants.NBT.TAG_COMPOUND); } } @@ -680,16 +680,16 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, } @Override - public NBTTagCompound writeUpdate(NBTTagCompound tag) { - tag.setInteger(NBT_DISK_STATE, diskState.getId()); - tag.setBoolean(NBT_CONNECTED, getEnergy() != 0); - tag.setInteger(NBT_TYPE, getServerGridType().ordinal()); + public CompoundNBT writeUpdate(CompoundNBT tag) { + tag.putInt(NBT_DISK_STATE, diskState.getId()); + tag.putBoolean(NBT_CONNECTED, getEnergy() != 0); + tag.putInt(NBT_TYPE, getServerGridType().ordinal()); return super.writeUpdate(tag); } @Override - public void readUpdate(NBTTagCompound tag) { + public void readUpdate(CompoundNBT tag) { super.readUpdate(tag); diskState = PortableGridDiskState.getById(tag.getInteger(NBT_DISK_STATE)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/AccessTypeUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/AccessTypeUtils.java index 9bbab2900..6327ae78f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/AccessTypeUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/AccessTypeUtils.java @@ -1,16 +1,16 @@ package com.raoulvdberge.refinedstorage.util; import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; public final class AccessTypeUtils { private static final String NBT_ACCESS_TYPE = "AccessType"; - public static void writeAccessType(NBTTagCompound tag, AccessType type) { - tag.setInteger(NBT_ACCESS_TYPE, type.getId()); + public static void writeAccessType(CompoundNBT tag, AccessType type) { + tag.putInt(NBT_ACCESS_TYPE, type.getId()); } - public static AccessType readAccessType(NBTTagCompound tag) { + public static AccessType readAccessType(CompoundNBT tag) { return tag.hasKey(NBT_ACCESS_TYPE) ? getAccessType(tag.getInteger(NBT_ACCESS_TYPE)) : AccessType.INSERT_EXTRACT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java index 3bdaeb693..1b56c0e20 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java @@ -9,8 +9,8 @@ import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.Fluid; @@ -116,74 +116,74 @@ public final class StackUtils { } } - public static void writeItems(IItemHandler handler, int id, NBTTagCompound tag, Function serializer) { - NBTTagList tagList = new NBTTagList(); + public static void writeItems(IItemHandler handler, int id, CompoundNBT tag, Function serializer) { + ListNBT tagList = new ListNBT(); for (int i = 0; i < handler.getSlots(); i++) { if (!handler.getStackInSlot(i).isEmpty()) { - NBTTagCompound stackTag = serializer.apply(handler.getStackInSlot(i)); + CompoundNBT stackTag = serializer.apply(handler.getStackInSlot(i)); - stackTag.setInteger(NBT_SLOT, i); + stackTag.putInt(NBT_SLOT, i); - tagList.appendTag(stackTag); + tagList.add(stackTag); } } - tag.setTag(String.format(NBT_INVENTORY, id), tagList); + tag.put(String.format(NBT_INVENTORY, id), tagList); } - public static void writeItems(IItemHandler handler, int id, NBTTagCompound tag) { - writeItems(handler, id, tag, stack -> stack.writeToNBT(new NBTTagCompound())); + public static void writeItems(IItemHandler handler, int id, CompoundNBT tag) { + writeItems(handler, id, tag, stack -> stack.writeToNBT(new CompoundNBT())); } - public static void readItems(IItemHandlerModifiable handler, int id, NBTTagCompound tag, Function deserializer) { + public static void readItems(IItemHandlerModifiable handler, int id, CompoundNBT tag, Function deserializer) { String name = String.format(NBT_INVENTORY, id); if (tag.hasKey(name)) { - NBTTagList tagList = tag.getTagList(name, Constants.NBT.TAG_COMPOUND); + ListNBT tagList = tag.getList(name, Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < tagList.tagCount(); i++) { - int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT); + for (int i = 0; i < tagList.size(); i++) { + int slot = tagList.getCompound(i).getInteger(NBT_SLOT); if (slot >= 0 && slot < handler.getSlots()) { - handler.setStackInSlot(slot, deserializer.apply(tagList.getCompoundTagAt(i))); + handler.setStackInSlot(slot, deserializer.apply(tagList.getCompound(i))); } } } } - public static void readItems(IItemHandlerModifiable handler, int id, NBTTagCompound tag) { + public static void readItems(IItemHandlerModifiable handler, int id, CompoundNBT tag) { readItems(handler, id, tag, ItemStack::new); } - public static void writeItems(IInventory inventory, int id, NBTTagCompound tag) { - NBTTagList tagList = new NBTTagList(); + public static void writeItems(IInventory inventory, int id, CompoundNBT tag) { + ListNBT tagList = new ListNBT(); for (int i = 0; i < inventory.getSizeInventory(); i++) { if (!inventory.getStackInSlot(i).isEmpty()) { - NBTTagCompound stackTag = new NBTTagCompound(); + CompoundNBT stackTag = new CompoundNBT(); - stackTag.setInteger(NBT_SLOT, i); + stackTag.putInt(NBT_SLOT, i); inventory.getStackInSlot(i).writeToNBT(stackTag); - tagList.appendTag(stackTag); + tagList.add(stackTag); } } - tag.setTag(String.format(NBT_INVENTORY, id), tagList); + tag.put(String.format(NBT_INVENTORY, id), tagList); } - public static void readItems(IInventory inventory, int id, NBTTagCompound tag) { + public static void readItems(IInventory inventory, int id, CompoundNBT tag) { String name = String.format(NBT_INVENTORY, id); if (tag.hasKey(name)) { - NBTTagList tagList = tag.getTagList(name, Constants.NBT.TAG_COMPOUND); + ListNBT tagList = tag.getList(name, Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < tagList.tagCount(); i++) { - int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT); + for (int i = 0; i < tagList.size(); i++) { + int slot = tagList.getCompound(i).getInteger(NBT_SLOT); - ItemStack stack = new ItemStack(tagList.getCompoundTagAt(i)); + ItemStack stack = new ItemStack(tagList.getCompound(i)); if (!stack.isEmpty()) { inventory.setInventorySlotContents(slot, stack); @@ -198,7 +198,7 @@ public final class StackUtils { public static FluidStack copy(FluidStack stack, int size) { FluidStack copy = stack.copy(); - copy.amount = size; + copy.setAmount(size); return copy; } @@ -229,23 +229,23 @@ public final class StackUtils { private static final String NBT_ITEM_NBT = "NBT"; private static final String NBT_ITEM_CAPS = "Caps"; - public static NBTTagCompound serializeStackToNbt(@Nonnull ItemStack stack) { - NBTTagCompound dummy = new NBTTagCompound(); + public static CompoundNBT serializeStackToNbt(@Nonnull ItemStack stack) { + CompoundNBT dummy = new CompoundNBT(); - NBTTagCompound itemTag = new NBTTagCompound(); + CompoundNBT itemTag = new CompoundNBT(); - itemTag.setInteger(NBT_ITEM_TYPE, Item.getIdFromItem(stack.getItem())); - itemTag.setInteger(NBT_ITEM_QUANTITY, stack.getCount()); - itemTag.setInteger(NBT_ITEM_DAMAGE, stack.getItemDamage()); + itemTag.putInt(NBT_ITEM_TYPE, Item.getIdFromItem(stack.getItem())); + itemTag.putInt(NBT_ITEM_QUANTITY, stack.getCount()); + itemTag.putInt(NBT_ITEM_DAMAGE, stack.getItemDamage()); if (stack.hasTagCompound()) { - itemTag.setTag(NBT_ITEM_NBT, stack.getTagCompound()); + itemTag.put(NBT_ITEM_NBT, stack.getTagCompound()); } stack.writeToNBT(dummy); if (dummy.hasKey("ForgeCaps")) { - itemTag.setTag(NBT_ITEM_CAPS, dummy.getTag("ForgeCaps")); + itemTag.put(NBT_ITEM_CAPS, dummy.getTag("ForgeCaps")); } dummy.removeTag("ForgeCaps"); @@ -254,15 +254,15 @@ public final class StackUtils { } @Nonnull - public static ItemStack deserializeStackFromNbt(NBTTagCompound tag) { + public static ItemStack deserializeStackFromNbt(CompoundNBT tag) { ItemStack stack = new ItemStack( Item.getItemById(tag.getInteger(NBT_ITEM_TYPE)), tag.getInteger(NBT_ITEM_QUANTITY), tag.getInteger(NBT_ITEM_DAMAGE), - tag.hasKey(NBT_ITEM_CAPS) ? tag.getCompoundTag(NBT_ITEM_CAPS) : null + tag.hasKey(NBT_ITEM_CAPS) ? tag.getCompound(NBT_ITEM_CAPS) : null ); - stack.setTagCompound(tag.hasKey(NBT_ITEM_NBT) ? tag.getCompoundTag(NBT_ITEM_NBT) : null); + stack.setTagCompound(tag.hasKey(NBT_ITEM_NBT) ? tag.getCompound(NBT_ITEM_NBT) : null); return stack; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java index a0435624d..aac2487f9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java @@ -1,11 +1,12 @@ package com.raoulvdberge.refinedstorage.util; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryHelper; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Direction; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.Style; @@ -29,7 +30,7 @@ public final class WorldUtils { } } - public static IItemHandler getItemHandler(@Nullable TileEntity tile, EnumFacing side) { + public static IItemHandler getItemHandler(@Nullable TileEntity tile, Direction side) { if (tile == null) { return null; } @@ -47,11 +48,11 @@ public final class WorldUtils { return handler; } - public static IFluidHandler getFluidHandler(@Nullable TileEntity tile, EnumFacing side) { + public static IFluidHandler getFluidHandler(@Nullable TileEntity tile, Direction side) { return (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) ? tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side) : null; } - public static void sendNoPermissionMessage(EntityPlayer player) { + public static void sendNoPermissionMessage(PlayerEntity player) { player.sendMessage(new TextComponentTranslation("misc.refinedstorage:security.no_permission").setStyle(new Style().setColor(TextFormatting.RED))); }