aboutsummaryrefslogtreecommitdiff
path: root/fabric/src
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-02-09 20:17:34 +0800
committershedaniel <daniel@shedaniel.me>2022-02-09 20:17:34 +0800
commitcaa850ff55576c8aef92c28ab5dcf87a319f6e3a (patch)
tree4fbb17d0d7ee6c3d523ff5839288315e483accea /fabric/src
parent48ef9ff7f4b1be74006837b51a683d5e8b9bdc52 (diff)
downloadRoughlyEnoughItems-caa850ff55576c8aef92c28ab5dcf87a319f6e3a.tar.gz
RoughlyEnoughItems-caa850ff55576c8aef92c28ab5dcf87a319f6e3a.tar.bz2
RoughlyEnoughItems-caa850ff55576c8aef92c28ab5dcf87a319f6e3a.zip
Migrate to Cloth Config's ValueAnimator, and add option to cache entry renders
Diffstat (limited to 'fabric/src')
-rw-r--r--fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java12
-rw-r--r--fabric/src/main/resources/fabric.mod.json3
2 files changed, 6 insertions, 9 deletions
diff --git a/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java b/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java
index 0a59b313d..391b8ce9e 100644
--- a/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java
+++ b/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java
@@ -62,7 +62,7 @@ public class RoughlyEnoughItemsInitializerImpl {
RoughlyEnoughItemsState.error("Architectury API is not installed!", "https://www.curseforge.com/minecraft/mc-mods/architectury-fabric/files/all");
} else {
Version version = FabricLoader.getInstance().getModContainer("architectury").get().getMetadata().getVersion();
-
+
try {
if (version instanceof SemanticVersion && SemanticVersion.parse("2.6.0").compareTo((SemanticVersion) version) > 0) {
RoughlyEnoughItemsState.error("Architectury API is too old, please update!", "https://www.curseforge.com/minecraft/mc-mods/architectury-fabric/files/all");
@@ -72,14 +72,8 @@ public class RoughlyEnoughItemsInitializerImpl {
}
}
if (isClient()) {
- try {
- if (!FabricLoader.getInstance().isModLoaded("cloth-config2")) {
- RoughlyEnoughItemsState.error("Cloth Config is not installed!", "https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/all");
- } else if (SemanticVersion.parse(FabricLoader.getInstance().getModContainer("cloth-config2").get().getMetadata().getVersion().getFriendlyString()).compareTo(SemanticVersion.parse("5.1")) < 0) {
- RoughlyEnoughItemsState.error("Your Cloth Config version is too old!", "https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/all");
- }
- } catch (VersionParsingException e) {
- e.printStackTrace();
+ if (!FabricLoader.getInstance().isModLoaded("cloth-config2")) {
+ RoughlyEnoughItemsState.error("Cloth Config is not installed!", "https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/all");
}
}
}
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 7695e8c23..6f203ae40 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -33,6 +33,9 @@
"mixins": [
"rei.mixins.json"
],
+ "breaks": {
+ "cloth-config2": "<6.2-"
+ },
"custom": {
"rei:translators": {
"English": [