From 12695ae3f4ba0c4eeb8be7ecc0839cadcd56072f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 14 May 2019 17:01:39 -0500 Subject: [PATCH] Fix dodge ring crash, fix logo --- .../common/item/equipment/bauble/ItemDodgeRing.java | 2 ++ src/main/resources/META-INF/mods.toml | 2 +- .../{assets/botania/textures => }/logo.png | Bin 3 files changed, 3 insertions(+), 1 deletion(-) rename src/main/resources/{assets/botania/textures => }/logo.png (100%) 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 f2f6c5c17..07c461e51 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 @@ -53,6 +53,8 @@ public class ItemDodgeRing extends ItemBauble { @OnlyIn(Dist.CLIENT) public static void onKeyDown(InputEvent.KeyInputEvent event) { Minecraft mc = Minecraft.getInstance(); + if(mc.player == null) + return; ItemStack ringStack = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(ModItems.dodgeRing, mc.player) : ItemStack.EMPTY; if(ringStack.isEmpty() || ItemNBTHelper.getInt(ringStack, TAG_DODGE_COOLDOWN, 0) > 0) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 834902d9e..baa33c950 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -2,7 +2,7 @@ modLoader="javafml" #mandatory loaderVersion="[25,)" issueTrackerURL="https://github.com/Vazkii/Botania/issues" #optional displayURL="https://botaniamod.net" #optional -logoFile="assets/botania/textures/logo.png" #optional +logoFile="logo.png" #optional credits="Azanor, Flaxbeard, Futureazoo, Rorax, Lorc, Adubbz, WTFG33ks, Auric245524, MegaManki, Kain Vinosec, Kihira, mDiyo, Mikeemoo, ChickenBones, PowerCrystals, cpw" #optional authors="Vazkii, wiiv, williewillus, dylan4ever" #optional diff --git a/src/main/resources/assets/botania/textures/logo.png b/src/main/resources/logo.png similarity index 100% rename from src/main/resources/assets/botania/textures/logo.png rename to src/main/resources/logo.png