diff --git a/src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java b/src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java index d1d1c1521..3822da857 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java @@ -143,7 +143,7 @@ public interface IRSAPI { * @param type the storage type * @param provider the external storage provider */ - void addExternalStorageProvider(StorageType type, IExternalStorageProvider provider); + void addExternalStorageProvider(StorageType type, IExternalStorageProvider provider); /** * @param type the type diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java index 3765ded09..ede581ae9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java @@ -9,6 +9,7 @@ public interface ICraftingMonitorElementList { * @param element the {@link ICraftingMonitorElement} */ void directAdd(ICraftingMonitorElement element); + /** * Add a element to the Storage list, similar elements will be merged. * A {@link #commit()} will stop any following adds to be merged with previous ones. @@ -16,6 +17,7 @@ public interface ICraftingMonitorElementList { * @param element the {@link ICraftingMonitorElement} */ void addStorage(ICraftingMonitorElement element); + /** * Add a element to the Processing or Crafting list, similar elements will be merged. * A {@link #commit()} will stop any following adds to be merged with previous ones. diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java index bcc3a5923..1f0c4ae13 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java @@ -16,7 +16,7 @@ public interface ICraftingPreviewElementRegistry { * @param id the id, as specified in {@link ICraftingPreviewElement#getId()} * @param factory the factory */ - void add(ResourceLocation id, Function factory); + void add(ResourceLocation id, Function> factory); /** * Returns a factory from the registry. @@ -25,5 +25,5 @@ public interface ICraftingPreviewElementRegistry { * @return the factory, or null if no factory was found */ @Nullable - Function get(ResourceLocation id); + Function> get(ResourceLocation id); } diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTask.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTask.java index a630218ac..ee85f4621 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTask.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTask.java @@ -89,7 +89,7 @@ public interface ICraftingTask { * * @return get a list of {@link ICraftingPreviewElement}s */ - List getPreviewStacks(); + List> getPreviewStacks(); /** * @return the crafting pattern corresponding to this task diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java index fc180342a..1ccb8f9fc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java @@ -2,6 +2,8 @@ package com.refinedmods.refinedstorage.api.network.grid; import net.minecraft.util.IStringSerializable; +import javax.annotation.Nonnull; + /** * Represents a grid type. * Used in {@link IGrid} to determine grid GUI rendering. @@ -24,23 +26,20 @@ public enum GridType implements IStringSerializable { */ FLUID(3, "fluid"); - private int id; - private String name; + private final int id; + private final String name; GridType(int id, String name) { this.id = id; this.name = name; } + @Nonnull @Override public String getName() { return name; } - public int getId() { - return id; - } - @Override public String toString() { return name; diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridManager.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridManager.java index fa64bf9ce..65c66eafd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridManager.java @@ -20,13 +20,6 @@ public interface IGridManager { */ void add(ResourceLocation id, IGridFactory factory); - /** - * @param id the id of the factory - * @return the factory, or null if no factory was found - */ - @Nullable - IGridFactory get(ResourceLocation id); - /** * Opens a grid. Can only be called on the server. * diff --git a/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java index 0b4dddfe2..1a3f56ff4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewE * This {@link FunctionalInterface} is used to define a draw/render function. * This function use x and y coords and the element to draw. * Usually packaged in a {@link IElementDrawers}. - * Used in {@link ICraftingPreviewElement#draw(int, int, IElementDrawers)} and {@link ICraftingMonitorElement#draw(int, int, IElementDrawers, boolean)}. + * Used in {@link ICraftingPreviewElement#draw(int, int, IElementDrawers)} and {@link ICraftingMonitorElement#draw(int, int, IElementDrawers)}. * * @param the element to draw, usually {@link String}, {@link net.minecraft.item.ItemStack} or {@link net.minecraftforge.fluids.FluidStack} */ diff --git a/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java index 00758fc6e..d09706490 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java @@ -36,7 +36,7 @@ public interface IElementDrawers { return getNullDrawer(); } - default IElementDrawer getErrorDrawer() { + default IElementDrawer getErrorDrawer() { return getNullDrawer(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/api/storage/AccessType.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/AccessType.java index 062761239..64f54c8f6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/storage/AccessType.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/AccessType.java @@ -17,7 +17,7 @@ public enum AccessType { */ EXTRACT(2); - private int id; + private final int id; /** * @param id the id of this access type diff --git a/src/main/java/com/refinedmods/refinedstorage/api/storage/IStorage.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/IStorage.java index 4cb4d26f4..6817db205 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/storage/IStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/IStorage.java @@ -9,7 +9,7 @@ import java.util.Collection; import java.util.Comparator; public interface IStorage { - Comparator COMPARATOR = (left, right) -> { + Comparator> COMPARATOR = (left, right) -> { int compare = Integer.compare(right.getPriority(), left.getPriority()); return compare != 0 ? compare : Integer.compare(right.getStored(), left.getStored()); diff --git a/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/StorageDiskSyncData.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/StorageDiskSyncData.java index fe01051b2..2507a40e3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/StorageDiskSyncData.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/StorageDiskSyncData.java @@ -4,8 +4,8 @@ package com.refinedmods.refinedstorage.api.storage.disk; * Contains synced info about a storage disk. */ public class StorageDiskSyncData { - private int stored; - private int capacity; + private final int stored; + private final int capacity; public StorageDiskSyncData(int stored, int capacity) { this.stored = stored; diff --git a/src/main/java/com/refinedmods/refinedstorage/api/util/StackListEntry.java b/src/main/java/com/refinedmods/refinedstorage/api/util/StackListEntry.java index fd1b84ee0..58af9d749 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/util/StackListEntry.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/util/StackListEntry.java @@ -8,8 +8,8 @@ import java.util.UUID; * @param the stack type */ public class StackListEntry { - private UUID id; - private T stack; + private final UUID id; + private final T stack; public StackListEntry(T stack) { this.stack = stack; diff --git a/src/main/java/com/refinedmods/refinedstorage/api/util/StackListResult.java b/src/main/java/com/refinedmods/refinedstorage/api/util/StackListResult.java index 467528b7d..fc23049c2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/util/StackListResult.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/util/StackListResult.java @@ -8,9 +8,9 @@ import java.util.UUID; * @param the stack type */ public class StackListResult { - private T stack; - private UUID id; - private int change; + private final T stack; + private final UUID id; + private final int change; public StackListResult(T stack, UUID id, int change) { this.stack = stack; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java index 526b82965..cf3330233 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java @@ -92,7 +92,7 @@ public class API implements IRSAPI { for (ModFileScanData.AnnotationData annotation : annotations) { try { - Class clazz = Class.forName(annotation.getClassType().getClassName()); + Class clazz = Class.forName(annotation.getClassType().getClassName()); Field field = clazz.getField(annotation.getMemberName()); if (field.getType() == IRSAPI.class) { @@ -296,8 +296,8 @@ public class API implements IRSAPI { } private int getHashCode(ListNBT tag, int result) { - for (int i = 0; i < tag.size(); ++i) { - result = getHashCode(tag.get(i), result); + for (INBT tagItem : tag) { + result = getHashCode(tagItem, result); } return result; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java index 3f0c5f99a..c16276e0d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java @@ -37,21 +37,21 @@ public class CraftingManager implements ICraftingManager { private static final String NBT_TASK_TYPE = "Type"; private static final String NBT_TASK_DATA = "Task"; - private INetwork network; + private final INetwork network; - private Map> containerInventories = new LinkedHashMap<>(); - private Map> patternToContainer = new HashMap<>(); + private final Map> containerInventories = new LinkedHashMap<>(); + private final Map> patternToContainer = new HashMap<>(); - private List patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); - private Map tasks = new LinkedHashMap<>(); - private List tasksToAdd = new ArrayList<>(); - private List tasksToCancel = new ArrayList<>(); + private final Map tasks = new LinkedHashMap<>(); + private final List tasksToAdd = new ArrayList<>(); + private final List tasksToCancel = new ArrayList<>(); private ListNBT tasksToRead; - private Map throttledRequesters = new HashMap<>(); + private final Map throttledRequesters = new HashMap<>(); - private Set listeners = new HashSet<>(); + private final Set listeners = new HashSet<>(); public CraftingManager(INetwork network) { this.network = network; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java index 003928153..8a8026802 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; public class CraftingPatternChain implements ICraftingPatternChain { - private List patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); private int pos; public void addPattern(ICraftingPattern pattern) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java index b25bc2b79..111fb82cd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java @@ -36,7 +36,7 @@ public class CraftingPatternChainList implements ICraftingPatternChainList { return chain; } - private class Key { + private static class Key { private final ICraftingPattern pattern; public Key(ICraftingPattern pattern) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java index c40f42e01..99e849ab7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java @@ -170,7 +170,7 @@ public class CraftingPatternFactory { inv.setInventorySlotContents(i, input); } - private void modifyCraftingInputsToUseAlternatives(ICraftingRecipe recipe, List> inputs) throws CraftingPatternFactoryException { + private void modifyCraftingInputsToUseAlternatives(ICraftingRecipe recipe, List> inputs) { if (!recipe.getIngredients().isEmpty()) { inputs.clear(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java index ed8c91e77..2f9ce8aa8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java @@ -7,11 +7,11 @@ import net.minecraft.util.ResourceLocation; import java.util.*; public class CraftingMonitorElementList implements ICraftingMonitorElementList { - private List elements = new LinkedList<>(); - private Map> currentLists = new LinkedHashMap<>(); - private Map> currentCraftingLists = new LinkedHashMap<>(); - private Map> currentProcessingLists = new LinkedHashMap<>(); - private Map> currentStorageLists = new LinkedHashMap<>(); + private final List elements = new LinkedList<>(); + private final Map> currentLists = new LinkedHashMap<>(); + private final Map> currentCraftingLists = new LinkedHashMap<>(); + private final Map> currentProcessingLists = new LinkedHashMap<>(); + private final Map> currentStorageLists = new LinkedHashMap<>(); @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java index e4b6e2fc7..4d8786686 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.function.Function; public class CraftingMonitorElementRegistry implements ICraftingMonitorElementRegistry { - private Map> registry = new HashMap<>(); + private final Map> registry = new HashMap<>(); @Override public void add(ResourceLocation id, Function factory) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java index c8d122a42..4f1b10f74 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java @@ -14,8 +14,8 @@ import javax.annotation.Nullable; public class ErrorCraftingMonitorElement implements ICraftingMonitorElement { public static final ResourceLocation ID = new ResourceLocation("error"); - private ICraftingMonitorElement base; - private String message; + private final ICraftingMonitorElement base; + private final String message; public ErrorCraftingMonitorElement(ICraftingMonitorElement base, String message) { this.base = base; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java index 6992ca362..1cb863dce 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java @@ -24,7 +24,7 @@ public class FluidCraftingMonitorElement implements ICraftingMonitorElement { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "fluid"); - private FluidStack stack; + private final FluidStack stack; private int stored; private int missing; private int processing; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java index f67e05ff4..6e082e60d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java @@ -25,7 +25,7 @@ public class ItemCraftingMonitorElement implements ICraftingMonitorElement { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "item"); - private ItemStack stack; + private final ItemStack stack; private int stored; private int missing; private int processing; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java index 9f893e19e..772b4fb60 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.function.Function; public class CraftingPreviewElementRegistry implements ICraftingPreviewElementRegistry { - private Map> registry = new HashMap<>(); + private final Map>> registry = new HashMap<>(); @Override - public void add(ResourceLocation id, Function factory) { + public void add(ResourceLocation id, Function> factory) { registry.put(id, factory); } @Nullable @Override - public Function get(ResourceLocation id) { + public Function> get(ResourceLocation id) { return registry.get(id); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java index 7eabe8745..2bd511aac 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java @@ -11,8 +11,8 @@ import net.minecraft.util.ResourceLocation; public class ErrorCraftingPreviewElement implements ICraftingPreviewElement { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "error"); - private CraftingTaskErrorType type; - private ItemStack stack; + private final CraftingTaskErrorType type; + private final ItemStack stack; public ErrorCraftingPreviewElement(CraftingTaskErrorType type, ItemStack stack) { this.type = type; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java index cd4018b4e..a806603fb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.FluidStack; public class FluidCraftingPreviewElement implements ICraftingPreviewElement { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "fluid"); - private FluidStack stack; + private final FluidStack stack; private int available; private boolean missing; // If missing is true then toCraft is the missing amount diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java index cc18af3f6..6a409b9bd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java @@ -17,7 +17,7 @@ import net.minecraftforge.items.ItemHandlerHelper; public class ItemCraftingPreviewElement implements ICraftingPreviewElement { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "item"); - private ItemStack stack; + private final ItemStack stack; private int available; private boolean missing; // If missing is true then toCraft is the missing amount diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java index 6fa9dcc8e..bd8c1f6a2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; public class CraftingTaskRegistry implements ICraftingTaskRegistry { - private Map registry = new HashMap<>(); + private final Map registry = new HashMap<>(); @Override public void add(ResourceLocation id, ICraftingTaskFactory factory) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java index 6dac30b9e..ec3d55e20 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java @@ -17,10 +17,10 @@ class Crafting { private static final String NBT_TO_EXTRACT = "ToExtract"; private static final String NBT_ROOT = "Root"; - private ICraftingPattern pattern; - private NonNullList took; - private IStackList toExtract; - private boolean root; + private final ICraftingPattern pattern; + private final NonNullList took; + private final IStackList toExtract; + private final boolean root; public Crafting(ICraftingPattern pattern, NonNullList took, IStackList toExtract, boolean root) { this.pattern = pattern; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java index fce8df46c..91f59afae 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java @@ -68,34 +68,34 @@ public class CraftingTask implements ICraftingTask { private static final Logger LOGGER = LogManager.getLogger(CraftingTask.class); - private INetwork network; - private ICraftingRequestInfo requested; - private int quantity; - private ICraftingPattern pattern; + private final INetwork network; + private final ICraftingRequestInfo requested; + private final int quantity; + private final ICraftingPattern pattern; private UUID id = UUID.randomUUID(); private int ticks; private long calculationStarted = -1; private long executionStarted = -1; private int totalSteps; - private Set patternsUsed = new HashSet<>(); + private final Set patternsUsed = new HashSet<>(); - private IStorageDisk internalStorage; - private IStorageDisk internalFluidStorage; + private final IStorageDisk internalStorage; + private final IStorageDisk internalFluidStorage; private IStackList toExtractInitial = API.instance().createItemStackList(); private IStackList toExtractInitialFluids = API.instance().createFluidStackList(); - private List crafting = new ArrayList<>(); - private List processing = new ArrayList<>(); + private final List crafting = new ArrayList<>(); + private final List processing = new ArrayList<>(); private IStackList missing = API.instance().createItemStackList(); private IStackList missingFluids = API.instance().createFluidStackList(); - private IStackList toTake = API.instance().createItemStackList(); - private IStackList toTakeFluids = API.instance().createFluidStackList(); + private final IStackList toTake = API.instance().createItemStackList(); + private final IStackList toTakeFluids = API.instance().createFluidStackList(); - private IStackList toCraft = API.instance().createItemStackList(); - private IStackList toCraftFluids = API.instance().createFluidStackList(); + private final IStackList toCraft = API.instance().createItemStackList(); + private final IStackList toCraftFluids = API.instance().createFluidStackList(); public CraftingTask(INetwork network, ICraftingRequestInfo requested, int quantity, ICraftingPattern pattern) { this.network = network; @@ -281,7 +281,7 @@ public class CraftingTask implements ICraftingTask { } static class PossibleInputs { - private List possibilities; + private final List possibilities; private int pos; PossibleInputs(List possibilities) { @@ -323,7 +323,7 @@ public class CraftingTask implements ICraftingTask { } static class PossibleFluidInputs { - private List possibilities; + private final List possibilities; private int pos; PossibleFluidInputs(List possibilities) { @@ -698,7 +698,7 @@ public class CraftingTask implements ICraftingTask { network.getCraftingManager().onTaskChanged(); - counter.merge(container, 1, (a, b) -> a + b); + counter.merge(container, 1, Integer::sum); } } } @@ -816,7 +816,7 @@ public class CraftingTask implements ICraftingTask { p.getPattern().getContainer().onUsedForProcessing(); - counter.merge(container, 1, (a, b) -> a + b); + counter.merge(container, 1, Integer::sum); } } @@ -1163,7 +1163,7 @@ public class CraftingTask implements ICraftingTask { } @Override - public List getPreviewStacks() { + public List> getPreviewStacks() { Map map = new LinkedHashMap<>(); Map mapFluids = new LinkedHashMap<>(); @@ -1253,7 +1253,7 @@ public class CraftingTask implements ICraftingTask { mapFluids.put(hash, previewStack); } - List elements = new ArrayList<>(); + List> elements = new ArrayList<>(); elements.addAll(map.values()); elements.addAll(mapFluids.values()); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java index c94a2782f..ec4f5a51f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskError; import javax.annotation.Nullable; public class CraftingTaskError implements ICraftingTaskError { - private CraftingTaskErrorType type; + private final CraftingTaskErrorType type; private ICraftingPattern recursedPattern; public CraftingTaskError(CraftingTaskErrorType type) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java index 12c711573..9018f39b1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java @@ -18,13 +18,13 @@ class Processing { private static final String NBT_STATE = "State"; private static final String NBT_ROOT = "Root"; - private ICraftingPattern pattern; - private IStackList itemsToReceive; - private IStackList fluidsToReceive; - private IStackList itemsToPut; - private IStackList fluidsToPut; + private final ICraftingPattern pattern; + private final IStackList itemsToReceive; + private final IStackList fluidsToReceive; + private final IStackList itemsToPut; + private final IStackList fluidsToPut; private ProcessingState state = ProcessingState.READY; - private boolean root; + private final boolean root; public Processing(ICraftingPattern pattern, IStackList itemsToReceive, IStackList fluidsToReceive, IStackList itemsToPut, IStackList fluidsToPut, boolean root) { this.pattern = pattern; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java index ec904a09d..d8380d798 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java @@ -27,11 +27,11 @@ public abstract class Craft { private static final String NBT_QUANTITY = "Quantity"; private static final String NBT_NEEDED_PER_CRAFT = "NeededPerCraft"; - private boolean root; + private final boolean root; protected int quantity; - private ICraftingPattern pattern; - private Map> itemsToUse = new LinkedHashMap<>(); - private Map neededPerCraft = new LinkedHashMap<>(); + private final ICraftingPattern pattern; + private final Map> itemsToUse = new LinkedHashMap<>(); + private final Map neededPerCraft = new LinkedHashMap<>(); Craft(ICraftingPattern pattern, boolean root) { this.pattern = pattern; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java index b5d407e29..12806bacc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java @@ -12,7 +12,7 @@ import net.minecraftforge.common.util.Constants; class Crafting extends Craft { private static final String NBT_RECIPE = "Recipe"; - private NonNullList recipe; + private final NonNullList recipe; Crafting(ICraftingPattern pattern, boolean root, NonNullList recipe) { super(pattern, root); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java index 06566b4d7..888d314ba 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java @@ -71,35 +71,35 @@ public class CraftingTask implements ICraftingTask { private static final Logger LOGGER = LogManager.getLogger(CraftingTask.class); - private INetwork network; - private ICraftingRequestInfo requested; - private int quantity; - private ICraftingPattern pattern; + private final INetwork network; + private final ICraftingRequestInfo requested; + private final int quantity; + private final ICraftingPattern pattern; private UUID id = UUID.randomUUID(); private int ticks; private long calculationStarted = -1; private long executionStarted = -1; private int totalSteps; private int currentstep; - private Set patternsUsed = new HashSet<>(); + private final Set patternsUsed = new HashSet<>(); - private IStorageDisk internalStorage; - private IStorageDisk internalFluidStorage; + private final IStorageDisk internalStorage; + private final IStorageDisk internalFluidStorage; private IStackList toExtractInitial = API.instance().createItemStackList(); private IStackList toExtractInitialFluids = API.instance().createFluidStackList(); - private Map crafts = new LinkedHashMap<>(); - private List toRemove = new ArrayList<>(); + private final Map crafts = new LinkedHashMap<>(); + private final List toRemove = new ArrayList<>(); private IStackList missing = API.instance().createItemStackList(); private IStackList missingFluids = API.instance().createFluidStackList(); - private IStackList toTake = API.instance().createItemStackList(); - private IStackList toTakeFluids = API.instance().createFluidStackList(); + private final IStackList toTake = API.instance().createItemStackList(); + private final IStackList toTakeFluids = API.instance().createFluidStackList(); - private List toCraft = new ArrayList<>(); - private List toCraftFluids = new ArrayList<>(); + private final List toCraft = new ArrayList<>(); + private final List toCraftFluids = new ArrayList<>(); public CraftingTask(INetwork network, ICraftingRequestInfo requested, int quantity, ICraftingPattern pattern) { this.network = network; @@ -273,7 +273,7 @@ public class CraftingTask implements ICraftingTask { } static class PossibleInputs { - private List possibilities; + private final List possibilities; private int pos; PossibleInputs(List possibilities) { @@ -315,7 +315,7 @@ public class CraftingTask implements ICraftingTask { } static class PossibleFluidInputs { - private List possibilities; + private final List possibilities; private int pos; PossibleFluidInputs(List possibilities) { @@ -327,6 +327,7 @@ public class CraftingTask implements ICraftingTask { } // Return false if we're exhausted. + // TODO: never called? boolean cycle() { if (pos + 1 >= possibilities.size()) { pos = 0; @@ -1199,7 +1200,7 @@ public class CraftingTask implements ICraftingTask { } @Override - public List getPreviewStacks() { + public List> getPreviewStacks() { Map map = new LinkedHashMap<>(); Map mapFluids = new LinkedHashMap<>(); @@ -1289,7 +1290,7 @@ public class CraftingTask implements ICraftingTask { mapFluids.put(hash, previewStack); } - List elements = new ArrayList<>(); + List> elements = new ArrayList<>(); elements.addAll(map.values()); elements.addAll(mapFluids.values()); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java index bbb2f3768..6f42e8875 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskError; import javax.annotation.Nullable; public class CraftingTaskError implements ICraftingTaskError { - private CraftingTaskErrorType type; + private final CraftingTaskErrorType type; private ICraftingPattern recursedPattern; public CraftingTaskError(CraftingTaskErrorType type) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java index d3e64d8dc..ec59ce8dc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java @@ -26,9 +26,9 @@ public class NetworkManager extends WorldSavedData implements INetworkManager { private final World world; - private Logger logger = LogManager.getLogger(getClass()); + private final Logger logger = LogManager.getLogger(getClass()); - private ConcurrentHashMap networks = new ConcurrentHashMap<>(); + private final ConcurrentHashMap networks = new ConcurrentHashMap<>(); public NetworkManager(String name, World world) { super(name); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java index fd05555f2..6fb07a785 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java @@ -19,11 +19,11 @@ import java.util.*; import java.util.function.Consumer; public class NetworkNodeGraph implements INetworkNodeGraph { - private INetwork network; + private final INetwork network; private Set nodes = Sets.newConcurrentHashSet(); - private List listeners = new LinkedList<>(); + private final List listeners = new LinkedList<>(); - private Set> actions = new HashSet<>(); + private final Set> actions = new HashSet<>(); private boolean invalidating = false; @@ -109,14 +109,14 @@ public class NetworkNodeGraph implements INetworkNodeGraph { } private class Operator implements INetworkNodeVisitor.Operator { - private Set foundNodes = Sets.newConcurrentHashSet(); // All scanned nodes + private final Set foundNodes = Sets.newConcurrentHashSet(); // All scanned nodes - private Set newNodes = Sets.newConcurrentHashSet(); // All scanned new nodes, that didn't appear in the list before - private Set previousNodes = Sets.newConcurrentHashSet(nodes); // All unscanned nodes (nodes that were in the previous list, but not in the new list) + private final Set newNodes = Sets.newConcurrentHashSet(); // All scanned new nodes, that didn't appear in the list before + private final Set previousNodes = Sets.newConcurrentHashSet(nodes); // All unscanned nodes (nodes that were in the previous list, but not in the new list) - private Queue toCheck = new ArrayDeque<>(); + private final Queue toCheck = new ArrayDeque<>(); - private Action action; + private final Action action; public Operator(Action action) { this.action = action; @@ -158,7 +158,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph { } } - private class Visitor implements INetworkNodeVisitor { + private static class Visitor implements INetworkNodeVisitor { private final INetworkNode node; private final World world; private final BlockPos pos; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java index 468b0cd0c..3c26bab9d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java @@ -28,9 +28,9 @@ public class NetworkNodeManager extends WorldSavedData implements INetworkNodeMa private final World world; - private Logger logger = LogManager.getLogger(getClass()); + private final Logger logger = LogManager.getLogger(getClass()); - private ConcurrentHashMap nodes = new ConcurrentHashMap<>(); + private final ConcurrentHashMap nodes = new ConcurrentHashMap<>(); public NetworkNodeManager(String name, World world) { super(name); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java index 13b8e29c6..072107407 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java @@ -25,12 +25,6 @@ public class GridManager implements IGridManager { factories.put(id, factory); } - @Override - @Nullable - public IGridFactory get(ResourceLocation id) { - return factories.get(id); - } - @Override public void openGrid(ResourceLocation id, ServerPlayerEntity player, BlockPos pos) { openGrid(id, player, null, pos, -1); @@ -67,7 +61,7 @@ public class GridManager implements IGridManager { @Override @Nullable public Pair createGrid(ResourceLocation id, PlayerEntity player, @Nullable ItemStack stack, @Nullable BlockPos pos, int slotId) { - IGridFactory factory = get(id); + IGridFactory factory = factories.get(id); if (factory == null) { return null; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java index 68f80c1b7..3440a613e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java @@ -15,12 +15,12 @@ import java.util.Collections; import java.util.List; public class GridTab implements IGridTab { - private List filters; - private String name; + private final List filters; + private final String name; @Nonnull - private ItemStack icon; + private final ItemStack icon; @Nullable - private FluidStack fluidIcon; + private final FluidStack fluidIcon; public GridTab(List filters, String name, @Nonnull ItemStack icon, @Nullable FluidStack fluidIcon) { this.filters = filters; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java index d0687c5a8..85d6d5404 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.UUID; public class FluidGridHandler implements IFluidGridHandler { - private INetwork network; + private final INetwork network; public FluidGridHandler(INetwork network) { this.network = network; @@ -41,26 +41,24 @@ public class FluidGridHandler implements IFluidGridHandler { return; } - NetworkUtils.extractBucketFromPlayerInventoryOrNetwork(player, network, bucket -> { - bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null).ifPresent(fluidHandler -> { - network.getFluidStorageTracker().changed(player, stack.copy()); + NetworkUtils.extractBucketFromPlayerInventoryOrNetwork(player, network, bucket -> bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null).ifPresent(fluidHandler -> { + network.getFluidStorageTracker().changed(player, stack.copy()); - FluidStack extracted = network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, Action.PERFORM); + FluidStack extracted = network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, Action.PERFORM); - fluidHandler.fill(extracted, IFluidHandler.FluidAction.EXECUTE); + fluidHandler.fill(extracted, IFluidHandler.FluidAction.EXECUTE); - 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(); + 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(); + } - network.getNetworkItemManager().drainEnergy(player, RS.SERVER_CONFIG.getWirelessFluidGrid().getExtractUsage()); - }); - }); + network.getNetworkItemManager().drainEnergy(player, RS.SERVER_CONFIG.getWirelessFluidGrid().getExtractUsage()); + })); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index c85849ebb..9c1c256e9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.UUID; public class ItemGridHandler implements IItemGridHandler { - private INetwork network; + private final INetwork network; public ItemGridHandler(INetwork network) { this.network = network; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java index 8d3352b04..52414bb77 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java @@ -20,7 +20,7 @@ import javax.annotation.Nonnull; import java.util.UUID; public class PortableFluidGridHandler implements IFluidGridHandler { - private IPortableGrid portableGrid; + private final IPortableGrid portableGrid; public PortableFluidGridHandler(IPortableGrid portableGrid) { this.portableGrid = portableGrid; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java index c07c1d097..37684cd3b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java @@ -19,8 +19,8 @@ import javax.annotation.Nullable; import java.util.UUID; public class PortableItemGridHandler implements IItemGridHandler { - private IPortableGrid portableGrid; - private IGrid grid; + private final IPortableGrid portableGrid; + private final IGrid grid; public PortableItemGridHandler(IPortableGrid portableGrid, IGrid grid) { this.portableGrid = portableGrid; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java index e9124df45..7b81344cf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java @@ -19,10 +19,10 @@ import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.network.NetworkHooks; public class WirelessCraftingMonitorNetworkItem implements INetworkItem { - private INetworkItemManager handler; - private PlayerEntity player; - private ItemStack stack; - private int slotId; + private final INetworkItemManager handler; + private final PlayerEntity player; + private final ItemStack stack; + private final int slotId; public WirelessCraftingMonitorNetworkItem(INetworkItemManager handler, PlayerEntity player, ItemStack stack, int slotId) { this.handler = handler; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java index eb30f8533..4c3d11e6d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java @@ -17,10 +17,10 @@ import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; public class WirelessFluidGridNetworkItem implements INetworkItem { - private INetworkItemManager handler; - private PlayerEntity player; - private ItemStack stack; - private int slotId; + private final INetworkItemManager handler; + private final PlayerEntity player; + private final ItemStack stack; + private final int slotId; public WirelessFluidGridNetworkItem(INetworkItemManager handler, PlayerEntity player, ItemStack stack, int slotId) { this.handler = handler; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java index 372d833d2..1a7b382bc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java @@ -17,10 +17,10 @@ import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; public class WirelessGridNetworkItem implements INetworkItem { - private INetworkItemManager handler; - private PlayerEntity player; - private ItemStack stack; - private int slotId; + private final INetworkItemManager handler; + private final PlayerEntity player; + private final ItemStack stack; + private final int slotId; public WirelessGridNetworkItem(INetworkItemManager handler, PlayerEntity player, ItemStack stack, int slotId) { this.handler = handler; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java index fddc5a3fd..0bd1f321b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java @@ -39,7 +39,6 @@ import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemHandlerHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -54,11 +53,11 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, private static final int BASE_SPEED = 20; - private BaseItemHandler itemFilters = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this)); - private FluidInventory fluidFilters = new FluidInventory(1) + private final BaseItemHandler itemFilters = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this)); + private final FluidInventory fluidFilters = new FluidInventory(1) .addListener(new NetworkNodeFluidInventoryListener(this)); - private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.CRAFTING, UpgradeItem.Type.STACK) + private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.CRAFTING, UpgradeItem.Type.STACK) .addListener(new NetworkNodeInventoryListener(this)); private int compare = IComparer.COMPARE_NBT; @@ -273,7 +272,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, } private class NetworkFluidHandler implements IFluidHandler { - private FluidStack resource; + private final FluidStack resource; public NetworkFluidHandler(FluidStack resource) { this.resource = resource; @@ -318,9 +317,9 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, } } - private class ConstructorBlockItemUseContext extends BlockItemUseContext { - public ConstructorBlockItemUseContext(World worldIn, @Nullable PlayerEntity playerIn, Hand handIn, ItemStack stackIn, BlockRayTraceResult rayTraceResultIn) { - super(worldIn, playerIn, handIn, stackIn, rayTraceResultIn); + private static class ConstructorBlockItemUseContext extends BlockItemUseContext { + public ConstructorBlockItemUseContext(World world, @Nullable PlayerEntity player, Hand hand, ItemStack stack, BlockRayTraceResult rayTraceResult) { + super(world, player, hand, stack, rayTraceResult); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java index 7b8acfa18..0e95fe0b2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java @@ -62,7 +62,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC private static final String NBT_LOCKED = "Locked"; private static final String NBT_WAS_POWERED = "WasPowered"; - private BaseItemHandler patternsInventory = new BaseItemHandler(9) { + private final BaseItemHandler patternsInventory = new BaseItemHandler(9) { @Override public int getSlotLimit(int slot) { return 1; @@ -82,9 +82,9 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC } }); - private List patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); - private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED) + private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED) .addListener(new NetworkNodeInventoryListener(this)); // Used to prevent infinite recursion on getRootContainer() when there's e.g. two crafters facing each other. diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java index 7296f7407..d67bb50e8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java @@ -93,9 +93,7 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting tag.putInt(NBT_TAB_PAGE, tabPage); - if (tabSelected.isPresent()) { - tag.putUniqueId(NBT_TAB_SELECTED, tabSelected.get()); - } + tabSelected.ifPresent(uuid -> tag.putUniqueId(NBT_TAB_SELECTED, uuid)); return tag; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java index 167ba97bb..93832e8a2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java @@ -58,14 +58,12 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I private static final int BASE_SPEED = 20; - private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); - private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); + private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); + private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); - private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.SILK_TOUCH, UpgradeItem.Type.FORTUNE_1, UpgradeItem.Type.FORTUNE_2, UpgradeItem.Type.FORTUNE_3) + private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.SILK_TOUCH, UpgradeItem.Type.FORTUNE_1, UpgradeItem.Type.FORTUNE_2, UpgradeItem.Type.FORTUNE_3) .addListener(new NetworkNodeInventoryListener(this)) - .addListener((handler, slot, reading) -> { - tool = createTool(); - }); + .addListener((handler, slot, reading) -> tool = createTool()); private int compare = IComparer.COMPARE_NBT; private int mode = IWhitelistBlacklist.BLACKLIST; @@ -316,10 +314,6 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I return upgrades; } - public IItemHandler getInventory() { - return itemFilters; - } - @Override public IItemHandler getDrops() { return upgrades; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java index 3c4468606..6a1cd8c86 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java @@ -20,7 +20,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; public class DetectorNetworkNode extends NetworkNode implements IComparable, IType { @@ -38,8 +37,8 @@ public class DetectorNetworkNode extends NetworkNode implements IComparable, ITy private static final String NBT_TYPE = "Type"; private static final String NBT_FLUID_FILTERS = "FluidFilters"; - private BaseItemHandler itemFilters = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this)); - private FluidInventory fluidFilters = new FluidInventory(1).addListener(new NetworkNodeFluidInventoryListener(this)); + private final BaseItemHandler itemFilters = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this)); + private final FluidInventory fluidFilters = new FluidInventory(1).addListener(new NetworkNodeFluidInventoryListener(this)); private int compare = IComparer.COMPARE_NBT; private int type = IType.ITEMS; @@ -210,10 +209,6 @@ public class DetectorNetworkNode extends NetworkNode implements IComparable, ITy } } - public IItemHandler getInventory() { - return itemFilters; - } - @Override public void setRedstoneMode(RedstoneMode mode) { // NO OP diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java index 413a030ec..6afc40cc8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java @@ -34,10 +34,10 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy private static final String NBT_TYPE = "Type"; private static final String NBT_FLUID_FILTERS = "FluidFilters"; - private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); - private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); + private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); + private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); - private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.CRAFTING, UpgradeItem.Type.STACK, UpgradeItem.Type.REGULATOR) + private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.CRAFTING, UpgradeItem.Type.STACK, UpgradeItem.Type.REGULATOR) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { if (!reading && !getUpgrades().hasUpgrade(UpgradeItem.Type.REGULATOR)) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java index 3e7588afc..230159125 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java @@ -20,7 +20,6 @@ import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInvento import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; import com.refinedmods.refinedstorage.tile.ExternalStorageTile; import com.refinedmods.refinedstorage.tile.config.*; -import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import com.refinedmods.refinedstorage.util.AccessTypeUtils; import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; @@ -51,8 +50,8 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP private static final String NBT_TYPE = "Type"; private static final String NBT_FLUID_FILTERS = "FluidFilters"; - private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); - private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); + private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); + private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); private int priority = 0; private int compare = IComparer.COMPARE_NBT; @@ -61,8 +60,8 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP private AccessType accessType = AccessType.INSERT_EXTRACT; private int networkTicks; - private List> itemStorages = new CopyOnWriteArrayList<>(); - private List> fluidStorages = new CopyOnWriteArrayList<>(); + private final List> itemStorages = new CopyOnWriteArrayList<>(); + private final List> fluidStorages = new CopyOnWriteArrayList<>(); public ExternalStorageNetworkNode(World world, BlockPos pos) { super(world, pos); @@ -213,17 +212,17 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP if (facing != null) { if (type == IType.ITEMS) { - for (IExternalStorageProvider provider : API.instance().getExternalStorageProviders(StorageType.ITEM)) { + for (IExternalStorageProvider provider : API.instance().getExternalStorageProviders(StorageType.ITEM)) { if (provider.canProvide(facing, getDirection())) { - itemStorages.add(provider.provide(this, () -> getFacingTile(), getDirection())); + itemStorages.add(provider.provide(this, this::getFacingTile, getDirection())); break; } } } else if (type == IType.FLUIDS) { - for (IExternalStorageProvider provider : API.instance().getExternalStorageProviders(StorageType.FLUID)) { + for (IExternalStorageProvider provider : API.instance().getExternalStorageProviders(StorageType.FLUID)) { if (provider.canProvide(facing, getDirection())) { - fluidStorages.add(provider.provide(this, () -> getFacingTile(), getDirection())); + fluidStorages.add(provider.provide(this, this::getFacingTile, getDirection())); break; } @@ -250,31 +249,6 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP return new TranslationTextComponent("gui.refinedstorage:external_storage"); } - @Override - public TileDataParameter getRedstoneModeParameter() { - return ExternalStorageTile.REDSTONE_MODE; - } - - @Override - public TileDataParameter getCompareParameter() { - return ExternalStorageTile.COMPARE; - } - - @Override - public TileDataParameter getWhitelistBlacklistParameter() { - return ExternalStorageTile.WHITELIST_BLACKLIST; - } - - @Override - public TileDataParameter getPriorityParameter() { - return ExternalStorageTile.PRIORITY; - } - - @Override - public TileDataParameter getAccessTypeParameter() { - return ExternalStorageTile.ACCESS_TYPE; - } - @Override public long getStored() { return ExternalStorageTile.STORED.getValue(); @@ -312,11 +286,6 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP markDirty(); } - @Override - public TileDataParameter getTypeParameter() { - return ExternalStorageTile.TYPE; - } - @Override public int getType() { return world.isRemote ? ExternalStorageTile.TYPE.getValue() : type; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java index e93a8c6bb..c77489e0d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java @@ -40,7 +40,7 @@ public class FluidInterfaceNetworkNode extends NetworkNode { private static final String NBT_TANK_OUT = "TankOut"; private static final String NBT_OUT = "Out"; - private FluidTank tankIn = new FluidTank(TANK_CAPACITY) { + private final FluidTank tankIn = new FluidTank(TANK_CAPACITY) { @Override protected void onContentsChanged() { super.onContentsChanged(); @@ -52,14 +52,14 @@ public class FluidInterfaceNetworkNode extends NetworkNode { markDirty(); } }; - private FluidTank tankOut = new FluidTank(TANK_CAPACITY); + private final FluidTank tankOut = new FluidTank(TANK_CAPACITY); - private ProxyFluidHandler tank = new ProxyFluidHandler(tankIn, tankOut); + private final ProxyFluidHandler tank = new ProxyFluidHandler(tankIn, tankOut); - private BaseItemHandler in = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this)).addValidator(stack -> !StackUtils.getFluid(stack, true).getValue().isEmpty()); - private FluidInventory out = new FluidInventory(1, TANK_CAPACITY).addListener(new NetworkNodeFluidInventoryListener(this)); + private final BaseItemHandler in = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this)).addValidator(stack -> !StackUtils.getFluid(stack, true).getValue().isEmpty()); + private final FluidInventory out = new FluidInventory(1, TANK_CAPACITY).addListener(new NetworkNodeFluidInventoryListener(this)); - private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK, UpgradeItem.Type.CRAFTING).addListener(new NetworkNodeInventoryListener(this)); + private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK, UpgradeItem.Type.CRAFTING).addListener(new NetworkNodeInventoryListener(this)); public FluidInterfaceNetworkNode(World world, BlockPos pos) { super(world, pos); 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 e92c39401..872898ddf 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 @@ -79,7 +79,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I private final AllowedTagList allowedTagList = new AllowedTagList(this::updateAllowedTags); - private Container craftingContainer = new Container(ContainerType.CRAFTING, 0) { + private final Container craftingContainer = new Container(ContainerType.CRAFTING, 0) { @Override public boolean canInteractWith(PlayerEntity player) { return false; @@ -93,16 +93,16 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I } }; private ICraftingRecipe currentRecipe; - private CraftingInventory matrix = new CraftingInventory(craftingContainer, 3, 3); - private CraftResultInventory result = new CraftResultInventory(); - private BaseItemHandler processingMatrix = new BaseItemHandler(9 * 2) + private final CraftingInventory matrix = new CraftingInventory(craftingContainer, 3, 3); + private final CraftResultInventory result = new CraftResultInventory(); + private final BaseItemHandler processingMatrix = new BaseItemHandler(9 * 2) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { if (!reading && slot < 9) { allowedTagList.clearItemTags(slot); } }); - private FluidInventory processingMatrixFluids = new FluidInventory(9 * 2, FluidAttributes.BUCKET_VOLUME * 64) + private final FluidInventory processingMatrixFluids = new FluidInventory(9 * 2, FluidAttributes.BUCKET_VOLUME * 64) .addListener(new NetworkNodeFluidInventoryListener(this)) .addListener((handler, slot, reading) -> { if (!reading && slot < 9) { @@ -112,9 +112,9 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I private boolean reading; - private Set craftingListeners = new HashSet<>(); + private final Set craftingListeners = new HashSet<>(); - private BaseItemHandler patterns = new BaseItemHandler(2) { + private final BaseItemHandler patterns = new BaseItemHandler(2) { @Override public int getSlotLimit(int slot) { return slot == 1 ? 1 : super.getSlotLimit(slot); @@ -171,9 +171,9 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I } })); - private List filters = new ArrayList<>(); - private List tabs = new ArrayList<>(); - private FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs).addListener(new NetworkNodeInventoryListener(this)); + private final List filters = new ArrayList<>(); + private final List tabs = new ArrayList<>(); + private final FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs).addListener(new NetworkNodeInventoryListener(this)); private final GridType type; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/IStorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/IStorageScreen.java index 93805083d..91b043a8e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/IStorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/IStorageScreen.java @@ -1,24 +1,10 @@ package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.refinedmods.refinedstorage.api.storage.AccessType; -import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.util.text.ITextComponent; public interface IStorageScreen { ITextComponent getTitle(); - TileDataParameter getTypeParameter(); - - TileDataParameter getRedstoneModeParameter(); - - TileDataParameter getCompareParameter(); - - TileDataParameter getWhitelistBlacklistParameter(); - - TileDataParameter getPriorityParameter(); - - TileDataParameter getAccessTypeParameter(); - long getStored(); long getCapacity(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java index a32685159..bbc104cd3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java @@ -36,10 +36,10 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh private static final String NBT_TYPE = "Type"; private static final String NBT_FLUID_FILTERS = "FLuidFilters"; - private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); - private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); + private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); + private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); - private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK).addListener(new NetworkNodeInventoryListener(this)); + private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK).addListener(new NetworkNodeInventoryListener(this)); private int compare = IComparer.COMPARE_NBT; private int mode = IWhitelistBlacklist.BLACKLIST; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java index 19fed2264..6f07c0606 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java @@ -29,14 +29,14 @@ public class InterfaceNetworkNode extends NetworkNode implements IComparable { private static final String NBT_COMPARE = "Compare"; - private BaseItemHandler importItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); + private final BaseItemHandler importItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); - private BaseItemHandler exportFilterItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); - private BaseItemHandler exportItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); + private final BaseItemHandler exportFilterItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); + private final BaseItemHandler exportItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); - private IItemHandler items = new ProxyItemHandler(importItems, exportItems); + private final IItemHandler items = new ProxyItemHandler(importItems, exportItems); - private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK, UpgradeItem.Type.CRAFTING) + private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK, UpgradeItem.Type.CRAFTING) .addListener(new NetworkNodeInventoryListener(this)); private int compare = IComparer.COMPARE_NBT; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java index 9268d2869..01113b52a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java @@ -22,7 +22,7 @@ import javax.annotation.Nullable; public class NetworkTransmitterNetworkNode extends NetworkNode { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "network_transmitter"); - private BaseItemHandler networkCard = new BaseItemHandler(1) + private final BaseItemHandler networkCard = new BaseItemHandler(1) .addValidator(new ItemValidator(RSItems.NETWORK_CARD)) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java index dbf1cae75..9db9a7fe0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java @@ -28,10 +28,10 @@ import java.util.UUID; public class SecurityManagerNetworkNode extends NetworkNode implements ISecurityCardContainer { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "security_manager"); - private List cards = new ArrayList<>(); + private final List cards = new ArrayList<>(); private ISecurityCard globalCard; - private BaseItemHandler cardsInv = new BaseItemHandler(9 * 2) + private final BaseItemHandler cardsInv = new BaseItemHandler(9 * 2) .addValidator(new ItemValidator(RSItems.SECURITY_CARD)) .addListener(new NetworkNodeInventoryListener(this)) .addListener(((handler, slot, reading) -> { @@ -44,7 +44,7 @@ public class SecurityManagerNetworkNode extends NetworkNode implements ISecurity } })); - private BaseItemHandler editCard = new BaseItemHandler(1) + private final BaseItemHandler editCard = new BaseItemHandler(1) .addValidator(new ItemValidator(RSItems.SECURITY_CARD)) .addListener(new NetworkNodeInventoryListener(this)); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java index 72a353986..8ed9cb1d1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java @@ -5,8 +5,8 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import java.util.Objects; public class SlottedCraftingRequest { - private INetworkNode node; - private int slot; + private final INetworkNode node; + private final int slot; public SlottedCraftingRequest(INetworkNode node, int slot) { this.node = node; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java index 94de8c872..8e40129d4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java @@ -42,7 +42,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl private static final String NBT_TYPE = "Type"; private static final String NBT_FLUID_FILTERS = "FluidFilters"; - private BaseItemHandler itemFilter = new BaseItemHandler(1) + private final BaseItemHandler itemFilter = new BaseItemHandler(1) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { if (!reading) { @@ -50,13 +50,13 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl } }); - private FluidInventory fluidFilter = new FluidInventory(1, FluidAttributes.BUCKET_VOLUME) + private final FluidInventory fluidFilter = new FluidInventory(1, FluidAttributes.BUCKET_VOLUME) .addListener((handler, slot, reading) -> { if (!reading) { WorldUtils.updateBlock(world, pos); } }); - private Map> deposits = new HashMap<>(); + private final Map> deposits = new HashMap<>(); private int compare = IComparer.COMPARE_NBT; private int type = IType.ITEMS; @@ -216,17 +216,15 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl boolean shift = player.isCrouching(); if (shift) { - NetworkUtils.extractBucketFromPlayerInventoryOrNetwork(player, network, bucket -> { - bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null).ifPresent(fluidHandler -> { - network.getFluidStorageTracker().changed(player, stack.copy()); + NetworkUtils.extractBucketFromPlayerInventoryOrNetwork(player, network, bucket -> bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null).ifPresent(fluidHandler -> { + network.getFluidStorageTracker().changed(player, stack.copy()); - fluidHandler.fill(network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, Action.PERFORM), IFluidHandler.FluidAction.EXECUTE); + fluidHandler.fill(network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, Action.PERFORM), IFluidHandler.FluidAction.EXECUTE); - if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) { - InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), fluidHandler.getContainer()); - } - }); - }); + if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) { + InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), fluidHandler.getContainer()); + } + })); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java index affddb464..f95fd6b1b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java @@ -20,7 +20,7 @@ import javax.annotation.Nullable; public class WirelessTransmitterNetworkNode extends NetworkNode implements IWirelessTransmitter { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "wireless_transmitter"); - private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.RANGE).addListener(new NetworkNodeInventoryListener(this)); + private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.RANGE).addListener(new NetworkNodeInventoryListener(this)); public WirelessTransmitterNetworkNode(World world, BlockPos pos) { super(world, pos); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java index c2fecb5d0..fd0dfe7d5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java @@ -54,13 +54,13 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide private int ticksSinceBlockUpdateRequested; private boolean blockUpdateRequested; - private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); - private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); + private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); + private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); - private IStorageDisk[] itemDisks = new IStorageDisk[8]; - private IStorageDisk[] fluidDisks = new IStorageDisk[8]; + private final IStorageDisk[] itemDisks = new IStorageDisk[8]; + private final IStorageDisk[] fluidDisks = new IStorageDisk[8]; - private BaseItemHandler disks = new BaseItemHandler(8) + private final BaseItemHandler disks = new BaseItemHandler(8) .addValidator(new StorageDiskItemValidator()) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java index bc3763f1f..f554be166 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java @@ -17,8 +17,8 @@ import javax.annotation.Nullable; import java.util.Collection; public class FluidDriveWrapperStorageDisk implements IStorageDisk { - private DiskDriveNetworkNode diskDrive; - private IStorageDisk parent; + private final DiskDriveNetworkNode diskDrive; + private final IStorageDisk parent; private DiskState lastState; public FluidDriveWrapperStorageDisk(DiskDriveNetworkNode diskDrive, IStorageDisk parent) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java index b409b30c4..f291bcf0d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java @@ -17,8 +17,8 @@ import javax.annotation.Nullable; import java.util.Collection; public class ItemDriveWrapperStorageDisk implements IStorageDisk { - private DiskDriveNetworkNode diskDrive; - private IStorageDisk parent; + private final DiskDriveNetworkNode diskDrive; + private final IStorageDisk parent; private DiskState lastState; public ItemDriveWrapperStorageDisk(DiskDriveNetworkNode diskDrive, IStorageDisk parent) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java index c693e52df..bc1153d2d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java @@ -56,10 +56,10 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab private int type = IType.ITEMS; private int ioMode = IO_MODE_INSERT; - private IStorageDisk[] itemDisks = new IStorageDisk[6]; - private IStorageDisk[] fluidDisks = new IStorageDisk[6]; + private final IStorageDisk[] itemDisks = new IStorageDisk[6]; + private final IStorageDisk[] fluidDisks = new IStorageDisk[6]; - private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK) { + private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK) { @Override public int getStackInteractCount() { int count = super.getStackInteractCount(); @@ -72,7 +72,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab } }.addListener(new NetworkNodeInventoryListener(this)); - private BaseItemHandler inputDisks = new BaseItemHandler(3) + private final BaseItemHandler inputDisks = new BaseItemHandler(3) .addValidator(new StorageDiskItemValidator()) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { @@ -93,7 +93,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab } }); - private BaseItemHandler outputDisks = new BaseItemHandler(3) + private final BaseItemHandler outputDisks = new BaseItemHandler(3) .addValidator(new StorageDiskItemValidator()) .addListener(new NetworkNodeInventoryListener(this)) .addListener(((handler, slot, reading) -> { @@ -114,10 +114,10 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab } })); - private ProxyItemHandler disks = new ProxyItemHandler(inputDisks, outputDisks); + private final ProxyItemHandler disks = new ProxyItemHandler(inputDisks, outputDisks); - private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); - private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); + private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); + private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); public DiskManipulatorNetworkNode(World world, BlockPos pos) { super(world, pos); @@ -149,7 +149,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab IStorageDisk storage = itemDisks[slot]; if (ioMode == IO_MODE_INSERT) { - insertItemIntoNetwork(storage, slot); + insertItemIntoNetwork(storage); } else if (ioMode == IO_MODE_EXTRACT) { extractItemFromNetwork(storage, slot); } @@ -172,8 +172,9 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab } } - private void insertItemIntoNetwork(IStorageDisk storage, int slot) { + private void insertItemIntoNetwork(IStorageDisk storage) { List stacks = new ArrayList<>(storage.getStacks()); + for (int i = 0; i < stacks.size(); ++i) { ItemStack stack = stacks.get(i); @@ -209,6 +210,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab } List stacks = new ArrayList<>(storage.getStacks()); + for (int i = 0; i < stacks.size(); ++i) { ItemStack stack = stacks.get(i); @@ -222,6 +224,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab return false; } } + return true; } @@ -304,6 +307,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab } List stacks = new ArrayList<>(storage.getStacks()); + for (int i = 0; i < stacks.size(); ++i) { FluidStack stack = stacks.get(i); @@ -317,6 +321,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab return false; } } + return true; } @@ -465,14 +470,6 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab return upgrades; } - public IStorageDisk[] getItemDisks() { - return itemDisks; - } - - public IStorageDisk[] getFluidDisks() { - return fluidDisks; - } - @Override public void read(CompoundNBT tag) { super.read(tag); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java index 1f6801a78..fa706409c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java @@ -18,8 +18,8 @@ import javax.annotation.Nullable; import java.util.Collection; public class StorageDiskFluidManipulatorWrapper implements IStorageDisk { - private DiskManipulatorNetworkNode diskManipulator; - private IStorageDisk parent; + private final DiskManipulatorNetworkNode diskManipulator; + private final IStorageDisk parent; private DiskState lastState; public StorageDiskFluidManipulatorWrapper(DiskManipulatorNetworkNode diskManipulator, IStorageDisk parent) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java index 27df6c216..182d5e30f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java @@ -18,8 +18,8 @@ import javax.annotation.Nullable; import java.util.Collection; public class StorageDiskItemManipulatorWrapper implements IStorageDisk { - private DiskManipulatorNetworkNode diskManipulator; - private IStorageDisk parent; + private final DiskManipulatorNetworkNode diskManipulator; + private final IStorageDisk parent; private DiskState lastState; public StorageDiskItemManipulatorWrapper(DiskManipulatorNetworkNode diskManipulator, IStorageDisk parent) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java index 963ef3f39..f61b5fc58 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java @@ -22,7 +22,6 @@ import com.refinedmods.refinedstorage.tile.config.IAccessType; import com.refinedmods.refinedstorage.tile.config.IComparable; import com.refinedmods.refinedstorage.tile.config.IPrioritizable; import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; -import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import com.refinedmods.refinedstorage.util.AccessTypeUtils; import com.refinedmods.refinedstorage.util.FluidStorageBlockUtils; import net.minecraft.item.ItemStack; @@ -55,9 +54,9 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre private static final String NBT_FILTERS = "Filters"; public static final String NBT_ID = "Id"; - private FluidInventory filters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); + private final FluidInventory filters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); - private FluidStorageType type; + private final FluidStorageType type; private AccessType accessType = AccessType.INSERT_EXTRACT; private int priority = 0; @@ -234,36 +233,6 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre return new TranslationTextComponent("block.refinedstorage." + type.getName() + "_fluid_storage_block"); } - @Override - public TileDataParameter getTypeParameter() { - return null; - } - - @Override - public TileDataParameter getRedstoneModeParameter() { - return FluidStorageTile.REDSTONE_MODE; - } - - @Override - public TileDataParameter getCompareParameter() { - return FluidStorageTile.COMPARE; - } - - @Override - public TileDataParameter getWhitelistBlacklistParameter() { - return FluidStorageTile.WHITELIST_BLACKLIST; - } - - @Override - public TileDataParameter getPriorityParameter() { - return FluidStorageTile.PRIORITY; - } - - @Override - public TileDataParameter getAccessTypeParameter() { - return FluidStorageTile.ACCESS_TYPE; - } - @Override public long getStored() { return FluidStorageTile.STORED.getValue(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java index 5970d9c51..cf4f09f2d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java @@ -16,8 +16,8 @@ import javax.annotation.Nullable; import java.util.Collection; public class FluidStorageWrapperStorageDisk implements IStorageDisk { - private FluidStorageNetworkNode storage; - private IStorageDisk parent; + private final FluidStorageNetworkNode storage; + private final IStorageDisk parent; public FluidStorageWrapperStorageDisk(FluidStorageNetworkNode storage, IStorageDisk parent) { this.storage = storage; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java index 0a90a932b..8e18dd2bc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java @@ -16,8 +16,8 @@ import javax.annotation.Nullable; import java.util.Collection; public class ItemStorageWrapperStorageDisk implements IStorageDisk { - private StorageNetworkNode storage; - private IStorageDisk parent; + private final StorageNetworkNode storage; + private final IStorageDisk parent; public ItemStorageWrapperStorageDisk(StorageNetworkNode storage, IStorageDisk parent) { this.storage = storage; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java index 6d81b9e2e..235493000 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java @@ -22,7 +22,6 @@ import com.refinedmods.refinedstorage.tile.config.IAccessType; import com.refinedmods.refinedstorage.tile.config.IComparable; import com.refinedmods.refinedstorage.tile.config.IPrioritizable; import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; -import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import com.refinedmods.refinedstorage.util.AccessTypeUtils; import com.refinedmods.refinedstorage.util.StackUtils; import com.refinedmods.refinedstorage.util.StorageBlockUtils; @@ -55,7 +54,7 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I private static final String NBT_MODE = "Mode"; public static final String NBT_ID = "Id"; - private BaseItemHandler filters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); + private final BaseItemHandler filters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); private final ItemStorageType type; @@ -233,36 +232,6 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I return new TranslationTextComponent("block.refinedstorage." + type.getName() + "_storage_block"); } - @Override - public TileDataParameter getTypeParameter() { - return null; - } - - @Override - public TileDataParameter getRedstoneModeParameter() { - return StorageTile.REDSTONE_MODE; - } - - @Override - public TileDataParameter getCompareParameter() { - return StorageTile.COMPARE; - } - - @Override - public TileDataParameter getWhitelistBlacklistParameter() { - return StorageTile.WHITELIST_BLACKLIST; - } - - @Override - public TileDataParameter getPriorityParameter() { - return StorageTile.PRIORITY; - } - - @Override - public TileDataParameter getAccessTypeParameter() { - return StorageTile.ACCESS_TYPE; - } - @Override public long getStored() { return StorageTile.STORED.getValue(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityCard.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityCard.java index 604313865..2eea30e81 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityCard.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityCard.java @@ -9,8 +9,8 @@ import java.util.Map; import java.util.UUID; public class SecurityCard implements ISecurityCard { - private UUID owner; - private Map permissions = new HashMap<>(); + private final UUID owner; + private final Map permissions = new HashMap<>(); public SecurityCard(@Nullable UUID owner) { this.owner = owner; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java index 976a29f50..c76a2b6ed 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java @@ -14,8 +14,8 @@ import java.util.Map; import java.util.UUID; public class SecurityManager implements ISecurityManager { - private INetwork network; - private Map cards = new HashMap<>(); + private final INetwork network; + private final Map cards = new HashMap<>(); private ISecurityCard globalCard; public SecurityManager(INetwork network) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java index a8833138c..eee5c0d1b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java @@ -3,6 +3,7 @@ package com.refinedmods.refinedstorage.apiimpl.render; import com.mojang.blaze3d.systems.RenderSystem; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.render.IElementDrawer; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.FontRenderer; @@ -11,14 +12,14 @@ public class CraftingMonitorElementDrawers extends ElementDrawers { private int itemWidth; private int itemHeight; - private IElementDrawer overlayDrawer = (x, y, color) -> { + private final IElementDrawer overlayDrawer = (x, y, color) -> { RenderSystem.color4f(1, 1, 1, 1); RenderSystem.disableLighting(); AbstractGui.fill(x, y, x + itemWidth, y + itemHeight, color); }; - private IElementDrawer errorDrawer = (x, y, nothing) -> { + private final IElementDrawer errorDrawer = (x, y, nothing) -> { RenderSystem.color4f(1, 1, 1, 1); RenderSystem.disableLighting(); @@ -26,7 +27,7 @@ public class CraftingMonitorElementDrawers extends ElementDrawers { screen.blit(x + itemWidth - 12 - 2, y + itemHeight - 12 - 2, 0, 244, 12, 12); }; - public CraftingMonitorElementDrawers(BaseScreen gui, FontRenderer fontRenderer, int itemWidth, int itemHeight) { + public CraftingMonitorElementDrawers(BaseScreen gui, FontRenderer fontRenderer, int itemWidth, int itemHeight) { super(gui, fontRenderer); this.itemWidth = itemWidth; @@ -39,7 +40,7 @@ public class CraftingMonitorElementDrawers extends ElementDrawers { } @Override - public IElementDrawer getErrorDrawer() { + public IElementDrawer getErrorDrawer() { return errorDrawer; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java index 2d9f73db2..ad64a903a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java @@ -3,21 +3,19 @@ package com.refinedmods.refinedstorage.apiimpl.render; import com.mojang.blaze3d.systems.RenderSystem; import com.refinedmods.refinedstorage.api.render.IElementDrawer; import com.refinedmods.refinedstorage.screen.grid.CraftingPreviewScreen; +import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.FontRenderer; public class CraftingPreviewElementDrawers extends ElementDrawers { - private CraftingPreviewScreen screen; - private IElementDrawer overlayDrawer = (x, y, colour) -> { + private final IElementDrawer overlayDrawer = (x, y, colour) -> { RenderSystem.color4f(1, 1, 1, 1); RenderSystem.disableLighting(); - screen.fill(x, y, x + 73, y + 29, colour); + AbstractGui.fill(x, y, x + 73, y + 29, colour); }; public CraftingPreviewElementDrawers(CraftingPreviewScreen screen, FontRenderer fontRenderer) { super(screen, fontRenderer); - - this.screen = screen; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/ElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/ElementDrawers.java index f7132fdd9..1436ff013 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/ElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/ElementDrawers.java @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; public class ElementDrawers implements IElementDrawers { - protected BaseScreen screen; - private FontRenderer fontRenderer; + protected final BaseScreen screen; + private final FontRenderer fontRenderer; public ElementDrawers(BaseScreen screen, FontRenderer fontRenderer) { this.screen = screen; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/FluidStorageType.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/FluidStorageType.java index 9d1d706c4..d87e687b6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/FluidStorageType.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/FluidStorageType.java @@ -7,8 +7,8 @@ public enum FluidStorageType { FOUR_THOUSAND_NINETY_SIX_K("4096k", 4096_000), CREATIVE("creative", -1); - private String name; - private int capacity; + private final String name; + private final int capacity; FluidStorageType(String name, int capacity) { this.name = name; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/ItemStorageType.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/ItemStorageType.java index 9bc2e3134..e4c04c0d9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/ItemStorageType.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/ItemStorageType.java @@ -7,8 +7,8 @@ public enum ItemStorageType { SIXTY_FOUR_K("64k", 64_000), CREATIVE("creative", -1); - private String name; - private int capacity; + private final String name; + private final int capacity; ItemStorageType(String name, int capacity) { this.name = name; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java index 180632d08..1eb03a182 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java @@ -16,9 +16,9 @@ import java.util.LinkedList; import java.util.List; public class PortableFluidStorageCache implements IStorageCache { - private IPortableGrid portableGrid; - private IStackList list = API.instance().createFluidStackList(); - private List> listeners = new LinkedList<>(); + private final IPortableGrid portableGrid; + private final IStackList list = API.instance().createFluidStackList(); + private final List> listeners = new LinkedList<>(); public PortableFluidStorageCache(IPortableGrid portableGrid) { this.portableGrid = portableGrid; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java index f6e368731..c0a4f538b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java @@ -16,9 +16,9 @@ import java.util.LinkedList; import java.util.List; public class PortableItemStorageCache implements IStorageCache { - private IPortableGrid portableGrid; - private IStackList list = API.instance().createItemStackList(); - private List> listeners = new LinkedList<>(); + private final IPortableGrid portableGrid; + private final IStackList list = API.instance().createItemStackList(); + private final List> listeners = new LinkedList<>(); public PortableItemStorageCache(IPortableGrid portableGrid) { this.portableGrid = portableGrid; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java index a4d37ddcb..ba785f58a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java @@ -14,8 +14,8 @@ import java.util.ArrayList; import java.util.List; public class FluidGridStorageCacheListener implements IStorageCacheListener { - private ServerPlayerEntity player; - private INetwork network; + private final ServerPlayerEntity player; + private final INetwork network; public FluidGridStorageCacheListener(ServerPlayerEntity player, INetwork network) { this.player = player; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java index 92bdc9e71..84662776d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java @@ -14,8 +14,8 @@ import java.util.ArrayList; import java.util.List; public class ItemGridStorageCacheListener implements IStorageCacheListener { - private ServerPlayerEntity player; - private INetwork network; + private final ServerPlayerEntity player; + private final INetwork network; public ItemGridStorageCacheListener(ServerPlayerEntity player, INetwork network) { this.player = player; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java index 29d165e88..1a48388fa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.List; public class PortableFluidGridStorageCacheListener implements IStorageCacheListener { - private IPortableGrid portableGrid; - private ServerPlayerEntity player; + private final IPortableGrid portableGrid; + private final ServerPlayerEntity player; public PortableFluidGridStorageCacheListener(IPortableGrid portableGrid, ServerPlayerEntity player) { this.portableGrid = portableGrid; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java index abf547e01..fb5abf2eb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.List; public class PortableItemGridStorageCacheListener implements IStorageCacheListener { - private IPortableGrid portableGrid; - private ServerPlayerEntity player; + private final IPortableGrid portableGrid; + private final ServerPlayerEntity player; public PortableItemGridStorageCacheListener(IPortableGrid portableGrid, ServerPlayerEntity player) { this.portableGrid = portableGrid; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java index 0674016d6..a95aeec31 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java @@ -28,9 +28,9 @@ public class FluidStorageDisk implements IStorageDisk { public static final int VERSION = 1; @Nullable - private ServerWorld world; - private int capacity; - private Multimap stacks = ArrayListMultimap.create(); + private final ServerWorld world; + private final int capacity; + private final Multimap stacks = ArrayListMultimap.create(); @Nullable private IStorageDiskListener listener; @@ -155,7 +155,7 @@ public class FluidStorageDisk implements IStorageDisk { @Override public int getStored() { - return stacks.values().stream().mapToInt(s -> s.getAmount()).sum(); + return stacks.values().stream().mapToInt(FluidStack::getAmount).sum(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java index 26881950b..a0bf5cc6e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java @@ -29,9 +29,9 @@ public class ItemStorageDisk implements IStorageDisk { public static final int VERSION = 1; @Nullable - private ServerWorld world; - private int capacity; - private Multimap stacks = ArrayListMultimap.create(); + private final ServerWorld world; + private final int capacity; + private final Multimap stacks = ArrayListMultimap.create(); @Nullable private IStorageDiskListener listener; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java index 8096993d6..2112c453f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java @@ -15,8 +15,8 @@ import javax.annotation.Nullable; import java.util.Collection; public class PortableFluidStorageDisk implements IStorageDisk { - private IStorageDisk parent; - private IPortableGrid portableGrid; + private final IStorageDisk parent; + private final IPortableGrid portableGrid; public PortableFluidStorageDisk(IStorageDisk parent, IPortableGrid portableGrid) { this.parent = parent; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java index fb1818da4..baa278f07 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java @@ -15,8 +15,8 @@ import javax.annotation.Nullable; import java.util.Collection; public class PortableItemStorageDisk implements IStorageDisk { - private IStorageDisk parent; - private IPortableGrid portableGrid; + private final IStorageDisk parent; + private final IPortableGrid portableGrid; public PortableItemStorageDisk(IStorageDisk parent, IPortableGrid portableGrid) { this.parent = parent; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java index 3f19d9f2f..de6727255 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; public class StorageDiskRegistry implements IStorageDiskRegistry { - private Map factories = new HashMap<>(); + private final Map factories = new HashMap<>(); @Override public void add(ResourceLocation id, IStorageDiskFactory factory) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java index a5d6b0c81..7cfb8cf64 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java @@ -13,8 +13,8 @@ import java.util.UUID; public class StorageDiskSync implements IStorageDiskSync { private static final int THROTTLE_MS = 500; - private Map data = new HashMap<>(); - private Map syncTime = new HashMap<>(); + private final Map data = new HashMap<>(); + private final Map syncTime = new HashMap<>(); @Nullable @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java index b13011df1..066d5d5bd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java @@ -18,10 +18,10 @@ import java.util.List; import java.util.function.Supplier; public class FluidExternalStorage implements IExternalStorage { - private IExternalStorageContext context; - private Supplier handlerSupplier; - private boolean connectedToInterface; - private FluidExternalStorageCache cache = new FluidExternalStorageCache(); + private final IExternalStorageContext context; + private final Supplier handlerSupplier; + private final boolean connectedToInterface; + private final FluidExternalStorageCache cache = new FluidExternalStorageCache(); public FluidExternalStorage(IExternalStorageContext context, Supplier handlerSupplier, boolean connectedToInterface) { this.context = context; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java index 218c8c34a..b54fea94e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java @@ -19,10 +19,10 @@ import java.util.List; import java.util.function.Supplier; public class ItemExternalStorage implements IExternalStorage { - private IExternalStorageContext context; - private Supplier handlerSupplier; - private boolean connectedToInterface; - private ItemExternalStorageCache cache = new ItemExternalStorageCache(); + private final IExternalStorageContext context; + private final Supplier handlerSupplier; + private final boolean connectedToInterface; + private final ItemExternalStorageCache cache = new ItemExternalStorageCache(); public ItemExternalStorage(IExternalStorageContext context, Supplier handlerSupplier, boolean connectedToInterface) { this.context = context; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java index e3c0e7bc0..6857696be 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java @@ -64,7 +64,7 @@ public class FluidStorageTracker implements IStorageTracker { return list; } - private class Key { + private static class Key { private final FluidStack stack; public Key(FluidStack stack) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java index 7b1243b0b..0b74b5743 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java @@ -64,7 +64,7 @@ public class ItemStorageTracker implements IStorageTracker { return list; } - private class Key { + private static class Key { private final ItemStack stack; public Key(ItemStack stack) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidFilter.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidFilter.java index 49f6ced7f..41cb95124 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidFilter.java @@ -4,10 +4,10 @@ import com.refinedmods.refinedstorage.api.util.IFilter; import net.minecraftforge.fluids.FluidStack; public class FluidFilter implements IFilter { - private FluidStack stack; - private int compare; - private int mode; - private boolean modFilter; + private final FluidStack stack; + private final int compare; + private final int mode; + private final boolean modFilter; public FluidFilter(FluidStack stack, int compare, int mode, boolean modFilter) { this.stack = stack; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemFilter.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemFilter.java index 8a8837574..578b85650 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemFilter.java @@ -4,10 +4,10 @@ import com.refinedmods.refinedstorage.api.util.IFilter; import net.minecraft.item.ItemStack; public class ItemFilter implements IFilter { - private ItemStack stack; - private int compare; - private int mode; - private boolean modFilter; + private final ItemStack stack; + private final int compare; + private final int mode; + private final boolean modFilter; public ItemFilter(ItemStack stack, int compare, int mode, boolean modFilter) { this.stack = stack; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/QuantityFormatter.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/QuantityFormatter.java index 3ce1dd946..cdc1181f2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/QuantityFormatter.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/QuantityFormatter.java @@ -10,9 +10,9 @@ import java.text.DecimalFormatSymbols; import java.util.Locale; public class QuantityFormatter implements IQuantityFormatter { - private DecimalFormat formatterWithUnits = new DecimalFormat("####0.#", DecimalFormatSymbols.getInstance(Locale.US)); - private DecimalFormat formatter = new DecimalFormat("#,###", DecimalFormatSymbols.getInstance(Locale.US)); - private DecimalFormat bucketFormatter = new DecimalFormat("####0.###", DecimalFormatSymbols.getInstance(Locale.US)); + private final DecimalFormat formatterWithUnits = new DecimalFormat("####0.#", DecimalFormatSymbols.getInstance(Locale.US)); + private final DecimalFormat formatter = new DecimalFormat("#,###", DecimalFormatSymbols.getInstance(Locale.US)); + private final DecimalFormat bucketFormatter = new DecimalFormat("####0.###", DecimalFormatSymbols.getInstance(Locale.US)); public QuantityFormatter() { formatterWithUnits.setRoundingMode(RoundingMode.DOWN); diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java index d0aa2d26c..d5de34fad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java @@ -120,6 +120,7 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { } @Override + @SuppressWarnings("deprecation") public IFluidState getFluidState(BlockState state) { return state.get(WATERLOGGED) ? Fluids.WATER.getStillFluidState(false) : super.getFluidState(state); } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java index b2331ae4b..252bae012 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java @@ -39,7 +39,7 @@ public class ControllerBlock extends BaseBlock { NEARLY_ON("nearly_on"), ON("on"); - private String name; + private final String name; EnergyType(String name) { this.name = name; @@ -58,7 +58,7 @@ public class ControllerBlock extends BaseBlock { public static final EnumProperty ENERGY_TYPE = EnumProperty.create("energy_type", EnergyType.class); - private NetworkType type; + private final NetworkType type; public ControllerBlock(NetworkType type) { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); diff --git a/src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java b/src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java index 0bd94f7ce..568a0436b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java +++ b/src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java @@ -15,7 +15,7 @@ import java.util.concurrent.Callable; public class NetworkNodeProxyCapability { @CapabilityInject(INetworkNodeProxy.class) - public static Capability NETWORK_NODE_PROXY_CAPABILITY = null; + public static final Capability NETWORK_NODE_PROXY_CAPABILITY = null; public static void register() { CapabilityManager.INSTANCE.register(INetworkNodeProxy.class, new Storage(), new Factory()); diff --git a/src/main/java/com/refinedmods/refinedstorage/config/ClientConfig.java b/src/main/java/com/refinedmods/refinedstorage/config/ClientConfig.java index 41840408d..856600bca 100644 --- a/src/main/java/com/refinedmods/refinedstorage/config/ClientConfig.java +++ b/src/main/java/com/refinedmods/refinedstorage/config/ClientConfig.java @@ -3,11 +3,11 @@ package com.refinedmods.refinedstorage.config; import net.minecraftforge.common.ForgeConfigSpec; public class ClientConfig { - private ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); - private ForgeConfigSpec spec; + private final ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); + private final ForgeConfigSpec spec; - private Grid grid; - private CrafterManager crafterManager; + private final Grid grid; + private final CrafterManager crafterManager; public ClientConfig() { grid = new Grid(); diff --git a/src/main/java/com/refinedmods/refinedstorage/config/ServerConfig.java b/src/main/java/com/refinedmods/refinedstorage/config/ServerConfig.java index 7fceb3c7a..3085affc9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/config/ServerConfig.java +++ b/src/main/java/com/refinedmods/refinedstorage/config/ServerConfig.java @@ -3,39 +3,39 @@ package com.refinedmods.refinedstorage.config; import net.minecraftforge.common.ForgeConfigSpec; public class ServerConfig { - private ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); - private ForgeConfigSpec spec; + private final ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); + private final ForgeConfigSpec spec; - private Upgrades upgrades; - private Controller controller; - private Cable cable; - private Grid grid; - private DiskDrive diskDrive; - private StorageBlock storageBlock; - private FluidStorageBlock fluidStorageBlock; - private ExternalStorage externalStorage; - private Importer importer; - private Exporter exporter; - private NetworkReceiver networkReceiver; - private NetworkTransmitter networkTransmitter; - private Relay relay; - private Detector detector; - private SecurityManager securityManager; - private Interface _interface; - private FluidInterface fluidInterface; - private WirelessTransmitter wirelessTransmitter; - private StorageMonitor storageMonitor; - private WirelessGrid wirelessGrid; - private WirelessFluidGrid wirelessFluidGrid; - private Constructor constructor; - private Destructor destructor; - private DiskManipulator diskManipulator; - private PortableGrid portableGrid; - private Crafter crafter; - private CrafterManager crafterManager; - private CraftingMonitor craftingMonitor; - private WirelessCraftingMonitor wirelessCraftingMonitor; - private Autocrafting autocrafting; + private final Upgrades upgrades; + private final Controller controller; + private final Cable cable; + private final Grid grid; + private final DiskDrive diskDrive; + private final StorageBlock storageBlock; + private final FluidStorageBlock fluidStorageBlock; + private final ExternalStorage externalStorage; + private final Importer importer; + private final Exporter exporter; + private final NetworkReceiver networkReceiver; + private final NetworkTransmitter networkTransmitter; + private final Relay relay; + private final Detector detector; + private final SecurityManager securityManager; + private final Interface _interface; + private final FluidInterface fluidInterface; + private final WirelessTransmitter wirelessTransmitter; + private final StorageMonitor storageMonitor; + private final WirelessGrid wirelessGrid; + private final WirelessFluidGrid wirelessFluidGrid; + private final Constructor constructor; + private final Destructor destructor; + private final DiskManipulator diskManipulator; + private final PortableGrid portableGrid; + private final Crafter crafter; + private final CrafterManager crafterManager; + private final CraftingMonitor craftingMonitor; + private final WirelessCraftingMonitor wirelessCraftingMonitor; + private final Autocrafting autocrafting; public ServerConfig() { upgrades = new Upgrades(); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java index dfbd9f826..6370ad62e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java @@ -26,15 +26,15 @@ import java.util.List; public abstract class BaseContainer extends Container { @Nullable - private BaseTile tile; + private final BaseTile tile; @Nullable private TileDataWatcher listener; - private PlayerEntity player; + private final PlayerEntity player; - protected TransferManager transferManager = new TransferManager(this); + protected final TransferManager transferManager = new TransferManager(this); - private List fluidSlots = new ArrayList<>(); - private List fluids = new ArrayList<>(); + private final List fluidSlots = new ArrayList<>(); + private final List fluids = new ArrayList<>(); public BaseContainer(@Nullable ContainerType type, @Nullable BaseTile tile, PlayerEntity player, int windowId) { super(type, windowId); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java index c4f1e7091..8270c30a2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java @@ -28,10 +28,10 @@ import java.util.function.Predicate; public class CrafterManagerContainer extends BaseContainer { private IScreenInfoProvider screenInfoProvider; - private CrafterManagerNetworkNode crafterManager; + private final CrafterManagerNetworkNode crafterManager; private Map containerData; - private Map dummyInventories = new HashMap<>(); - private Map headings = new HashMap<>(); + private final Map dummyInventories = new HashMap<>(); + private final Map headings = new HashMap<>(); private int rows; public CrafterManagerContainer(CrafterManagerTile crafterManager, PlayerEntity player, int windowId) { diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java index 5404263ec..07e6b3c9d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java @@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nullable; public class CraftingMonitorContainer extends BaseContainer implements ICraftingMonitorListener { - private ICraftingMonitor craftingMonitor; + private final ICraftingMonitor craftingMonitor; private boolean addedListener; public CraftingMonitorContainer(ContainerType type, ICraftingMonitor craftingMonitor, @Nullable CraftingMonitorTile craftingMonitorTile, PlayerEntity player, int windowId) { diff --git a/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java index 0cb5296d3..9dd600526 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java @@ -14,7 +14,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; public class FilterContainer extends BaseContainer { - private ItemStack stack; + private final ItemStack stack; public FilterContainer(PlayerEntity player, ItemStack stack, int windowId) { super(RSContainers.FILTER, null, player, windowId); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java index 291e11490..ad393239f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java @@ -31,7 +31,7 @@ import net.minecraftforge.items.SlotItemHandler; import javax.annotation.Nullable; public class GridContainer extends BaseContainer implements ICraftingGridListener { - private IGrid grid; + private final IGrid grid; private IStorageCache cache; private IStorageCacheListener listener; private IScreenInfoProvider screenInfoProvider; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java index 737baffab..d92e99f40 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java @@ -5,9 +5,9 @@ import com.refinedmods.refinedstorage.screen.IScreenInfoProvider; import net.minecraftforge.items.IItemHandler; public class CrafterManagerSlot extends BaseSlot { - private boolean visible; - private CrafterManagerNetworkNode crafterManager; - private IScreenInfoProvider display; + private final boolean visible; + private final CrafterManagerNetworkNode crafterManager; + private final IScreenInfoProvider display; public CrafterManagerSlot(IItemHandler itemHandler, int inventoryIndex, int x, int y, boolean visible, IScreenInfoProvider display, CrafterManagerNetworkNode crafterManager) { super(itemHandler, inventoryIndex, x, y); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java index e3320b840..6a4255bed 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java @@ -13,7 +13,7 @@ public class FilterSlot extends BaseSlot { public static final int FILTER_ALLOW_BLOCKS = 2; public static final int FILTER_ALLOW_ALTERNATIVES = 4; - private int flags; + private final int flags; public FilterSlot(IItemHandler handler, int inventoryIndex, int x, int y, int flags) { super(handler, inventoryIndex, x, y); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java index 307b3ccfb..f6e1f8edd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java @@ -13,8 +13,8 @@ public class FluidFilterSlot extends BaseSlot { public static final int FILTER_ALLOW_SIZE = 1; public static final int FILTER_ALLOW_ALTERNATIVES = 2; - private int flags; - private FluidInventory fluidInventory; + private final int flags; + private final FluidInventory fluidInventory; public FluidFilterSlot(FluidInventory inventory, int inventoryIndex, int x, int y, int flags) { super(new ItemStackHandler(inventory.getSlots()), inventoryIndex, x, y); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java index f1a1c8ae5..9600286dd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; public class ResultCraftingGridSlot extends CraftingResultSlot { - private IGrid grid; + private final IGrid grid; public ResultCraftingGridSlot(PlayerEntity player, IGrid grid, int inventoryIndex, int x, int y) { super(player, grid.getCraftingMatrix(), grid.getCraftingResult(), inventoryIndex, x, y); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/transfer/FilterInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/FilterInventoryWrapper.java index 81681eaf7..928bac563 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/transfer/FilterInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/FilterInventoryWrapper.java @@ -8,9 +8,9 @@ import net.minecraftforge.items.IItemHandlerModifiable; import java.util.function.Supplier; class FilterInventoryWrapper implements IInventoryWrapper { - private ItemFilterInventoryWrapper item; - private FluidFilterInventoryWrapper fluid; - private Supplier typeGetter; + private final ItemFilterInventoryWrapper item; + private final FluidFilterInventoryWrapper fluid; + private final Supplier typeGetter; FilterInventoryWrapper(IItemHandlerModifiable itemTo, FluidInventory fluidTo, Supplier typeGetter) { this.item = new ItemFilterInventoryWrapper(itemTo); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java index b51b6eb51..ac56f197c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java @@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; class FluidFilterInventoryWrapper implements IInventoryWrapper { - private FluidInventory filterInv; + private final FluidInventory filterInv; FluidFilterInventoryWrapper(FluidInventory filterInv) { this.filterInv = filterInv; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/transfer/InsertionResult.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InsertionResult.java index 5d03590d4..d57952448 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/transfer/InsertionResult.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InsertionResult.java @@ -3,7 +3,7 @@ package com.refinedmods.refinedstorage.container.transfer; import net.minecraft.item.ItemStack; class InsertionResult { - private InsertionResultType type; + private final InsertionResultType type; private ItemStack value; InsertionResult(ItemStack value) { diff --git a/src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java index c0e092c34..fd0a3bde7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java @@ -11,8 +11,8 @@ import net.minecraftforge.items.wrapper.RangedWrapper; import java.util.Objects; class InventoryInventoryWrapper implements IInventoryWrapper { - private IInventory inventory; - private IItemHandler wrapper; + private final IInventory inventory; + private final IItemHandler wrapper; InventoryInventoryWrapper(IInventory inventory) { this.inventory = inventory; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java index 90d0a81dc..9fb7170a1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java @@ -6,7 +6,7 @@ import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; class ItemFilterInventoryWrapper implements IInventoryWrapper { - private IItemHandlerModifiable filterInv; + private final IItemHandlerModifiable filterInv; ItemFilterInventoryWrapper(IItemHandlerModifiable filterInv) { this.filterInv = filterInv; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java index 9f266a213..7eadce054 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java @@ -7,7 +7,7 @@ import net.minecraftforge.items.ItemHandlerHelper; import java.util.Objects; class ItemHandlerInventoryWrapper implements IInventoryWrapper { - private IItemHandler handler; + private final IItemHandler handler; ItemHandlerInventoryWrapper(IItemHandler handler) { this.handler = handler; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java index fe565990b..4156f85ad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java @@ -19,8 +19,8 @@ import java.util.function.Function; import java.util.function.Supplier; public class TransferManager { - private Map> fromToMap = new HashMap<>(); - private Container container; + private final Map> fromToMap = new HashMap<>(); + private final Container container; @Nullable private Function notFoundHandler; diff --git a/src/main/java/com/refinedmods/refinedstorage/energy/BaseEnergyStorage.java b/src/main/java/com/refinedmods/refinedstorage/energy/BaseEnergyStorage.java index 140ea267f..5b068a0b5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/energy/BaseEnergyStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/energy/BaseEnergyStorage.java @@ -8,14 +8,12 @@ public class BaseEnergyStorage extends EnergyStorage { } // @Volatile: Impl from EnergyStorage#extractEnergy, without the canExtract check - public int extractEnergyBypassCanExtract(int maxExtract, boolean simulate) { + public void extractEnergyBypassCanExtract(int maxExtract, boolean simulate) { int energyExtracted = Math.min(energy, maxExtract); if (!simulate) { energy -= energyExtracted; } - - return energyExtracted; } public void setStored(int energy) { diff --git a/src/main/java/com/refinedmods/refinedstorage/energy/ItemEnergyStorage.java b/src/main/java/com/refinedmods/refinedstorage/energy/ItemEnergyStorage.java index c0f44aeab..218224314 100644 --- a/src/main/java/com/refinedmods/refinedstorage/energy/ItemEnergyStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/energy/ItemEnergyStorage.java @@ -7,7 +7,7 @@ import net.minecraftforge.energy.EnergyStorage; public class ItemEnergyStorage extends EnergyStorage { private static final String NBT_ENERGY = "Energy"; - private ItemStack stack; + private final ItemStack stack; public ItemEnergyStorage(ItemStack stack, int capacity) { super(capacity, Integer.MAX_VALUE, Integer.MAX_VALUE); diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java index b86e51689..9ff364a8c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java @@ -17,7 +17,7 @@ public final class CraftingTweaksIntegration { return ModList.get().isLoaded(ID); } - public static boolean isCraftingTweaksClass(Class clazz) { + public static boolean isCraftingTweaksClass(Class clazz) { return clazz.getName().startsWith("net.blay09.mods.craftingtweaks"); } diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java index 14ad7f8e6..bb8ade9dc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java @@ -14,26 +14,26 @@ import mezz.jei.api.recipe.transfer.IRecipeTransferError; import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; -import net.minecraft.inventory.container.Container; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import javax.annotation.Nonnull; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -public class GridRecipeTransferHandler implements IRecipeTransferHandler { +public class GridRecipeTransferHandler implements IRecipeTransferHandler { public static final long TRANSFER_SCROLLBAR_DELAY_MS = 200; public static long LAST_TRANSFER_TIME; @Override - public Class getContainerClass() { + public Class getContainerClass() { return GridContainer.class; } @Override - public IRecipeTransferError transferRecipe(Container container, IRecipeLayout recipeLayout, PlayerEntity player, boolean maxTransfer, boolean doTransfer) { - IGrid grid = ((GridContainer) container).getGrid(); + public IRecipeTransferError transferRecipe(@Nonnull GridContainer container, @Nonnull IRecipeLayout recipeLayout, @Nonnull PlayerEntity player, boolean maxTransfer, boolean doTransfer) { + IGrid grid = container.getGrid(); if (doTransfer) { LAST_TRANSFER_TIME = System.currentTimeMillis(); diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FluidInventory.java b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FluidInventory.java index fac7bb6a9..16ddd7d68 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FluidInventory.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FluidInventory.java @@ -13,8 +13,8 @@ public class FluidInventory { private final List> listeners = new ArrayList<>(); - private FluidStack[] fluids; - private int maxAmount; + private final FluidStack[] fluids; + private final int maxAmount; private boolean empty = true; public FluidInventory(int size, int maxAmount) { diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java index 89c48a586..a0768e32b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java @@ -7,8 +7,8 @@ import net.minecraftforge.fluids.capability.templates.FluidTank; import javax.annotation.Nonnull; public class ProxyFluidHandler implements IFluidHandler { - private FluidTank insertHandler; - private FluidTank extractHandler; + private final FluidTank insertHandler; + private final FluidTank extractHandler; public ProxyFluidHandler(FluidTank insertHandler, FluidTank extractHandler) { this.insertHandler = insertHandler; diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterIconItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterIconItemHandler.java index 71ed88a51..3f5299460 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterIconItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterIconItemHandler.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemStackHandler; public class FilterIconItemHandler extends ItemStackHandler { - private ItemStack stack; + private final ItemStack stack; public FilterIconItemHandler(ItemStack stack) { super(1); diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java index 8ff3337d7..28f41dd2c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; public class FilterItemHandler extends BaseItemHandler { - private List filters; - private List tabs; + private final List filters; + private final List tabs; public FilterItemHandler(List filters, List tabs) { super(4); diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemsItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemsItemHandler.java index 651349e90..7a659b577 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemsItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemsItemHandler.java @@ -7,7 +7,7 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.items.ItemStackHandler; public class FilterItemsItemHandler extends ItemStackHandler { - private ItemStack stack; + private final ItemStack stack; public FilterItemsItemHandler(ItemStack stack) { super(27); diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/item/ProxyItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/ProxyItemHandler.java index 80889dc24..c7ec3eefe 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/item/ProxyItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/ProxyItemHandler.java @@ -6,8 +6,8 @@ import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; public class ProxyItemHandler implements IItemHandler { - private IItemHandler insertHandler; - private IItemHandler extractHandler; + private final IItemHandler insertHandler; + private final IItemHandler extractHandler; public ProxyItemHandler(IItemHandler insertHandler, IItemHandler extractHandler) { this.insertHandler = insertHandler; diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/item/UpgradeItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/UpgradeItemHandler.java index 5647263f8..2688fc1b8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/item/UpgradeItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/UpgradeItemHandler.java @@ -8,8 +8,8 @@ public class UpgradeItemHandler extends BaseItemHandler { public UpgradeItemHandler(int size, UpgradeItem.Type... supportedUpgrades) { super(size); - for (int i = 0; i < supportedUpgrades.length; ++i) { - addValidator(new UpgradeItemValidator(supportedUpgrades[i])); + for (UpgradeItem.Type supportedUpgrade : supportedUpgrades) { + addValidator(new UpgradeItemValidator(supportedUpgrade)); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/ItemValidator.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/ItemValidator.java index 64aadeb7f..6bd1f44cd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/ItemValidator.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/ItemValidator.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import java.util.function.Predicate; public class ItemValidator implements Predicate { - private Item item; + private final Item item; public ItemValidator(Item item) { this.item = item; diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/UpgradeItemValidator.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/UpgradeItemValidator.java index 5a71f1890..a7dcb155a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/UpgradeItemValidator.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/UpgradeItemValidator.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import java.util.function.Predicate; public class UpgradeItemValidator implements Predicate { - private UpgradeItem.Type type; + private final UpgradeItem.Type type; public UpgradeItemValidator(UpgradeItem.Type type) { this.type = type; diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java index 93b699309..83f1b40d5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; public class NetworkNodeFluidInventoryListener implements InventoryListener { - private INetworkNode node; + private final INetworkNode node; public NetworkNodeFluidInventoryListener(INetworkNode node) { this.node = node; diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java index 405bd1790..cc35b05d9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; public class NetworkNodeInventoryListener implements InventoryListener { - private INetworkNode node; + private final INetworkNode node; public NetworkNodeInventoryListener(INetworkNode node) { this.node = node; diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java index e79decca4..8a5d24724 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; import net.minecraft.tileentity.TileEntity; public class TileInventoryListener implements InventoryListener { - private TileEntity tile; + private final TileEntity tile; public TileInventoryListener(TileEntity tile) { this.tile = tile; diff --git a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java index c6b234683..05895eca6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java @@ -35,7 +35,7 @@ import java.util.Set; import java.util.stream.Collectors; public class PatternItem extends Item implements ICraftingPatternProvider { - private static Map CACHE = new HashMap<>(); + private static final Map CACHE = new HashMap<>(); private static final String NBT_VERSION = "Version"; private static final String NBT_INPUT_SLOT = "Input_%d"; diff --git a/src/main/java/com/refinedmods/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java b/src/main/java/com/refinedmods/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java index b166df6b9..167f4d273 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java @@ -13,13 +13,10 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; public class EnergyCapabilityProvider implements ICapabilityProvider { - private ItemStack stack; - private int energyCapacity; - private LazyOptional capability = LazyOptional.of(() -> new ItemEnergyStorage(stack, energyCapacity)); + private final LazyOptional capability; public EnergyCapabilityProvider(ItemStack stack, int energyCapacity) { - this.stack = stack; - this.energyCapacity = energyCapacity; + this.capability = LazyOptional.of(() -> new ItemEnergyStorage(stack, energyCapacity)); } @Nonnull diff --git a/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java b/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java index 3ce38169c..d1e94ef47 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java @@ -2,7 +2,6 @@ package com.refinedmods.refinedstorage.network; import com.refinedmods.refinedstorage.network.craftingmonitor.CraftingMonitorUpdateMessage; import com.refinedmods.refinedstorage.network.grid.GridCraftingPreviewResponseMessage; -import com.refinedmods.refinedstorage.network.grid.GridCraftingStartResponseMessage; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.screen.CraftingMonitorScreen; import com.refinedmods.refinedstorage.screen.grid.CraftingPreviewScreen; @@ -30,7 +29,7 @@ public class ClientProxy { )); } - public static void onReceivedCraftingStartResponseMessage(GridCraftingStartResponseMessage message) { + public static void onReceivedCraftingStartResponseMessage() { Screen screen = Minecraft.getInstance().currentScreen; if (screen instanceof CraftingSettingsScreen) { diff --git a/src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java index 34c387fff..bb51b2ee4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java @@ -10,11 +10,11 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class FilterUpdateMessage { - private int compare; - private int mode; - private boolean modFilter; - private String name; - private int type; + private final int compare; + private final int mode; + private final boolean modFilter; + private final String name; + private final int type; public FilterUpdateMessage(int compare, int mode, boolean modFilter, String name, int type) { this.compare = compare; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java index 053244e62..788ff53af 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java @@ -10,8 +10,8 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class FluidFilterSlotUpdateMessage { - private int containerSlot; - private FluidStack stack; + private final int containerSlot; + private final FluidStack stack; public FluidFilterSlotUpdateMessage(int containerSlot, FluidStack stack) { this.containerSlot = containerSlot; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java index 410e751fa..5df55bb14 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java @@ -12,7 +12,7 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class OpenNetworkItemMessage { - private int slotId; + private final int slotId; public OpenNetworkItemMessage(int slotId) { this.slotId = slotId; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java index 49ef8787b..1ea701ab6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java @@ -11,9 +11,9 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class SecurityManagerUpdateMessage { - private BlockPos pos; - private Permission permission; - private boolean state; + private final BlockPos pos; + private final Permission permission; + private final boolean state; public SecurityManagerUpdateMessage(BlockPos pos, Permission permission, boolean state) { this.pos = pos; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java index 551ef27f5..2cab754cd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java @@ -15,8 +15,8 @@ import net.minecraftforge.items.IItemHandler; import java.util.function.Supplier; public class SetFilterSlotMessage { - private int containerSlot; - private ItemStack stack; + private final int containerSlot; + private final ItemStack stack; public SetFilterSlotMessage(int containerSlot, ItemStack stack) { this.containerSlot = containerSlot; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java index 7be7bb624..4728effd0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java @@ -13,8 +13,8 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class SetFluidFilterSlotMessage { - private int containerSlot; - private FluidStack stack; + private final int containerSlot; + private final FluidStack stack; public SetFluidFilterSlotMessage(int containerSlot, FluidStack stack) { this.containerSlot = containerSlot; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java index 3cd8d135d..47ca5386e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java @@ -11,7 +11,7 @@ import java.util.function.Supplier; public class CraftingMonitorCancelMessage { @Nullable - private UUID taskId; + private final UUID taskId; public CraftingMonitorCancelMessage(@Nullable UUID taskId) { this.taskId = taskId; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java index 2af1e8a39..64ebeec63 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java @@ -11,8 +11,8 @@ import java.util.UUID; import java.util.function.Supplier; public class WirelessCraftingMonitorSettingsUpdateMessage { - private Optional tabSelected; - private int tabPage; + private final Optional tabSelected; + private final int tabPage; public WirelessCraftingMonitorSettingsUpdateMessage(Optional tabSelected, int tabPage) { this.tabSelected = tabSelected; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java index 4fe9ea476..83bef0928 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java @@ -10,7 +10,7 @@ import java.util.UUID; import java.util.function.Supplier; public class StorageDiskSizeRequestMessage { - private UUID id; + private final UUID id; public StorageDiskSizeRequestMessage(UUID id) { this.id = id; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java index 19e7a41c5..d93d78644 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java @@ -10,9 +10,9 @@ import java.util.UUID; import java.util.function.Supplier; public class StorageDiskSizeResponseMessage { - private UUID id; - private int stored; - private int capacity; + private final UUID id; + private final int stored; + private final int capacity; public StorageDiskSizeResponseMessage(UUID id, int stored, int capacity) { this.id = id; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java index 37fd960e6..45519db2e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java @@ -11,10 +11,10 @@ import java.util.UUID; import java.util.function.Supplier; public class GridCraftingPreviewRequestMessage { - private UUID id; - private int quantity; - private boolean noPreview; - private boolean fluids; + private final UUID id; + private final int quantity; + private final boolean noPreview; + private final boolean fluids; public GridCraftingPreviewRequestMessage(UUID id, int quantity, boolean noPreview, boolean fluids) { this.id = id; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java index e38f7d7a5..f6095b259 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java @@ -13,13 +13,13 @@ import java.util.UUID; import java.util.function.Supplier; public class GridCraftingPreviewResponseMessage { - private ResourceLocation factoryId; - private List stacks; - private UUID id; - private int quantity; - private boolean fluids; + private final ResourceLocation factoryId; + private final List> stacks; + private final UUID id; + private final int quantity; + private final boolean fluids; - public GridCraftingPreviewResponseMessage(ResourceLocation factoryId, List stacks, UUID id, int quantity, boolean fluids) { + public GridCraftingPreviewResponseMessage(ResourceLocation factoryId, List> stacks, UUID id, int quantity, boolean fluids) { this.factoryId = factoryId; this.stacks = stacks; this.id = id; @@ -31,7 +31,7 @@ public class GridCraftingPreviewResponseMessage { return factoryId; } - public List getStacks() { + public List> getStacks() { return stacks; } @@ -53,7 +53,7 @@ public class GridCraftingPreviewResponseMessage { int quantity = buf.readInt(); boolean fluids = buf.readBoolean(); - List stacks = new LinkedList<>(); + List> stacks = new LinkedList<>(); int size = buf.readInt(); @@ -72,7 +72,7 @@ public class GridCraftingPreviewResponseMessage { buf.writeBoolean(message.fluids); buf.writeInt(message.stacks.size()); - for (ICraftingPreviewElement stack : message.stacks) { + for (ICraftingPreviewElement stack : message.stacks) { buf.writeResourceLocation(stack.getId()); stack.write(buf); } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java index 2a0c3f661..840360e23 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java @@ -11,9 +11,9 @@ import java.util.UUID; import java.util.function.Supplier; public class GridCraftingStartRequestMessage { - private UUID id; - private int quantity; - private boolean fluids; + private final UUID id; + private final int quantity; + private final boolean fluids; public GridCraftingStartRequestMessage(UUID id, int quantity, boolean fluids) { this.id = id; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java index 8c0bb3d7a..85c24f862 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java @@ -15,7 +15,7 @@ public class GridCraftingStartResponseMessage { } public static void handle(GridCraftingStartResponseMessage message, Supplier ctx) { - ctx.get().enqueueWork(() -> ClientProxy.onReceivedCraftingStartResponseMessage(message)); + ctx.get().enqueueWork(() -> ClientProxy.onReceivedCraftingStartResponseMessage()); ctx.get().setPacketHandled(true); } } \ No newline at end of file diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java index 58d784cf1..1f8979ab4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java @@ -11,8 +11,8 @@ import java.util.UUID; import java.util.function.Supplier; public class GridFluidPullMessage { - private UUID id; - private boolean shift; + private final UUID id; + private final boolean shift; public GridFluidPullMessage(UUID id, boolean shift) { this.id = id; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java index b53529bb6..2c1d7d946 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java @@ -19,7 +19,7 @@ import java.util.function.Supplier; public class GridFluidUpdateMessage { private INetwork network; - private boolean canCraft; + private final boolean canCraft; private List stacks = new ArrayList<>(); public GridFluidUpdateMessage(boolean canCraft, List stacks) { diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java index e12a4b5e4..9ceddd4df 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java @@ -10,7 +10,7 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class GridItemInsertHeldMessage { - private boolean single; + private final boolean single; public GridItemInsertHeldMessage(boolean single) { this.single = single; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java index 5325f9fbc..37fd284ea 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java @@ -11,8 +11,8 @@ import java.util.UUID; import java.util.function.Supplier; public class GridItemPullMessage { - private UUID id; - private int flags; + private final UUID id; + private final int flags; public GridItemPullMessage(UUID id, int flags) { this.id = id; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java index 77106e7e4..727ccbefb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java @@ -19,7 +19,7 @@ import java.util.function.Supplier; public class GridItemUpdateMessage { private INetwork network; - private boolean canCraft; + private final boolean canCraft; private List stacks = new ArrayList<>(); public GridItemUpdateMessage(boolean canCraft, List stacks) { diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java index 1afea290f..2e75c68df 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class GridPatternCreateMessage { - private BlockPos pos; + private final BlockPos pos; public GridPatternCreateMessage(BlockPos pos) { this.pos = pos; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java index c5c4c6333..9d8d422ce 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java @@ -19,10 +19,10 @@ import java.util.List; import java.util.function.Supplier; public class GridProcessingTransferMessage { - private Collection inputs; - private Collection outputs; - private Collection fluidInputs; - private Collection fluidOutputs; + private final Collection inputs; + private final Collection outputs; + private final Collection fluidInputs; + private final Collection fluidOutputs; public GridProcessingTransferMessage(Collection inputs, Collection outputs, Collection fluidInputs, Collection fluidOutputs) { this.inputs = inputs; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java index 74b28c9f7..684dd5bc4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java @@ -20,7 +20,7 @@ public class GridTransferMessage { private Map> inputs; private List slots; - private ItemStack[][] recipe = new ItemStack[9][]; + private final ItemStack[][] recipe = new ItemStack[9][]; public GridTransferMessage() { } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java index 660f3f7e2..cdada1a2b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java @@ -13,13 +13,13 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class PortableGridSettingsUpdateMessage { - private int viewType; - private int sortingDirection; - private int sortingType; - private int searchBoxMode; - private int size; - private int tabSelected; - private int tabPage; + private final int viewType; + private final int sortingDirection; + private final int sortingType; + private final int searchBoxMode; + private final int size; + private final int tabSelected; + private final int tabPage; public PortableGridSettingsUpdateMessage(int viewType, int sortingDirection, int sortingType, int searchBoxMode, int size, int tabSelected, int tabPage) { this.viewType = viewType; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java index 1eff899e3..bd820a5d1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java @@ -12,12 +12,12 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class WirelessFluidGridSettingsUpdateMessage { - private int sortingDirection; - private int sortingType; - private int searchBoxMode; - private int size; - private int tabSelected; - private int tabPage; + private final int sortingDirection; + private final int sortingType; + private final int searchBoxMode; + private final int size; + private final int tabSelected; + private final int tabPage; public WirelessFluidGridSettingsUpdateMessage(int sortingDirection, int sortingType, int searchBoxMode, int size, int tabSelected, int tabPage) { this.sortingDirection = sortingDirection; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java index e440dc0ed..f30795214 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java @@ -13,13 +13,13 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class WirelessGridSettingsUpdateMessage { - private int viewType; - private int sortingDirection; - private int sortingType; - private int searchBoxMode; - private int size; - private int tabSelected; - private int tabPage; + private final int viewType; + private final int sortingDirection; + private final int sortingType; + private final int searchBoxMode; + private final int size; + private final int tabSelected; + private final int tabPage; public WirelessGridSettingsUpdateMessage(int viewType, int sortingDirection, int sortingType, int searchBoxMode, int size, int tabSelected, int tabPage) { this.viewType = viewType; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java index e0b5c8c19..6841f7ca6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java @@ -9,9 +9,9 @@ import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class TileDataParameterMessage { - private TileEntity tile; - private TileDataParameter parameter; - private boolean initial; + private final TileEntity tile; + private final TileDataParameter parameter; + private final boolean initial; public TileDataParameterMessage(TileEntity tile, TileDataParameter parameter, boolean initial) { this.tile = tile; diff --git a/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java index a1fb8e33a..ff5a6454a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java @@ -11,8 +11,8 @@ import java.util.function.BiConsumer; import java.util.function.Supplier; public class TileDataParameterUpdateMessage { - private TileDataParameter parameter; - private Object value; + private final TileDataParameter parameter; + private final Object value; public TileDataParameterUpdateMessage(TileDataParameter parameter, Object value) { this.parameter = parameter; diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java index 695038c6f..a85e623b0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java @@ -17,8 +17,8 @@ import net.minecraft.world.World; import net.minecraftforge.registries.ForgeRegistries; public class UpgradeWithEnchantedBookRecipe extends ShapedRecipe { - private EnchantmentData enchant; - private ItemStack result; + private final EnchantmentData enchant; + private final ItemStack result; public UpgradeWithEnchantedBookRecipe(ResourceLocation recipeId, Enchantment enchantment, int enchantmentLevel, ItemStack result) { super(recipeId, "", 3, 3, NonNullList.from(Ingredient.EMPTY, diff --git a/src/main/java/com/refinedmods/refinedstorage/render/BakedModelOverrideRegistry.java b/src/main/java/com/refinedmods/refinedstorage/render/BakedModelOverrideRegistry.java index c5fdcefb1..6e5860d6c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/BakedModelOverrideRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/BakedModelOverrideRegistry.java @@ -12,7 +12,7 @@ public class BakedModelOverrideRegistry { IBakedModel create(IBakedModel base, Map registry); } - private Map registry = new HashMap<>(); + private final Map registry = new HashMap<>(); public void add(ResourceLocation id, BakedModelOverrideFactory factory) { registry.put(id, factory); diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java index 2253f69a0..7cb88c583 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java @@ -13,15 +13,16 @@ import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.util.Direction; import net.minecraftforge.client.model.data.IModelData; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.*; public class DiskDriveBakedModel extends DelegateBakedModel { - private class CacheKey { - private BlockState state; - private Direction side; - private DiskState[] diskState; - private Random random; + private static class CacheKey { + private final BlockState state; + private final Direction side; + private final DiskState[] diskState; + private final Random random; CacheKey(BlockState state, @Nullable Direction side, DiskState[] diskState, Random random) { this.state = state; @@ -62,10 +63,10 @@ public class DiskDriveBakedModel extends DelegateBakedModel { } } - private Map baseByFacing = new HashMap<>(); - private Map>> disksByFacing = new HashMap<>(); + private final Map baseByFacing = new HashMap<>(); + private final Map>> disksByFacing = new HashMap<>(); - private LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { + private final LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { @Override @SuppressWarnings("deprecation") public List load(CacheKey key) { @@ -125,8 +126,9 @@ public class DiskDriveBakedModel extends DelegateBakedModel { } } + @Nonnull @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand, IModelData data) { + public List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData data) { DiskState[] diskState = data.getData(DiskDriveTile.DISK_STATE_PROPERTY); if (diskState == null) { 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 98cb6a39b..5e6aa6e17 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java @@ -15,15 +15,16 @@ import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.util.Direction; import net.minecraftforge.client.model.data.IModelData; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.*; public class DiskManipulatorBakedModel extends DelegateBakedModel { - private class CacheKey { - private BlockState state; - private Direction side; - private DiskState[] diskState; - private Random random; + private static class CacheKey { + private final BlockState state; + private final Direction side; + private final DiskState[] diskState; + private final Random random; CacheKey(BlockState state, @Nullable Direction side, DiskState[] diskState, Random random) { this.state = state; @@ -64,11 +65,11 @@ public class DiskManipulatorBakedModel extends DelegateBakedModel { } } - private Map modelsConnected = new HashMap<>(); - private Map modelsDisconnected = new HashMap<>(); - private Map>> disks = new HashMap<>(); + private final Map modelsConnected = new HashMap<>(); + private final Map modelsDisconnected = new HashMap<>(); + private final Map>> disks = new HashMap<>(); - private LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { + private final LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { @Override @SuppressWarnings("deprecation") public List load(CacheKey key) { @@ -139,7 +140,8 @@ public class DiskManipulatorBakedModel extends DelegateBakedModel { } @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand, IModelData data) { + @Nonnull + public List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData data) { DiskState[] diskState = data.getData(DiskManipulatorTile.DISK_STATE_PROPERTY); if (diskState == null) { diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java index 52d604077..08a92c693 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java @@ -11,6 +11,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.*; @@ -33,7 +34,8 @@ public class FullbrightBakedModel extends DelegateBakedModel { } @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand, IModelData data) { + @Nonnull + public List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData data) { if (state == null) { return base.getQuads(state, side, rand, data); } @@ -77,12 +79,12 @@ public class FullbrightBakedModel extends DelegateBakedModel { ); } - private class CacheKey { - private IBakedModel base; - private Set textures; - private Random random; - private BlockState state; - private Direction side; + private static class CacheKey { + private final IBakedModel base; + private final Set textures; + private final Random random; + private final BlockState state; + private final Direction side; public CacheKey(IBakedModel base, Set textures, Random random, BlockState state, Direction side) { this.base = base; diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java index 39113a394..da7bb8750 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java @@ -32,7 +32,7 @@ public class PortableGridBakedModel extends DelegateBakedModel { private final CustomItemOverrideList itemOverrideList = new CustomItemOverrideList(); - private LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { + private final LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { @Override @SuppressWarnings("deprecation") public List load(CacheKey key) { @@ -93,7 +93,7 @@ public class PortableGridBakedModel extends DelegateBakedModel { boolean active = state.get(PortableGridBlock.ACTIVE); PortableGridDiskState diskState = state.get(PortableGridBlock.DISK_STATE); - return cache.getUnchecked(new CacheKey(direction, diskState, active, rand, state, side)); + return cache.getUnchecked(new CacheKey(direction, diskState, active, rand, state)); } return super.getQuads(state, side, rand); @@ -132,21 +132,19 @@ public class PortableGridBakedModel extends DelegateBakedModel { } } - private class CacheKey { + private static class CacheKey { private final Direction direction; private final PortableGridDiskState diskState; private final boolean active; private final Random random; private final BlockState state; - private final Direction side; - public CacheKey(Direction direction, PortableGridDiskState diskState, boolean active, Random random, BlockState state, Direction side) { + public CacheKey(Direction direction, PortableGridDiskState diskState, boolean active, Random random, BlockState state) { this.direction = direction; this.diskState = diskState; this.active = active; this.random = random; this.state = state; - this.side = side; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java index 3e9319cb0..9a4515f03 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Direction; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; @@ -35,11 +36,10 @@ public class PortableGridItemBakedModel implements IBakedModel { } @Override + @Nonnull @SuppressWarnings("deprecation") - public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand) { - List quads = new ArrayList<>(); - - quads.addAll(base.getQuads(state, side, rand)); + public List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand) { + List quads = new ArrayList<>(base.getQuads(state, side, rand)); if (disk != null) { quads.addAll(disk.getQuads(state, side, rand)); diff --git a/src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java index ad80a85d3..158788e96 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java @@ -97,6 +97,7 @@ public class StorageMonitorTileRenderer extends TileEntityRenderer extends BaseScreen { - private BaseScreen parent; + private final BaseScreen parent; protected TextFieldWidget amountField; protected Button okButton; protected Button cancelButton; - public AmountSpecifyingScreen(BaseScreen parent, T container, int width, int height, PlayerInventory playerInventory, ITextComponent title) { + public AmountSpecifyingScreen(BaseScreen parent, T container, int width, int height, PlayerInventory playerInventory, ITextComponent title) { super(container, width, height, playerInventory, title); this.parent = parent; @@ -175,7 +175,7 @@ public abstract class AmountSpecifyingScreen extends BaseSc minecraft.displayGuiScreen(parent); } - public BaseScreen getParent() { + public BaseScreen getParent() { return parent; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java index ca73852c3..68ca7fdfa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java @@ -46,7 +46,7 @@ public abstract class BaseScreen extends ContainerScreen private static final Map TEXTURE_CACHE = new HashMap<>(); private static final Map> ACTIONS = new HashMap<>(); - private Logger logger = LogManager.getLogger(getClass()); + private final Logger logger = LogManager.getLogger(getClass()); private int sideButtonY; @@ -155,9 +155,7 @@ public abstract class BaseScreen extends ContainerScreen renderForeground(mouseX, mouseY); - for (int i = 0; i < this.buttons.size(); ++i) { - Widget button = buttons.get(i); - + for (Widget button : this.buttons) { if (button instanceof SideButton && button.isHovered()) { renderTooltip(mouseX, mouseY, ((SideButton) button).getTooltip()); } @@ -262,15 +260,13 @@ public abstract class BaseScreen extends ContainerScreen return button; } - public SideButton addSideButton(SideButton button) { + public void addSideButton(SideButton button) { button.x = guiLeft + -SideButton.WIDTH - 2; button.y = guiTop + sideButtonY; sideButtonY += SideButton.HEIGHT + 2; this.addButton(button); - - return button; } public void bindTexture(String namespace, String filenameInTexturesFolder) { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java index 09bc23142..3e47bf995 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java @@ -23,7 +23,7 @@ public class ControllerScreen extends BaseScreen { private static final int ENERGY_BAR_WIDTH = 16; private static final int ENERGY_BAR_HEIGHT = 59; - private ScrollbarWidget scrollbar; + private final ScrollbarWidget scrollbar; public ControllerScreen(ControllerContainer container, PlayerInventory inventory, ITextComponent title) { super(container, 176, 181, inventory, title); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java index f4d5c4a31..3553b9a44 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java @@ -23,7 +23,7 @@ import java.util.Map; // TODO @MouseTweaksDisableWheelTweak public class CrafterManagerScreen extends BaseScreen implements IScreenInfoProvider { - private CrafterManagerNetworkNode crafterManager; + private final CrafterManagerNetworkNode crafterManager; private ScrollbarWidget scrollbar; private SearchWidget searchField; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterTileDataParameterClientListener.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterTileDataParameterClientListener.java index 046d741c9..741caa32d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterTileDataParameterClientListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterTileDataParameterClientListener.java @@ -7,9 +7,7 @@ public class CrafterTileDataParameterClientListener implements TileDataParameter @Override public void onChanged(boolean initial, Boolean hasRoot) { if (!hasRoot) { - BaseScreen.executeLater(CrafterScreen.class, gui -> { - gui.addSideButton(new CrafterModeSideButton(gui)); - }); + BaseScreen.executeLater(CrafterScreen.class, gui -> gui.addSideButton(new CrafterModeSideButton(gui))); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java index 16dc4d3db..f6453f5af 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java @@ -35,12 +35,12 @@ import java.util.UUID; public class CraftingMonitorScreen extends BaseScreen { public static class Task implements IGridTab { - private UUID id; - private ICraftingRequestInfo requested; - private int qty; - private long executionStarted; - private int completionPercentage; - private List elements; + private final UUID id; + private final ICraftingRequestInfo requested; + private final int qty; + private final long executionStarted; + private final int completionPercentage; + private final List elements; public Task(UUID id, ICraftingRequestInfo requested, int qty, long executionStarted, int completionPercentage, List elements) { this.id = id; @@ -94,14 +94,14 @@ public class CraftingMonitorScreen extends BaseScreen private Button cancelButton; private Button cancelAllButton; - private ScrollbarWidget scrollbar; + private final ScrollbarWidget scrollbar; - private ICraftingMonitor craftingMonitor; + private final ICraftingMonitor craftingMonitor; private List tasks = Collections.emptyList(); - private TabListWidget tabs; + private final TabListWidget tabs; - private IElementDrawers drawers = new CraftingMonitorElementDrawers(this, font, ITEM_WIDTH, ITEM_HEIGHT); + private final IElementDrawers drawers = new CraftingMonitorElementDrawers(this, font, ITEM_WIDTH, ITEM_HEIGHT); public CraftingMonitorScreen(CraftingMonitorContainer container, PlayerInventory inventory, ITextComponent title) { super(container, 254, 201, inventory, title); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java index 458c08721..ba92022ad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java @@ -18,12 +18,12 @@ import net.minecraft.util.text.ITextComponent; import org.lwjgl.glfw.GLFW; public class FilterScreen extends BaseScreen { - private ItemStack stack; + private final ItemStack stack; private int compare; private int mode; private boolean modFilter; - private String name; + private final String name; private int type; private CheckboxWidget modFilterCheckBox; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java index aaa987ce9..61463a28d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java @@ -15,11 +15,11 @@ import javax.annotation.Nullable; import java.util.function.Function; public class FluidAmountScreen extends AmountSpecifyingScreen { - private int containerSlot; - private FluidStack stack; - private int maxAmount; + private final int containerSlot; + private final FluidStack stack; + private final int maxAmount; @Nullable - private Function alternativesScreenFactory; + private final Function alternativesScreenFactory; public FluidAmountScreen(BaseScreen parent, PlayerEntity player, int containerSlot, FluidStack stack, int maxAmount, @Nullable Function alternativesScreenFactory) { super(parent, new FluidAmountContainer(player, stack), alternativesScreenFactory != null ? 194 : 172, 99, player.inventory, new TranslationTextComponent("gui.refinedstorage.fluid_amount")); @@ -40,9 +40,7 @@ public class FluidAmountScreen extends AmountSpecifyingScreen { - minecraft.displayGuiScreen(alternativesScreenFactory.apply(this)); - }); + addButton(x + 114, cancelButton.y + 24, getOkCancelButtonWidth(), 20, I18n.format("gui.refinedstorage.alternatives"), true, true, btn -> minecraft.displayGuiScreen(alternativesScreenFactory.apply(this))); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java index 8cb427fd7..d4c1fe11a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java @@ -15,11 +15,11 @@ import javax.annotation.Nullable; import java.util.function.Function; public class ItemAmountScreen extends AmountSpecifyingScreen { - private int containerSlot; - private ItemStack stack; - private int maxAmount; + private final int containerSlot; + private final ItemStack stack; + private final int maxAmount; @Nullable - private Function alternativesScreenFactory; + private final Function alternativesScreenFactory; public ItemAmountScreen(BaseScreen parent, PlayerEntity player, int containerSlot, ItemStack stack, int maxAmount, @Nullable Function alternativesScreenFactory) { super(parent, new AmountContainer(player, stack), alternativesScreenFactory != null ? 194 : 172, 99, player.inventory, new TranslationTextComponent("gui.refinedstorage.item_amount")); @@ -40,9 +40,7 @@ public class ItemAmountScreen extends AmountSpecifyingScreen { super.onPostInit(x, y); if (alternativesScreenFactory != null) { - addButton(x + 114, cancelButton.y + 24, getOkCancelButtonWidth(), 20, I18n.format("gui.refinedstorage.alternatives"), true, true, btn -> { - minecraft.displayGuiScreen(alternativesScreenFactory.apply(this)); - }); + addButton(x + 114, cancelButton.y + 24, getOkCancelButtonWidth(), 20, I18n.format("gui.refinedstorage.alternatives"), true, true, btn -> minecraft.displayGuiScreen(alternativesScreenFactory.apply(this))); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java index cdb5708dc..b0073b748 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java @@ -10,7 +10,7 @@ import net.minecraft.util.text.TranslationTextComponent; import org.apache.commons.lang3.tuple.Pair; public class PriorityScreen extends AmountSpecifyingScreen { - private TileDataParameter priority; + private final TileDataParameter priority; public PriorityScreen(BaseScreen parent, TileDataParameter priority, PlayerInventory inventory) { super(parent, new Container(null, 0) { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java index d70902d7b..572e6f34b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java @@ -16,7 +16,7 @@ import net.minecraft.util.text.ITextComponent; public class SecurityManagerScreen extends BaseScreen { private final SecurityManagerTile securityManager; - private CheckboxWidget[] permissions = new CheckboxWidget[Permission.values().length]; + private final CheckboxWidget[] permissions = new CheckboxWidget[Permission.values().length]; public SecurityManagerScreen(SecurityManagerContainer container, PlayerInventory inventory, ITextComponent title) { super(container, 176, 234, inventory, title); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java index d6e16e11c..4225349ed 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java @@ -21,15 +21,15 @@ public class StorageScreen extends BaseScreen { private static final int BAR_WIDTH = 16; private static final int BAR_HEIGHT = 70; - private String texture; - private TileDataParameter typeParameter; - private TileDataParameter redstoneModeParameter; - private TileDataParameter exactModeParameter; - private TileDataParameter whitelistBlacklistParameter; - private TileDataParameter priorityParameter; - private TileDataParameter accessTypeParameter; - private Supplier storedSupplier; - private Supplier capacitySupplier; + 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 Supplier storedSupplier; + private final Supplier capacitySupplier; public StorageScreen(T container, PlayerInventory inventory, @@ -79,9 +79,7 @@ public class StorageScreen extends BaseScreen { int buttonWidth = 10 + font.getStringWidth(I18n.format("misc.refinedstorage.priority")); - addButton(x + 169 - buttonWidth, y + 41, buttonWidth, 20, I18n.format("misc.refinedstorage.priority"), true, true, btn -> { - minecraft.displayGuiScreen(new PriorityScreen(this, priorityParameter, playerInventory)); - }); + addButton(x + 169 - buttonWidth, y + 41, buttonWidth, 20, I18n.format("misc.refinedstorage.priority"), true, true, btn -> minecraft.displayGuiScreen(new PriorityScreen(this, priorityParameter, playerInventory))); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java index b7682e7ec..e8297113b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java @@ -31,7 +31,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -public class AlternativesScreen extends BaseScreen { +public class AlternativesScreen extends BaseScreen { private final Screen parent; private final ScrollbarWidget scrollbar; @@ -325,10 +325,8 @@ public class AlternativesScreen extends BaseScreen { private class ItemListLine implements Line { private final List items = new ArrayList<>(); - public ItemListLine addItem(ItemStack stack) { + public void addItem(ItemStack stack) { items.add(stack); - - return this; } @Override @@ -355,10 +353,8 @@ public class AlternativesScreen extends BaseScreen { private class FluidListLine implements Line { private final List fluids = new ArrayList<>(); - public FluidListLine addFluid(FluidStack stack) { + public void addFluid(FluidStack stack) { fluids.add(stack); - - return this; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java index a91219ac4..0a103dc12 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java @@ -29,16 +29,17 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fluids.FluidStack; import org.lwjgl.glfw.GLFW; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; -public class CraftingPreviewScreen extends BaseScreen { +public class CraftingPreviewScreen extends BaseScreen { private static final int VISIBLE_ROWS = 5; - private final List stacks; + private final List> stacks; private final Screen parent; private final ResourceLocation factoryId; @@ -51,12 +52,12 @@ public class CraftingPreviewScreen extends BaseScreen { private ItemStack hoveringStack; private FluidStack hoveringFluid; - private IElementDrawers drawers = new CraftingPreviewElementDrawers(this, font); + private final IElementDrawers drawers = new CraftingPreviewElementDrawers(this, font); - public CraftingPreviewScreen(Screen parent, ResourceLocation factoryId, List stacks, UUID id, int quantity, boolean fluids, ITextComponent title) { + public CraftingPreviewScreen(Screen parent, ResourceLocation factoryId, List> stacks, UUID id, int quantity, boolean fluids, ITextComponent title) { super(new Container(null, 0) { @Override - public boolean canInteractWith(PlayerEntity player) { + public boolean canInteractWith(@Nonnull PlayerEntity player) { return false; } }, 254, 201, null, title); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java index 0019b6606..29014a57b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java @@ -13,7 +13,7 @@ import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.fluids.FluidAttributes; public class CraftingSettingsScreen extends AmountSpecifyingScreen { - private IGridStack stack; + private final IGridStack stack; public CraftingSettingsScreen(BaseScreen parent, PlayerEntity player, IGridStack stack) { super(parent, new CraftingSettingsContainer(player, stack), 172, 99, player.inventory, new TranslationTextComponent("container.crafting")); 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 db6a23757..7a586e057 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java @@ -50,8 +50,8 @@ public class GridScreen extends BaseScreen implements IScreenInfo private ScrollbarWidget scrollbar; - private IGrid grid; - private TabListWidget tabs; + private final IGrid grid; + private final TabListWidget tabs; private boolean wasConnected; private boolean doSort; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/CraftableGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/CraftableGridFilter.java index d5afac1a1..d2a253398 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/CraftableGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/CraftableGridFilter.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.function.Predicate; public class CraftableGridFilter implements Predicate { - private boolean craftable; + private final boolean craftable; public CraftableGridFilter(boolean craftable) { this.craftable = craftable; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/FilterGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/FilterGridFilter.java index 3f39c9754..c4e863a74 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/FilterGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/FilterGridFilter.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.function.Predicate; public class FilterGridFilter implements Predicate { - private List filters; + private final List filters; public FilterGridFilter(List filters) { this.filters = filters; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/ModGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/ModGridFilter.java index a1d3d531f..5a61fb07b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/ModGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/ModGridFilter.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.function.Predicate; public class ModGridFilter implements Predicate { - private String inputModName; + private final String inputModName; public ModGridFilter(String inputModName) { this.inputModName = standardify(inputModName); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/NameGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/NameGridFilter.java index 77f9f4c76..be1832622 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/NameGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/NameGridFilter.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.function.Predicate; public class NameGridFilter implements Predicate { - private String name; + private final String name; public NameGridFilter(String name) { this.name = name.toLowerCase(); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/OrGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/OrGridFilter.java index f22e45828..4439dc07e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/OrGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/OrGridFilter.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.function.Predicate; public class OrGridFilter implements Predicate { - private List>> orPartFilters; + private final List>> orPartFilters; public OrGridFilter(List>> orPartFilters) { this.orPartFilters = orPartFilters; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TagGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TagGridFilter.java index a86056a5d..3546b7292 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TagGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TagGridFilter.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.function.Predicate; public class TagGridFilter implements Predicate { - private String tagName; + private final String tagName; public TagGridFilter(String tagName) { this.tagName = tagName.toLowerCase(); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TooltipGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TooltipGridFilter.java index 588c1c6e6..445a06f96 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TooltipGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TooltipGridFilter.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.function.Predicate; public class TooltipGridFilter implements Predicate { - private String tooltip; + private final String tooltip; public TooltipGridFilter(String tooltip) { this.tooltip = tooltip.toLowerCase(); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java index 8195d5a5d..2959fe904 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java @@ -18,15 +18,15 @@ import java.util.Set; import java.util.UUID; public class FluidGridStack implements IGridStack { - private Logger logger = LogManager.getLogger(getClass()); + private final Logger logger = LogManager.getLogger(getClass()); - private UUID id; + private final UUID id; @Nullable private UUID otherId; - private FluidStack stack; + private final FluidStack stack; @Nullable private StorageTrackerEntry entry; - private boolean craftable; + private final boolean craftable; private boolean zeroed; private Set cachedTags; @@ -159,7 +159,7 @@ public class FluidGridStack implements IGridStack { } @Override - public void draw(BaseScreen gui, int x, int y) { + public void draw(BaseScreen screen, int x, int y) { FluidRenderer.INSTANCE.render(x, y, stack); String text; @@ -174,7 +174,7 @@ public class FluidGridStack implements IGridStack { text = API.instance().getQuantityFormatter().formatInBucketFormWithOnlyTrailingDigitsIfZero(getQuantity()); } - gui.renderQuantity(x, y, text, color); + screen.renderQuantity(x, y, text, color); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java index b79351b6c..b840d82d6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java @@ -29,7 +29,7 @@ public interface IGridStack { String getFormattedFullQuantity(); - void draw(BaseScreen gui, int x, int y); + void draw(BaseScreen screen, int x, int y); Object getIngredient(); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java index 825ce8ce4..63998800b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java @@ -19,15 +19,14 @@ import java.util.HashSet; import java.util.Optional; import java.util.Set; import java.util.UUID; -import java.util.stream.Collectors; public class ItemGridStack implements IGridStack { - private Logger logger = LogManager.getLogger(getClass()); + private final Logger logger = LogManager.getLogger(getClass()); private UUID id; @Nullable private UUID otherId; - private ItemStack stack; + private final ItemStack stack; private boolean craftable; @Nullable private StorageTrackerEntry entry; @@ -145,7 +144,7 @@ public class ItemGridStack implements IGridStack { public String getTooltip() { if (cachedTooltip == null) { try { - cachedTooltip = RenderUtils.getTooltipFromItem(stack).stream().collect(Collectors.joining("\n")); + cachedTooltip = String.join("\n", RenderUtils.getTooltipFromItem(stack)); } catch (Throwable t) { logger.warn("Could not retrieve item tooltip of " + stack.getItem().toString(), t); @@ -172,7 +171,7 @@ public class ItemGridStack implements IGridStack { } @Override - public void draw(BaseScreen gui, int x, int y) { + public void draw(BaseScreen screen, int x, int y) { String text = null; int color = RenderSettings.INSTANCE.getSecondaryColor(); @@ -185,7 +184,7 @@ public class ItemGridStack implements IGridStack { text = API.instance().getQuantityFormatter().formatWithUnits(getQuantity()); } - gui.renderItem(x, y, stack, true, text, color); + screen.renderItem(x, y, stack, true, text, color); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java index b17568fe9..96a66b12d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java @@ -12,14 +12,14 @@ import java.util.*; import java.util.function.Predicate; public abstract class BaseGridView implements IGridView { - private GridScreen screen; + private final GridScreen screen; private boolean canCraft; - private IGridSorter defaultSorter; - private List sorters; + private final IGridSorter defaultSorter; + private final List sorters; private List stacks = new ArrayList<>(); - protected Map map = new HashMap<>(); + protected final Map map = new HashMap<>(); public BaseGridView(GridScreen screen, IGridSorter defaultSorter, List sorters) { this.screen = screen; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java index 92856eb16..cb480cbd9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java @@ -14,10 +14,10 @@ import java.util.List; public class ScrollbarWidget implements IGuiEventListener { private static final int SCROLLER_HEIGHT = 15; - private int x; - private int y; - private int width; - private int height; + private final int x; + private final int y; + private final int width; + private final int height; private boolean enabled = false; private int offset; @@ -25,11 +25,11 @@ public class ScrollbarWidget implements IGuiEventListener { private boolean clicked = false; - private List listeners = new LinkedList<>(); + private final List listeners = new LinkedList<>(); - private BaseScreen screen; + private final BaseScreen screen; - public ScrollbarWidget(BaseScreen screen, int x, int y, int width, int height) { + public ScrollbarWidget(BaseScreen screen, int x, int y, int width, int height) { this.screen = screen; this.x = x; this.y = y; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java index a0264f2eb..ec479466b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java @@ -20,24 +20,24 @@ public class TabListWidget { void onPageChanged(int page); } - private BaseScreen gui; - private ElementDrawers drawers; + private final BaseScreen screen; + private final ElementDrawers drawers; - private Supplier> tabs; + private final Supplier> tabs; private int tabHovering; - private int tabsPerPage; - private Supplier pages; - private Supplier page; - private Supplier selected; + private final int tabsPerPage; + private final Supplier pages; + private final Supplier page; + private final Supplier selected; private boolean hadTabs; - private List listeners = new LinkedList<>(); + private final List listeners = new LinkedList<>(); private Button left; private Button right; - public TabListWidget(BaseScreen gui, ElementDrawers drawers, Supplier> tabs, Supplier pages, Supplier page, Supplier selected, int tabsPerPage) { - this.gui = gui; + public TabListWidget(BaseScreen screen, ElementDrawers drawers, Supplier> tabs, Supplier pages, Supplier page, Supplier selected, int tabsPerPage) { + this.screen = screen; this.drawers = drawers; this.tabs = tabs; this.pages = pages; @@ -47,8 +47,8 @@ public class TabListWidget { } public void init(int width) { - this.left = gui.addButton(gui.getGuiLeft(), gui.getGuiTop() - 22, 20, 20, "<", true, pages.get() > 0, btn -> listeners.forEach(t -> t.onPageChanged(page.get() - 1))); - this.right = gui.addButton(gui.getGuiLeft() + width - 22, gui.getGuiTop() - 22, 20, 20, ">", true, pages.get() > 0, btn -> listeners.forEach(t -> t.onPageChanged(page.get() + 1))); + this.left = screen.addButton(screen.getGuiLeft(), screen.getGuiTop() - 22, 20, 20, "<", true, pages.get() > 0, btn -> listeners.forEach(t -> t.onPageChanged(page.get() - 1))); + this.right = screen.addButton(screen.getGuiLeft() + width - 22, screen.getGuiTop() - 22, 20, 20, ">", true, pages.get() > 0, btn -> listeners.forEach(t -> t.onPageChanged(page.get() + 1))); } public void addListener(ITabListListener listener) { @@ -80,7 +80,7 @@ public class TabListWidget { if (this.hadTabs != hasTabs) { this.hadTabs = hasTabs; - gui.init(); + screen.init(); } if (page.get() > pages.get()) { @@ -127,7 +127,7 @@ public class TabListWidget { RenderSystem.enableAlphaTest(); - gui.bindTexture(RS.ID, "icons.png"); + screen.bindTexture(RS.ID, "icons.png"); if (!isSelected) { ty += 3; @@ -151,14 +151,14 @@ public class TabListWidget { uvx = 199; } - gui.blit(tx, ty, uvx, uvy, tbw, IGridTab.TAB_HEIGHT); + screen.blit(tx, ty, uvx, uvy, tbw, IGridTab.TAB_HEIGHT); tab.drawIcon(otx + 6, ty + 9 - (!isSelected ? 3 : 0), drawers.getItemDrawer(), drawers.getFluidDrawer()); } public void drawTooltip(FontRenderer fontRenderer, int mouseX, int mouseY) { if (tabHovering >= 0 && tabHovering < tabs.get().size()) { - tabs.get().get(tabHovering).drawTooltip(mouseX, mouseY, gui.width, gui.height, fontRenderer); + tabs.get().get(tabHovering).drawTooltip(mouseX, mouseY, screen.width, screen.height, fontRenderer); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java index 8089f0504..86823744b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java @@ -9,9 +9,9 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class AccessTypeSideButton extends SideButton { - private TileDataParameter parameter; + private final TileDataParameter parameter; - public AccessTypeSideButton(BaseScreen screen, TileDataParameter parameter) { + public AccessTypeSideButton(BaseScreen screen, TileDataParameter parameter) { super(screen); this.parameter = parameter; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java index 10649f378..b722ae5da 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java @@ -1,5 +1,6 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; +import com.refinedmods.refinedstorage.container.ConstructorContainer; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.tile.ConstructorTile; import com.refinedmods.refinedstorage.tile.data.TileDataManager; @@ -7,7 +8,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class ConstructorDropSideButton extends SideButton { - public ConstructorDropSideButton(BaseScreen screen) { + public ConstructorDropSideButton(BaseScreen screen) { super(screen); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java index 182304dc3..498e45510 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java @@ -1,5 +1,6 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; +import com.refinedmods.refinedstorage.container.CrafterContainer; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.tile.CrafterTile; import com.refinedmods.refinedstorage.tile.data.TileDataManager; @@ -7,7 +8,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class CrafterModeSideButton extends SideButton { - public CrafterModeSideButton(BaseScreen screen) { + public CrafterModeSideButton(BaseScreen screen) { super(screen); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java index d1aebd9bf..0bcfce015 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java @@ -1,5 +1,6 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; +import com.refinedmods.refinedstorage.container.DestructorContainer; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.tile.DestructorTile; import com.refinedmods.refinedstorage.tile.data.TileDataManager; @@ -7,7 +8,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class DestructorPickupSideButton extends SideButton { - public DestructorPickupSideButton(BaseScreen screen) { + public DestructorPickupSideButton(BaseScreen screen) { super(screen); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java index 2b4ee4597..b26032ba2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java @@ -1,6 +1,7 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.refinedmods.refinedstorage.apiimpl.network.node.DetectorNetworkNode; +import com.refinedmods.refinedstorage.container.DetectorContainer; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.tile.DetectorTile; import com.refinedmods.refinedstorage.tile.data.TileDataManager; @@ -8,7 +9,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class DetectorModeSideButton extends SideButton { - public DetectorModeSideButton(BaseScreen screen) { + public DetectorModeSideButton(BaseScreen screen) { super(screen); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java index f067c4a70..ca0008852 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java @@ -10,9 +10,9 @@ import net.minecraft.util.text.TextFormatting; public class ExactModeSideButton extends SideButton { private static final int MASK = IComparer.COMPARE_NBT; - private TileDataParameter parameter; + private final TileDataParameter parameter; - public ExactModeSideButton(BaseScreen screen, TileDataParameter parameter) { + public ExactModeSideButton(BaseScreen screen, TileDataParameter parameter) { super(screen); this.parameter = parameter; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java index dada9fde9..cd547d44c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java @@ -6,7 +6,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class FilterTypeSideButton extends SideButton { - private FilterScreen screen; + private final FilterScreen screen; public FilterTypeSideButton(FilterScreen screen) { super(screen); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java index 49bcba062..c1502423e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java @@ -9,8 +9,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; public class GridSizeSideButton extends SideButton { - private Supplier sizeSupplier; - private Consumer listener; + private final Supplier sizeSupplier; + private final Consumer listener; public GridSizeSideButton(BaseScreen screen, Supplier sizeSupplier, Consumer listener) { super(screen); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java index 85bbc9b30..7bcfcfbea 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java @@ -1,14 +1,15 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class GridSortingDirectionSideButton extends SideButton { - private IGrid grid; + private final IGrid grid; - public GridSortingDirectionSideButton(BaseScreen screen, IGrid grid) { + public GridSortingDirectionSideButton(BaseScreen screen, IGrid grid) { super(screen); this.grid = grid; 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 933ce1665..384c7edfa 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,15 +3,16 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; 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; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class GridSortingTypeSideButton extends SideButton { - private IGrid grid; + private final IGrid grid; - public GridSortingTypeSideButton(BaseScreen screen, IGrid grid) { + public GridSortingTypeSideButton(BaseScreen screen, IGrid grid) { super(screen); this.grid = grid; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java index 12c1dbf84..7836a030f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java @@ -1,14 +1,15 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class GridViewTypeSideButton extends SideButton { - private IGrid grid; + private final IGrid grid; - public GridViewTypeSideButton(BaseScreen screen, IGrid grid) { + public GridViewTypeSideButton(BaseScreen screen, IGrid grid) { super(screen); this.grid = grid; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java index 982717d5d..b7c7f8f04 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java @@ -1,6 +1,7 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.refinedmods.refinedstorage.apiimpl.network.node.diskmanipulator.DiskManipulatorNetworkNode; +import com.refinedmods.refinedstorage.container.DiskManipulatorContainer; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.tile.DiskManipulatorTile; import com.refinedmods.refinedstorage.tile.data.TileDataManager; @@ -8,7 +9,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class IoModeSideButton extends SideButton { - public IoModeSideButton(BaseScreen screen) { + public IoModeSideButton(BaseScreen screen) { super(screen); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java index ad45abf2c..2a823b9dc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java @@ -7,9 +7,9 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class RedstoneModeSideButton extends SideButton { - private TileDataParameter parameter; + private final TileDataParameter parameter; - public RedstoneModeSideButton(BaseScreen screen, TileDataParameter parameter) { + public RedstoneModeSideButton(BaseScreen screen, TileDataParameter parameter) { super(screen); this.parameter = parameter; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java index 1c2c9c79e..c365afd4a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java @@ -11,9 +11,9 @@ public abstract class SideButton extends Button { public static final int WIDTH = 18; public static final int HEIGHT = 18; - protected BaseScreen screen; + protected final BaseScreen screen; - public SideButton(BaseScreen screen) { + public SideButton(BaseScreen screen) { super(-1, -1, 18, 18, "", btn -> { }); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java index 1cb1a05ad..8a1e12adc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java @@ -8,9 +8,9 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class TypeSideButton extends SideButton { - private TileDataParameter type; + private final TileDataParameter type; - public TypeSideButton(BaseScreen screen, TileDataParameter type) { + public TypeSideButton(BaseScreen screen, TileDataParameter type) { super(screen); this.type = type; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java index 9c74dbdb8..456e82379 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java @@ -8,9 +8,9 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; public class WhitelistBlacklistSideButton extends SideButton { - private TileDataParameter parameter; + private final TileDataParameter parameter; - public WhitelistBlacklistSideButton(BaseScreen screen, TileDataParameter parameter) { + public WhitelistBlacklistSideButton(BaseScreen screen, TileDataParameter parameter) { super(screen); this.parameter = parameter; diff --git a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java index 1ee4532b9..c983d56c4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java @@ -32,7 +32,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; public class ClientSetup { - private BakedModelOverrideRegistry bakedModelOverrideRegistry = new BakedModelOverrideRegistry(); + private final BakedModelOverrideRegistry bakedModelOverrideRegistry = new BakedModelOverrideRegistry(); public ClientSetup() { IResourceManager resourceManager = Minecraft.getInstance().getResourceManager(); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java index 5b760d210..86e8b8b12 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java @@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntityType; import javax.annotation.Nullable; public abstract class BaseTile extends TileEntity { - protected TileDataManager dataManager = new TileDataManager(this); + protected final TileDataManager dataManager = new TileDataManager(this); public BaseTile(TileEntityType tileType) { super(tileType); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/ClientNode.java b/src/main/java/com/refinedmods/refinedstorage/tile/ClientNode.java index 6f171b0ea..cef25618b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/ClientNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ClientNode.java @@ -4,9 +4,9 @@ import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; public class ClientNode { - private ItemStack stack; + private final ItemStack stack; private int amount; - private int energyUsage; + private final int energyUsage; public ClientNode(ItemStack stack, int amount, int energyUsage) { this.stack = stack; diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java index f4c7d719f..f52146296 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java @@ -20,7 +20,7 @@ public class CrafterTile extends NetworkNodeTile { public static final TileDataParameter MODE = new TileDataParameter<>(DataSerializers.VARINT, CrafterNetworkNode.CrafterMode.IGNORE.ordinal(), t -> t.getNode().getMode().ordinal(), (t, v) -> t.getNode().setMode(CrafterNetworkNode.CrafterMode.getById(v))); private static final TileDataParameter HAS_ROOT = new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> t.getNode().getRootContainerNotSelf().isPresent(), null, (t, v) -> new CrafterTileDataParameterClientListener().onChanged(t, v)); - private LazyOptional patternsCapability = LazyOptional.of(() -> getNode().getPatternItems()); + private final LazyOptional patternsCapability = LazyOptional.of(() -> getNode().getPatternItems()); public CrafterTile() { super(RSTiles.CRAFTER); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java index 7151d2d9b..8fd85eea9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java @@ -81,9 +81,9 @@ public class DiskDriveTile extends NetworkNodeTile { private static final String NBT_DISK_STATE = "DiskStates"; - private LazyOptional diskCapability = LazyOptional.of(() -> getNode().getDisks()); + private final LazyOptional diskCapability = LazyOptional.of(() -> getNode().getDisks()); - private DiskState[] diskState = new DiskState[8]; + private final DiskState[] diskState = new DiskState[8]; public DiskDriveTile() { super(RSTiles.DISK_DRIVE); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java index efbc8a51a..5e451db01 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java @@ -41,9 +41,9 @@ public class DiskManipulatorTile extends NetworkNodeTile diskCapability = LazyOptional.of(() -> getNode().getDisks()); + private final LazyOptional diskCapability = LazyOptional.of(() -> getNode().getDisks()); - private DiskState[] diskState = new DiskState[8]; + private final DiskState[] diskState = new DiskState[8]; public DiskManipulatorTile() { super(RSTiles.DISK_MANIPULATOR); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/FluidInterfaceTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/FluidInterfaceTile.java index ddc46a8e3..63498ead0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/FluidInterfaceTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/FluidInterfaceTile.java @@ -22,8 +22,8 @@ public class FluidInterfaceTile extends NetworkNodeTile TANK_IN = new TileDataParameter<>(RSSerializers.FLUID_STACK_SERIALIZER, FluidStack.EMPTY, t -> t.getNode().getTankIn().getFluid()); public static final TileDataParameter TANK_OUT = new TileDataParameter<>(RSSerializers.FLUID_STACK_SERIALIZER, FluidStack.EMPTY, t -> t.getNode().getTankOut().getFluid()); - private LazyOptional tankCapability = LazyOptional.of(() -> getNode().getTank()); - private LazyOptional inCapability = LazyOptional.of(() -> getNode().getIn()); + private final LazyOptional tankCapability = LazyOptional.of(() -> getNode().getTank()); + private final LazyOptional inCapability = LazyOptional.of(() -> getNode().getIn()); public FluidInterfaceTile() { super(RSTiles.FLUID_INTERFACE); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java index 586ca209b..4d35be264 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java @@ -18,7 +18,7 @@ import javax.annotation.Nullable; public class InterfaceTile extends NetworkNodeTile { public static final TileDataParameter COMPARE = IComparable.createParameter(); - private LazyOptional itemsCapability = LazyOptional.of(() -> getNode().getItems()); + private final LazyOptional itemsCapability = LazyOptional.of(() -> getNode().getItems()); public InterfaceTile() { super(RSTiles.INTERFACE); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java index 96f3f3379..eec5b1538 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java @@ -27,7 +27,7 @@ public abstract class NetworkNodeTile extends BaseTile im private N clientNode; private N removedNode; - private LazyOptional> networkNodeProxy = LazyOptional.of(() -> this); + private final LazyOptional> networkNodeProxy = LazyOptional.of(() -> this); public NetworkNodeTile(TileEntityType tileType) { super(tileType); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java index 668084783..a8957450a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java @@ -28,7 +28,7 @@ public class NetworkTransmitterTile extends NetworkNodeTile networkCardCapability = LazyOptional.of(() -> getNode().getNetworkCard()); + private final LazyOptional networkCardCapability = LazyOptional.of(() -> getNode().getNetworkCard()); public NetworkTransmitterTile() { super(RSTiles.NETWORK_TRANSMITTER); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/config/IAccessType.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IAccessType.java index e289982e9..24db387ec 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/config/IAccessType.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IAccessType.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.tileentity.TileEntity; public interface IAccessType { - static TileDataParameter createParameter() { + static > TileDataParameter createParameter() { return new TileDataParameter<>(RSSerializers.ACCESS_TYPE_SERIALIZER, AccessType.INSERT_EXTRACT, t -> ((IAccessType) t.getNode()).getAccessType(), (t, v) -> ((IAccessType) t.getNode()).setAccessType(v)); } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java index eecd2c56f..9facd50af 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java @@ -6,7 +6,7 @@ import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; public interface IComparable { - static TileDataParameter createParameter() { + static > TileDataParameter createParameter() { return new TileDataParameter<>(DataSerializers.VARINT, 0, t -> ((IComparable) t.getNode()).getCompare(), (t, v) -> ((IComparable) t.getNode()).setCompare(v)); } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java index fc20da5b5..ccdfef407 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java @@ -6,7 +6,7 @@ import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; public interface IPrioritizable { - static TileDataParameter createParameter() { + static > TileDataParameter createParameter() { return new TileDataParameter<>(DataSerializers.VARINT, 0, t -> ((IPrioritizable) t.getNode()).getPriority(), (t, v) -> ((IPrioritizable) t.getNode()).setPriority(v)); } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java index 449973ca0..c73fa29e0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java @@ -14,7 +14,7 @@ public interface IType { int ITEMS = 0; int FLUIDS = 1; - static TileDataParameter createParameter(@Nullable TileDataParameterClientListener clientListener) { + static > TileDataParameter createParameter(@Nullable TileDataParameterClientListener clientListener) { return new TileDataParameter<>(DataSerializers.VARINT, ITEMS, t -> ((IType) t.getNode()).getType(), (t, v) -> { if (v == IType.ITEMS || v == IType.FLUIDS) { ((IType) t.getNode()).setType(v); @@ -22,7 +22,7 @@ public interface IType { }, clientListener); } - static TileDataParameter createParameter() { + static > TileDataParameter createParameter() { return createParameter(null); } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java index 7f697742d..fa0603b00 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java @@ -14,7 +14,7 @@ public interface IWhitelistBlacklist { int WHITELIST = 0; int BLACKLIST = 1; - static TileDataParameter createParameter() { + static > TileDataParameter createParameter() { return new TileDataParameter<>(DataSerializers.VARINT, 0, t -> ((IWhitelistBlacklist) t.getNode()).getWhitelistBlacklistMode(), (t, v) -> { if (v == WHITELIST || v == BLACKLIST) { ((IWhitelistBlacklist) t.getNode()).setWhitelistBlacklistMode(v); 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 6b82d6107..1cf655457 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java @@ -26,14 +26,14 @@ import java.util.Optional; import java.util.UUID; public class WirelessCraftingMonitor implements ICraftingMonitor { - private ItemStack stack; + private final ItemStack stack; @Nullable - private MinecraftServer server; - private DimensionType nodeDimension; - private BlockPos nodePos; + private final MinecraftServer server; + private final DimensionType nodeDimension; + private final BlockPos nodePos; private int tabPage; private Optional tabSelected; - private int slotId; + private final int slotId; public WirelessCraftingMonitor(ItemStack stack, @Nullable MinecraftServer server, int slotId) { this.stack = stack; diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataManager.java b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataManager.java index da4b5c7c2..2328419cf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataManager.java @@ -12,14 +12,14 @@ import java.util.concurrent.CopyOnWriteArrayList; public class TileDataManager { private static int LAST_ID = 0; - private static Map REGISTRY = new HashMap<>(); + private static final Map REGISTRY = new HashMap<>(); - private TileEntity tile; + private final TileEntity tile; - private List parameters = new ArrayList<>(); - private List watchedParameters = new ArrayList<>(); + private final List parameters = new ArrayList<>(); + private final List watchedParameters = new ArrayList<>(); - private List watchers = new CopyOnWriteArrayList<>(); + private final List watchers = new CopyOnWriteArrayList<>(); public TileDataManager(TileEntity tile) { this.tile = tile; diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataParameter.java b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataParameter.java index 59eea59f2..a466a0147 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataParameter.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataParameter.java @@ -9,12 +9,12 @@ import java.util.function.Function; public class TileDataParameter { private int id; - private IDataSerializer serializer; - private Function valueProducer; + private final IDataSerializer serializer; + private final Function valueProducer; @Nullable - private BiConsumer valueConsumer; + private final BiConsumer valueConsumer; @Nullable - private TileDataParameterClientListener listener; + private final TileDataParameterClientListener listener; private T value; public TileDataParameter(IDataSerializer serializer, T defaultValue, Function producer) { diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataWatcher.java b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataWatcher.java index 6570e7a88..1d64af039 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataWatcher.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataWatcher.java @@ -6,8 +6,8 @@ import net.minecraft.entity.player.ServerPlayerEntity; public class TileDataWatcher { private boolean sentInitial; - private ServerPlayerEntity player; - private TileDataManager manager; + private final ServerPlayerEntity player; + private final TileDataManager manager; private Object[] cache; diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java index 7ab712ed8..acab7fdb8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java @@ -88,7 +88,7 @@ public class GridTile extends NetworkNodeTile { private final GridType type; - private LazyOptional diskCapability = LazyOptional.of(() -> getNode().getPatterns()); + private final LazyOptional diskCapability = LazyOptional.of(() -> getNode().getPatterns()); public GridTile(GridType type) { super(GridUtils.getTileEntityType(type)); 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 2349758fb..ab5a3f8f8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -51,9 +51,9 @@ public class WirelessFluidGrid implements INetworkAwareGrid { private int tabPage; private int size; - private List filters = new ArrayList<>(); - private List tabs = new ArrayList<>(); - private FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs) + private final List filters = new ArrayList<>(); + private final List tabs = new ArrayList<>(); + private final FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs) .addListener(((handler, slot, reading) -> { if (!stack.hasTag()) { stack.setTag(new CompoundNBT()); 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 aca75c700..d8037da11 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java @@ -52,9 +52,9 @@ public class WirelessGrid implements INetworkAwareGrid { private int tabPage; private int size; - private List filters = new ArrayList<>(); - private List tabs = new ArrayList<>(); - private FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs) + private final List filters = new ArrayList<>(); + private final List tabs = new ArrayList<>(); + private final FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs) .addListener((handler, slot, reading) -> { if (!stack.hasTag()) { stack.setTag(new CompoundNBT()); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java index 4a0511fa0..c07f1860e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java @@ -67,13 +67,13 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer @Nullable private IStorageCache cache; - private PortableItemGridHandler itemHandler = new PortableItemGridHandler(this, this); - private PortableFluidGridHandler fluidHandler = new PortableFluidGridHandler(this); + private final PortableItemGridHandler itemHandler = new PortableItemGridHandler(this, this); + private final PortableFluidGridHandler fluidHandler = new PortableFluidGridHandler(this); @Nullable private PlayerEntity player; private ItemStack stack; - private int slotId; + private final int slotId; private int sortingType; private int sortingDirection; @@ -82,13 +82,13 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer private int tabPage; private int size; - private ItemStorageTracker storageTracker = new ItemStorageTracker(() -> stack.getTag().put(NBT_STORAGE_TRACKER, getItemStorageTracker().serializeNbt())); - private FluidStorageTracker fluidStorageTracker = new FluidStorageTracker(() -> stack.getTag().put(NBT_FLUID_STORAGE_TRACKER, getFluidStorageTracker().serializeNbt())); + private final ItemStorageTracker storageTracker = new ItemStorageTracker(() -> stack.getTag().put(NBT_STORAGE_TRACKER, getItemStorageTracker().serializeNbt())); + private final FluidStorageTracker fluidStorageTracker = new FluidStorageTracker(() -> stack.getTag().put(NBT_FLUID_STORAGE_TRACKER, getFluidStorageTracker().serializeNbt())); - private List filters = new ArrayList<>(); - private List tabs = new ArrayList<>(); + private final List filters = new ArrayList<>(); + private final List tabs = new ArrayList<>(); - private FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs) + private final FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs) .addListener((handler, slot, reading) -> { if (!stack.hasTag()) { stack.setTag(new CompoundNBT()); @@ -97,7 +97,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer StackUtils.writeItems(handler, 0, stack.getTag()); }); - private BaseItemHandler disk = new BaseItemHandler(1) + private final BaseItemHandler disk = new BaseItemHandler(1) .addValidator(new StorageDiskItemValidator()) .addListener(((handler, slot, reading) -> { if (player != null && !player.world.isRemote) { diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java index 7d069cfb3..15a58418e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java @@ -9,8 +9,8 @@ public enum PortableGridDiskState implements IStringSerializable { DISCONNECTED(3, "disconnected"), NONE(4, "none"); - private int id; - private String type; + private final int id; + private final String type; PortableGridDiskState(int id, String type) { this.id = id; diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java index 068cc9069..604c21bc5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java @@ -119,9 +119,9 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid, private static final String NBT_ENERGY = "Energy"; private static final String NBT_ENCHANTMENTS = "ench"; // @Volatile: minecraft specific nbt key private EnergyStorage energyStorage = createEnergyStorage(0); - private LazyOptional energyStorageCap = LazyOptional.of(() -> energyStorage); + private final LazyOptional energyStorageCap = LazyOptional.of(() -> energyStorage); - private PortableGridBlockItem.Type type; + private final PortableGridBlockItem.Type type; private RedstoneMode redstoneMode = RedstoneMode.IGNORE; @@ -134,11 +134,11 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid, private GridType clientGridType; - private List filters = new ArrayList<>(); - private List tabs = new ArrayList<>(); + private final List filters = new ArrayList<>(); + private final List tabs = new ArrayList<>(); - private FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs).addListener(new TileInventoryListener(this)); - private BaseItemHandler disk = new BaseItemHandler(1) + private final FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs).addListener(new TileInventoryListener(this)); + private final BaseItemHandler disk = new BaseItemHandler(1) .addValidator(new StorageDiskItemValidator()) .addListener(new TileInventoryListener(this)) .addListener((handler, slot, reading) -> { @@ -158,14 +158,14 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid, @Nullable private IStorageCache cache; - private PortableItemGridHandler itemHandler = new PortableItemGridHandler(this, this); - private PortableFluidGridHandler fluidHandler = new PortableFluidGridHandler(this); + private final PortableItemGridHandler itemHandler = new PortableItemGridHandler(this, this); + private final PortableFluidGridHandler fluidHandler = new PortableFluidGridHandler(this); private PortableGridDiskState diskState = PortableGridDiskState.NONE; private boolean active; - private ItemStorageTracker storageTracker = new ItemStorageTracker(this::markDirty); - private FluidStorageTracker fluidStorageTracker = new FluidStorageTracker(this::markDirty); + private final ItemStorageTracker storageTracker = new ItemStorageTracker(this::markDirty); + private final FluidStorageTracker fluidStorageTracker = new FluidStorageTracker(this::markDirty); private ListNBT enchants = null; diff --git a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java index c8ecbf28c..0a83bcf5f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java @@ -162,7 +162,7 @@ public final class RenderUtils { if (needsWrap) { int wrappedTooltipWidth = 0; - List wrappedTextLines = new ArrayList(); + List wrappedTextLines = new ArrayList<>(); for (int i = 0; i < textLines.size(); i++) { String textLine = textLines.get(i); List wrappedLine = font.listFormattedStringToWidth(textLine, tooltipTextWidth); diff --git a/src/main/resources/assets/refinedstorage/lang/de_de.json b/src/main/resources/assets/refinedstorage/lang/de_de.json index f0ca11dd8..ca0bc9ace 100644 --- a/src/main/resources/assets/refinedstorage/lang/de_de.json +++ b/src/main/resources/assets/refinedstorage/lang/de_de.json @@ -346,5 +346,5 @@ "advancements.refinedstorage.interface_to_the_world": "Schnittstelle zur Welt", "advancements.refinedstorage.interface_to_the_world.description": "Benutze ein Interface, um gleichzeitig Items zu exportieren und zu importieren", "advancements.refinedstorage.storing_externally": "Speicher auslagern", - "advancements.refinedstorage.storing_externally.description": "Benutze einen externen Speicher um externe Itemquellen wie zum Beispiel Kisten anzubinden", + "advancements.refinedstorage.storing_externally.description": "Benutze einen externen Speicher um externe Itemquellen wie zum Beispiel Kisten anzubinden" } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/lang/ru_ru.json b/src/main/resources/assets/refinedstorage/lang/ru_ru.json index 63679a02d..3c0b52fa2 100644 --- a/src/main/resources/assets/refinedstorage/lang/ru_ru.json +++ b/src/main/resources/assets/refinedstorage/lang/ru_ru.json @@ -371,5 +371,5 @@ "advancements.refinedstorage.interface_to_the_world": "Интерфейс к миру", "advancements.refinedstorage.interface_to_the_world.description": "Экспортируйте и импортируйте предметы одновременно с помощью интерфейса", "advancements.refinedstorage.storing_externally": "Внешнее хранение", - "advancements.refinedstorage.storing_externally.description": "Используйте шину внешнего хранения для подключения к сети внешнего хранилища, например сундука", + "advancements.refinedstorage.storing_externally.description": "Используйте шину внешнего хранения для подключения к сети внешнего хранилища, например сундука" } \ No newline at end of file