#9

Author: Circulate233

gradle.properties

@@ -115,7 +115,7 @@ mixin_refmap = mixins.${mod_id}.refmap.json
 # 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 = true
+is_coremod = false
 coremod_includes_mod = true
 coremod_plugin_class_name = com.glodblock.github.coremod.FCCoreMod
 

gradle/scripts/dependencies.gradle

@@ -44,8 +44,8 @@ dependencies {
     implementation(rfg.deobf('curse.maven:baubles-227083:2518667')) //baubles
     compileOnly(rfg.deobf("curse.maven:thaumic-223628:2629023"))
     compileOnly(rfg.deobf("curse.maven:thaumic-energistics-extended-life-849094:6321322"))
-    implementation(rfg.deobf("curse.maven:mekanism-ce-399904:4804509")) //mek-ce
-    implementation(rfg.deobf("curse.maven:mekanism-energistics-1027681:5389347")) //mekeng
+    compileOnly(rfg.deobf("curse.maven:mekanism-ce-399904:4804509")) //mek-ce
+    compileOnly(rfg.deobf("curse.maven:mekanism-energistics-1027681:5389347")) //mekeng
     implementation(rfg.deobf("curse.maven:ae2-crafting-tree-legacy-1121489:5814089"))
     compileOnly(rfg.deobf('curse.maven:opencomputers-223008:4630537')) //oc
     compileOnly(rfg.deobf("curse.maven:p455w0rdslib-255232:2830265"))

src/main/java/com/glodblock/github/coremod/FCCoreMod.java

@@ -18,10 +18,6 @@ public class FCCoreMod implements IFMLLoadingPlugin, IEarlyMixinLoader {
 
     private static final Map<String, BooleanSupplier> MIXIN_CONFIGS = new Object2ObjectLinkedOpenHashMap<>();
 
-    {
-        addMixinCFG("mixins.ae2fc.json");
-    }
-
     @Nullable
     @Override
     public String getModContainerClass() {

src/main/java/com/glodblock/github/coremod/LateMixinLoader.java

@@ -16,6 +16,7 @@ public class LateMixinLoader implements ILateMixinLoader {
     private static final Map<String, BooleanSupplier> MIXIN_CONFIGS = new Object2ObjectLinkedOpenHashMap<>();
 
     static {
+        addMixinCFG("mixins.ae2fc.json");
         addMixinCFG("mixins.ae2fc.packagedauto.json", () -> Loader.isModLoaded("packagedauto"));
         addMixinCFG("mixins.ae2fc.jei.json", () -> Loader.isModLoaded("jei"));
         addMixinCFG("mixins.ae2fc.wct.json", () -> Loader.isModLoaded("wct"));

src/main/java/com/glodblock/github/coremod/mixin/ae2/gui/MixinGuiCraftAmount.java

@@ -8,7 +8,6 @@
 import com.glodblock.github.loader.FCItems;
 import com.glodblock.github.util.ModAndClassUtil;
 import com.glodblock.github.util.UtilClient;
-import mekanism.api.gas.GasStack;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
@@ -50,9 +49,9 @@ protected void renderHoveredToolTip(final int mouseX, final int mouseY) {
     @Unique
     @Optional.Method(modid = "mekeng")
     private boolean rendererGas(final ItemStack item, final int mouseX, final int mouseY) {
-        final GasStack gs = FakeItemRegister.getStack(item);
+        final Object gs = FakeItemRegister.getStack(item);
         if (gs != null) {
-            this.drawHoveringText(Collections.singletonList(gs.getGas().getLocalizedName()), mouseX, mouseY);
+            this.drawHoveringText(Collections.singletonList(UtilClient.getGasDisplayName(gs)), mouseX, mouseY);
             return true;
         }
         return false;

src/main/java/com/glodblock/github/util/UtilClient.java

@@ -16,6 +16,7 @@
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
+import mekanism.api.gas.GasStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -246,6 +247,14 @@ public static String getFluidDisplayModName(Fluid fluid) {
         return fluidModNameMap.computeIfAbsent(fluid, f -> getDisplayModName(Util.getFluidModID(f)));
     }
 
+    @Optional.Method(modid = "mekeng")
+    public static String getGasDisplayName(Object gas) {
+        if (gas instanceof GasStack gs) {
+            return gs.getGas().getLocalizedName();
+        }
+        return "";
+    }
+
     public static String getDisplayModName(@Nonnull String modid) {
         return TextFormatting.BLUE.toString() + TextFormatting.ITALIC + Loader.instance().getIndexedModList().get(modid).getName();
     }