Skip to content

Commit 5634c1f

Browse files
committed
fix: Set alpha to 255
Fixes in-world rendering via recipe blocks.
1 parent ce83aad commit 5634c1f

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=0.2.0-beta.1
1+
version=0.2.0-beta.2
22

33
# Distribution
44
modrinthId=dAKfA83i

xplat/src/main/java/gay/ampflower/mod/pet/item/CollarDyeableItem.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import it.unimi.dsi.fastutil.ints.IntImmutableList;
66
import it.unimi.dsi.fastutil.ints.IntList;
77
import net.minecraft.block.Block;
8-
import net.minecraft.component.DataComponentTypes;
8+
import net.minecraft.component.type.DyedColorComponent;
99
import net.minecraft.item.ItemStack;
10+
import net.minecraft.util.math.ColorHelper;
1011

1112
import java.util.Arrays;
1213

@@ -31,18 +32,14 @@ public int getColor(final ItemStack stack, int index) {
3132
if (index > 0) {
3233
return -1;
3334
}
34-
final var colourFallback = stack.get(DataComponentTypes.DYED_COLOR);
35-
if (colourFallback != null) {
36-
return colourFallback.rgb();
37-
}
38-
return material.getColour();
35+
return DyedColorComponent.getColor(stack, material.getColour());
3936
}
4037

4138
final var list = colours.rgbs();
4239
if (list == null || index >= list.size()) {
4340
return -1;
4441
}
45-
return list.getInt(index);
42+
return ColorHelper.Argb.fullAlpha(list.getInt(index));
4643
}
4744

4845
public void setColor(final ItemStack stack, int index, int colour) {

xplat/src/main/java/gay/ampflower/mod/pet/item/CollarMaterials.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import net.minecraft.sound.SoundEvent;
1313
import net.minecraft.sound.SoundEvents;
1414
import net.minecraft.util.DyeColor;
15+
import net.minecraft.util.math.ColorHelper;
1516

1617
import java.util.function.Supplier;
1718

@@ -80,7 +81,7 @@ public enum CollarMaterials implements CollarMaterial {
8081
this.repairMaterial = repairMaterial;
8182
this.equipSound = equipSound;
8283
this.soundGroup = soundGroup;
83-
this.colour = colour;
84+
this.colour = ColorHelper.Argb.fullAlpha(colour);
8485
this.layeredColour = layeredColor;
8586
}
8687

0 commit comments

Comments
 (0)