From 56bc3ae5bcb2ad3aab8168731d56b210fdbc5b05 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 17 Oct 2020 22:28:45 +0200 Subject: [PATCH] More SonarQube fixes. --- .../com/refinedmods/refinedstorage/block/BaseBlock.java | 1 + .../com/refinedmods/refinedstorage/item/PatternItem.java | 4 ++-- .../render/model/DiskManipulatorBakedModel.java | 4 ++-- .../refinedstorage/screen/ConstructorScreen.java | 3 ++- .../refinedstorage/screen/CrafterManagerScreen.java | 3 ++- .../refinedmods/refinedstorage/screen/DestructorScreen.java | 3 ++- .../refinedmods/refinedstorage/screen/DiskDriveScreen.java | 3 ++- .../refinedstorage/screen/DiskManipulatorScreen.java | 3 ++- .../refinedmods/refinedstorage/screen/ExporterScreen.java | 3 ++- .../refinedstorage/screen/ExternalStorageScreen.java | 3 ++- .../refinedstorage/screen/FluidInterfaceScreen.java | 3 ++- .../refinedstorage/screen/FluidStorageBlockScreen.java | 3 ++- .../refinedmods/refinedstorage/screen/ImporterScreen.java | 3 ++- .../refinedmods/refinedstorage/screen/InterfaceScreen.java | 3 ++- .../refinedstorage/screen/NetworkTransmitterScreen.java | 6 ++++-- .../com/refinedmods/refinedstorage/screen/RelayScreen.java | 5 +++-- .../refinedstorage/screen/SecurityManagerScreen.java | 3 ++- .../refinedstorage/screen/StorageBlockScreen.java | 3 ++- .../refinedstorage/screen/WirelessTransmitterScreen.java | 4 +++- .../refinedmods/refinedstorage/screen/grid/GridScreen.java | 3 ++- .../screen/widget/sidebutton/GridSortingTypeSideButton.java | 5 ++--- .../tile/craftingmonitor/WirelessCraftingMonitor.java | 5 +++-- .../refinedstorage/tile/grid/WirelessFluidGrid.java | 5 +++-- .../refinedmods/refinedstorage/tile/grid/WirelessGrid.java | 5 +++-- 24 files changed, 54 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java index 875d5226b..3748e5fd5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java @@ -31,6 +31,7 @@ public abstract class BaseBlock extends Block { } protected void onDirectionChanged(World world, BlockPos pos, Direction newDirection) { + // NO OP } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java index 24d670761..17d69a4b8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java @@ -11,7 +11,7 @@ import com.refinedmods.refinedstorage.apiimpl.autocrafting.CraftingPatternFactor import com.refinedmods.refinedstorage.render.Styles; import com.refinedmods.refinedstorage.render.tesr.PatternItemStackTileRenderer; import com.refinedmods.refinedstorage.util.RenderUtils; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -71,7 +71,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider { ICraftingPattern pattern = fromCache(world, stack); if (pattern.isValid()) { - if (ContainerScreen.hasShiftDown() || isProcessing(stack)) { + if (Screen.hasShiftDown() || isProcessing(stack)) { tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.inputs").setStyle(Styles.YELLOW)); RenderUtils.addCombinedItemsToTooltip(tooltip, true, pattern.getInputs().stream().map(i -> !i.isEmpty() ? i.get(0) : ItemStack.EMPTY).collect(Collectors.toList())); diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java index 9b8b004a2..8b2f9edef 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java @@ -5,7 +5,7 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; -import com.refinedmods.refinedstorage.block.DiskManipulatorBlock; +import com.refinedmods.refinedstorage.block.NetworkNodeBlock; import com.refinedmods.refinedstorage.tile.DiskManipulatorTile; import com.refinedmods.refinedstorage.util.ColorMap; import net.minecraft.block.BlockState; @@ -80,7 +80,7 @@ public class DiskManipulatorBakedModel extends DelegateBakedModel { @SuppressWarnings("deprecation") public List load(CacheKey key) { Direction facing = key.state.get(RSBlocks.DISK_MANIPULATOR.get(ColorMap.DEFAULT_COLOR).get().getDirection().getProperty()); - boolean connected = key.state.get(DiskManipulatorBlock.CONNECTED); + boolean connected = key.state.get(NetworkNodeBlock.CONNECTED); List quads = new ArrayList<>(QuadTransformer.getTransformedQuads( connected ? baseConnected : baseDisconnected, diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java index 1186f3ac0..f0cd6137a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java @@ -8,6 +8,7 @@ import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButt import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; import com.refinedmods.refinedstorage.tile.ConstructorTile; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; @@ -19,7 +20,7 @@ public class ConstructorScreen extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new RedstoneModeSideButton(this, ConstructorTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE)); addSideButton(new TypeSideButton(this, ConstructorTile.TYPE)); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java index 1ed9697a4..7dafaba3c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java @@ -13,6 +13,7 @@ import com.refinedmods.refinedstorage.screen.widget.sidebutton.CrafterManagerSea import com.refinedmods.refinedstorage.screen.widget.sidebutton.GridSizeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.tile.CrafterManagerTile; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import com.refinedmods.refinedstorage.tile.data.TileDataManager; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; @@ -43,7 +44,7 @@ public class CrafterManagerScreen extends BaseScreen im @Override public void onPostInit(int x, int y) { - addSideButton(new RedstoneModeSideButton(this, CrafterManagerTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE)); addSideButton(new CrafterManagerSearchBoxModeSideButton(this)); addSideButton(new GridSizeSideButton(this, crafterManager::getSize, size -> TileDataManager.setParameter(CrafterManagerTile.SIZE, size))); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java index b6e52de1a..d0dc28e7e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java @@ -5,6 +5,7 @@ import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.container.DestructorContainer; import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; import com.refinedmods.refinedstorage.tile.DestructorTile; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; @@ -16,7 +17,7 @@ public class DestructorScreen extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new RedstoneModeSideButton(this, DestructorTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE)); addSideButton(new TypeSideButton(this, DestructorTile.TYPE)); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java index 3fcf0ce38..67f87d032 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java @@ -3,6 +3,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.matrix.MatrixStack; import com.refinedmods.refinedstorage.container.DiskDriveContainer; import com.refinedmods.refinedstorage.tile.DiskDriveTile; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; @@ -15,7 +16,7 @@ public class DiskDriveScreen extends StorageScreen { title, "gui/disk_drive.png", DiskDriveTile.TYPE, - DiskDriveTile.REDSTONE_MODE, + NetworkNodeTile.REDSTONE_MODE, DiskDriveTile.COMPARE, DiskDriveTile.WHITELIST_BLACKLIST, DiskDriveTile.PRIORITY, diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java index d336bf153..d2ab61cc9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java @@ -5,6 +5,7 @@ import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.container.DiskManipulatorContainer; import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; import com.refinedmods.refinedstorage.tile.DiskManipulatorTile; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; @@ -16,7 +17,7 @@ public class DiskManipulatorScreen extends BaseScreen @Override public void onPostInit(int x, int y) { - addSideButton(new RedstoneModeSideButton(this, DiskManipulatorTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE)); addSideButton(new IoModeSideButton(this)); addSideButton(new TypeSideButton(this, DiskManipulatorTile.TYPE)); addSideButton(new WhitelistBlacklistSideButton(this, DiskManipulatorTile.WHITELIST_BLACKLIST)); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java index f4fbabaf4..8d1cacf79 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java @@ -8,6 +8,7 @@ import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButt import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; import com.refinedmods.refinedstorage.tile.ExporterTile; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; @@ -27,7 +28,7 @@ public class ExporterScreen extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new RedstoneModeSideButton(this, ExporterTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE)); addSideButton(new TypeSideButton(this, ExporterTile.TYPE)); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java index 0961f75eb..01ae0538a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java @@ -2,6 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.refinedmods.refinedstorage.container.ExternalStorageContainer; import com.refinedmods.refinedstorage.tile.ExternalStorageTile; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; @@ -13,7 +14,7 @@ public class ExternalStorageScreen extends StorageScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new RedstoneModeSideButton(this, FluidInterfaceTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE)); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java index 9cb48c64b..7a7873baf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java @@ -2,6 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.refinedmods.refinedstorage.container.FluidStorageContainer; import com.refinedmods.refinedstorage.tile.FluidStorageTile; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; @@ -13,7 +14,7 @@ public class FluidStorageBlockScreen extends StorageScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new RedstoneModeSideButton(this, ImporterTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE)); addSideButton(new TypeSideButton(this, ImporterTile.TYPE)); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java index 598aa32d2..f027e3113 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java @@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.container.InterfaceContainer; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.tile.InterfaceTile; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; @@ -17,7 +18,7 @@ public class InterfaceScreen extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new RedstoneModeSideButton(this, InterfaceTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE)); addSideButton(new ExactModeSideButton(this, InterfaceTile.COMPARE)); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java index 756a918bf..8b4a77957 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java @@ -4,6 +4,7 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.container.NetworkTransmitterContainer; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import com.refinedmods.refinedstorage.tile.NetworkTransmitterTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -19,11 +20,12 @@ public class NetworkTransmitterScreen extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new RedstoneModeSideButton(this, RelayTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE)); } @Override public void tick(int x, int y) { + // NO OP } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java index 46330273e..d6905ff60 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java @@ -8,6 +8,7 @@ import com.refinedmods.refinedstorage.item.SecurityCardItem; import com.refinedmods.refinedstorage.network.SecurityManagerUpdateMessage; import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import com.refinedmods.refinedstorage.tile.SecurityManagerTile; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; @@ -28,7 +29,7 @@ public class SecurityManagerScreen extends BaseScreen @Override public void onPostInit(int x, int y) { - addSideButton(new RedstoneModeSideButton(this, SecurityManagerTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE)); int padding = 15; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java index 7f534abaa..08b009385 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java @@ -1,6 +1,7 @@ package com.refinedmods.refinedstorage.screen; import com.refinedmods.refinedstorage.container.StorageContainer; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import com.refinedmods.refinedstorage.tile.StorageTile; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; @@ -13,7 +14,7 @@ public class StorageBlockScreen extends StorageScreen { title, "gui/storage.png", null, - StorageTile.REDSTONE_MODE, + NetworkNodeTile.REDSTONE_MODE, StorageTile.COMPARE, StorageTile.WHITELIST_BLACKLIST, StorageTile.PRIORITY, diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java index 96d763d1d..fe0e87b05 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java @@ -4,6 +4,7 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.container.WirelessTransmitterContainer; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import com.refinedmods.refinedstorage.tile.WirelessTransmitterTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -16,11 +17,12 @@ public class WirelessTransmitterScreen extends BaseScreen implements IScreenInfo this.scrollbar = new ScrollbarWidget(this, 174, getTopHeight(), 12, (getVisibleRows() * 18) - 2); if (grid instanceof GridNetworkNode || grid instanceof PortableGridTile) { - addSideButton(new RedstoneModeSideButton(this, grid instanceof GridNetworkNode ? GridTile.REDSTONE_MODE : PortableGridTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, grid instanceof GridNetworkNode ? NetworkNodeTile.REDSTONE_MODE : PortableGridTile.REDSTONE_MODE)); } int sx = x + 80 + 1; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java index 1fdcd5e0c..f0590fe2b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java @@ -3,7 +3,6 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.matrix.MatrixStack; import com.refinedmods.refinedstorage.api.network.grid.GridType; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; import com.refinedmods.refinedstorage.container.GridContainer; import com.refinedmods.refinedstorage.integration.inventorytweaks.InventoryTweaksIntegration; import com.refinedmods.refinedstorage.screen.BaseScreen; @@ -47,13 +46,13 @@ public class GridSortingTypeSideButton extends SideButton { } } else if (type == IGrid.SORTING_TYPE_ID) { type = IGrid.SORTING_TYPE_LAST_MODIFIED; - } else if (type == GridNetworkNode.SORTING_TYPE_LAST_MODIFIED) { + } else if (type == IGrid.SORTING_TYPE_LAST_MODIFIED) { if (grid.getGridType() == GridType.FLUID || !InventoryTweaksIntegration.isLoaded()) { type = IGrid.SORTING_TYPE_QUANTITY; } else { type = IGrid.SORTING_TYPE_INVENTORYTWEAKS; } - } else if (type == GridNetworkNode.SORTING_TYPE_INVENTORYTWEAKS) { + } else if (type == IGrid.SORTING_TYPE_INVENTORYTWEAKS) { type = IGrid.SORTING_TYPE_QUANTITY; } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java index 0d4774da1..044eaba66 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java @@ -4,6 +4,7 @@ import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager; import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.item.NetworkItem; import com.refinedmods.refinedstorage.item.WirelessCraftingMonitorItem; import com.refinedmods.refinedstorage.network.craftingmonitor.WirelessCraftingMonitorSettingsUpdateMessage; import com.refinedmods.refinedstorage.tile.data.TileDataParameter; @@ -39,8 +40,8 @@ public class WirelessCraftingMonitor implements ICraftingMonitor { this.server = server; this.slotId = slotId; - this.nodeDimension = WirelessCraftingMonitorItem.getDimension(stack); - this.nodePos = new BlockPos(WirelessCraftingMonitorItem.getX(stack), WirelessCraftingMonitorItem.getY(stack), WirelessCraftingMonitorItem.getZ(stack)); + this.nodeDimension = NetworkItem.getDimension(stack); + this.nodePos = new BlockPos(NetworkItem.getX(stack), NetworkItem.getY(stack), NetworkItem.getZ(stack)); this.tabPage = WirelessCraftingMonitorItem.getTabPage(stack); this.tabSelected = WirelessCraftingMonitorItem.getTabSelected(stack); } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java index 6d9aed404..25bdb97b2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -11,6 +11,7 @@ import com.refinedmods.refinedstorage.api.util.IFilter; import com.refinedmods.refinedstorage.api.util.IStackList; import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.FluidGridStorageCacheListener; import com.refinedmods.refinedstorage.inventory.item.FilterItemHandler; +import com.refinedmods.refinedstorage.item.NetworkItem; import com.refinedmods.refinedstorage.item.WirelessFluidGridItem; import com.refinedmods.refinedstorage.network.grid.WirelessFluidGridSettingsUpdateMessage; import com.refinedmods.refinedstorage.screen.BaseScreen; @@ -64,8 +65,8 @@ public class WirelessFluidGrid implements INetworkAwareGrid { public WirelessFluidGrid(ItemStack stack, @Nullable MinecraftServer server, int slotId) { this.stack = stack; this.server = server; - this.nodeDimension = WirelessFluidGridItem.getDimension(stack); - this.nodePos = new BlockPos(WirelessFluidGridItem.getX(stack), WirelessFluidGridItem.getY(stack), WirelessFluidGridItem.getZ(stack)); + this.nodeDimension = NetworkItem.getDimension(stack); + this.nodePos = new BlockPos(NetworkItem.getX(stack), NetworkItem.getY(stack), NetworkItem.getZ(stack)); this.slotId = slotId; this.sortingType = WirelessFluidGridItem.getSortingType(stack); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java index 4a7d8c6c0..cc797265b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java @@ -11,6 +11,7 @@ import com.refinedmods.refinedstorage.api.util.IFilter; import com.refinedmods.refinedstorage.api.util.IStackList; import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.ItemGridStorageCacheListener; import com.refinedmods.refinedstorage.inventory.item.FilterItemHandler; +import com.refinedmods.refinedstorage.item.NetworkItem; import com.refinedmods.refinedstorage.item.WirelessGridItem; import com.refinedmods.refinedstorage.network.grid.WirelessGridSettingsUpdateMessage; import com.refinedmods.refinedstorage.screen.BaseScreen; @@ -65,8 +66,8 @@ public class WirelessGrid implements INetworkAwareGrid { public WirelessGrid(ItemStack stack, @Nullable MinecraftServer server, int slotId) { this.stack = stack; this.server = server; - this.nodeDimension = WirelessGridItem.getDimension(stack); - this.nodePos = new BlockPos(WirelessGridItem.getX(stack), WirelessGridItem.getY(stack), WirelessGridItem.getZ(stack)); + this.nodeDimension = NetworkItem.getDimension(stack); + this.nodePos = new BlockPos(NetworkItem.getX(stack), NetworkItem.getY(stack), NetworkItem.getZ(stack)); this.slotId = slotId; this.viewType = WirelessGridItem.getViewType(stack);