dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More SonarQube fixes.

Browse Source
This commit is contained in:
raoulvdberge
2020-10-17 22:28:45 +02:00
parent 3525bd3e90
commit 56bc3ae5bc
24 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java
View File

@@ -31,6 +31,7 @@ public abstract class BaseBlock extends Block {
}
protected void onDirectionChanged(World world, BlockPos pos, Direction newDirection) {
// NO OP
}
@Override

4
src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java
View File

@@ -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()));

4
src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java
View File

@@ -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<BakedQuad> 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<BakedQuad> quads = new ArrayList<>(QuadTransformer.getTransformedQuads(
connected ? baseConnected : baseDisconnected,

3
src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java
View File

@@ -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<ConstructorContainer> {
@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));

3
src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java
View File

@@ -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<CrafterManagerContainer> 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)));

3
src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java
View File

@@ -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<DestructorContainer> {
@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));

3
src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java
View File

@@ -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<DiskDriveContainer> {
title,
"gui/disk_drive.png",
DiskDriveTile.TYPE,
DiskDriveTile.REDSTONE_MODE,
NetworkNodeTile.REDSTONE_MODE,
DiskDriveTile.COMPARE,
DiskDriveTile.WHITELIST_BLACKLIST,
DiskDriveTile.PRIORITY,

3
src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java
View File

@@ -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<DiskManipulatorContainer>
@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));

3
src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java
View File

@@ -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<ExporterContainer> {
@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));

3
src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java
View File

@@ -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<ExternalStorageContaine
title,
"gui/storage.png",
ExternalStorageTile.TYPE,
ExternalStorageTile.REDSTONE_MODE,
NetworkNodeTile.REDSTONE_MODE,
ExternalStorageTile.COMPARE,
ExternalStorageTile.WHITELIST_BLACKLIST,
ExternalStorageTile.PRIORITY,

3
src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java
View File

@@ -8,6 +8,7 @@ import com.refinedmods.refinedstorage.container.FluidInterfaceContainer;
import com.refinedmods.refinedstorage.render.FluidRenderer;
import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton;
import com.refinedmods.refinedstorage.tile.FluidInterfaceTile;
import com.refinedmods.refinedstorage.tile.NetworkNodeTile;
import com.refinedmods.refinedstorage.util.RenderUtils;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.PlayerInventory;
@@ -23,7 +24,7 @@ public class FluidInterfaceScreen extends BaseScreen<FluidInterfaceContainer> {
@Override
public void onPostInit(int x, int y) {
addSideButton(new RedstoneModeSideButton(this, FluidInterfaceTile.REDSTONE_MODE));
addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE));
}
@Override

3
src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java
View File

@@ -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<FluidStorageContainer
title,
"gui/storage.png",
null,
FluidStorageTile.REDSTONE_MODE,
NetworkNodeTile.REDSTONE_MODE,
FluidStorageTile.COMPARE,
FluidStorageTile.WHITELIST_BLACKLIST,
FluidStorageTile.PRIORITY,

3
src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java
View File

@@ -8,6 +8,7 @@ import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideB
import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton;
import com.refinedmods.refinedstorage.screen.widget.sidebutton.WhitelistBlacklistSideButton;
import com.refinedmods.refinedstorage.tile.ImporterTile;
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 ImporterScreen extends BaseScreen<ImporterContainer> {
@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));

3
src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java
View File

@@ -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<InterfaceContainer> {
@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));
}

6
src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java
View File

@@ -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<NetworkTransmitterConta
@Override
public void onPostInit(int x, int y) {
addSideButton(new RedstoneModeSideButton(this, NetworkTransmitterTile.REDSTONE_MODE));
addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE));
}
@Override
public void tick(int x, int y) {
// NO OP
}
@Override
@@ -53,4 +55,4 @@ public class NetworkTransmitterScreen extends BaseScreen<NetworkTransmitterConta
renderString(matrixStack, 51, 24, text);
renderString(matrixStack, 7, 42, I18n.format("container.inventory"));
}
}
}

5
src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java
View File

@@ -4,7 +4,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.container.RelayContainer;
import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton;
import com.refinedmods.refinedstorage.tile.RelayTile;
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,11 +16,12 @@ public class RelayScreen extends BaseScreen<RelayContainer> {
@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

3
src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java
View File

@@ -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<SecurityManagerContainer>
@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;

3
src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java
View File

@@ -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<StorageContainer> {
title,
"gui/storage.png",
null,
StorageTile.REDSTONE_MODE,
NetworkNodeTile.REDSTONE_MODE,
StorageTile.COMPARE,
StorageTile.WHITELIST_BLACKLIST,
StorageTile.PRIORITY,

4
src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java
View File

@@ -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<WirelessTransmitterCon
@Override
public void onPostInit(int x, int y) {
addSideButton(new RedstoneModeSideButton(this, WirelessTransmitterTile.REDSTONE_MODE));
addSideButton(new RedstoneModeSideButton(this, NetworkNodeTile.REDSTONE_MODE));
}
@Override
public void tick(int x, int y) {
// NO OP
}
@Override

3
src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java
View File

@@ -25,6 +25,7 @@ import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget;
import com.refinedmods.refinedstorage.screen.widget.SearchWidget;
import com.refinedmods.refinedstorage.screen.widget.TabListWidget;
import com.refinedmods.refinedstorage.screen.widget.sidebutton.*;
import com.refinedmods.refinedstorage.tile.NetworkNodeTile;
import com.refinedmods.refinedstorage.tile.data.TileDataManager;
import com.refinedmods.refinedstorage.tile.grid.GridTile;
import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid;
@@ -101,7 +102,7 @@ public class GridScreen extends BaseScreen<GridContainer> 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;

5
src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java
View File

@@ -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;
}

5
src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java
View File

@@ -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);
}

5
src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java
View File

@@ -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);

5
src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java
View File

@@ -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);