diff --git a/build.gradle.kts b/build.gradle.kts index 8a5d901..0d68d0c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,37 +15,13 @@ configurations.all { } repositories { - maven { - url = uri("https://jm.gserv.me/repository/maven-public/") - content { - includeGroup("info.journeymap") - } - } + // Modrinth maven { url = uri("https://api.modrinth.com/maven/") content { includeGroup("maven.modrinth") } } - maven { - url = uri("https://www.cursemaven.com") - } - maven { - url = uri("https://masa.dy.fi/maven") - } - // YACL - maven { - url = uri("https://maven.isxander.dev/releases") - } - // YACL Snapshots - maven { - name = "Xander Snapshot Maven" - url = uri("https://maven.isxander.dev/snapshots") - } - // Where Is It, JackFredLib - maven { - url = uri("https://maven.jackf.red/releases/") - } // Meteor Client maven { name = "meteor-maven" @@ -55,6 +31,11 @@ repositories { name = "meteor-maven-snapshots" url = uri("https://maven.meteordev.org/snapshots") } + // XaeroLib + maven { + name = "Xaero's Maven" + url = uri("https://chocolateminecraft.com/maven") + } mavenCentral() gradlePluginPortal() } @@ -72,15 +53,15 @@ dependencies { annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.5.3") // Meteor Client - modImplementation(files("libs\\baritone-unoptimized-fabric-1.15.0-2-gf7a53504.jar")) + modImplementation(libs.baritone) modImplementation(libs.meteor.client) implementation(libs.starscript) implementation(libs.orbit) // Xaero's Mods + modCompileOnly(libs.xlib) modCompileOnly(libs.xwm) // Xaero's World Map modCompileOnly(libs.xmm) // Xaero's Minimap - modCompileOnly(files("libs\\xaerolib-fabric-1.21.11-1.0.38.jar")) // Chest Tracker modImplementation(libs.whereisit) @@ -97,7 +78,7 @@ tasks { "mc_version" to libs.versions.minecraft.get(), "gh_hash" to (System.getenv("GITHUB_SHA") ?: ""), ) - + filesMatching("fabric.mod.json") { expand (propertyMap) } @@ -116,4 +97,4 @@ tasks { options.encoding = "UTF-8" options.release = 21 } -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d5937f9..33394b9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,34 +3,32 @@ mod-version = "1.21.11_1.0.9.5" # Fabric (https://fabricmc.net/develop) minecraft = "1.21.11" -yarn-mappings = "1.21.11+build.3" -fabric-loader = "0.18.4" -fabric-api = "0.140.2+1.21.11" +yarn-mappings = "1.21.11+build.6" +fabric-loader = "0.19.3" +fabric-api = "0.141.6+1.21.11" # Plugins # Loom (https://github.com/FabricMC/fabric-loom) -loom = "1.14-SNAPSHOT" +loom = "1.16-SNAPSHOT" # Meteor (https://github.com/MeteorDevelopment/meteor-client) meteor = "1.21.11-SNAPSHOT" +baritone = "1.21.11-SNAPSHOT" # Starscript (https://github.com/MeteorDevelopment/starscript) starscript = "0.2.5" # Orbit (https://github.com/MeteorDevelopment/orbit) orbit = "0.2.4" # Xaero's Mods +# XaeroLib +xlib = "1.7.1" # Xaero's World Map (https://modrinth.com/mod/xaeros-world-map/versions) -xwm = "1.40.2_Fabric_1.21.11" +xwm = "1.44.2" # Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions) -xmm = "25.3.2_Fabric_1.21.11" +xmm = "26.4.2" # Where Is It (https://modrinth.com/mod/where-is-it-port/versions) -whereisit = "2.7.3+" -# YetAnotherConfigLib (https://github.com/ponuing/WhereIsIt/blob/1.21.11/gradle.properties) -yacl = "3.8.1+1.21.11-fabric" - -# MaLiLib (https://www.curseforge.com/minecraft/mc-mods/malilib) -malilib = "7130809" +whereisit = "2.7.5.2+1.21.11" [libraries] # Fabric base @@ -43,20 +41,17 @@ fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fab # Meteor Client meteor-client = { module = "meteordevelopment:meteor-client", version.ref = "meteor" } +baritone = { module = "meteordevelopment:baritone", version.ref = "baritone" } starscript = { module = "org.meteordev:starscript", version.ref = "starscript" } orbit = { module = "meteordevelopment:orbit", version.ref = "orbit" } # Xaero's Mods -xwm = { module = "maven.modrinth:xaeros-world-map", version.ref = "xwm" } -xmm = { module = "maven.modrinth:xaeros-minimap", version.ref = "xmm" } +xlib = { module = "xaero.lib:xaerolib-fabric-1.21.11", version.ref = "xlib" } +xwm = { module = "xaero.map:xaeroworldmap-fabric-1.21.11", version.ref = "xwm" } +xmm = { module = "xaero.minimap:xaerominimap-fabric-1.21.11", version.ref = "xmm" } # Where Is It whereisit = { module = "maven.modrinth:where-is-it-port", version.ref = "whereisit" } -# YetAnotherConfigLib -yacl = { module = "dev.isxander.yacl:yet-another-config-lib-fabric", version.ref = "yacl" } - -# MaLiLib -malilib = { module = "curse.maven:malilib-303119", version.ref = "malilib" } [plugins] -fabric-loom = { id = "fabric-loom", version.ref = "loom" } \ No newline at end of file +fabric-loom = { id = "fabric-loom", version.ref = "loom" } diff --git a/libs/baritone-unoptimized-fabric-1.15.0-2-gf7a53504.jar b/libs/baritone-unoptimized-fabric-1.15.0-2-gf7a53504.jar deleted file mode 100644 index f857ee9..0000000 Binary files a/libs/baritone-unoptimized-fabric-1.15.0-2-gf7a53504.jar and /dev/null differ diff --git a/libs/xaerolib-fabric-1.21.11-1.0.38.jar b/libs/xaerolib-fabric-1.21.11-1.0.38.jar deleted file mode 100644 index b627635..0000000 Binary files a/libs/xaerolib-fabric-1.21.11-1.0.38.jar and /dev/null differ diff --git a/src/main/java/nekiplay/MixinPlugin.java b/src/main/java/nekiplay/MixinPlugin.java index 31d9a3c..7601a17 100644 --- a/src/main/java/nekiplay/MixinPlugin.java +++ b/src/main/java/nekiplay/MixinPlugin.java @@ -25,11 +25,9 @@ public class MixinPlugin implements IMixinConfigPlugin { public static boolean isFutureClient = false; // Other cheat client public static boolean isBaritonePresent = false; // Baritone for auto walking - public static boolean isJourneyMapPresent = false; // Currently not used public static boolean isXaeroWorldMapresent = false; // Extension for map and baritone public static boolean isXaeroMiniMapresent = false; // Extension for map and baritone public static boolean isXaeroPlusMapresent = false; // other extension for map and baritone - public static boolean isLitematicaMapresent = false; // Detect litematica mod public static boolean isWhereIsIt = false; // Utility for ChestTracker for render 3d text @Override @@ -45,11 +43,9 @@ public void onLoad(String mixinPackage) { isZewo2 = loader.isModLoaded("zewo2"); isBaritonePresent = loader.isModLoaded("baritone-meteor") || loader.isModLoaded("baritone"); - isJourneyMapPresent = loader.isModLoaded("journeymap"); isXaeroWorldMapresent = loader.isModLoaded("xaeroworldmap"); isXaeroMiniMapresent = loader.isModLoaded("xaerominimap"); isXaeroPlusMapresent = loader.isModLoaded("xaeroplus"); - isLitematicaMapresent = loader.isModLoaded("litematica"); isWhereIsIt = loader.isModLoaded("whereisit"); } @@ -69,9 +65,6 @@ else if (mixinClassName.startsWith(mixinPackageMeteorPlus + ".meteorclient")) { } return isMeteorClient; } - else if (mixinClassName.startsWith(mixinPackageMeteorPlus + ".journeymap")) { - return isBaritonePresent && isJourneyMapPresent && isMeteorClient; - } else if (mixinClassName.startsWith(mixinPackageMeteorPlus + ".xaero.worldmap")) { return isBaritonePresent && isXaeroWorldMapresent && isMeteorClient; } diff --git a/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java b/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java index 18aaa6f..2fe1cef 100644 --- a/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java +++ b/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java @@ -77,17 +77,6 @@ public void onInitialize() { else { notFoundIntegrations.add("Xaero's World Map"); } - if (isJourneyMapPresent) { - if (!isBaritonePresent) { - notFoundBaritoneIntegrations.add("Journey Map"); - } - else { - enabledIntegrations.add("Journey Map"); - } - } - else { - notFoundIntegrations.add("Journey Map"); - } if (!isWhereIsIt) { notFoundIntegrations.add("Where is it"); @@ -185,7 +174,7 @@ public void onInitialize() { } modules.add(new NoSlowPlus()); if (isBaritonePresent) { - if (isXaeroWorldMapresent || isJourneyMapPresent) { + if (isXaeroWorldMapresent) { modules.add(new MapIntegration()); } } @@ -210,8 +199,6 @@ public void onInitialize() { public void onRegisterCategories() { LOG.info(METEOR_LOGPREFIX + " registering categories..."); if (isXaeroWorldMapresent || - isJourneyMapPresent || - MixinPlugin.isLitematicaMapresent || MixinPlugin.isWhereIsIt ) { Modules.registerCategory(CATEGORYMODS); diff --git a/src/main/java/nekiplay/meteorplus/features/modules/combat/TriggerBot.java b/src/main/java/nekiplay/meteorplus/features/modules/combat/TriggerBot.java index 33c3d0e..a06395d 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/combat/TriggerBot.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/combat/TriggerBot.java @@ -109,7 +109,7 @@ private boolean entityCheck(Entity entity) { if ((entity instanceof LivingEntity && ((LivingEntity) entity).isDead()) || !entity.isAlive()) return false; if (!entities.get().contains(entity.getType())) return false; if (entity instanceof Tameable tameable - && tameable.getOwner().getUuid() != null + && tameable.getOwner() != null && tameable.getOwner().getUuid().equals(mc.player.getUuid())) return false; if (entity instanceof PlayerEntity player) { if (player.isCreative()) return false; diff --git a/src/main/java/nekiplay/meteorplus/features/modules/combat/criticals/CriticalsPlus.java b/src/main/java/nekiplay/meteorplus/features/modules/combat/criticals/CriticalsPlus.java index 047865a..82711b6 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/combat/criticals/CriticalsPlus.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/combat/criticals/CriticalsPlus.java @@ -27,9 +27,8 @@ public static boolean skipCrit() { public static boolean allowCrit() { if (canCrit()) { return true; - } - else if (Modules.get().get(Criticals.class).isActive()) { - return !skipCrit(); + } else if (Modules.get().isActive(Criticals.class)) { + return !skipCrit(); } return false; } diff --git a/src/main/java/nekiplay/meteorplus/mixin/minecraft/entity/ShulkerEntityAccessor.java b/src/main/java/nekiplay/meteorplus/mixin/minecraft/entity/ShulkerEntityAccessor.java deleted file mode 100644 index a597327..0000000 --- a/src/main/java/nekiplay/meteorplus/mixin/minecraft/entity/ShulkerEntityAccessor.java +++ /dev/null @@ -1,14 +0,0 @@ -package nekiplay.meteorplus.mixin.minecraft.entity; - -import net.minecraft.entity.mob.ShulkerEntity; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -@Mixin(ShulkerEntity.class) -public interface ShulkerEntityAccessor { - @Invoker("getPeekAmount") - int getPeekAmount(); - - @Invoker("isClosed") - boolean isClosed(); -} diff --git a/src/main/resources/meteorplus.mixins.json b/src/main/resources/meteorplus.mixins.json index dc6880d..6085486 100644 --- a/src/main/resources/meteorplus.mixins.json +++ b/src/main/resources/meteorplus.mixins.json @@ -20,7 +20,6 @@ "meteorclient.modules.WaypointsModuleMixin", "minecraft.ClientConnectionAccessor", "minecraft.ShapelessRecipeAccessor", - "minecraft.entity.ShulkerEntityAccessor", "minecraft.hud.DebugHudMixin", "minecraft.hud.InGameHudMixin" ],