-
-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix ascending rail collision box in 1.10 (#564)
- Loading branch information
1 parent
92c7f29
commit 6cdfd2d
Showing
2 changed files
with
59 additions
and
0 deletions.
There are no files selected for viewing
58 changes: 58 additions & 0 deletions
58
...anmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractRailBlock.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/* | ||
* This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus | ||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> 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 <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
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.*; | ||
import net.minecraft.util.shape.VoxelShape; | ||
import net.minecraft.util.shape.VoxelShapes; | ||
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.Redirect; | ||
|
||
@Mixin(AbstractRailBlock.class) | ||
public abstract class MixinAbstractRailBlock extends Block { | ||
|
||
@Shadow | ||
@Final | ||
protected static VoxelShape ASCENDING_SHAPE; | ||
|
||
@Unique | ||
private static final VoxelShape viaFabricPlus$ascending_shape_r1_10_x = VoxelShapes.fullCube(); | ||
|
||
public MixinAbstractRailBlock(Settings settings) { | ||
super(settings); | ||
} | ||
|
||
@Redirect(method = "getOutlineShape", at = @At(value = "FIELD", target = "Lnet/minecraft/block/AbstractRailBlock;ASCENDING_SHAPE:Lnet/minecraft/util/shape/VoxelShape;")) | ||
private VoxelShape changeOutlineShape() { | ||
// https://bugs.mojang.com/browse/MC-102638 | ||
if (ProtocolTranslator.getTargetVersion().equalTo(ProtocolVersion.v1_10)) { | ||
return viaFabricPlus$ascending_shape_r1_10_x; | ||
} else { | ||
return ASCENDING_SHAPE; | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters