Merge branch 'master' into 1.19.2

enjarai · Jan 3, 2023 · 8cf7969 · 8cf7969
2 parents 1fdb809 + 03a9db2
commit 8cf7969
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1 @@
-- Updated to 1.19.3
-- Added CICADA integration for inter-mod log conversations
+- Fixed an issue with leather armor not being properly hidden.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ yarn_mappings=1.19+build.4
 loader_version=0.14.9
 
 # Mod Properties
-mod_version = 1.3.5
+mod_version = 1.3.6
 maven_group = nl.enjarai
 archives_base_name = show-me-your-skin
 

diff --git a/src/main/java/nl/enjarai/showmeyourskin/mixin/ArmorFeatureRendererMixin.java b/src/main/java/nl/enjarai/showmeyourskin/mixin/ArmorFeatureRendererMixin.java
@@ -55,7 +55,7 @@ public abstract class ArmorFeatureRendererMixin<T extends LivingEntity, M extend
             cancellable = true
     )
     private void showmeyourskin$armorTransparency(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, ArmorItem item, boolean usesSecondLayer, A model, boolean legs, float red, float green, float blue, String overlay, CallbackInfo ci) {
-        var ctx = MixinContext.ARMOR.getAndClearContext();
+        var ctx = MixinContext.ARMOR.getContext();
 
         if (ctx != null && ctx.shouldModify()) {
             var t = ctx.getApplicableTransparency();

diff --git a/src/main/resources/cicada/showmeyourskin/conversations.json b/src/main/resources/cicada/showmeyourskin/conversations.json
@@ -57,7 +57,7 @@
       "lines": [
         {
           "order": 30,
-          "text": "Christmas is for children."
+          "text": "Time to watch home alone again!"
         }
       ]
     },

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -6,8 +6,7 @@
   "name": "Show Me Your Skin!",
   "description": "A mod to hide or customize armor rendering.",
   "authors": [
-    "enjarai",
-    "Dr. Doofenschmirtz"
+    "enjarai"
   ],
   "contact": {
     "homepage": "https://enjarai.nl/",