修复bug

现在流体样板终端在标记流体物品时，左键标记流体，右键标记物品

Author: Circulate233

gradle.properties

@@ -16,7 +16,7 @@ show_testing_output = false
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 1.7.13
+mod_version = 1.8.0
 root_package = com.circulation
 mod_id = random_complement
 mod_name = RandomComplement
@@ -118,9 +118,9 @@ use_mixins_debugClassLoading = false
 # Only make a coremod if you are absolutely sure of what you are doing
 # Change the property `coremod_includes_mod` to false if your coremod doesn't have a @Mod annotation
 # You MUST state a class name for `coremod_plugin_class_name` if you are making a coremod, the class should implement `IFMLLoadingPlugin`
-is_coremod = false
+is_coremod = true
 coremod_includes_mod = true
-coremod_plugin_class_name =
+coremod_plugin_class_name = com.circulation.random_complement.mixin.rcEarlyMixinLoader
 
 # AssetMover
 # Convenient way to allow downloading of assets from official vanilla Minecraft servers, CurseForge, or any direct links

src/main/java/com/circulation/random_complement/client/ClientProxy.java

@@ -5,12 +5,18 @@
 import com.circulation.random_complement.client.handler.RCJEIInputHandler;
 import com.circulation.random_complement.common.CommonProxy;
 import com.circulation.random_complement.common.util.Functions;
+import com.circulation.random_complement.mixin.jei.AccessorGhostIngredientDragManager;
+import com.circulation.random_complement.mixin.jei.AccessorInputHandler;
 import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
 import it.unimi.dsi.fastutil.objects.ReferenceList;
+import mezz.jei.Internal;
+import net.minecraft.client.Minecraft;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.Side;
 
@@ -72,4 +78,25 @@ public void onRegisterModels(ModelRegistryEvent event) {
 
     }
 
+    public static ItemStack getMouseItem() {
+        var i = Minecraft.getMinecraft().player.inventory.getItemStack();
+        if (!i.isEmpty()) return i;
+
+        if (Loader.isModLoaded("jei")) return getJEIMouseItem();
+
+        return ItemStack.EMPTY;
+    }
+
+    @Optional.Method(modid = "jei")
+    public static ItemStack getJEIMouseItem() {
+        var ii = ((AccessorGhostIngredientDragManager) ((AccessorInputHandler) Internal.getInputHandler()).getGhostIngredientDragManager()).getGhostIngredientDrag();
+        if (ii != null && ii.getIngredient() instanceof ItemStack stack) return stack;
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    @Optional.Method(modid = "jei")
+    public boolean isMouseHasItem() {
+        return !Minecraft.getMinecraft().player.inventory.getItemStack().isEmpty() || ((AccessorGhostIngredientDragManager) ((AccessorInputHandler) Internal.getInputHandler()).getGhostIngredientDragManager()).getGhostIngredientDrag() != null;
+    }
 }

src/main/java/com/circulation/random_complement/common/CommonProxy.java

@@ -9,6 +9,7 @@
 import com.circulation.random_complement.common.network.WirelessPickBlock;
 import com.circulation.random_complement.common.util.Functions;
 import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.fml.relauncher.Side;
 
 import static com.circulation.random_complement.RandomComplement.NET_CHANNEL;
@@ -42,4 +43,9 @@ public void postInit() {
         if (Loader.isModLoaded("appliedenergistics2")) CraftingUnitHandler.register();
     }
 
+    @Optional.Method(modid = "jei")
+    public boolean isMouseHasItem() {
+        return false;
+    }
+
 }

src/main/java/com/circulation/random_complement/common/util/MEHandler.java

@@ -21,9 +21,12 @@
 import com.glodblock.github.common.item.fake.FakeFluids;
 import com.glodblock.github.common.item.fake.FakeItemRegister;
 import com.glodblock.github.integration.mek.FakeGases;
