Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package fr.madu59.obe.client.mixin.blockentity.sign;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;

import fr.madu59.obe.client.renderer.blockentity.ext.SignTextExt;
import net.minecraft.world.level.block.entity.SignText;

// SignText is immutable (edits return a new instance), so hasMessage can be computed once per instance
// instead of streaming and stringifying every line on every frame
@Mixin(SignText.class)
public abstract class SignTextMixin implements SignTextExt {
@Unique private static final byte UNKNOWN = 0, EMPTY = 1, PRESENT = 2;
@Unique private byte hasMessage = UNKNOWN;
@Unique private byte hasFilteredMessage = UNKNOWN;

@Override
public boolean obe$hasMessage(boolean filtered) {
byte cached = filtered ? hasFilteredMessage : hasMessage;
if (cached == UNKNOWN) {
cached = ((SignText) (Object) this).hasMessage(filtered) ? PRESENT : EMPTY;
if (filtered) hasFilteredMessage = cached;
else hasMessage = cached;
}
return cached == PRESENT;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
import java.util.List;

import fr.madu59.obe.client.config.SettingsManager;
import fr.madu59.obe.client.renderer.blockentity.ext.SignTextExt;
import net.minecraft.client.Minecraft;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.entity.BeaconBlockEntity;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.CampfireBlockEntity;
import net.minecraft.world.level.block.entity.ShelfBlockEntity;
import net.minecraft.world.level.block.entity.SignBlockEntity;
import net.minecraft.world.level.block.entity.SignText;
import net.minecraft.world.level.block.entity.SignTextSlot;

public class SpecialBlockEntityRenderingManager {
Expand Down Expand Up @@ -41,6 +43,10 @@ private static boolean isContainerEmpty(List<ItemStack> items) {

private static boolean isEmpty(SignBlockEntity be){
boolean shouldFilter = Minecraft.getInstance().isTextFilteringEnabled();
return (be.getText(SignTextSlot.FRONT) == null || !be.getText(SignTextSlot.FRONT).hasMessage(shouldFilter)) && (be.getText(SignTextSlot.BACK) == null || !be.getText(SignTextSlot.BACK).hasMessage(shouldFilter));
return !hasMessage(be.getText(SignTextSlot.FRONT), shouldFilter) && !hasMessage(be.getText(SignTextSlot.BACK), shouldFilter);
}

private static boolean hasMessage(SignText text, boolean filtered){
return text != null && ((SignTextExt) text).obe$hasMessage(filtered);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package fr.madu59.obe.client.renderer.blockentity.ext;

public interface SignTextExt {
boolean obe$hasMessage(boolean filtered);
}
1 change: 1 addition & 0 deletions src/client/resources/obe.client.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"blockentity.decoratedpot.DecoratedPotBlockEntityMixin",
"blockentity.shulkerbox.ShulkerBoxBlockEntityMixin",
"blockentity.lectern.LecternBlockEntityMixin",
"blockentity.sign.SignTextMixin",
"blockentity.compat.lootr.LootrChestBlockEntityMixin",
"blockentity.compat.lootr.LootrShulkerBoxBlockEntityMixin",
"blockentity.BlockEntityMixin",
Expand Down