Merge pull request #5

v3

Author: KdGaming0

CHANGELOG.md

@@ -1 +1,4 @@
-- chore: updated to 1.21.11
+New Features:
+
+feat: Add client-side sword block when holding right-click with a sword
+fix: Hypixel NPC scaling when chasing the other player scale slider.

LICENSE.md LICENSELICENSE.md renamed to LICENSE

@@ -1,6 +1,5 @@
-import org.gradle.kotlin.dsl.from
-
 plugins {
+    `maven-publish`
     id("fabric-loom")
     id("me.modmuss50.mod-publish-plugin")
 }
@@ -9,42 +8,42 @@ version = "${property("mod.version")}+${stonecutter.current.version}"
 base.archivesName = property("mod.id") as String
 
 repositories {
-    /**
-     * Restricts dependency search of the given [groups] to the [maven URL][url],
-     * improving the setup speed.
-     */
+    mavenCentral()
     fun strictMaven(url: String, alias: String, vararg groups: String) = exclusiveContent {
         forRepository { maven(url) { name = alias } }
         filter { groups.forEach(::includeGroup) }
     }
-    strictMaven("https://www.cursemaven.com", "CurseForge", "curse.maven")
     strictMaven("https://api.modrinth.com/maven", "Modrinth", "maven.modrinth")
-    maven("https://maven.terraformersmc.com/")
-    maven("https://maven.wispforest.io/releases/")
-    maven("https://jitpack.io")
-    maven("https://repo.hypixel.net/repository/Hypixel/")
     maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1")
+    exclusiveContent {
+        forRepository {
+            maven {
+                url = uri("https://maven.azureaaron.net/releases")
+            }
+        }
+
+        filter {
+            includeGroup("net.azureaaron")
+        }
+    }
 }
 
 dependencies {
     minecraft("com.mojang:minecraft:${stonecutter.current.version}")
-    mappings("net.fabricmc:yarn:${property("deps.yarn_mappings")}:v2")
+    mappings(loom.officialMojangMappings())
     modImplementation("net.fabricmc:fabric-loader:${property("deps.fabric_loader")}")
     modImplementation("net.fabricmc.fabric-api:fabric-api:${property("deps.fabric_api")}")
 
     modImplementation("maven.modrinth:midnightlib:${property("deps.midnightlib_version")}")
     include("maven.modrinth:midnightlib:${property("deps.midnightlib_version")}")
 
-    modImplementation("com.terraformersmc:modmenu:${property("deps.modmenu_version")}")
-    modImplementation("io.wispforest:owo-lib:${property("deps.owo_version")}")
-
-    modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:1.2.1")
+    modImplementation("net.azureaaron:hm-api:${property("deps.hm_api_version")}")
+    include("net.azureaaron:hm-api:${property("deps.hm_api_version")}")
 
-    implementation("com.google.code.gson:gson:2.10.1")
-    implementation("org.apache.httpcomponents:httpclient:4.5.13")
+    modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:1.2.2")
+    modRuntimeOnly("maven.modrinth:modmenu:${property("deps.modmenu_version")}")
 }
 
