From 49cd3d94cca3ba5b67781e52c11a80ce5ac73783 Mon Sep 17 00:00:00 2001 From: Joshua Schirra Date: Mon, 13 Sep 2021 03:44:12 +0200 Subject: [PATCH] more cleanup and translations --- gradle.properties | 2 +- .../soulbound/compat/TrinketsIntegration.java | 32 +++++++++---------- .../soulbound/core/SoulboundConfig.java | 3 +- .../assets/soulbound/lang/en_us.json | 7 ++-- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5ebfd6f..c5f0fab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,6 @@ cloth_version=5.0.38 modmenu_version=2.0.10 # publishing -modrinth_id=0 +modrinth_id=9QyjzbTh modrinth_game_versions=1.17.1 api_package=dev.upcraft.soulbound.api diff --git a/src/main/java/dev/upcraft/soulbound/compat/TrinketsIntegration.java b/src/main/java/dev/upcraft/soulbound/compat/TrinketsIntegration.java index add6a49..dc09bdc 100644 --- a/src/main/java/dev/upcraft/soulbound/compat/TrinketsIntegration.java +++ b/src/main/java/dev/upcraft/soulbound/compat/TrinketsIntegration.java @@ -21,23 +21,6 @@ @SuppressWarnings("unused") // called by reflection public class TrinketsIntegration { - static { - register(); - } - - private static void register() { - TrinketDropCallback.EVENT.register((rule, stack, ref, entity) -> { - if (SoulboundHooks.shouldKeepStack(stack, entity.getRandom())) { - @Nullable SoulboundContainer container = DUMMY_PROVIDER.getContainer(entity); - if (container != null && !SoulboundHooks.createItemProcessor(container).apply(stack).isEmpty()) { - return TrinketEnums.DropRule.KEEP; - } - } - return TrinketEnums.DropRule.DEFAULT; - }); - Registry.register(SoulboundApi.CONTAINERS, new Identifier(Soulbound.MODID, "trinkets_integration"), DUMMY_PROVIDER); - } - public static final SoulboundContainerProvider DUMMY_PROVIDER = entity -> { TrinketComponent component = TrinketsApi.getTrinketComponent(entity).orElse(null); return component != null ? new SoulboundContainer() { @@ -63,5 +46,20 @@ public void restoreFromNbt(NbtCompound nbt, UnaryOperator itemProcess } : null; }; + static { + register(); + } + private static void register() { + TrinketDropCallback.EVENT.register((rule, stack, ref, entity) -> { + if (SoulboundHooks.shouldKeepStack(stack, entity.getRandom())) { + @Nullable SoulboundContainer container = DUMMY_PROVIDER.getContainer(entity); + if (container != null && !SoulboundHooks.createItemProcessor(container).apply(stack).isEmpty()) { + return TrinketEnums.DropRule.KEEP; + } + } + return TrinketEnums.DropRule.DEFAULT; + }); + Registry.register(SoulboundApi.CONTAINERS, new Identifier(Soulbound.MODID, "trinkets_integration"), DUMMY_PROVIDER); + } } diff --git a/src/main/java/dev/upcraft/soulbound/core/SoulboundConfig.java b/src/main/java/dev/upcraft/soulbound/core/SoulboundConfig.java index bf91c87..e468e19 100644 --- a/src/main/java/dev/upcraft/soulbound/core/SoulboundConfig.java +++ b/src/main/java/dev/upcraft/soulbound/core/SoulboundConfig.java @@ -2,9 +2,10 @@ import dev.upcraft.soulbound.Soulbound; import me.shedaniel.autoconfig.ConfigData; +import me.shedaniel.autoconfig.annotation.Config; import net.minecraft.util.math.MathHelper; -@me.shedaniel.autoconfig.annotation.Config(name = Soulbound.MODID) +@Config(name = Soulbound.MODID) public class SoulboundConfig implements ConfigData { public double soulboundPreservationRate = 1.0F; diff --git a/src/main/resources/assets/soulbound/lang/en_us.json b/src/main/resources/assets/soulbound/lang/en_us.json index 5654af5..8e67924 100644 --- a/src/main/resources/assets/soulbound/lang/en_us.json +++ b/src/main/resources/assets/soulbound/lang/en_us.json @@ -1,3 +1,6 @@ { - "enchantment.soulbound.soulbound": "Soulbound" -} \ No newline at end of file + "enchantment.soulbound.soulbound": "Soulbound", + "enchantment.soulbound.soulbound.desc": "Retains items upon death", + "text.autoconfig.soulbound.option.soulboundPreservationRate": "Soulbound Enchantment Preservation Rate", + "text.autoconfig.soulbound.option.soulboundDropChance": "Item Drop Chance" +}