1.21.4-5 Update and rendering bug fix

Author: Axionize

LICENSE

@@ -1,21 +1,168 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 Camotoy
-
-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.
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+All commits after 51c96e51af819bd8b432d6c725566edca88b2b39 in this project are licensed under LGPLv3.
+Previous commits are licensed under MIT.

LICENSE.MIT

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Camotoy
+
+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.

README.md

@@ -1,22 +1,13 @@
 # BedrockSkinUtility
 
-Fabric mod that allows you to view Bedrock skins and capes.
+Improved Fabric mod that allows you to view Bedrock skins and capes, including "4D" bits.
 
 ![2021-08-02_22 06 21](https://user-images.githubusercontent.com/20743703/127946308-e68f88e8-11ec-47da-a3f2-63034fe0540e.png)
 
-
-Persona/character creator skins are not supported at this time, though this will be supported in the future.
-
 Setup:
 
 - Install this mod clientside
 - Install this plugin on your server: https://github.com/Camotoy/GeyserSkinManager
 - Done!
 
-Logo courtesy of NotNotNotSwipez (Discord: notnotnotswipez#9106).
-
-Thanks to https://github.com/VelvetMC/SimpleCapes for helping me figure out how capes work in Fabric, and for the base of translucent capes.
-
-Thanks to Blockbench for having a convert option to Fabric which greatly helped me get the last puzzle pieces together.
-
-Camotoy's Discord server: https://discord.gg/jNNC4CZtsN
+Discord server: [https://discord.gg/jNNC4CZtsN](https://discord.gg/invite/K9wtUdAQZK)

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.10-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -23,6 +23,10 @@ dependencies {
     // You may need to force-disable transitiveness on them.
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/BedrockSkinUtility.accesswidener")
+}
+
 processResources {
     inputs.property "version", project.version
 

gradle.properties

@@ -2,12 +2,12 @@
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21
-loader_version=0.15.11
+minecraft_version=1.21.4
+loader_version=0.16.12
 # Mod Properties
-mod_version=1.6.0
+mod_version=1.6.1
 maven_group=net.camotoy
 archives_base_name=BedrockSkinUtility
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.100.3+1.21
+fabric_version=0.119.2+1.21.4

src/main/java/net/camotoy/bedrockskinutility/client/BedrockPlayerEntityModel.java

@@ -4,7 +4,7 @@
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.world.entity.LivingEntity;
 
-public class BedrockPlayerEntityModel<T extends LivingEntity> extends PlayerModel<T> {
+public class BedrockPlayerEntityModel<T extends LivingEntity> extends PlayerModel {
     public BedrockPlayerEntityModel(ModelPart root) {
         super(root, false);
     }

src/main/java/net/camotoy/bedrockskinutility/client/ColorUtil.java

@@ -0,0 +1,12 @@
+package net.camotoy.bedrockskinutility.client;
+
+public class ColorUtil {
+    public static class ARGB32 {
+        public ARGB32() {
+        }
+
+        public static int color(int i, int j, int k, int l) {
+            return i << 24 | j << 16 | k << 8 | l;
+        }
+    }
+}

src/main/java/net/camotoy/bedrockskinutility/client/mixin/CapeFeatureRendererMixin.java

@@ -10,7 +10,7 @@
 @Mixin(CapeLayer.class)
 public class CapeFeatureRendererMixin {
     @Redirect(
-            method = "render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/player/AbstractClientPlayer;FFFFFF)V",
+            method = "render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/renderer/entity/state/PlayerRenderState;FF)V",
             at = @At(value = "INVOKE",
                     target = "Lnet/minecraft/client/renderer/RenderType;entitySolid(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType;"),
             require = 0 // Fail safely if other mods overwrite this

src/main/java/net/camotoy/bedrockskinutility/client/mixin/EntityRendererDispatcherMixin.java

@@ -20,7 +20,7 @@ public abstract class EntityRendererDispatcherMixin {
                     target = "Lnet/minecraft/client/player/AbstractClientPlayer;getSkin()Lnet/minecraft/client/resources/PlayerSkin;"),
             cancellable = true
     )
-    public void getRenderer(Entity entity, CallbackInfoReturnable<EntityRenderer<?>> cir) {
+    public void getRenderer(Entity entity, CallbackInfoReturnable<EntityRenderer<?, ?>> cir) {
         PlayerInfo playerListEntry = ((BedrockAbstractClientPlayerEntity) entity).bedrockskinutility$getPlayerListEntry();
         if (playerListEntry != null) {
             PlayerRenderer renderer = ((BedrockPlayerInfo) playerListEntry).bedrockskinutility$getModel();

src/main/java/net/camotoy/bedrockskinutility/client/pluginmessage/BedrockMessageHandler.java

@@ -18,7 +18,6 @@
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.client.resources.PlayerSkin;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.FastColor;
 import org.apache.logging.log4j.Logger;
 
 import java.awt.image.BufferedImage;
@@ -95,9 +94,15 @@ public void handle(SkinData payload, ClientPlayNetworking.Context context) {
             // Convert Bedrock JSON geometry into a class format that Java understands
             BedrockPlayerEntityModel<AbstractClientPlayer> model = GeometryUtil.bedrockGeoToJava(info);
             if (model != null) {
-                EntityRendererProvider.Context entityContext = new EntityRendererProvider.Context(client.getEntityRenderDispatcher(),
-                        client.getItemRenderer(), client.getBlockRenderer(), client.getEntityRenderDispatcher().getItemInHandRenderer(),
-                        client.getResourceManager(), client.getEntityModels(), client.font);
+                EntityRendererProvider.Context entityContext = new EntityRendererProvider.Context(
+                        client.getEntityRenderDispatcher(),
+                        client.getItemModelResolver(),
+                        client.getMapRenderer(),
+                        client.getBlockRenderer(),
+                        client.getResourceManager(),
+                        client.getEntityModels(),
+                        client.getEntityRenderDispatcher().equipmentAssets, // how tf do I get an equipmentAssetManager??
+                        client.font);
                 renderer = new PlayerRenderer(entityContext, false);
                 ((PlayerEntityRendererChangeModel) renderer).bedrockskinutility$setModel(model);
             } else {
@@ -150,8 +155,13 @@ private NativeImage toNativeImage(byte[] data, int width, int height) {
         for (int currentWidth = 0; currentWidth < width; currentWidth++) {
             for (int currentHeight = 0; currentHeight < height; currentHeight++) {
                 int rgba = bufferedImage.getRGB(currentWidth, currentHeight);
-                nativeImage.setPixelRGBA(currentWidth, currentHeight, FastColor.ARGB32.color(
-                        (rgba >> 24) & 0xFF, rgba & 0xFF, (rgba >> 8) & 0xFF, (rgba >> 16) & 0xFF));
+                // Correct color component order and use setPixel directly
+                nativeImage.setPixel(currentWidth, currentHeight, ColorUtil.ARGB32.color(
+                        (rgba >> 24) & 0xFF, // Alpha
+                        (rgba >> 16) & 0xFF, // Red
+                        (rgba >> 8) & 0xFF,  // Green
+                        rgba & 0xFF          // Blue
+                ));
             }
         }
         return nativeImage;