From 7e7dad084e1895791c7cb6063a51c424510f098a Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 9 Jul 2021 01:57:38 +0300 Subject: [PATCH 1/3] Eternal pedestals fix --- .../ru/betterend/blocks/entities/EternalPedestalEntity.java | 5 +++-- .../ru/betterend/client/render/PedestalItemRenderer.java | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java b/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java index 7697033f..dc516e51 100644 --- a/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java @@ -27,9 +27,10 @@ public class EternalPedestalEntity extends PedestalBlockEntity { } @Override - public void setLevel(Level world) { + public void setLevel(Level level) { + super.setLevel(level); if (hasRitual()) { - linkedRitual.setWorld(world); + linkedRitual.setWorld(level); } } diff --git a/src/main/java/ru/betterend/client/render/PedestalItemRenderer.java b/src/main/java/ru/betterend/client/render/PedestalItemRenderer.java index e0aa34ee..2568db8c 100644 --- a/src/main/java/ru/betterend/client/render/PedestalItemRenderer.java +++ b/src/main/java/ru/betterend/client/render/PedestalItemRenderer.java @@ -37,8 +37,6 @@ public class PedestalItemRenderer implements Bloc BlockState state = world.getBlockState(blockEntity.getBlockPos()); if (!(state.getBlock() instanceof PedestalBlock)) return; - System.out.println(state.getBlock()); - ItemStack activeItem = blockEntity.getItem(0); matrices.pushPose(); From 2f88ac535805dac00994b495d7e2fb8eb5d2f21a Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 9 Jul 2021 02:03:11 +0300 Subject: [PATCH 2/3] Guidebook fix --- .../guidebook/en_us/entries/rituals/eternal_ritual.json | 2 +- .../guidebook/en_us/entries/rituals/infusion_ritual.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/data/betterend/patchouli_books/guidebook/en_us/entries/rituals/eternal_ritual.json b/src/main/resources/data/betterend/patchouli_books/guidebook/en_us/entries/rituals/eternal_ritual.json index dc587602..596563f9 100644 --- a/src/main/resources/data/betterend/patchouli_books/guidebook/en_us/entries/rituals/eternal_ritual.json +++ b/src/main/resources/data/betterend/patchouli_books/guidebook/en_us/entries/rituals/eternal_ritual.json @@ -2,7 +2,7 @@ "name": "Eternal Ritual", "icon": "betterend:eternal_pedestal", "read_by_default": true, - "category": "rituals", + "category": "betterend:rituals", "pages": [ { "type": "text", diff --git a/src/main/resources/data/betterend/patchouli_books/guidebook/en_us/entries/rituals/infusion_ritual.json b/src/main/resources/data/betterend/patchouli_books/guidebook/en_us/entries/rituals/infusion_ritual.json index a588ebf8..da553170 100644 --- a/src/main/resources/data/betterend/patchouli_books/guidebook/en_us/entries/rituals/infusion_ritual.json +++ b/src/main/resources/data/betterend/patchouli_books/guidebook/en_us/entries/rituals/infusion_ritual.json @@ -2,7 +2,7 @@ "name": "Infusion Ritual", "icon": "betterend:infusion_pedestal", "read_by_default": true, - "category": "rituals", + "category": "betterend:rituals", "pages": [ { "type": "text", From a8ace0005b370be85b63843c8cbb2b9b0a493120 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 9 Jul 2021 02:03:32 +0300 Subject: [PATCH 3/3] Removed old method --- .../ru/betterend/blocks/entities/EternalPedestalEntity.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java b/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java index dc516e51..7796d528 100644 --- a/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java @@ -34,12 +34,6 @@ public class EternalPedestalEntity extends PedestalBlockEntity { } } - public void setLevelAndPosition(Level world, BlockPos pos) { - if (hasRitual()) { - linkedRitual.setWorld(world); - } - } - @Override public CompoundTag save(CompoundTag tag) { if (hasRitual()) {