Skip to content

Commit 503eab5

Browse files
committed
Fix log spam caused by carry-on
1 parent 5a6fbb2 commit 503eab5

File tree

4 files changed

+28
-1
lines changed

4 files changed

+28
-1
lines changed

build.gradle.kts

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ repositories {
2424
exclusiveMaven("https://maven.wispforest.io", "me.alphamode")
2525
exclusiveMaven("https://maven.terraformersmc.com/releases/", "com.terraformersmc")
2626
exclusiveMaven("https://repo.erdbeerbaerlp.de/repository/maven-public/", "de.erdbeerbaerlp")
27+
exclusiveMaven("https://maven.blamejared.com/", "tschipp.carryon")
2728
flatDir {
2829
dirs(setOf("libs"))
2930
}
@@ -69,6 +70,8 @@ dependencies {
6970
}
7071

7172
modCompileOnly("maven.modrinth:enchancement:1.20-26")
73+
74+
modImplementation("tschipp.carryon:carryon-fabric-1.20.1:2.1.2.7") { isTransitive = false }
7275

7376
// OPAC API
7477
modApi("maven.modrinth:open-parties-and-claims:fabric-1.20.1-0.23.2")

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
org.gradle.jvmargs=-Xmx2G
33

44
# Mod Properties
5-
mod_version = 0.0.47
5+
mod_version = 0.0.48
66
maven_group = dev.ithundxr
77
archives_base_name = RailwaysTweaks
88

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package dev.ithundxr.railwaystweaks.mixin.compat.carryon;
2+
3+
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
4+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
5+
import com.llamalad7.mixinextras.sugar.Cancellable;
6+
import net.minecraft.world.entity.Entity;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
10+
import tschipp.carryon.common.carry.PlacementHandler;
11+
12+
@Mixin(PlacementHandler.class)
13+
public class PlacementHandlerMixin {
14+
@WrapOperation(method = "tryStackEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;getBbHeight()F", ordinal = 0))
15+
private static float railwaysTweaks$fixMissingNullcheck(Entity instance, Operation<Float> original, @Cancellable CallbackInfo ci) {
16+
if (instance == null) {
17+
ci.cancel();
18+
return 0;
19+
}
20+
21+
return original.call(instance);
22+
}
23+
}

src/main/resources/railwaystweaks.mixins.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"ServerPlayerMixin",
1212
"ServerStatusPacketListenerImplMixin",
1313
"compat.appleskin.SyncHandlerMixin",
14+
"compat.carryon.PlacementHandlerMixin",
1415
"compat.create.BlockHelperMixin",
1516
"compat.create.Carriage$DimensionalCarriageEntityMixin",
1617
"compat.create.CarriageAccessor",

0 commit comments

Comments
 (0)