MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/1.17' into 1.17

Browse source
This commit is contained in:
Frank Bauer 2021-07-09 02:00:33 +02:00
commit 4a8108f8e1
4 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java
View file

@ -27,16 +27,10 @@ public class EternalPedestalEntity extends PedestalBlockEntity {
} }
@Override @Override
public void setLevel(Level world) { public void setLevel(Level level) {
super.setLevel(world); super.setLevel(level);
if (hasRitual()) { if (hasRitual()) {
linkedRitual.setWorld(world); linkedRitual.setWorld(level);
}
}
public void setLevelAndPosition(Level world, BlockPos pos) {
if (hasRitual()) {
linkedRitual.setWorld(world);
} }
} }

2
src/main/java/ru/betterend/client/render/PedestalItemRenderer.java
View file

@ -37,8 +37,6 @@ public class PedestalItemRenderer<T extends PedestalBlockEntity> implements Bloc
BlockState state = world.getBlockState(blockEntity.getBlockPos()); BlockState state = world.getBlockState(blockEntity.getBlockPos());
if (!(state.getBlock() instanceof PedestalBlock)) return; if (!(state.getBlock() instanceof PedestalBlock)) return;
System.out.println(state.getBlock());
ItemStack activeItem = blockEntity.getItem(0); ItemStack activeItem = blockEntity.getItem(0);
matrices.pushPose(); matrices.pushPose();

2
src/main/resources/data/betterend/patchouli_books/guidebook/en_us/entries/rituals/eternal_ritual.json
View file

@ -2,7 +2,7 @@
"name": "Eternal Ritual", "name": "Eternal Ritual",
"icon": "betterend:eternal_pedestal", "icon": "betterend:eternal_pedestal",
"read_by_default": true, "read_by_default": true,
"category": "rituals", "category": "betterend:rituals",
"pages": [ "pages": [
{ {
"type": "text", "type": "text",

2
src/main/resources/data/betterend/patchouli_books/guidebook/en_us/entries/rituals/infusion_ritual.json
View file

@ -2,7 +2,7 @@
"name": "Infusion Ritual", "name": "Infusion Ritual",
"icon": "betterend:infusion_pedestal", "icon": "betterend:infusion_pedestal",
"read_by_default": true, "read_by_default": true,
"category": "rituals", "category": "betterend:rituals",
"pages": [ "pages": [
{ {
"type": "text", "type": "text",