Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2025-01-25 22:11:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Anvil block shape not rendering properly in <= 1.12.2

Browse Source 
Fixed https://github.com/ViaVersion/ViaFabricPlus/issues/246
This commit is contained in:
FlorianMichael 2023-09-18 17:02:21 +02:00
parent 7ea0500b24
commit 8aca0ea935
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAnvilBlock.java
View File

@ -17,13 +17,10 @@
*/ */
package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
import net.minecraft.block.*;
import net.raphimc.vialoader.util.VersionEnum; import net.raphimc.vialoader.util.VersionEnum;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import net.minecraft.block.AnvilBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.ShapeContext;
import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.DirectionProperty;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
@ -38,7 +35,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(AnvilBlock.class) @Mixin(AnvilBlock.class)
public class MixinAnvilBlock { public class MixinAnvilBlock extends FallingBlock {
@Unique @Unique
private final static VoxelShape viafabricplus_x_axis_shape_v1_12_2 = Block.createCuboidShape(0, 0, 2, 16, 16, 14); private final static VoxelShape viafabricplus_x_axis_shape_v1_12_2 = Block.createCuboidShape(0, 0, 2, 16, 16, 14);
@ -50,10 +47,27 @@ public class MixinAnvilBlock {
@Final @Final
public static DirectionProperty FACING; public static DirectionProperty FACING;
public MixinAnvilBlock(Settings settings) {
super(settings);
}
@Unique
private boolean viafabricplus_requireOriginalShape;
@Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true) @Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true)
public void injectGetOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) { public void injectGetOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) {
if (viafabricplus_requireOriginalShape) {
viafabricplus_requireOriginalShape = false;
return;
}
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_12_2)) { if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_12_2)) {
cir.setReturnValue(state.get(FACING).getAxis() == Direction.Axis.X ? viafabricplus_x_axis_shape_v1_12_2 : viafabricplus_z_axis_shape_v1_12_2); cir.setReturnValue(state.get(FACING).getAxis() == Direction.Axis.X ? viafabricplus_x_axis_shape_v1_12_2 : viafabricplus_z_axis_shape_v1_12_2);
} }
} }
@Override
public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) {
viafabricplus_requireOriginalShape = true;
return super.getCullingShape(state, world, pos);
}
} }