Skip to content

Commit c66de7f

Browse files
committed
Add support for 1.19.4
1 parent 37f3918 commit c66de7f

5 files changed

Lines changed: 14 additions & 8 deletions

File tree

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
org.gradle.jvmargs=-Xmx2G
33
# Fabric Properties
44
# check these on https://modmuss50.me/fabric.html
5-
minecraft_version=1.19.3
6-
loader_version=0.14.11
5+
minecraft_version=1.19.4
6+
loader_version=0.14.18
77
# Mod Properties
88
mod_version=1.4.0
99
maven_group=net.camotoy
1010
archives_base_name=BedrockSkinUtility
1111
# Dependencies
1212
# check this on https://modmuss50.me/fabric.html
13-
fabric_version=0.69.0+1.19.3
13+
fabric_version=0.76.0+1.19.4

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
import net.minecraft.client.model.geom.builders.CubeDeformation;
1111
import net.minecraft.client.model.geom.builders.CubeListBuilder;
1212
import net.minecraft.client.player.AbstractClientPlayer;
13+
import net.minecraft.core.Direction;
1314
import org.apache.logging.log4j.Logger;
1415

1516
import java.util.*;
1617

1718
public class GeometryUtil {
19+
// Copied from CubeListBuilder
20+
private static final Set<Direction> ALL_VISIBLE = EnumSet.allOf(Direction.class);
21+
1822
private final Logger logger;
1923

2024
public GeometryUtil(Logger logger) {
@@ -104,8 +108,8 @@ public BedrockPlayerEntityModel<AbstractClientPlayer> bedrockGeoToJava(SkinInfo
104108
// The Y needs to be inverted, for whatever reason
105109
// https://github.com/JannisX11/blockbench/blob/8529c0adee8565f8dac4b4583c3473b60679966d/js/transform.js#L148
106110
cuboids.add(new ModelPart.Cube((int) uv.get(0).getAsFloat(), (int) uv.get(1).getAsFloat(),
107-
(originX - pivotX), (((originY + sizeY) * -1) + pivotY), (originZ - pivotZ),
108-
sizeX, sizeY, sizeZ, inflate, inflate, inflate, mirrored, uvHeight, uvWidth));
111+
(originX - pivotX), (-(originY + sizeY) + pivotY), (originZ - pivotZ),
112+
sizeX, sizeY, sizeZ, inflate, inflate, inflate, mirrored, uvHeight, uvWidth, ALL_VISIBLE));
109113
}
110114
}
111115

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ public class CapeFeatureRendererMixin {
1212
@Redirect(
1313
method = "render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/player/AbstractClientPlayer;FFFFFF)V",
1414
at = @At(value = "INVOKE",
15-
target = "Lnet/minecraft/client/renderer/RenderType;entitySolid(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType;")
15+
target = "Lnet/minecraft/client/renderer/RenderType;entitySolid(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType;"),
16+
require = 0 // Fail safely if other mods overwrite this
1617
)
1718
public RenderType solidToTranslucent(ResourceLocation texture) {
1819
if (texture.getNamespace().equals("geyserskinmanager")) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.minecraft.client.Minecraft;
77
import net.minecraft.client.multiplayer.ClientPacketListener;
88
import net.minecraft.network.FriendlyByteBuf;
9+
import net.minecraft.util.FastColor;
910
import org.apache.logging.log4j.Logger;
1011

1112
import java.awt.image.BufferedImage;
@@ -39,7 +40,7 @@ protected NativeImage toNativeImage(byte[] data, int width, int height) {
3940
for (int currentWidth = 0; currentWidth < width; currentWidth++) {
4041
for (int currentHeight = 0; currentHeight < height; currentHeight++) {
4142
int rgba = bufferedImage.getRGB(currentWidth, currentHeight);
42-
nativeImage.setPixelRGBA(currentWidth, currentHeight, NativeImage.combine(
43+
nativeImage.setPixelRGBA(currentWidth, currentHeight, FastColor.ARGB32.color(
4344
(rgba >> 24) & 0xFF, rgba & 0xFF, (rgba >> 8) & 0xFF, (rgba >> 16) & 0xFF));
4445
}
4546
}

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"depends": {
2323
"fabricloader": ">=0.12.6",
2424
"fabric": "*",
25-
"minecraft": ">=1.19.3"
25+
"minecraft": ">=1.19.4"
2626
}
2727
}

0 commit comments

Comments
 (0)