add more APIs, update gradle, add branding

build.gradle.kts

@@ -14,4 +14,23 @@ repositories {
     mavenLocal()
 }
 
-minecraft(project.libs.versions.minecraft).loader(project.libs.versions.frogloader)
+dependencies {
+
+}
+
+phytotelma {
+    loader(project.libs.versions.frogloader)
+    minecraft(project.libs.versions.minecraft)
+}
+
+tasks.processResources {
+    inputs.property("version", version)
+
+    filesMatching("frog.mod.toml") {
+        expand("version" to version)
+    }
+}
+
+tasks.runClient {
+    classpath(sourceSets.test.get().runtimeClasspath)
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon May 13 10:13:59 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/dev/frogmc/froglib/branding/impl/mixin/client/ClientBrandRetrieverMixin.java

@@ -0,0 +1,15 @@
+package dev.frogmc.froglib.branding.impl.mixin.client;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import net.minecraft.client.ClientBrandRetriever;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(ClientBrandRetriever.class)
+public class ClientBrandRetrieverMixin {
+
+	@ModifyReturnValue(method = "getClientModName", at = @At("RETURN"))
+	private static String setClientBrand(String original){
+		return original+"/FrogLoader";
+	}
+}

src/main/java/dev/frogmc/froglib/entrypoints/mixin/client/MinecraftMixin.java

@@ -1,17 +1,18 @@
 package dev.frogmc.froglib.entrypoints.mixin.client;
 
 import dev.frogmc.froglib.entrypoints.ExtensionLauncher;
-import net.minecraft.client.main.Main;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.main.GameConfig;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(Main.class)
+@Mixin(Minecraft.class)
-public class MainMixin {
+public abstract class MinecraftMixin {
 
-	@Inject(method = "main", at = @At(value = "INVOKE", target = "Ljava/lang/Thread;setName(Ljava/lang/String;)V"))
+	@Inject(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/client/Minecraft;running:Z"))
-	private static void initializeClient(String[] args, CallbackInfo ci) {
+	private void initializeClient(GameConfig gameConfig, CallbackInfo ci) {
 		ExtensionLauncher.invokeClient();
 	}
 }

src/main/java/dev/frogmc/froglib/entrypoints/mixin/server/MinecraftServerMainMixin.java

@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Main.class)
-public class MinecraftServerMixin {
+public abstract class MinecraftServerMainMixin {
 
 	@Inject(method = "main", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;spin(Ljava/util/function/Function;)Lnet/minecraft/server/MinecraftServer;"))
 	private static void initializeServer(String[] args, CallbackInfo ci) {

src/main/java/dev/frogmc/froglib/events/api/Events.java

@@ -1,9 +1,17 @@
 package dev.frogmc.froglib.events.api;
 
 import dev.frogmc.froglib.events.api.types.ClientStartupEvent;
+import dev.frogmc.froglib.events.api.types.ClientTickEvent;
 import dev.frogmc.froglib.events.api.types.ServerStartupEvent;
+import dev.frogmc.froglib.events.api.types.ServerTickEvent;
 
 public class Events {
 	public static final Event<ClientStartupEvent> CLIENT_STARTUP = Event.of(ClientStartupEvent.class);
 	public static final Event<ServerStartupEvent> SERVER_STARTUP = Event.of(ServerStartupEvent.class);
+
+	public static final Event<ClientTickEvent> PRE_CLIENT_TICK = Event.of(ClientTickEvent.class);
+	public static final Event<ClientTickEvent> POST_CLIENT_TICK = Event.of(ClientTickEvent.class);
+
+	public static final Event<ServerTickEvent> PRE_SERVER_TICK = Event.of(ServerTickEvent.class);
+	public static final Event<ServerTickEvent> POST_SERVER_TICK = Event.of(ServerTickEvent.class);
 }

src/main/java/dev/frogmc/froglib/events/api/types/ClientTickEvent.java

@@ -0,0 +1,8 @@
+package dev.frogmc.froglib.events.api.types;
+
+import net.minecraft.client.Minecraft;
+
+public interface ClientTickEvent {
+
+	void onTick(Minecraft minecraft);
+}

src/main/java/dev/frogmc/froglib/events/api/types/ServerTickEvent.java

@@ -0,0 +1,7 @@
+package dev.frogmc.froglib.events.api.types;
+
+import net.minecraft.server.MinecraftServer;
+
+public interface ServerTickEvent {
+	void onTick(MinecraftServer server);
+}

src/main/java/dev/frogmc/froglib/events/impl/mixin/MinecraftServerMixin.java

@@ -0,0 +1,22 @@
+package dev.frogmc.froglib.events.impl.mixin;
+
+import dev.frogmc.froglib.events.api.Events;
+import net.minecraft.server.MinecraftServer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MinecraftServer.class)
+public abstract class MinecraftServerMixin {
+
+	@Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;tickServer(Ljava/util/function/BooleanSupplier;)V"))
+	private void preServerTick(CallbackInfo ci) {
+		Events.PRE_SERVER_TICK.invoker().onTick((MinecraftServer) (Object) this);
+	}
+
+	@Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;tickServer(Ljava/util/function/BooleanSupplier;)V", shift = At.Shift.AFTER))
+	private void postServerTick(CallbackInfo ci) {
+		Events.POST_SERVER_TICK.invoker().onTick((MinecraftServer) (Object) this);
+	}
+}

src/main/java/dev/frogmc/froglib/events/impl/mixin/client/MinecraftMixin.java

@@ -9,10 +9,20 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Minecraft.class)
-public class MinecraftMixin {
+public abstract class MinecraftMixin {
 
 	@Inject(method = "<init>", at = @At("TAIL"))
 	private void postClientInit(GameConfig gameConfig, CallbackInfo ci) {
 		Events.CLIENT_STARTUP.invoker().onClientInit((Minecraft) (Object) this, gameConfig);
 	}
+
+	@Inject(method = "tick", at = @At("HEAD"))
+	private void preClientTick(CallbackInfo ci) {
+		Events.PRE_CLIENT_TICK.invoker().onTick((Minecraft) (Object) this);
+	}
+
+	@Inject(method = "tick", at = @At("TAIL"))
+	private void postClientTick(CallbackInfo ci) {
+		Events.POST_CLIENT_TICK.invoker().onTick((Minecraft) (Object) this);
+	}
 }

src/main/java/dev/frogmc/froglib/events/impl/mixin/server/DedicatedServerMixin.java

@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(DedicatedServer.class)
-public class DedicatedServerMixin {
+public abstract class DedicatedServerMixin {
 
 	@Inject(method = "initServer", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;info(Ljava/lang/String;)V", ordinal = 0))
 	private void initializeServer(CallbackInfoReturnable<Boolean> cir) {

src/main/java/dev/frogmc/froglib/keybinds/api/KeyMappings.java

@@ -0,0 +1,17 @@
+package dev.frogmc.froglib.keybinds.api;
+
+import dev.frogmc.froglib.keybinds.impl.KeyMappingsImpl;
+import net.minecraft.client.KeyMapping;
+
+public interface KeyMappings {
+
+	private static KeyMappings getInstance(){
+		return KeyMappingsImpl.getInstance();
+	}
+
+	static void register(KeyMapping mapping){
+		getInstance().registerKey(mapping);
+	}
+
+	void registerKey(KeyMapping mapping);
+}

src/main/java/dev/frogmc/froglib/keybinds/impl/KeyMappingsImpl.java

@@ -0,0 +1,18 @@
+package dev.frogmc.froglib.keybinds.impl;
+
+import dev.frogmc.froglib.keybinds.api.KeyMappings;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.Minecraft;
+import org.apache.commons.lang3.ArrayUtils;
+
+public class KeyMappingsImpl implements KeyMappings {
+
+	private static final KeyMappingsImpl INSTANCE = new KeyMappingsImpl();
+	public static KeyMappings getInstance(){
+		return INSTANCE;
+	}
+
+	public void registerKey(KeyMapping mapping){
+		Minecraft.getInstance().options.keyMappings = ArrayUtils.add(Minecraft.getInstance().options.keyMappings, mapping);
+	}
+}

src/main/java/dev/frogmc/froglib/keybinds/impl/mixin/client/KeyMappingMixin.java

@@ -0,0 +1,26 @@
+package dev.frogmc.froglib.keybinds.impl.mixin.client;
+
+import java.util.Map;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import net.minecraft.client.KeyMapping;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(KeyMapping.class)
+public abstract class KeyMappingMixin {
+
+	@Shadow @Final @Mutable private static Map<String, Integer> CATEGORY_SORT_ORDER;
+
+	@Inject(method = "<init>(Ljava/lang/String;Lcom/mojang/blaze3d/platform/InputConstants$Type;ILjava/lang/String;)V", at = @At("TAIL"))
+	private void addModCategoriesToOrdering(String name, InputConstants.Type type, int keyCode, String category, CallbackInfo ci){
+		if (!CATEGORY_SORT_ORDER.containsKey(category)) {
+			CATEGORY_SORT_ORDER.put(category, CATEGORY_SORT_ORDER.size()+1);
+		}
+	}
+}

src/main/resources/frog.mod.toml

@@ -4,7 +4,7 @@ format_version = "1.0.0"
 [frog.mod]
 id = "froglib"
 name = "FrogLib"
-version = "0.0.1"
+version = "$version"
 license = "Apache-2.0"
 credits = [
     { name = "FrogMC Team", roles = ["author"] }
@@ -23,8 +23,10 @@ server = [
     "dev.frogmc.froglib.resources.impl.ResourceLoaderServer"
 ]
 mixin_config = [
+    "froglib.branding.mixins.json",
     "froglib.entrypoints.mixins.json",
     "froglib.events.mixins.json",
-    "froglib.resources.mixins.json"
+    "froglib.resources.mixins.json",
+    "froglib.keybinds.mixins.json"
 ]
-
+frog_aw = "froglib.accesswidener"

src/main/resources/froglib.accesswidener

@@ -0,0 +1,3 @@
+accessWidener   v2  named
+
+mutable field net/minecraft/client/Options keyMappings [Lnet/minecraft/client/KeyMapping;

src/main/resources/froglib.branding.mixins.json

@@ -0,0 +1,17 @@
+{
+	"required": true,
+	"minVersion": "0.8",
+	"package": "dev.frogmc.froglib.branding.impl.mixin",
+	"compatibilityLevel": "JAVA_21",
+	"mixins": [
+
+	],
+	"server": [
+	],
+	"client": [
+		"client.ClientBrandRetrieverMixin"
+	],
+	"injectors": {
+		"defaultRequire": 1
+	}
+}

src/main/resources/froglib.entrypoints.mixins.json

@@ -4,10 +4,10 @@
 	"package": "dev.frogmc.froglib.entrypoints.mixin",
 	"compatibilityLevel": "JAVA_21",
 	"server": [
-		"server.MinecraftServerMixin"
+		"server.MinecraftServerMainMixin"
 	],
 	"client": [
-		"client.MainMixin"
+		"client.MinecraftMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

src/main/resources/froglib.events.mixins.json

@@ -4,7 +4,7 @@
 	"package": "dev.frogmc.froglib.events.impl.mixin",
 	"compatibilityLevel": "JAVA_21",
 	"mixins": [
-
+		"MinecraftServerMixin"
 	],
 	"server": [
 		"server.DedicatedServerMixin"

src/main/resources/froglib.keybinds.mixins.json

@@ -0,0 +1,17 @@
+{
+	"required": true,
+	"minVersion": "0.8",
+	"package": "dev.frogmc.froglib.keybinds.impl.mixin",
+	"compatibilityLevel": "JAVA_21",
+	"mixins": [
+
+	],
+	"server": [
+	],
+	"client": [
+		"client.KeyMappingMixin"
+	],
+	"injectors": {
+		"defaultRequire": 1
+	}
+}

src/test/java/dev/frogmc/froglib/test/KeybindsTest.java

@@ -0,0 +1,14 @@
+package dev.frogmc.froglib.test;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import dev.frogmc.froglib.entrypoints.ClientExtension;
+import dev.frogmc.froglib.keybinds.api.KeyMappings;
+import dev.frogmc.frogloader.api.mod.ModProperties;
+import net.minecraft.client.KeyMapping;
+
+public class KeybindsTest implements ClientExtension {
+	@Override
+	public void onClientInit(ModProperties mod) {
+		KeyMappings.register(new KeyMapping("key.froglib.test", InputConstants.KEY_O, "category.froglib"));
+	}
+}

src/test/resources/frog.mod.toml

@@ -0,0 +1,19 @@
+[frog]
+format_version = "1.0.0"
+
+[frog.mod]
+id = "frog_lib_test"
+name = "Frog Lib Test Mod"
+version = "1.0.0"
+license = "Apache-2.0"
+credits = [
+    { name = "FrogMC Team", roles = ["author"] }
+]
+
+[frog.dependencies]
+depends = [
+    { id = "minecraft", versions = "~1.20.6", name = "Minecraft" }
+]
+
+[frog.extensions]
+client = "dev.frogmc.froglib.test.KeybindsTest"