From b6c7477943d8131761d9a2dd7a9b4042dde180b8 Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Thu, 23 Jan 2025 19:36:57 -0500 Subject: [PATCH] cleanup (#34) * Cleanup & minor fixes * spotless --- .../common/building/AEAnalysisResult.java | 13 ++-- .../common/building/BlockAnalyzer.java | 71 ------------------- .../common/building/BlockSpec.java | 21 +++--- .../common/items/manipulator/MMKeyInputs.java | 18 ++--- .../common/items/manipulator/MMRenderer.java | 40 +++++++---- .../common/items/manipulator/MMState.java | 1 - .../common/uplink/MTEMMUplinkMEHatch.java | 2 - 7 files changed, 50 insertions(+), 116 deletions(-) diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AEAnalysisResult.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AEAnalysisResult.java index 757d8b3..0dc2789 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AEAnalysisResult.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AEAnalysisResult.java @@ -168,16 +168,11 @@ public boolean apply(IBlockApplyContext ctx) { if (!isAttunable) { // change the part into the proper version if (actualItem != null && (expectedItem == null || !Objects.equals(actualItem, expectedItem))) { - if (expectedStack != null && !partHost.canAddPart(expectedStack, dir)) { - ctx.error("Invalid location (" + MMUtils.getDirectionDisplayName(dir, true) + ") for part (" + expectedStack.getDisplayName() + ")"); - continue; - } - if (expectedStack != null) { var result = ctx.tryConsumeItems(Arrays.asList(new BigItemStack(expectedStack)), IPseudoInventory.CONSUME_SIMULATED); if (!result.leftBoolean()) { - ctx.error("Could not extract item: " + expectedStack.getDisplayName()); + ctx.warn("Could not extract item: " + expectedStack.getDisplayName()); continue; } } @@ -188,10 +183,12 @@ public boolean apply(IBlockApplyContext ctx) { if (actualItem == null && expectedItem != null) { if (expectedStack != null && !partHost.canAddPart(expectedStack, dir)) { - ctx.error("Invalid location (" + MMUtils.getDirectionDisplayName(dir, true) + ") for part (" + expectedStack.getDisplayName() + ")"); + ctx.error( + "Invalid location (" + MMUtils.getDirectionDisplayName(dir, true) + ") for part (" + expectedStack.getDisplayName() + ")" + ); continue; } - + if (!installPart(ctx, partHost, dir, expected, false)) { return false; } } } diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/BlockAnalyzer.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/BlockAnalyzer.java index 1ddcf71..819f956 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/BlockAnalyzer.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/BlockAnalyzer.java @@ -108,77 +108,6 @@ public static interface IBlockApplyContext extends IPseudoInventory { public void error(String message); } - public static class BlockApplyContext implements IBlockApplyContext { - - public World world; - public int x, y, z; - public EntityPlayer player; - public PendingBuild build; - public ItemStack manipulator; - - public static final double EU_PER_ACTION = 8192; - - @Override - public World getWorld() { - return world; - } - - @Override - public int getX() { - return x; - } - - @Override - public int getY() { - return y; - } - - @Override - public int getZ() { - return z; - } - - @Override - public TileEntity getTileEntity() { - return world.getTileEntity(x, y, z); - } - - @Override - public EntityPlayer getRealPlayer() { - return player; - } - - @Override - public boolean tryApplyAction(double complexity) { - return build.tryConsumePower(manipulator, x, y, z, EU_PER_ACTION * complexity); - } - - @Override - public BooleanObjectImmutablePair> tryConsumeItems(List items, int flags) { - return build.tryConsumeItems(items, flags); - } - - @Override - public void givePlayerItems(List items) { - build.givePlayerItems(items); - } - - @Override - public void givePlayerFluids(List fluids) { - build.givePlayerFluids(fluids); - } - - @Override - public void warn(String message) { - sendChatToPlayer(player, String.format("§cWarning at block %d, %d, %d: %s§r", x, y, z, message)); - } - - @Override - public void error(String message) { - sendChatToPlayer(player, String.format("§cError at block %d, %d, %d: %s§r", x, y, z, message)); - } - } - /** * A fake apply context that tracks which items were consumed. */ diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/BlockSpec.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/BlockSpec.java index d642300..b4a5314 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/BlockSpec.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/BlockSpec.java @@ -365,27 +365,22 @@ public static BlockSpec fromBlock(BlockSpec pooled, World world, int x, int y, i spec.objectId = GameRegistry.findUniqueIdentifierFor(block); spec.block = block; - if (!MMUtils.isFree(block, blockMeta)) { - @Nullable - Item item = MMUtils.getItemFromBlock(block, blockMeta); + @Nullable + Item item = MMUtils.getItemFromBlock(block, blockMeta); + if (!MMUtils.isFree(block, blockMeta)) { if (item == null) { return new BlockSpec().setObject(Blocks.air, 0); } if (block != Blocks.wall_sign && block != Blocks.standing_sign) { block = MMUtils.getBlockFromItem(item, item.getMetadata(blockMeta)); } + } - int itemMeta = block.getDamageValue(world, x, y, z); + int itemMeta = block.getDamageValue(world, x, y, z); - spec.metadata = itemMeta; - spec.item = Optional.ofNullable(item); - spec.itemId = item == null ? Optional.empty() : Optional.of(ItemId.create(item, itemMeta, null)); - } else { - spec.metadata = 0; - spec.item = Optional.empty(); - spec.itemId = Optional.empty(); - spec.stack = Optional.empty(); - } + spec.metadata = itemMeta; + spec.item = Optional.ofNullable(item); + spec.itemId = item == null ? Optional.empty() : Optional.of(ItemId.create(item, itemMeta, null)); if (Mods.ArchitectureCraft.isModLoaded()) { spec.arch = ArchitectureCraftAnalysisResult.analyze(world.getTileEntity(x, y, z)); diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMKeyInputs.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMKeyInputs.java index 8050aa1..c65dd21 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMKeyInputs.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMKeyInputs.java @@ -18,7 +18,7 @@ @EventBusSubscriber public class MMKeyInputs { - + public static final KeyBinding CONTROL = new KeyBinding("key.mm-ctrl", Keyboard.KEY_LCONTROL, "key.mm"); public static final KeyBinding CUT = new KeyBinding("key.mm-cut", Keyboard.KEY_X, "key.mm"); public static final KeyBinding COPY = new KeyBinding("key.mm-copy", Keyboard.KEY_C, "key.mm"); @@ -48,7 +48,7 @@ public static void onKeyPressed(KeyInputEvent event) { if (state.config.placeMode != PlaceMode.MOVING) { Messages.SetPlaceMode.sendToServer(PlaceMode.MOVING); } - + if (InteractionConfig.pasteAutoClear) { Messages.ClearCoords.sendToServer(); @@ -56,12 +56,12 @@ public static void onKeyPressed(KeyInputEvent event) { Messages.ClearTransform.sendToServer(); } } - + Messages.MarkCut.sendToServer(); return; } - + if (COPY.isPressed()) { if (state.config.placeMode != PlaceMode.COPYING) { Messages.SetPlaceMode.sendToServer(PlaceMode.COPYING); @@ -69,7 +69,7 @@ public static void onKeyPressed(KeyInputEvent event) { if (InteractionConfig.pasteAutoClear) { Messages.ClearCoords.sendToServer(); - + if (InteractionConfig.resetTransform) { Messages.ClearTransform.sendToServer(); } @@ -79,21 +79,21 @@ public static void onKeyPressed(KeyInputEvent event) { return; } - + if (PASTE.isPressed()) { // set the mode to copying if we aren't in a mode supports pasting (moving/copying) if (state.config.placeMode != PlaceMode.COPYING && state.config.placeMode != PlaceMode.MOVING) { Messages.SetPlaceMode.sendToServer(PlaceMode.COPYING); } - + Messages.MarkPaste.sendToServer(); return; } - + if (RESET.isPressed()) { Messages.ClearCoords.sendToServer(); - + if (InteractionConfig.resetTransform) { Messages.ClearTransform.sendToServer(); } diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMRenderer.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMRenderer.java index 477eca9..82fa2ef 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMRenderer.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMRenderer.java @@ -31,8 +31,8 @@ import com.gtnewhorizon.gtnhlib.util.CoordinatePacker; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.entity.fx.WeightlessParticleFX; -import com.recursive_pineapple.matter_manipulator.GlobalMMConfig.RenderingConfig; import com.recursive_pineapple.matter_manipulator.GlobalMMConfig; +import com.recursive_pineapple.matter_manipulator.GlobalMMConfig.RenderingConfig; import com.recursive_pineapple.matter_manipulator.MMMod; import com.recursive_pineapple.matter_manipulator.client.rendering.BoxRenderer; import com.recursive_pineapple.matter_manipulator.common.building.BlockSpec; @@ -62,7 +62,7 @@ public class MMRenderer { private static List analysisCache = null; private static ItemMatterManipulator lastDrawer = null; - + private static boolean wasValid = false; private static final long ANALYSIS_INTERVAL_MS = 10_000; @@ -77,10 +77,10 @@ public class MMRenderer { private static boolean wasInUse = false; - private MMRenderer() { } + private MMRenderer() {} /** Just loads the class */ - public static void init() { } + public static void init() {} public static void markNeedsRedraw() { needsHintDraw = true; @@ -168,7 +168,7 @@ private static void clear(EntityPlayer player) { lastAnalyzedConfig = null; lastPlayerPosition = null; analysisCache = null; - + needsHintDraw = false; needsAnalysis = false; @@ -565,7 +565,8 @@ private static void drawHints( pendingBlock.z, errors, warnings, - RenderingConfig.hintsOnTop || state.config.placeMode == PlaceMode.EXCHANGING || (RenderingConfig.hintsOnTopAir && pendingBlock.spec.isAir())); + RenderingConfig.hintsOnTop || state.config.placeMode == PlaceMode.EXCHANGING || (RenderingConfig.hintsOnTopAir && pendingBlock.spec.isAir()) + ); } if (warnings != null) { @@ -603,11 +604,26 @@ private static void drawHints( StructureLibAPI.endHinting(player.worldObj); } - private static final short[] WHITE = { 255, 255, 255, 255 }; - private static final short[] WARNING = { 255, 170, 0, 255 }; - private static final short[] ERROR = { 255, 85, 85, 255 }; - - private static void markHintDrawthrough(World world, EntityPlayer player, int x, int y, int z, LongOpenHashSet errors, LongOpenHashSet warnings, boolean drawOnTop) { + private static final short[] WHITE = { + 255, 255, 255, 255 + }; + private static final short[] WARNING = { + 255, 170, 0, 255 + }; + private static final short[] ERROR = { + 255, 85, 85, 255 + }; + + private static void markHintDrawthrough( + World world, + EntityPlayer player, + int x, + int y, + int z, + LongOpenHashSet errors, + LongOpenHashSet warnings, + boolean drawOnTop + ) { long packed = CoordinatePacker.pack(x, y, z); short[] colour = WHITE; @@ -680,4 +696,4 @@ private static void drawRulers(EntityPlayer player, Location l, boolean fromSurf GL11.glDisable(GL11.GL_BLEND); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMState.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMState.java index 022819f..a264312 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMState.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMState.java @@ -29,7 +29,6 @@ import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.security.ISecurityGrid; import appeng.api.networking.storage.IStorageGrid; -import appeng.api.parts.IPartHost; import appeng.api.parts.IPartItem; import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/uplink/MTEMMUplinkMEHatch.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/uplink/MTEMMUplinkMEHatch.java index e014bdb..e3ddb78 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/uplink/MTEMMUplinkMEHatch.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/uplink/MTEMMUplinkMEHatch.java @@ -64,8 +64,6 @@ public class MTEMMUplinkMEHatch extends MTEHatch implements IGridProxyable, IPowerChannelState, ICraftingProvider, ICraftingRequester { - public static final long REQUEST_TIMEOUT = 20 * 60; - protected BaseActionSource requestSource = null; protected AENetworkProxy gridProxy = null; protected boolean additionalConnection = false;