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

Fix #103

Browse source
This commit is contained in:
Aleksey 2021-02-27 00:39:17 +03:00
parent db2a555ae9
commit 616c824257
6 changed files with 123 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java
View file

@ -9,7 +9,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
import net.minecraft.util.Tickable;
import net.minecraft.world.World;
import ru.betterend.blocks.basis.PedestalBlock;
import ru.betterend.registry.EndBlockEntities;
import ru.betterend.registry.EndItems;
@ -29,17 +28,11 @@ public class PedestalBlockEntity extends BlockEntity implements Inventory, Ticka
}
public int getAge() {
return this.age;
return age;
}
public int getMaxAge() {
return this.maxAge;
}
@Override
public void clear() {
this.activeItem = ItemStack.EMPTY;
this.markDirty();
return maxAge;
}
@Override
@ -49,42 +42,41 @@ public class PedestalBlockEntity extends BlockEntity implements Inventory, Ticka
@Override
public boolean isEmpty() {
return this.activeItem.isEmpty();
return activeItem.isEmpty();
}
@Override
public ItemStack getStack(int slot) {
return this.activeItem;
return activeItem;
}
@Override
public ItemStack removeStack(int slot, int amount) {
return this.removeStack(slot);
return removeStack(slot);
}
@Override
public boolean isValid(int slot, ItemStack stack) {
return this.isEmpty();
return isEmpty();
}
@Override
public void clear() {
activeItem = ItemStack.EMPTY;
markDirty();
}
@Override
public ItemStack removeStack(int slot) {
ItemStack stored = this.activeItem;
this.activeItem = ItemStack.EMPTY;
this.markDirty();
ItemStack stored = activeItem;
clear();
return stored;
}
public void removeStack(World world, BlockState state) {
world.setBlockState(pos, state.with(PedestalBlock.HAS_ITEM, false)
.with(PedestalBlock.HAS_LIGHT, false));
this.removeStack(0);
}
@Override
public void setStack(int slot, ItemStack stack) {
this.activeItem = stack;
this.markDirty();
activeItem = stack;
markDirty();
}
@Override
@ -92,17 +84,18 @@ public class PedestalBlockEntity extends BlockEntity implements Inventory, Ticka
if (world != null && !world.isClient) {
BlockState state = world.getBlockState(pos);
if (state.getBlock() instanceof PedestalBlock) {
state = state.with(PedestalBlock.HAS_ITEM, !isEmpty());
BlockState trueState = state.with(PedestalBlock.HAS_ITEM, !isEmpty());
if (activeItem.getItem() == EndItems.ETERNAL_CRYSTAL) {
state = state.with(PedestalBlock.HAS_LIGHT, true);
trueState = trueState.with(PedestalBlock.HAS_LIGHT, true);
} else {
state = state.with(PedestalBlock.HAS_LIGHT, false);
trueState = trueState.with(PedestalBlock.HAS_LIGHT, false);
}
world.setBlockState(pos, state);
world.setBlockState(pos, trueState);
}
}
super.markDirty();
}
@Override
public boolean canPlayerUse(PlayerEntity player) {
@ -111,12 +104,12 @@ public class PedestalBlockEntity extends BlockEntity implements Inventory, Ticka
@Override
public BlockEntityUpdateS2CPacket toUpdatePacket() {
return new BlockEntityUpdateS2CPacket(pos, 32, this.toInitialChunkDataTag());
return new BlockEntityUpdateS2CPacket(pos, 32, toInitialChunkDataTag());
}
@Override
public CompoundTag toInitialChunkDataTag() {
return this.toTag(new CompoundTag());
return toTag(new CompoundTag());
}
@Override
@ -124,7 +117,7 @@ public class PedestalBlockEntity extends BlockEntity implements Inventory, Ticka
super.fromTag(state, tag);
if (tag.contains("active_item")) {
CompoundTag itemTag = tag.getCompound("active_item");
this.activeItem = ItemStack.fromTag(itemTag);
activeItem = ItemStack.fromTag(itemTag);
}
}
@ -138,9 +131,9 @@ public class PedestalBlockEntity extends BlockEntity implements Inventory, Ticka
@Override
public void tick() {
if (!isEmpty()) {
this.age++;
age++;
if (age > maxAge) {
this.age = 0;
age = 0;
}
}
}

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

@ -15,6 +15,7 @@ import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import ru.betterend.blocks.EternalPedestal;
import ru.betterend.blocks.basis.PedestalBlock;
import ru.betterend.blocks.entities.PedestalBlockEntity;
@ -34,16 +35,17 @@ public class PedestalItemRenderer<T extends PedestalBlockEntity> extends BlockEn
@Override
public void render(T blockEntity, float tickDelta, MatrixStack matrices,
VertexConsumerProvider vertexConsumers, int light, int overlay) {
if (blockEntity.isEmpty()) return;
BlockState state = blockEntity.getWorld().getBlockState(blockEntity.getPos());
World world = blockEntity.getWorld();
if (blockEntity.isEmpty() || world == null) return;
BlockState state = world.getBlockState(blockEntity.getPos());
if (!(state.getBlock() instanceof PedestalBlock)) return;
ItemStack activeItem = blockEntity.getStack(0);
matrices.push();
MinecraftClient minecraft = MinecraftClient.getInstance();
BakedModel model = minecraft.getItemRenderer().getHeldItemModel(activeItem, blockEntity.getWorld(), null);
BakedModel model = minecraft.getItemRenderer().getHeldItemModel(activeItem, world, null);
Vector3f translate = model.getTransformation().ground.translation;
PedestalBlock pedestal = (PedestalBlock) state.getBlock();
matrices.translate(translate.getX(), translate.getY(), translate.getZ());