diff options
Diffstat (limited to 'forge')
3 files changed, 8 insertions, 8 deletions
diff --git a/forge/build.gradle b/forge/build.gradle index dc61dde24..00e366c75 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -215,9 +215,9 @@ curseforge { releaseType = "release" changelogType = "html" changelog = rootProject.releaseChangelog - addGameVersion "1.16.4" - addGameVersion "1.16.5" - addGameVersion "Java 8" + addGameVersion "1.18" + addGameVersion "1.18.1" + addGameVersion "Java 17" addGameVersion "Forge" relations { requiredDependency "architectury-forge" diff --git a/forge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java b/forge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java index f315c20b6..644fd8231 100644 --- a/forge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java +++ b/forge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java @@ -56,15 +56,15 @@ public class AnnotationUtils { .collect(Collectors.toList()); out: for (ModFileScanData.AnnotationData annotation : data.getAnnotations()) { - if (annotationType.equals(annotation.getAnnotationType())) { + if (annotationType.equals(annotation.annotationType())) { try { - Class<T> clazz = (Class<T>) Class.forName(annotation.getMemberName()); + Class<T> clazz = (Class<T>) Class.forName(annotation.memberName()); if (predicate.test(clazz)) { instances.add(new ImmutableTriple<>(modIds, () -> { try { return clazz.getDeclaredConstructor().newInstance(); } catch (Throwable throwable) { - AnnotationUtils.LOGGER.error("Failed to load plugin: " + annotation.getMemberName(), throwable); + LOGGER.error("Failed to load plugin: " + annotation.memberName(), throwable); return null; } }, clazz)); @@ -76,7 +76,7 @@ public class AnnotationUtils { continue out; t = t.getCause(); } - AnnotationUtils.LOGGER.error("Failed to load plugin: " + annotation.getMemberName(), throwable); + LOGGER.error("Failed to load plugin: " + annotation.memberName(), throwable); } } } diff --git a/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java b/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java index 91becf2f8..d57a39fb9 100644 --- a/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java +++ b/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java @@ -25,7 +25,7 @@ package me.shedaniel.rei.forge; import me.shedaniel.rei.RoughlyEnoughItemsInitializer; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.DatagenModLoader; +import net.minecraftforge.data.loading.DatagenModLoader; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.loading.FMLEnvironment; |