diff --git a/forge/build.gradle b/forge/build.gradle index 650783d7..fd9bfb02 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -41,7 +41,7 @@ dependencies { modCompileOnly("curse.maven:jeresources-240630:3951643") modCompileOnly("me.shedaniel:RoughlyEnoughItems-forge:${rei_version}") { transitive false } modCompileOnly("dev.latvian.mods:kubejs-forge:${kubejs_version}") - modRuntimeOnly("curse.maven:ferritecore-429235:4441949") + //modRuntimeOnly("curse.maven:ferritecore-429235:4441949") modCompileOnly("team.chisel.ctm:CTM:${ctm_version}") modCompileOnly("curse.maven:supermartijncore-454372:4455391") diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/LootTableManagerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/LootTableManagerMixin.java deleted file mode 100644 index 293b2022..00000000 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/LootTableManagerMixin.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.embeddedt.modernfix.forge.mixin.perf.datapack_reload_exceptions; - -import net.minecraft.world.level.storage.loot.LootTables; -import org.slf4j.Logger; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(LootTables.class) -public class LootTableManagerMixin { - @Redirect(method = "*(Lnet/minecraft/server/packs/resources/ResourceManager;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/resources/ResourceLocation;Lcom/google/gson/JsonElement;)V", - at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false)) - private void logWithoutStacktrace(Logger instance, String s, Object location, Object exc) { - instance.error(s + ": {}", location, exc.toString()); - } -} diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java index 8e404d09..db3fc0c9 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java @@ -48,11 +48,6 @@ public class ForgeRegistryMixin { expectedNextBit = -1; } - @Inject(method = "createAndAddDummy", at = @At(value = "INVOKE", target = "Ljava/util/BitSet;clear(I)V")) - private void clearBitCache2(CallbackInfo ci) { - expectedNextBit = -1; - } - @Redirect(method = "add(ILnet/minecraft/resources/ResourceLocation;Ljava/lang/Object;Ljava/lang/String;)I", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;trace(Lorg/apache/logging/log4j/Marker;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V")) private void skipTrace(Logger logger, Marker marker, String s, Object o, Object o1, Object o2, Object o3, Object o4) { diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 29a2c07a..1f6bdc70 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -6,7 +6,7 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader = "javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion = "[45,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion = "[46,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. license = "GNU LGPL 3.0" @@ -40,7 +40,7 @@ modId = "forge" #mandatory # Does this dependency have to exist - if not, ordering below must be specified mandatory = true #mandatory # The version range of the dependency -versionRange = "[45.0.63,)" #mandatory +versionRange = "[46.0.1,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering = "NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER @@ -50,7 +50,7 @@ side = "BOTH" modId = "minecraft" mandatory = true # This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange = "[1.19.4, 1.20)" +versionRange = "[1.20, 1.21)" ordering = "NONE" side = "BOTH" [[dependencies.modernfix]] diff --git a/gradle.properties b/gradle.properties index e6138d5f..7be0f9fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx2G mod_id=modernfix minecraft_version=1.20 -enabled_platforms=fabric -forge_version=1.19.4-45.0.22 +enabled_platforms=fabric,forge +forge_version=1.20-46.0.1 parchment_version=2023.03.12 refined_storage_version=4392788 jei_version=13.1.0.2 diff --git a/settings.gradle b/settings.gradle index a94653fc..8a77caf9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,6 +9,6 @@ pluginManagement { include("common") include("fabric") -//include("forge") +include("forge") rootProject.name = 'modernfix'