From 5efcf30ea8ea1d0e2e196ac73b66472337b1b5b7 Mon Sep 17 00:00:00 2001 From: DArkHekRoMaNT Date: Sun, 13 Apr 2025 21:43:04 +0200 Subject: [PATCH 1/2] Update 1.20 --- DecoClock.csproj | 9 +-------- Mod.xml | 9 +++++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/DecoClock.csproj b/DecoClock.csproj index afa1faa..678d623 100644 --- a/DecoClock.csproj +++ b/DecoClock.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net7 true latest enable @@ -17,11 +17,4 @@ - - - - - - - diff --git a/Mod.xml b/Mod.xml index 2cf1c9a..729d37a 100644 --- a/Mod.xml +++ b/Mod.xml @@ -2,14 +2,15 @@ DecO'Clock decoclock - 0.9.4 + 0.10.0 Svarozhich - 1.20.0-rc.1 + 1.20.7 + 1.20.0 Adds to the game several types of mechanical clocks showing the current game time - True + true - + From e7a24bad5b7b1ffea5a748929304be3667dc1ff8 Mon Sep 17 00:00:00 2001 From: DArkHekRoMaNT Date: Sun, 13 Apr 2025 21:54:00 +0200 Subject: [PATCH 2/2] Fix cu --- BlockEntity/BECuckooClock.cs | 2 +- Render/CuckooRenderer.cs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/BlockEntity/BECuckooClock.cs b/BlockEntity/BECuckooClock.cs index b33a275..b52278c 100644 --- a/BlockEntity/BECuckooClock.cs +++ b/BlockEntity/BECuckooClock.cs @@ -96,7 +96,7 @@ public override void RegisterRenderer(ICoreClientAPI capi) capi.Event.RegisterRenderer(rendererCuckooClock = new(capi, Pos), EnumRenderStage.Opaque); rendererCuckooClock.MinuteTick += () => { if (!MuteSounds) TickSound?.Start(); }; - rendererCuckooClock.HourTick += (_) => { if (!MuteSounds && rendererCuckoo.Cu) cuckooSound?.Start(); }; + rendererCuckooClock.HourTick += (_) => { if (!MuteSounds && rendererCuckoo.TryCu()) cuckooSound?.Start(); }; } public override void OnBlockRemoved() diff --git a/Render/CuckooRenderer.cs b/Render/CuckooRenderer.cs index 44710fe..924601b 100644 --- a/Render/CuckooRenderer.cs +++ b/Render/CuckooRenderer.cs @@ -21,7 +21,6 @@ internal class CuckooRenderer(ICoreClientAPI capi, BlockPos pos) : IRenderer float timeAnimation = 0; public double RenderOrder => 0.5; public int RenderRange => 24; - public bool Cu => cuckoo != null; public void OnRenderFrame(float deltaTime, EnumRenderStage stage) { @@ -152,6 +151,14 @@ public void Update(MeshData? cuckoo, float cuckooDy, float cuckooDz, } } + public bool TryCu() + { + if (cuckoo == null) + return false; + + cu = true; + return true; + } public void Dispose() {