Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2025-03-02 04:01:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Issue 5 and 9 from https://github.com/ViaVersion/ViaFabricPlus/issues/178

Browse Source
This commit is contained in:
FlorianMichael 2023-07-18 06:06:39 +02:00
parent ccba9f362d
commit 884e05f3d6
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonHeadBlock.java
View File

@ -17,6 +17,7 @@
*/
package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
import net.minecraft.state.property.BooleanProperty;
import net.raphimc.vialoader.util.VersionEnum;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
@ -26,7 +27,9 @@ import net.minecraft.util.math.Direction;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView;
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;
@ -35,14 +38,27 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(PistonHeadBlock.class)
public class MixinPistonHeadBlock extends FacingBlock {
@Shadow @Final public static BooleanProperty SHORT;
@Shadow @Final private static VoxelShape[] SHORT_HEAD_SHAPES;
@Shadow @Final private static VoxelShape[] HEAD_SHAPES;
public MixinPistonHeadBlock(Settings settings) {
super(settings);
}
@Unique
private boolean viafabricplus_skipOutlineChange;
@Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true)
public void injectGetOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) {
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_12_2)) {
cir.setReturnValue(viafabricplus_getCoreShape_v1_8_x(state));
if (viafabricplus_skipOutlineChange) {
viafabricplus_skipOutlineChange = false;
return;
}
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_11)) {
cir.setReturnValue(viafabricplus_getHeadShape_v1_8_x(state));
}
}
@ -52,6 +68,7 @@ public class MixinPistonHeadBlock extends FacingBlock {
return VoxelShapes.union(viafabricplus_getHeadShape_v1_8_x(state), viafabricplus_getCoreShape_v1_8_x(state));
}
viafabricplus_skipOutlineChange = true;
return super.getCollisionShape(state, world, pos, context);
}