Skip to content

Commit c9cdab8

Browse files
committed
whoop
1 parent d98a7f6 commit c9cdab8

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

src/main/java/net/diamonddev/simpletrims/common/SimpleTrims.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import net.fabricmc.fabric.api.gamerule.v1.GameRuleFactory;
66
import net.fabricmc.fabric.api.gamerule.v1.GameRuleRegistry;
77
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
8+
import net.fabricmc.loader.api.FabricLoader;
9+
import net.fabricmc.loader.impl.FabricLoaderImpl;
810
import net.minecraft.resource.ResourceType;
911
import net.minecraft.util.Identifier;
1012
import net.minecraft.world.GameRules;
@@ -40,14 +42,22 @@ public class SimpleTrims implements ModInitializer {
4042
"can we go much higher (yes, we can)"
4143
};
4244

43-
public GameRules.Key<GameRules.BooleanRule> SHOULD_PROVIDE_TRIM_POWERS;
45+
public static GameRules.Key<GameRules.BooleanRule> SHOULD_PROVIDE_TRIM_POWERS;
46+
47+
// mods
48+
public static boolean hasBetterTrimTooltips;
4449

4550
@Override
4651
public void onInitialize() {
4752
ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(TRIM_DATA);
4853

49-
SHOULD_PROVIDE_TRIM_POWERS = // gamerule
50-
GameRuleRegistry.register("shouldSimpleTrimsProvideApoliPowers", GameRules.Category.PLAYER, GameRuleFactory.createBooleanRule(true));
54+
//SHOULD_PROVIDE_TRIM_POWERS = // gamerule
55+
// GameRuleRegistry.register("shouldSimpleTrimsProvideApoliPowers", GameRules.Category.PLAYER, GameRuleFactory.createBooleanRule(true));
56+
57+
hasBetterTrimTooltips = FabricLoader.getInstance().isModLoaded("better-trim-tooltips");
58+
// i think the compat for this is on bettertrimtooltips side, will pr better trim tooltips
59+
60+
5161

5262
LOGGER.info("{} (initialized simpletrims)", getGoofyMessage());
5363
}

src/main/java/net/diamonddev/simpletrims/common/data/SimpleTrimsDataLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class SimpleTrimsDataLoader implements SimpleSynchronousResourceReloadLis
2323

2424
public static final String ENCODED_PALETTE_CONTAIN_STRING = "simpletrims_encoded_palette";
2525
public static final String NOT_A_TRANSLATION_KEY_LOL = "yeahBroThisIsntATranslationKey";
26-
public static final String REFERABLE_KEY_REGEX_PATTERN = "^[A-Za-z0-9]+\\.[A-Za-z0-9_-]+\\.simpletrims\\.referable\\.material$";
26+
public static final String REFERABLE_KEY_REGEX_PATTERN = "^[A-Za-z0-9]+\\.[A-Za-z0-9_-]+\\.simpletrims\\.referable\\.material\\.trim$";
2727

2828
private static final String MATERIAL_PALETTE_FILEPATH = "encodable_palettes";
2929
private static final String MATERIAL_FILEPATH = "simple_trim_material";
@@ -123,7 +123,7 @@ public String getDescTranslationKey() {
123123
return bean.desc.matNameTranslationKey;
124124
}
125125
public String getReferrableTranslationKey() {
126-
return String.format("%s.%s.simpletrims.referable.material", getNamespace(), getAssetName());
126+
return String.format("%s.%s.simpletrims.referable.material.trim", getNamespace(), getAssetName());
127127
}
128128
public String getDescColorCodeAsHexString() {
129129
return bean.desc.matColorHexcode;

src/main/java/net/diamonddev/simpletrims/mixin/LivingEntityMixin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.diamonddev.simpletrims.mixin;
22

3+
import net.diamonddev.simpletrims.common.SimpleTrims;
34
import net.diamonddev.simpletrims.common.data.TrimApoliPowerUtil;
45
import net.minecraft.entity.Entity;
56
import net.minecraft.entity.EntityType;
@@ -18,6 +19,8 @@ public LivingEntityMixin(EntityType<?> type, World world) {
1819

1920
@Inject(method = "tick", at = @At("HEAD"))
2021
private void simpletrims$applyTrimPowers(CallbackInfo ci) {
21-
//TrimApoliPowerUtil.updateAllTrimPowerApplications((LivingEntity)(Object)this); //todo
22+
//if (getWorld().getGameRules().getBoolean(SimpleTrims.SHOULD_PROVIDE_TRIM_POWERS)) {
23+
// TrimApoliPowerUtil.updateAllTrimPowerApplications((LivingEntity)(Object)this); //todo
24+
//}
2225
}
2326
}

0 commit comments

Comments
 (0)