diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/ModBlocks.java | 5 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index 09bf3eb4af..c1ca513f01 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -16,6 +16,7 @@ import gtPlusPlus.core.block.machine.bedrock.Mining_Pipe_Fake; import gtPlusPlus.core.fluids.FluidRegistryHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner; import net.minecraftforge.fluids.Fluid; public final class ModBlocks { @@ -60,6 +61,8 @@ public final class ModBlocks { public static Block blockXpConverter; public static Block blockCompressedObsidian; public static Block blockNet; + + public static Block blockCustomMobSpawner; public static void init() { Logger.INFO("Initializing Blocks."); @@ -93,6 +96,8 @@ public final class ModBlocks { blockXpConverter = new BlockTankXpConverter(); blockCompressedObsidian = new BlockCompressedObsidian(); blockNet = new BlockNet(); + + blockCustomMobSpawner = new BlockGenericSpawner(); blockFakeMiningPipe = new Mining_Pipe_Fake(); blockFakeMiningHead = new Mining_Head_Fake(); diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index ae33c8428d..af384565a9 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -66,12 +66,11 @@ public class ReflectionUtils { public static boolean setField(final Object object, final String fieldName, final Object fieldValue) { Class<?> clazz = object.getClass(); - if (clazz != null) { + while (clazz != null) { try { final Field field = getField(clazz, fieldName); if (field != null) { - makeAccessible(field); - field.set(object, fieldValue); + setValue(object, field, fieldValue); return true; } } catch (final NoSuchFieldException e) { |