调整mixin相关的东西

Author: Circulate233

build.gradle

@@ -17,7 +17,6 @@ buildscript {
         force 'org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20'
     }
     dependencies {
-        classpath 'xyz.wagyourtail.unimined:unimined:1.4.18-kappa'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -27,6 +26,7 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'org.jetbrains.gradle.plugin.idea-ext' version '1.4.1'
+    id 'xyz.wagyourtail.unimined' version '1.4.18-kappa'
     id 'com.gradleup.shadow' version '9.4.0'
     id 'com.diffplug.spotless' version '8.4.0'
 }

gradle.properties

@@ -42,6 +42,6 @@ publish_to_maven=false
 maven_name=${mod_name}
 maven_url=
 
-is_coremod=true
+is_coremod=false
 coremod_includes_mod=true
-coremod_plugin_class_name=github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader
+coremod_plugin_class_name=

src/main/java/github/kasuminova/novaeng/NovaEngCoreConfig.java

@@ -23,10 +23,6 @@ public class NovaEngCoreConfig {
     @Config.Name("MachineAssemblyTool")
     public static MachineAssemblyTool MACHINE_ASSEMBLY_TOOL = new MachineAssemblyTool();
 
-    @Config.RequiresMcRestart
-    @Config.Name("javaCheck")
-    public static boolean javaCheck = true;
-
     static {
         ConfigAnytime.register(NovaEngCoreConfig.class);
     }

src/main/java/github/kasuminova/novaeng/NovaEngineeringCore.java

@@ -45,9 +45,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.LOG;
-import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.LOG_PREFIX;
-
 @Mod(modid = NovaEngineeringCore.MOD_ID, name = NovaEngineeringCore.MOD_NAME, version = NovaEngineeringCore.VERSION,
     dependencies = "required-after:modularmachinery@[2.3.0,);" +
         "required-after:theoneprobe@[1.12-1.4.28,);" +
@@ -84,7 +81,7 @@ public class NovaEngineeringCore {
                 if (hitokoto == null || hitokoto.isEmpty()) {
                     return;
                 }
-                LOG.info(LOG_PREFIX + "{}", hitokoto);
+                log.info("{}", hitokoto);
             });
         }
     }

src/main/java/github/kasuminova/novaeng/client/ClientProxy.java

@@ -4,7 +4,6 @@
 import appeng.helpers.WirelessTerminalGuiObject;
 import baubles.api.BaublesApi;
 import github.kasuminova.mmce.client.renderer.MachineControllerRenderer;
-import github.kasuminova.novaeng.NovaEngCoreConfig;
 import github.kasuminova.novaeng.NovaEngineeringCore;
 import github.kasuminova.novaeng.client.book.BookTransformerAppendModifiers;
 import github.kasuminova.novaeng.client.gui.GuiECalculatorController;
@@ -85,9 +84,6 @@
 import java.awt.Color;
 import java.util.List;
 
