Motschen/Decorative
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/Decorative.git synced 2025-12-16 13:05:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set water color on world load

Browse Source
This commit is contained in:
Martin Prokoph
2024-07-31 21:04:27 +02:00
parent 442632262f
commit 1dc367652c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/eu/midnightdust/motschen/decorative/polymer/model/ItemDisplayBirdBathModel.java
View File

@@ -17,8 +17,6 @@ import net.minecraft.component.type.PotionContentsComponent;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items; import net.minecraft.item.Items;
import net.minecraft.potion.Potions; import net.minecraft.potion.Potions;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.joml.Vector3f; import org.joml.Vector3f;
@@ -49,9 +47,7 @@ public class ItemDisplayBirdBathModel extends BlockModel {
this.water = ItemDisplayElementUtil.createSimple(); this.water = ItemDisplayElementUtil.createSimple();
this.water.setDisplaySize(1, 1); this.water.setDisplaySize(1, 1);
this.water.setScale(new Vector3f(state.get(BirdBath.LEVEL) >= 2 ? 1.9f : 1.65f)); this.water.setViewRange(0);
this.water.setOffset(new Vec3d(0d, -0.025 * (3-(state.get(BirdBath.LEVEL))), 0d));
this.water.setViewRange(state.get(BirdBath.LEVEL) != 0 ? (0.75f * (DecorativeConfig.viewDistance / 100f)) : 0);
this.addElement(this.water); this.addElement(this.water);
} }
@@ -59,8 +55,9 @@ public class ItemDisplayBirdBathModel extends BlockModel {
public void notifyUpdate(HolderAttachment.UpdateType updateType) { public void notifyUpdate(HolderAttachment.UpdateType updateType) {
if (updateType == BlockAwareAttachment.BLOCK_STATE_UPDATE) { if (updateType == BlockAwareAttachment.BLOCK_STATE_UPDATE) {
var state = this.blockState(); var state = this.blockState();
this.water.setItem(getColoredWater());
this.water.setViewRange(state.get(BirdBath.LEVEL) != 0 ? (0.75f * (DecorativeConfig.viewDistance / 100f)) : 0); this.water.setViewRange(state.get(BirdBath.LEVEL) != 0 ? (0.75f * (DecorativeConfig.viewDistance / 100f)) : 0);
this.water.setScale(new Vector3f(state.get(BirdBath.LEVEL) >= 2 ? 1.9f : 1.65f)); this.water.setScale(new Vector3f(state.get(BirdBath.LEVEL) >= 2 ? 2f : 1.65f));
this.water.setOffset(new Vec3d(0d, -0.025 * (3-(state.get(BirdBath.LEVEL))), 0d)); this.water.setOffset(new Vec3d(0d, -0.025 * (3-(state.get(BirdBath.LEVEL))), 0d));
this.tick(); this.tick();
@@ -70,7 +67,7 @@ public class ItemDisplayBirdBathModel extends BlockModel {
protected void onAttachmentSet(HolderAttachment attachment, @Nullable HolderAttachment oldAttachment) { protected void onAttachmentSet(HolderAttachment attachment, @Nullable HolderAttachment oldAttachment) {
if (attachment instanceof ChunkAttachment chunkAttachment) { if (attachment instanceof ChunkAttachment chunkAttachment) {
this.waterColor = ColorUtil.convertRgbToArgb(ColorUtil.getWaterColor(chunkAttachment.getChunk(), blockPos())); this.waterColor = ColorUtil.convertRgbToArgb(ColorUtil.getWaterColor(chunkAttachment.getChunk(), blockPos()));
this.water.setItem(getColoredWater()); this.notifyUpdate(BlockAwareAttachment.BLOCK_STATE_UPDATE);
} }
} }
private ItemStack getColoredWater() { private ItemStack getColoredWater() {