Use mixins accessors + some misc fixes

build.gradle

@@ -879,6 +879,7 @@ def getManifestAttributes() {
             "ForceLoadAsMod": !containsMixinsAndOrCoreModOnly.toBoolean()
         ]
     }
+    manifestAttributes += ["Main-class": "kubatech.standalone"]
     return manifestAttributes
 }
 

dependencies.gradle

@@ -1,12 +1,46 @@
-// Add your dependencies here
+/*
+ * Add your dependencies here. Supported configurations:
+ *  - api("group:name:version:classifier"): if you use the types from this dependency in the public API of this mod
+ *       Available at runtime and compiletime for mods depending on this mod
+ *  - implementation("g:n:v:c"): if you need this for internal implementation details of the mod, but none of it is visible via the public API
+ *       Available at runtime but not compiletime for mods depending on this mod
+ *  - compileOnly("g:n:v:c"): if the mod you're building doesn't need this dependency during runtime at all, e.g. for optional mods
+ *       Not available at all for mods depending on this mod, only visible at compiletime for this mod
+ *  - compileOnlyApi("g:n:v:c"): like compileOnly, but also visible at compiletime for mods depending on this mod
+ *       Available at compiletime but not runtime for mods depending on this mod
+ *  - runtimeOnlyNonPublishable("g:n:v:c"): if you want to include a mod in this mod's runClient/runServer runs, but not publish it as a dependency
+ *       Not available at all for mods depending on this mod, only visible at runtime for this mod
+ *  - devOnlyNonPublishable("g:n:v:c"): a combination of runtimeOnlyNonPublishable and compileOnly for dependencies present at both compiletime and runtime,
+ *       but not published as Maven dependencies - useful for RFG-deobfuscated dependencies or local testing
+ *  - runtimeOnly("g:n:v:c"): if you don't need this at compile time, but want it to be present at runtime
+ *       Available at runtime for mods depending on this mod
+ *  - annotationProcessor("g:n:v:c"): mostly for java compiler plugins, if you know you need this, use it, otherwise don't worry
+ *  - testCONFIG("g:n:v:c") - replace CONFIG by one of the above (except api), same as above but for the test sources instead of main
+ *
+ *  - shadowImplementation("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name
+ *       Requires you to enable usesShadowedDependencies in gradle.properties
+ *
+ *  - compile("g:n:v:c"): deprecated, replace with "api" (works like the old "compile") or "implementation" (can be more efficient)
+ *
+ * You can exclude transitive dependencies (dependencies of the chosen dependency) by appending { transitive = false } if needed,
+ * but use this sparingly as it can break using your mod as another mod's dependency if you're not careful.
+ *
+ * To depend on obfuscated jars you can use `devOnlyNonPublishable(rfg.deobf("dep:spec:1.2.3"))` to fetch an obfuscated jar from maven,
+ * or `devOnlyNonPublishable(rfg.deobf(project.files("libs/my-mod-jar.jar")))` to use a file.
+ *
+ * Gradle names for some of the configuration can be misleading, compileOnlyApi and runtimeOnly both get published as dependencies in Maven, but compileOnly does not.
+ * The buildscript adds runtimeOnlyNonPublishable to also have a runtime dependency that's not published.
+ *
+ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
+ */
 
 dependencies {
     api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.82:dev')
     api("com.github.GTNewHorizons:EnderCore:0.2.16:dev")
     api("com.github.GTNewHorizons:EnderIO:2.4.18:dev")
-    api("com.github.GTNewHorizons:Infernal-Mobs:1.7.8-GTNH:dev")
     api("com.github.GTNewHorizons:ForestryMC:4.6.7:dev")
     api("com.github.GTNewHorizons:ModularUI:1.1.10:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.7.9-GTNH:dev")
     //compileOnly("curse.maven:extrautilities-225561:2264384") {
     //    transitive = false
     //}

src/main/java/kubatech/CommonProxy.java

@@ -36,11 +36,7 @@
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import kubatech.api.LoaderReference;
-import kubatech.commands.CommandBees;
-import kubatech.commands.CommandConfig;
 import kubatech.commands.CommandHandler;
-import kubatech.commands.CommandHelp;
-import kubatech.commands.CommandTea;
 import kubatech.config.Config;
 import kubatech.loaders.MTLoader;
 import kubatech.loaders.RecipeLoader;
@@ -76,10 +72,6 @@ public void serverAboutToStart(FMLServerAboutToStartEvent event) {}
     public void serverStarting(FMLServerStartingEvent event) {
         RecipeLoader.addRecipesLate();
         CommandHandler cmd = new CommandHandler();
-        cmd.addCommand(new CommandHelp());
-        cmd.addCommand(new CommandConfig());
-        cmd.addCommand(new CommandBees());
-        cmd.addCommand(new CommandTea());
         event.registerServerCommand(cmd);
     }
 

src/main/java/kubatech/api/helpers/ReflectionHelper.java

@@ -20,9 +20,23 @@
 
 package kubatech.api.helpers;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Objects;
+import java.util.jar.JarFile;
+import java.util.stream.Collectors;
+
+import net.minecraft.launchwrapper.Launch;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.tree.ClassNode;
 
 public class ReflectionHelper {
 
@@ -140,4 +154,53 @@ public static <T> T callMethod(Object obj, String methodName, T defaultValue, Ob
             return defaultValue;
         }
     }
+
+    /**
+     * Gets all classes in a specific package path, works only for jar files.
+     *
+     * @param packageName The package name
+     * @return The class nodes
+     */
+    public static Collection<ClassNode> getClasses(String packageName) throws IOException, SecurityException {
+        ClassLoader classLoader = Thread.currentThread()
+            .getContextClassLoader();
+        assert classLoader != null;
+        String packagePath = packageName.replace('.', '/');
+        URL resource = classLoader.getResource(packagePath);
+        if (resource == null) throw new FileNotFoundException();
+        if (!resource.getProtocol()
+            .equals("jar")) return Collections.emptySet();
+        String jarPath = resource.getPath();
+
+        try (JarFile jar = new JarFile(jarPath.substring(5, jarPath.indexOf('!')))) {
+            return jar.stream()
+                .filter(
+                    j -> !j.isDirectory() && j.getName()
+                        .startsWith(packagePath)
+                        && j.getName()
+                            .endsWith(".class"))
+                .map(j -> {
+                    try {
+                        String name = j.getName();
+                        URL jarResource = Launch.classLoader.getResource(name);
+                        if (jarResource == null) return null;
+                        byte[] bytes;
+                        try (InputStream is = jarResource.openStream()) {
+                            bytes = new byte[(int) j.getSize()];
+                            if (is.read(bytes) != bytes.length) return null;
+                            if (is.available() > 0) return null;
+                        }
+
+                        ClassNode cn = new ClassNode();
+                        ClassReader cr = new ClassReader(bytes);
+                        cr.accept(cn, 0);
+
+                        return cn;
+                    } catch (IOException ignored) {}
+                    return null;
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+        }
+    }
 }

src/main/java/kubatech/api/network/CustomTileEntityPacket.java

@@ -132,7 +132,7 @@ public static class Handler implements IMessageHandler<CustomTileEntityPacket, I
 
         @Override
         public IMessage onMessage(CustomTileEntityPacket message, MessageContext ctx) {
-            if (!ModUtils.isClientSided) return null;
+            if (!ModUtils.isClientThreaded()) return null;
             Minecraft mc = Minecraft.getMinecraft();
             if (mc == null) return null;
             if (mc.thePlayer == null) return null;