Updated Via API usage

ViaVersion · Dec 27, 2023 · b58a74a · b58a74a
1 parent 5c2e9c3
commit b58a74a
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 126 deletions.
diff --git a/...afabricplus/injection/mixin/fixes/minecraft/entity/MixinLockableContainerBlockEntity.java b/...afabricplus/injection/mixin/fixes/minecraft/entity/MixinLockableContainerBlockEntity.java
diff --git a/.../florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinChatItemRewriter.java b/.../florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinChatItemRewriter.java
@@ -20,8 +20,8 @@
 package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.libs.mcstructs.snbt.SNbtSerializer;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ChatItemRewriter;
-import net.lenni0451.mcstructs.snbt.SNbtSerializer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;

diff --git a/...lorianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinComponentConverter.java b/...lorianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinComponentConverter.java
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/impl/DebugSettings.java b/src/main/java/de/florianmichael/viafabricplus/settings/impl/DebugSettings.java
@@ -40,7 +40,6 @@ public class DebugSettings extends SettingGroup {
     // 1.13 -> 1.12.2
     public final VersionedBooleanSetting executeInputsInSync = new VersionedBooleanSetting(this, Text.translatable("debug_settings.viafabricplus.execute_inputs_in_sync"), VersionRange.andOlder(VersionEnum.r1_12_2));
     public final VersionedBooleanSetting sneakInstant = new VersionedBooleanSetting(this, Text.translatable("debug_settings.viafabricplus.sneak_instant"), VersionRange.of(VersionEnum.r1_8, VersionEnum.r1_12_2));
-    public final VersionedBooleanSetting skipContainersWithCustomDisplayNames = new VersionedBooleanSetting(this, Text.translatable("debug_settings.viafabricplus.skip_containers_with_custom_display_names"), VersionRange.andOlder(VersionEnum.r1_12_2));
 
     // 1.12 -> 1.11.1-1.11.2
     public final VersionedBooleanSetting sendOpenInventoryPacket = new VersionedBooleanSetting(this, Text.translatable("debug_settings.viafabricplus.send_open_inventory_packet"), VersionRange.andOlder(VersionEnum.r1_11_1to1_11_2));

diff --git a/src/main/resources/assets/viafabricplus/lang/en_us.json b/src/main/resources/assets/viafabricplus/lang/en_us.json
@@ -59,7 +59,6 @@
   "debug_settings.viafabricplus.replace_sneaking": "Replace sneaking",
   "debug_settings.viafabricplus.long_sneaking": "Long sneaking",
   "debug_settings.viafabricplus.legacy_mining_speeds": "Legacy mining speeds",
-  "debug_settings.viafabricplus.skip_containers_with_custom_display_names": "Skip containers with custom display names",
   "debug_settings.viafabricplus.prevent_entity_cramming": "Prevent entity cramming",
   "debug_settings.viafabricplus.always_tick_client_player": "Always tick client player",
 

diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
@@ -102,7 +102,6 @@
     "fixes.minecraft.entity.MixinEntityRenderDispatcher",
     "fixes.minecraft.entity.MixinItemEntity",
     "fixes.minecraft.entity.MixinLivingEntity",
-    "fixes.minecraft.entity.MixinLockableContainerBlockEntity",
     "fixes.minecraft.entity.MixinOtherClientPlayerEntity",
     "fixes.minecraft.entity.MixinPlayerEntity",
     "fixes.minecraft.entity.MixinPlayerEntityRenderer",
@@ -171,7 +170,6 @@
     "fixes.viaversion.MixinChatItemRewriter",
     "fixes.viaversion.MixinCommandBlockProvider",
     "fixes.viaversion.MixinCommonBoss",
-    "fixes.viaversion.MixinComponentConverter",
     "fixes.viaversion.MixinEntityIdRewriter",
     "fixes.viaversion.MixinEntityPackets1_17",
     "fixes.viaversion.MixinEntityPackets1_19_4",