From 3fa507d6d1c813579214610d552f20dfb57173fa Mon Sep 17 00:00:00 2001 From: tterrag Date: Mon, 18 Feb 2019 12:03:02 -0500 Subject: [PATCH] Make SpawnPlacementType extensible, remove from ArmorMaterial --- .../EntitySpawnPlacementRegistry.java.patch | 10 +++++++--- .../minecraft/item/ArmorMaterial.java.patch | 20 ------------------- 2 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 patches/minecraft/net/minecraft/item/ArmorMaterial.java.patch diff --git a/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java.patch b/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java.patch index a864accde..63c07636b 100644 --- a/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java.patch @@ -8,13 +8,17 @@ field_209347_a.put(p_209346_0_, new EntitySpawnPlacementRegistry.Entry(p_209346_2_, p_209346_1_, p_209346_3_)); } -@@ -109,5 +110,20 @@ - public static enum SpawnPlacementType { +@@ -106,8 +107,23 @@ + } + } + +- public static enum SpawnPlacementType { ++ public static enum SpawnPlacementType implements net.minecraftforge.common.IExtensibleEnum { ON_GROUND, IN_WATER; + + public static SpawnPlacementType create(String name, net.minecraftforge.common.util.TriPredicate> predicate) { -+ return null; ++ throw new IllegalStateException("Enum not extended"); + } + + private net.minecraftforge.common.util.TriPredicate> predicate; diff --git a/patches/minecraft/net/minecraft/item/ArmorMaterial.java.patch b/patches/minecraft/net/minecraft/item/ArmorMaterial.java.patch deleted file mode 100644 index e03ab0102..000000000 --- a/patches/minecraft/net/minecraft/item/ArmorMaterial.java.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/net/minecraft/item/ArmorMaterial.java -+++ b/net/minecraft/item/ArmorMaterial.java -@@ -10,7 +10,7 @@ - import net.minecraftforge.api.distmarker.Dist; - import net.minecraftforge.api.distmarker.OnlyIn; - --public enum ArmorMaterial implements IArmorMaterial { -+public enum ArmorMaterial implements IArmorMaterial, net.minecraftforge.common.IExtensibleEnum { - LEATHER("leather", 5, new int[]{1, 2, 3, 1}, 15, SoundEvents.field_187728_s, 0.0F, () -> { - return Ingredient.func_199804_a(Items.field_151116_aA); - }), -@@ -77,4 +77,8 @@ - public float func_200901_e() { - return this.field_189417_k; - } -+ -+ public static ArmorMaterial create(String name, String p_i48533_3_, int p_i48533_4_, int[] p_i48533_5_, int p_i48533_6_, SoundEvent p_i48533_7_, float p_i48533_8_, Supplier p_i48533_9_) { -+ throw new IllegalStateException("Enum not extended"); -+ } - }