mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-15 17:44:46 +00:00
Code cleanup (#133)
* gradle updateBuildScript * fix comments and commented-out code Code deletion, converting comments into javadocs, and refactoring code to not need comments. * remove redundant suppressions * replace C-style array declaration with Java-style * make private field final * remove unnecessary semicolon * extract a common part from an if * simplify boolean expression * simplify ternary if * remove unused imports * convert escaped characters for clarity * replace while with for * replace explicit types with diamond operators * replace anonymous type with lambda * enable modern Java syntax * migrate to enhanced switch * migrate to pattern variables for instanceof * remove empty javadoc * add Nonnull annotation to overrides of Nonnull methods * replace wailaStack with null When wailaStack is not null, the flow breaks out of the loop, so there's no need to confuse the reader with putting wailaStack both as the result and the parameter of the call - there's no recursion. * int cannot be bigger than its max value * suppress dataflow warning * remove redundant initializer The default value of int is 0. * null check is covered by instanceof * simplify some calls of addVertexWithUV * fix typos and add TODOs * make flipState more understandable
This commit is contained in:
1 parent
f87b76347e
commit
d5b8ef6ea9
89 files changed
+421
-633
No files matched your search
@@ -57,13 +57,10 @@ public class CPacketCraftRequest implements IMessage {
|
||||
@Nullable
|
||||
@Override
|
||||
public IMessage onMessage(CPacketCraftRequest message, MessageContext ctx) {
|
||||
if (ctx.getServerHandler().playerEntity.openContainer instanceof ContainerCraftAmount) {
|
||||
if (ctx.getServerHandler().playerEntity.openContainer instanceof final ContainerCraftAmount cca) {
|
||||
EntityPlayerMP player = ctx.getServerHandler().playerEntity;
|
||||
final ContainerCraftAmount cca = (ContainerCraftAmount) ctx
|
||||
.getServerHandler().playerEntity.openContainer;
|
||||
final Object target = cca.getTarget();
|
||||
if (target instanceof IGridHost) {
|
||||
final IGridHost gh = (IGridHost) target;
|
||||
if (target instanceof final IGridHost gh) {
|
||||
final IGridNode gn = gh.getGridNode(ForgeDirection.UNKNOWN);
|
||||
|
||||
if (gn == null) {
|
||||
@@ -106,8 +103,7 @@ public class CPacketCraftRequest implements IMessage {
|
||||
GuiType.FLUID_CRAFTING_CONFIRM_ITEM);
|
||||
}
|
||||
|
||||
if (player.openContainer instanceof ContainerCraftConfirm) {
|
||||
final ContainerCraftConfirm ccc = (ContainerCraftConfirm) player.openContainer;
|
||||
if (player.openContainer instanceof final ContainerCraftConfirm ccc) {
|
||||
ccc.setAutoStart(message.heldShift);
|
||||
ccc.setJob(futureJob);
|
||||
cca.detectAndSendChanges();
|
||||
|
||||
@@ -64,60 +64,32 @@ public class CPacketFluidPatternTermBtns implements IMessage {
|
||||
String Name = message.Name;
|
||||
String Value = message.Value;
|
||||
final Container c = ctx.getServerHandler().playerEntity.openContainer;
|
||||
if (Name.startsWith("PatternTerminal.") && (c instanceof FCContainerEncodeTerminal)) {
|
||||
final FCContainerEncodeTerminal cpt = (FCContainerEncodeTerminal) c;
|
||||
if (Name.startsWith("PatternTerminal.") && (c instanceof final FCContainerEncodeTerminal cpt)) {
|
||||
switch (Name) {
|
||||
case "PatternTerminal.CraftMode":
|
||||
cpt.getPatternTerminal().setCraftingRecipe(Value.equals("1"));
|
||||
break;
|
||||
case "PatternTerminal.Encode":
|
||||
case "PatternTerminal.CraftMode" -> cpt.getPatternTerminal().setCraftingRecipe(Value.equals("1"));
|
||||
case "PatternTerminal.Encode" -> {
|
||||
switch (Value) {
|
||||
case "0":
|
||||
cpt.encode();
|
||||
break;
|
||||
case "1":
|
||||
cpt.encodeAndMoveToInventory();
|
||||
break;
|
||||
case "3":
|
||||
cpt.encodeAllItemAndMoveToInventory();
|
||||
break;
|
||||
case "0" -> cpt.encode();
|
||||
case "1" -> cpt.encodeAndMoveToInventory();
|
||||
case "3" -> cpt.encodeAllItemAndMoveToInventory();
|
||||
}
|
||||
break;
|
||||
case "PatternTerminal.Clear":
|
||||
cpt.clear();
|
||||
break;
|
||||
case "PatternTerminal.Substitute":
|
||||
cpt.getPatternTerminal().setSubstitution(Value.equals("1"));
|
||||
break;
|
||||
case "PatternTerminal.Invert":
|
||||
cpt.getPatternTerminal().setInverted(Value.equals("1"));
|
||||
break;
|
||||
case "PatternTerminal.Double":
|
||||
cpt.doubleStacks(Value.equals("1"));
|
||||
break;
|
||||
case "PatternTerminal.Combine":
|
||||
cpt.getPatternTerminal().setCombineMode(Value.equals("1"));
|
||||
break;
|
||||
case "PatternTerminal.beSubstitute":
|
||||
cpt.getPatternTerminal().setBeSubstitute(Value.equals("1"));
|
||||
break;
|
||||
case "PatternTerminal.ActivePage":
|
||||
cpt.getPatternTerminal().setActivePage(Integer.parseInt(Value));
|
||||
break;
|
||||
case "PatternTerminal.Prioritize":
|
||||
}
|
||||
case "PatternTerminal.Clear" -> cpt.clear();
|
||||
case "PatternTerminal.Substitute" -> cpt.getPatternTerminal().setSubstitution(Value.equals("1"));
|
||||
case "PatternTerminal.Invert" -> cpt.getPatternTerminal().setInverted(Value.equals("1"));
|
||||
case "PatternTerminal.Double" -> cpt.doubleStacks(Value.equals("1"));
|
||||
case "PatternTerminal.Combine" -> cpt.getPatternTerminal().setCombineMode(Value.equals("1"));
|
||||
case "PatternTerminal.beSubstitute" -> cpt.getPatternTerminal().setBeSubstitute(Value.equals("1"));
|
||||
case "PatternTerminal.ActivePage" -> cpt.getPatternTerminal()
|
||||
.setActivePage(Integer.parseInt(Value));
|
||||
case "PatternTerminal.Prioritize" -> {
|
||||
switch (Value) {
|
||||
case "0":
|
||||
case "1":
|
||||
cpt.getPatternTerminal().setPrioritization(Value.equals("1"));
|
||||
break;
|
||||
case "2":
|
||||
cpt.getPatternTerminal().sortCraftingItems();
|
||||
break;
|
||||
case "0", "1" -> cpt.getPatternTerminal().setPrioritization(Value.equals("1"));
|
||||
case "2" -> cpt.getPatternTerminal().sortCraftingItems();
|
||||
}
|
||||
break;
|
||||
case "PatternTerminal.AutoFillerPattern":
|
||||
cpt.getPatternTerminal().setAutoFillPattern(Value.equals("1"));
|
||||
break;
|
||||
}
|
||||
case "PatternTerminal.AutoFillerPattern" -> cpt.getPatternTerminal()
|
||||
.setAutoFillPattern(Value.equals("1"));
|
||||
}
|
||||
cpt.getPatternTerminal().saveSettings();
|
||||
} else if (Name.startsWith("StorageBus.") && c instanceof ContainerFluidStorageBus) {
|
||||
|
||||
@@ -92,8 +92,7 @@ public class CPacketInventoryAction implements IMessage {
|
||||
@Override
|
||||
public IMessage onMessage(CPacketInventoryAction message, MessageContext ctx) {
|
||||
final EntityPlayerMP sender = ctx.getServerHandler().playerEntity;
|
||||
if (sender.openContainer instanceof AEBaseContainer) {
|
||||
final AEBaseContainer baseContainer = (AEBaseContainer) sender.openContainer;
|
||||
if (sender.openContainer instanceof final AEBaseContainer baseContainer) {
|
||||
Object target = baseContainer.getTarget();
|
||||
if (message.action == InventoryAction.AUTO_CRAFT) {
|
||||
final ContainerOpenContext context = baseContainer.getOpenContext();
|
||||
@@ -117,8 +116,7 @@ public class CPacketInventoryAction implements IMessage {
|
||||
ForgeDirection.UNKNOWN,
|
||||
GuiType.FLUID_CRAFTING_AMOUNT);
|
||||
}
|
||||
if (sender.openContainer instanceof ContainerCraftAmount) {
|
||||
final ContainerCraftAmount cca = (ContainerCraftAmount) sender.openContainer;
|
||||
if (sender.openContainer instanceof final ContainerCraftAmount cca) {
|
||||
if (baseContainer.getTargetStack() != null) {
|
||||
cca.getCraftingItem().putStack(baseContainer.getTargetStack().getItemStack());
|
||||
cca.setItemToCraft(baseContainer.getTargetStack());
|
||||
@@ -154,8 +152,7 @@ public class CPacketInventoryAction implements IMessage {
|
||||
amt = fluid == null ? 1 : fluid.amount;
|
||||
}
|
||||
FluidCraft.proxy.netHandler.sendTo(new SPacketSetItemAmount(amt), sender);
|
||||
if (sender.openContainer instanceof ContainerPatternValueAmount) {
|
||||
final ContainerPatternValueAmount cpv = (ContainerPatternValueAmount) sender.openContainer;
|
||||
if (sender.openContainer instanceof final ContainerPatternValueAmount cpv) {
|
||||
if (baseContainer.getTargetStack() != null) {
|
||||
cpv.setValueIndex(message.slot);
|
||||
cpv.getPatternValue().putStack(baseContainer.getTargetStack().getItemStack());
|
||||
|
||||
@@ -116,23 +116,14 @@ public class CPacketLevelMaintainer implements IMessage {
|
||||
@Override
|
||||
public IMessage onMessage(CPacketLevelMaintainer message, MessageContext ctx) {
|
||||
if (message.action.startsWith("TileLevelMaintainer.")
|
||||
&& ctx.getServerHandler().playerEntity.openContainer instanceof ContainerLevelMaintainer) {
|
||||
&& ctx.getServerHandler().playerEntity.openContainer instanceof final ContainerLevelMaintainer cca) {
|
||||
EntityPlayerMP player = ctx.getServerHandler().playerEntity;
|
||||
final ContainerLevelMaintainer cca = (ContainerLevelMaintainer) ctx
|
||||
.getServerHandler().playerEntity.openContainer;
|
||||
switch (message.action) {
|
||||
case "TileLevelMaintainer.Quantity":
|
||||
cca.getTile().updateQuantity(message.slotIndex, message.size);
|
||||
break;
|
||||
case "TileLevelMaintainer.Batch":
|
||||
cca.getTile().updateBatchSize(message.slotIndex, message.size);
|
||||
break;
|
||||
case "TileLevelMaintainer.Enable":
|
||||
cca.getTile().setRequestStatus(message.slotIndex, false);
|
||||
break;
|
||||
case "TileLevelMaintainer.Disable":
|
||||
cca.getTile().setRequestStatus(message.slotIndex, true);
|
||||
break;
|
||||
case "TileLevelMaintainer.Quantity" -> cca.getTile()
|
||||
.updateQuantity(message.slotIndex, message.size);
|
||||
case "TileLevelMaintainer.Batch" -> cca.getTile().updateBatchSize(message.slotIndex, message.size);
|
||||
case "TileLevelMaintainer.Enable" -> cca.getTile().setRequestStatus(message.slotIndex, false);
|
||||
case "TileLevelMaintainer.Disable" -> cca.getTile().setRequestStatus(message.slotIndex, true);
|
||||
}
|
||||
this.refresh(cca, player);
|
||||
}
|
||||
|
||||
@@ -61,8 +61,7 @@ public class CPacketPatternValueSet implements IMessage {
|
||||
@Override
|
||||
public IMessage onMessage(CPacketPatternValueSet message, MessageContext ctx) {
|
||||
EntityPlayer player = ctx.getServerHandler().playerEntity;
|
||||
if (player.openContainer instanceof ContainerPatternValueAmount) {
|
||||
ContainerPatternValueAmount cpv = (ContainerPatternValueAmount) player.openContainer;
|
||||
if (player.openContainer instanceof ContainerPatternValueAmount cpv) {
|
||||
final Object target = cpv.getTarget();
|
||||
if (target instanceof IGridHost) {
|
||||
final ContainerOpenContext context = cpv.getOpenContext();
|
||||
|
||||
@@ -48,7 +48,7 @@ public class CPacketTransferRecipe implements IMessage {
|
||||
this.shift = shift;
|
||||
}
|
||||
|
||||
// I should use GZIP to compress the message, but i'm too lazy.
|
||||
// TODO: this should use GZIP to compress the message
|
||||
// NBT to ByteBuf has a compress stream
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
@@ -100,9 +100,8 @@ public class CPacketTransferRecipe implements IMessage {
|
||||
if (monitor != null) {
|
||||
storageList = monitor.getStorageList();
|
||||
}
|
||||
if (c instanceof FCContainerEncodeTerminal) {
|
||||
if (c instanceof FCContainerEncodeTerminal cf) {
|
||||
// pattern terminal only
|
||||
FCContainerEncodeTerminal cf = (FCContainerEncodeTerminal) c;
|
||||
|
||||
boolean combine = cf.combine;
|
||||
cf.getPatternTerminal().setCraftingRecipe(message.isCraft);
|
||||
|
||||
@@ -91,7 +91,6 @@ public class SPacketMEItemInvUpdate implements IMessage {
|
||||
public static class Handler implements IMessageHandler<SPacketMEItemInvUpdate, IMessage> {
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||
public IMessage onMessage(SPacketMEItemInvUpdate message, MessageContext ctx) {
|
||||
final GuiScreen gs = Minecraft.getMinecraft().currentScreen;
|
||||
if (gs instanceof GuiItemMonitor) {
|
||||
|
||||
Reference in new issue
Block a user