From cb286c0bcac4c4a88a80e088cabed8ad4689962a Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 13 Sep 2023 22:01:13 -0400 Subject: [PATCH] 1.20.2-pre3 --- .../mixin/perf/blast_search_trees/MinecraftMixin.java | 3 ++- .../mixin/perf/nbt_memory_usage/CompoundTag1Mixin.java | 4 ++-- fabric/testmod/build.gradle | 2 +- gradle.properties | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java index a87eec04..3cef3b8c 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java @@ -7,6 +7,7 @@ import net.minecraft.world.item.ItemStack; import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.embeddedt.modernfix.platform.ModernFixPlatformHooks; +import org.embeddedt.modernfix.searchtree.DummySearchTree; import org.embeddedt.modernfix.searchtree.SearchTreeProviderRegistry; import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFWErrorCallback; @@ -36,7 +37,7 @@ public abstract class MinecraftMixin { SearchRegistry.TreeBuilderSupplier tagSupplier = list -> provider.getSearchTree(true); this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, nameSupplier); this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, tagSupplier); - //this.searchRegistry.register(SearchRegistry.RECIPE_COLLECTIONS, list -> new DummySearchTree<>()); + this.searchRegistry.register(SearchRegistry.RECIPE_COLLECTIONS, list -> new DummySearchTree<>()); ModernFixPlatformHooks.INSTANCE.registerCreativeSearchTrees(this.searchRegistry, nameSupplier, tagSupplier, this::populateSearchTree); // grab components for all key mappings in order to prevent them from being loaded off-thread later // this populates the LazyLoadedValues diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nbt_memory_usage/CompoundTag1Mixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nbt_memory_usage/CompoundTag1Mixin.java index 8034f856..ed71f082 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nbt_memory_usage/CompoundTag1Mixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nbt_memory_usage/CompoundTag1Mixin.java @@ -10,8 +10,8 @@ import java.util.Map; @Mixin(targets = "net/minecraft/nbt/CompoundTag$1") public class CompoundTag1Mixin { - @ModifyVariable(method = "load(Ljava/io/DataInput;ILnet/minecraft/nbt/NbtAccounter;)Lnet/minecraft/nbt/CompoundTag;", at = @At(value = "INVOKE_ASSIGN", target = "Lcom/google/common/collect/Maps;newHashMap()Ljava/util/HashMap;", remap = false)) - private Map modifyMap(Map map) { + @ModifyVariable(method = "loadCompound", at = @At(value = "INVOKE_ASSIGN", target = "Lcom/google/common/collect/Maps;newHashMap()Ljava/util/HashMap;", remap = false)) + private static Map modifyMap(Map map) { CanonizingStringMap newMap = new CanonizingStringMap<>(); if(map != null) newMap.putAll(map); diff --git a/fabric/testmod/build.gradle b/fabric/testmod/build.gradle index 08d3d446..ae1635cb 100644 --- a/fabric/testmod/build.gradle +++ b/fabric/testmod/build.gradle @@ -28,7 +28,7 @@ dependencies { modImplementation(fabricApi.module("fabric-models-v0", "0.84.0+1.20.1")) { exclude group: 'net.fabricmc', module: 'fabric-loader' } modImplementation(fabricApi.module("fabric-registry-sync-v0", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' } modImplementation(fabricApi.module("fabric-renderer-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' } - modImplementation(fabricApi.module("fabric-rendering-data-attachment-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' } + modImplementation("net.fabricmc.fabric-api:fabric-rendering-data-attachment-v1:0.3.36+92a0d36777") { exclude group: 'net.fabricmc', module: 'fabric-loader' } modImplementation(fabricApi.module("fabric-rendering-fluids-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' } modRuntimeOnly(fabricApi.module("fabric-renderer-indigo", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' } diff --git a/gradle.properties b/gradle.properties index 7de7743a..07ff5265 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ junit_version=5.10.0-M1 mixinextras_version=0.2.0-beta.9 mod_id=modernfix -minecraft_version=1.20.2-pre1 +minecraft_version=1.20.2-pre3 enabled_platforms=fabric forge_version=1.20.1-47.1.3 # parchment_version=2023.07.09 @@ -15,10 +15,10 @@ rei_version=11.0.597 ctm_version=1.20.1-1.1.8+4 kubejs_version=1902.6.0-build.142 rhino_version=1902.2.2-build.268 -supported_minecraft_versions=23w33a +supported_minecraft_versions=1.20.2-pre3 fabric_loader_version=0.14.22 -fabric_api_version=0.86.1+1.20.2 +fabric_api_version=0.88.3+1.20.2 continuity_version=3.0.0-beta.2+1.19.3