From ceb822b1cbad002dc4637993565eeb641185c22e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 2 Dec 2017 23:38:32 +0000 Subject: [PATCH 01/16] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 8e6a485c5..9eef87867 100644 --- a/contributors.properties +++ b/contributors.properties @@ -89,3 +89,4 @@ frankgrandpa=3 wee_wee123=2 fire_spirit=1 xeanwolf20=11 +aureiio=0 From ceb1af2a38f704d1a57ae33e366d0266a024c6bd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Dec 2017 18:46:38 -0600 Subject: [PATCH 02/16] Fix manastorm charge/corporea index star animations being choppy --- .../java/vazkii/botania/client/core/helper/RenderHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index cca59e325..f5587de04 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -140,7 +140,7 @@ public final class RenderHelper { public static void renderStar(int color, float xScale, float yScale, float zScale, long seed) { Tessellator tessellator = Tessellator.getInstance(); - int ticks = ClientTickHandler.ticksInGame % 200; + float ticks = (ClientTickHandler.ticksInGame % 200) + ClientTickHandler.partialTicks; if (ticks >= 100) ticks = 200 - ticks - 1; From 56cf0aa73b4fb21aa4176fa0cc2e7765ecb5011a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Dec 2017 21:52:01 -0600 Subject: [PATCH 03/16] Fix loonium loot distribution being skewed, closes #2293 --- .../block/subtile/functional/SubTileLoonuim.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 7c1056a70..a55782482 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -45,6 +45,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.Collections; import java.util.List; import java.util.Random; @@ -70,7 +71,10 @@ public class SubTileLoonuim extends SubTileFunctional { List stacks = world.getLootTableManager().getLootTableFromLocation(lootTable).generateLootForPools(rand, new LootContext.Builder((WorldServer) world).build()); if (stacks.isEmpty()) return; - else stack = stacks.get(0); + else { + Collections.shuffle(stacks); + stack = stacks.get(0); + } } while(stack.isEmpty() || BotaniaAPI.looniumBlacklist.contains(stack.getItem())); int bound = RANGE * 2 + 1; @@ -96,18 +100,18 @@ public class SubTileLoonuim extends SubTileFunctional { else if(world.rand.nextInt(10) == 0) { entity = new EntityCreeper(world); if(world.rand.nextInt(200) == 0) - ((EntityCreeper) entity).onStruckByLightning(null); + entity.onStruckByLightning(null); } else switch(world.rand.nextInt(3)) { - case 0: - entity = new EntityZombie(world); + case 0: if(world.rand.nextInt(10) == 0) entity = new EntityHusk(world); + else entity = new EntityZombie(world); break; case 1: - entity = new EntitySkeleton(world); if(world.rand.nextInt(10) == 0) entity = new EntityStray(world); + else entity = new EntitySkeleton(world); break; case 2: if(world.rand.nextInt(10) == 0) @@ -132,7 +136,7 @@ public class SubTileLoonuim extends SubTileFunctional { entity.onInitialSpawn(world.getDifficultyForLocation(pos), null); world.spawnEntity(entity); - SubTileSpectranthemum.spawnExplosionParticles(entity, 5); + entity.spawnExplosionParticle(); mana -= COST; sync(); From eb84402b13a9095eccdf96824969b99065c8e849 Mon Sep 17 00:00:00 2001 From: Kitten Date: Thu, 7 Dec 2017 14:47:45 +0000 Subject: [PATCH 04/16] Fix incorrect step assist height (#2446) * Fix incorrect step assist height * Boi, I messed up, oh no, now it's correct --- .../botania/common/item/equipment/bauble/ItemTravelBelt.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 1f977ce05..df14f9eef 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -91,7 +91,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs if(player.isSneaking()) player.stepHeight = 0.60001F; // Not 0.6F because that is the default - else player.stepHeight = 1F; + else player.stepHeight = 1.25F; } else { player.stepHeight = 0.6F; @@ -99,7 +99,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs } } else if(shouldPlayerHaveStepup(player)) { playersWithStepup.add(s); - player.stepHeight = 1F; + player.stepHeight = 1.25F; } } } From 6e275ef8d20a2f7c8e2fd30c50cd50201395f358 Mon Sep 17 00:00:00 2001 From: codycoolwaffle Date: Thu, 7 Dec 2017 06:48:04 -0800 Subject: [PATCH 05/16] Update readme to use CurseForge (#2457) It's almost 2018. Minecraft Forums are basically dead. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 940f2c963..7f9eb8d1c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![](web/img/logo.png) Welcome to the Botania repository. -Botania is a [Minecraft](https://minecraft.net/) mod based on adding natural magic to the game. It's inspired by other magic mods, such as [Thaumcraft](http://www.minecraftforum.net/topic/2011841-) or [Blood Magic](http://www.minecraftforum.net/topic/1899223-). +Botania is a [Minecraft](https://minecraft.net/) mod based on adding natural magic to the game. It's inspired by other magic mods, such as [Thaumcraft](https://www.curseforge.com/minecraft/mc-mods/thaumcraft) or [Blood Magic](https://www.curseforge.com/minecraft/mc-mods/blood-magic). The current iteration of Botania for 1.10 is made possible thanks to the massive help by the part of williewillus, who ported the mod through 1.8, 1.9 and 1.10, so go buy him a beer or something, I dunno, he's pretty cool. From 0634799e8078264e11291d195631495d949c1379 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Dec 2017 08:49:38 -0600 Subject: [PATCH 06/16] 9cedab8 but for spreaders too --- .../vazkii/botania/common/block/tile/mana/TileSpreader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 59a28d2b0..3bfa8777d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -178,7 +178,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public void onChunkUnload() { super.onChunkUnload(); - invalidate(); + ManaNetworkEvent.removeCollector(this); } @Override From eb86921f1daa4116f95d04df6f63a07c1a03952d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Dec 2017 12:55:55 -0600 Subject: [PATCH 07/16] Fix #2429 --- .../item/equipment/bauble/ItemDodgeRing.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java index d3d9e93e6..60cd2a463 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java @@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.InputEvent.KeyInputEvent; import net.minecraftforge.fml.relauncher.Side; @@ -34,23 +35,22 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.network.PacketDodge; import vazkii.botania.common.network.PacketHandler; +@Mod.EventBusSubscriber(Side.CLIENT) public class ItemDodgeRing extends ItemBauble { public static final String TAG_DODGE_COOLDOWN = "dodgeCooldown"; public static final int MAX_CD = 20; - int leftDown, rightDown; + private static boolean oldLeftDown, oldRightDown; + private static int leftDown, rightDown; public ItemDodgeRing() { super(LibItemNames.DODGE_RING); - - if(FMLCommonHandler.instance().getSide().isClient()) - MinecraftForge.EVENT_BUS.register(this); } @SubscribeEvent @SideOnly(Side.CLIENT) - public void onKeyDown(KeyInputEvent event) { + public static void onKeyDown(KeyInputEvent event) { Minecraft mc = Minecraft.getMinecraft(); IItemHandler baublesInv = BaublesApi.getBaublesHandler(mc.player); @@ -65,19 +65,22 @@ public class ItemDodgeRing extends ItemBauble { return; int threshold = 4; - if(mc.gameSettings.keyBindLeft.isKeyDown()) { + if(mc.gameSettings.keyBindLeft.isKeyDown() && !oldLeftDown) { int oldLeft = leftDown; leftDown = ClientTickHandler.ticksInGame; if(leftDown - oldLeft < threshold) dodge(mc.player, true); - } else if(mc.gameSettings.keyBindRight.isKeyDown()) { + } else if(mc.gameSettings.keyBindRight.isKeyDown() && !oldRightDown) { int oldRight = rightDown; rightDown = ClientTickHandler.ticksInGame; if(rightDown - oldRight < threshold) dodge(mc.player, false); } + + oldLeftDown = mc.gameSettings.keyBindLeft.isKeyDown(); + oldRightDown = mc.gameSettings.keyBindRight.isKeyDown(); } @Override @@ -87,8 +90,7 @@ public class ItemDodgeRing extends ItemBauble { ItemNBTHelper.setInt(stack, TAG_DODGE_COOLDOWN, cd - 1); } - @SideOnly(Side.CLIENT) - public void dodge(EntityPlayer player, boolean left) { + private static void dodge(EntityPlayer player, boolean left) { if(player.capabilities.isFlying || !player.onGround || player.moveForward > 0.2 || player.moveForward < -0.2) return; @@ -107,8 +109,6 @@ public class ItemDodgeRing extends ItemBauble { @SideOnly(Side.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack, float pticks) { - Math.max(1, stack.getItemDamage()); - Minecraft.getMinecraft(); int xo = resolution.getScaledWidth() / 2 - 20; int y = resolution.getScaledHeight() / 2 + 20; From 15ab7d67d1c3a3e74338428fe0b932efe8d64134 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Dec 2017 13:03:22 -0600 Subject: [PATCH 08/16] API doc tweak for stack nulls --- src/main/java/vazkii/botania/api/item/IHornHarvestable.java | 6 +++--- src/main/java/vazkii/botania/api/mana/ILens.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IHornHarvestable.java b/src/main/java/vazkii/botania/api/item/IHornHarvestable.java index a441b785a..9f964b5d9 100644 --- a/src/main/java/vazkii/botania/api/item/IHornHarvestable.java +++ b/src/main/java/vazkii/botania/api/item/IHornHarvestable.java @@ -21,20 +21,20 @@ public interface IHornHarvestable { /** * Returns true if this block can be uprooted. - * Note that the stack param can be null if it's a drum breaking it. + * Note that the stack param can be empty if it's a drum breaking it. */ public boolean canHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType); /** * Returns true if harvestByHorn() should be called. If false it just uses the normal * block breaking method. - * Note that the stack param can be null if it's a drum breaking it. + * Note that the stack param can be empty if it's a drum breaking it. */ public boolean hasSpecialHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType); /** * Called to harvest by a horn. - * Note that the stack param can be null if it's a drum breaking it. + * Note that the stack param can be empty if it's a drum breaking it. */ public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType); diff --git a/src/main/java/vazkii/botania/api/mana/ILens.java b/src/main/java/vazkii/botania/api/mana/ILens.java index f65ce6218..13c2577ad 100644 --- a/src/main/java/vazkii/botania/api/mana/ILens.java +++ b/src/main/java/vazkii/botania/api/mana/ILens.java @@ -26,7 +26,7 @@ public interface ILens extends ILensEffect { public boolean canCombineLenses(ItemStack sourceLens, ItemStack compositeLens); /** - * Gets the composite lens in the stack passed in, return null for none. + * Gets the composite lens in the stack passed in, return empty for none. */ public ItemStack getCompositeLens(ItemStack stack); From a238ede251f3dd4dfedea6d13314d990dc0fe894 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Dec 2017 16:47:54 -0600 Subject: [PATCH 09/16] Remove reference to the scrapped BotaniaV2 in mcmod.info --- src/main/resources/mcmod.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 17476ac27..92547371f 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid": "Botania", "name": "Botania", - "description": "Botania is a mod that adds nature magic to Minecraft. This time with a fancy number in front.", + "description": "Botania is a mod that adds nature magic to Minecraft", "version": "${version}", "mcversion": "${mcversion}", "logoFile": "assets/botania/textures/logo.png", From ba2852c10d04d8f24e3ac652217f30a4f87cc13e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 9 Dec 2017 13:10:35 +0000 Subject: [PATCH 10/16] bad build --- build.properties | 4 ++-- version/1.12.1.txt | 2 +- web/changelog.txt | 14 ++++++++++++++ web/versions.ini | 3 ++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index a5c653191..a771dcc9d 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Sat Nov 11 16:07:39 GMT 2017 +#Fri Dec 08 16:56:44 GMT 2017 mod_name=Botania cf_meta_version=1.12.1 forge_version=14.22.0.2467 @@ -7,5 +7,5 @@ dir_repo=./ mc_mappings=snapshot_20170624 version=r1.10 dir_output=../Build Output/Botania/ +build_number=352 mc_version=1.12.1 -build_number=351 diff --git a/version/1.12.1.txt b/version/1.12.1.txt index 7cdf1a65b..817e973de 100644 --- a/version/1.12.1.txt +++ b/version/1.12.1.txt @@ -1 +1 @@ -r1.10-350 \ No newline at end of file +r1.10-351 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index 69b4188b8..a0494293e 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,17 @@ +r1.10 351 +*Another big round of fixes provided by williewillus +*Fixed a division by zero crash when entering some entries with bad recipes. +*Fixed a potential race condition in corporea indexes, which would cause them to not function properly. +*Fixed a potential race condition in the gaia guardian boss bar, which would cause it to not function properly. +*Fixed manastorm charge and corporea index star animations being choppy. +*Fixed Manastorm Charges not giving mana. +*Fixed pools and spreaders sometimes not getting removed from the network properly. +*Fixed pressing any key twice while strafing left or right causing the ring of dexterous motion to activate. +*Fixed requesting items from a corporea index showing the incorrect amount of items in the chat. +*Fixed step assist height being incorrect. (InsomniaKitten) +*Fixed the loonium not drawing items properly out of the loot table. +*Improved the way advancements work by using actual data-driven triggers. +*Removed DSU integration since MFR isn't around. r1.10 350 *Added beetroot to the full crop farm challenge text. (codewarrior0) *Fixed a crash when moving a mana pool with a quark piston. diff --git a/web/versions.ini b/web/versions.ini index 670008703..9f3cd4ba3 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -301,4 +301,5 @@ r1.10-346=1.12.1 r1.10-347=1.12.1 r1.10-348=1.12.1 r1.10-349=1.12.1 -r1.10-350=1.12.1 \ No newline at end of file +r1.10-350=1.12.1 +r1.10-351=1.12.1 \ No newline at end of file From a3b0091a73f9c06b05d72911b1446c86e7d9cde1 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 9 Dec 2017 13:23:13 +0000 Subject: [PATCH 11/16] good build --- build.properties | 4 ++-- version/1.12.1.txt | 2 +- web/changelog.txt | 5 ++++- web/versions.ini | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index a771dcc9d..34f7d3e9e 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Fri Dec 08 16:56:44 GMT 2017 +#Sat Dec 09 13:14:01 GMT 2017 mod_name=Botania cf_meta_version=1.12.1 forge_version=14.22.0.2467 @@ -7,5 +7,5 @@ dir_repo=./ mc_mappings=snapshot_20170624 version=r1.10 dir_output=../Build Output/Botania/ -build_number=352 mc_version=1.12.1 +build_number=353 diff --git a/version/1.12.1.txt b/version/1.12.1.txt index 817e973de..a284320c7 100644 --- a/version/1.12.1.txt +++ b/version/1.12.1.txt @@ -1 +1 @@ -r1.10-351 \ No newline at end of file +r1.10-352 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index a0494293e..040393b2e 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,4 +1,4 @@ -r1.10 351 +r1.10 352 *Another big round of fixes provided by williewillus *Fixed a division by zero crash when entering some entries with bad recipes. *Fixed a potential race condition in corporea indexes, which would cause them to not function properly. @@ -12,6 +12,9 @@ r1.10 351 *Fixed the loonium not drawing items properly out of the loot table. *Improved the way advancements work by using actual data-driven triggers. *Removed DSU integration since MFR isn't around. +*Removed reference to the scrapped BotaniaV2 in the mcmod.info file. +r1.10 351 +*Absolutely nothing because I'm stupid and forgot to pull the changes from the repository before building \:D/ r1.10 350 *Added beetroot to the full crop farm challenge text. (codewarrior0) *Fixed a crash when moving a mana pool with a quark piston. diff --git a/web/versions.ini b/web/versions.ini index 9f3cd4ba3..7aba36f8e 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -302,4 +302,5 @@ r1.10-347=1.12.1 r1.10-348=1.12.1 r1.10-349=1.12.1 r1.10-350=1.12.1 -r1.10-351=1.12.1 \ No newline at end of file +r1.10-351=1.12.1 +r1.10-352=1.12.1 \ No newline at end of file From 2740c3e6fbca15319ff6d6ff869bb548045793db Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 9 Dec 2017 20:00:30 +0000 Subject: [PATCH 12/16] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 9eef87867..2ef88c12a 100644 --- a/contributors.properties +++ b/contributors.properties @@ -90,3 +90,4 @@ wee_wee123=2 fire_spirit=1 xeanwolf20=11 aureiio=0 +nightred=13 From d5732131d108fd846db1114c32b3de01e9bd9463 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 10 Dec 2017 20:11:28 -0600 Subject: [PATCH 13/16] Pass mod id to EventBusSubscriber. Apparently you're supposed to do this. --- .../core/handler/AstrolabePreviewHandler.java | 3 +- .../handler/BlockHighlightRenderHandler.java | 3 +- .../client/core/handler/BossBarHandler.java | 3 +- .../core/handler/ClientTickHandler.java | 3 +- .../client/core/handler/DebugHandler.java | 2 +- .../client/core/handler/HUDHandler.java | 3 +- .../client/core/handler/LightningHandler.java | 3 +- .../client/core/handler/ModelHandler.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 3 +- .../client/core/handler/RenderLexicon.java | 3 +- .../TooltipAdditionDisplayHandler.java | 3 +- .../client/core/handler/TooltipHandler.java | 3 +- .../render/world/SkyblockRenderEvents.java | 3 +- .../botania/common/block/BlockFelPumpkin.java | 3 +- .../botania/common/block/BlockGhostRail.java | 2 +- .../botania/common/block/ModBlocks.java | 3 +- .../botania/common/block/ModFluffBlocks.java | 3 +- .../string/BlockRedStringInterceptor.java | 3 +- .../functional/BergamuteEventHandler.java | 3 +- .../subtile/functional/SubTileLoonuim.java | 24 ++++---- .../subtile/functional/SubTileVinculotus.java | 56 +++++++++---------- .../subtile/generating/SubTileNarslimmus.java | 23 ++++---- .../botania/common/brew/ModPotions.java | 3 +- .../core/handler/CommonTickHandler.java | 3 +- .../common/core/handler/ConfigHandler.java | 2 +- .../common/core/handler/ModSounds.java | 2 +- .../common/core/handler/PixieHandler.java | 3 +- .../common/core/handler/SheddingHandler.java | 3 +- .../common/core/version/VersionChecker.java | 2 +- .../common/crafting/ModCraftingRecipes.java | 2 +- .../vazkii/botania/common/item/ModItems.java | 3 +- .../item/block/ItemBlockSpecialFlower.java | 2 +- .../item/equipment/bauble/ItemDodgeRing.java | 3 +- .../equipment/bauble/ItemGoddessCharm.java | 3 +- .../common/item/relic/ItemLokiRing.java | 2 +- .../common/item/relic/ItemOdinRing.java | 2 +- 36 files changed, 102 insertions(+), 90 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java index d18449b09..b932e9541 100644 --- a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java @@ -29,10 +29,11 @@ import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.item.ItemAstrolabe; +import vazkii.botania.common.lib.LibMisc; import java.util.List; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class AstrolabePreviewHandler { @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index 5b851eba6..ada5ba786 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -33,10 +33,11 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityMagicLandmine; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibMisc; import java.awt.Color; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class BlockHighlightRenderHandler { private BlockHighlightRenderHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 68292cf4c..6016d9690 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -24,6 +24,7 @@ import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.lib.LibMisc; import java.awt.Rectangle; import java.util.Collections; @@ -31,7 +32,7 @@ import java.util.Set; import java.util.UUID; import java.util.WeakHashMap; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class BossBarHandler { private BossBarHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index befd7ab2b..fb28c3c8b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -29,8 +29,9 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class ClientTickHandler { private ClientTickHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 4a96cc014..9dfc1e698 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -37,7 +37,7 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class DebugHandler { private DebugHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 3c003a16e..9500d09d3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -70,6 +70,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; import java.awt.Color; @@ -77,7 +78,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class HUDHandler { private HUDHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 02a72841c..14a092660 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -26,11 +26,12 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.fx.FXLightning; import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayDeque; import java.util.Deque; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public class LightningHandler { private LightningHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index b4dc14db2..56339af54 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -50,7 +50,7 @@ import java.util.Locale; import java.util.Map; import java.util.function.IntFunction; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class ModelHandler { @SubscribeEvent public static void registerModels(ModelRegistryEvent evt) { diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 056fd96f6..f4aa98edf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -40,8 +40,9 @@ import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class MultiblockRenderHandler { private MultiblockRenderHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index f94165c8d..5cda7ad7b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -23,9 +23,10 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.page.PageText; +import vazkii.botania.common.lib.LibMisc; // Hacky way to render 3D lexicon, will be reevaluated in the future. -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public class RenderLexicon { private static final ModelBook model = new ModelBook(); // todo 1.12 improve diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 38af93ae8..93fe8de91 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -36,10 +36,11 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; +import vazkii.botania.common.lib.LibMisc; import java.awt.Color; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class TooltipAdditionDisplayHandler { private static float lexiconLookupTime = 0F; diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index 236c82101..896959e9e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -18,8 +18,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index eb9135846..d14449785 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -17,9 +17,10 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.world.WorldTypeSkyblock; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class SkyblockRenderEvents { @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 5d188a5a0..17d77a61d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -36,10 +36,11 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class BlockFelPumpkin extends BlockMod implements ILexiconable { private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index d1c307043..f4d46e476 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -39,7 +39,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class BlockGhostRail extends BlockRailBase implements ILexiconable, IModelRegister { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index cc0f5bea8..d8de0131e 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -122,9 +122,10 @@ import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModBlocks { public static final Block flower = new BlockModFlower(); public static final Block altar = new BlockAltar(); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index f2708309e..ec9ffc95d 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -60,12 +60,13 @@ import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; import java.util.Locale; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModFluffBlocks { public static List slabsToRegister = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index eba6ff8d0..cb5f965d0 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -28,11 +28,12 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.Random; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index 2e46d292b..ab81b27dd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -16,13 +16,14 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.awt.Color; import java.util.Random; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public class BergamuteEventHandler { private BergamuteEventHandler() {} diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index a55782482..9fec08075 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -44,11 +44,13 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.Collections; import java.util.List; import java.util.Random; +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class SubTileLoonuim extends SubTileFunctional { private static final int COST = 35000; @@ -181,20 +183,14 @@ public class SubTileLoonuim extends SubTileFunctional { cmp.setString(TAG_LOOT_TABLE, lootTable.toString()); } - @Mod.EventBusSubscriber - public static class DropHandler { - - @SubscribeEvent(priority = EventPriority.LOWEST) - public static void onDrops(LivingDropsEvent event) { - EntityLivingBase e = event.getEntityLiving(); - if(e.getEntityData().hasKey(TAG_ITEMSTACK_TO_DROP)) { - NBTTagCompound cmp = e.getEntityData().getCompoundTag(TAG_ITEMSTACK_TO_DROP); - ItemStack stack = new ItemStack(cmp); - event.getDrops().clear(); - event.getDrops().add(new EntityItem(e.world, e.posX, e.posY, e.posZ, stack)); - } + @SubscribeEvent(priority = EventPriority.LOWEST) + public static void onDrops(LivingDropsEvent event) { + EntityLivingBase e = event.getEntityLiving(); + if(e.getEntityData().hasKey(TAG_ITEMSTACK_TO_DROP)) { + NBTTagCompound cmp = e.getEntityData().getCompoundTag(TAG_ITEMSTACK_TO_DROP); + ItemStack stack = new ItemStack(cmp); + event.getDrops().clear(); + event.getDrops().add(new EntityItem(e.world, e.posX, e.posY, e.posZ, stack)); } - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 18f2f9248..521862367 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -20,6 +20,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.Collections; @@ -27,6 +28,7 @@ import java.util.List; import java.util.Set; import java.util.WeakHashMap; +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class SubTileVinculotus extends SubTileFunctional { public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); @@ -66,43 +68,37 @@ public class SubTileVinculotus extends SubTileFunctional { return LexiconData.vinculotus; } - @Mod.EventBusSubscriber - public static class EndermanIntercepter { + @SubscribeEvent + public static void onEndermanTeleport(EnderTeleportEvent event) { + int cost = 50; - @SubscribeEvent - public static void onEndermanTeleport(EnderTeleportEvent event) { - int cost = 50; + if(event.getEntityLiving() instanceof EntityEnderman) { + List possibleFlowers = new ArrayList<>(); + for(SubTileVinculotus flower : existingFlowers) { + if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.getEntityLiving().world || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) + continue; - if(event.getEntityLiving() instanceof EntityEnderman) { - List possibleFlowers = new ArrayList<>(); - for(SubTileVinculotus flower : existingFlowers) { - if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.getEntityLiving().world || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) - continue; + double x = flower.supertile.getPos().getX() + 0.5; + double y = flower.supertile.getPos().getY() + 1.5; + double z = flower.supertile.getPos().getZ() + 0.5; - double x = flower.supertile.getPos().getX() + 0.5; - double y = flower.supertile.getPos().getY() + 1.5; - double z = flower.supertile.getPos().getZ() + 0.5; + if(MathHelper.pointDistanceSpace(x, y, z, event.getTargetX(), event.getTargetY(), event.getTargetZ()) < RANGE) + possibleFlowers.add(flower); + } - if(MathHelper.pointDistanceSpace(x, y, z, event.getTargetX(), event.getTargetY(), event.getTargetZ()) < RANGE) - possibleFlowers.add(flower); - } + if(!possibleFlowers.isEmpty()) { + SubTileVinculotus flower = possibleFlowers.get(event.getEntityLiving().world.rand.nextInt(possibleFlowers.size())); - if(!possibleFlowers.isEmpty()) { - SubTileVinculotus flower = possibleFlowers.get(event.getEntityLiving().world.rand.nextInt(possibleFlowers.size())); + double x = flower.supertile.getPos().getX() + 0.5; + double y = flower.supertile.getPos().getY() + 1.5; + double z = flower.supertile.getPos().getZ() + 0.5; - double x = flower.supertile.getPos().getX() + 0.5; - double y = flower.supertile.getPos().getY() + 1.5; - double z = flower.supertile.getPos().getZ() + 0.5; - - event.setTargetX(x + Math.random() * 3 - 1); - event.setTargetY(y); - event.setTargetZ(z + Math.random() * 3 - 1); - flower.mana -= cost; - flower.sync(); - } + event.setTargetX(x + Math.random() * 3 - 1); + event.setTargetY(y); + event.setTargetZ(z + Math.random() * 3 - 1); + flower.mana -= cost; + flower.sync(); } } - } - } 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 ab4bae954..415a2fd98 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 @@ -26,9 +26,11 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.List; +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class SubTileNarslimmus extends SubTileGenerating { public static final String TAG_WORLD_SPAWNED = "Botania:WorldSpawned"; @@ -87,20 +89,15 @@ public class SubTileNarslimmus extends SubTileGenerating { return LexiconData.narslimmus; } - @Mod.EventBusSubscriber - public static class SpawnIntercepter { - - @SubscribeEvent - public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { - if(event.getEntityLiving() instanceof EntitySlime && event.getResult() != Result.DENY && isSlimeChunk(event.getEntityLiving().world, MathHelper.floor(event.getX()), MathHelper.floor(event.getZ()))) - event.getEntityLiving().getEntityData().setBoolean(TAG_WORLD_SPAWNED, true); - } - - 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; - } + @SubscribeEvent + public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { + if(event.getEntityLiving() instanceof EntitySlime && event.getResult() != Result.DENY && isSlimeChunk(event.getEntityLiving().world, MathHelper.floor(event.getX()), MathHelper.floor(event.getZ()))) + event.getEntityLiving().getEntityData().setBoolean(TAG_WORLD_SPAWNED, true); + } + private 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/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index 12b2ed26b..05d706fa2 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -20,8 +20,9 @@ import vazkii.botania.common.brew.potion.PotionClear; import vazkii.botania.common.brew.potion.PotionEmptiness; import vazkii.botania.common.brew.potion.PotionFeatherfeet; import vazkii.botania.common.brew.potion.PotionSoulCross; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ModPotions { public static final Potion soulCross = new PotionSoulCross(); diff --git a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java index f41af57d6..d1155e40b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -15,8 +15,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; import vazkii.botania.api.corporea.CorporeaHelper; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class CommonTickHandler { private CommonTickHandler() {} diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index f20842816..b0ca16298 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -424,7 +424,7 @@ public final class ConfigHandler { } - @Mod.EventBusSubscriber + @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public static class ChangeListener { @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index 68c4d27ac..452f55a49 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModSounds { public static final SoundEvent airRod = makeSoundEvent("airrod"); public static final SoundEvent agricarnation = makeSoundEvent("agricarnation"); diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index 62a06fcda..d7a5bedb9 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -17,8 +17,9 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class PixieHandler { private PixieHandler() {} diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index f93e787fe..57861fe50 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -25,13 +25,14 @@ import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.ForgeRegistries; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageShedding; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; import java.util.Objects; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class SheddingHandler { private SheddingHandler() {} diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 92de06d7d..8e580b1d6 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -25,7 +25,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class VersionChecker { private VersionChecker() {} diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 0e0cd2782..9500f753b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -50,7 +50,7 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.IntStream; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModCraftingRecipes { public static ResourceLocation recipeLexicon; diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 09d98ae2e..7c17cb9cf 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -92,9 +92,10 @@ import vazkii.botania.common.item.rod.ItemSmeltRod; import vazkii.botania.common.item.rod.ItemTerraformRod; import vazkii.botania.common.item.rod.ItemTornadoRod; import vazkii.botania.common.item.rod.ItemWaterRod; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModItems { public static final Item lexicon = new ItemLexicon(); public static final Item petal = new ItemPetal(); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index e7f5b3f55..f0eadff9c 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -51,7 +51,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { public ItemBlockSpecialFlower(Block block1) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java index 60cd2a463..4f81b8483 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java @@ -32,10 +32,11 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketDodge; import vazkii.botania.common.network.PacketHandler; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public class ItemDodgeRing extends ItemBauble { public static final String TAG_DODGE_COOLDOWN = "dodgeCooldown"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java index 364e18b33..982e449dc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -30,10 +30,11 @@ import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem, IBaubleRender { public static final int COST = 1000; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 9389a0505..7ae97a5f9 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -50,7 +50,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinateListProvider, IManaUsingItem { private static final String TAG_CURSOR_LIST = "cursorList"; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 5e9b5b82b..7e7fe9eca 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -34,7 +34,7 @@ import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemOdinRing extends ItemRelicBauble { private static final List damageNegations = new ArrayList<>(); From d7ecb447c22bf8472ae26d4c82866d450d57c8df Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 10 Dec 2017 20:17:18 -0600 Subject: [PATCH 14/16] Cleanup in crafting recipes --- .../common/crafting/ModCraftingRecipes.java | 62 ------------------- 1 file changed, 62 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 9500f753b..662e023e8 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -325,86 +325,26 @@ public final class ModCraftingRecipes { IForgeRegistry r = evt.getRegistry(); r.register(new AncientWillRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "ancient_will_attach"))); - // RecipeSorter.register("botania:ancientWill", AncientWillRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new BlackHoleTalismanExtractRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "black_hole_talisman_extract"))); - // RecipeSorter.register("botania:blackHoleTalismanExtract", BlackHoleTalismanExtractRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new SpellClothRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "cleanse_enchants"))); - // RecipeSorter.register("botania:spellCloth", SpellClothRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new CompositeLensRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "composite_lens"))); - // RecipeSorter.register("botania:compositeLens", CompositeLensRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new CosmeticAttachRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "cosmetic_attach"))); r.register(new CosmeticRemoveRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "cosmetic_remove"))); - // RecipeSorter.register("botania:cosmeticAttach", CosmeticAttachRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - // RecipeSorter.register("botania:cosmeticRemove", CosmeticRemoveRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new HelmRevealingRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "helm_revealing"))); - // RecipeSorter.register("botania:helmRevealing", HelmRevealingRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new KeepIvyRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "keep_ivy_attach"))); - // RecipeSorter.register("botania:keepIvy", KeepIvyRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new LensDyeingRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "lens_dye"))); - // RecipeSorter.register("botania:lensDying", LensDyeingRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new ManaGunLensRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "mana_gun_add_lens"))); r.register(new ManaGunRemoveLensRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "mana_gun_remove_lens"))); r.register(new ManaGunClipRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "mana_gun_add_clip"))); - // RecipeSorter.register("botania:manaGunLens", ManaGunLensRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - // RecipeSorter.register("botania:manaGunRemoveLens", ManaGunRemoveLensRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - // RecipeSorter.register("botania:manaGunClip", ManaGunClipRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new PhantomInkRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "phantom_ink"))); - // RecipeSorter.register("botania:phantomInk", PhantomInkRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new SpecialFloatingFlowerRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "special_floating_flower"))); - // RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, RecipeSorter.Category.SHAPELESS, ""); - r.register(new TerraPickTippingRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "terra_pick_tipping"))); - // RecipeSorter.register("botania:terraPickTipping", TerraPickTippingRecipe.class, RecipeSorter.Category.SHAPELESS, ""); for(int i = 0; i < 8; i++) { GameRegistry.addSmelting(new ItemStack(ModFluffBlocks.biomeStoneA, 1, i + 8), new ItemStack(ModFluffBlocks.biomeStoneA, 1, i), 0.1F); } - /*// Wand of the Forest Recipes - File f = new File("/home/vincent/CS/mods/Botania/eclipse/wands/"); - f.mkdirs(); - Gson gson =new GsonBuilder().setPrettyPrinting().create(); - recipesTwigWand = new ArrayList<>(); - for(int i = 0; i < 16; i++) - for(int j = 0; j < 16; j++) { - ItemStack output = ItemTwigWand.forColors(i, j); - Map json = new HashMap<>(); - json.put("result", ImmutableMap.of("item", ModItems.twigWand.getRegistryName().toString(), "data", 0, "nbt", output.getTagCompound().toString())); - json.put("group", ModItems.twigWand.getRegistryName().toString()); - json.put("type", "forge:ore_shaped"); - json.put("pattern", ImmutableList.of(" AS", " SB", "S ")); - Map key = new HashMap<>(); - key.put("A", ImmutableMap.of("item", "#" + LibOreDict.PETAL[i].toUpperCase())); - key.put("B", ImmutableMap.of("item", "#" + LibOreDict.PETAL[j].toUpperCase())); - key.put("S", ImmutableMap.of("item", "#" + LibOreDict.LIVINGWOOD_TWIG.toUpperCase())); - json.put("key", key); - - String name = String.format("%s_%s_%s.json", ModItems.twigWand.getRegistryName().getResourcePath(), EnumDyeColor.byMetadata(i), EnumDyeColor.byMetadata(j)); - - File f1 = new File(f, name); - - try (FileWriter w = new FileWriter(f1)) { - gson.toJson(json, w); - } catch (IOException e) { - e.printStackTrace(); - } - - *//*recipesTwigWand.add(recipe.getRegistryName()); - r.register(recipe);*//* - }*/ - // Terrasteel Armor Recipes - // RecipeSorter.register("botania:armorUpgrade", ArmorUpgradeRecipe.class, RecipeSorter.Category.SHAPED, ""); r.register(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), "TRT", "SAS", " S ", 'T', LibOreDict.LIVINGWOOD_TWIG, @@ -440,13 +380,11 @@ public final class ModCraftingRecipes { 'R', LibOreDict.RUNE[7], 'A', new ItemStack(ModItems.manasteelBoots)).setRegistryName(ModItems.terrasteelBoots.getRegistryName())); - // RecipeSorter.register("botania:manaUpgrade", ManaUpgradeRecipe.class, RecipeSorter.Category.SHAPED, ""); r.register(new ManaUpgradeRecipe(new ItemStack(ModItems.manaRing), "TI ", "I I", " I ", 'T', new ItemStack(ModItems.manaTablet, 1, Short.MAX_VALUE), 'I', LibOreDict.MANA_STEEL).setRegistryName(ModItems.manaRing.getRegistryName())); - // RecipeSorter.register("botania:manaUpgradeShapeless", ShapelessManaUpgradeRecipe.class, RecipeSorter.Category.SHAPELESS, ""); r.register(new ShapelessManaUpgradeRecipe(new ItemStack(ModItems.manaRingGreater), LibOreDict.TERRA_STEEL, new ItemStack(ModItems.manaRing, 1, Short.MAX_VALUE)).setRegistryName(ModItems.manaRingGreater.getRegistryName())); // Terra Shatterer Recipe From 775c0d20c355caf1df8e441a92d9930d5a87f79b Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 12 Dec 2017 22:28:04 +0000 Subject: [PATCH 15/16] Have fun Jared --- build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.gradle b/build.gradle index 46b39c3c5..27cb63a7b 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,7 @@ repositories { apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'com.matthewprenger.cursegradle' +apply plugin: 'maven' ext.configFile = file('build.properties') @@ -247,4 +248,12 @@ curseforge { } } +uploadArchives { + repositories { + mavenDeployer { + repository(url: "file://" + (System.getenv("local_maven") != null ? System.getenv("local_maven") : System.getenv("bamboo_local_maven"))) + } + } +} + defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curseforge', 'upload' From 1b4b4cce7a1a62a107b8f2b3440f4eaaa3529d6a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Dec 2017 12:32:46 -0600 Subject: [PATCH 16/16] 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)