From 6d92651623f15a1b83ef06c6badc145c9faae886 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sun, 26 Jul 2020 12:33:37 -0400 Subject: [PATCH] Fix --- .../energonrelics/energy/core/util/Action.java | 4 ++-- .../energy/core/util/EnergyTicker.java | 2 ++ .../models/block/holographic_sky_on.json | 5 +---- .../textures/block/holographic_sky_off.png | Bin 843 -> 909 bytes 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/thebrokenrail/energonrelics/energy/core/util/Action.java b/src/main/java/com/thebrokenrail/energonrelics/energy/core/util/Action.java index b67e037..723bc6a 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/energy/core/util/Action.java +++ b/src/main/java/com/thebrokenrail/energonrelics/energy/core/util/Action.java @@ -23,11 +23,11 @@ public class Action { public static > Action createBlockStatePropertyAction(long cost, Property property, T successValue, T failureValue) { return new Action(cost, (world, pos, state) -> { - if (!state.get(property).equals(successValue)) { + if (state.contains(property) && !state.get(property).equals(successValue)) { world.setBlockState(pos, state.with(property, successValue)); } }, (world, pos, state) -> { - if (!state.get(property).equals(failureValue)) { + if (state.contains(property) && !state.get(property).equals(failureValue)) { world.setBlockState(pos, state.with(property, failureValue)); } }); diff --git a/src/main/java/com/thebrokenrail/energonrelics/energy/core/util/EnergyTicker.java b/src/main/java/com/thebrokenrail/energonrelics/energy/core/util/EnergyTicker.java index 6818a18..1e4e510 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/energy/core/util/EnergyTicker.java +++ b/src/main/java/com/thebrokenrail/energonrelics/energy/core/util/EnergyTicker.java @@ -39,6 +39,8 @@ public class EnergyTicker { for (EnergyProviderBlockEntity provider : started) { provider.logicTick(); } + + scheduled.clear(); } } } diff --git a/src/main/resources/assets/energonrelics/models/block/holographic_sky_on.json b/src/main/resources/assets/energonrelics/models/block/holographic_sky_on.json index 0f6c530..4a62236 100644 --- a/src/main/resources/assets/energonrelics/models/block/holographic_sky_on.json +++ b/src/main/resources/assets/energonrelics/models/block/holographic_sky_on.json @@ -1,6 +1,3 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "particle": "energonrelics:block/holographic_sky_off" - } + "parent": "energonrelics:holographic_sky_off" } diff --git a/src/main/resources/assets/energonrelics/textures/block/holographic_sky_off.png b/src/main/resources/assets/energonrelics/textures/block/holographic_sky_off.png index 8249a03032dd3355dad6166ceb7b2a7d60260288..03a45136c94252b2b58a9a422eae2d356ccc5dc4 100644 GIT binary patch delta 419 zcmV;U0bKse28{=>(g6n$5DDYGky?}40VscWNkl$D%Z`FT5G?FrWOxo?KtPDW z7>$s4@c+MtAJF(Xcu@Ax*;#h8b?WJ%x~gjc5gB9fjWkW`x(0&)a|P zb^wmYBLH@o=lOEE1OUEEk_158w!ZH(?Ql43w_C2Y)|gkU%a$yJ5PjdzJL~lt09YuB zA^>$=^FAzS*X#RUDK!kkU+cDJKEt}7r;K43ilUg$=EUZ&6h#r)_Zr91b=@!wjWJTn z$KxS{sO#DolV#a7O|RF>^E}6KoN0fWm=*-V^ZDcqKA#VOrfH^Wy4`N~`#sCD_xp{_ zX5+dpJ0_wyj;pGYQt}8XrL|O+<&r z(sf-8Ahy N002ovPDHLkV1lCx(yssj delta 352 zcmV-m0iXVj2g?Sq(g6n#EGtq}O$?LS0VsbpNkl