From 31665f191a5f69141f6c025903e73fabd8a87cd4 Mon Sep 17 00:00:00 2001 From: Emma Waffle Date: Wed, 9 Mar 2022 20:17:12 -0500 Subject: [PATCH] Release v3.0.0 --- .../frydae/emcutils/mixins/ConnectScreenMixin.java | 2 +- fabric/build.gradle | 6 ++++++ gradle.properties | 12 ++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/dev/frydae/emcutils/mixins/ConnectScreenMixin.java b/common/src/main/java/dev/frydae/emcutils/mixins/ConnectScreenMixin.java index 5ddafea..cf4c004 100644 --- a/common/src/main/java/dev/frydae/emcutils/mixins/ConnectScreenMixin.java +++ b/common/src/main/java/dev/frydae/emcutils/mixins/ConnectScreenMixin.java @@ -14,6 +14,6 @@ public abstract class ConnectScreenMixin { @Inject(method = "connect(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/network/ServerAddress;)V", at = @At(value = "HEAD")) public void onConnect(MinecraftClient client, ServerAddress address, CallbackInfo ci) { Util.setServerAddress(String.valueOf(address)); - Util.isOnEMC = address.getAddress().matches(".*.emc.gs?."); + Util.isOnEMC = address.getAddress().matches("(.*\\.)?(emc\\.gs|empire\\.us|empireminecraft\\.com)"); } } diff --git a/fabric/build.gradle b/fabric/build.gradle index b80fbee..50dd550 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -89,6 +89,7 @@ components.java { } } +import com.modrinth.minotaur.dependencies.ModDependency modrinth { projectId = "QYTT62S0" versionNumber = rootProject.mod_version + "+fabric" @@ -97,6 +98,11 @@ modrinth { uploadFile = remapJar gameVersions = ["1.18.2"] loaders = ["fabric"] + dependencies = [ + new ModDependency("P7dR8mSH", "required"), // FAPI + new ModDependency("codAaoxh", "required"), // MidnightLib + new ModDependency("mOgUt4GM", "optional"), // Mod Menu + ] } publishing { diff --git a/gradle.properties b/gradle.properties index 735aa76..d4ff909 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,19 +5,19 @@ org.gradle.parallel=true mc_version=1.18.2 mod_version=3.0.0 -release_title= +release_title=Update to 1.18.2 changeLog= # https://fabricmc.net/develop -yarn_mappings=1 +yarn_mappings=2 loader_version=0.13.3 -fabric_version=0.47.8+1.18.2 +fabric_version=0.47.10+1.18.2 # https://files.minecraftforge.net/ -forge_version=40.0.1 +forge_version=40.0.12 # https://maven.shedaniel.me/dev/architectury/architectury/ -architectury_version=4.0.27 +architectury_version=4.0.30 # https://modrinth.com/mod/midnightlib/versions midnightlib_version=0.4.0 @@ -26,7 +26,7 @@ midnightlib_version=0.4.0 modmenu_version=3.1.0 # https://www.curseforge.com/minecraft/mc-mods/config-menus-forge/files/all -config_menus_version=3570070 +config_menus_version=3671318 # https://www.curseforge.com/minecraft/mc-mods/voxelmap/files/all # voxel_version=3345206