From 54494b4362261279748031a30a268d3fdd8b6858 Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Sun, 5 Mar 2023 20:34:51 +0100
Subject: [PATCH] Huge update: include all licenses into the jar file added old
 chest model and bounding box in <= b1.7.3 added old furnace bounding box in
 <= b1.8.1 refactored license management cleaned up some mixin classes added
 old hurt sound in <= b1.7.3

---
 LICENSE_GENERAL_MIT                           |  21 +++++++
 build.gradle                                  |   6 +-
 gradle.properties                             |   4 +-
 .../definition/LegacySounds.java              |  10 ++++
 .../c0_30/ClassicWorldHeightInjection.java    |   2 +-
 .../{visual => }/MixinBipedEntityModel.java   |   2 +-
 .../fixes/MixinChestBlockEntityRenderer.java  |  25 ++++++++
 .../fixes/MixinClientPlayNetworkHandler.java  |   6 ++
 .../fixes/{visual => }/MixinItemRenderer.java |   2 +-
 .../mixin/fixes/block/MixinChestBlock.java    |  39 +++++++++++++
 .../mixin/fixes/block/MixinFenceBlock.java    |  24 +++++++-
 .../fixes/entity/MixinClientPlayerEntity.java |  10 ++++
 .../mixin/fixes/entity/MixinPlayerEntity.java |  12 ++++
 .../mixin/fixes/item/MixinBlockItem.java      |   2 +-
 .../fixes/item/MixinHeldItemRenderer.java     |   2 +-
 .../fixes/item/MixinItemPlacementContext.java |   2 +-
 .../mixin/fixes/item/MixinSwordItem.java      |   2 +-
 .../mixin/fixes/screen/MixinChatScreen.java   |  12 ++++
 .../MixinCommandBlockScreen.java              |   2 +-
 .../MixinCreativeInventoryScreen.java         |   2 +-
 .../MixinJigsawBlockScreen.java               |   2 +-
 .../{visual => screen/hud}/MixinChatHud.java  |   2 +-
 .../viaversion/MixinProtocolVersion.java      |   2 +-
 .../MixinChatItemRewriter.java                |   2 +-
 .../MixinWorldPackets1_13.java                |   2 +-
 .../MixinWorldPackets_2.java                  |   2 +-
 .../MixinEntityPackets1_17.java               |   2 +-
 .../MixinWorldPackets1_17.java                |   2 +-
 .../MixinProtocol1_18_2To1_18.java            |   2 +-
 .../protocol1_9to1_8/MixinChunk1_8Type.java   |   2 +-
 .../MixinEntityPackets_6_1.java               |   2 +-
 .../MixinEntityTracker1_9.java                |   2 +-
 .../MixinMetadataRewriter1_9To1_8.java        |   2 +-
 .../mixin/fixes/visual/MixinChatScreen.java   |  21 -------
 .../visual/MixinClientPlayNetworkHandler.java |  17 ------
 .../fixes/visual/MixinClientPlayerEntity.java |  25 --------
 .../settings/groups/VisualSettings.java       |   3 +
 .../assets/minecraft/blockstates/chest.json   |  55 ++++++++++++++++++
 .../models/block/chest_left.json              |  24 ++++++++
 .../models/block/chest_right.json             |  24 ++++++++
 .../models/block/chest_single.json            |  23 ++++++++
 .../assets/viafabricplus/sounds.json          |   7 +++
 .../viafabricplus/sounds/random/hurt.ogg      | Bin 0 -> 11499 bytes
 .../textures/block/chest_end.png              | Bin 0 -> 332 bytes
 .../textures/block/chest_left_back.png        | Bin 0 -> 378 bytes
 .../textures/block/chest_left_front.png       | Bin 0 -> 399 bytes
 .../textures/block/chest_right_back.png       | Bin 0 -> 358 bytes
 .../textures/block/chest_right_front.png      | Bin 0 -> 415 bytes
 .../textures/block/chest_single_front.png     | Bin 0 -> 452 bytes
 .../textures/block/chest_single_side.png      | Bin 0 -> 387 bytes
 src/main/resources/viafabricplus.mixins.json  |  16 ++---
 51 files changed, 329 insertions(+), 99 deletions(-)
 create mode 100644 LICENSE_GENERAL_MIT
 create mode 100644 src/main/java/de/florianmichael/viafabricplus/definition/LegacySounds.java
 rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{visual => }/MixinBipedEntityModel.java (95%)
 create mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinChestBlockEntityRenderer.java
 rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{visual => }/MixinItemRenderer.java (94%)
 create mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinChestBlock.java
 rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{visual => screen}/MixinCommandBlockScreen.java (94%)
 rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{visual => screen}/MixinCreativeInventoryScreen.java (92%)
 rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{visual => screen}/MixinJigsawBlockScreen.java (96%)
 rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{visual => screen/hud}/MixinChatHud.java (92%)
 delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinChatScreen.java
 delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinClientPlayNetworkHandler.java
 delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinClientPlayerEntity.java
 create mode 100644 src/main/resources/assets/minecraft/blockstates/chest.json
 create mode 100644 src/main/resources/assets/viafabricplus/models/block/chest_left.json
 create mode 100644 src/main/resources/assets/viafabricplus/models/block/chest_right.json
 create mode 100644 src/main/resources/assets/viafabricplus/models/block/chest_single.json
 create mode 100644 src/main/resources/assets/viafabricplus/sounds.json
 create mode 100644 src/main/resources/assets/viafabricplus/sounds/random/hurt.ogg
 create mode 100644 src/main/resources/assets/viafabricplus/textures/block/chest_end.png
 create mode 100644 src/main/resources/assets/viafabricplus/textures/block/chest_left_back.png
 create mode 100644 src/main/resources/assets/viafabricplus/textures/block/chest_left_front.png
 create mode 100644 src/main/resources/assets/viafabricplus/textures/block/chest_right_back.png
 create mode 100644 src/main/resources/assets/viafabricplus/textures/block/chest_right_front.png
 create mode 100644 src/main/resources/assets/viafabricplus/textures/block/chest_single_front.png
 create mode 100644 src/main/resources/assets/viafabricplus/textures/block/chest_single_side.png

diff --git a/LICENSE_GENERAL_MIT b/LICENSE_GENERAL_MIT
new file mode 100644
index 00000000..4dac4292
--- /dev/null
+++ b/LICENSE_GENERAL_MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2023
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/build.gradle b/build.gradle
index f6715ba7..fb45dcab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -85,7 +85,7 @@ jar {
 	} {
 		exclude "META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA"
 	}
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}" }
-	}
+	from("LICENSE") { rename { "${it}_${project.archivesBaseName}" } }
+	from("LICENSE_multiconnect") { rename { "${it}_${project.archivesBaseName}" } }
+	from("LICENSE_GENERAL_MIT") { rename { "${it}_${project.archivesBaseName}" } }
 }
diff --git a/gradle.properties b/gradle.properties
index 7a529739..e5db0fcc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ yarn_mappings=1.19.3+build.5
 loader_version=0.14.14
 
 # viafabricplus
-mod_version=1.6.1
+mod_version=1.7.1
 maven_group=de.florianmichael
 archives_base_name=viafabricplus
 
@@ -22,7 +22,7 @@ snake_yml_version=2.0
 
 # raphimc libs
 vialegacy_version=2.2.8
-viaaprilfools_version=2.0.5
+viaaprilfools_version=2.0.6
 
 # lenni0451 libs
 mcstructs_text_version=2.2.0
diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/LegacySounds.java b/src/main/java/de/florianmichael/viafabricplus/definition/LegacySounds.java
new file mode 100644
index 00000000..69d8b810
--- /dev/null
+++ b/src/main/java/de/florianmichael/viafabricplus/definition/LegacySounds.java
@@ -0,0 +1,10 @@
+package de.florianmichael.viafabricplus.definition;
+
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.Identifier;
+
+public class LegacySounds {
+
+    public static final Identifier RANDOM_HURT_ID = new Identifier("viafabricplus", "random.hurt");
+    public static final SoundEvent RANDOM_HURT = SoundEvent.of(RANDOM_HURT_ID);
+}
diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/ClassicWorldHeightInjection.java b/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/ClassicWorldHeightInjection.java
index b71d1f7f..06f6a64f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/ClassicWorldHeightInjection.java
+++ b/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/ClassicWorldHeightInjection.java
@@ -23,7 +23,7 @@ import java.util.BitSet;
 import java.util.List;
 
 @SuppressWarnings("DataFlowIssue")
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 public class ClassicWorldHeightInjection {
 
     public static PacketHandler handleJoinGame(final PacketHandler parentRemapper) {
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinBipedEntityModel.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinBipedEntityModel.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinBipedEntityModel.java
rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinBipedEntityModel.java
index 08c2bdd7..81b7c33c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinBipedEntityModel.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinBipedEntityModel.java
@@ -1,4 +1,4 @@
-package de.florianmichael.viafabricplus.injection.mixin.fixes.visual;
+package de.florianmichael.viafabricplus.injection.mixin.fixes;
 
 import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
 import net.minecraft.client.model.ModelPart;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinChestBlockEntityRenderer.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinChestBlockEntityRenderer.java
new file mode 100644
index 00000000..e5055d96
--- /dev/null
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinChestBlockEntityRenderer.java
@@ -0,0 +1,25 @@
+package de.florianmichael.viafabricplus.injection.mixin.fixes;
+
+import de.florianmichael.vialoadingbase.ViaLoadingBase;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.LidOpenable;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.block.entity.ChestBlockEntityRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.raphimc.vialegacy.api.LegacyProtocolVersion;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+// Copyright Gaming32 - LICENSE_GENERAL_MIT file
+@Mixin(ChestBlockEntityRenderer.class)
+public class MixinChestBlockEntityRenderer<T extends BlockEntity & LidOpenable> {
+
+    @Inject(method = "render(Lnet/minecraft/block/entity/BlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;II)V", at = @At("HEAD"), cancellable = true)
+    public void dontRender(T entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, CallbackInfo ci) {
+        if (tickDelta != 0 && ViaLoadingBase.getClassWrapper().getTargetVersion().isOlderThanOrEqualTo(LegacyProtocolVersion.b1_7tob1_7_3)) {
+            ci.cancel();
+        }
+    }
+}
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinClientPlayNetworkHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinClientPlayNetworkHandler.java
index d6c98150..e0fbffd3 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinClientPlayNetworkHandler.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinClientPlayNetworkHandler.java
@@ -2,6 +2,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes;
 
 import com.mojang.authlib.GameProfile;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
 import de.florianmichael.vialoadingbase.ViaLoadingBase;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.DownloadingTerrainScreen;
@@ -127,4 +128,9 @@ public abstract class MixinClientPlayNetworkHandler {
             instance.warn(s, o);
         }
     }
+
+    @Redirect(method = "onServerMetadata", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket;isSecureChatEnforced()Z"))
+    public boolean removeSecureChatWarning(ServerMetadataS2CPacket instance) {
+        return instance.isSecureChatEnforced() || VisualSettings.getClassWrapper().disableSecureChatWarning.getValue();
+    }
 }
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinItemRenderer.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinItemRenderer.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinItemRenderer.java
rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinItemRenderer.java
index c9a54683..6d123d43 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinItemRenderer.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinItemRenderer.java
@@ -1,4 +1,4 @@
-package de.florianmichael.viafabricplus.injection.mixin.fixes.visual;
+package de.florianmichael.viafabricplus.injection.mixin.fixes;
 
 import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
 import net.minecraft.client.render.item.ItemModels;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinChestBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinChestBlock.java
new file mode 100644
index 00000000..49d2e165
--- /dev/null
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinChestBlock.java
@@ -0,0 +1,39 @@
+package de.florianmichael.viafabricplus.injection.mixin.fixes.block;
+
+import de.florianmichael.vialoadingbase.ViaLoadingBase;
+import net.minecraft.block.*;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.block.entity.ChestBlockEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import net.raphimc.vialegacy.api.LegacyProtocolVersion;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.function.Supplier;
+
+@Mixin(ChestBlock.class)
+public abstract class MixinChestBlock extends AbstractChestBlock<ChestBlockEntity> {
+
+    protected MixinChestBlock(Settings settings, Supplier<BlockEntityType<? extends ChestBlockEntity>> blockEntityTypeSupplier) {
+        super(settings, blockEntityTypeSupplier);
+    }
+
+    @Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true)
+    public void changeShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) {
+        if (ViaLoadingBase.getClassWrapper().getTargetVersion().isOlderThanOrEqualTo(LegacyProtocolVersion.r1_4_2)) {
+            cir.setReturnValue(VoxelShapes.fullCube());
+        }
+    }
+
+    @Inject(method = "getRenderType", at = @At("HEAD"), cancellable = true)
+    public void changeRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir) {
+        if (ViaLoadingBase.getClassWrapper().getTargetVersion().isOlderThanOrEqualTo(LegacyProtocolVersion.b1_7tob1_7_3)) {
+            cir.setReturnValue(BlockRenderType.MODEL);
+        }
+    }
+}
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFenceBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFenceBlock.java
index 310c9d2a..d856125c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFenceBlock.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFenceBlock.java
@@ -2,15 +2,24 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import de.florianmichael.vialoadingbase.ViaLoadingBase;
-import net.minecraft.block.FenceBlock;
+import net.minecraft.block.*;
 import net.minecraft.util.ActionResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
+import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(FenceBlock.class)
-public class MixinFenceBlock {
+public class MixinFenceBlock extends HorizontalConnectingBlock {
+
+    protected MixinFenceBlock(float radius1, float radius2, float boundingHeight1, float boundingHeight2, float collisionHeight, Settings settings) {
+        super(radius1, radius2, boundingHeight1, boundingHeight2, collisionHeight, settings);
+    }
 
     @Inject(method = "onUse", at = @At("HEAD"), cancellable = true)
     private void injectOnUse(CallbackInfoReturnable<ActionResult> ci) {
@@ -18,4 +27,15 @@ public class MixinFenceBlock {
             ci.setReturnValue(ActionResult.SUCCESS);
         }
     }
+
+    @Unique
+    private static final VoxelShape viafabricplus_fence_shape_b1_8_1 = Block.createCuboidShape(0, 0, 0, 16, 32, 16);
+
+    @Override
+    public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+        if (ViaLoadingBase.getClassWrapper().getTargetVersion().isOlderThan(LegacyProtocolVersion.r1_0_0tor1_0_1)) {
+            return viafabricplus_fence_shape_b1_8_1;
+        }
+        return super.getCollisionShape(state, world, pos, context);
+    }
 }
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinClientPlayerEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinClientPlayerEntity.java
index a24228c5..d75ebdb6 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinClientPlayerEntity.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinClientPlayerEntity.java
@@ -2,9 +2,11 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.entity;
 
 import com.mojang.authlib.GameProfile;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import de.florianmichael.viafabricplus.definition.v1_8_x.ArmorPointsDefinition;
 import de.florianmichael.viafabricplus.definition.v1_8_x.IdlePacketExecutor;
 import de.florianmichael.viafabricplus.injection.access.IClientPlayerEntity;
 import de.florianmichael.viafabricplus.settings.groups.DebugSettings;
+import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
 import de.florianmichael.vialoadingbase.ViaLoadingBase;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.input.Input;
@@ -186,6 +188,14 @@ public abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity
         }
     }
 
+    @Override
+    public int getArmor() {
+        if (VisualSettings.getClassWrapper().emulateArmorHud.getValue()) {
+            return ArmorPointsDefinition.sum();
+        }
+        return super.getArmor();
+    }
+
     @Override
     public void viafabricplus_cancelSwingOnce() {
         protocolhack_areSwingCanceledThisTick = true;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinPlayerEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinPlayerEntity.java
index 88af00fc..01ad8a96 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinPlayerEntity.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinPlayerEntity.java
@@ -1,13 +1,17 @@
 package de.florianmichael.viafabricplus.injection.mixin.fixes.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import de.florianmichael.viafabricplus.definition.LegacySounds;
+import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
 import de.florianmichael.vialoadingbase.ViaLoadingBase;
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityPose;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.player.PlayerAbilities;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.sound.SoundEvent;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -80,4 +84,12 @@ public abstract class MixinPlayerEntity extends LivingEntity {
             ci.setReturnValue(1f);
         }
     }
