Skip to content

Commit 5a6fbb2

Browse files
committed
Suppress Tinkers Modifier exception
1 parent 0a5f528 commit 5a6fbb2

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed

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.46
5+
mod_version = 0.0.47
66
maven_group = dev.ithundxr
77
archives_base_name = RailwaysTweaks
88

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package dev.ithundxr.railwaystweaks.mixin.compat.tconstruct;
2+
3+
import org.spongepowered.asm.mixin.Final;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.Shadow;
6+
import org.spongepowered.asm.mixin.injection.At;
7+
import org.spongepowered.asm.mixin.injection.Inject;
8+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
9+
import slimeknights.tconstruct.library.modifiers.Modifier;
10+
import slimeknights.tconstruct.library.modifiers.ModifierId;
11+
import slimeknights.tconstruct.library.modifiers.ModifierManager;
12+
import slimeknights.tconstruct.library.modifiers.util.LazyModifier;
13+
14+
@Mixin(LazyModifier.class)
15+
public class LazyModifierMixin {
16+
17+
@Shadow @Final protected ModifierId id;
18+
19+
@Inject(
20+
method = "get()Lslimeknights/tconstruct/library/modifiers/Modifier;",
21+
at = @At("HEAD"),
22+
cancellable = true,
23+
remap = false
24+
)
25+
private void railwayTweaks$suppressException(CallbackInfoReturnable<Modifier> cir) {
26+
if (!ModifierManager.INSTANCE.isDynamicModifiersLoaded())
27+
cir.setReturnValue(ModifierManager.INSTANCE.getDefaultValue());
28+
}
29+
}

src/main/resources/railwaystweaks.mixins.json

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"compat.create.SchematicannonBlockEntityMixin",
1818
"compat.dcintegration.DiscordEventListenerMixin",
1919
"compat.enchancement.SlideComponentMixin",
20+
"compat.tconstruct.LazyModifierMixin",
2021
"compat.tconstruct.SimpleChannelAccessor"
2122
],
2223
"client": [

0 commit comments

Comments
 (0)