Skip to content

Commit

Permalink
feat: reenable AU integration
Browse files Browse the repository at this point in the history
  • Loading branch information
klikli-dev committed Jun 14, 2023
1 parent 7139531 commit e667526
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
10 changes: 3 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -190,17 +190,13 @@ dependencies {
implementation fg.deobf("net.tslat.smartbrainlib:SmartBrainLib-forge-${smartbrainlib_minecraft_version}:${smartbrainlib_version}")

//almostunified
//TODO: reenable once updated
// compileOnly fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}")
// runtimeOnly fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}")
implementation fg.deobf("com.almostreliable.mods:almostunified-forge:${minecraft_version}-${almost_unified_version}")

//modonomicon
implementation fg.deobf("com.klikli_dev:modonomicon:${minecraft_version}-${modonomicon_version}")
//we build against full jar because we NEED IT ALL

//theurgy
compileOnly fg.deobf("com.klikli_dev:theurgy:${minecraft_version}-${theurgy_version}")
runtimeOnly fg.deobf("com.klikli_dev:theurgy:${minecraft_version}-${theurgy_version}")
implementation fg.deobf("com.klikli_dev:theurgy:${minecraft_version}-${theurgy_version}")

//runtime only helper mods for dev env, placed in ./runtime-mods, example: Hwyla-forge-1.10.11-B78_1.16.2.jar
//runtimeOnly fg.deobf("ignoredvalue:Hwyla:forge-1.10.11-B78_1.16.2")
Expand Down Expand Up @@ -241,7 +237,7 @@ def replaceProperties = [
curios_version_range : curios_version_range,
geckolib_version_range : geckolib_version_range,
smartbrainlib_version_range : smartbrainlib_version_range,
almostunified_version_range : almostunified_version_range,
almost_unified_version_range : almost_unified_version_range,
modonomicon_version_range : modonomicon_version_range,
theurgy_version_range : theurgy_version_range,
per_viam_invenire_version_range: per_viam_invenire_version_range,
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ geckolib_version_range=[4.2,)
smartbrainlib_minecraft_version=1.20
smartbrainlib_version=1.11
smartbrainlib_version_range=[1.11,)
almostunified_version=XYZ
almostunified_version_range=[0,)
almost_unified_version=0.5.0
almost_unified_version_range=[0.5.0,)
modonomicon_version=1.33.1
modonomicon_version_range=[1.32.2,)
theurgy_version=1.3.5
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.klikli_dev.occultism.integration.almostunified;

import com.almostreliable.unified.api.AlmostUnifiedLookup;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraftforge.fml.ModList;
Expand All @@ -19,9 +20,7 @@ public static Item getPreferredItemForTag(TagKey<Item> tag) {

public static class AlmostUnifiedHelper {
public static Item getPreferredItemForTag(TagKey<Item> tag) {
//TODO: enable once updated
// return AlmostUnifiedLookup.INSTANCE.getPreferredItemForTag(tag);
return null;
return AlmostUnifiedLookup.INSTANCE.getPreferredItemForTag(tag);
}
}
}
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ side = "BOTH"
[[dependencies.occultism]]
modId = "almostunified"
mandatory = false
versionRange = "${almostunified_version_range}"
versionRange = "${almost_unified_version_range}"
side = "BOTH"

[[dependencies.occultism]]
Expand Down

0 comments on commit e667526

Please sign in to comment.