tibs/cauldron-dyeing
1
0
Fork 0
mirror of https://github.com/TibiNonEst/cauldron-dyeing.git synced 2024-10-22 17:53:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

Actually check for null colors correctly

Browse source
This commit is contained in:
tibs 2022-06-08 13:34:05 -04:00
parent 457dffa328
commit 66b44be2bb
Signed by untrusted user who does not match committer: tibs
GPG key ID: 047833989F50F88F
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java
View file

@ -13,13 +13,14 @@ import net.minecraft.util.DyeColor;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
public class WaterCauldronBlockEntity extends BlockEntity { public class WaterCauldronBlockEntity extends BlockEntity {
private final int[] EMPTY_NBT = new int[] {-1, -1, -1}; private final int[] NULL_COLOR = new int[] {-1, -1, -1};
private int[] color; private int[] color = NULL_COLOR;
public WaterCauldronBlockEntity(BlockPos pos, BlockState state) { public WaterCauldronBlockEntity(BlockPos pos, BlockState state) {
super(CauldronDyeing.WATER_CAULDRON_BLOCK_ENTITY, pos, state); super(CauldronDyeing.WATER_CAULDRON_BLOCK_ENTITY, pos, state);
color = null;
} }
// Formula taken from https://minecraft.fandom.com/wiki/Dye#Dyeing_armor and DyeableItem#blendAndSetColor // Formula taken from https://minecraft.fandom.com/wiki/Dye#Dyeing_armor and DyeableItem#blendAndSetColor
@ -31,7 +32,7 @@ public class WaterCauldronBlockEntity extends BlockEntity {
newColor[1] = (int) (colorComponents[1] * 255.0f); newColor[1] = (int) (colorComponents[1] * 255.0f);
newColor[2] = (int) (colorComponents[2] * 255.0f); newColor[2] = (int) (colorComponents[2] * 255.0f);
if (color != null) { if (!Arrays.equals(color, NULL_COLOR)) {
var avgColor = new int[3]; var avgColor = new int[3];
avgColor[0] = (color[0] + newColor[0]) / 2; avgColor[0] = (color[0] + newColor[0]) / 2;
avgColor[1] = (color[1] + newColor[1]) / 2; avgColor[1] = (color[1] + newColor[1]) / 2;
@ -53,25 +54,24 @@ public class WaterCauldronBlockEntity extends BlockEntity {
} }
public int getColor() { public int getColor() {
return color != null ? (color[0] << 16) + (color[1] << 8) + color[2] : -1; return !Arrays.equals(color, NULL_COLOR) ? (color[0] << 16) + (color[1] << 8) + color[2] : -1;
} }
public void resetColor() { public void resetColor() {
color = null; color = NULL_COLOR;
markDirty(); markDirty();
} }
@Override @Override
public void writeNbt(NbtCompound tag) { public void writeNbt(NbtCompound tag) {
super.writeNbt(tag); super.writeNbt(tag);
tag.putIntArray("color", color != null ? color : EMPTY_NBT); tag.putIntArray("color", color);
} }
@Override @Override
public void readNbt(NbtCompound tag) { public void readNbt(NbtCompound tag) {
super.readNbt(tag); super.readNbt(tag);
var value = tag.getIntArray("color"); color = tag.getIntArray("color");
color = value != EMPTY_NBT ? color : null;
markDirty(); markDirty();
} }