-import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.checkJavaVersion;
-import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.isCleanroomLoader;
-
 @SuppressWarnings("MethodMayBeStatic")
 @Mod.EventBusSubscriber(Side.CLIENT)
 public class ClientProxy extends CommonProxy {
@@ -111,7 +107,7 @@ public static int getColorForODFirst(String odName) {
         if (color < 0) {
             var od = OreDictionary.getOres(odName);
             if (!od.isEmpty()) {
-                var stack = od.get(0);
+                var stack = od.getFirst();
                 color = getColorForItemStack(stack).getRGB();
             } else {
                 color = Color.WHITE.getRGB();
@@ -130,9 +126,9 @@ public static Color getColorForItemStack(ItemStack stack) {
                     new BlockPos(0, 0, 0), EnumFacing.UP, 0, 0, 0, stack.getMetadata(), mc.player);
                 List<BakedQuad> quads = mc.getBlockRendererDispatcher().getModelForState(state).getQuads(state, EnumFacing.NORTH, 0);
                 if (quads.isEmpty()) return Color.WHITE;
-                sprite = quads.get(0).getSprite();
+                sprite = quads.getFirst().getSprite();
             } else sprite = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, null, null)
-                                     .getQuads(null, null, 0).get(0).getSprite();
+                                     .getQuads(null, null, 0).getFirst().getSprite();
             IntList colours = new IntArrayList();
             for (int[] rows : sprite.getFrameTextureData(0))
                 for (int colour : rows) if ((colour & 0xFF) > 0) colours.add(colour);
@@ -168,15 +164,7 @@ public boolean isClient() {
     @Override
     public void construction() {
         super.construction();
-
         ConfigManager.sync(NovaEngineeringCore.MOD_ID, Config.Type.INSTANCE);
-
-        if (NovaEngCoreConfig.javaCheck) {
-            if (!isCleanroomLoader()) {
-                checkJavaVersion();
-            }
-        }
-
         TitleUtils.setRandomTitle("*Construction*");
     }
 
@@ -264,7 +252,7 @@ public void onModelRegister(ModelRegistryEvent event) {
     @Nullable
     @Override
     public Object getClientGuiElement(final int id, final EntityPlayer player, final World world, final int x, final int y, final int z) {
-        GuiType type = GuiType.values()[MathHelper.clamp(id, 0, GuiType.values().length - 1)];
+        GuiType type = GuiType.getEntries().get(MathHelper.clamp(id, 0, GuiType.getEntries().size()) - 1);
         Class<? extends TileEntity> required = type.requiredTileEntity;
         TileEntity present = null;
         if (required != null) {

src/main/java/github/kasuminova/novaeng/client/util/TitleUtils.java

@@ -3,7 +3,6 @@
 import github.kasuminova.novaeng.NovaEngCoreConfig;
 import github.kasuminova.novaeng.NovaEngineeringCore;
 import github.kasuminova.novaeng.client.hitokoto.HitokotoAPI;
-import github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader;
 import org.lwjgl.opengl.Display;
 
 import java.lang.reflect.Method;
@@ -116,7 +115,7 @@ private static void setTitle() {
         if (!NovaEngCoreConfig.CLIENT.enableNovaEngTitle) {
             return;
         }
-        if (NovaEngCoreEarlyMixinLoader.isCleanroomLoader() && !unsupportedPlatform) {
+        if (!unsupportedPlatform) {
             try {
                 Class<?> Display = Class.forName("org.lwjgl.opengl.Display");
                 Method getWindow = Display.getDeclaredMethod("getWindow");

src/main/java/github/kasuminova/novaeng/mixin/NovaEngCoreEarlyMixinLoader.java

@@ -5,6 +5,8 @@
 import net.minecraftforge.common.config.Config;
 import net.minecraftforge.common.config.ConfigManager;
 import net.minecraftforge.fml.common.Loader;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
@@ -15,12 +17,12 @@
 import java.util.function.BooleanSupplier;
 
 import static github.kasuminova.novaeng.NovaEngineeringCore.MOD_ID;
-import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.LOG;
-import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.LOG_PREFIX;
 
 @SuppressWarnings({"unused", "SameParameterValue"})
-public class NovaEngCoreLateMixinLoader implements IMixinConfigPlugin {
+public class NovaEngCoreMixinConfigPlugin implements IMixinConfigPlugin {
 
+    public static final Logger LOG = LogManager.getLogger("NOVAENG_CORE_PRE");
+    public static final String LOG_PREFIX = "[NOVAENG_CORE_PRE]" + ' ';
     private static final Map<String, BooleanSupplier> MIXIN_PACKAGES = new Object2ObjectLinkedOpenHashMap<>();
 
     static {

…ng/mixin/NovaEngCoreLateMixinLoader.java …/mixin/NovaEngCoreMixinConfigPlugin.javasrc/main/java/github/kasuminova/novaeng/mixin/NovaEngCoreLateMixinLoader.java renamed to src/main/java/github/kasuminova/novaeng/mixin/NovaEngCoreMixinConfigPlugin.java src/main/java/github/kasuminova/novaeng/mixin/NovaEngCoreLateMixinLoader.java renamed to src/main/java/github/kasuminova/novaeng/mixin/NovaEngCoreMixinConfigPlugin.java

@@ -1,6 +1,6 @@
 {
   "package": "github.kasuminova.novaeng.mixin.ar",
-  "plugin": "github.kasuminova.novaeng.mixin.NovaEngCoreLateMixinLoader",
+  "plugin": "github.kasuminova.novaeng.mixin.NovaEngCoreMixinConfigPlugin",
   "refmap": "mixins.novaeng_core.refmap.json",
   "target": "@env(MOD)",
     "minVersion": "0.8",

src/main/resources/mixins.novaeng_core_advancedrocketry.json

@@ -1,6 +1,6 @@
 {
   "package": "github.kasuminova.novaeng.mixin.ae2",
-  "plugin": "github.kasuminova.novaeng.mixin.NovaEngCoreLateMixinLoader",
+  "plugin": "github.kasuminova.novaeng.mixin.NovaEngCoreMixinConfigPlugin",
   "refmap": "mixins.novaeng_core.refmap.json",
   "target": "@env(MOD)",
     "minVersion": "0.8",