From f87448a38aaa22885249031b765f43e1af08a06a Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 1 Mar 2017 14:26:34 +0100 Subject: [PATCH] Cleanup --- .../raoulvdberge/refinedstorage/RSUtils.java | 8 ++ .../CraftingPatternChainList.java | 7 +- .../network/node/NetworkNodeCable.java | 4 +- .../network/node/NetworkNodeFluidStorage.java | 10 +-- .../apiimpl/network/node/NetworkNodeGrid.java | 22 +++--- .../network/node/NetworkNodeStorage.java | 10 +-- .../node/diskdrive/NetworkNodeDiskDrive.java | 6 +- .../solderer/SoldererRecipeFluidStorage.java | 6 +- .../solderer/SoldererRecipeStorage.java | 6 +- .../refinedstorage/block/BlockBase.java | 4 +- .../refinedstorage/block/BlockCable.java | 78 +++++++++---------- .../block/BlockConstructor.java | 29 +++---- .../refinedstorage/block/BlockController.java | 6 +- .../refinedstorage/block/BlockCrafter.java | 4 +- .../refinedstorage/block/BlockDestructor.java | 4 +- .../refinedstorage/block/BlockDetector.java | 2 +- .../block/BlockDiskManipulator.java | 4 +- .../refinedstorage/block/BlockExporter.java | 41 +++++----- .../block/BlockExternalStorage.java | 17 ++-- .../block/BlockFluidInterface.java | 2 +- .../block/BlockFluidStorage.java | 8 +- .../refinedstorage/block/BlockGrid.java | 6 +- .../refinedstorage/block/BlockImporter.java | 41 +++++----- .../refinedstorage/block/BlockInterface.java | 2 +- .../block/BlockMachineCasing.java | 2 +- .../block/BlockNetworkReceiver.java | 2 +- .../block/BlockNetworkTransmitter.java | 2 +- .../block/BlockProcessingPatternEncoder.java | 2 +- .../block/BlockQuartzEnrichedIron.java | 2 +- .../refinedstorage/block/BlockReader.java | 4 +- .../refinedstorage/block/BlockRelay.java | 2 +- .../refinedstorage/block/BlockSolderer.java | 4 +- .../refinedstorage/block/BlockStorage.java | 8 +- .../block/BlockWirelessTransmitter.java | 2 +- .../refinedstorage/block/BlockWriter.java | 4 +- ...ontrollerType.java => ControllerType.java} | 4 +- ...StorageType.java => FluidStorageType.java} | 8 +- .../{EnumGridType.java => GridType.java} | 4 +- ...mStorageType.java => ItemStorageType.java} | 8 +- ...mPlacementType.java => PlacementType.java} | 4 +- .../container/ContainerGrid.java | 12 +-- .../refinedstorage/gui/grid/GuiGrid.java | 38 ++++----- .../sidebutton/SideButtonGridSortingType.java | 4 +- .../IntegrationCraftingTweaks.java | 4 +- .../refinedstorage/item/ItemBlockBase.java | 6 +- .../item/ItemBlockController.java | 6 +- .../item/ItemBlockFluidStorage.java | 8 +- .../refinedstorage/item/ItemBlockStorage.java | 8 +- .../item/ItemFluidStorageDisk.java | 4 +- .../refinedstorage/item/ItemStorageDisk.java | 4 +- .../network/MessageGridCraftingClear.java | 6 +- .../network/MessageGridCraftingTransfer.java | 4 +- .../network/MessageGridPatternCreate.java | 5 +- .../refinedstorage/proxy/ProxyClient.java | 30 +++---- .../refinedstorage/proxy/ProxyCommon.java | 36 ++++----- .../refinedstorage/tile/TileController.java | 26 +++---- .../refinedstorage/tile/grid/IGrid.java | 4 +- .../tile/grid/WirelessFluidGrid.java | 6 +- .../tile/grid/WirelessGrid.java | 6 +- 59 files changed, 305 insertions(+), 301 deletions(-) rename src/main/java/com/raoulvdberge/refinedstorage/block/{EnumControllerType.java => ControllerType.java} (80%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/block/{EnumFluidStorageType.java => FluidStorageType.java} (76%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/block/{EnumGridType.java => GridType.java} (83%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/block/{EnumItemStorageType.java => ItemStorageType.java} (75%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/block/{EnumPlacementType.java => PlacementType.java} (94%) mode change 100755 => 100644 diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java index 7c360b044..21acdfa05 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java @@ -347,6 +347,14 @@ public final class RSUtils { return String.valueOf(qty); } + public static AxisAlignedBB getAABB(int fromX, int fromY, int fromZ, int toX, int toY, int toZ) { + return new AxisAlignedBB((float) fromX / 16F, (float) fromY / 16F, (float) fromZ / 16F, (float) toX / 16F, (float) toY / 16F, (float) toZ / 16F); + } + + public static boolean isInAABB(AxisAlignedBB aabb, float hitX, float hitY, float hitZ) { + return hitX >= aabb.minX && hitX <= aabb.maxX && hitY >= aabb.minY && hitY <= aabb.maxY && hitZ >= aabb.minZ && hitZ <= aabb.maxZ; + } + private static class AdvancedRayTraceResultBase { public final AxisAlignedBB bounds; public final T hit; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java index 5a3216c59..4cb5f7567 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; +import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain; import java.util.Collection; import java.util.Iterator; @@ -90,8 +90,8 @@ public class CraftingPatternChainList implements Iterable c) { c.removeIf(p -> !isValidForChain(p)); + return innerList.addAll(c); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCable.java index 3a2f41e4f..52bed80a4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCable.java @@ -29,8 +29,8 @@ public class NetworkNodeCable extends NetworkNode { @Override public boolean canConduct(@Nullable EnumFacing direction) { if (IntegrationMCMP.isLoaded() && direction != null) { - return RSMCMPAddon.hasConnectionWith(holder.world().getTileEntity(holder.pos()), Collections.singletonList(BlockCable.directionToAABB(direction))) - && RSMCMPAddon.hasConnectionWith(holder.world().getTileEntity(holder.pos().offset(direction)), Collections.singletonList(BlockCable.directionToAABB(direction.getOpposite()))); + return RSMCMPAddon.hasConnectionWith(holder.world().getTileEntity(holder.pos()), Collections.singletonList(BlockCable.getCableExtensionAABB(direction))) + && RSMCMPAddon.hasConnectionWith(holder.world().getTileEntity(holder.pos().offset(direction)), Collections.singletonList(BlockCable.getCableExtensionAABB(direction.getOpposite()))); } return true; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidStorage.java index 259110657..8d21cd81d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidStorage.java @@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskFluid; import com.raoulvdberge.refinedstorage.block.BlockFluidStorage; -import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; +import com.raoulvdberge.refinedstorage.block.FluidStorageType; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode; import com.raoulvdberge.refinedstorage.tile.TileFluidStorage; @@ -72,7 +72,7 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage, private StorageFluid storage = new StorageFluid(StorageDiskFluid.getTag()); private NBTTagCompound storageTagToRead; - private EnumFluidStorageType type; + private FluidStorageType type; private AccessType accessType = AccessType.INSERT_EXTRACT; private int priority = 0; @@ -201,12 +201,12 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage, accessType = RSUtils.readAccessType(tag); } - public EnumFluidStorageType getType() { + public FluidStorageType getType() { if (type == null && holder.world() != null && holder.world().getBlockState(holder.pos()).getBlock() == RSBlocks.FLUID_STORAGE) { - type = (EnumFluidStorageType) holder.world().getBlockState(holder.pos()).getValue(BlockFluidStorage.TYPE); + type = (FluidStorageType) holder.world().getBlockState(holder.pos()).getValue(BlockFluidStorage.TYPE); } - return type == null ? EnumFluidStorageType.TYPE_64K : type; + return type == null ? FluidStorageType.TYPE_64K : type; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java index 7d1cfe30b..827f11f6d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java @@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.block.BlockGrid; -import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFilter; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode; @@ -86,7 +86,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { private List tabs = new ArrayList<>(); private ItemHandlerFilter filter = new ItemHandlerFilter(filters, tabs, new ItemHandlerListenerNetworkNode(this)); - private EnumGridType type; + private GridType type; private int viewType = VIEW_TYPE_NORMAL; private int sortingDirection = SORTING_DIRECTION_DESCENDING; @@ -150,17 +150,17 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { this.oredictPattern = oredictPattern; } - public EnumGridType getType() { + public GridType getType() { if (type == null && holder.world().getBlockState(holder.pos()).getBlock() == RSBlocks.GRID) { - type = (EnumGridType) holder.world().getBlockState(holder.pos()).getValue(BlockGrid.TYPE); + type = (GridType) holder.world().getBlockState(holder.pos()).getValue(BlockGrid.TYPE); } - return type == null ? EnumGridType.NORMAL : type; + return type == null ? GridType.NORMAL : type; } public void onOpened(EntityPlayer player) { if (network != null) { - if (getType() == EnumGridType.FLUID) { + if (getType() == GridType.FLUID) { network.sendFluidStorageToClient((EntityPlayerMP) player); } else { network.sendItemStorageToClient((EntityPlayerMP) player); @@ -170,7 +170,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { @Override public String getGuiTitle() { - return getType() == EnumGridType.FLUID ? "gui.refinedstorage:fluid_grid" : "gui.refinedstorage:grid"; + return getType() == GridType.FLUID ? "gui.refinedstorage:fluid_grid" : "gui.refinedstorage:grid"; } public IItemHandler getPatterns() { @@ -211,7 +211,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { @Override public void onRecipeTransfer(EntityPlayer player, ItemStack[][] recipe) { - if (network != null && getType() == EnumGridType.CRAFTING && !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)) { + if (network != null && getType() == GridType.CRAFTING && !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)) { return; } @@ -221,7 +221,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { if (!slot.isEmpty()) { // Only if we are a crafting grid. Pattern grids can just be emptied. - if (getType() == EnumGridType.CRAFTING) { + if (getType() == GridType.CRAFTING) { // If we are connected, try to insert into network. If it fails, stop. if (network != null) { if (network.insertItem(slot, slot.getCount(), true) != null) { @@ -247,7 +247,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { ItemStack[] possibilities = recipe[i]; // If we are a crafting grid - if (getType() == EnumGridType.CRAFTING) { + if (getType() == GridType.CRAFTING) { boolean found = false; // If we are connected, first try to get the possibilities from the network @@ -285,7 +285,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { } } } - } else if (getType() == EnumGridType.PATTERN) { + } else if (getType() == GridType.PATTERN) { // If we are a pattern grid we can just set the slot matrix.setInventorySlotContents(i, possibilities[0]); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorage.java index 98aa32c4f..78f239ca9 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorage.java @@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskItem; import com.raoulvdberge.refinedstorage.block.BlockStorage; -import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; +import com.raoulvdberge.refinedstorage.block.ItemStorageType; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode; import com.raoulvdberge.refinedstorage.tile.TileStorage; @@ -71,7 +71,7 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto private StorageItem storage = new StorageItem(StorageDiskItem.getTag()); private NBTTagCompound storageTagToRead = null; - private EnumItemStorageType type; + private ItemStorageType type; private AccessType accessType = AccessType.INSERT_EXTRACT; private int priority = 0; @@ -196,12 +196,12 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto accessType = RSUtils.readAccessType(tag); } - public EnumItemStorageType getType() { + public ItemStorageType getType() { if (type == null && holder.world() != null && holder.world().getBlockState(holder.pos()).getBlock() == RSBlocks.STORAGE) { - type = (EnumItemStorageType) holder.world().getBlockState(holder.pos()).getValue(BlockStorage.TYPE); + type = (ItemStorageType) holder.world().getBlockState(holder.pos()).getValue(BlockStorage.TYPE); } - return type == null ? EnumItemStorageType.TYPE_1K : type; + return type == null ? ItemStorageType.TYPE_1K : type; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java index 4adcd2389..37b25c252 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java @@ -14,8 +14,8 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.INetworkNodeHolder; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskFluid; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskItem; -import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; -import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; +import com.raoulvdberge.refinedstorage.block.FluidStorageType; +import com.raoulvdberge.refinedstorage.block.ItemStorageType; import com.raoulvdberge.refinedstorage.inventory.IItemValidator; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; @@ -330,7 +330,7 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS ItemStack disk = disks.getStackInSlot(i); if (!disk.isEmpty()) { - int diskCapacity = disk.getItem() == RSItems.STORAGE_DISK ? EnumItemStorageType.getById(disk.getItemDamage()).getCapacity() : EnumFluidStorageType.getById(disk.getItemDamage()).getCapacity(); + int diskCapacity = disk.getItem() == RSItems.STORAGE_DISK ? ItemStorageType.getById(disk.getItemDamage()).getCapacity() : FluidStorageType.getById(disk.getItemDamage()).getCapacity(); if (diskCapacity == -1) { return -1; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java index c3555cb8b..6d4c8f9b4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.solderer; import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe; -import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; +import com.raoulvdberge.refinedstorage.block.FluidStorageType; import com.raoulvdberge.refinedstorage.item.ItemBlockFluidStorage; import com.raoulvdberge.refinedstorage.item.ItemProcessor; import net.minecraft.item.ItemStack; @@ -12,10 +12,10 @@ import net.minecraft.util.NonNullList; import javax.annotation.Nonnull; public class SoldererRecipeFluidStorage implements ISoldererRecipe { - private EnumFluidStorageType type; + private FluidStorageType type; private NonNullList rows = NonNullList.create(); - public SoldererRecipeFluidStorage(EnumFluidStorageType type, int storagePart) { + public SoldererRecipeFluidStorage(FluidStorageType type, int storagePart) { this.type = type; this.rows.add(new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java index c25503904..3055cff57 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.solderer; import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe; -import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; +import com.raoulvdberge.refinedstorage.block.ItemStorageType; import com.raoulvdberge.refinedstorage.item.ItemBlockStorage; import com.raoulvdberge.refinedstorage.item.ItemProcessor; import net.minecraft.item.ItemStack; @@ -12,10 +12,10 @@ import net.minecraft.util.NonNullList; import javax.annotation.Nonnull; public class SoldererRecipeStorage implements ISoldererRecipe { - private EnumItemStorageType type; + private ItemStorageType type; private NonNullList rows = NonNullList.create(); - public SoldererRecipeStorage(EnumItemStorageType type, int storagePart) { + public SoldererRecipeStorage(ItemStorageType type, int storagePart) { this.type = type; this.rows.add(new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java index 4c48e10fb..d2d611c19 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java @@ -193,7 +193,7 @@ public abstract class BlockBase extends Block { return super.canEntityDestroy(state, world, pos, entity); } - public EnumPlacementType getPlacementType() { - return EnumPlacementType.HORIZONTAL; + public PlacementType getPlacementType() { + return PlacementType.HORIZONTAL; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java index 2f410a039..849d20b32 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java @@ -26,17 +26,13 @@ import java.util.Collections; import java.util.List; public class BlockCable extends BlockNode { - protected static AxisAlignedBB createAABB(int fromX, int fromY, int fromZ, int toX, int toY, int toZ) { - return new AxisAlignedBB((float) fromX / 16F, (float) fromY / 16F, (float) fromZ / 16F, (float) toX / 16F, (float) toY / 16F, (float) toZ / 16F); - } - - public static final AxisAlignedBB CORE_AABB = createAABB(6, 6, 6, 10, 10, 10); - protected static final AxisAlignedBB NORTH_AABB = createAABB(6, 6, 0, 10, 10, 6); - protected static final AxisAlignedBB EAST_AABB = createAABB(10, 6, 6, 16, 10, 10); - protected static final AxisAlignedBB SOUTH_AABB = createAABB(6, 6, 10, 10, 10, 16); - protected static final AxisAlignedBB WEST_AABB = createAABB(0, 6, 6, 6, 10, 10); - protected static final AxisAlignedBB UP_AABB = createAABB(6, 10, 6, 10, 16, 10); - protected static final AxisAlignedBB DOWN_AABB = createAABB(6, 0, 6, 10, 6, 10); + public static final AxisAlignedBB CORE_AABB = RSUtils.getAABB(6, 6, 6, 10, 10, 10); + private static final AxisAlignedBB NORTH_AABB = RSUtils.getAABB(6, 6, 0, 10, 10, 6); + private static final AxisAlignedBB EAST_AABB = RSUtils.getAABB(10, 6, 6, 16, 10, 10); + private static final AxisAlignedBB SOUTH_AABB = RSUtils.getAABB(6, 6, 10, 10, 10, 16); + private static final AxisAlignedBB WEST_AABB = RSUtils.getAABB(0, 6, 6, 6, 10, 10); + private static final AxisAlignedBB UP_AABB = RSUtils.getAABB(6, 10, 6, 10, 16, 10); + private static final AxisAlignedBB DOWN_AABB = RSUtils.getAABB(6, 0, 6, 10, 6, 10); protected static final PropertyBool NORTH = PropertyBool.create("north"); protected static final PropertyBool EAST = PropertyBool.create("east"); @@ -123,8 +119,8 @@ public class BlockCable extends BlockNode { } if (IntegrationMCMP.isLoaded()) { - return RSMCMPAddon.hasConnectionWith(tile, Collections.singletonList(BlockCable.directionToAABB(direction))) - && RSMCMPAddon.hasConnectionWith(otherTile, Collections.singletonList(BlockCable.directionToAABB(direction.getOpposite()))); + return RSMCMPAddon.hasConnectionWith(tile, Collections.singletonList(BlockCable.getCableExtensionAABB(direction))) + && RSMCMPAddon.hasConnectionWith(otherTile, Collections.singletonList(BlockCable.getCableExtensionAABB(direction.getOpposite()))); } return true; @@ -133,38 +129,16 @@ public class BlockCable extends BlockNode { return false; } - public static AxisAlignedBB directionToAABB(EnumFacing facing) { - if (facing == EnumFacing.NORTH) { - return NORTH_AABB; - } else if (facing == EnumFacing.EAST) { - return EAST_AABB; - } else if (facing == EnumFacing.SOUTH) { - return SOUTH_AABB; - } else if (facing == EnumFacing.WEST) { - return WEST_AABB; - } else if (facing == EnumFacing.UP) { - return UP_AABB; - } else if (facing == EnumFacing.DOWN) { - return DOWN_AABB; - } - - return NORTH_AABB; - } - - private boolean isInAABB(AxisAlignedBB aabb, float hitX, float hitY, float hitZ) { - return hitX >= aabb.minX && hitX <= aabb.maxX && hitY >= aabb.minY && hitY <= aabb.maxY && hitZ >= aabb.minZ && hitZ <= aabb.maxZ; - } - protected boolean hitCablePart(IBlockState state, World world, BlockPos pos, float hitX, float hitY, float hitZ) { state = getActualState(state, world, pos); - return isInAABB(CORE_AABB, hitX, hitY, hitZ) || - (state.getValue(NORTH) && isInAABB(NORTH_AABB, hitX, hitY, hitZ)) || - (state.getValue(EAST) && isInAABB(EAST_AABB, hitX, hitY, hitZ)) || - (state.getValue(SOUTH) && isInAABB(SOUTH_AABB, hitX, hitY, hitZ)) || - (state.getValue(WEST) && isInAABB(WEST_AABB, hitX, hitY, hitZ)) || - (state.getValue(UP) && isInAABB(UP_AABB, hitX, hitY, hitZ)) || - (state.getValue(DOWN) && isInAABB(DOWN_AABB, hitX, hitY, hitZ)); + return RSUtils.isInAABB(CORE_AABB, hitX, hitY, hitZ) || + (state.getValue(NORTH) && RSUtils.isInAABB(NORTH_AABB, hitX, hitY, hitZ)) || + (state.getValue(EAST) && RSUtils.isInAABB(EAST_AABB, hitX, hitY, hitZ)) || + (state.getValue(SOUTH) && RSUtils.isInAABB(SOUTH_AABB, hitX, hitY, hitZ)) || + (state.getValue(WEST) && RSUtils.isInAABB(WEST_AABB, hitX, hitY, hitZ)) || + (state.getValue(UP) && RSUtils.isInAABB(UP_AABB, hitX, hitY, hitZ)) || + (state.getValue(DOWN) && RSUtils.isInAABB(DOWN_AABB, hitX, hitY, hitZ)); } public List getUnionizedCollisionBoxes(IBlockState state) { @@ -258,7 +232,25 @@ public class BlockCable extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } + + public static AxisAlignedBB getCableExtensionAABB(EnumFacing facing) { + if (facing == EnumFacing.NORTH) { + return NORTH_AABB; + } else if (facing == EnumFacing.EAST) { + return EAST_AABB; + } else if (facing == EnumFacing.SOUTH) { + return SOUTH_AABB; + } else if (facing == EnumFacing.WEST) { + return WEST_AABB; + } else if (facing == EnumFacing.UP) { + return UP_AABB; + } else if (facing == EnumFacing.DOWN) { + return DOWN_AABB; + } + + return NORTH_AABB; + } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java index f6e930911..664c828ae 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.block; import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.RSUtils; import com.raoulvdberge.refinedstorage.tile.TileConstructor; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -15,19 +16,19 @@ import java.util.ArrayList; import java.util.List; public class BlockConstructor extends BlockCable { - public static final AxisAlignedBB HOLDER_NORTH_AABB = createAABB(7, 7, 2, 9, 9, 6); - public static final AxisAlignedBB HOLDER_EAST_AABB = createAABB(10, 7, 7, 14, 9, 9); - public static final AxisAlignedBB HOLDER_SOUTH_AABB = createAABB(7, 7, 10, 9, 9, 14); - public static final AxisAlignedBB HOLDER_WEST_AABB = createAABB(2, 7, 7, 6, 9, 9); - public static final AxisAlignedBB HOLDER_UP_AABB = createAABB(7, 10, 7, 9, 14, 9); - public static final AxisAlignedBB HOLDER_DOWN_AABB = createAABB(7, 2, 7, 9, 6, 9); + public static final AxisAlignedBB HOLDER_NORTH_AABB = RSUtils.getAABB(7, 7, 2, 9, 9, 6); + public static final AxisAlignedBB HOLDER_EAST_AABB = RSUtils.getAABB(10, 7, 7, 14, 9, 9); + public static final AxisAlignedBB HOLDER_SOUTH_AABB = RSUtils.getAABB(7, 7, 10, 9, 9, 14); + public static final AxisAlignedBB HOLDER_WEST_AABB = RSUtils.getAABB(2, 7, 7, 6, 9, 9); + public static final AxisAlignedBB HOLDER_UP_AABB = RSUtils.getAABB(7, 10, 7, 9, 14, 9); + public static final AxisAlignedBB HOLDER_DOWN_AABB = RSUtils.getAABB(7, 2, 7, 9, 6, 9); - public static final AxisAlignedBB HEAD_NORTH_AABB = createAABB(0, 0, 0, 16, 16, 2); - public static final AxisAlignedBB HEAD_EAST_AABB = createAABB(14, 0, 0, 16, 16, 16); - public static final AxisAlignedBB HEAD_SOUTH_AABB = createAABB(0, 0, 14, 16, 16, 16); - public static final AxisAlignedBB HEAD_WEST_AABB = createAABB(0, 0, 0, 2, 16, 16); - public static final AxisAlignedBB HEAD_DOWN_AABB = createAABB(0, 0, 0, 16, 2, 16); - public static final AxisAlignedBB HEAD_UP_AABB = createAABB(0, 14, 0, 16, 16, 16); + public static final AxisAlignedBB HEAD_NORTH_AABB = RSUtils.getAABB(0, 0, 0, 16, 16, 2); + public static final AxisAlignedBB HEAD_EAST_AABB = RSUtils.getAABB(14, 0, 0, 16, 16, 16); + public static final AxisAlignedBB HEAD_SOUTH_AABB = RSUtils.getAABB(0, 0, 14, 16, 16, 16); + public static final AxisAlignedBB HEAD_WEST_AABB = RSUtils.getAABB(0, 0, 0, 2, 16, 16); + public static final AxisAlignedBB HEAD_DOWN_AABB = RSUtils.getAABB(0, 0, 0, 16, 2, 16); + public static final AxisAlignedBB HEAD_UP_AABB = RSUtils.getAABB(0, 14, 0, 16, 16, 16); public BlockConstructor() { super("constructor"); @@ -91,7 +92,7 @@ public class BlockConstructor extends BlockCable { } @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY; + public PlacementType getPlacementType() { + return PlacementType.ANY; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java index 2e6dcbd79..58322d5b7 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; public class BlockController extends BlockBase { - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumControllerType.class); + public static final PropertyEnum TYPE = PropertyEnum.create("type", ControllerType.class); private static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 7); @@ -51,12 +51,12 @@ public class BlockController extends BlockBase { @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(TYPE, meta == 0 ? EnumControllerType.NORMAL : EnumControllerType.CREATIVE); + return getDefaultState().withProperty(TYPE, meta == 0 ? ControllerType.NORMAL : ControllerType.CREATIVE); } @Override public int getMetaFromState(IBlockState state) { - return state.getValue(TYPE) == EnumControllerType.NORMAL ? 0 : 1; + return state.getValue(TYPE) == ControllerType.NORMAL ? 0 : 1; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java index fc4a0077b..895debe24 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java @@ -30,8 +30,8 @@ public class BlockCrafter extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY_FACE_PLAYER; + public PlacementType getPlacementType() { + return PlacementType.ANY_FACE_PLAYER; } public boolean hasConnectivityState() { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java index a443f4f7a..a11084da9 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java @@ -48,7 +48,7 @@ public class BlockDestructor extends BlockCable { } @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY; + public PlacementType getPlacementType() { + return PlacementType.ANY; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java index 7a403d85d..9be9ac8df 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java @@ -93,7 +93,7 @@ public class BlockDetector extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java index e36ed5137..d2ee9dab3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java @@ -58,7 +58,7 @@ public class BlockDiskManipulator extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.HORIZONTAL; + public PlacementType getPlacementType() { + return PlacementType.HORIZONTAL; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java index 00e9e4110..a048ce3c8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.block; import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.RSUtils; import com.raoulvdberge.refinedstorage.tile.TileExporter; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -15,24 +16,24 @@ import java.util.ArrayList; import java.util.List; public class BlockExporter extends BlockCable { - private static final AxisAlignedBB LINE_NORTH_1_AABB = createAABB(6, 6, 0, 10, 10, 2); - private static final AxisAlignedBB LINE_NORTH_2_AABB = createAABB(5, 5, 2, 11, 11, 4); - private static final AxisAlignedBB LINE_NORTH_3_AABB = createAABB(3, 3, 4, 13, 13, 6); - private static final AxisAlignedBB LINE_EAST_1_AABB = createAABB(14, 6, 6, 16, 10, 10); - private static final AxisAlignedBB LINE_EAST_2_AABB = createAABB(12, 5, 5, 14, 11, 11); - private static final AxisAlignedBB LINE_EAST_3_AABB = createAABB(10, 3, 3, 12, 13, 13); - private static final AxisAlignedBB LINE_SOUTH_1_AABB = createAABB(6, 6, 14, 10, 10, 16); - private static final AxisAlignedBB LINE_SOUTH_2_AABB = createAABB(5, 5, 12, 11, 11, 14); - private static final AxisAlignedBB LINE_SOUTH_3_AABB = createAABB(3, 3, 10, 13, 13, 12); - private static final AxisAlignedBB LINE_WEST_1_AABB = createAABB(0, 6, 6, 2, 10, 10); - private static final AxisAlignedBB LINE_WEST_2_AABB = createAABB(2, 5, 5, 4, 11, 11); - private static final AxisAlignedBB LINE_WEST_3_AABB = createAABB(4, 3, 3, 6, 13, 13); - private static final AxisAlignedBB LINE_UP_1_AABB = createAABB(6, 14, 6, 10, 16, 10); - private static final AxisAlignedBB LINE_UP_2_AABB = createAABB(5, 12, 5, 11, 14, 11); - private static final AxisAlignedBB LINE_UP_3_AABB = createAABB(3, 10, 3, 13, 12, 13); - private static final AxisAlignedBB LINE_DOWN_1_AABB = createAABB(6, 0, 6, 10, 2, 10); - private static final AxisAlignedBB LINE_DOWN_2_AABB = createAABB(5, 2, 5, 11, 4, 11); - private static final AxisAlignedBB LINE_DOWN_3_AABB = createAABB(3, 4, 3, 13, 6, 13); + private static final AxisAlignedBB LINE_NORTH_1_AABB = RSUtils.getAABB(6, 6, 0, 10, 10, 2); + private static final AxisAlignedBB LINE_NORTH_2_AABB = RSUtils.getAABB(5, 5, 2, 11, 11, 4); + private static final AxisAlignedBB LINE_NORTH_3_AABB = RSUtils.getAABB(3, 3, 4, 13, 13, 6); + private static final AxisAlignedBB LINE_EAST_1_AABB = RSUtils.getAABB(14, 6, 6, 16, 10, 10); + private static final AxisAlignedBB LINE_EAST_2_AABB = RSUtils.getAABB(12, 5, 5, 14, 11, 11); + private static final AxisAlignedBB LINE_EAST_3_AABB = RSUtils.getAABB(10, 3, 3, 12, 13, 13); + private static final AxisAlignedBB LINE_SOUTH_1_AABB = RSUtils.getAABB(6, 6, 14, 10, 10, 16); + private static final AxisAlignedBB LINE_SOUTH_2_AABB = RSUtils.getAABB(5, 5, 12, 11, 11, 14); + private static final AxisAlignedBB LINE_SOUTH_3_AABB = RSUtils.getAABB(3, 3, 10, 13, 13, 12); + private static final AxisAlignedBB LINE_WEST_1_AABB = RSUtils.getAABB(0, 6, 6, 2, 10, 10); + private static final AxisAlignedBB LINE_WEST_2_AABB = RSUtils.getAABB(2, 5, 5, 4, 11, 11); + private static final AxisAlignedBB LINE_WEST_3_AABB = RSUtils.getAABB(4, 3, 3, 6, 13, 13); + private static final AxisAlignedBB LINE_UP_1_AABB = RSUtils.getAABB(6, 14, 6, 10, 16, 10); + private static final AxisAlignedBB LINE_UP_2_AABB = RSUtils.getAABB(5, 12, 5, 11, 14, 11); + private static final AxisAlignedBB LINE_UP_3_AABB = RSUtils.getAABB(3, 10, 3, 13, 12, 13); + private static final AxisAlignedBB LINE_DOWN_1_AABB = RSUtils.getAABB(6, 0, 6, 10, 2, 10); + private static final AxisAlignedBB LINE_DOWN_2_AABB = RSUtils.getAABB(5, 2, 5, 11, 4, 11); + private static final AxisAlignedBB LINE_DOWN_3_AABB = RSUtils.getAABB(3, 4, 3, 13, 6, 13); public BlockExporter() { super("exporter"); @@ -97,7 +98,7 @@ public class BlockExporter extends BlockCable { } @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY; + public PlacementType getPlacementType() { + return PlacementType.ANY; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java index 17386336c..aa385173b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.block; import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.RSUtils; import com.raoulvdberge.refinedstorage.apiimpl.network.node.externalstorage.NetworkNodeExternalStorage; import com.raoulvdberge.refinedstorage.tile.TileExternalStorage; import net.minecraft.block.Block; @@ -17,12 +18,12 @@ import java.util.ArrayList; import java.util.List; public class BlockExternalStorage extends BlockCable { - private static final AxisAlignedBB HEAD_NORTH_AABB = createAABB(3, 3, 0, 13, 13, 2); - private static final AxisAlignedBB HEAD_EAST_AABB = createAABB(14, 3, 3, 16, 13, 13); - private static final AxisAlignedBB HEAD_SOUTH_AABB = createAABB(3, 3, 14, 13, 13, 16); - private static final AxisAlignedBB HEAD_WEST_AABB = createAABB(0, 3, 3, 2, 13, 13); - private static final AxisAlignedBB HEAD_UP_AABB = createAABB(3, 14, 3, 13, 16, 13); - private static final AxisAlignedBB HEAD_DOWN_AABB = createAABB(3, 0, 3, 13, 2, 13); + private static final AxisAlignedBB HEAD_NORTH_AABB = RSUtils.getAABB(3, 3, 0, 13, 13, 2); + private static final AxisAlignedBB HEAD_EAST_AABB = RSUtils.getAABB(14, 3, 3, 16, 13, 13); + private static final AxisAlignedBB HEAD_SOUTH_AABB = RSUtils.getAABB(3, 3, 14, 13, 13, 16); + private static final AxisAlignedBB HEAD_WEST_AABB = RSUtils.getAABB(0, 3, 3, 2, 13, 13); + private static final AxisAlignedBB HEAD_UP_AABB = RSUtils.getAABB(3, 14, 3, 13, 16, 13); + private static final AxisAlignedBB HEAD_DOWN_AABB = RSUtils.getAABB(3, 0, 3, 13, 2, 13); public BlockExternalStorage() { super("external_storage"); @@ -95,7 +96,7 @@ public class BlockExternalStorage extends BlockCable { } @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY; + public PlacementType getPlacementType() { + return PlacementType.ANY; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java index 85dfb77de..7f1d27042 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java @@ -36,7 +36,7 @@ public class BlockFluidInterface extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java index f84e84a02..f992a5f2c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; public class BlockFluidStorage extends BlockNode { - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumFluidStorageType.class); + public static final PropertyEnum TYPE = PropertyEnum.create("type", FluidStorageType.class); public BlockFluidStorage() { super("fluid_storage"); @@ -50,12 +50,12 @@ public class BlockFluidStorage extends BlockNode { @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(TYPE, EnumFluidStorageType.getById(meta)); + return getDefaultState().withProperty(TYPE, FluidStorageType.getById(meta)); } @Override public int getMetaFromState(IBlockState state) { - return ((EnumFluidStorageType) state.getValue(TYPE)).getId(); + return ((FluidStorageType) state.getValue(TYPE)).getId(); } @Override @@ -112,7 +112,7 @@ public class BlockFluidStorage extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java index 7c3f08fe5..b75df5a02 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java @@ -18,7 +18,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockGrid extends BlockNode { - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumGridType.class); + public static final PropertyEnum TYPE = PropertyEnum.create("type", GridType.class); public BlockGrid() { super("grid"); @@ -45,12 +45,12 @@ public class BlockGrid extends BlockNode { @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(TYPE, meta == 0 ? EnumGridType.NORMAL : (meta == 1 ? EnumGridType.CRAFTING : (meta == 2 ? EnumGridType.PATTERN : EnumGridType.FLUID))); + return getDefaultState().withProperty(TYPE, meta == 0 ? GridType.NORMAL : (meta == 1 ? GridType.CRAFTING : (meta == 2 ? GridType.PATTERN : GridType.FLUID))); } @Override public int getMetaFromState(IBlockState state) { - return state.getValue(TYPE) == EnumGridType.NORMAL ? 0 : (state.getValue(TYPE) == EnumGridType.CRAFTING ? 1 : (state.getValue(TYPE) == EnumGridType.PATTERN ? 2 : 3)); + return state.getValue(TYPE) == GridType.NORMAL ? 0 : (state.getValue(TYPE) == GridType.CRAFTING ? 1 : (state.getValue(TYPE) == GridType.PATTERN ? 2 : 3)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java index eb4b871a0..81f02c2de 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.block; import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.RSUtils; import com.raoulvdberge.refinedstorage.tile.TileImporter; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -15,24 +16,24 @@ import java.util.ArrayList; import java.util.List; public class BlockImporter extends BlockCable { - private static final AxisAlignedBB LINE_NORTH_1_AABB = createAABB(6, 6, 4, 10, 10, 6); - private static final AxisAlignedBB LINE_NORTH_2_AABB = createAABB(5, 5, 2, 11, 11, 4); - private static final AxisAlignedBB LINE_NORTH_3_AABB = createAABB(3, 3, 0, 13, 13, 2); - private static final AxisAlignedBB LINE_EAST_1_AABB = createAABB(10, 6, 6, 12, 10, 10); - private static final AxisAlignedBB LINE_EAST_2_AABB = createAABB(12, 5, 5, 14, 11, 11); - private static final AxisAlignedBB LINE_EAST_3_AABB = createAABB(14, 3, 3, 16, 13, 13); - private static final AxisAlignedBB LINE_SOUTH_1_AABB = createAABB(6, 6, 10, 10, 10, 12); - private static final AxisAlignedBB LINE_SOUTH_2_AABB = createAABB(5, 5, 12, 11, 11, 14); - private static final AxisAlignedBB LINE_SOUTH_3_AABB = createAABB(3, 3, 14, 13, 13, 16); - private static final AxisAlignedBB LINE_WEST_1_AABB = createAABB(4, 6, 6, 6, 10, 10); - private static final AxisAlignedBB LINE_WEST_2_AABB = createAABB(2, 5, 5, 4, 11, 11); - private static final AxisAlignedBB LINE_WEST_3_AABB = createAABB(0, 3, 3, 2, 13, 13); - private static final AxisAlignedBB LINE_UP_1_AABB = createAABB(6, 10, 6, 10, 12, 10); - private static final AxisAlignedBB LINE_UP_2_AABB = createAABB(5, 12, 5, 11, 14, 11); - private static final AxisAlignedBB LINE_UP_3_AABB = createAABB(3, 14, 3, 13, 16, 13); - private static final AxisAlignedBB LINE_DOWN_1_AABB = createAABB(6, 4, 6, 10, 6, 10); - private static final AxisAlignedBB LINE_DOWN_2_AABB = createAABB(5, 2, 5, 11, 4, 11); - private static final AxisAlignedBB LINE_DOWN_3_AABB = createAABB(3, 0, 3, 13, 2, 13); + private static final AxisAlignedBB LINE_NORTH_1_AABB = RSUtils.getAABB(6, 6, 4, 10, 10, 6); + private static final AxisAlignedBB LINE_NORTH_2_AABB = RSUtils.getAABB(5, 5, 2, 11, 11, 4); + private static final AxisAlignedBB LINE_NORTH_3_AABB = RSUtils.getAABB(3, 3, 0, 13, 13, 2); + private static final AxisAlignedBB LINE_EAST_1_AABB = RSUtils.getAABB(10, 6, 6, 12, 10, 10); + private static final AxisAlignedBB LINE_EAST_2_AABB = RSUtils.getAABB(12, 5, 5, 14, 11, 11); + private static final AxisAlignedBB LINE_EAST_3_AABB = RSUtils.getAABB(14, 3, 3, 16, 13, 13); + private static final AxisAlignedBB LINE_SOUTH_1_AABB = RSUtils.getAABB(6, 6, 10, 10, 10, 12); + private static final AxisAlignedBB LINE_SOUTH_2_AABB = RSUtils.getAABB(5, 5, 12, 11, 11, 14); + private static final AxisAlignedBB LINE_SOUTH_3_AABB = RSUtils.getAABB(3, 3, 14, 13, 13, 16); + private static final AxisAlignedBB LINE_WEST_1_AABB = RSUtils.getAABB(4, 6, 6, 6, 10, 10); + private static final AxisAlignedBB LINE_WEST_2_AABB = RSUtils.getAABB(2, 5, 5, 4, 11, 11); + private static final AxisAlignedBB LINE_WEST_3_AABB = RSUtils.getAABB(0, 3, 3, 2, 13, 13); + private static final AxisAlignedBB LINE_UP_1_AABB = RSUtils.getAABB(6, 10, 6, 10, 12, 10); + private static final AxisAlignedBB LINE_UP_2_AABB = RSUtils.getAABB(5, 12, 5, 11, 14, 11); + private static final AxisAlignedBB LINE_UP_3_AABB = RSUtils.getAABB(3, 14, 3, 13, 16, 13); + private static final AxisAlignedBB LINE_DOWN_1_AABB = RSUtils.getAABB(6, 4, 6, 10, 6, 10); + private static final AxisAlignedBB LINE_DOWN_2_AABB = RSUtils.getAABB(5, 2, 5, 11, 4, 11); + private static final AxisAlignedBB LINE_DOWN_3_AABB = RSUtils.getAABB(3, 0, 3, 13, 2, 13); public BlockImporter() { super("importer"); @@ -97,7 +98,7 @@ public class BlockImporter extends BlockCable { } @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY; + public PlacementType getPlacementType() { + return PlacementType.ANY; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java index be1c36224..42f0a3e5a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java @@ -36,7 +36,7 @@ public class BlockInterface extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java index ff56689b4..6f3cbc4bd 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java @@ -6,7 +6,7 @@ public class BlockMachineCasing extends BlockBase { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java index 24b947de4..01c614059 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java @@ -16,7 +16,7 @@ public class BlockNetworkReceiver extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java index 05d93d13d..8d0794b29 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java @@ -30,7 +30,7 @@ public class BlockNetworkTransmitter extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java index 4f5dd7805..22771953f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java @@ -49,7 +49,7 @@ public class BlockProcessingPatternEncoder extends BlockBase { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java index 1d64b5a44..62e5587dd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java @@ -6,7 +6,7 @@ public class BlockQuartzEnrichedIron extends BlockBase { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java index f37f87332..3f9e63150 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java @@ -70,7 +70,7 @@ public class BlockReader extends BlockCable { } @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY_FACE_PLAYER; + public PlacementType getPlacementType() { + return PlacementType.ANY_FACE_PLAYER; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java index 6d96e8ed3..cdcd0b51e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java @@ -30,7 +30,7 @@ public class BlockRelay extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java index f3345fa33..489d5f06c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java @@ -110,7 +110,7 @@ public class BlockSolderer extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.HORIZONTAL; + public PlacementType getPlacementType() { + return PlacementType.HORIZONTAL; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java index b6224dcc5..6ab3c6ca4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; public class BlockStorage extends BlockNode { - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumItemStorageType.class); + public static final PropertyEnum TYPE = PropertyEnum.create("type", ItemStorageType.class); public BlockStorage() { super("storage"); @@ -50,12 +50,12 @@ public class BlockStorage extends BlockNode { @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(TYPE, EnumItemStorageType.getById(meta)); + return getDefaultState().withProperty(TYPE, ItemStorageType.getById(meta)); } @Override public int getMetaFromState(IBlockState state) { - return ((EnumItemStorageType) state.getValue(TYPE)).getId(); + return ((ItemStorageType) state.getValue(TYPE)).getId(); } @Override @@ -112,7 +112,7 @@ public class BlockStorage extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java index 46b27034f..4c2cfba4e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java @@ -85,7 +85,7 @@ public class BlockWirelessTransmitter extends BlockNode { } @Override - public EnumPlacementType getPlacementType() { + public PlacementType getPlacementType() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java index 7d6a0a254..53f91cc3f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java @@ -91,7 +91,7 @@ public class BlockWriter extends BlockCable { } @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY_FACE_PLAYER; + public PlacementType getPlacementType() { + return PlacementType.ANY_FACE_PLAYER; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumControllerType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerType.java old mode 100755 new mode 100644 similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/block/EnumControllerType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/ControllerType.java index 509898cd0..a28137042 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumControllerType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerType.java @@ -2,14 +2,14 @@ package com.raoulvdberge.refinedstorage.block; import net.minecraft.util.IStringSerializable; -public enum EnumControllerType implements IStringSerializable { +public enum ControllerType implements IStringSerializable { NORMAL(0, "normal"), CREATIVE(1, "creative"); private int id; private String name; - EnumControllerType(int id, String name) { + ControllerType(int id, String name) { this.id = id; this.name = name; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumFluidStorageType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java old mode 100755 new mode 100644 similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/block/EnumFluidStorageType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java index dc80d4617..a9e3746d8 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumFluidStorageType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.block; import net.minecraft.util.IStringSerializable; -public enum EnumFluidStorageType implements IStringSerializable { +public enum FluidStorageType implements IStringSerializable { TYPE_64K(0, 64000, "64k"), TYPE_128K(1, 128000, "128k"), TYPE_256K(2, 256000, "256k"), @@ -13,7 +13,7 @@ public enum EnumFluidStorageType implements IStringSerializable { private int capacity; private String name; - EnumFluidStorageType(int id, int capacity, String name) { + FluidStorageType(int id, int capacity, String name) { this.id = id; this.capacity = capacity; this.name = name; @@ -37,8 +37,8 @@ public enum EnumFluidStorageType implements IStringSerializable { return name; } - public static EnumFluidStorageType getById(int id) { - for (EnumFluidStorageType type : EnumFluidStorageType.values()) { + public static FluidStorageType getById(int id) { + for (FluidStorageType type : FluidStorageType.values()) { if (type.getId() == id) { return type; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumGridType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/GridType.java old mode 100755 new mode 100644 similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/block/EnumGridType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/GridType.java index a53b9e565..65a3446ef --- a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumGridType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/GridType.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.block; import net.minecraft.util.IStringSerializable; -public enum EnumGridType implements IStringSerializable { +public enum GridType implements IStringSerializable { NORMAL(0, "normal"), CRAFTING(1, "crafting"), PATTERN(2, "pattern"), @@ -11,7 +11,7 @@ public enum EnumGridType implements IStringSerializable { private int id; private String name; - EnumGridType(int id, String name) { + GridType(int id, String name) { this.id = id; this.name = name; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumItemStorageType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/ItemStorageType.java old mode 100755 new mode 100644 similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/block/EnumItemStorageType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/ItemStorageType.java index 4de1cbff4..54485e6af --- a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumItemStorageType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/ItemStorageType.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.block; import net.minecraft.util.IStringSerializable; -public enum EnumItemStorageType implements IStringSerializable { +public enum ItemStorageType implements IStringSerializable { TYPE_1K(0, 1000, "1k"), TYPE_4K(1, 4000, "4k"), TYPE_16K(2, 16000, "16k"), @@ -13,7 +13,7 @@ public enum EnumItemStorageType implements IStringSerializable { private int capacity; private String name; - EnumItemStorageType(int id, int capacity, String name) { + ItemStorageType(int id, int capacity, String name) { this.id = id; this.capacity = capacity; this.name = name; @@ -37,8 +37,8 @@ public enum EnumItemStorageType implements IStringSerializable { return name; } - public static EnumItemStorageType getById(int id) { - for (EnumItemStorageType type : EnumItemStorageType.values()) { + public static ItemStorageType getById(int id) { + for (ItemStorageType type : ItemStorageType.values()) { if (type.getId() == id) { return type; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/PlacementType.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/PlacementType.java index 38d40f501..9789db30e --- a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/PlacementType.java @@ -4,7 +4,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -public enum EnumPlacementType { +public enum PlacementType { ANY( EnumFacing.VALUES ), @@ -20,7 +20,7 @@ public enum EnumPlacementType { final EnumFacing[] allowed; - EnumPlacementType(EnumFacing... allowed) { + PlacementType(EnumFacing... allowed) { this.allowed = allowed; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java index 6b37037fc..cd5aad7fe 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.RSUtils; import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler; import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; -import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.container.slot.*; import com.raoulvdberge.refinedstorage.gui.grid.IGridDisplay; import com.raoulvdberge.refinedstorage.tile.grid.IGrid; @@ -46,7 +46,7 @@ public class ContainerGrid extends ContainerBase { addPlayerInventory(8, display.getYPlayerInventory()); - if (grid.getType() == EnumGridType.CRAFTING) { + if (grid.getType() == GridType.CRAFTING) { int x = 26; int y = headerAndSlots + 4; @@ -62,7 +62,7 @@ public class ContainerGrid extends ContainerBase { } addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, getPlayer(), (NetworkNodeGrid) grid, 0, 130 + 4, headerAndSlots + 22)); - } else if (grid.getType() == EnumGridType.PATTERN) { + } else if (grid.getType() == GridType.PATTERN) { int x = 8; int y = headerAndSlots + 4; @@ -83,7 +83,7 @@ public class ContainerGrid extends ContainerBase { addSlotToContainer(new SlotOutput(((NetworkNodeGrid) grid).getPatterns(), 1, 152, headerAndSlots + 40)); } - if (grid.getType() != EnumGridType.FLUID) { + if (grid.getType() != GridType.FLUID) { for (int i = 0; i < 4; ++i) { addSlotToContainer(new SlotItemHandler(grid.getFilter(), i, 204, 6 + (18 * i) + getTabDelta())); } @@ -139,9 +139,9 @@ public class ContainerGrid extends ContainerBase { IItemGridHandler itemHandler = grid.getNetwork().getItemGridHandler(); IFluidGridHandler fluidHandler = grid.getNetwork().getFluidGridHandler(); - if (grid.getType() != EnumGridType.FLUID && itemHandler != null) { + if (grid.getType() != GridType.FLUID && itemHandler != null) { slot.putStack(RSUtils.transformNullToEmpty(itemHandler.onInsert((EntityPlayerMP) player, slot.getStack()))); - } else if (grid.getType() == EnumGridType.FLUID && fluidHandler != null) { + } else if (grid.getType() == GridType.FLUID && fluidHandler != null) { slot.putStack(RSUtils.transformNullToEmpty(fluidHandler.onInsert((EntityPlayerMP) player, slot.getStack()))); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java index 0102cb72e..3b7fdfa95 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java @@ -6,7 +6,7 @@ import com.google.common.collect.Multimaps; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; -import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.container.ContainerGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.gui.Scrollbar; @@ -92,7 +92,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { } public GuiGrid(ContainerGrid container, IGrid grid) { - super(container, grid.getType() == EnumGridType.FLUID ? 193 : 227, 0); + super(container, grid.getType() == GridType.FLUID ? 193 : 227, 0); this.grid = grid; this.wasConnected = this.grid.isActive(); @@ -137,11 +137,11 @@ public class GuiGrid extends GuiBase implements IGridDisplay { searchField.yPosition = sy; } - if (grid.getType() == EnumGridType.PATTERN) { + if (grid.getType() == GridType.PATTERN) { oredictPattern = addCheckBox(x + 64, y + getTabDelta() + getHeader() + (getVisibleRows() * 18) + 46, t("misc.refinedstorage:oredict"), TileGrid.OREDICT_PATTERN.getValue()); } - if (grid.getType() != EnumGridType.FLUID) { + if (grid.getType() != GridType.FLUID) { addSideButton(new SideButtonGridViewType(this, grid)); } @@ -166,7 +166,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { List stacks = new ArrayList<>(); if (grid.isActive()) { - stacks.addAll(grid.getType() == EnumGridType.FLUID ? FLUIDS.values() : ITEMS.values()); + stacks.addAll(grid.getType() == GridType.FLUID ? FLUIDS.values() : ITEMS.values()); List> filters = GridFilterParser.getFilters( grid, @@ -244,16 +244,16 @@ public class GuiGrid extends GuiBase implements IGridDisplay { @Override public int getFooter() { - return (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 156 : 99; + return (grid.getType() == GridType.CRAFTING || grid.getType() == GridType.PATTERN) ? 156 : 99; } @Override public int getYPlayerInventory() { int yp = getTabDelta() + getHeader() + (getVisibleRows() * 18); - if (grid.getType() == EnumGridType.NORMAL || grid.getType() == EnumGridType.FLUID) { + if (grid.getType() == GridType.NORMAL || grid.getType() == GridType.FLUID) { yp += 16; - } else if (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) { + } else if (grid.getType() == GridType.CRAFTING || grid.getType() == GridType.PATTERN) { yp += 73; } @@ -309,7 +309,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { } private boolean isOverCreatePattern(int mouseX, int mouseY) { - return grid.getType() == EnumGridType.PATTERN && inBounds(152, getTabDelta() + getHeader() + (getVisibleRows() * 18) + 22, 16, 16, mouseX, mouseY) && ((NetworkNodeGrid) grid).canCreatePattern(); + return grid.getType() == GridType.PATTERN && inBounds(152, getTabDelta() + getHeader() + (getVisibleRows() * 18) + 22, 16, 16, mouseX, mouseY) && ((NetworkNodeGrid) grid).canCreatePattern(); } private int getTabDelta() { @@ -370,9 +370,9 @@ public class GuiGrid extends GuiBase implements IGridDisplay { drawTab(tab, false, x, y, mouseX, mouseY); } - if (grid.getType() == EnumGridType.CRAFTING) { + if (grid.getType() == GridType.CRAFTING) { bindTexture("gui/crafting_grid.png"); - } else if (grid.getType() == EnumGridType.PATTERN) { + } else if (grid.getType() == GridType.PATTERN) { bindTexture("gui/pattern_grid.png"); } else { bindTexture("gui/grid.png"); @@ -380,9 +380,9 @@ public class GuiGrid extends GuiBase implements IGridDisplay { int yy = y + getTabDelta(); - drawTexture(x, yy, 0, 0, screenWidth - (grid.getType() != EnumGridType.FLUID ? 34 : 0), getHeader()); + drawTexture(x, yy, 0, 0, screenWidth - (grid.getType() != GridType.FLUID ? 34 : 0), getHeader()); - if (grid.getType() != EnumGridType.FLUID) { + if (grid.getType() != GridType.FLUID) { drawTexture(x + screenWidth - 34 + 4, y + getTabDelta(), 197, 0, 30, 82); } @@ -391,18 +391,18 @@ public class GuiGrid extends GuiBase implements IGridDisplay { for (int i = 0; i < rows; ++i) { yy += 18; - drawTexture(x, yy, 0, getHeader() + (i > 0 ? (i == rows - 1 ? 18 * 2 : 18) : 0), screenWidth - (grid.getType() != EnumGridType.FLUID ? 34 : 0), 18); + drawTexture(x, yy, 0, getHeader() + (i > 0 ? (i == rows - 1 ? 18 * 2 : 18) : 0), screenWidth - (grid.getType() != GridType.FLUID ? 34 : 0), 18); } yy += 18; - drawTexture(x, yy, 0, getHeader() + (18 * 3), screenWidth - (grid.getType() != EnumGridType.FLUID ? 34 : 0), getFooter()); + drawTexture(x, yy, 0, getHeader() + (18 * 3), screenWidth - (grid.getType() != GridType.FLUID ? 34 : 0), getFooter()); for (FilterTab tab : grid.getTabs()) { drawTab(tab, true, x, y, mouseX, mouseY); } - if (grid.getType() == EnumGridType.PATTERN) { + if (grid.getType() == GridType.PATTERN) { int ty = 0; if (isOverCreatePattern(mouseX - guiLeft, mouseY - guiTop)) { @@ -529,11 +529,11 @@ public class GuiGrid extends GuiBase implements IGridDisplay { ItemStack held = ((ContainerGrid) this.inventorySlots).getPlayer().inventory.getItemStack(); if (isOverSlotArea(mouseX - guiLeft, mouseY - guiTop) && !held.isEmpty() && (clickedButton == 0 || clickedButton == 1)) { - RS.INSTANCE.network.sendToServer(grid.getType() == EnumGridType.FLUID ? new MessageGridFluidInsertHeld() : new MessageGridItemInsertHeld(clickedButton == 1)); + RS.INSTANCE.network.sendToServer(grid.getType() == GridType.FLUID ? new MessageGridFluidInsertHeld() : new MessageGridItemInsertHeld(clickedButton == 1)); } if (isOverSlotWithItem()) { - if (grid.getType() != EnumGridType.FLUID && (held.isEmpty() || (!held.isEmpty() && clickedButton == 2))) { + if (grid.getType() != GridType.FLUID && (held.isEmpty() || (!held.isEmpty() && clickedButton == 2))) { GridStackItem stack = (GridStackItem) STACKS.get(slotNumber); if (stack.isCraftable() && (stack.doesDisplayCraftText() || (GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown())) && CAN_CRAFT) { @@ -555,7 +555,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { RS.INSTANCE.network.sendToServer(new MessageGridItemPull(stack.getHash(), flags)); } - } else if (grid.getType() == EnumGridType.FLUID && held.isEmpty()) { + } else if (grid.getType() == GridType.FLUID && held.isEmpty()) { RS.INSTANCE.network.sendToServer(new MessageGridFluidPull(STACKS.get(slotNumber).getHash(), GuiScreen.isShiftKeyDown())); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java index e14b90e28..04ad3571d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.gui.sidebutton; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; -import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.tile.grid.IGrid; import net.minecraft.util.text.TextFormatting; @@ -32,7 +32,7 @@ public class SideButtonGridSortingType extends SideButton { if (type == NetworkNodeGrid.SORTING_TYPE_QUANTITY) { type = NetworkNodeGrid.SORTING_TYPE_NAME; } else if (type == NetworkNodeGrid.SORTING_TYPE_NAME) { - if (grid.getType() == EnumGridType.FLUID) { + if (grid.getType() == GridType.FLUID) { type = NetworkNodeGrid.SORTING_TYPE_QUANTITY; } else { type = NetworkNodeGrid.SORTING_TYPE_ID; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java index 451c66857..2a8a6a97c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.integration.craftingtweaks; import com.google.common.base.Function; -import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.container.ContainerGrid; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.Loader; @@ -28,7 +28,7 @@ public final class IntegrationCraftingTweaks { public static class ContainerCallback implements Function { @Override public Boolean apply(ContainerGrid containerGrid) { - return containerGrid.getGrid().getType() == EnumGridType.CRAFTING; + return containerGrid.getGrid().getType() == GridType.CRAFTING; } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java index 8d0da6710..c2d35206c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.item; -import com.raoulvdberge.refinedstorage.block.EnumPlacementType; +import com.raoulvdberge.refinedstorage.block.PlacementType; import com.raoulvdberge.refinedstorage.tile.TileBase; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -13,9 +13,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemBlockBase extends ItemBlock { - private EnumPlacementType placementType; + private PlacementType placementType; - public ItemBlockBase(Block block, EnumPlacementType placementType, boolean subtypes) { + public ItemBlockBase(Block block, PlacementType placementType, boolean subtypes) { super(block); setRegistryName(block.getRegistryName()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java index 7a0450b16..1fa90a7c5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.block.EnumControllerType; +import com.raoulvdberge.refinedstorage.block.ControllerType; import com.raoulvdberge.refinedstorage.tile.TileController; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -19,7 +19,7 @@ public class ItemBlockController extends ItemBlockBase { @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - if (stack.getMetadata() != EnumControllerType.CREATIVE.getId()) { + if (stack.getMetadata() != ControllerType.CREATIVE.getId()) { tooltip.add(I18n.format("misc.refinedstorage:energy_stored", getEnergyStored(stack), getEnergyCapacity(stack))); } } @@ -46,7 +46,7 @@ public class ItemBlockController extends ItemBlockBase { tag = new NBTTagCompound(); } - tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == EnumControllerType.CREATIVE.getId() ? RS.INSTANCE.config.controllerCapacity : 0); + tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == ControllerType.CREATIVE.getId() ? RS.INSTANCE.config.controllerCapacity : 0); return stack; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java index 3404ba8af..ceba92049 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeFluidStorage; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskFluid; -import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; +import com.raoulvdberge.refinedstorage.block.FluidStorageType; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -25,12 +25,12 @@ public class ItemBlockFluidStorage extends ItemBlockBase { @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - EnumFluidStorageType type = EnumFluidStorageType.getById(stack.getMetadata()); + FluidStorageType type = FluidStorageType.getById(stack.getMetadata()); if (type != null && isValid(stack)) { NBTTagCompound tag = stack.getTagCompound().getCompoundTag(NetworkNodeFluidStorage.NBT_STORAGE); - if (type == EnumFluidStorageType.TYPE_CREATIVE) { + if (type == FluidStorageType.TYPE_CREATIVE) { tooltip.add(I18n.format("misc.refinedstorage:storage.stored", StorageDiskFluid.getStored(tag))); } else { tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", StorageDiskFluid.getStored(tag), type.getCapacity())); @@ -42,7 +42,7 @@ public class ItemBlockFluidStorage extends ItemBlockBase { public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); - EnumFluidStorageType type = EnumFluidStorageType.getById(stack.getMetadata()); + FluidStorageType type = FluidStorageType.getById(stack.getMetadata()); if (type != null && stack.getCount() == 1 && isValid(stack) && StorageDiskFluid.getStored(stack.getTagCompound().getCompoundTag(NetworkNodeFluidStorage.NBT_STORAGE)) <= 0 && stack.getMetadata() != ItemFluidStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { ItemStack storagePart = new ItemStack(RSItems.FLUID_STORAGE_PART, 1, stack.getMetadata()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java index ec2f7beeb..fdb7a9554 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeStorage; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskItem; -import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; +import com.raoulvdberge.refinedstorage.block.ItemStorageType; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -25,12 +25,12 @@ public class ItemBlockStorage extends ItemBlockBase { @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - EnumItemStorageType type = EnumItemStorageType.getById(stack.getMetadata()); + ItemStorageType type = ItemStorageType.getById(stack.getMetadata()); if (type != null && isValid(stack)) { NBTTagCompound tag = stack.getTagCompound().getCompoundTag(NetworkNodeStorage.NBT_STORAGE); - if (type == EnumItemStorageType.TYPE_CREATIVE) { + if (type == ItemStorageType.TYPE_CREATIVE) { tooltip.add(I18n.format("misc.refinedstorage:storage.stored", StorageDiskItem.getStored(tag))); } else { tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", StorageDiskItem.getStored(tag), type.getCapacity())); @@ -42,7 +42,7 @@ public class ItemBlockStorage extends ItemBlockBase { public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); - EnumItemStorageType type = EnumItemStorageType.getById(stack.getMetadata()); + ItemStorageType type = ItemStorageType.getById(stack.getMetadata()); if (type != null && stack.getCount() == 1 && isValid(stack) && StorageDiskItem.getStored(stack.getTagCompound().getCompoundTag(NetworkNodeStorage.NBT_STORAGE)) <= 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { ItemStack storagePart = new ItemStack(RSItems.STORAGE_PART, 1, stack.getMetadata()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java index c08ece566..1fddac706 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java @@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageDiskProvider; import com.raoulvdberge.refinedstorage.api.storage.StorageDiskType; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskFluid; -import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; +import com.raoulvdberge.refinedstorage.block.FluidStorageType; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -133,6 +133,6 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid @Nonnull @Override public IStorageDisk create(ItemStack disk) { - return API.instance().getDefaultStorageDiskBehavior().createFluidStorage(disk.getTagCompound(), EnumFluidStorageType.getById(disk.getItemDamage()).getCapacity()); + return API.instance().getDefaultStorageDiskBehavior().createFluidStorage(disk.getTagCompound(), FluidStorageType.getById(disk.getItemDamage()).getCapacity()); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java index a41654176..584478bd5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java @@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageDiskProvider; import com.raoulvdberge.refinedstorage.api.storage.StorageDiskType; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskItem; -import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; +import com.raoulvdberge.refinedstorage.block.ItemStorageType; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -143,6 +143,6 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider create(ItemStack disk) { - return API.instance().getDefaultStorageDiskBehavior().createItemStorage(disk.getTagCompound(), EnumItemStorageType.getById(disk.getItemDamage()).getCapacity()); + return API.instance().getDefaultStorageDiskBehavior().createItemStorage(disk.getTagCompound(), ItemStorageType.getById(disk.getItemDamage()).getCapacity()); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingClear.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingClear.java index 7c822ca83..cc8a89989 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingClear.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingClear.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.RSUtils; import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.container.ContainerGrid; import com.raoulvdberge.refinedstorage.tile.grid.IGrid; import io.netty.buffer.ByteBuf; @@ -35,7 +35,7 @@ public class MessageGridCraftingClear extends MessageHandlerPlayerToServer { - int energy = stack.getItemDamage() == EnumControllerType.CREATIVE.getId() ? 7 : TileController.getEnergyScaled(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack), 7); + int energy = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? 7 : TileController.getEnergyScaled(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack), 7); return new ModelResourceLocation("refinedstorage:controller", "direction=north,energy=" + energy); }); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java index 4d73d6ad9..2cf6d2e7c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java @@ -272,7 +272,7 @@ public class ProxyCommon { ); // Controller - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()), + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CONTROLLER, 1, ControllerType.NORMAL.getId()), "EDE", "SMS", "ESE", @@ -322,7 +322,7 @@ public class ProxyCommon { ); // Grid - GameRegistry.addRecipe(new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()), + GameRegistry.addRecipe(new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId()), "ECE", "PMP", "EDE", @@ -335,29 +335,29 @@ public class ProxyCommon { // Crafting Grid API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe( - new ItemStack(RSBlocks.GRID, 1, EnumGridType.CRAFTING.getId()), + new ItemStack(RSBlocks.GRID, 1, GridType.CRAFTING.getId()), 500, new ItemStack(Blocks.CRAFTING_TABLE), new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()) + new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId()) )); // Pattern Grid API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe( - new ItemStack(RSBlocks.GRID, 1, EnumGridType.PATTERN.getId()), + new ItemStack(RSBlocks.GRID, 1, GridType.PATTERN.getId()), 500, new ItemStack(RSItems.PATTERN), new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()) + new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId()) )); // Fluid Grid API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe( - new ItemStack(RSBlocks.GRID, 1, EnumGridType.FLUID.getId()), + new ItemStack(RSBlocks.GRID, 1, GridType.FLUID.getId()), 500, new ItemStack(Items.BUCKET), new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()) + new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId()) )); // Wireless Grid @@ -367,7 +367,7 @@ public class ProxyCommon { "EAE", 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON), 'P', new ItemStack(Items.ENDER_PEARL), - 'G', new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()), + 'G', new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId()), 'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED) ); @@ -378,7 +378,7 @@ public class ProxyCommon { "EAE", 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON), 'P', new ItemStack(Items.ENDER_PEARL), - 'G', new ItemStack(RSBlocks.GRID, 1, EnumGridType.FLUID.getId()), + 'G', new ItemStack(RSBlocks.GRID, 1, GridType.FLUID.getId()), 'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED) ); @@ -674,16 +674,16 @@ public class ProxyCommon { ); // Storage Blocks - API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_1K, ItemStoragePart.TYPE_1K)); - API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_4K, ItemStoragePart.TYPE_4K)); - API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_16K, ItemStoragePart.TYPE_16K)); - API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_64K, ItemStoragePart.TYPE_64K)); + API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(ItemStorageType.TYPE_1K, ItemStoragePart.TYPE_1K)); + API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(ItemStorageType.TYPE_4K, ItemStoragePart.TYPE_4K)); + API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(ItemStorageType.TYPE_16K, ItemStoragePart.TYPE_16K)); + API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(ItemStorageType.TYPE_64K, ItemStoragePart.TYPE_64K)); // Fluid Storage Blocks - API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_64K, ItemFluidStoragePart.TYPE_64K)); - API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_128K, ItemFluidStoragePart.TYPE_128K)); - API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_256K, ItemFluidStoragePart.TYPE_256K)); - API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_512K, ItemFluidStoragePart.TYPE_512K)); + API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(FluidStorageType.TYPE_64K, ItemFluidStoragePart.TYPE_64K)); + API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(FluidStorageType.TYPE_128K, ItemFluidStoragePart.TYPE_128K)); + API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(FluidStorageType.TYPE_256K, ItemFluidStoragePart.TYPE_256K)); + API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(FluidStorageType.TYPE_512K, ItemFluidStoragePart.TYPE_512K)); // Crafting Monitor GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CRAFTING_MONITOR), diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java index a92a3a344..b94ec507e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java @@ -31,8 +31,8 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.security.SecurityManager; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheFluid; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheItem; import com.raoulvdberge.refinedstorage.block.BlockController; -import com.raoulvdberge.refinedstorage.block.EnumControllerType; -import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.block.ControllerType; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.container.ContainerCraftingMonitor; import com.raoulvdberge.refinedstorage.container.ContainerGrid; import com.raoulvdberge.refinedstorage.container.ContainerReaderWriter; @@ -173,7 +173,7 @@ public class TileController extends TileBase implements INetworkMaster, IRedston private boolean craftingMonitorUpdateRequested; - private EnumControllerType type; + private ControllerType type; private RedstoneMode redstoneMode = RedstoneMode.IGNORE; @@ -246,7 +246,7 @@ public class TileController extends TileBase implements INetworkMaster, IRedston networkItemHandler.update(); - if (getType() == EnumControllerType.NORMAL) { + if (getType() == ControllerType.NORMAL) { if (!RS.INSTANCE.config.controllerUsesEnergy) { energy.setEnergyStored(energy.getMaxEnergyStored()); } else if (energy.getEnergyStored() - getEnergyUsage() >= 0) { @@ -254,7 +254,7 @@ public class TileController extends TileBase implements INetworkMaster, IRedston } else { energy.setEnergyStored(0); } - } else if (getType() == EnumControllerType.CREATIVE) { + } else if (getType() == ControllerType.CREATIVE) { energy.setEnergyStored(energy.getMaxEnergyStored()); } @@ -317,7 +317,7 @@ public class TileController extends TileBase implements INetworkMaster, IRedston @Override public void sendItemStorageToClient() { getWorld().getMinecraftServer().getPlayerList().getPlayers().stream() - .filter(player -> isWatchingGrid(player, EnumGridType.NORMAL, EnumGridType.CRAFTING, EnumGridType.PATTERN)) + .filter(player -> isWatchingGrid(player, GridType.NORMAL, GridType.CRAFTING, GridType.PATTERN)) .forEach(this::sendItemStorageToClient); } @@ -329,14 +329,14 @@ public class TileController extends TileBase implements INetworkMaster, IRedston @Override public void sendItemStorageDeltaToClient(ItemStack stack, int delta) { getWorld().getMinecraftServer().getPlayerList().getPlayers().stream() - .filter(player -> isWatchingGrid(player, EnumGridType.NORMAL, EnumGridType.CRAFTING, EnumGridType.PATTERN)) + .filter(player -> isWatchingGrid(player, GridType.NORMAL, GridType.CRAFTING, GridType.PATTERN)) .forEach(player -> RS.INSTANCE.network.sendTo(new MessageGridItemDelta(this, stack, delta), player)); } @Override public void sendFluidStorageToClient() { getWorld().getMinecraftServer().getPlayerList().getPlayers().stream() - .filter(player -> isWatchingGrid(player, EnumGridType.FLUID)) + .filter(player -> isWatchingGrid(player, GridType.FLUID)) .forEach(this::sendFluidStorageToClient); } @@ -348,11 +348,11 @@ public class TileController extends TileBase implements INetworkMaster, IRedston @Override public void sendFluidStorageDeltaToClient(FluidStack stack, int delta) { getWorld().getMinecraftServer().getPlayerList().getPlayers().stream() - .filter(player -> isWatchingGrid(player, EnumGridType.FLUID)) + .filter(player -> isWatchingGrid(player, GridType.FLUID)) .forEach(player -> RS.INSTANCE.network.sendTo(new MessageGridFluidDelta(stack, delta), player)); } - private boolean isWatchingGrid(EntityPlayer player, EnumGridType... types) { + private boolean isWatchingGrid(EntityPlayer player, GridType... types) { if (player.openContainer.getClass() == ContainerGrid.class) { IGrid grid = ((ContainerGrid) player.openContainer).getGrid(); @@ -742,12 +742,12 @@ public class TileController extends TileBase implements INetworkMaster, IRedston return this; } - public EnumControllerType getType() { + public ControllerType getType() { if (type == null && getWorld().getBlockState(pos).getBlock() == RSBlocks.CONTROLLER) { - this.type = (EnumControllerType) getWorld().getBlockState(pos).getValue(BlockController.TYPE); + this.type = (ControllerType) getWorld().getBlockState(pos).getValue(BlockController.TYPE); } - return type == null ? EnumControllerType.NORMAL : type; + return type == null ? ControllerType.NORMAL : type; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java index e651f6869..117e2d287 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.tile.grid; import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; -import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; import com.raoulvdberge.refinedstorage.item.filter.Filter; import com.raoulvdberge.refinedstorage.item.filter.FilterTab; @@ -15,7 +15,7 @@ import javax.annotation.Nullable; import java.util.List; public interface IGrid { - EnumGridType getType(); + GridType getType(); @Nullable INetworkMaster getNetwork(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java index da1b4354b..f4ebdfdc0 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.tile.grid; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; -import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; import com.raoulvdberge.refinedstorage.item.ItemWirelessFluidGrid; @@ -53,8 +53,8 @@ public class WirelessFluidGrid implements IGrid { } @Override - public EnumGridType getType() { - return EnumGridType.FLUID; + public GridType getType() { + return GridType.FLUID; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java index 3e039dc45..c4182f18e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.tile.grid; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSUtils; import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; -import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFilter; @@ -80,8 +80,8 @@ public class WirelessGrid implements IGrid { } @Override - public EnumGridType getType() { - return EnumGridType.NORMAL; + public GridType getType() { + return GridType.NORMAL; } @Override