From 435dc1c02d89744a7a827ea8d1704217207144a8 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 29 Jan 2019 12:33:11 +0200 Subject: [PATCH] Possibly fixed issues with Pam's Harvestcraft --- .../unicopia/forgebullshit/RegistryLockSpinner.java | 2 -- .../java/com/minelittlepony/unicopia/item/ItemApple.java | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/RegistryLockSpinner.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/RegistryLockSpinner.java index 9f3fbbf3..25eb2ac9 100644 --- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/RegistryLockSpinner.java +++ b/src/main/java/com/minelittlepony/unicopia/forgebullshit/RegistryLockSpinner.java @@ -4,8 +4,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import net.minecraft.util.registry.RegistryNamespaced; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.registries.ILockableRegistry; public final class RegistryLockSpinner { diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java b/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java index dbc8d7a8..4bf71945 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java +++ b/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java @@ -72,7 +72,10 @@ public class ItemApple extends ItemFood { public ItemApple(String domain, String name) { super(4, 3, false); setTranslationKey(name); - setRegistryName(domain, name); + + if (!"minecraft".contentEquals(domain)) { + setRegistryName(domain, name); + } } public ItemApple setSubTypes(String... types) {