Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ public static void handle(Supplier<MinecraftServer> 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;
Expand Down
1 change: 1 addition & 0 deletions Fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion Fabric/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
9 changes: 9 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down