+import com.glodblock.github.util.ModAndClassUtil;
+import com.glodblock.github.util.Util;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import lombok.Getter;
+import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
@@ -94,8 +97,8 @@ public static void drawSlotPluses(List<Slot> slots) {
      * https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial/blob/c3cd45df5db9db256b9fb4774b2cb57fdf11e389/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java#L397
      */
     public static void refillBlankPatterns(ContainerMEMonitorable container, SlotRestrictedInput slot) {
-        if (container instanceof PatternTermConfigs) {
-            if (((PatternTermConfigs) container).r$getAutoFillPattern() == PatternTermAutoFillPattern.CLOSE) return;
+        if (container instanceof PatternTermConfigs p) {
+            if (p.r$getAutoFillPattern() == PatternTermAutoFillPattern.CLOSE) return;
             if (Platform.isServer()) {
                 ItemStack blanks = slot.getStack();
                 int blanksToRefill = 64;
@@ -235,6 +238,37 @@ private static ItemStack packMEKEngItem(Object obj) {
         return ItemStack.EMPTY;
     }
 
+    @Optional.Method(modid = "ae2fc")
+    public static FluidStack covertFluid(Object ingredient) {
+        if (ingredient instanceof FluidStack) {
+            return (FluidStack) ingredient;
+        } else {
+            return ingredient instanceof ItemStack ? Util.getFluidFromItem((ItemStack) ingredient) : null;
+        }
+    }
+
+    @Optional.Method(modid = "mekeng")
+    public static String getGasName(Object gas) {
+        if (gas instanceof GasStack g) return g.getGas().getLocalizedName();
+        if (gas instanceof Gas g) return g.getLocalizedName();
+        return "";
+    }
+
+    @Optional.Method(modid = "ae2fc")
+    public static Object covertGas(Object ingredient) {
+        if (ModAndClassUtil.GAS) {
+            if (ingredient instanceof GasStack) {
+                return ingredient;
+            }
+
+            if (ingredient instanceof ItemStack) {
+                return Util.getGasFromItem((ItemStack) ingredient);
+            }
+        }
+
+        return null;
+    }
+
     @SideOnly(Side.CLIENT)
     private static void drawPlusesPre() {
         RenderHelper.disableStandardItemLighting();

…tainerExpandedProcessingPatternTerm.java …tainerExpandedProcessingPatternTerm.javasrc/main/java/com/circulation/random_complement/mixin/ae2fc/container/MixinContainerExpandedProcessingPatternTerm.java renamed to src/main/java/com/circulation/random_complement/mixin/ae2/container/MixinContainerExpandedProcessingPatternTerm.java src/main/java/com/circulation/random_complement/mixin/ae2fc/container/MixinContainerExpandedProcessingPatternTerm.java renamed to src/main/java/com/circulation/random_complement/mixin/ae2/container/MixinContainerExpandedProcessingPatternTerm.java

@@ -1,8 +1,7 @@
-package com.circulation.random_complement.mixin.ae2fc.container;
+package com.circulation.random_complement.mixin.ae2.container;
 
 import appeng.api.storage.ITerminalHost;
 import appeng.container.implementations.ContainerExpandedProcessingPatternTerm;
-import appeng.container.implementations.ContainerPatternEncoder;
 import com.circulation.random_complement.common.util.MEHandler;
 import net.minecraft.entity.player.InventoryPlayer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -11,10 +10,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = ContainerExpandedProcessingPatternTerm.class, remap = false)
-public abstract class MixinContainerExpandedProcessingPatternTerm extends ContainerPatternEncoder {
+public abstract class MixinContainerExpandedProcessingPatternTerm extends MixinContainerPatternEncoder {
 
-    protected MixinContainerExpandedProcessingPatternTerm(InventoryPlayer ip, ITerminalHost monitorable, boolean bindInventory) {
-        super(ip, monitorable, bindInventory);
+    public MixinContainerExpandedProcessingPatternTerm(InventoryPlayer ip, ITerminalHost monitorable) {
+        super(ip, monitorable);
     }
 
     @Inject(method = "<init>", at = @At("TAIL"))

src/main/java/com/circulation/random_complement/mixin/ae2/container/MixinContainerPatternTerm.java

@@ -1,7 +1,6 @@
 package com.circulation.random_complement.mixin.ae2.container;
 
 import appeng.api.storage.ITerminalHost;
-import appeng.container.implementations.ContainerPatternEncoder;
 import appeng.container.implementations.ContainerPatternTerm;
 import com.circulation.random_complement.common.util.MEHandler;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -11,10 +10,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = ContainerPatternTerm.class, remap = false)
-public abstract class MixinContainerPatternTerm extends ContainerPatternEncoder {
+public abstract class MixinContainerPatternTerm extends MixinContainerPatternEncoder {
 
-    protected MixinContainerPatternTerm(InventoryPlayer ip, ITerminalHost monitorable, boolean bindInventory) {
-        super(ip, monitorable, bindInventory);
+    public MixinContainerPatternTerm(InventoryPlayer ip, ITerminalHost monitorable) {
+        super(ip, monitorable);
     }
 
     @Inject(method = "<init>", at = @At("TAIL"))

src/main/java/com/circulation/random_complement/mixin/ae2/container/MixinContainerWirelessPatternTerminal.java

@@ -1,7 +1,6 @@
 package com.circulation.random_complement.mixin.ae2.container;
 
 import appeng.api.storage.ITerminalHost;
-import appeng.container.implementations.ContainerPatternEncoder;
 import appeng.container.implementations.ContainerWirelessPatternTerminal;
 import appeng.helpers.WirelessTerminalGuiObject;
 import com.circulation.random_complement.common.util.MEHandler;
@@ -12,10 +11,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = ContainerWirelessPatternTerminal.class, remap = false)
-public abstract class MixinContainerWirelessPatternTerminal extends ContainerPatternEncoder {
+public abstract class MixinContainerWirelessPatternTerminal extends MixinContainerPatternEncoder {
 
-    protected MixinContainerWirelessPatternTerminal(InventoryPlayer ip, ITerminalHost monitorable, boolean bindInventory) {
-        super(ip, monitorable, bindInventory);
+    public MixinContainerWirelessPatternTerminal(InventoryPlayer ip, ITerminalHost monitorable) {
+        super(ip, monitorable);
     }
 
     @Inject(method = "<init>", at = @At("TAIL"))

src/main/java/com/circulation/random_complement/mixin/ae2/gui/MixinAEBaseGui.java

@@ -66,6 +66,7 @@ private void drawSlotFake(Slot slot, CallbackInfo ci) {
         if (slot.xPos < 0 || slot.yPos < 0) return;
         if (this instanceof RCAECraftablesGui) {
             if (slot instanceof SlotFake slotFake) {
+                if (!slotFake.shouldDisplay()) return;
                 var item = slotFake.getDisplayStack();
                 if (!item.isEmpty()) {
                     if (r$getCraftablesCache().contains(MEHandler.packAEItem(item))) {

src/main/java/com/circulation/random_complement/mixin/ae2/jei/MixinAEBaseGui.java

@@ -0,0 +1,27 @@
+package com.circulation.random_complement.mixin.ae2.jei;
+
+import appeng.client.gui.AEBaseGui;
+import com.circulation.random_complement.RandomComplement;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Container;
+import org.spongepowered.asm.mixin.Intrinsic;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(value = AEBaseGui.class)
+public abstract class MixinAEBaseGui extends GuiContainer {
+
+    public MixinAEBaseGui(Container inventorySlotsIn) {
+        super(inventorySlotsIn);
+    }
+
+    @Intrinsic
+    protected void renderHoveredToolTip(int mouseX, int mouseY) {
+        if (!RandomComplement.proxy.isMouseHasItem()
+            && this.hoveredSlot != null
+            && this.hoveredSlot.getHasStack()
+        ) {
+            this.renderToolTip(this.hoveredSlot.getStack(), mouseX, mouseY);
+        }
+    }
+
+}