From e348ae5b8491097d2e7bf9e4ac7136592283e80d Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 27 Mar 2025 22:09:50 -0700 Subject: [PATCH] Fix bundles causing crash upon inserting item. Closes #10509 --- .../resources/DelegatingOps.java.patch | 19 ++++++------------- .../net/minecraftforge/test/BaseTestMod.java | 5 ----- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/patches/minecraft/net/minecraft/resources/DelegatingOps.java.patch b/patches/minecraft/net/minecraft/resources/DelegatingOps.java.patch index 92525f825e..8fd3072fca 100644 --- a/patches/minecraft/net/minecraft/resources/DelegatingOps.java.patch +++ b/patches/minecraft/net/minecraft/resources/DelegatingOps.java.patch @@ -1,18 +1,9 @@ --- a/net/minecraft/resources/DelegatingOps.java +++ b/net/minecraft/resources/DelegatingOps.java -@@ -218,12 +_,30 @@ - - @Override - public ListBuilder listBuilder() { -- return new DelegatingOps.DelegateListBuilder(this.delegate.listBuilder()); -+ return new ListBuilder.Builder<>(this); +@@ -226,6 +_,24 @@ + return new DelegatingOps.DelegateRecordBuilder(this.delegate.mapBuilder()); } - @Override - public RecordBuilder mapBuilder() { - return new DelegatingOps.DelegateRecordBuilder(this.delegate.mapBuilder()); -+ } -+ + // Forge start + java.util.Map ctx = new java.util.HashMap<>(); + @@ -29,6 +20,8 @@ + public R withContext(ResourceLocation key, Object ctx) { + this.ctx.put(key, ctx); + return (R)this; - } - ++ } ++ protected class DelegateListBuilder implements ListBuilder { + private final ListBuilder original; + diff --git a/src/test/java/net/minecraftforge/test/BaseTestMod.java b/src/test/java/net/minecraftforge/test/BaseTestMod.java index d6f71a546c..8f820f7ef3 100644 --- a/src/test/java/net/minecraftforge/test/BaseTestMod.java +++ b/src/test/java/net/minecraftforge/test/BaseTestMod.java @@ -14,12 +14,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.function.Consumer; import java.util.function.Function; import com.mojang.serialization.Lifecycle; -import com.mojang.serialization.MapCodec; - import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.core.Holder; @@ -29,8 +26,6 @@ import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.data.registries.VanillaRegistries; import net.minecraft.gametest.framework.FunctionGameTestInstance; -import net.minecraft.gametest.framework.GameTestHelper; -import net.minecraft.gametest.framework.GameTestInstance; import net.minecraft.gametest.framework.TestData; import net.minecraft.gametest.framework.TestEnvironmentDefinition; import net.minecraft.resources.ResourceKey;