From d7405afedb74f85aabf45185cfdabcbced366f03 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 18 Oct 2020 20:18:50 +0200 Subject: [PATCH] Remove some unneeded util classes. --- .../apiimpl/network/node/GridNetworkNode.java | 18 ++++++- .../node/storage/FluidStorageNetworkNode.java | 20 +++++++- .../node/storage/StorageNetworkNode.java | 20 +++++++- .../refinedstorage/tile/FluidStorageTile.java | 22 ++++++++- .../refinedstorage/tile/StorageTile.java | 22 ++++++++- .../refinedstorage/tile/grid/GridTile.java | 20 +++++++- .../util/FluidStorageBlockUtils.java | 47 ------------------- .../refinedstorage/util/GridUtils.java | 43 ----------------- .../refinedstorage/util/NetworkUtils.java | 3 +- .../util/StorageBlockUtils.java | 47 ------------------- 10 files changed, 111 insertions(+), 151 deletions(-) delete mode 100644 src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java delete mode 100644 src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java delete mode 100644 src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java 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 677dc7065..098e2df48 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 @@ -27,7 +27,6 @@ import com.refinedmods.refinedstorage.item.PatternItem; import com.refinedmods.refinedstorage.tile.config.IType; import com.refinedmods.refinedstorage.tile.data.TileDataManager; import com.refinedmods.refinedstorage.tile.grid.GridTile; -import com.refinedmods.refinedstorage.util.GridUtils; import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -199,6 +198,21 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I this.type = type; } + public static ResourceLocation getId(GridType type) { + switch (type) { + case NORMAL: + return ID; + case CRAFTING: + return CRAFTING_ID; + case PATTERN: + return PATTERN_ID; + case FLUID: + return FLUID_ID; + default: + throw new IllegalArgumentException("Unknown grid type " + type); + } + } + public AllowedTagList getAllowedTagList() { return allowedTagList; } @@ -686,7 +700,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public ResourceLocation getId() { - return GridUtils.getNetworkNodeId(type); + return getId(type); } @Override 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 04337adb4..6963a5e44 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 @@ -23,7 +23,6 @@ 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.util.AccessTypeUtils; -import com.refinedmods.refinedstorage.util.FluidStorageBlockUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -74,6 +73,23 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre this.type = type; } + public static ResourceLocation getId(FluidStorageType type) { + switch (type) { + case SIXTY_FOUR_K: + return SIXTY_FOUR_K_FLUID_STORAGE_BLOCK_ID; + case TWO_HUNDRED_FIFTY_SIX_K: + return TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK_ID; + case THOUSAND_TWENTY_FOUR_K: + return THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK_ID; + case FOUR_THOUSAND_NINETY_SIX_K: + return FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK_ID; + case CREATIVE: + return CREATIVE_FLUID_STORAGE_BLOCK_ID; + default: + throw new IllegalArgumentException("Unknown storage type " + type); + } + } + @Override public int getEnergyUsage() { switch (type) { @@ -117,7 +133,7 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre @Override public ResourceLocation getId() { - return FluidStorageBlockUtils.getNetworkNodeId(type); + return getId(type); } @Override 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 34d43cca2..49b5211a8 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 @@ -24,7 +24,6 @@ import com.refinedmods.refinedstorage.tile.config.IPrioritizable; import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; import com.refinedmods.refinedstorage.util.AccessTypeUtils; import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.StorageBlockUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -74,6 +73,23 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I this.type = type; } + public static ResourceLocation getId(ItemStorageType type) { + switch (type) { + case ONE_K: + return ONE_K_STORAGE_BLOCK_ID; + case FOUR_K: + return FOUR_K_STORAGE_BLOCK_ID; + case SIXTEEN_K: + return SIXTEEN_K_STORAGE_BLOCK_ID; + case SIXTY_FOUR_K: + return SIXTY_FOUR_K_STORAGE_BLOCK_ID; + case CREATIVE: + return CREATIVE_STORAGE_BLOCK_ID; + default: + throw new IllegalArgumentException("Unknown storage type " + type); + } + } + @Override public int getEnergyUsage() { switch (type) { @@ -117,7 +133,7 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I @Override public ResourceLocation getId() { - return StorageBlockUtils.getNetworkNodeId(type); + return getId(type); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/FluidStorageTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/FluidStorageTile.java index 1d2ef4160..94fd20db6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/FluidStorageTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/FluidStorageTile.java @@ -1,5 +1,6 @@ package com.refinedmods.refinedstorage.tile; +import com.refinedmods.refinedstorage.RSTiles; import com.refinedmods.refinedstorage.api.storage.AccessType; import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; @@ -9,7 +10,7 @@ import com.refinedmods.refinedstorage.tile.config.IPrioritizable; import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; import com.refinedmods.refinedstorage.tile.data.RSSerializers; import com.refinedmods.refinedstorage.tile.data.TileDataParameter; -import com.refinedmods.refinedstorage.util.FluidStorageBlockUtils; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -25,7 +26,7 @@ public class FluidStorageTile extends NetworkNodeTile { private final FluidStorageType type; public FluidStorageTile(FluidStorageType type) { - super(FluidStorageBlockUtils.getTileEntityType(type)); + super(getType(type)); this.type = type; @@ -36,6 +37,23 @@ public class FluidStorageTile extends NetworkNodeTile { dataManager.addWatchedParameter(ACCESS_TYPE); } + public static TileEntityType getType(FluidStorageType type) { + switch (type) { + case SIXTY_FOUR_K: + return RSTiles.SIXTY_FOUR_K_FLUID_STORAGE_BLOCK; + case TWO_HUNDRED_FIFTY_SIX_K: + return RSTiles.TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK; + case THOUSAND_TWENTY_FOUR_K: + return RSTiles.THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK; + case FOUR_THOUSAND_NINETY_SIX_K: + return RSTiles.FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK; + case CREATIVE: + return RSTiles.CREATIVE_FLUID_STORAGE_BLOCK; + default: + throw new IllegalArgumentException("Unknown storage type " + type); + } + } + public FluidStorageType getFluidStorageType() { return type; } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/StorageTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/StorageTile.java index dee074ba2..345281e8b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/StorageTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/StorageTile.java @@ -1,5 +1,6 @@ package com.refinedmods.refinedstorage.tile; +import com.refinedmods.refinedstorage.RSTiles; import com.refinedmods.refinedstorage.api.storage.AccessType; import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; @@ -9,7 +10,7 @@ import com.refinedmods.refinedstorage.tile.config.IPrioritizable; import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; import com.refinedmods.refinedstorage.tile.data.RSSerializers; import com.refinedmods.refinedstorage.tile.data.TileDataParameter; -import com.refinedmods.refinedstorage.util.StorageBlockUtils; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -25,7 +26,7 @@ public class StorageTile extends NetworkNodeTile { private final ItemStorageType type; public StorageTile(ItemStorageType type) { - super(StorageBlockUtils.getTileEntityType(type)); + super(getType(type)); this.type = type; @@ -36,6 +37,23 @@ public class StorageTile extends NetworkNodeTile { dataManager.addWatchedParameter(ACCESS_TYPE); } + public static TileEntityType getType(ItemStorageType type) { + switch (type) { + case ONE_K: + return RSTiles.ONE_K_STORAGE_BLOCK; + case FOUR_K: + return RSTiles.FOUR_K_STORAGE_BLOCK; + case SIXTEEN_K: + return RSTiles.SIXTEEN_K_STORAGE_BLOCK; + case SIXTY_FOUR_K: + return RSTiles.SIXTY_FOUR_K_STORAGE_BLOCK; + case CREATIVE: + return RSTiles.CREATIVE_STORAGE_BLOCK; + default: + throw new IllegalArgumentException("Unknown storage type " + type); + } + } + public ItemStorageType getItemStorageType() { return type; } 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 e0fd41a7a..764fa3f1e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java @@ -1,5 +1,6 @@ package com.refinedmods.refinedstorage.tile.grid; +import com.refinedmods.refinedstorage.RSTiles; import com.refinedmods.refinedstorage.api.network.grid.GridType; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; @@ -9,8 +10,8 @@ import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import com.refinedmods.refinedstorage.tile.config.IType; import com.refinedmods.refinedstorage.tile.data.RSSerializers; import com.refinedmods.refinedstorage.tile.data.TileDataParameter; -import com.refinedmods.refinedstorage.util.GridUtils; import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -91,7 +92,7 @@ public class GridTile extends NetworkNodeTile { private final LazyOptional diskCapability = LazyOptional.of(() -> getNode().getPatterns()); public GridTile(GridType type) { - super(GridUtils.getTileEntityType(type)); + super(getType(type)); this.type = type; @@ -109,6 +110,21 @@ public class GridTile extends NetworkNodeTile { dataManager.addParameter(ALLOWED_FLUID_TAGS); } + public static TileEntityType getType(GridType type) { + switch (type) { + case NORMAL: + return RSTiles.GRID; + case CRAFTING: + return RSTiles.CRAFTING_GRID; + case PATTERN: + return RSTiles.PATTERN_GRID; + case FLUID: + return RSTiles.FLUID_GRID; + default: + throw new IllegalArgumentException("Unknown grid type " + type); + } + } + @Override @Nonnull public GridNetworkNode createNode(World world, BlockPos pos) { diff --git a/src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java deleted file mode 100644 index 2427260c8..000000000 --- a/src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.refinedmods.refinedstorage.util; - -import com.refinedmods.refinedstorage.RSTiles; -import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; -import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; -import com.refinedmods.refinedstorage.tile.FluidStorageTile; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.ResourceLocation; - -public class FluidStorageBlockUtils { - private FluidStorageBlockUtils() { - } - - public static ResourceLocation getNetworkNodeId(FluidStorageType type) { - switch (type) { - case SIXTY_FOUR_K: - return FluidStorageNetworkNode.SIXTY_FOUR_K_FLUID_STORAGE_BLOCK_ID; - case TWO_HUNDRED_FIFTY_SIX_K: - return FluidStorageNetworkNode.TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK_ID; - case THOUSAND_TWENTY_FOUR_K: - return FluidStorageNetworkNode.THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK_ID; - case FOUR_THOUSAND_NINETY_SIX_K: - return FluidStorageNetworkNode.FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK_ID; - case CREATIVE: - return FluidStorageNetworkNode.CREATIVE_FLUID_STORAGE_BLOCK_ID; - default: - throw new IllegalArgumentException("Unknown storage type " + type); - } - } - - public static TileEntityType getTileEntityType(FluidStorageType type) { - switch (type) { - case SIXTY_FOUR_K: - return RSTiles.SIXTY_FOUR_K_FLUID_STORAGE_BLOCK; - case TWO_HUNDRED_FIFTY_SIX_K: - return RSTiles.TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK; - case THOUSAND_TWENTY_FOUR_K: - return RSTiles.THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK; - case FOUR_THOUSAND_NINETY_SIX_K: - return RSTiles.FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK; - case CREATIVE: - return RSTiles.CREATIVE_FLUID_STORAGE_BLOCK; - default: - throw new IllegalArgumentException("Unknown storage type " + type); - } - } -} diff --git a/src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java deleted file mode 100644 index 1e494c22f..000000000 --- a/src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.refinedmods.refinedstorage.util; - -import com.refinedmods.refinedstorage.RSTiles; -import com.refinedmods.refinedstorage.api.network.grid.GridType; -import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.refinedmods.refinedstorage.tile.grid.GridTile; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.ResourceLocation; - -public class GridUtils { - private GridUtils() { - } - - public static ResourceLocation getNetworkNodeId(GridType type) { - switch (type) { - case NORMAL: - return GridNetworkNode.ID; - case CRAFTING: - return GridNetworkNode.CRAFTING_ID; - case PATTERN: - return GridNetworkNode.PATTERN_ID; - case FLUID: - return GridNetworkNode.FLUID_ID; - default: - throw new IllegalArgumentException("Unknown grid type " + type); - } - } - - public static TileEntityType getTileEntityType(GridType type) { - switch (type) { - case NORMAL: - return RSTiles.GRID; - case CRAFTING: - return RSTiles.CRAFTING_GRID; - case PATTERN: - return RSTiles.PATTERN_GRID; - case FLUID: - return RSTiles.FLUID_GRID; - default: - throw new IllegalArgumentException("Unknown grid type " + type); - } - } -} diff --git a/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java index bdd06896c..d1b5215d3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java @@ -24,8 +24,7 @@ public class NetworkUtils { @Nullable public static INetworkNode getNodeFromTile(@Nullable TileEntity tile) { if (tile != null) { - INetworkNodeProxy proxy = tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY).orElse(null); - + INetworkNodeProxy proxy = tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY).orElse(null); if (proxy != null) { return proxy.getNode(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java deleted file mode 100644 index a3b223a29..000000000 --- a/src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.refinedmods.refinedstorage.util; - -import com.refinedmods.refinedstorage.RSTiles; -import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; -import com.refinedmods.refinedstorage.tile.StorageTile; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.ResourceLocation; - -public class StorageBlockUtils { - private StorageBlockUtils() { - } - - public static ResourceLocation getNetworkNodeId(ItemStorageType type) { - switch (type) { - case ONE_K: - return StorageNetworkNode.ONE_K_STORAGE_BLOCK_ID; - case FOUR_K: - return StorageNetworkNode.FOUR_K_STORAGE_BLOCK_ID; - case SIXTEEN_K: - return StorageNetworkNode.SIXTEEN_K_STORAGE_BLOCK_ID; - case SIXTY_FOUR_K: - return StorageNetworkNode.SIXTY_FOUR_K_STORAGE_BLOCK_ID; - case CREATIVE: - return StorageNetworkNode.CREATIVE_STORAGE_BLOCK_ID; - default: - throw new IllegalArgumentException("Unknown storage type " + type); - } - } - - public static TileEntityType getTileEntityType(ItemStorageType type) { - switch (type) { - case ONE_K: - return RSTiles.ONE_K_STORAGE_BLOCK; - case FOUR_K: - return RSTiles.FOUR_K_STORAGE_BLOCK; - case SIXTEEN_K: - return RSTiles.SIXTEEN_K_STORAGE_BLOCK; - case SIXTY_FOUR_K: - return RSTiles.SIXTY_FOUR_K_STORAGE_BLOCK; - case CREATIVE: - return RSTiles.CREATIVE_STORAGE_BLOCK; - default: - throw new IllegalArgumentException("Unknown storage type " + type); - } - } -}