Skip to content

Commit 6b4a95a

Browse files
dynpatchdynpatch
committed
✨ feature: update to Weave API 1.0.0-b.1 and Weave-Gradle-PRE
1 parent 852bed6 commit 6b4a95a

File tree

7 files changed

+28
-91
lines changed

7 files changed

+28
-91
lines changed

‎build.gradle.kts‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
plugins {
2-
java
3-
id("com.github.weave-mc.weave-gradle") version "649dba7468"
2+
id("net.weavemc.gradle") version "1.0.0-PRE"
43
}
54

65
group = "com.example"
76
version = "1.0.0"
87

9-
minecraft.version("1.8.9")
8+
minecraft {
9+
configure {
10+
name = "ExampleMod"
11+
modId = "examplemod"
12+
entryPoints = listOf("com.example.mod.ExampleMod")
13+
mixinConfigs = listOf("examplemod.mixins.json")
14+
mcpMappings()
15+
}
16+
version("1.8.9")
17+
}
1018

1119
repositories {
12-
maven("https://jitpack.io") {
13-
name = "WeaveMC's Jitpack"
14-
content {
15-
includeGroup("com.github.weave-mc")
16-
}
17-
}
20+
maven("https://repo.weavemc.dev/releases")
1821
maven("https://repo.spongepowered.org/maven/")
1922
}
2023

2124
dependencies {
22-
compileOnly("com.github.weave-mc:weave-loader:v0.2.4")
23-
25+
compileOnly("net.weavemc.api:common:1.0.0-b.2")
2426
compileOnly("org.spongepowered:mixin:0.8.5")
2527
}
2628

‎settings.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
pluginManagement {
22
repositories {
33
gradlePluginPortal()
4-
maven("https://jitpack.io")
4+
maven("https://repo.weavemc.net/releases")
55
}
66
}
77

88
plugins {
9-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
9+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.+"
1010
}
1111

1212
rootProject.name = "ExampleMod"

‎src/main/java/com/example/mod/ExampleMod.java‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,17 @@
11
package com.example.mod;
22

3-
import net.weavemc.loader.api.ModInitializer;
4-
import net.weavemc.loader.api.command.CommandBus;
5-
import net.weavemc.loader.api.event.*;
6-
import com.example.mod.command.TestCommand;
7-
import com.example.mod.listener.RenderGameOverlayListener;
8-
import net.minecraft.client.Minecraft;
9-
import net.minecraft.util.ChatComponentText;
10-
import org.lwjgl.input.Keyboard;
3+
import net.weavemc.api.ModInitializer;
4+
import org.jetbrains.annotations.NotNull;
5+
6+
import java.lang.instrument.Instrumentation;
117

128
public class ExampleMod implements ModInitializer {
139
@Override
14-
public void preInit() {
10+
public void init() {
1511
System.out.println("Initializing ExampleMod!");
16-
17-
CommandBus.register(new TestCommand());
18-
19-
EventBus.subscribe(KeyboardEvent.class, e -> {
20-
if (Minecraft.getMinecraft().currentScreen == null && e.getKeyState()) {
21-
Minecraft.getMinecraft().thePlayer.addChatMessage(
22-
new ChatComponentText("Key Pressed: " + Keyboard.getKeyName(e.getKeyCode()))
23-
);
24-
}
25-
});
26-
EventBus.subscribe(RenderHandEvent.class, e -> e.setCancelled(true));
27-
28-
EventBus.subscribe(new RenderGameOverlayListener());
2912
}
13+
14+
//TODO: This will be removed
15+
@SuppressWarnings({"deprecation", "RedundantSuppression"})
16+
@Override public void preInit(@NotNull Instrumentation instrumentation) {}
3017
}

‎src/main/java/com/example/mod/command/TestCommand.java‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/main/java/com/example/mod/hook/MinecraftHook.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.mod.hook;
22

3-
import net.weavemc.loader.api.Hook;
3+
import net.weavemc.api.Hook;
44
import org.jetbrains.annotations.NotNull;
55
import org.objectweb.asm.Opcodes;
66
import org.objectweb.asm.Type;
@@ -16,15 +16,15 @@ public MinecraftHook() {
1616
public void transform(@NotNull ClassNode classNode, @NotNull AssemblerConfig assemblerConfig) {
1717
classNode.methods.stream()
1818
.filter(m -> m.name.equals("startGame"))
19-
.findFirst().orElseThrow()
20-
.instructions.insert(
19+
.findFirst()
20+
.ifPresent(m -> m.instructions.insert(
2121
new MethodInsnNode(
2222
Opcodes.INVOKESTATIC,
2323
Type.getInternalName(MinecraftHook.class),
2424
"onStartGame",
2525
"()V"
2626
)
27-
);
27+
));
2828
}
2929

3030
@SuppressWarnings("unused")

‎src/main/java/com/example/mod/listener/RenderGameOverlayListener.java‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/main/resources/weave.mod.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)