Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-07-08 12:24:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed hopper culling not being correct when installing MoreCulling mod

Browse Source
This commit is contained in:
FlorianMichael 2023-09-18 23:58:55 +02:00
parent 93bfa6a5ff
commit d3b89bed8d
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHopperBlock.java
View File

@ -17,13 +17,10 @@
*/
package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
import net.minecraft.block.*;
import net.raphimc.vialoader.util.VersionEnum;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.HopperBlock;
import net.minecraft.block.ShapeContext;
import net.minecraft.util.function.BooleanBiFunction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.shape.VoxelShape;
@ -36,19 +33,27 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(HopperBlock.class)
public class MixinHopperBlock {
public abstract class MixinHopperBlock extends BlockWithEntity {
@Unique
private final static VoxelShape viafabricplus_inside_shape_v1_12_2 = Block.createCuboidShape(2, 10, 2, 14, 16, 14);
@Unique
private final static VoxelShape viafabricplus_hopper_shape_v1_12_2 = VoxelShapes.combineAndSimplify(
VoxelShapes.fullCube(),
viafabricplus_inside_shape_v1_12_2,
BooleanBiFunction.ONLY_FIRST);
private final static VoxelShape viafabricplus_hopper_shape_v1_12_2 = VoxelShapes.combineAndSimplify(VoxelShapes.fullCube(), viafabricplus_inside_shape_v1_12_2, BooleanBiFunction.ONLY_FIRST);
@Unique
private boolean viafabricplus_requireOriginalShape;
public MixinHopperBlock(Settings settings) {
super(settings);
}
@Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true)
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)) {
cir.setReturnValue(viafabricplus_hopper_shape_v1_12_2);
}
@ -60,4 +65,10 @@ public class MixinHopperBlock {
cir.setReturnValue(viafabricplus_inside_shape_v1_12_2);
}
}
@Override
public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) {
viafabricplus_requireOriginalShape = true;
return super.getCullingShape(state, world, pos);
}
}