diff --git a/common/src/main/generated/.cache/0863d6b6d415911b15e9b245a98fa603d174e7c6 b/common/src/main/generated/.cache/0863d6b6d415911b15e9b245a98fa603d174e7c6 index ded64dd4..56730650 100644 --- a/common/src/main/generated/.cache/0863d6b6d415911b15e9b245a98fa603d174e7c6 +++ b/common/src/main/generated/.cache/0863d6b6d415911b15e9b245a98fa603d174e7c6 @@ -1,4 +1,4 @@ -// 1.21.4 Bingo/Tags for minecraft:item +// 1.21.4 -999999999-01-01T00:00:00 Bingo/Tags for minecraft:item b6112420422099eed7aaae79f801a0250bf8764a data/bingo/tags/item/all_mineral_blocks.json 849681cfac44a9f01a440afc75340e33bcdd9c4f data/bingo/tags/item/allowed_heads.json b8fb8aac34ee76a18519bf8341cc6965f6fc775f data/bingo/tags/item/banner_patterns.json diff --git a/common/src/main/generated/.cache/297dc8c0802911a4b1235dc7fd00d8b887ddc7b2 b/common/src/main/generated/.cache/297dc8c0802911a4b1235dc7fd00d8b887ddc7b2 index b49aca6d..258e7e4c 100644 --- a/common/src/main/generated/.cache/297dc8c0802911a4b1235dc7fd00d8b887ddc7b2 +++ b/common/src/main/generated/.cache/297dc8c0802911a4b1235dc7fd00d8b887ddc7b2 @@ -1,4 +1,4 @@ -// 1.21.4 Bingo/Tags for minecraft:block +// 1.21.4 -999999999-01-01T00:00:00 Bingo/Tags for minecraft:block b6112420422099eed7aaae79f801a0250bf8764a data/bingo/tags/block/all_mineral_blocks.json 50d93d5dff6f31f99f861c2df7c4e2dc1ec86e4b data/bingo/tags/block/basic_mineral_blocks.json 085238f24aca214ce9eb3f57ab02370467990f33 data/bingo/tags/block/copper_blocks.json diff --git a/common/src/main/generated/.cache/5e382c1dcfdccab7d9d316094aa5b015abb24861 b/common/src/main/generated/.cache/5e382c1dcfdccab7d9d316094aa5b015abb24861 index b6a3769a..2e0e6b4e 100644 --- a/common/src/main/generated/.cache/5e382c1dcfdccab7d9d316094aa5b015abb24861 +++ b/common/src/main/generated/.cache/5e382c1dcfdccab7d9d316094aa5b015abb24861 @@ -1,4 +1,4 @@ -// 1.21.4 Bingo/Tags for minecraft:worldgen/configured_feature +// 1.21.4 -999999999-01-01T00:00:00 Bingo/Tags for minecraft:worldgen/configured_feature 013d9ea62ec0ddf2721a333297ac7574249a7563 data/bingo/tags/worldgen/configured_feature/huge_fungi.json afade1a0005224f958f1e4506ac161e087293ffb data/bingo/tags/worldgen/configured_feature/huge_mushrooms.json 39430c9384ca4890a27c206f2fd4ae6bf99c8730 data/bingo/tags/worldgen/configured_feature/mega_jungle_trees.json diff --git a/common/src/main/generated/.cache/81117bebc11de4e4a17e141516825a2dcdf80cb4 b/common/src/main/generated/.cache/81117bebc11de4e4a17e141516825a2dcdf80cb4 index 27b49c27..b423a44a 100644 --- a/common/src/main/generated/.cache/81117bebc11de4e4a17e141516825a2dcdf80cb4 +++ b/common/src/main/generated/.cache/81117bebc11de4e4a17e141516825a2dcdf80cb4 @@ -1,3 +1,3 @@ -// 1.21.4 Bingo/Tags for minecraft:damage_type +// 1.21.4 -999999999-01-01T00:00:00 Bingo/Tags for minecraft:damage_type 0b98089d9e5e0278007f19881ffff2e4bdd990b0 data/bingo/tags/damage_type/berry_bush.json d1ee7bd9dc6ab495ba73da1f280cf19c3e54586f data/bingo/tags/damage_type/void.json diff --git a/common/src/main/generated/.cache/abd11bd80d925d09bec653682365b33e1c628412 b/common/src/main/generated/.cache/abd11bd80d925d09bec653682365b33e1c628412 index 260eb977..df5ed880 100644 --- a/common/src/main/generated/.cache/abd11bd80d925d09bec653682365b33e1c628412 +++ b/common/src/main/generated/.cache/abd11bd80d925d09bec653682365b33e1c628412 @@ -1,4 +1,4 @@ -// 1.21.4 Bingo/Tags for minecraft:entity_type +// 1.21.4 -999999999-01-01T00:00:00 Bingo/Tags for minecraft:entity_type a7266d62674990146a1e353a2242927ac8595909 data/bingo/tags/entity_type/hostile.json c32b895c9caf0e47d56aa324a6fe36ebb50f8754 data/bingo/tags/entity_type/passive.json 98330efe44bb1f14c86f1b764de6b749e31e03b1 data/bingo/tags/entity_type/tamable.json diff --git a/common/src/main/generated/.cache/fc6fe7acca2b7156c3a9a1a4a9b4946c68c37823 b/common/src/main/generated/.cache/fc6fe7acca2b7156c3a9a1a4a9b4946c68c37823 index 762bf7b2..6fe0f701 100644 --- a/common/src/main/generated/.cache/fc6fe7acca2b7156c3a9a1a4a9b4946c68c37823 +++ b/common/src/main/generated/.cache/fc6fe7acca2b7156c3a9a1a4a9b4946c68c37823 @@ -1,4 +1,4 @@ -// 1.21.4 Bingo/Bingo goals +// 1.21.4 -999999999-01-01T00:00:00 Bingo/Bingo goals 60933cb93b51bc5046fb820f19ed358af2699f4d data/bingo/bingo/goal/easy/3x3x3_glass_cube.json 49041086f9176f531ee3096073f5f1230a4e0f6a data/bingo/bingo/goal/easy/4x4_paintings.json 86d1d398343deced49a4d91d7b0ca17274600842 data/bingo/bingo/goal/easy/acacia_log.json diff --git a/common/src/main/generated/.cache/fd92b0e9e07895138b66a79af3d38ddbb4f5c5ed b/common/src/main/generated/.cache/fd92b0e9e07895138b66a79af3d38ddbb4f5c5ed index 1dac400c..176261b3 100644 --- a/common/src/main/generated/.cache/fd92b0e9e07895138b66a79af3d38ddbb4f5c5ed +++ b/common/src/main/generated/.cache/fd92b0e9e07895138b66a79af3d38ddbb4f5c5ed @@ -1,4 +1,4 @@ -// 1.21.4 Bingo/Bingo registries +// 1.21.4 -999999999-01-01T00:00:00 Bingo/Bingo registries a9f72075009412853f311f802e5a8cc82026e3b1 data/bingo/bingo/difficulty/easy.json c9569c8872f3f25555109253e266f5c683ed2377 data/bingo/bingo/difficulty/hard.json de8a0760a96282ce0120de5a0068c43bd439bbbe data/bingo/bingo/difficulty/medium.json diff --git a/fabric/src/main/java/io/github/gaming32/bingo/mixin/fabric/MixinHashCache_ProviderCache.java b/fabric/src/main/java/io/github/gaming32/bingo/mixin/fabric/MixinHashCache_ProviderCache.java deleted file mode 100644 index 2712a6a7..00000000 --- a/fabric/src/main/java/io/github/gaming32/bingo/mixin/fabric/MixinHashCache_ProviderCache.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.github.gaming32.bingo.mixin.fabric; - -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.hash.HashCode; -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import com.llamalad7.mixinextras.sugar.Local; -import org.apache.commons.lang3.StringUtils; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; - -import java.io.BufferedWriter; -import java.nio.file.Path; -import java.util.Comparator; -import java.util.Map; - -@Mixin(targets = "net.minecraft.data.HashCache$ProviderCache") -public class MixinHashCache_ProviderCache { - @WrapOperation( - method = "save", - at = @At( - value = "INVOKE", - target = "Ljava/io/BufferedWriter;write(Ljava/lang/String;)V" - ) - ) - private void skipDate(BufferedWriter instance, String str, Operation original, @Local(argsOnly = true) String date) { - //noinspection StringEquality - if (str == date) { - str = StringUtils.substringAfter(str, '\t'); - } - original.call(instance, str); - } - - @WrapOperation( - method = "save", - at = @At( - value = "INVOKE", - target = "Lcom/google/common/collect/ImmutableMap;entrySet()Lcom/google/common/collect/ImmutableSet;", - remap = false - ) - ) - private ImmutableSet> standardizeOrder( - ImmutableMap instance, - Operation>> original - ) { - return original.call(instance) - .stream() - .sorted(Map.Entry.comparingByKey(Comparator.comparing(k -> k.toString().replace('\\', '/')))) - .collect(ImmutableSet.toImmutableSet()); - } - - @WrapOperation( - method = "save", - at = @At( - value = "INVOKE", - target = "Ljava/nio/file/Path;toString()Ljava/lang/String;" - ) - ) - private String standardizeFilePaths(Path instance, Operation original) { - return original.call(instance).replace('\\', '/'); - } -} diff --git a/fabric/src/main/resources/bingo.mixins.json b/fabric/src/main/resources/bingo.mixins.json index bf2f0ed4..688eda72 100644 --- a/fabric/src/main/resources/bingo.mixins.json +++ b/fabric/src/main/resources/bingo.mixins.json @@ -6,7 +6,6 @@ "mixins": [ "MixinBoneMealItem", "MixinDyedItemColor", - "MixinHashCache_ProviderCache", "MixinPlayerList", "MixinServerLevel" ], diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index e8f413bc..c3ad2a71 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -40,7 +40,7 @@ ], "depends": { "fabricloader": ">=0.16.9", - "fabric-api": ">=0.110.0", + "fabric-api": ">=0.111.0", "minecraft": ">=1.21.4 <1.21.5" }, "custom": { diff --git a/gradle.properties b/gradle.properties index ba6cf34b..216316c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ mod_version=1.1.12 maven_group=io.github.gaming32 fabric_loader_version=0.16.9 -fabric_api_version=0.110.5+1.21.4 +fabric_api_version=0.111.0+1.21.4 neoforge_version=21.4.1-beta