From ac4f3bb6c1e6047a5c363a1633168f143ee28834 Mon Sep 17 00:00:00 2001 From: MAGGen-hub <56871670+MAGGen-hub@users.noreply.github.com> Date: Mon, 27 Mar 2023 20:07:55 +0300 Subject: [PATCH 1/6] Trinkets repositorys add. --- build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.gradle b/build.gradle index 1d169b6..2cf05ca 100644 --- a/build.gradle +++ b/build.gradle @@ -47,6 +47,15 @@ subprojects { name = 'BlameJared Maven (CrT / Bookshelf)' url = 'https://maven.blamejared.com' } + + maven { + name = "TerraformersMC" + url = "https://maven.terraformersmc.com/" + } + maven { + name = "Ladysnake Libs" + url = "https://ladysnake.jfrog.io/artifactory/mods" + } } tasks.withType(JavaCompile).configureEach { From 22ac0d2d9da895d5e4101026d5038e81b9963a46 Mon Sep 17 00:00:00 2001 From: MAGGen-hub <56871670+MAGGen-hub@users.noreply.github.com> Date: Mon, 27 Mar 2023 20:09:20 +0300 Subject: [PATCH 2/6] Trinkets dependensy add. --- Fabric/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 1edba5f..9bf72c1 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -12,6 +12,7 @@ dependencies { mappings loom.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" + modImplementation "dev.emi:trinkets:${trinkets_version}" implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' implementation project(":Common") } From b9b1c3e6fda75d0af9e494387d50bf97da2147ad Mon Sep 17 00:00:00 2001 From: MAGGen-hub <56871670+MAGGen-hub@users.noreply.github.com> Date: Mon, 27 Mar 2023 20:10:08 +0300 Subject: [PATCH 3/6] Changed trinkets version. --- Fabric/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fabric/gradle.properties b/Fabric/gradle.properties index 41a6ccd..8f6440f 100644 --- a/Fabric/gradle.properties +++ b/Fabric/gradle.properties @@ -7,7 +7,7 @@ minecraft_version=1.19.2 dossier_version=0.6.0 reach_entity_attributes_version=2.1.1 #gravestones_version=v1.9 -trinkets_version=3.3.0 +trinkets_version=3.4.1 # CurseForge Metadata curseforge_slug=campanion From 53925ccb792e9e172a85c635c582e68baa2bacc5 Mon Sep 17 00:00:00 2001 From: MAGGen-hub <56871670+MAGGen-hub@users.noreply.github.com> Date: Mon, 27 Mar 2023 20:12:46 +0300 Subject: [PATCH 4/6] Base support for trinkets. I know it cursed, but it works... --- .../campanion/CampanionFabric.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Fabric/src/main/java/com/terraformersmc/campanion/CampanionFabric.java b/Fabric/src/main/java/com/terraformersmc/campanion/CampanionFabric.java index b944cec..0c2a1c6 100644 --- a/Fabric/src/main/java/com/terraformersmc/campanion/CampanionFabric.java +++ b/Fabric/src/main/java/com/terraformersmc/campanion/CampanionFabric.java @@ -18,6 +18,27 @@ public class CampanionFabric implements ModInitializer { @Override public void onInitialize() { Campanion.init(); + + CampanionConfigManager.setTrinketsSupport(FabricLoader.getInstance().isModLoaded("trinkets") && CampanionConfigManager.getConfig().isTrinketsBackpacksEnabled()); + //Support for trinkets + if (CampanionConfigManager.IsTrinketsEnabled()) { + TrinketsApi.registerTrinketPredicate(new ResourceLocation("campanion", "backpacks"), (stack, ref, entity) -> { + if (stack.is(CampanionItemTags.BACKPACKS)) { + return CampanionConfigManager.getConfig().isTrinketsBackpacksEnabled() ? TriState.TRUE : TriState.FALSE; + } + return TriState.DEFAULT; + }); + + C2SOpenBackpack.TrinketSupportFunc = (player) -> { + TrinketComponent component = TrinketsApi.getTrinketComponent(player).orElse(null); + if (component != null && component.isEquipped(itemStack -> itemStack.getItem() instanceof BackpackItem)) { + return component.getEquipped(itemStack -> itemStack.getItem() instanceof BackpackItem).get(0).getB(); + } + return null; + }; + } + + Campanion.registerDispenserBehavior(); CampanionStats.loadClass(); From d800925b3e3e94ea1f5b022467c324ba12cfe140 Mon Sep 17 00:00:00 2001 From: MAGGen-hub <56871670+MAGGen-hub@users.noreply.github.com> Date: Mon, 27 Mar 2023 20:15:40 +0300 Subject: [PATCH 5/6] Trinkets support. --- .../campanion/config/CampanionConfigManager.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Common/src/main/java/com/terraformersmc/campanion/config/CampanionConfigManager.java b/Common/src/main/java/com/terraformersmc/campanion/config/CampanionConfigManager.java index 901b2a2..e6a12c9 100644 --- a/Common/src/main/java/com/terraformersmc/campanion/config/CampanionConfigManager.java +++ b/Common/src/main/java/com/terraformersmc/campanion/config/CampanionConfigManager.java @@ -7,6 +7,7 @@ public class CampanionConfigManager { private static File file; private static CampanionConfig config; + private static boolean TrinketsEnabled = false; private static void prepareBiomeConfigFile() { if (file != null) { @@ -69,4 +70,13 @@ public static void save() { public static CampanionConfig getConfig() { return config; } + + public static boolean IsTrinketsEnabled() { + return TrinketsEnabled; + } + + public static void setTrinketsSupport(boolean value){ + TrinketsEnabled = value; + } +} } From 6f98d31264dcf745e2e6e79161e964eb43b95fba Mon Sep 17 00:00:00 2001 From: MAGGen-hub <56871670+MAGGen-hub@users.noreply.github.com> Date: Mon, 27 Mar 2023 20:17:27 +0300 Subject: [PATCH 6/6] Trinkets support on backpack_open key pressed. --- .../terraformersmc/campanion/network/C2SOpenBackpack.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Common/src/main/java/com/terraformersmc/campanion/network/C2SOpenBackpack.java b/Common/src/main/java/com/terraformersmc/campanion/network/C2SOpenBackpack.java index d411e2f..0f66eb7 100644 --- a/Common/src/main/java/com/terraformersmc/campanion/network/C2SOpenBackpack.java +++ b/Common/src/main/java/com/terraformersmc/campanion/network/C2SOpenBackpack.java @@ -22,6 +22,11 @@ public static void handle(Supplier server, ServerPlayer player, // stack = component.getEquipped(itemStack -> itemStack.getItem() instanceof BackpackItem).get(0).getB(); // } // } + + if (CampanionConfigManager.IsTrinketsEnabled()) { + ItemStack temp = TrinketSupportFunc.apply(player); + if (temp != null) stack = temp; + } if (stack.getItem() instanceof BackpackItem) { BackpackItem.Type type = ((BackpackItem) stack.getItem()).type;