Merge pull request Weave-MC#4 from xtrm-en/master

exejar · web-flow · commit 1e624f98eb96 · 2024-04-30T20:57:54.000-04:00
Update to Weave 1.0.0-b.1 + minor improvements
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,51 @@
+# Eclipse IDE Files.
+eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# IntelliJ IDEA Output Files.
+out
+classes
+*.ipr
+*.iws
+*.iml
 .idea
+
+# VScode Configuration Directory.
+.vscode
+
+# Gradle Output Directories.
 build
-.gradle
+.gradle
+
+# Netbeans Output Files.
+.nb-gradle
+.nb-gradle-properties
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# VM Crash Logs.
+hs_err_pid*
+replay_pid*
+
+# Other
+run
+.DS_Store
+Thumbs.db
diff --git a/README.md b/README.md
@@ -0,0 +1,24 @@
+# Weave's Mod Template
+
+This repository shows how to setup a [Gradle](https://gradle.org) project with the [Weave Gradle plugin](https://github.com/Weave-MC/Weave-Gradle) to develop mods for Weave.
+
+## How to start?
+
+To use this repository as a template, click on the green **Use this template** button. 
+
+Alternatively, you can simply clone this repository with the following commands:
+```bash
+# You can change "MyCoolMod" to anything you'd like
+git clone https://github.com/Weave-MC/ExampleMod MyCoolMod 
+cd MyCoolMod
+```
+
+## How to build
+
+To build a Weave mod, you can simply run:
+
+```bash
+./gradlew build
+```
+
+You can find the built jar files in `./build/libs/*.jar`.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,24 +1,35 @@
 plugins {
-    java
-    id("com.github.weave-mc.weave-gradle") version "649dba7468"
+    id("net.weavemc.gradle") version "1.0.0-PRE"
 }
 
 group = "com.example"
-version = "1.0"
+version = "1.0.0"
 
-minecraft.version("1.8.9")
+minecraft {
+    configure {
+        name = "ExampleMod"
+        modId = "examplemod"
+        entryPoints = listOf("com.example.mod.ExampleMod")
+        mixinConfigs = listOf("examplemod.mixins.json")
+        mcpMappings()
+    }
+    version("1.8.9")
+}
 
 repositories {
-    maven("https://jitpack.io")
+    maven("https://repo.weavemc.dev/releases")
     maven("https://repo.spongepowered.org/maven/")
 }
 
 dependencies {
-    compileOnly("com.github.weave-mc:weave-loader:v0.2.4")
-
+    compileOnly("net.weavemc.api:common:1.0.0-b.2")
     compileOnly("org.spongepowered:mixin:0.8.5")
 }
 
-tasks.compileJava {
-    options.release.set(11)
-}
+java {
+    withSourcesJar()
+
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,8 +1,12 @@
-rootProject.name = "ExampleMod"
-
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven("https://jitpack.io")
+        maven("https://repo.weavemc.net/releases")
     }
-}
+}
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.+"
+}
+
+rootProject.name = "ExampleMod"
diff --git a/src/main/java/com/example/mod/ExampleMod.java b/src/main/java/com/example/mod/ExampleMod.java
@@ -1,30 +1,21 @@
 package com.example.mod;
 
-import net.weavemc.loader.api.ModInitializer;
-import net.weavemc.loader.api.command.CommandBus;
-import net.weavemc.loader.api.event.*;
-import com.example.mod.command.TestCommand;
-import com.example.mod.listener.RenderGameOverlayListener;
-import net.minecraft.client.Minecraft;
-import net.minecraft.util.ChatComponentText;
-import org.lwjgl.input.Keyboard;
+import net.weavemc.api.ModInitializer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 
-public class ExampleMod implements ModInitializer {
-    @Override
-    public void preInit() {
-        System.out.println("Initializing ExampleMod!");
-
-        CommandBus.register(new TestCommand());
+import java.lang.instrument.Instrumentation;
 
-        EventBus.subscribe(KeyboardEvent.class, e -> {
-            if (Minecraft.getMinecraft().currentScreen == null && e.getKeyState()) {
-                Minecraft.getMinecraft().thePlayer.addChatMessage(
-                        new ChatComponentText("Key Pressed: " + Keyboard.getKeyName(e.getKeyCode()))
-                );
-            }
-        });
-        EventBus.subscribe(RenderHandEvent.class, e -> e.setCancelled(true));
+public class ExampleMod implements ModInitializer {
+    private final Logger logger = LogManager.getLogger();
 
-        EventBus.subscribe(new RenderGameOverlayListener());
+    @Override
+    public void init() {
+        logger.info("Hello from ExampleMod!");
     }
+
+    //TODO: This will be removed
+    @SuppressWarnings({"deprecation", "RedundantSuppression"})
+    @Override public void preInit(@NotNull Instrumentation instrumentation) {}
 }
diff --git a/src/main/java/com/example/mod/command/TestCommand.java b/src/main/java/com/example/mod/command/TestCommand.java
diff --git a/src/main/java/com/example/mod/hook/MinecraftHook.java b/src/main/java/com/example/mod/hook/MinecraftHook.java
@@ -1,6 +1,6 @@
 package com.example.mod.hook;
 
-import net.weavemc.loader.api.Hook;
+import net.weavemc.api.Hook;
 import org.jetbrains.annotations.NotNull;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -16,15 +16,15 @@ public MinecraftHook() {
     public void transform(@NotNull ClassNode classNode, @NotNull AssemblerConfig assemblerConfig) {
         classNode.methods.stream()
                 .filter(m -> m.name.equals("startGame"))
-                .findFirst().orElseThrow()
-                .instructions.insert(
+                .findFirst()
+                .ifPresent(m -> m.instructions.insert(
                         new MethodInsnNode(
                                 Opcodes.INVOKESTATIC,
                                 Type.getInternalName(MinecraftHook.class),
                                 "onStartGame",
                                 "()V"
                         )
-                );
+                ));
     }
 
     @SuppressWarnings("unused")
diff --git a/src/main/java/com/example/mod/listener/RenderGameOverlayListener.java b/src/main/java/com/example/mod/listener/RenderGameOverlayListener.java
diff --git a/src/main/resources/weave.mod.json b/src/main/resources/weave.mod.json
