From 3b0693c3c2b5f8eb5d169c4a6464670101b315ce Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Wed, 4 Sep 2024 19:29:10 +0200 Subject: [PATCH] Delete wrong bamboo <=1.16.5 fix Closes https://github.com/ViaVersion/ViaFabricPlus/issues/525 --- .../minecraft/block/MixinBambooBlock.java | 43 ------------------- src/main/resources/viafabricplus.mixins.json | 1 - 2 files changed, 44 deletions(-) delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBambooBlock.java diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBambooBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBambooBlock.java deleted file mode 100644 index bfa9d825..00000000 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBambooBlock.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus - * Copyright (C) 2021-2024 FlorianMichael/EnZaXD and RK_01/RaphiMC - * Copyright (C) 2023-2024 contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; - -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator; -import net.minecraft.block.BambooBlock; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; -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(BambooBlock.class) -public abstract class MixinBambooBlock { - - @Inject(method = "isShapeFullCube", at = @At("HEAD"), cancellable = true) - private void changeBlockBoundingBox(BlockState state, BlockView world, BlockPos pos, CallbackInfoReturnable cir) { - if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_17)) { - cir.setReturnValue(true); - } - } - -} diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index c49563e7..0b9b880b 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -69,7 +69,6 @@ "fixes.minecraft.block.MixinAbstractBlock_AbstractBlockState", "fixes.minecraft.block.MixinAbstractSignBlock", "fixes.minecraft.block.MixinAnvilBlock", - "fixes.minecraft.block.MixinBambooBlock", "fixes.minecraft.block.MixinBedBlock", "fixes.minecraft.block.MixinBrewingStandBlock", "fixes.minecraft.block.MixinCarpetBlock",