diff --git a/src/main/java/com/refinedmods/refinedstorage/RSLootFunctions.java b/src/main/java/com/refinedmods/refinedstorage/RSLootFunctions.java index e65272eb6..eb5037a24 100644 --- a/src/main/java/com/refinedmods/refinedstorage/RSLootFunctions.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSLootFunctions.java @@ -9,18 +9,34 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; public final class RSLootFunctions { - public static LootFunctionType STORAGE_BLOCK; - public static LootFunctionType PORTABLE_GRID; - public static LootFunctionType CRAFTER; - public static LootFunctionType CONTROLLER; + private static LootFunctionType storageBlock; + private static LootFunctionType portableGrid; + private static LootFunctionType crafter; + private static LootFunctionType controller; private RSLootFunctions() { } public static void register() { - STORAGE_BLOCK = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "storage_block"), new LootFunctionType(new StorageBlockLootFunction.Serializer())); - PORTABLE_GRID = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "portable_grid"), new LootFunctionType(new PortableGridBlockLootFunction.Serializer())); - CRAFTER = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "crafter"), new LootFunctionType(new CrafterLootFunction.Serializer())); - CONTROLLER = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "controller"), new LootFunctionType(new ControllerLootFunction.Serializer())); + storageBlock = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "storage_block"), new LootFunctionType(new StorageBlockLootFunction.Serializer())); + portableGrid = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "portable_grid"), new LootFunctionType(new PortableGridBlockLootFunction.Serializer())); + crafter = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "crafter"), new LootFunctionType(new CrafterLootFunction.Serializer())); + controller = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "controller"), new LootFunctionType(new ControllerLootFunction.Serializer())); + } + + public static LootFunctionType getStorageBlock() { + return storageBlock; + } + + public static LootFunctionType getPortableGrid() { + return portableGrid; + } + + public static LootFunctionType getCrafter() { + return crafter; + } + + public static LootFunctionType getController() { + return controller; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/calculator/CraftingCalculator.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/calculator/CraftingCalculator.java index c933490c3..f8ab61f0e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/calculator/CraftingCalculator.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/calculator/CraftingCalculator.java @@ -125,7 +125,7 @@ public class CraftingCalculator { } else if (node instanceof ProcessingNode) { ProcessingNode processing = (ProcessingNode) node; - calculateForFluids(qty, storageSource, fluidStorageSource, results, fluidResults, pattern, inputs, fluidsToExtract, processing); + calculateForFluids(qty, storageSource, fluidStorageSource, results, fluidResults, inputs, fluidsToExtract, processing); for (ItemStack output : pattern.getOutputs()) { results.add(output, output.getCount() * qty); @@ -241,7 +241,6 @@ public class CraftingCalculator { IStackList fluidStorageSource, IStackList results, IStackList fluidResults, - ICraftingPattern pattern, CraftingPatternInputs inputs, IStackList fluidsToExtract, ProcessingNode node) throws CraftingCalculatorException { @@ -335,22 +334,36 @@ public class CraftingCalculator { } private int getQuantityPerCraft(@Nullable ItemStack item, @Nullable FluidStack fluid, ICraftingPattern pattern) { + if (item != null) { + return getQuantityPerCraftForItem(item, pattern); + } else if (fluid != null) { + return getQuantityPerCraftForFluid(fluid, pattern); + } else { + return 0; + } + } + + private int getQuantityPerCraftForFluid(FluidStack fluid, ICraftingPattern pattern) { int qty = 0; - if (item != null) { - for (ItemStack output : pattern.getOutputs()) { - if (API.instance().getComparer().isEqualNoQuantity(output, item)) { - qty += output.getCount(); - - if (!pattern.isProcessing()) { - break; - } - } + for (FluidStack output : pattern.getFluidOutputs()) { + if (API.instance().getComparer().isEqual(output, fluid, IComparer.COMPARE_NBT)) { + qty += output.getAmount(); } - } else if (fluid != null) { - for (FluidStack output : pattern.getFluidOutputs()) { - if (API.instance().getComparer().isEqual(output, fluid, IComparer.COMPARE_NBT)) { - qty += output.getAmount(); + } + + return qty; + } + + private int getQuantityPerCraftForItem(ItemStack item, ICraftingPattern pattern) { + int qty = 0; + + for (ItemStack output : pattern.getOutputs()) { + if (API.instance().getComparer().isEqualNoQuantity(output, item)) { + qty += output.getCount(); + + if (!pattern.isProcessing()) { + break; } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java index c953c7279..1bacd955c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java @@ -287,7 +287,11 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Nullable @Override public IStorageCache getStorageCache() { - return network != null ? (type == GridType.FLUID ? network.getFluidStorageCache() : network.getItemStorageCache()) : null; + if (network != null) { + return type == GridType.FLUID ? network.getFluidStorageCache() : network.getItemStorageCache(); + } + + return null; } @Nullable diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java index 91d1f54ca..edbfdf0ea 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java @@ -27,9 +27,18 @@ public class BlockModels { generator.getVariantBuilder(block) .forAllStates(state -> { Direction dir = state.get(BlockDirection.ANY.getProperty()); + + int xRotation = 0; + if (dir == Direction.DOWN) { + xRotation = 180; + } + if (dir.getAxis().isHorizontal()) { + xRotation = 90; + } + return ConfiguredModel.builder() .modelFile(modelFunc.apply(state)) - .rotationX(dir == Direction.DOWN ? 180 : dir.getAxis().isHorizontal() ? 90 : 0) + .rotationX(xRotation) .rotationY(dir.getAxis().isVertical() ? 0 : (((int) dir.getHorizontalAngle()) + angleOffset) % 360) .build(); }); @@ -39,9 +48,17 @@ public class BlockModels { generator.getVariantBuilder(block) .forAllStates(state -> { Direction dir = state.get(BlockDirection.ANY.getProperty()); + + int xRotation; + if (dir.getAxis() == Direction.Axis.Y) { + xRotation = dir == Direction.UP ? 180 : 0; + } else { + xRotation = dir.getAxis().isHorizontal() ? 90 : 0; + } + return ConfiguredModel.builder() .modelFile(modelFunc.apply(state)) - .rotationX(dir.getAxis() == Direction.Axis.Y ? (dir == Direction.UP ? 180 : 0) : dir.getAxis().isHorizontal() ? 90 : 0) + .rotationX(xRotation) .rotationY(dir.getAxis().isVertical() ? 0 : (((int) dir.getHorizontalAngle()) + angleOffset) % 360) .build(); }); diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java index 4ed36abdb..b8dc5dc6d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java @@ -34,7 +34,7 @@ public class ControllerLootFunction extends LootFunction { @Override public LootFunctionType func_230425_b_() { - return RSLootFunctions.CONTROLLER; + return RSLootFunctions.getController(); } public static LootFunction.Builder builder() { diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java index 55f2c79ba..7440ff2f1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java @@ -36,7 +36,7 @@ public class CrafterLootFunction extends LootFunction { @Override public LootFunctionType func_230425_b_() { - return RSLootFunctions.CRAFTER; + return RSLootFunctions.getCrafter(); } public static LootFunction.Builder builder() { diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java index 5124363eb..9b42836f4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java @@ -30,7 +30,7 @@ public class PortableGridBlockLootFunction extends LootFunction { @Override public LootFunctionType func_230425_b_() { - return RSLootFunctions.PORTABLE_GRID; + return RSLootFunctions.getPortableGrid(); } public static class Serializer extends LootFunction.Serializer { diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java index 11532485a..5f375afb9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java @@ -51,7 +51,7 @@ public class StorageBlockLootFunction extends LootFunction { @Override public LootFunctionType func_230425_b_() { - return RSLootFunctions.STORAGE_BLOCK; + return RSLootFunctions.getStorageBlock(); } public static class Serializer extends LootFunction.Serializer { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java index 95fee7a60..0dec9da20 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java @@ -356,7 +356,7 @@ public abstract class BaseScreen extends ContainerScreen public abstract void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY); public static void executeLater(Class clazz, Consumer callback) { - ACTIONS.computeIfAbsent(clazz, eky -> new ArrayDeque<>()).add(callback); + ACTIONS.computeIfAbsent(clazz, key -> new ArrayDeque<>()).add(callback); } public static void executeLater(Consumer callback) { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java index 7dafaba3c..5e98c2c70 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java @@ -91,7 +91,16 @@ public class CrafterManagerScreen extends BaseScreen im for (int i = 0; i < rows; ++i) { yy += 18; - blit(matrixStack, x, yy, 0, getTopHeight() + (i > 0 ? (i == rows - 1 ? 18 * 2 : 18) : 0), xSize, 18); + int yTextureStart = getTopHeight(); + if (i > 0) { + if (i == rows - 1) { + yTextureStart += 18 * 2; + } else { + yTextureStart += 18; + } + } + + blit(matrixStack, x, yy, 0, yTextureStart, xSize, 18); } yy += 18; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java index 67f87d032..c4dab7123 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java @@ -15,12 +15,14 @@ public class DiskDriveScreen extends StorageScreen { inventory, title, "gui/disk_drive.png", - DiskDriveTile.TYPE, - NetworkNodeTile.REDSTONE_MODE, - DiskDriveTile.COMPARE, - DiskDriveTile.WHITELIST_BLACKLIST, - DiskDriveTile.PRIORITY, - DiskDriveTile.ACCESS_TYPE, + new StorageScreenTileDataParameters( + DiskDriveTile.TYPE, + NetworkNodeTile.REDSTONE_MODE, + DiskDriveTile.COMPARE, + DiskDriveTile.WHITELIST_BLACKLIST, + DiskDriveTile.PRIORITY, + DiskDriveTile.ACCESS_TYPE + ), DiskDriveTile.STORED::getValue, DiskDriveTile.CAPACITY::getValue ); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java index 01ae0538a..cc5cb87c0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java @@ -13,12 +13,14 @@ public class ExternalStorageScreen extends StorageScreen (long) ((FluidStorageTile) container.getTile()).getFluidStorageType().getCapacity() ); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java index 08b009385..3c73dffb4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java @@ -13,12 +13,14 @@ public class StorageBlockScreen extends StorageScreen { inventory, title, "gui/storage.png", - null, - NetworkNodeTile.REDSTONE_MODE, - StorageTile.COMPARE, - StorageTile.WHITELIST_BLACKLIST, - StorageTile.PRIORITY, - StorageTile.ACCESS_TYPE, + new StorageScreenTileDataParameters( + null, + NetworkNodeTile.REDSTONE_MODE, + StorageTile.COMPARE, + StorageTile.WHITELIST_BLACKLIST, + StorageTile.PRIORITY, + StorageTile.ACCESS_TYPE + ), StorageTile.STORED::getValue, () -> (long) ((StorageTile) container.getTile()).getItemStorageType().getCapacity() ); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java index c4a01cea7..10d1bbe3c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java @@ -2,10 +2,8 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.matrix.MatrixStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.api.storage.AccessType; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; -import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -14,7 +12,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; -import javax.annotation.Nullable; import java.util.function.Supplier; public class StorageScreen extends BaseScreen { @@ -24,12 +21,7 @@ public class StorageScreen extends BaseScreen { private static final int BAR_HEIGHT = 70; private final String texture; - private final TileDataParameter typeParameter; - private final TileDataParameter redstoneModeParameter; - private final TileDataParameter exactModeParameter; - private final TileDataParameter whitelistBlacklistParameter; - private final TileDataParameter priorityParameter; - private final TileDataParameter accessTypeParameter; + private final StorageScreenTileDataParameters dataParameters; private final Supplier storedSupplier; private final Supplier capacitySupplier; @@ -37,51 +29,50 @@ public class StorageScreen extends BaseScreen { PlayerInventory inventory, ITextComponent title, String texture, - @Nullable TileDataParameter typeParameter, - @Nullable TileDataParameter redstoneModeParameter, - @Nullable TileDataParameter exactModeParameter, - @Nullable TileDataParameter whitelistBlacklistParameter, - TileDataParameter priorityParameter, - @Nullable TileDataParameter accessTypeParameter, - Supplier storedSupplier, Supplier capacitySupplier) { + StorageScreenTileDataParameters dataParameters, + Supplier storedSupplier, + Supplier capacitySupplier) { super(container, 176, 223, inventory, title); this.texture = texture; - this.typeParameter = typeParameter; - this.redstoneModeParameter = redstoneModeParameter; - this.exactModeParameter = exactModeParameter; - this.whitelistBlacklistParameter = whitelistBlacklistParameter; - this.priorityParameter = priorityParameter; - this.accessTypeParameter = accessTypeParameter; + this.dataParameters = dataParameters; this.storedSupplier = storedSupplier; this.capacitySupplier = capacitySupplier; } @Override public void onPostInit(int x, int y) { - if (redstoneModeParameter != null) { - addSideButton(new RedstoneModeSideButton(this, redstoneModeParameter)); + if (dataParameters.getRedstoneModeParameter() != null) { + addSideButton(new RedstoneModeSideButton(this, dataParameters.getRedstoneModeParameter())); } - if (typeParameter != null) { - addSideButton(new TypeSideButton(this, typeParameter)); + if (dataParameters.getTypeParameter() != null) { + addSideButton(new TypeSideButton(this, dataParameters.getTypeParameter())); } - if (whitelistBlacklistParameter != null) { - addSideButton(new WhitelistBlacklistSideButton(this, whitelistBlacklistParameter)); + if (dataParameters.getWhitelistBlacklistParameter() != null) { + addSideButton(new WhitelistBlacklistSideButton(this, dataParameters.getWhitelistBlacklistParameter())); } - if (exactModeParameter != null) { - addSideButton(new ExactModeSideButton(this, exactModeParameter)); + if (dataParameters.getExactModeParameter() != null) { + addSideButton(new ExactModeSideButton(this, dataParameters.getExactModeParameter())); } - if (accessTypeParameter != null) { - addSideButton(new AccessTypeSideButton(this, accessTypeParameter)); + if (dataParameters.getAccessTypeParameter() != null) { + addSideButton(new AccessTypeSideButton(this, dataParameters.getAccessTypeParameter())); } int buttonWidth = 10 + font.getStringWidth(I18n.format("misc.refinedstorage.priority")); - addButton(x + 169 - buttonWidth, y + 41, buttonWidth, 20, new TranslationTextComponent("misc.refinedstorage.priority"), true, true, btn -> minecraft.displayGuiScreen(new PriorityScreen(this, priorityParameter, playerInventory))); + addButton( + x + 169 - buttonWidth, + y + 41, buttonWidth, + 20, + new TranslationTextComponent("misc.refinedstorage.priority"), + true, + true, + btn -> minecraft.displayGuiScreen(new PriorityScreen(this, dataParameters.getPriorityParameter(), playerInventory)) + ); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreenTileDataParameters.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreenTileDataParameters.java new file mode 100644 index 000000000..b681358f3 --- /dev/null +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreenTileDataParameters.java @@ -0,0 +1,58 @@ +package com.refinedmods.refinedstorage.screen; + +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; + +import javax.annotation.Nullable; + +public class StorageScreenTileDataParameters { + @Nullable + private final TileDataParameter typeParameter; + @Nullable + private final TileDataParameter redstoneModeParameter; + @Nullable + private final TileDataParameter exactModeParameter; + @Nullable + private final TileDataParameter whitelistBlacklistParameter; + private final TileDataParameter priorityParameter; + @Nullable + private final TileDataParameter accessTypeParameter; + + public StorageScreenTileDataParameters(@Nullable TileDataParameter typeParameter, @Nullable TileDataParameter redstoneModeParameter, @Nullable TileDataParameter exactModeParameter, @Nullable TileDataParameter whitelistBlacklistParameter, TileDataParameter priorityParameter, @Nullable TileDataParameter accessTypeParameter) { + this.typeParameter = typeParameter; + this.redstoneModeParameter = redstoneModeParameter; + this.exactModeParameter = exactModeParameter; + this.whitelistBlacklistParameter = whitelistBlacklistParameter; + this.priorityParameter = priorityParameter; + this.accessTypeParameter = accessTypeParameter; + } + + @Nullable + public TileDataParameter getTypeParameter() { + return typeParameter; + } + + @Nullable + public TileDataParameter getRedstoneModeParameter() { + return redstoneModeParameter; + } + + @Nullable + public TileDataParameter getExactModeParameter() { + return exactModeParameter; + } + + @Nullable + public TileDataParameter getWhitelistBlacklistParameter() { + return whitelistBlacklistParameter; + } + + public TileDataParameter getPriorityParameter() { + return priorityParameter; + } + + @Nullable + public TileDataParameter getAccessTypeParameter() { + return accessTypeParameter; + } +} diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java index 32d83780a..7c71b5b5a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java @@ -315,7 +315,16 @@ public class GridScreen extends BaseScreen implements IScreenInfo for (int i = 0; i < rows; ++i) { yy += 18; - blit(matrixStack, x, yy, 0, getTopHeight() + (i > 0 ? (i == rows - 1 ? 18 * 2 : 18) : 0), xSize - 34, 18); + int yTextureStart = getTopHeight(); + if (i > 0) { + if (i == rows - 1) { + yTextureStart += 18 * 2; + } else { + yTextureStart += 18; + } + } + + blit(matrixStack, x, yy, 0, yTextureStart, xSize - 34, 18); } yy += 18; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java index 9102d136b..0077e40c7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java @@ -25,7 +25,7 @@ public abstract class SearchBoxModeSideButton extends SideButton { return MODE_ROTATION.get(MODE_ROTATION.indexOf(oldMode) + 1); } - public SearchBoxModeSideButton(BaseScreen screen) { + protected SearchBoxModeSideButton(BaseScreen screen) { super(screen); }