Remove Expanded Storage compatibility

Expanded Storage was removed from modrinth, which makes it impossible to use modrinths maven to maintain this compatibility
DrexHD · Feb 10, 2024 · 5f64553 · 5f64553
1 parent 0b645db
commit 5f64553
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Tatar Translation (Thanks to Amirhan-Taipovjan-Greatest-I)
 - Prevent raid spawning
 
+### Removed
+- Expanded Storage compatibility
+
 ## [1.5.1] - 2024-01-17
 ### Added
 - `vanish_on_join` meta key

diff --git a/README.md b/README.md
@@ -21,7 +21,6 @@
 - Bluemap support
 - Dynmap support
 - Hide sleep status
-- Expanded Storage compatibility
 - Exclude vanished players from player count
 - Prevents block interactions (pressure plates, dripleaf, tripwire, farmland, redstone ore, sculk sensor/shrieker and turtle egg)
 - Prevents player vibrations (sculk sensor/shrieker and warden)

diff --git a/build.gradle b/build.gradle
@@ -44,9 +44,7 @@ dependencies {
     implementation shadow("org.spongepowered:configurate-hocon:${project.configurate_hocon_version}")
 
     // Mod compat
-
     modCompileOnly "maven.modrinth:styled-chat:${project.styled_chat_version}"
-    modCompileOnly "maven.modrinth:expanded-storage:${project.expanded_storage_version}"
     compileOnly "com.github.BlueMap-Minecraft:BlueMapAPI:${project.bluemap_api_version}"
     compileOnly "us.dynmap:DynmapCoreAPI:${project.dynmap_api_version}"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,6 @@ player_data_api_version=0.2.2+1.19.3
 translations_version=2.0.0+1.20
 configurate_hocon_version=4.1.2
 # Compat
-expanded_storage_version=12.0.0
 bluemap_api_version=v2.5.1
 styled_chat_version=2.2.3+1.20.1
 dynmap_api_version=3.5
diff --git a/src/main/java/me/drex/vanish/mixin/compat/expandedstorage/ContainerMixin.java b/src/main/java/me/drex/vanish/mixin/compat/expandedstorage/ContainerMixin.java
diff --git a/src/main/java/me/drex/vanish/util/VanishMixinConfigPlugin.java b/src/main/java/me/drex/vanish/util/VanishMixinConfigPlugin.java
@@ -1,6 +1,5 @@
 package me.drex.vanish.util;
 
-import net.fabricmc.loader.api.FabricLoader;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
@@ -10,8 +9,6 @@
 
 public class VanishMixinConfigPlugin implements IMixinConfigPlugin {
 
-    public static final boolean EXPANDED_STORAGE = FabricLoader.getInstance().isModLoaded("expandedstorage");
-
     @Override
     public void onLoad(String mixinPackage) {
 
@@ -24,7 +21,7 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        return EXPANDED_STORAGE || !mixinClassName.startsWith("me.drex.vanish.mixin.compat.expandedstorage");
+        return true;
     }
 
     @Override

diff --git a/src/main/resources/vanish.mixins.json b/src/main/resources/vanish.mixins.json
@@ -27,7 +27,6 @@
     "SleepStatusMixin",
     "VanishedServerPlayerMixin",
     "WardenMixin",
-    "compat.expandedstorage.ContainerMixin",
     "interaction.ChunkMapMixin",
     "interaction.FallOnBlockMixin",
     "interaction.InsideBlockMixin",