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

[Change] Removed custom sign rendering in favour of vanilla Wood-Types

Browse source
This commit is contained in:
Frank 2023-05-18 01:19:57 +02:00
parent 3ee132e7ff
commit f38d1e9dde
15 changed files with 188 additions and 503 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/main/java/org/betterx/bclib/mixin/client/SignEditScreenMixin.java
View file

@ -1,64 +0,0 @@
package org.betterx.bclib.mixin.client;
import org.betterx.bclib.blocks.BaseSignBlock;
import org.betterx.bclib.client.render.BaseSignBlockEntityRenderer;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen;
import net.minecraft.client.gui.screens.inventory.SignEditScreen;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.blockentity.SignRenderer;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.SignBlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(SignEditScreen.class)
public abstract class SignEditScreenMixin extends AbstractSignEditScreen {
@Final
private final SignBlockEntity sign;
@Shadow
private SignRenderer.SignModel signModel;
@Unique
private boolean bclib_renderStick;
@Unique
private boolean bclib_isSign;
public SignEditScreenMixin(SignBlockEntity signBlockEntity, boolean bl, boolean bl2) {
super(signBlockEntity, bl, bl2);
this.sign = signBlockEntity;
}
@Inject(method = "offsetSign", at = @At("TAIL"))
private void bclib_offsetSign(GuiGraphics guiGraphics, BlockState blockState, CallbackInfo ci) {
bclib_isSign = blockState.getBlock() instanceof BaseSignBlock;
if (bclib_isSign) {
bclib_renderStick = blockState.getValue(BaseSignBlock.FLOOR);
if (bclib_renderStick) {
guiGraphics.pose().translate(0.0, 0.3125, 0.0);
}
}
}
@ModifyArg(method = "renderSignBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/geom/ModelPart;render(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;II)V"), index = 1)
private VertexConsumer bclib_renderSignBackground(VertexConsumer consumer) {
if (bclib_isSign) {
signModel.stick.visible = bclib_renderStick;
Block block = this.sign.getBlockState().getBlock();
MultiBufferSource.BufferSource bufferSource = this.minecraft.renderBuffers().bufferSource();
return BaseSignBlockEntityRenderer.getConsumer(bufferSource, block);
}
return consumer;
}
}

27
src/main/java/org/betterx/bclib/mixin/common/signs/BlockEntityTypeMixin.java Normal file
View file

@ -0,0 +1,27 @@
package org.betterx.bclib.mixin.common.signs;
import org.betterx.bclib.blocks.BaseSignBlock;
import org.betterx.bclib.blocks.BaseWallSignBlock;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(BlockEntityType.class)
public class BlockEntityTypeMixin {
@Inject(method = "isValid", at = @At("HEAD"), cancellable = true)
void bcl_isValid(BlockState blockState, CallbackInfoReturnable<Boolean> cir) {
final BlockEntityType self = (BlockEntityType) (Object) this;
if (self == BlockEntityType.SIGN) {
final Block block = blockState.getBlock();
if ((block instanceof BaseSignBlock) || (block instanceof BaseWallSignBlock)) {
cir.setReturnValue(true);
}
}
}
}