-// Add this mixin configuration block
 loom {
     decompilerOptions.named("vineflower") {
         options.put("mark-corresponding-synthetics", "1") // Adds names to lambdas - useful for mixins
@@ -71,21 +70,23 @@ tasks {
         inputs.property("name", project.property("mod.name"))
         inputs.property("version", project.property("mod.version"))
         inputs.property("minecraft", project.property("mod.mc_dep"))
-        inputs.property("owo_version", project.property("deps.owo_version"))
-        inputs.property("midnightlib_version", project.property("deps.midnightlib_version"))
+        inputs.property("fabricloader", project.property("deps.fabric_loader"))
+        inputs.property("midnightlib", project.property("deps.midnightlib_version"))
+        inputs.property("fabric_api", project.property("deps.fabric_api"))
+        inputs.property("hm_api", project.property("deps.hm_api_version"))
 
         val props = mapOf(
             "id" to project.property("mod.id"),
             "name" to project.property("mod.name"),
             "version" to project.property("mod.version"),
             "minecraft" to project.property("mod.mc_dep"),
-            "owo_version" to project.property("deps.owo_version"),
-            "midnightlib_version" to project.property("deps.midnightlib_version")
+            "fabricloader" to project.property("deps.fabric_loader"),
+            "midnightlib" to project.property("deps.midnightlib_version"),
+            "fabric_api" to project.property("deps.fabric_api"),
+            "hm_api" to project.property("deps.hm_api_version"),
         )
 
-        filesMatching("fabric.mod.json") {
-            expand(props)
-        }
+        filesMatching("fabric.mod.json") { expand(props) }
     }
 
     jar {
@@ -97,22 +98,12 @@ tasks {
     // Builds the version into a shared folder in `build/libs/${mod version}/`
     register<Copy>("buildAndCollect") {
         group = "build"
-        from(
-            remapJar.map { it.archiveFile },
-            remapSourcesJar.map { it.archiveFile }
-        )
+        from(remapJar.map { it.archiveFile }, remapSourcesJar.map { it.archiveFile })
         into(rootProject.layout.buildDirectory.file("libs/${project.property("mod.version")}"))
         dependsOn("build")
     }
 }
 
-stonecutter {
-    replacements.string(current.parsed >= "1.21.11") {
-        replace("Components", "UIComponents")
-        replace("Containers", "UIContainers")
-    }
-}
-
 publishMods {
     file = tasks.remapJar.map { it.archiveFile.get() }
     additionalFiles.from(tasks.remapSourcesJar.map { it.archiveFile.get() })
@@ -132,9 +123,6 @@ publishMods {
         requires {
             slug = "P7dR8mSH" // Fabric API
         }
-        requires {
-            slug = "ccKDOlHs" // OwO Lib
-        }
         optional {
             slug = "mOgUt4GM" // ModMenu
         }
@@ -147,9 +135,6 @@ publishMods {
         requires {
             slug = "fabric-api"
         }
-        requires {
-            slug = "owo-lib"
-        }
         optional {
             slug = "modmenu"
         }

build.gradle.kts

@@ -4,18 +4,19 @@ org.gradle.parallel=true
 org.gradle.configuration-cache=false
 
 # Mod properties
-mod.version=2.2.6
+mod.version=3.0.0
 mod.group=com.github.kd_gaming1
 mod.id=scaleme
-mod.name=ScaleMe
+mod.name=Scale Me
 
 # Global dependencies
 deps.fabric_loader=0.18.4
-deps.yarn_mappings=[VERSIONED]
+
+# Global dependencies
 deps.fabric_api=[VERSIONED]
+deps.moulconfig_version=[VERSIONED]
 deps.midnightlib_version=[VERSIONED]
-deps.modmenu_version=[VERSIONED]
-deps.owo_version=[VERSIONED]
+deps.hm_api_version=[VERSIONED]
 
 publish.modrinth=pEGu9f0K
 publish.curseforge=1378514

gradle.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -8,12 +8,12 @@ pluginManagement {
 }
 
 plugins {
-    id("dev.kikugie.stonecutter") version "0.8.3"
+    id("dev.kikugie.stonecutter") version "0.9-alpha.7"
 }
 
 stonecutter {
     create(rootProject) {
-        versions("1.21.5", "1.21.8", "1.21.10", "1.21.11")
-        vcsVersion = "1.21.5"
+        versions("1.21.10", "1.21.11")
+        vcsVersion = "1.21.10"
     }
 }

settings.gradle.kts

@@ -0,0 +1,62 @@
+package com.github.kd_gaming1.scaleme;
+
+import com.github.kd_gaming1.scaleme.command.Commands;
+import com.github.kd_gaming1.scaleme.config.ScaleMeConfig;
+import com.github.kd_gaming1.scaleme.util.BlockingState;
+import com.github.kd_gaming1.scaleme.util.HypixelLocationState;
+import eu.midnightdust.lib.config.MidnightConfig;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import net.azureaaron.hmapi.network.HypixelNetworking;
+import net.azureaaron.hmapi.network.packet.v1.s2c.LocationUpdateS2CPacket;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+//? if >=1.21.11 {
+/*import net.minecraft.util.Util;
+ *///?} else {
+import net.minecraft.Util;
+//?}
+import com.mojang.blaze3d.platform.InputConstants;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.tags.ItemTags;
+import org.lwjgl.glfw.GLFW;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ScaleMe implements ClientModInitializer {
+
+    public static final String MOD_ID = "scaleme";
+    public static final Logger LOGGER = LoggerFactory.getLogger("Scale Me");
+
+    @Override
+    public void onInitializeClient() {
+        MidnightConfig.init(MOD_ID, ScaleMeConfig.class);
+
+        HypixelNetworking.registerToEvents(
+                Util.make(new Object2IntOpenHashMap<>(), map -> map.put(LocationUpdateS2CPacket.ID, 1))
+        );
+
+        HypixelLocationState.register();
+
+        ClientPlayConnectionEvents.DISCONNECT.register(
+                (handler, client) -> HypixelLocationState.reset()
+        );
+
+        KeyMapping blockKey = KeyBindingHelper.registerKeyBinding(new KeyMapping(
+                "key.scaleme.sword_block",
+                InputConstants.Type.MOUSE,
+                GLFW.GLFW_MOUSE_BUTTON_RIGHT,
+                KeyMapping.Category.GAMEPLAY
+        ));
+
+        ClientTickEvents.END_CLIENT_TICK.register(client -> {
+            if (client.player == null) return;
+            BlockingState.isBlocking = ScaleMeConfig.enableSwordBlock
+                    && blockKey.isDown()
+                    && client.player.getMainHandItem().is(ItemTags.SWORDS);
+        });
+
+        Commands.register();
+    }
+}