From 1b4b4cce7a1a62a107b8f2b3440f4eaaa3529d6a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Dec 2017 12:32:46 -0600 Subject: [PATCH] Fix #2462 (and a compile error derp from before) --- src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java | 2 +- .../common/block/subtile/generating/SubTileNarslimmus.java | 2 +- src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index c4fe38406..6afe79d42 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -83,7 +83,7 @@ public class LexiconEntry implements Comparable { } public String getTagline() { - return null; // Override this if you want a tagline. You probably do + return ""; // Override this if you want a tagline. You probably do } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index 415a2fd98..7477a9c7f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -95,7 +95,7 @@ public class SubTileNarslimmus extends SubTileGenerating { event.getEntityLiving().getEntityData().setBoolean(TAG_WORLD_SPAWNED, true); } - private static boolean isSlimeChunk(World world, int x, int z) { + public static boolean isSlimeChunk(World world, int x, int z) { Chunk chunk = world.getChunkFromBlockCoords(new BlockPos(x, 0, z)); return chunk.getRandomWithSeed(987234911L).nextInt(10) == 0; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 9ba239b15..60bed0489 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -33,7 +33,7 @@ public class ItemSlimeBottle extends ItemMod { if(!world.isRemote) { int x = MathHelper.floor(entity.posX); int z = MathHelper.floor(entity.posZ); - boolean slime = SubTileNarslimmus.SpawnIntercepter.isSlimeChunk(world, x, z); + boolean slime = SubTileNarslimmus.isSlimeChunk(world, x, z); int meta = stack.getItemDamage(); int newMeta = slime ? 1 : 0; if(meta != newMeta)