upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3126 - duplicate stat id error - don't use the "universal iterators" in statbuilding, use the one without the duplicate entries. (The duplicate entry one is for rendering setup)

Browse Source
This commit is contained in:
cpw committed 2016-07-28 15:56:30 -04:00
1 parent 543156a008
commit bc82f2ae5a
2 files changed
+31 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

patches/minecraft/net/minecraft/stats/StatList.java.patch
+28 -4
View File
@@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/stats/StatList.java
+++ ../src-work/minecraft/net/minecraft/stats/StatList.java
@@ -162,7 +162,7 @@
@@ -162,12 +162,12 @@
}
}
@@ -9,7 +9,13 @@
}
private static void func_151181_c()
@@ -184,7 +184,7 @@
{
- for (Block block : Block.field_149771_c)
+ for (Block block : net.minecraftforge.fml.common.registry.GameData.getBlockRegistry().typeSafeIterable())
{
Item item = Item.func_150898_a(block);
@@ -184,12 +184,12 @@
}
}
@@ -18,7 +24,13 @@
}
private static void func_75925_c()
@@ -208,7 +208,7 @@
{
- for (Item item : Item.field_150901_e)
+ for (Item item : net.minecraftforge.fml.common.registry.GameData.getItemRegistry().typeSafeIterable())
{
if (item != null)
{
@@ -208,12 +208,12 @@
}
}
@@ -27,7 +39,13 @@
}
private static void func_151179_e()
@@ -227,7 +227,7 @@
{
- for (Item item : Item.field_150901_e)
+ for (Item item : net.minecraftforge.fml.common.registry.GameData.getItemRegistry().typeSafeIterable())
{
if (item != null)
{
@@ -227,12 +227,12 @@
}
}
@@ -36,6 +54,12 @@
}
private static void func_188054_f()
{
- for (Item item : Item.field_150901_e)
+ for (Item item : net.minecraftforge.fml.common.registry.GameData.getItemRegistry().typeSafeIterable())
{
if (item != null)
{
@@ -247,7 +247,7 @@
}
}
src/test/java/net/minecraftforge/fml/common/registry/SubstitutionInjectionTest.java
+3
View File
@@ -4,6 +4,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockDirt;
import net.minecraft.init.Blocks;
import net.minecraft.init.Bootstrap;
import net.minecraft.stats.StatList;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.DummyModContainer;
import net.minecraftforge.fml.common.Loader;
@@ -45,6 +46,8 @@ public class SubstitutionInjectionTest
GameRegistry.addSubstitutionAlias("minecraft:dirt", GameRegistry.Type.BLOCK, toSub);
PersistentRegistryManager.freezeData();
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
// This should not throw an exception
StatList.reinit();
final FMLControlledNamespacedRegistry<Block> blockRegistry = (FMLControlledNamespacedRegistry<Block>)PersistentRegistryManager.findRegistryByType(Block.class);