diff options
Diffstat (limited to 'src/main/java/gregtech/api/multitileentity')
9 files changed, 16 insertions, 27 deletions
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java index f1f4b8591a..3f2cc71e54 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java @@ -182,7 +182,6 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl } @Override - @SuppressWarnings("unchecked") public final void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aAABB, List<AxisAlignedBB> aList, Entity aEntity) { final TileEntity tileEntity = world.getTileEntity(x, y, z); diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java index bf7259626f..d5917aa6c9 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java @@ -38,7 +38,6 @@ public class MultiTileEntityItem extends ItemBlock { } @Override - @SuppressWarnings("unchecked") public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean F3_H) { final IMultiTileEntity mute = block.getRegistry() .getReferenceTileEntity(stack); @@ -58,7 +57,6 @@ public class MultiTileEntityItem extends ItemBlock { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") public void getSubItems(Item aItem, CreativeTabs aTab, List<ItemStack> aList) { for (MultiTileEntityClassContainer tClass : block.getRegistry().registrations) { if (!tClass.hidden && ((IMultiTileEntity) tClass.getReferenceTileEntity()) diff --git a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java index 5ca30b6df6..b776e5e3b9 100644 --- a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java +++ b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java @@ -1016,12 +1016,11 @@ public abstract class MultiTileEntity extends CoverableTileEntity @Override public boolean playerOwnsThis(EntityPlayer aPlayer, boolean aCheckPrecicely) { - if (aCheckPrecicely || privateAccess() || (ownerName.length() == 0)) - if ((ownerName.length() == 0) && isServerSide()) { - setOwnerName(aPlayer.getDisplayName()); - setOwnerUuid(aPlayer.getUniqueID()); - } else return !privateAccess() || aPlayer.getDisplayName() - .equals("Player") || ownerName.equals("Player") || ownerName.equals(aPlayer.getDisplayName()); + if (aCheckPrecicely || privateAccess() || (ownerName.isEmpty())) if ((ownerName.isEmpty()) && isServerSide()) { + setOwnerName(aPlayer.getDisplayName()); + setOwnerUuid(aPlayer.getUniqueID()); + } else return !privateAccess() || aPlayer.getDisplayName() + .equals("Player") || ownerName.equals("Player") || ownerName.equals(aPlayer.getDisplayName()); return true; } @@ -1034,9 +1033,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity * @return a Packet containing all Data which has to be synchronised to the Client - Override as needed */ public GTPacketMultiTileEntity getClientDataPacket() { - - final GTPacketMultiTileEntity packet = new GTPacketMultiTileEntity(); - return packet; + return new GTPacketMultiTileEntity(); } @Override diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java index 0f959c6bce..92a147ff53 100644 --- a/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java +++ b/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java @@ -8,7 +8,7 @@ import gregtech.api.net.GTPacketMultiTileEntity; public interface SyncedMultiTileEntity { - public static final int DEFAULT_TIMED_PACKET_PERIOD = 20; + int DEFAULT_TIMED_PACKET_PERIOD = 20; /** * Will send a packet to the client when they open the controller or access a casing. diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java index 32b87126ca..13810520bb 100644 --- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java +++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java @@ -247,10 +247,9 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex super.copyTextures(); final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry .getReferenceTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID()); - if (!(tCanonicalTileEntity instanceof MultiTileBasicMachine)) { + if (!(tCanonicalTileEntity instanceof MultiTileBasicMachine canonicalEntity)) { return; } - final MultiTileBasicMachine canonicalEntity = (MultiTileBasicMachine) tCanonicalTileEntity; activeOverlayTexture = canonicalEntity.activeOverlayTexture; activeOverlayGlowTexture = canonicalEntity.activeOverlayGlowTexture; inactiveOverlayTexture = canonicalEntity.inactiveOverlayTexture; diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java index 1eaae5997d..d6b4ef7fe3 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java @@ -158,7 +158,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce } protected void calculateTier() { - if (functionalCasings.size() == 0) { + if (functionalCasings.isEmpty()) { return; } double sum = 0; @@ -1018,10 +1018,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce @Override public GTPacketMultiTileEntity getClientDataPacket() { - final GTPacketMultiTileEntity packet = super.getClientDataPacket(); - - return packet; - + return super.getClientDataPacket(); } @Override diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java index 2c3cafc67d..faf3f1ae8a 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java @@ -347,8 +347,8 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity if (te instanceof MultiBlockPart part) { final IMultiBlockController tController = part.getTarget(false); if (tController != null) tController.onStructureChange(); - } else if (te instanceof IMultiBlockController controller) { - controller.onStructureChange(); + } else if (te instanceof IMultiBlockController blockController) { + blockController.onStructureChange(); } } } @@ -675,8 +675,7 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity if (!canOpenControllerGui()) return guiProvider; if (uiContext.getPlayer() .isSneaking()) return guiProvider; - GUIProvider<?> controllerGUI = controller.getGUI(uiContext); - return controllerGUI; + return controller.getGUI(uiContext); } @Override diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java index 1dfd497151..5e7a928399 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java @@ -49,7 +49,7 @@ public abstract class StackableModularController<C extends StackableModularContr @Override public void resetMucCount() { Map<UpgradeCasings, int[]> mucCounters = getMucMap(); - mucCounters.forEach((type, casingCount) -> { Arrays.fill(casingCount, 0); }); + mucCounters.forEach((type, casingCount) -> Arrays.fill(casingCount, 0)); } // Returns the cheapest MUC that is possible for the multi, which gets the minimum bonuses. diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java index 238ce1eb2d..c736456437 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java @@ -17,7 +17,7 @@ public class WallShareablePart extends MultiBlockPart { @Override public void setTarget(IMultiBlockController newController, int allowedModes) { - if (targets.size() >= 1) { + if (!targets.isEmpty()) { this.allowedModes = 0; setMode((byte) 0); controller.invalidate(); @@ -30,7 +30,7 @@ public class WallShareablePart extends MultiBlockPart { return; } - targets.add(new WeakTargetRef<IMultiBlockController>(IMultiBlockController.class, true)); + targets.add(new WeakTargetRef<>(IMultiBlockController.class, true)); } @Override |