Merge remote-tracking branch 'origin/1.20-fabric' into 1.20.4-fabric

# Conflicts:
#	gradle.properties

Author: zenfyrdev

CHANGELOG.md

@@ -1,9 +1,24 @@
 ### What's New:
 
-[`gui/item_frame_tooltips`] && [`gui/name_tooltips`]:
+[`gui/smooth_tooltips`]:
 
-* Fixed tooltip alignment with Iceberg installed. (Legendary Tooltips)
+* New Module!
+* Makes tooltips slowly flow towards the cursor. 
+* Compatibility can be hit & miss, so experimental, for now.
+
+[`mechanics/dragon_fight`]:
+
+* Fixed the `ConcurrentModificationException` crash.
+* Moved data to a new format. **All data has been reset.**
+
+[`mechanics/trading_goat_horn`]:
+
+* Moved data to a new format. **All data has been reset.**
 
 [`general`]:
 
-* Misc fixes.
+* Updated Chinese translation. Courtesy of [Rad586](https://github.com/Rad586).
+* Startup should be a bit faster now.
+  * Andromeda used to scan every module's package for classes `Main`, `Merged`, `client.Client` and `server.Server`.
+  * Now, module entrypoints are defined and registered during module construction.
+* Other minor changes.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 melontini
+Copyright (c) 2024 melontini
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,8 +1,8 @@
 ## <img src="https://github.com/melontini/andromeda/assets/104443436/f8724c6c-f15b-49ca-9f42-b7ae01d1e64a" width="75" height="75"> Andromeda
 
 [![Modrinth](https://img.shields.io/modrinth/dt/TseYlb0f?logo=modrinth&color=mint)](https://modrinth.com/mod/andromeda)
-[![CodeFactor](https://www.codefactor.io/repository/github/melontini/andromeda/badge)](https://www.codefactor.io/repository/github/melontini/andromeda)
-![GitHub](https://img.shields.io/github/license/melontini/andromeda)
+[![CodeFactor](https://www.codefactor.io/repository/github/constellation-mc/andromeda/badge)](https://www.codefactor.io/repository/github/melontini/andromeda)
+![GitHub](https://img.shields.io/github/license/constellation-mc/andromeda)
 
 ### A galaxy is a collection of things and systems. So is this mod.
 

gradle.properties

@@ -8,7 +8,7 @@ minecraft_version=1.20.4
 yarn_mappings=1.20.4+build.3
 loader_version=0.15.7
 # Mod Properties
-mod_version=1.7.1-1.20.4
+mod_version=1.8.0-1.20.4
 maven_group=me.melontini
 archives_base_name=andromeda
 # Dependencies

src/main/java/me/melontini/andromeda/base/Bootstrap.java

@@ -1,6 +1,8 @@
 package me.melontini.andromeda.base;
 
 import lombok.CustomLog;
+import me.melontini.andromeda.base.events.Bus;
+import me.melontini.andromeda.base.events.InitEvent;
 import me.melontini.andromeda.base.util.annotations.ModuleInfo;
 import me.melontini.andromeda.common.Andromeda;
 import me.melontini.andromeda.common.client.AndromedaClient;
@@ -43,6 +45,14 @@
 @CustomLog
 public class Bootstrap {
 
+    private static void runInit(String init, Module<?> module) {
+        run(() -> {
+            Bus<InitEvent> event = module.getOrCreateBus(init + "_init_event", null);
+            if (event == null) return;
+            event.invoker().collect().forEach(module::initClass);
+        }, (b) -> b.message("Failed to execute %s!".formatted(init)).add("module", module.meta().id()));
+    }
+
     @Environment(EnvType.CLIENT)
     public static void onClient() {
         Status.update();
@@ -51,7 +61,7 @@ public static void onClient() {
 
         for (Module<?> module : ModuleManager.get().loaded()) {
             if (module.meta().environment().isServer()) continue;
-            run(() -> module.initClasses("client.Client"), (b) -> b.message("Failed to execute Module.onClient!").add("module", module.meta().id()));
+            runInit("client", module);
         }
         run(AndromedaClient::init, b -> b.message("Failed to initialize AndromedaClient!"));
     }
@@ -64,7 +74,7 @@ public static void onServer() {
 
         for (Module<?> module : ModuleManager.get().loaded()) {
             if (module.meta().environment().isClient()) continue;
-            run(() -> module.initClasses("server.Server"), (b) -> b.message("Failed to execute Module.onServer!").add("module", module.meta().id()));
+            runInit("server", module);
         }
     }
 
@@ -73,7 +83,7 @@ private static void onMerged() {
             MixinEnvironment.getCurrentEnvironment().audit();
 
         for (Module<?> module : ModuleManager.get().loaded()) {
-            run(() -> module.initClasses("Merged"), (b) -> b.message("Failed to execute Module.onMerged!").add("module", module.meta().id()));
+            runInit("merged", module);
         }
     }
 
@@ -90,7 +100,7 @@ public static void onMain() {
         }
 
         for (Module<?> module : ModuleManager.get().loaded()) {
-            run(() -> module.initClasses("Main"), (b) -> b.message("Failed to execute Module!").add("module", module.meta().id()));
+            runInit("main", module);
         }
 
         run(Andromeda::init, b -> b.message("Failed to initialize Andromeda!"));
@@ -143,7 +153,7 @@ public static void onPreLaunch() {
         m.print();
         //Scan for mixins.
         m.loaded().forEach(module -> getModuleClassPath().addUrl(module.getClass().getProtectionDomain().getCodeSource().getLocation()));
-        run(() -> MixinProcessor.addMixins(m), (b) -> b.message("Failed to inject dynamic mixin configs!").message(MixinProcessor.NOTICE));
+        run(() -> m.getMixinProcessor().addMixins(), (b) -> b.message("Failed to inject dynamic mixin configs!").message(MixinProcessor.NOTICE));
         Support.share("andromeda:module_manager", m);
 
         Status.update();

src/main/java/me/melontini/andromeda/base/MixinProcessor.java

@@ -4,35 +4,24 @@
 import lombok.CustomLog;
 import me.melontini.andromeda.base.events.Bus;
 import me.melontini.andromeda.base.events.MixinConfigEvent;
-import me.melontini.andromeda.base.util.annotations.SpecialEnvironment;
+import me.melontini.andromeda.base.util.ModulePlugin;
+import me.melontini.andromeda.util.CommonValues;
 import me.melontini.andromeda.util.exceptions.AndromedaException;
-import me.melontini.andromeda.util.mixin.AndromedaMixins;
 import me.melontini.dark_matter.api.base.reflect.wrappers.GenericField;
 import me.melontini.dark_matter.api.base.reflect.wrappers.GenericMethod;
-import me.melontini.dark_matter.api.base.util.mixin.ExtendablePlugin;
-import me.melontini.dark_matter.api.base.util.mixin.IPluginPlugin;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.AnnotationNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.InsnList;
-import org.objectweb.asm.tree.MethodNode;
+import org.jetbrains.annotations.ApiStatus;
 import org.spongepowered.asm.mixin.FabricUtil;
 import org.spongepowered.asm.mixin.Mixins;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
-import org.spongepowered.asm.mixin.transformer.meta.MixinMerged;
 import org.spongepowered.asm.service.IMixinService;
 import org.spongepowered.asm.service.MixinService;
-import org.spongepowered.asm.util.Annotations;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Proxy;
-import java.util.List;
-import java.util.Set;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * The MixinProcessor is responsible for injecting dynamic mixin configs.
@@ -43,21 +32,35 @@
 public class MixinProcessor {
 
     public static final String NOTICE = "## Mixin configs are internal mod components and are not the same as user configs! ##";
+    public static final String JAVA_VERSION = "JAVA_17";
+    public static final String MIXIN_VERSION = "0.8.5";
+
     private static final ThreadLocal<InputStream> CONFIG = ThreadLocal.withInitial(() -> null);
-    private static boolean done = false;
+    private boolean done = false;
+    private final ModuleManager manager;
+    private final Map<String, Module<?>> mixinConfigs = new HashMap<>();
+
+    public MixinProcessor(ModuleManager manager) {
+        this.manager = manager;
+    }
 
-    public static void addMixins(ModuleManager manager) {
+    @ApiStatus.Internal
+    public Optional<Module<?>> fromConfig(String name) {
+        return Optional.ofNullable(mixinConfigs.get(name));
+    }
+
+    public void addMixins() {
         if (done) return;
         IMixinService service = MixinService.getService();
-        MixinProcessor.injectService(service);
-        manager.loaded().forEach((module) -> {
+        this.injectService(service);
+        this.manager.loaded().forEach((module) -> {
             JsonObject config = createConfig(module);
 
             String cfg = "andromeda_dynamic$$" + module.meta().dotted() + ".mixins.json";
             try (ByteArrayInputStream bais = new ByteArrayInputStream(config.toString().getBytes())) {
-                CONFIG.set(bais);
+                CONFIG.set(bais);//Is there a safer way to do this?
                 Mixins.addConfiguration(cfg);
-                manager.mixinConfigs.put(cfg, module);
+                this.mixinConfigs.put(cfg, module);
             } catch (IOException e) {
                 throw AndromedaException.builder()
                         .message("Couldn't inject mixin config for module '%s'".formatted(module.meta().id())).message(NOTICE)
@@ -66,38 +69,39 @@ public static void addMixins(ModuleManager manager) {
                 CONFIG.remove();
             }
         });
-        MixinProcessor.dejectService(service);
+        this.dejectService(service);
         done = true;
 
-        Mixins.getConfigs().forEach(config1 -> {
-            if (manager.mixinConfigs.containsKey(config1.getName())) {
-                config1.getConfig().decorate(FabricUtil.KEY_MOD_ID, "andromeda");
+        Mixins.getConfigs().forEach(config -> {
+            if (this.mixinConfigs.containsKey(config.getName())) {
+                config.getConfig().decorate(FabricUtil.KEY_MOD_ID, CommonValues.MODID);
             }
         });
     }
 
-    public static JsonObject createConfig(Module<?> module) {
+    public JsonObject createConfig(Module<?> module) {
         JsonObject object = new JsonObject();
         object.addProperty("required", true);
-        object.addProperty("minVersion", "0.8");
+        object.addProperty("minVersion", MIXIN_VERSION);
         object.addProperty("package", module.getClass().getPackageName() + ".mixin");
-        object.addProperty("compatibilityLevel", "JAVA_17");
-        object.addProperty("plugin", Plugin.class.getName());
+        object.addProperty("compatibilityLevel", JAVA_VERSION);
+        object.addProperty("plugin", ModulePlugin.class.getName());
         object.addProperty("refmap", "andromeda-refmap.json");
         JsonObject injectors = new JsonObject();
         injectors.addProperty("defaultRequire", 1);
+        injectors.addProperty("maxShiftBy", 3);
         object.add("injectors", injectors);
 
-        Bus<MixinConfigEvent> bus = module.getOrCreateBus(MixinConfigEvent.class, null);
+        Bus<MixinConfigEvent> bus = module.getOrCreateBus("mixin_config_event", null);
         if (bus != null) bus.invoker().accept(object);
 
         return object;
     }
 
-    private static final GenericMethod<?, MixinService> GET_INSTANCE = GenericMethod.of(MixinService.class, "getInstance");
-    private static final GenericField<MixinService, IMixinService> SERVICE = GenericField.of(MixinService.class, "service");
+    private final GenericMethod<?, MixinService> GET_INSTANCE = GenericMethod.of(MixinService.class, "getInstance");
+    private final GenericField<MixinService, IMixinService> SERVICE = GenericField.of(MixinService.class, "service");
 
-    public static void injectService(IMixinService currentService) {
+    public void injectService(IMixinService currentService) {
         IMixinService service = (IMixinService) Proxy.newProxyInstance(MixinProcessor.class.getClassLoader(), new Class[]{IMixinService.class}, (proxy, method, args) -> {
             if (method.getName().equals("getResourceAsStream")) {
                 if (args[0] instanceof String s) {
@@ -113,74 +117,8 @@ public static void injectService(IMixinService currentService) {
         SERVICE.accessible(true).set(serviceProxy, service);
     }
 
-    public static void dejectService(IMixinService realService) {
+    public void dejectService(IMixinService realService) {
         MixinService serviceProxy = GET_INSTANCE.accessible(true).invoke(null);
         SERVICE.accessible(true).set(serviceProxy, realService);
     }
-
-    @SuppressWarnings("UnstableApiUsage")
-    public static class Plugin extends ExtendablePlugin {
-
-        private static final String MIXIN_ENVIRONMENT_ANNOTATION = "L" + SpecialEnvironment.class.getName().replace(".", "/") + ";";
-
-        private String mixinPackage;
-
-        @Override
-        protected void collectPlugins(Set<IPluginPlugin> plugins) {
-            plugins.add(DefaultPlugins.constructDummyPlugin());
-        }
-
-        protected void onPluginLoad(String mixinPackage) {
-            this.mixinPackage = mixinPackage;
-        }
-
-        protected void getMixins(List<String> mixins) {
-            mixins.addAll(AndromedaMixins.discoverInPackage(this.mixinPackage));
-        }
-
-        @Override
-        protected void afterApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-            if (targetClass.visibleAnnotations != null && !targetClass.visibleAnnotations.isEmpty()) {//strip our annotation from the class
-                targetClass.visibleAnnotations.removeIf(node -> MIXIN_ENVIRONMENT_ANNOTATION.equals(node.desc));
-            }
-
-            for (MethodNode method : targetClass.methods) {
-                AnnotationNode unique = Annotations.getVisible(method, Unique.class);
-                AnnotationNode mixinMerged = Annotations.getVisible(method, MixinMerged.class);
-                if (unique == null && mixinMerged != null) {
-                    String mixin = Annotations.getValue(mixinMerged, "mixin");
-                    if (mixin.startsWith(this.mixinPackage)) {
-                        wrapNodeWithErrorHandling(method, ModuleManager.get().moduleFromConfig(mixinInfo.getConfig().getName()).orElseThrow().meta().id());
-                    }
-                }
-            }
-        }
-
-        private void wrapNodeWithErrorHandling(MethodNode handlerNode, String module) {
-            Label start = new Label(), end = new Label(), handler = new Label(), handlerEnd = new Label();
-
-            String throwable = Type.getInternalName(Throwable.class);
-            handlerNode.visitTryCatchBlock(start, end, handler, throwable);
-
-            InsnList old = handlerNode.instructions;
-            handlerNode.instructions = new InsnList();
-            handlerNode.visitLabel(start);
-            handlerNode.instructions.add(old);
-
-            handlerNode.visitLabel(end);
-            handlerNode.visitJumpInsn(Opcodes.GOTO, handlerEnd);
-
-            handlerNode.visitLabel(handler);
-            handlerNode.visitVarInsn(Opcodes.ASTORE, handlerNode.maxLocals);
-
-            handlerNode.visitVarInsn(Opcodes.ALOAD, handlerNode.maxLocals);
-            handlerNode.visitLdcInsn(module);
-            handlerNode.visitMethodInsn(Opcodes.INVOKESTATIC, Type.getInternalName(AndromedaException.class), "moduleException", "(" + Type.getDescriptor(Throwable.class) + Type.getDescriptor(String.class) + ")" + Type.getDescriptor(AndromedaException.class), false);
-
-            handlerNode.visitInsn(Opcodes.ATHROW);
-            handlerNode.visitLabel(handlerEnd);
-
-            handlerNode.visitLocalVariable("exc", "L" + throwable + ";", null, start, handler, handlerNode.maxLocals);
-        }
-    }
 }