mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 04:09:51 +00:00
Fix bundles causing crash upon inserting item. Closes #10509
This commit is contained in:
2 files changed
+6
-18
No files matched your search
@@ -1,18 +1,9 @@
|
||||
--- a/net/minecraft/resources/DelegatingOps.java
|
||||
+++ b/net/minecraft/resources/DelegatingOps.java
|
||||
@@ -218,12 +_,30 @@
|
||||
|
||||
@Override
|
||||
public ListBuilder<T> 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<T> mapBuilder() {
|
||||
return new DelegatingOps.DelegateRecordBuilder(this.delegate.mapBuilder());
|
||||
+ }
|
||||
+
|
||||
+ // Forge start
|
||||
+ java.util.Map<ResourceLocation, Object> ctx = new java.util.HashMap<>();
|
||||
+
|
||||
@@ -29,6 +20,8 @@
|
||||
+ public <R> R withContext(ResourceLocation key, Object ctx) {
|
||||
+ this.ctx.put(key, ctx);
|
||||
+ return (R)this;
|
||||
}
|
||||
|
||||
+ }
|
||||
+
|
||||
protected class DelegateListBuilder implements ListBuilder<T> {
|
||||
private final ListBuilder<T> original;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user