修复流体合成样板无法自动上传到EF的问题

Author: Circulate233

src/main/java/github/kasuminova/novaeng/common/network/PktEFabricatorPatternSearchGUIAction.java

@@ -37,19 +37,19 @@ public PktEFabricatorPatternSearchGUIAction(final Action action, final BlockPos
 
     @Override
     public void fromBytes(final ByteBuf buf) {
-        action = Action.values()[buf.readByte()];
-        if (action == Action.PICKUP_PATTERN) {
-            pos = BlockPos.fromLong(buf.readLong());
-            slot = buf.readByte();
+        this.action = Action.values()[buf.readByte()];
+        if (this.action == Action.PICKUP_PATTERN) {
+            this.pos = BlockPos.fromLong(buf.readLong());
+            this.slot = buf.readByte();
         }
     }
 
     @Override
     public void toBytes(final ByteBuf buf) {
-        buf.writeByte(action.ordinal());
-        if (action == Action.PICKUP_PATTERN) {
-            buf.writeLong(pos.toLong());
-            buf.writeByte(slot);
+        buf.writeByte(this.action.ordinal());
+        if (this.action == Action.PICKUP_PATTERN) {
+            buf.writeLong(this.pos.toLong());
+            buf.writeByte(this.slot);
         }
     }
 

src/main/java/github/kasuminova/novaeng/common/network/PktEFabricatorPatternSearchGUIUpdate.java

@@ -40,14 +40,14 @@ protected static void processPacket(final PktEFabricatorPatternSearchGUIUpdate m
 
     @Override
     public void fromBytes(final ByteBuf buf) {
-        type = UpdateType.values()[buf.readByte()];
-        data = EFabricatorPatternData.readFrom(buf);
+        this.type = UpdateType.values()[buf.readByte()];
+        this.data = EFabricatorPatternData.readFrom(buf);
     }
 
     @Override
     public void toBytes(final ByteBuf buf) {
-        buf.writeByte(type.ordinal());
-        data.writeTo(buf);
+        buf.writeByte(this.type.ordinal());
+        this.data.writeTo(buf);
     }
 
     @Override

src/main/java/github/kasuminova/novaeng/common/network/PktPatternTermUploadPattern.kt

@@ -7,7 +7,7 @@ import appeng.api.storage.data.IAEItemStack
 import appeng.container.implementations.ContainerPatternEncoder
 import appeng.items.misc.ItemEncodedPattern
 import appeng.me.GridAccessException
-import com.glodblock.github.util.FluidPatternDetails
+import com.glodblock.github.util.FluidCraftingPatternDetails
 import github.kasuminova.novaeng.common.tile.ecotech.efabricator.EFabricatorMEChannel
 import github.kasuminova.novaeng.mixin.ae2.AccessorContainerPatternEncoder
 import hellfirepvp.modularmachinery.ModularMachinery
@@ -44,7 +44,7 @@ class PktPatternTermUploadPattern : IMessage, IMessageHandler<PktPatternTermUplo
             val channelNodes = if (part != null) {
                 try {
                     part.proxy.grid.getMachines(EFabricatorMEChannel::class.java)
-                } catch (ignored: GridAccessException) {
+                } catch (_: GridAccessException) {
                     return@addSyncTask
                 }
             } else if (itemObject is IActionHost) {
@@ -58,7 +58,7 @@ class PktPatternTermUploadPattern : IMessage, IMessageHandler<PktPatternTermUplo
             val item = patternStack.item
             val out: IAEItemStack? = if (item is ItemEncodedPattern) {
                 val pattern: ICraftingPatternDetails = item.getPatternForItem(patternStack, player.world)
-                if (pattern.isCraftable || pattern is FluidPatternDetails) {
+                if (pattern.isCraftable || pattern is FluidCraftingPatternDetails) {
                     pattern.condensedOutputs[0]
                 } else return@addSyncTask
             } else return@addSyncTask

src/main/java/github/kasuminova/novaeng/mixin/ae2/MixinGuiPatternTerm.java

@@ -35,7 +35,7 @@ public MixinGuiPatternTerm() {
 
     @Inject(method = "initGui", at = @At("RETURN"))
     private void injectInitGui(final CallbackInfo ci) {
-        novaeng_core$uploadPatternButton = new GuiTabButton(
+        this.novaeng_core$uploadPatternButton = new GuiTabButton(
             this.guiLeft + 173, this.guiTop + this.ySize - 155,
             new ItemStack(BlockEFabricatorController.L4), I18n.format("gui.efabricator.button.upload_pattern"), this.itemRender
         );
@@ -44,15 +44,15 @@ private void injectInitGui(final CallbackInfo ci) {
 
     @Inject(method = "actionPerformed", at = @At("HEAD"), cancellable = true)
     private void injectActionPerformed(final GuiButton btn, final CallbackInfo ci) {
-        if (btn == novaeng_core$uploadPatternButton) {
+        if (btn == this.novaeng_core$uploadPatternButton) {
             NovaEngineeringCore.NET_CHANNEL.sendToServer(new PktPatternTermUploadPattern());
             ci.cancel();
         }
     }
 
     @Inject(method = "drawFG", at = @At("HEAD"), remap = false)
     private void injectDrawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY, final CallbackInfo ci) {
-        novaeng_core$uploadPatternButton.visible = this.container.isCraftingMode();
+        this.novaeng_core$uploadPatternButton.visible = this.container.isCraftingMode();
     }
 
 }