diff --git a/build.gradle.kts b/build.gradle.kts index 07d9c61..730487d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -72,8 +72,8 @@ dependencies { runtimeOnly(libs.greenhouse.config) include(libs.greenhouse.config) - api(libs.greenhouse.config.extensions.gamerules) - include(libs.greenhouse.config.extensions.gamerules) + api(libs.config.extensions.gamerules) + include(libs.config.extensions.gamerules) localCompile(libs.jei.common.api) localCompile(libs.jei.common) diff --git a/gradle.properties b/gradle.properties index 6d45870..196cb32 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,9 +5,9 @@ mod_version = 2.0.0 maven_group = org.vulpixel.menderman mod_id = menderman -minecraft_versions = 26.1, 26.1.1, 26.1.2 -friendly_minecraft_version = 26.1.x +minecraft_versions = 26.2 +friendly_minecraft_version = 26.2.x curseforge_project_id = ?????? modrinth_project_id = C7Hovsc7 -git_commitish = 26.1.x +git_commitish = 26.2.x diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c94e43f..a39fb00 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -minecraft = "26.1.2" +minecraft = "26.2" # Xplat mixin = "0.17.3+mixin.0.8.7" @@ -7,12 +7,12 @@ mixin-extras = "0.5.4" # Fabric fabric-loader = "0.19.3" -fabric-api = "0.155.0+26.2" +fabric-api = "0.161.0+26.2" mod-menu = "20.0.1" # Dependencies greenhouse_config = "3.1.0+26.2.x" -greenhouse_config_extensions_gamerules = "0.1.1+26.2.x" +config_extensions_gamerules = "0.2.0+26.2.x" # Integrations jei = "30.12.0.69" @@ -39,7 +39,7 @@ fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fab mod-menu = { module = "com.terraformersmc:modmenu", version.ref = "mod-menu" } greenhouse_config = { module = "lgbt.greenhouse.config:greenhouse-config", version.ref = "greenhouse_config" } -greenhouse_config_extensions_gamerules = { module = "lgbt.greenhouse.config_extensions:greenhouse-config-extensions-gamerules", version.ref = "greenhouse_config_extensions_gamerules" } +config_extensions_gamerules = { module = "org.vulpixel.config_extensions:config-extensions-gamerules", version.ref = "config_extensions_gamerules" } jei-common-api = { module = "mezz.jei:jei-26.2-common-api", version.ref = "jei" } jei-common = { module = "mezz.jei:jei-26.2-common", version.ref = "jei" } diff --git a/src/datagen/java/org/vulpixel/menderman/datagen/MendermanDataGenerator_TagsProvider_Multiver.java b/src/datagen/java/org/vulpixel/menderman/datagen/MendermanDataGenerator_TagsProvider_Multiver.java index 75a94de..7ace798 100644 --- a/src/datagen/java/org/vulpixel/menderman/datagen/MendermanDataGenerator_TagsProvider_Multiver.java +++ b/src/datagen/java/org/vulpixel/menderman/datagen/MendermanDataGenerator_TagsProvider_Multiver.java @@ -20,14 +20,15 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagsProvider; final class MendermanDataGenerator_TagsProvider_Multiver { // MHs for fast non-reflective access - private static final MethodHandle unbound$FabricTagsProvider$builder; - private final MethodHandle FabricTagsProvider$builder; + private static final MethodHandle FabricTagsProvider$builder; + + private final FabricTagsProvider self; static { try { MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(FabricTagsProvider.class, MethodHandles.lookup()); - unbound$FabricTagsProvider$builder = lookup + FabricTagsProvider$builder = lookup .findVirtual( FabricTagsProvider.class, "builder", @@ -38,14 +39,14 @@ final class MendermanDataGenerator_TagsProvider_Multiver { } } - MendermanDataGenerator_TagsProvider_Multiver(FabricTagsProvider provider) { - FabricTagsProvider$builder = unbound$FabricTagsProvider$builder.bindTo(provider); + MendermanDataGenerator_TagsProvider_Multiver(FabricTagsProvider self) { + this.self = self; } @SuppressWarnings("unchecked") // checked in parameters public TagAppender builder(TagKey tag) { try { - return (TagAppender) FabricTagsProvider$builder.invokeExact(tag); + return (TagAppender) FabricTagsProvider$builder.invokeExact(this.self, tag); } catch (Throwable e) { throw new RuntimeException(e); } diff --git a/src/main/java/org/vulpixel/menderman/api/gamerule/MendermanGamerules.java b/src/main/java/org/vulpixel/menderman/api/gamerule/MendermanGamerules.java index a44e5a2..248569d 100644 --- a/src/main/java/org/vulpixel/menderman/api/gamerule/MendermanGamerules.java +++ b/src/main/java/org/vulpixel/menderman/api/gamerule/MendermanGamerules.java @@ -12,7 +12,7 @@ package org.vulpixel.menderman.api.gamerule; import com.mojang.brigadier.arguments.BoolArgumentType; import com.mojang.serialization.Codec; import lgbt.greenhouse.config.api.v3.GreenhouseConfigHolder; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; import org.vulpixel.menderman.Menderman; import org.vulpixel.menderman.api.config.MendermanConfig; import org.vulpixel.menderman.world.gamerule.MendermanGamerulesInternal; diff --git a/src/main/java/org/vulpixel/menderman/util/multiver/ItemsOrIds.java b/src/main/java/org/vulpixel/menderman/util/multiver/ItemsOrIds.java index d59da89..a03034f 100644 --- a/src/main/java/org/vulpixel/menderman/util/multiver/ItemsOrIds.java +++ b/src/main/java/org/vulpixel/menderman/util/multiver/ItemsOrIds.java @@ -9,28 +9,22 @@ package org.vulpixel.menderman.util.multiver; -import net.minecraft.core.registries.Registries; +import net.minecraft.references.BlockItemIds; import net.minecraft.references.ItemIds; -import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.Item; public final class ItemsOrIds { public static final ResourceKey STICK = ItemIds.STICK; - public static final ResourceKey CARROT = createMc("carrot"); + public static final ResourceKey CARROT = BlockItemIds.CARROT_CROP.item(); public static final ResourceKey PHANTOM_MEMBRANE = ItemIds.PHANTOM_MEMBRANE; public static final ResourceKey LEATHER = ItemIds.LEATHER; public static final ResourceKey FLINT = ItemIds.FLINT; public static final ResourceKey BREEZE_ROD = ItemIds.BREEZE_ROD; public static final ResourceKey PRISMARINE_SHARD = ItemIds.PRISMARINE_SHARD; - public static final ResourceKey TURTLE_SCUTE = ItemIds.TURTLE_SCUTE; - public static final ResourceKey WARPED_FUNGUS = createMc("warped_fungus"); - public static final ResourceKey ARMADILLO_SCUTE = ItemIds.ARMADILLO_SCUTE; + public static final ResourceKey WARPED_FUNGUS = BlockItemIds.WARPED_FUNGUS.item(); + public static final ResourceKey NETHERITE_SCRAP = ItemIds.NETHERITE_SCRAP; private ItemsOrIds() { } - - private static ResourceKey createMc(String name) { - return ResourceKey.create(Registries.ITEM, Identifier.withDefaultNamespace(name)); - } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index eccc355..387ae74 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,8 +32,8 @@ ], "depends": { "fabricloader": ">=0.19", - "fabric-api": ">=0.149.1", - "minecraft": "~26.1", + "fabric-api": ">=0.161.0", + "minecraft": "~26.2", "java": ">=25" }, "custom": { diff --git a/src/main/resources/menderman.mixins.json b/src/main/resources/menderman.mixins.json index e33e66f..f72a8c6 100644 --- a/src/main/resources/menderman.mixins.json +++ b/src/main/resources/menderman.mixins.json @@ -1,21 +1,21 @@ { "required": true, "minVersion": "0.8", - "package": "lgbt.greenhouse.menderman.mixin", + "package": "org.vulpixel.menderman.mixin", "plugin": "org.vulpixel.menderman.MendermanMixinConfigPlugin", "compatibilityLevel": "JAVA_25", "mixins": [ - "lgbt.vulpixel.menderman.mixin.Mixin_AnvilMenu", - "lgbt.vulpixel.menderman.mixin.Mixin_GameRuleRegistryFix", - "lgbt.vulpixel.menderman.mixin.Mixin_GrindstoneMenu", - "lgbt.vulpixel.menderman.mixin.Mixin_MinecraftServer", - "lgbt.vulpixel.menderman.mixin.integration.jei.Mixin_AnvilRecipeCategory", - "lgbt.vulpixel.menderman.mixin.integration.jei.Mixin_AnvilRecipeMaker", - "lgbt.vulpixel.menderman.mixin.integration.jei.Mixin_IRecipeCategory" + "Mixin_AnvilMenu", + "Mixin_GameRuleRegistryFix", + "Mixin_GrindstoneMenu", + "Mixin_MinecraftServer", + "integration.jei.Mixin_AnvilRecipeCategory", + "integration.jei.Mixin_AnvilRecipeMaker", + "integration.jei.Mixin_IRecipeCategory" ], "client": [ - "lgbt.vulpixel.menderman.mixin.client.Mixin_AnvilScreen", - "lgbt.vulpixel.menderman.mixin.client.Mixin_LanguageManager" + "client.Mixin_AnvilScreen", + "client.Mixin_LanguageManager" ], "injectors": { "defaultRequire": 1