From 9cfa1cb26cdacdcd93aa6528fb25e0c74fa8e32a Mon Sep 17 00:00:00 2001 From: Emily Lovegrove Date: Sat, 12 Apr 2025 17:31:53 +0100 Subject: [PATCH] Load bundled api properties relative to tweaker Allows for the properties to be relocated along with the tweaker as previously it would load whatever properties file happened to be first in the classpath and potentially load an older version of the mod api. --- tweaker/build.gradle | 4 +++- .../java/net/hypixel/modapi/tweaker/HypixelModAPITweaker.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tweaker/build.gradle b/tweaker/build.gradle index e8eada8..c9d0ff9 100644 --- a/tweaker/build.gradle +++ b/tweaker/build.gradle @@ -19,7 +19,9 @@ task generateVersionInfo(type: WriteProperties) { tasks.jar { dependsOn(project(":").reobfJar) from(project(":").jar) - from(generateVersionInfo) + into("net/hypixel/modapi/tweaker") { + from(generateVersionInfo) + } manifest { attributes("TweakClass": "net.hypixel.modapi.tweaker.HypixelModAPITweaker") } diff --git a/tweaker/src/main/java/net/hypixel/modapi/tweaker/HypixelModAPITweaker.java b/tweaker/src/main/java/net/hypixel/modapi/tweaker/HypixelModAPITweaker.java index 4464cd7..fd51523 100644 --- a/tweaker/src/main/java/net/hypixel/modapi/tweaker/HypixelModAPITweaker.java +++ b/tweaker/src/main/java/net/hypixel/modapi/tweaker/HypixelModAPITweaker.java @@ -35,7 +35,7 @@ public class HypixelModAPITweaker implements ITweaker { // Load version information from the .properties generated by the gradle task generateVersionInfo Properties properties = new Properties(); try { - properties.load(HypixelModAPITweaker.class.getResourceAsStream("/hypixel-mod-api-bundled.properties")); + properties.load(HypixelModAPITweaker.class.getResourceAsStream("hypixel-mod-api-bundled.properties")); } catch (IOException e) { LOGGER.error("Could not load version information for bundled hypixel mod API", e); }