+
+    // Copyright Gaming32 - LICENSE_GENERAL_MIT file
+    @Inject(method = "getHurtSound", at = @At("HEAD"), cancellable = true)
+    public void replaceSound(DamageSource source, CallbackInfoReturnable<SoundEvent> cir) {
+        if (VisualSettings.getClassWrapper().replaceHurtSoundWithOOFSound.getValue()) {
+            cir.setReturnValue(LegacySounds.RANDOM_HURT);
+        }
+    }
 }
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinBlockItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinBlockItem.java
index e19e63bc..6c78bda0 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinBlockItem.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinBlockItem.java
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-// Copyright Earthcomputer - MIT LICENSE
+// Copyright (c) 2019 Joseph Burton (Earthcomputer) - LICENSE_multiconnect file
 @Mixin(BlockItem.class)
 public class MixinBlockItem {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinHeldItemRenderer.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinHeldItemRenderer.java
index 0d47b5ed..ee4baaed 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinHeldItemRenderer.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinHeldItemRenderer.java
@@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-// Copyright Earthcomputer - MIT LICENSE
+// Copyright (c) 2019 Joseph Burton (Earthcomputer) - LICENSE_multiconnect file
 @Mixin(HeldItemRenderer.class)
 public class MixinHeldItemRenderer {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemPlacementContext.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemPlacementContext.java
index 37ed4122..6269a4c9 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemPlacementContext.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemPlacementContext.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-// Copyright Earthcomputer - MIT LICENSE
+// Copyright (c) 2019 Joseph Burton (Earthcomputer) - LICENSE_multiconnect file
 @Mixin(ItemPlacementContext.class)
 public class MixinItemPlacementContext {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinSwordItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinSwordItem.java
index 6cec9f63..e0df621b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinSwordItem.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinSwordItem.java
@@ -13,7 +13,7 @@ import net.minecraft.util.UseAction;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 
-// Copyright Earthcomputer - MIT LICENSE
+// Copyright (c) 2019 Joseph Burton (Earthcomputer) - LICENSE_multiconnect file
 @Mixin(SwordItem.class)
 public class MixinSwordItem extends ToolItem {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinChatScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinChatScreen.java
index f9ba7f7a..0fd0df6d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinChatScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinChatScreen.java
@@ -1,12 +1,16 @@
 package de.florianmichael.viafabricplus.injection.mixin.fixes.screen;
 
 import de.florianmichael.viafabricplus.definition.ChatLengthDefinition;
+import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
+import net.minecraft.client.gui.hud.ChatHud;
+import net.minecraft.client.gui.hud.MessageIndicator;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ChatScreen.class)
@@ -18,4 +22,12 @@ public class MixinChatScreen {
     public void changeChatLength(CallbackInfo ci) {
         this.chatField.setMaxLength(ChatLengthDefinition.getMaxLength());
     }
+
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/ChatHud;getIndicatorAt(DD)Lnet/minecraft/client/gui/hud/MessageIndicator;"))
+    public MessageIndicator removeIndicator(ChatHud instance, double mouseX, double mouseY) {
+        if (VisualSettings.getClassWrapper().hideSignatureIndicator.getValue()) {
+            return null;
+        }
+        return instance.getIndicatorAt(mouseX, mouseY);
+    }
 }
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinCommandBlockScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCommandBlockScreen.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinCommandBlockScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCommandBlockScreen.java
index b41c72ad..8273886b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinCommandBlockScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCommandBlockScreen.java
@@ -1,4 +1,4 @@
-package de.florianmichael.viafabricplus.injection.mixin.fixes.visual;
+package de.florianmichael.viafabricplus.injection.mixin.fixes.screen;
 
 import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
 import net.minecraft.block.entity.CommandBlockBlockEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinCreativeInventoryScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCreativeInventoryScreen.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinCreativeInventoryScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCreativeInventoryScreen.java
index 24cc6e4b..3f615479 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinCreativeInventoryScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCreativeInventoryScreen.java
@@ -1,4 +1,4 @@
-package de.florianmichael.viafabricplus.injection.mixin.fixes.visual;
+package de.florianmichael.viafabricplus.injection.mixin.fixes.screen;
 
 import de.florianmichael.viafabricplus.definition.c0_30.ClassicItemSelectionScreen;
 import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinJigsawBlockScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinJigsawBlockScreen.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinJigsawBlockScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinJigsawBlockScreen.java
index 74f7e6ad..c98dadbc 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinJigsawBlockScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinJigsawBlockScreen.java
@@ -1,4 +1,4 @@
-package de.florianmichael.viafabricplus.injection.mixin.fixes.visual;
+package de.florianmichael.viafabricplus.injection.mixin.fixes.screen;
 
 import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
 import net.minecraft.block.entity.JigsawBlockEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinChatHud.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/hud/MixinChatHud.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinChatHud.java
rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/hud/MixinChatHud.java
index 19c16586..8c7c47ac 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinChatHud.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/hud/MixinChatHud.java
@@ -1,4 +1,4 @@
-package de.florianmichael.viafabricplus.injection.mixin.fixes.visual;
+package de.florianmichael.viafabricplus.injection.mixin.fixes.screen.hud;
 
 import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
 import net.minecraft.client.gui.hud.ChatHud;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocolVersion.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocolVersion.java
index 93044d82..fc996c22 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocolVersion.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocolVersion.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.HashMap;
 import java.util.Map;
 
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(value = ProtocolVersion.class, remap = false)
 public abstract class MixinProtocolVersion {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinChatItemRewriter.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinChatItemRewriter.java
index 42924c61..37a3b315 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinChatItemRewriter.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinChatItemRewriter.java
@@ -13,7 +13,7 @@ import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(value = ChatItemRewriter.class, remap = false)
 public abstract class MixinChatItemRewriter {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinWorldPackets1_13.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinWorldPackets1_13.java
index 8e7cd479..e2aabad4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinWorldPackets1_13.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinWorldPackets1_13.java
@@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(value = WorldPackets.class, remap = false)
 public abstract class MixinWorldPackets1_13 {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16_2to1_16_1/MixinWorldPackets_2.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16_2to1_16_1/MixinWorldPackets_2.java
index a1c4474e..a3093bf7 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16_2to1_16_1/MixinWorldPackets_2.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16_2to1_16_1/MixinWorldPackets_2.java
@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(value = WorldPackets.class, remap = false)
 public abstract class MixinWorldPackets_2 {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinEntityPackets1_17.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinEntityPackets1_17.java
index 1a807b43..9144234c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinEntityPackets1_17.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinEntityPackets1_17.java
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(value = EntityPackets.class, remap = false)
 public abstract class MixinEntityPackets1_17 {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinWorldPackets1_17.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinWorldPackets1_17.java
index 504267f0..85354d16 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinWorldPackets1_17.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinWorldPackets1_17.java
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(value = WorldPackets.class, remap = false)
 public abstract class MixinWorldPackets1_17 {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_18_2to1_18/MixinProtocol1_18_2To1_18.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_18_2to1_18/MixinProtocol1_18_2To1_18.java
index f0a8c9ed..ea95cc70 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_18_2to1_18/MixinProtocol1_18_2To1_18.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_18_2to1_18/MixinProtocol1_18_2To1_18.java
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @SuppressWarnings("DataFlowIssue")
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(value = Protocol1_18_2To1_18.class, remap = false)
 public class MixinProtocol1_18_2To1_18 extends AbstractProtocol<ClientboundPackets1_18, ClientboundPackets1_18, ServerboundPackets1_17, ServerboundPackets1_17> {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinChunk1_8Type.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinChunk1_8Type.java
index 0a5085bf..0f8ed5cc 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinChunk1_8Type.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinChunk1_8Type.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import java.util.ArrayList;
 import java.util.logging.Level;
 
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(value = Chunk1_8Type.class, remap = false)
 public abstract class MixinChunk1_8Type {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityPackets_6_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityPackets_6_1.java
index 35a1ce45..5ea8a52e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityPackets_6_1.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityPackets_6_1.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(targets = "com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.EntityPackets$6$1", remap = false)
 public abstract class MixinEntityPackets_6_1 {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityTracker1_9.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityTracker1_9.java
index 5b22fc5b..c81e694d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityTracker1_9.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityTracker1_9.java
@@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.Slice;
 
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(value = EntityTracker1_9.class, remap = false)
 public abstract class MixinEntityTracker1_9 {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinMetadataRewriter1_9To1_8.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinMetadataRewriter1_9To1_8.java
index 0114397f..0a2cd3ee 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinMetadataRewriter1_9To1_8.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinMetadataRewriter1_9To1_8.java
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.List;
 
-// Copyright RaphiMC/RK_01 - GPL v3 LICENSE
+// Copyright RaphiMC/RK_01 - LICENSE file
 @Mixin(value = MetadataRewriter1_9To1_8.class, remap = false)
 public abstract class MixinMetadataRewriter1_9To1_8 {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinChatScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinChatScreen.java
deleted file mode 100644
index acf4cc63..00000000
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinChatScreen.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.florianmichael.viafabricplus.injection.mixin.fixes.visual;
-
-import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
-import net.minecraft.client.gui.hud.ChatHud;
-import net.minecraft.client.gui.hud.MessageIndicator;
-import net.minecraft.client.gui.screen.ChatScreen;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(ChatScreen.class)
-public class MixinChatScreen {
-
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/ChatHud;getIndicatorAt(DD)Lnet/minecraft/client/gui/hud/MessageIndicator;"))
-    public MessageIndicator removeIndicator(ChatHud instance, double mouseX, double mouseY) {
-        if (VisualSettings.getClassWrapper().hideSignatureIndicator.getValue()) {
-            return null;
-        }
-        return instance.getIndicatorAt(mouseX, mouseY);
-    }
-}
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinClientPlayNetworkHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinClientPlayNetworkHandler.java
deleted file mode 100644
index c06088c5..00000000
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinClientPlayNetworkHandler.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.florianmichael.viafabricplus.injection.mixin.fixes.visual;
-
-import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.network.packet.s2c.play.ServerMetadataS2CPacket;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(ClientPlayNetworkHandler.class)
-public class MixinClientPlayNetworkHandler {
-
-    @Redirect(method = "onServerMetadata", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket;isSecureChatEnforced()Z"))
-    public boolean removeSecureChatWarning(ServerMetadataS2CPacket instance) {
-        return instance.isSecureChatEnforced() || VisualSettings.getClassWrapper().disableSecureChatWarning.getValue();
-    }
-}
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinClientPlayerEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinClientPlayerEntity.java
deleted file mode 100644
index 66ebdc97..00000000
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/visual/MixinClientPlayerEntity.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.florianmichael.viafabricplus.injection.mixin.fixes.visual;
-
-import com.mojang.authlib.GameProfile;
-import de.florianmichael.viafabricplus.definition.v1_8_x.ArmorPointsDefinition;
-import de.florianmichael.viafabricplus.settings.groups.VisualSettings;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.world.ClientWorld;
-import org.spongepowered.asm.mixin.Mixin;
-
-@Mixin(ClientPlayerEntity.class)
-public class MixinClientPlayerEntity extends AbstractClientPlayerEntity {
-
-    public MixinClientPlayerEntity(ClientWorld world, GameProfile profile) {
-        super(world, profile);
-    }
-
-    @Override
-    public int getArmor() {
-        if (VisualSettings.getClassWrapper().emulateArmorHud.getValue()) {
-            return ArmorPointsDefinition.sum();
-        }
-        return super.getArmor();
-    }
-}
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/groups/VisualSettings.java b/src/main/java/de/florianmichael/viafabricplus/settings/groups/VisualSettings.java
index 66102bbb..185df8da 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/groups/VisualSettings.java
+++ b/src/main/java/de/florianmichael/viafabricplus/settings/groups/VisualSettings.java
@@ -25,6 +25,9 @@ public class VisualSettings extends SettingGroup {
     public final ProtocolSyncBooleanSetting emulateArmorHud = new ProtocolSyncBooleanSetting(this, "Emulate Armor hud", ProtocolRange.andOlder(ProtocolVersion.v1_8));
     public final ProtocolSyncBooleanSetting removeNewerFeaturesFromCommandBlockScreen = new ProtocolSyncBooleanSetting(this, "Remove newer features from Command block screen", ProtocolRange.andOlder(ProtocolVersion.v1_8));
 
+    // r1_0_0tor1_0_1 -> b1_8tob1_8_1
+    public final ProtocolSyncBooleanSetting replaceHurtSoundWithOOFSound = new ProtocolSyncBooleanSetting(this, "Replace hurt sound with OOF sound", ProtocolRange.andOlder(LegacyProtocolVersion.b1_8tob1_8_1));
+
     // a1_0_15 -> c0_28toc0_30
     public final ProtocolSyncBooleanSetting replaceCreativeInventory = new ProtocolSyncBooleanSetting(this, "Replace creative inventory", ProtocolRange.andOlder(LegacyProtocolVersion.c0_28toc0_30));
     public final ProtocolSyncBooleanSetting oldWalkingAnimation = new ProtocolSyncBooleanSetting(this, "Old walking animation", ProtocolRange.andOlder(LegacyProtocolVersion.c0_28toc0_30));
diff --git a/src/main/resources/assets/minecraft/blockstates/chest.json b/src/main/resources/assets/minecraft/blockstates/chest.json
new file mode 100644
index 00000000..4aec7582
--- /dev/null
+++ b/src/main/resources/assets/minecraft/blockstates/chest.json
@@ -0,0 +1,55 @@
+{
+  "variants": {
+    "type=single": {
+      "model": "viafabricplus:block/chest_single"
+    },
+    "type=left,facing=south": {
+      "model": "viafabricplus:block/chest_right",
+      "rotation": {
+        "y": -90
+      }
+    },
+    "type=left,facing=east": {
+      "model": "viafabricplus:block/chest_right",
+      "rotation": {
+        "y": -90
+      }
+    },
+    "type=left,facing=north": {
+      "model": "viafabricplus:block/chest_right",
+      "rotation": {
+        "y": 180
+      }
+    },
+    "type=left,facing=west": {
+      "model": "viafabricplus:block/chest_right",
+      "rotation": {
+        "y": 90
+      }
+    },
+    "type=right,facing=south": {
+      "model": "viafabricplus:block/chest_left",
+      "rotation": {
+        "y": -90
+      }
+    },
+    "type=right,facing=east": {
+      "model": "viafabricplus:block/chest_left",
+      "rotation": {
+        "y": -90
+      }
+    },
+    "type=right,facing=north": {
+      "model": "viafabricplus:block/chest_left",
+      "rotation": {
+        "y": 180
+      }
+    },
+    "type=right,facing=west": {
+      "model": "viafabricplus:block/chest_left",
+      "rotation": {
+        "y": 90
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/viafabricplus/models/block/chest_left.json b/src/main/resources/assets/viafabricplus/models/block/chest_left.json
new file mode 100644
index 00000000..7c08e658
--- /dev/null
+++ b/src/main/resources/assets/viafabricplus/models/block/chest_left.json
@@ -0,0 +1,24 @@
+{
+	"credit": "Gaming32",
+	"textures": {
+		"0": "viafabricplus:block/chest_end",
+		"1": "viafabricplus:block/chest_left_front",
+		"2": "viafabricplus:block/chest_single_side",
+		"3": "viafabricplus:block/chest_left_back",
+		"particle": "viafabricplus:block/chest_end"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#3"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#missing"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/viafabricplus/models/block/chest_right.json b/src/main/resources/assets/viafabricplus/models/block/chest_right.json
new file mode 100644
index 00000000..f4e8971e
--- /dev/null
+++ b/src/main/resources/assets/viafabricplus/models/block/chest_right.json
@@ -0,0 +1,24 @@
+{
+	"credit": "Gaming32",
+	"textures": {
+		"0": "viafabricplus:block/chest_right_front",
+		"1": "viafabricplus:block/chest_end",
+		"2": "viafabricplus:block/chest_single_side",
+		"3": "viafabricplus:block/chest_right_back",
+		"particle": "viafabricplus:block/chest_end"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#3"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#missing"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#1"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/viafabricplus/models/block/chest_single.json b/src/main/resources/assets/viafabricplus/models/block/chest_single.json
new file mode 100644
index 00000000..2d1ef3f3
--- /dev/null
+++ b/src/main/resources/assets/viafabricplus/models/block/chest_single.json
@@ -0,0 +1,23 @@
+{
+	"credit": "Gaming32",
+	"textures": {
+		"0": "viafabricplus:block/chest_end",
+		"1": "viafabricplus:block/chest_single_front",
+		"2": "viafabricplus:block/chest_single_side",
+		"particle": "viafabricplus:block/chest_end"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/viafabricplus/sounds.json b/src/main/resources/assets/viafabricplus/sounds.json
new file mode 100644
index 00000000..ccedb447
--- /dev/null
+++ b/src/main/resources/assets/viafabricplus/sounds.json
@@ -0,0 +1,7 @@
+{
+  "random.hurt": {
+    "sounds": [
+      "viafabricplus:random/hurt"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/viafabricplus/sounds/random/hurt.ogg b/src/main/resources/assets/viafabricplus/sounds/random/hurt.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..b4cbc12e58a16844854ff57a010c336a2f154ed7
GIT binary patch
literal 11499
zcmb7pXH-<p((WE|mMkD3NE{?50VPPDArA})2$FNoN{#}Oa~6~#2@+&T3WAbzkPHHn
zvq}cVyTSLIb<X{9zwh?y=~cU`yLwkwJ>AuNG_0+)0Sw@u5-ItYpzO=}24RGFIlGzJ
zx?iy%^5uUe-!&lDL<2<QYUIDm)yON!dvbsH4W2*$SrRe->R|xIk8E9Rcs1OtnH+4*
zbg#8D!I%X3`S0<I3JP8+gJA#d%q}aZ3jy!|An1-NO?%LA0ulg70U*EpUYc)r^T}7=
z;1VTD-^eR!xm;=ZS!5$f?KKzE`SyW4cP3#ADgeL&f}nU=Zi}*8%_oesYh+q<TwPaG
zcocsMZMbCWjKMZ@@|^6J<T@iBu|75cE`$soa~LH;nK}Gl4HT7O77Z=RFzbaD)4TTz
zbTNgJNNf})Ys%t73pL?frG+U7IM0NE`(88dy!-ycQ>HLdSy0Kpnrl0lz;^+e7T3%x
z&42a%HH!%dy0RRWNZD6SKQKZ+@PmGcj7^K2ZA6e~3?ZT|B#G2f7}r7SA&rc@9ml;K
z$I~1qb*~9sNBug-+5fKBrZYi+d=~K}7HHBPXwtG+5>{A5IR;>HwIunR(aU0SE6Q<f
zwn<h`)2ySiN;0!HO7jS=yMRu_x_TR6(I<M{C(in5(si3vY@1c|zpXMh-CTeSxRzb6
z^na_88!PVh3U>pbPh}9SU2fb;?!sN}50pIQyF65TQgnLIj|u<f1kmkZk)hyL(0<UB
z{9uSeWN1uyfI>}6SZ(ZoQMD<9uj2(YggMtL%`ON}D8cl4S%N^dGzEBaM1N-jJ46<&
zFl7yA9Sn$*WUc0xQf7~}Md@U7G?r#$yAO)5=Qs?~F6X!pLVGhi@-v6C+y`MqS*X9%
zQ}S%wiqcV#N4uUw(n)Iy_Ol($!Y!SC1di1o&RQ#Jqy(v`lxz-kqt0J_*Gk<7OO0~|
z+r*c^5m7VQ_Ko;PAa!Puvp0Z$#RKR4r@_At9~sbZrc*SXxgkvcaX4m_%tg$}j2`hM
z$@v1^&_c%8I7N7As3wAz1LYBNZ8;MFgpvMd6f;NAm_;%d=eQAYl@umLbM<n*>lf_f
zzG})p4@zuTeI}J75~v-8bBm1Yn#ZEo^4#BwE8C;c69#utV1PqWe-Q;bmB}LEAr9>|
zJ|Z&QKvd+15d5d(zOxRIF^v329r{5J2J_!|z7A%jo|mJ3y60?txY3m7!leJgWbBih
z5tjOC|5g8*4q5_S!RZ=~DP}POT{)rZviN@;{10-JTq(N}>3b4cRcct(M!5%m3Tqq)
zk5DLp;i64tG(zP$Ms2ArYBVNdIfk?x_p+R>vox&t*RS(mIQfq{>G_|?0bz4TJZ@R}
zzmXI7O)QQDmc*)`#D0yO(#*Wg(pUc%a`J7Wi!-8&Bcs<N<2a+zY@@Qu8eci|zTIy6
zAM3x70|ExD3J6w(|3Xfy0KFUto*HhogTFRPj)1#^hr-SObN~RfCJ?DyZ6&N)2%d3-
z$T)%rsUwN}pUU_Zw7`W;z20ewB~IyldotRSd~IT6iJom|xW_#kh`H14x<e`y`IIn~
z1?y>SrhKF;xM&IhDY$pigwo6PGq2|qsv}l%UXN<o<+!Ivz!^}K_PyxWI%X<p(Lr(W
zF$U3#uAR|>ql@SW!Og%0{8f<>5bKix@(_R&j~SJKP=>DMxRF3nIp%}RMJevR;;T8K
zqp;E(_fc_ZBI4@NZ4kDZqcbQD%?$(3E)06`#~lVj1q*P+07$xiJb;bKYmEwP9jcCa
zN{)CK!NydzDHM?7@>)nWJ+$M9j-}zK@YomdQAA4zsU_k#t%ICBRvk-In;du4LV6n3
zIhy)7&Ynn))q;<X^BzWq-j35JmWGqDO4q9NKvkY<dgG4To{mNo3X@bwy)=dKR7<@y
z&nKyt^ON!;o(khBMp~YhhN(siUY7bNYLiEv$h2@!x>WCJMB}t@FAtpP2`JUGoWAKa
zFB&j=5^jC{RwGD}5gns3q$fD<?8KESJ+vjrnND?F&@-Ao7SZxB8bMm>dm#07EvHY6
z^p8EYkp70LmRHgf$Ay~_(-Zzn9!5r2nsxP${bwgrS0_A|PF2V1Km$F;JpC7rJ*_i6
zjZPINkNlBo{^n@QC#T^Hr5Bw)V#><4%XSGqa`k<xB7A=^*TR?LIeY3jZ#~x%|6}=A
zXQKV=CxPuc_qmq0+#e5w0xTarE3%y}+CFdEY--`#ZW5SlsiZ`XPa+LPBgRw1m#G7m
zr~H@16#qSu>6HJ1Pk^aU-eg_u(y@Q9!?xmWzn4Gzn__n_I^8ZL*1h8fzZ2nu0d*A{
z`~^gmbTxN?ND9D&)Qv;{n;Ag_?guCmSvZ+Fso;8{ML!H5RY(no@t6_Gu4Sb3i$e=i
z(qy4L;p7H{sCH_&Z3SA_-i~L26mDOTLL&#|DVnfTtr({hz+rY*hp**;yBjE&5L_?u
zAVF*~fycRBbs?qsYEBA~1Q$bC3Y<$IHN}jmv|SewjV{zNx36BMHXkfVp;qCl1_h1+
zt2E~Q;#ZUB{GEIPd>36XKtWaFoTZ>DD72$r90sbA*x&?5sPc4B!=oxdRnXE7P!&(d
zBRLpPT8bGDv}4Mwzp*3D5VruG0FMD**DyxBe!`9z)&A)3<T2=DnyblaRJcUI5so6q
zGiK%D=rnt~>NRTfA@u5m{a|zPgq>RT>Wo>x<Qk2|KqKxAS<pagIjBJ0gq@?n8vQ?$
zLnlC0JQFjZ;Ck|LI?#@ZDR8YOK~<$4S@wf%T^Z&YJQMWh{gNGN_5+P4S%wK9)QQBv
z11Uoj2ZSyDHEhE;J7~gim^*Wlhnd<l+!0)zIiU&gjtqBFcyCUqCLEp#QZQ&r5*%I;
zj)22U(I9LIu3+mhobrf1|7z2b;R1r%T)F!W<h4XBr>j|qC=|v(RC--;Mud^$bv%DL
zU;tlnbdckop7Rt}iP0n&`6t(XJV7|9jd@&gW{>^Hgpre;mf${b>UqtXa5R5(#hI>i
zG!l232N7{I!Zc&1Y44(ikErXrDkjiMK@S8GI6PulDzxFQx_&Dh05Bzz#bFL7k_EHE
z6j@~`8vvNJLI9@LFhNb5ZaBaMW|~ax2KE);VQE$hHXs!Nzkd9GHP@%=|93+LZ0Ick
zi+@Z$Z{cw$m<NYPlw$#(z|7kmj8TbA*1|9Rt2AK<1Pqm`D6r0yl7xU)AO~T}DAa_(
zi)uG@&<kj4!x%6a4eWS2Y0P)PC^fJb04YusipIQLV8TESR*I%Ej}e(PK!9C9YZ_0I
z5HAEeAKULWrcaoaqu0RfL=sJHULmqR=l=bw^B@|`zBMa49@)PY$6fM;0CU7704cuc
zU{#Wbt{C0p>t$jEf@C5EI&<7fKmg0b1wb{|`LHtdA6{6(KfHnzgy3HuTZ$$K(W`zS
z58m^4?A4+%c>KeIqOSB^Nuek(>E`^Kt)zg`e<<>QQ;2`{D@4Hm837K%XTBbL)f9wX
zX}O}V=Dnu4P?P}RvIriDCRn)^I{IO;?2mnb>%a$7Wu`#`2dLuJLPvBnwKGK!Ks$2K
zM9@(BB2{QuO6s6ML}W6xAt4nen9Y)2rA`>Z7@YhG5C9hs9|6di1{cVM;gP;>ZEa|%
z1#dgD77@zw+&EGA<1$(T3;;JT{|cr|M5p3R2et?8VhHb^1gR`(2x<E_fIzvm4gcPQ
z9}ygLi&(j@5V+U3GH}DZ0RUY%q+}!XO3%A+l_R_HU@$O)0@Hb*6&GkV#gLa5?iyM8
z0U^I5D2pJ!7F{)1SbwwrtD7Je*59k0jLKi})z$8bZ{X%+NX^H`ck+F8V}5#KsI$AT
zue+_QrK9_O7`C><i@S?fhdAGHXj-`zt4I*rLas=E+f{4EhTE8{C)Rf<pZ}0~pwr`~
zBF%vRfkE<Bq_ZtE8gmDxOb3+kwHmDZ6`+NmDGy~yt~NZ$LXot(xPJ8x)%4tn;ec?H
z1P4FTqgMR#5y8tNd>UdYGru<f>-B{L(%_gg)6r8&q4z@n$5Gb2(x;w)0>D7I;}N?a
zN@c=RU%j(M_b1QQ+O)9Q<QFuzGP>Lc05Jp$S=mjXpUgRXH>@$3-wv=Dz<c*-^p?=C
zM7vM;-|_MC?Q7#Wpdr4mH$L7q?l&ei=0OA*Vy)d-Wg7ps7!Z_Wp+E)EDG`B6MoeZ<
zJuGp;7ws>MjAhjxQ>k}3m^@inKzi?`j&FxCJ*-q>3p>6+7=v}%W6xU!i<-^5!P38L
zePH%Ym#px^w_h=HxaTi7@E4N_oKj*#*mC*=pL%;VUSt*NlF^FJ(f~lGm;Cz?O#LXk
zf-^H*V*aKt<n$JL_OLfu`gV3~fX>aT4*nsdR}gj}AoFO7l|pghapi||?NzPyUEV9Z
zF9FO$qTkEbxR4WT2+%5uw?Z2?Ic7QOiqZK1G7R&<oKm;>V99+-`+(xR96ovBbHw-?
zNH-1*Ic0-3WR?!lhMZ{UTNKWyszhLH8V}B?e<I8I1mS!bd9M~{B~JDy@?uwOl#DLe
zrIo%eaoiDMi-~G3VN+hE5=el+gFIz_2fnOlV~6A?0}ldU)0KuxQi-w&20T|>>yGGh
zPCFgHhs)_}pPI>EG#BI+us%ifsp=uD4WLrGA13igGby#~hIi)ABdqV6mmW-MK>L@E
z1eWoIEFwWgp1@@!O7pg;*5Sam-XZmz#QbMt2=L)o<pS$SVim=GzyxE16O+A(8Yujn
zn0TudE9k2XQ?3m_dO^ut(2)N!2=|_kL@Iw$>9CLk#b$FC`yxb`p6smY3_Hj>kdPC5
z6<Ji-R~>PZ%PVW@M9CTW=b5v5)A&R)Wf1$D+!c!B%X=+7ahlIuf*;9E2i)v`Msmq)
z_6T3|yc(mh%4FhFkBai-f;DTa+xEWZgN7hGQKE37kjGu2%1oNG-U_L)>7I6FBKX`0
z4^{F5Q{^I!%E-*106$ylK_Y+yzwS%(yII82B{vU{S1RJw|3&fU=`FtDt-#`MJKLy0
zKRDwYoEHdUB%skqm&u`{2z&Gj6AE$tOxeU~9$!yd^Xq)Dh=Wyzy4L;4p5il|m0g?q
z==p++R47GDQh=hCg^ZcFpJ|lFL6w{Rp;WTu@^jpm()Tyew||ED12Buw<w*L{OkX8?
zKAE&6g&$|f&!>L#v@F!WbS)m9zZK_n#ue=LiA07y41-f-_!$mgHBA^qW9eA&u%aU1
zb}a<}9QkHuXly;mO1dE)prL>~eukkMleBbnBIs^}wn;|{A_B=tzszS`ZYNj4r6NbI
zQ#vg%q?(Q}r8w?yVBGd2zX;4Dxbaw`S0aRg0iRg&bJ06ba#k8<z@Ed3);5eP8^B6(
z3d#r#6frjYW3#i=Q)5_LM@`)L8L!VR$uNNJD`8W#&7pz*APcQ-CQKq}TaKZ1cdQuQ
z740)v7=3pgAN^G0{R3*87Ye=2Z~OJ#hn*)3t!QOB!UcBY>jTfs?7k`8)_5vjk1jdS
z54oRGF7#WlHLv6dH#9|mQKBwoME%8b-8&CVYX4ttDMgupa_fxqM$gJBL1mY1dQ9!S
zDh^}Yu2;*=T!{?C&PSES<XaG9u8BsPM8>4_%@;a5tS=obKWOCLR^L4MfI&<x5}csG
zK|0{m6c3m{TmY;w_ZwdTEVKY%AD^^vRPpA+SdKRoHGuy8qZ@To4_0x1!BatuTv9sO
z?3*(y;??C$d4Vxr{rJzc)fSF<jD96TQd&|fw)&`bKhOL~-&(f*ATrM>ZG2NJd*wSC
zcixIgC(6=_Ka=?NjsT)sD5jycSR?jMdFtKKYW2&4v7qIe)3e_+J&G_$48Lv;XY-T9
zLCR2<i>A1<*{%xD34dLT8VrNO8>y8yNmrIF0V#ttIkr0=BLl*}Wm2vFT!hZ_%`@_+
zxVK`g;O|)74zekFLI-fm+-Z#f`1$5HS%eI4uaS_hq(KTt3&$&}#^#hrR8VI<>d!ya
zHkJ`@&^_NHbE&BRYNK{Ojkx(Gn=(%opHHm~1#eCD)+V3uu_ot@KM>QVBIquQFR}=u
z?rA`H%$lh>tUaK_>r^Ie+Rb|RX49`9yA^@+M}|xE6?eDv5;y8uZ`FDjL!Qa<B6}9T
z`h%`}7p1xkZNPbgR>iHmt^qZ4ltjzw7OS|{GL+FL)b%eg80pgF1eRE2O`N1k*;Y>J
zOTTf7mMY0tkuzzuQe)5vtv$sF5`X}i#EC4J`piZv+1ADxzSigD=?qQ-LT=WS;uf$0
z4ga9y2Ks_7#^zg){P*zJ%uaG{qlz5WPyLGQ3lbdYle9BQMn9?$iGNAWfhdz#L5CL4
z6hs(gX!pv$PVMC2;bKYON^v*&nPNz6^8zcQ=*>i|JRk(jo?O%;TdXbbB`_(B1Uy#z
zQ>VZ?*r`45z$MhZ>fWuYw#}l|Z~v_x2OXWhUr;Y(*JTR{IJ3l*TD@&Y^z`Bt_G76V
z$+bQgl;X2-#-w;|*p5-wNlcIuRr<wKye7YZ3zY?;XFE%R_Aj5W*6#^<SI|8)XaxGY
zNwU^m@8@8g+&w>DLFi)>noeCN?TM4sT9ugtjf>bg%b8S{*bmIcfTzDM#wvT>XzXK{
zTpk}h)eVr0Vabk2ERs7!32>nX%aF4GP{qpN{}Z~7`NGcoEEOZ1>@{z?PR!fB*YNdz
znc(5dlqoaj%zQVd2s{R_35|PQH(n{<g98EjA_eOE=?R}zZ=*xn{A>h2gc<N`v6v`?
zK4@<t#129;#KKsy*R6+gXF?C-|EQ@Zjrsc1W$%ggLg=-ks5)NfmLG}oQ(%5_Uy_(~
z=EZ)R(Uo3;LsPQlnqWULW>6-}xO<j=;dtCREOH}c6DguPcK1;eR{h<|q$P!HlB)W?
zipOH75~SGz^SJ!$Ze|#ETO==XF{H`TY#Ya>WftRI%80OAZ&p<9(WP5enRqp2Pxy8G
z*+FhD`jE7Jn6#oFsClk2WAp$cK%9p*ahlyM#{3yvHVbQCd@Q2mw&Ml6bz3jHrP=G4
zk~nVz<BwWOPXaC`idK#pq5B7)Jl#BgzPewUZokaJ5cUzfA}wlih9Gt)5e6aPS-6aT
zNB(;I;{_J8HACUZ58GmmjY{I0a=G>z)8@FKbwFSq_F(ptb@=vdSd(DEt@~T0_(3Fo
zywz5}>&DS11`_yy(zo`85Qg6`F*8Wkv9+`j&bz^8lJU!24K4`!CCk{F#D_<gXI>)o
z>8Blg;bGh)E@dkXPl!3e1Nf*wrSb($-I+mXKLL<njWudlqKSv!iepv)B#ioD0(kG(
zDe)&PnMwD{n?z4Wd8<suh6PqVAP=dq@l93~(L9{dBxG0%Qu^<RIHFIL>Zc3xTGlGE
zusn5zzf|=0uC#DAp={pA4JZerYEIP%RA+zoI6JJdG*b{h&@bLsY8{wsnLF*);IN?x
zSW1txxZjrI<wF+>jNqbJzm2hq&7uzCL&;x0Ypo~nss4ibBIH?JN+pr4Gl$Y^t||P7
zRMn5l+(+LE-C_XpXmcHM#|TC$6>sy=s0B{9Zdl8CA3tTMmRT*+9gan?DAXL@`sQrI
ze0gu^efp%On$(G~iV%t3>)h0VosYdr(xHLRxsYm1K`~7>>3q3f7+K8L=a;5j&k1=4
zv7Q`r4_LVA+ON5(@0$tJ?W9rgnRn#<E>WCaz->oa-ilqa!tuz~`oqc;p~w=TClt|W
zG;@m%qmEG9<->rA(~V!mhD#~l&r>6{W2Qb)nZH<Zx)Y&AFpfPcI?DO_QKIH+4Fu<7
zW%vFpU7%%(UM>qtKjIvFL&rl}3$NzVNeP<Ai#-iV=nyx2cvMK&>D@O-AAdw7ds`rY
zt?BC@5ely@%&fFKA5ojHV7EPUg)TVbFP-wSgrk%iTNvox5H)VBIWoN+35(pPrWUbh
z-L?C0^qMHcOqt9g*kNm#3zl%mHpFQCW^~dOPDJ`jEOgcA3$t<G302AuU5J8pV^(2r
zn*5FhCc+keob4}Dr!4ZD&{NJhR`_c`pbNToTmDb*tnGeIz0KNyt>gwE6<Hp}NTFOp
zy#t$_E?od7S27;|VgQ(MVU!&<g<NCu7yYrbW>bRRc>r*HqfT-oomwnJlN;NdizV?p
z!;Zis8=bc#X<vNakmDpa|GwRpeS<X1go7{4xYUy3%p%rs5HCy#7qj!?!nWt~EPO;r
z<gu>f%|AK&DvH~gG`<pztIZI?PCt1%w}8s5i*;PwkYikF>%F8G9q65$dphDDq@kQ#
z_~{%S{^2);j?Jg>S1eJBzHeRm{qRq940;gWd@{~4;9pgYk*exAc=DvbrDvyYclJNf
ztnNO*lPwdFAMtoyhDbW3(PynqNO-+35(5{WQY4Bh-208?``sO0+AADG*YagA_w(<7
ztrr|LNB8sS9`4G;4khB{4~n)jiPDA4zz$|U2Q%*SWk0_`kyN>bW%jG3b?V*7UT}su
zo3%Lw=}j|r=H2PnhjIkmdLPgaALHG=Ur@7&qa|&5Mi-D473#;6AKgz~B2yJNGmQ)*
zE>Zn_ZXdHeQPnUYHJu%HyhqMz>{H%B6a;*)1OPWv{3v6ph6$S2tYh?$8=CG^8}<$B
zJ^`Is<4Rb4<l+7orx~f*49z$dcj?MSQwh6QzMcHJIGqx65)av6>gxZ6Any_-n0nrU
zeTQA5!YtM|mc{=&7QN0>{hFe@9^1@6Q9PD=ZP*$3nyH2yrCjflj_7<w67+?QQ@AzV
zD_!E1qbM>Ld@rT<BEvZa>TYfoPZw3+8awHUiN5i$1fH)W_Rd_nOgK!UU>rei-6M*Q
zfW~tT&<tlb0$;s7M%h3k0-uS<vIOooPA254e2&o)U>ArC=7RlMeH36<x$kYey+8Nf
z=2Qo<To6sQpsJx>>Dt6@5y4)uWyY!E+$-zze8-jg*`iUklO^ZOF@`YL`7f#l3}yNB
zFmEzy*PDVf38t1<>hH#mmUbGA<#8RoWq4V>dTqDh#qjO@d{^k`p0FVWw|Ky(_t~jE
zjcjIhABL|zY4DB4{<c3+wpr@%`d#<L&9pLBn8BBzEO&~CSuD=!&1O9VqU0a?pC64!
zQ30Sc2IT?B;=&|8@sp7_sj`p_MWm;W>7cfhMyi$WlZBtlU0KEFOF1IHyDD&AP9{70
zu2H<A@;(xUvoAk79S%;u5cfAuHL`mDfH6ncine!dk+ec@_CA$`#p6$8iAhw?p{BQt
zRp^)Bw#qAP^Ru&up3w}bew##<P8ntzZ~Je^_pA)ru%&Qz`)Fi;;w|+TWY&?Z=2znR
zBAJDl&l8<mZu^?-<F5$MVfRoosq2yrCLgTQh8&O>d0u};z^W|)uc2VM`iua62LYgb
z)&7h_eV@BK``Y??KeY_>vaqtV@$hmFws$l`u8WjUOb2doKJe$spk37;q<?rE@jMo_
zBQl1{Tqo6|$oi{MR#)_sCXciScjt$W$KJF(ySMj{UP6w2fj(`4e6j$>NTBBKuEB85
z<izsaED)CfkCECX#C49<f>b&<>NcI6-3xm~hj!IcTM4sx1zc21rF*n=+(@m2NyO(V
zQ)w1Q`v#f$$Bx+kTB_JtHEw+I^lIb`qC$gXE$%3x@qm<=5`bQOfTB{d-{fJGMF`>E
zW_!-T3eBff^;CmN!!0H@?Va%D28eXT&ep))<r`8y+=GkXF=Z|;E!cid%6s?OU<_|i
z>6kRL!{KG-#XZDXd&jw(k7j8}QU$}LSp_mi^k!_3TV?OfMa9Uw@}|fSi@l`q^i>q0
zE$%pdcH`S(Z#MBPFzo)=-dHnfV=%H0i3m=UT(v1+bBY=p<9|okA(}bpp>=Ry5B;sX
z!&>A`hLk$nOS_cxJbS;%An{SdX`5v}|1DB!NI+QBU~||DwoFR?sskzMtSP$z&6Fo=
z<8OUgqNuY1kQuPGl2hn7^fRZB(E1jmJ%*G|xp614pfb(cpKZG@bS=?4Oy*y4=u67k
z?P`rvp?yz6hxb3iv({5HtfgZuJ)Rb%2lX)z-W*(fLH)Jzr6?S83+=<yFK}=?#YTS0
z6^3Hn8e{kx1E1Jvc0V0YOCw)DAG}TLOZId1qq1N3h#h6e@+P9^?Gy8qQdg(UL7F?-
z9r`iBei@B@{K#MWccl=A>rvxd5rPPULr9a$L2rJ{dTNVmRmM=honaZRr5UB+4sdbT
zq*RL+^+VM5-93f#0&LJ5qcT5)fZ9K3-&P8=<3mY%D3;=}orvZuiKH2{qiXK@8LD(f
zBqovZS=mUril66;oUp!K<8PdmxguPTljBAw3skyKhl_2y*ebPVbD8g+?KG}>oOCIW
zb{RY=31&Fb^Nx2F4>when<$PIz1>}$SCmk#NN+pezkEM?grH;8qyMP{_S}Y)`%f}O
zC+Ay5C-3rY);2%(;RmP@$^FTQ9?5)OLTRfASyw#uwkIln&#CZMRbp#&__7bp@k%TV
zh}Ng<PXadv2St+b4B+y2Q&QUTT?fgU5SkKXrE%(8zCCNjDbX!1mb3S?@lQ#<x}d*4
z<9_3xlzk-E{@n(G)qm*NH&;PuEqsf_tGE)S>sYJl{H261G9mq5;;13b$im75#U&n0
z@eXz3<L<zUWGUjwF=Ccj?}TqpN2nSOxmY;~quVBx4v|>SC)OOky)1hjV(PpJ+npMy
z#e+_TjGi0@FJs2Wu*G(RfNw_S`^QeGd>z>}olFKcb1T-LWE=zsw^}o4LuD!C2#tMq
z4ES(sAipXbLfgM`+)1KgVxUQNH!;&e7M*y!&w~5?QmL70@EsiDUAH(Kr!>rY*G*v5
z9bC2?E+|Oaka}TKJUxYNGpJ>E>67t%W&X#GsV<S7{AIUbmI7_6t5j#e>{3hl&ePe%
z)r1)BjS%rMwQ#zjCRvFJ`g}>3g$AKj?#NqK)DP{kLi?yl0->pPADA$D8pOWfeuYqQ
zv7I{F<KO#*^Hz1%^Ym-F_uxq?hNb9cdJ=7&{3963f)q8_fqj4T#K60Q8zavrhi$f3
z28YTf&|TxRP{dPeNFr&;&xbmY*h0Zc+kL_g+QIhakRyU~?uU|xwKIK9=T>vW#j^ye
zL9PzZ#$NA@bbH-s+8$_Uoa>e;tlw<W(TXR0VYXmweD8H89+cnf(*}a5!dlMZOaMox
z@u31E&YeRe#L7c*?c>1g8_p2_m5ya0TU-{)^NgN#cQR6K&mRy^GBy(KJD5$HPiLzL
z8dO`W4r=<usASo9BUuSliz!vzQops0AFIWX1`;y>j6UUx&b-Wy;lQaL00=WAl$0@@
zmu#h$l2^5MP5qdt%{73HxVJD-(0`WoEA*A`dK=<#)56quw~!+glhrts7b>e}H$BHo
z9Z{nbNMwdCZ;bZV8pj~t|0&%-%QT|Pjf*vAk{*z=DXeMr(Wu3EHiVqx06(tIeHyLl
zisGj^cwvHTQ82{k*4n=bDb28M<}r0>I;J_%OEuQNxz#Y1f6mJGJFCM-g%D<v`}K(A
z{<g)dOs?58n3Ua2z*}<r`@W6_;sw7+->CsoJ`OMveA955(<ci&&llgs&nIxRGI1c;
z)8Y%cn$2rH*Ai0rxR3)S3_St{L_bwXF9U0K>)4X#hQ3S$>!z^}6xJ?9@ZPq2V}=wq
z*l35hv5Th2T=Hsk!WP&y@5cy+bQPjxBt;d>;#x{)U-{{wmjafP-x@0sK4_OOV_yPX
zX*})i1id%92r^kUf?ayZpZm9(WUN!uwCX;XA*kcl#;H0j==hV|Tnp0?MSGx-W_vf<
zl>I%Btn0i)PLspqI4i8G%uDd(tMgyI5`hQoe%u4%I7HWizGRXLH8=6t>*!~84)vqF
zHCjA*mA-3^6groSXgDinxJpabOO#pX;;zAz&y&8^;T!J09g6Z5Wz;eFuKq+_u;B|)
z)AJ!Z?yY22_4|}BX7?xKPIoW^qPz5@1M5-K;X4T&VUw^2!a06K1$q51n|?CE-XB`Y
z<?%&D3r!tVcd_!`%cD_)&OKUMi6@&S&{w_4+HTvxDg2HtV2~2-Q(A~MZYJt4_v-MK
z-|}`7FB&(%r@RM?38;N3HZuHC!^5Q<=PqlnT}+h0>waPOU5C;>TJ`Kbz9AcfXb)#s
z{lZz5h2(+8(ILS%ZEkpVyuG*m&$RE=QBBW$uPXB8?04aQF@*hMH+tM){h-SI<<isn
zr#c;*s5T`TGKvj_=D5MAmtIQvt_oFYNyg^xR>g%oC-1-iQBq8SE&VzVwxa0w;>og_
z7uDh|#uYF0=q<JTq{bTa#<(1g{6K>daWM9bt>}ShGj(#m*PXpggd~vXBiw?G+14KP
zC%G8kfvow+R7Prm_nAmm`y=C2+q5)~%El*OyvNMFrSv}q7_QHRP=89VZ~yxCAqlke
z)#q${nb;W#KCTt(kh^7jmgekf@-{Jd=iKMl?;1%(df|*vM@XiOrR&tFu+!RRNV(rp
z`6BR1Cwn%D#m16ZiJs(?qnzrVv6gY}oEwQD4#rn`hnI6K;@njqW|_k`aC9=|%6|y#
zDtC`ArCZy*LfQw|{k|K1Dj^-2p}kqVEn3^|icE}T{V1WvYqr`2!Dc=7J{;s>W@aSC
zTOa`cz@!hV5ilVB5X7au?othzsSs9-wbfXEC2(nU5NPC=-u3L}{L5*_t<N4>XTIO`
zg~ZK7L%uZzm^^&D5jgd=<<_#P-s{Re8h`xU)Sfl^NU;yw+{*U!ZFd}t+qvYaM+GvK
z+f)~(q>ORc+Eqr^-c0-bdbVPxxKUj``20SO51LMo=y!#_eS$X}+B4uqx#Gw?oq4M&
zQ^P_`QHIrdpWQ2w{1!%{rk$mm6?MIpKe-`12kOT4tEZo@Mihc|o)ZTC>($0yTqA?G
zxK~e4+!(6m{rtp`fa~UI!4Ba&Rp8fetfHiu60dYFj4(j;msaTe`%-F7?_p9d11A%R
z2J0~00th`F)e6em!iHD|4-muXZ%~yRPeN?+Ks_~?YZaVo&wCJQg{Amd=UA+Ty<{r8
zCp|<VGC-^EfT;OJj<gkRyo;T5mS{Z3N4N^m&afJk@o|0{G78A}LnK8Rhhrj0>n}FS
z>PHi5FSp>*_4EE7PAB^dC$zPgl<c%NTju5G&Th34R=}~#Sp@u|dfcngu41$G=yOHZ
zMc1xgxOAWswbes=0-*hO6M@e9wzMZb1}$*-p`BZLwjl6$+TY=^?Jv)d6@Sjw%^#aZ
zBi`tJRf5p@l*>A^hdx5?L|y*A(5RmnsP}JC6Sv|}L=t^5NF6P>*MA7l5vsKaICCWS
z5PN!XWVk>lJ78Wh-u&_-T2ox8&`wR!f9==quCd*;A~9K{oL?nkt`e@I7Q|twV<xkB
zQ_vp!22%j`;~bO6KOQrb>QbB({-jT-*S{?yX7!o4+FzZuc~=|R7j?YdViXzekZr0(
zpL-`NKfdtSV}v_Iu(3OLYA30FG0HRigEn#nR&7H7j}0e#IYYS~T{^0p`1vK%>;Uc#
zRb~E(HAV}VI(IQ-5-l!7C!0*Wy|x^4RE-(uOno~3+5_k1QMgg;#_wC67fZ#fF$d1X
z&Nia^O4t*32%nrAMS7qIg6b}AzRRUmnjvTm*#2xAy8gxZ8{UQTdb1aX8Mc`%#&*YZ
zjTSbKaA9+--k6qzKKOA>XM5*UKRLR9O?YXg0;VH;oZEWkNjh4u{C2|HNqA*hHfJ^0
zOX0io>a5&sySO-mD#hd@+UxU#T0av-Jv0TSi*%Zp1A4k|<4JNU=o*k}q~ZVpKB|LV
zobuSEXD1x-S?UMFjqc^Fino(XSYaPE|DcTX{hb;6_MaGPC<Go}$b4LILhk$4E%3JI
z@$U<azgyq4qzbF>_}QMIp{g-$W}#2u;X41jM&?@$ir7(D50hmf(oqjxEuqah5Dl5p
z2urq4^G=`laxojZ<=m*T9RH*E4*FCWU3<8#E|RBomYY<oEIDZeUC*;NjF_0EHtk6X
zH{cI(+HchGIAyx2riReZj-j7teTycTsqG!6x|f}Tt*GmVdzs2zsu20AoZL#<D?ay@
z!`#XPJ*18rmJZwSi`B{8IGe*cuTT5MM$XO_lA<k+^tWW%j9#<ododW+s@GQP>xuAZ
zO+Aw(y2t1*syMDP@>s|kU1jwa&jgB_)vJg6j7g1?MePV#z4PjciVDhluj<wGn2|=U
z&zf=YBrL*xX-_{o!?334ecnhnIY3@41T8JVTZ|cVR;YMqvQR>lk(c>C^S+N-gYAiY
aC?nax_M8zc9?0;`4Nj7xp#(^-%l`pzGP+a%

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/viafabricplus/textures/block/chest_end.png b/src/main/resources/assets/viafabricplus/textures/block/chest_end.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f66db86b6d5e76c216d0acc31174ea3a2ac4d6a
GIT binary patch
literal 332
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}}0G|+7Z8dpgJyml<bu$As4HemzB>f3#T9cBM>*JNC=IHfj$}TBVUtOuY
zJWt+KU#%}uZBe$enZBx)s;q^+s*$c**}CP)K%+PdJR*x382Ao@Fyrz36)8Z$X`U{Q
zAsWG^{ft6~6*yQLO<Y)fGk*Qw{%ym{UcSWz+yaIwn;uS!Q`s%IYV8u=a<z?oJKbCQ
z4VG2LJzmajHEGF0g+=b~568CdP^>!e<X*M5+Z6d!=7TMtH1Z4o@i-?n1RZ;Ih&!sT
zLd;pa`S~HO;CZM2`V`sq%vzMiwkv1tt%uo(x7wa=m=-B(db{=B%<pr)pE>h$=H&hN
XZ*u<LF4QRqbRmPMtDnm{r-UW|BC>Z6

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/viafabricplus/textures/block/chest_left_back.png b/src/main/resources/assets/viafabricplus/textures/block/chest_left_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..c141fda948ea78463b12cde0db20e0a7311d5326
GIT binary patch
literal 378
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%Lh70G|+7H#;LoYkgN+Lt{PF{!G~=Me57*<X2bfYN*IA%2w7=m7SWSS0Ar5
zDOq_!nwGYjyqSTTnZByIp}M?`cxI4hd6YqMm|kg!W?!OOQ?#0vnp{hgzK*J_ma3e(
zvYeu<_&zIE51?I~1s;*b3=DjSL74G){)!Z!;9^e~#}JKRU4Kp?CPkjtr!K~xTH3UZ
z{n!8aS)0<@*e>}=b!0?}EfVfKG-2yG>vYj`R&kw`_hgN&&kO9i|EH1nL!%0llHi=8
zbFEpn*Q4~=mP#eByArkk>%Hjg@&NrQm)3c(+cRzaRoyMS%QNf=!w09YIg7b&1&S)`
zW%tc|Fh7NVMnn5t<sU5~Gn6)XT~@Q>RP0|OwE4v90FH;Y$Eq8Sr}w<)pTorYq;0yk
QJkYrep00i_>zopr0Pin-Gynhq

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/viafabricplus/textures/block/chest_left_front.png b/src/main/resources/assets/viafabricplus/textures/block/chest_left_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..39d178b774ebe0d4d2b8cfb80140ff4434ce1d0f
GIT binary patch
literal 399
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%Li00G|+7H#;LoYkgN+Lk$(#)s?zSiqx0q$@gc<hS-U@*cdFzR_=(DJbU(R
zeZ11t9KA`&$`jJGDkD@69Xe#Jr)s9JYG$BjZm6!KF28i?(()*S;xN6;AkESc%|uW2
zi4!Nf+UWNssulaoB|3^}smki8%4(^~sVmD}t*ib9bO2|8M`SSr1K(i~W;~w1A_XY8
z*we)^L?hU=uTiQ=fv3fvIZP};P&6`AbMJrUvIp1CA7_((!<WHvp-9}U;gVanW`<tk
z!g*VR-e~MSy6*KEFZXZk2ZWxl*?jH$-;XV7bCP?e9}sZfaj#*@JI$qu5^_H0#og>h
z_pJZ<cOjRdQ|}@bF5keXy%#l3F=sEY(oF5y;>cXDo;FwUYv+Yk3!Yw&T9q8Zpc}UQ
n+_yf)&o=s&`ZF!-i_h6-PUF5U`_B9-(76nru6{1-oD!M<>%@$B

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/viafabricplus/textures/block/chest_right_back.png b/src/main/resources/assets/viafabricplus/textures/block/chest_right_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cf79d5353f1410b5ebb5688dc8a35b21a342d22
GIT binary patch
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%LhJ0G|+7H#;LoYkgN+Lk$(#)s?zSiqx0q$@gc<y4V;j%2uwASDKomHz`?p
zLYkJbo~oI?s+obBxuJS_ltFQrUS^PHX^5t)jecLEnwF}pj;gGds+_vATvEAmG|+s`
z0*}aI1_r*vAk26?e?<yVaJHw5V~9quZXcsqvjUIvVrDBwLCNA<cmL1hE}iert!u)l
z#&qURGy8*@4{>bsydySjF7K0lZaeR^P@b3&lYpm};n5k_O<jFbS8sjSx^UVi@daDM
zv)6wAmzE{#{*R~VU;3&E3Rfh&9vSe4-jirvY*SEv=CsD+1=}Qd%)M}YhT=Duj8KEm
wtEcAha4&Ezp7m&!M8Ul0ORF?D*M)v%5BKGaZ9A7326QHar>mdKI;Vst0PjY2ZvX%Q

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/viafabricplus/textures/block/chest_right_front.png b/src/main/resources/assets/viafabricplus/textures/block/chest_right_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..6dbf9c3877986e37528ac635d55d9e0b4d533537
GIT binary patch
literal 415
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%LiO0G|+7H#;LoYkgN+Lt{PF{!G~=Me57*<X2bfYN*JD*oiG&y0jxwa#6Oj
zma1%9TU&j+($pNiNy*9+(zLYI<jcy+bkya{^i|Ca)XWXl<z>WOO{L1C42r|_GJ`Zr
zLo^c|#mWO@`V!TeqSdt2<XV#SbyQ`wROQr_<rHPb7c{T>0CWatfk$L90|Vb-5N14{
zzaj-FxYpCfF+?L+x4&1YNkO1x{g2C&_zrGT($-%2z5dX*EBS1E(`N5&&0y}>7SW`%
zw%62++f6z=@a?nBh36z+E4=yE8=KMawPeLiOBTK}xjlw~<u+ey>%(qTExppZD|_G5
zIqiu%7C&+6f3C45SNrMHlb!po&QP4})GEVZ{^nYym}8uaYj>yUTFz@Ki{066zT9c@
zZ(#{$5zE~6&|LA!B$EQ3hm%iK+fOwTz4A%->38<sW;{uow>sYhI-J4N)z4*}Q$iB}
D(Fc*C

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/viafabricplus/textures/block/chest_single_front.png b/src/main/resources/assets/viafabricplus/textures/block/chest_single_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e8c4afd10b0cce6a4e21b93799e5a573f90e11c
GIT binary patch
literal 452
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%Lg%0X`wFZgxhF*7~lthQ@lTt1ESv6sa%Ilkd-z)liXbjgjw8QgN{{Sd^{Y
z5h;20?AfJDmujiX*2gPN&C#ojP(5_$P+MDDh@IG^WaSBITH0#zX8NjT25LI$@?~XZ
zI_h%rGUDY?2E}1|iJs~cCr)%Vl`0L<bhXj%OH?cNmrHaMD-V!qidNH7lWR%R*HM+#
zQk7FzmQ$1!Z!u*y0J@N~z$3Dlfr0NZ2s0kfUy%Y7-0tb(7@`rZ+t*!oNI}3w{gapW
zES9xG9~;-MzajPN|NlA6$Ey>>(-O-Yx)_At^)M{C<TbO$$m^QOsh^L7Hz{fQti2j_
z{@K|xLU);D3%j3QUlm>bzB(jH*y)DZ?ph9~4rYPJhR5E|zxz_gv;Xujue`$r=YLMO
zRk_$^JY~|Qt1CW*+>_X9B3nDf>!VXmFL!PVvt;)A_j1c@483;C3D@ZcWnTWvsApYT
qS@~Sf_SQDpU@76^U;ZzDGR=O;mv-fd-#(xh7(8A5T-G@yGywq50HB%x

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/viafabricplus/textures/block/chest_single_side.png b/src/main/resources/assets/viafabricplus/textures/block/chest_single_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..045d3ef96de2d837afa0bee6a0585856facf7da8
GIT binary patch
literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%Lht0G|+7H#;LoYkgN+Lt{PF)s?zSiqx0q$@gc<YN*J%*cdFzR@PFLt&dll
znxi)<S$RU5mbRL_nZBx-fttCYy1a~dd6YqMm|kX(W@(6~tBrnNqFPh5nwFYeOOn2h
zs;ri(oVv1{qO3UUN9|;wjhqD@k;M!Qe1}1p@p%4<6rkWTPZ!4!jbPnAZlOa8JTBW?
z9drW(j^6s^_`cp#{MBs5MwJ{f2@Zo#CL#-tcHC%-xG2p1S1)Sw;z*0Ln=NN_7B;9W
z{&?_LDA`Biiskc~K%Pj=QdX~>Q-iLR?lqp;l6zD7^rg?uQd6!UD{{XrqQ;Y}9pB>?
z?JvK#xI(Z~*z8sY8=v~`_`}}>wbfL5{@n78J!a1s^~SHcUvZDnoZ|OU_owcx%li9|
ZVbe!0TgCUve}FD#@O1TaS?83{1OTAnf2;ri

literal 0
HcmV?d00001

diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
index 31727e83..b05ac22e 100644
--- a/src/main/resources/viafabricplus.mixins.json
+++ b/src/main/resources/viafabricplus.mixins.json
@@ -30,6 +30,7 @@
     "fixes.block.MixinBlockView",
     "fixes.block.MixinBrewingStandBlock",
     "fixes.block.MixinCauldronBlock",
+    "fixes.block.MixinChestBlock",
     "fixes.block.MixinEndPortalBlock",
     "fixes.block.MixinEndPortalFrameBlock",
     "fixes.block.MixinFarmlandBlock",
@@ -129,18 +130,19 @@
     "defaultRequire": 1
   },
   "client": [
-    "bridge.MixinOptionsScreen",
     "bridge.MixinConnectScreen",
     "bridge.MixinDownloadingTerrainScreen",
+    "bridge.MixinOptionsScreen",
+    "fixes.MixinChestBlockEntityRenderer",
     "fixes.screen.MixinChatScreen",
-    "fixes.visual.MixinBipedEntityModel",
-    "fixes.visual.MixinChatHud",
+    "fixes.MixinBipedEntityModel",
+    "fixes.screen.hud.MixinChatHud",
     "fixes.visual.MixinChatScreen",
     "fixes.visual.MixinClientPlayerEntity",
     "fixes.visual.MixinClientPlayNetworkHandler",
-    "fixes.visual.MixinCommandBlockScreen",
-    "fixes.visual.MixinCreativeInventoryScreen",
-    "fixes.visual.MixinItemRenderer",
-    "fixes.visual.MixinJigsawBlockScreen"
+    "fixes.screen.MixinCommandBlockScreen",
+    "fixes.screen.MixinCreativeInventoryScreen",
+    "fixes.MixinItemRenderer",
+    "fixes.screen.MixinJigsawBlockScreen"
   ]
 }