diff --git a/README.md b/README.md index d143e4b49..7bfd6a8ee 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,14 @@ > CustomNPC+ is a [Minecraft](https://minecraft.net/) mod that allows you to add custom NPCs to your world. It is developed for creative and storytelling players who want to make their Minecraft worlds more in-depth and unique. CustomNPC+ is only a branch version of the **1.7.10** Forge version of the original (down below) and has no plans to add or update any other version. This is not an official version of CustomNPC. -Link to CurseForge: [HERE](https://www.curseforge.com/minecraft/mc-mods/customnpc-plus) +**CurseForge**: [Download](https://www.curseforge.com/minecraft/mc-mods/customnpc-plus) + +[![Discord Badge](https://img.shields.io/badge/KAMKEEL_Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/pQqRTvFeJ5) +[![Download CustomNPC+](https://img.shields.io/badge/CustomNPC+-0081CB?style=for-the-badge&logo=material-ui&logoColor=white)](https://www.curseforge.com/minecraft/mc-mods/customnpc-plus) +[![Download CustomNPC+](https://img.shields.io/badge/MorePlayerModels+-0081CB?style=for-the-badge&logo=material-ui&logoColor=white)](https://www.curseforge.com/minecraft/mc-mods/moreplayermodels-plus) +[![Download PluginMod](https://img.shields.io/badge/Plugin_Mod-0081CB?style=for-the-badge&logo=material-ui&logoColor=white)](https://github.com/KAMKEEL/Plugin-Mod) + Support Me + ### âť— Notice I am not the original creator of CustomNPC. The original creator is @[Noppes](https://github.com/Noppes). I have been permitted to update the 1.7.10 and post my results on GitHub. The original mod that is updated to the latest versions of Minecraft can be found on these links: [CurseForge](https://www.curseforge.com/minecraft/mc-mods/custom-npcs), [kodevelopment](http://www.kodevelopment.nl/minecraft/customnpcs) @@ -41,9 +48,6 @@ This mod is an ***update*** to CustomNPC and not an add-on. Do not install Custo - Scripting Fixes / New Functions: [Documentation History](https://github.com/PewDizinho/CustomNPCPlus-Script-Documentation) (We never remove script functionality, only add on existing functions) ---- Please Suggest New Features! - - ## đź”° Skin Model Feature: ###### **Majority of these cape designs are taken from the internet with fair-usage.* ##### âť” Please note all *local* skins in this version of CustomNPC, must match the model selected. @@ -63,9 +67,13 @@ This mod is an ***update*** to CustomNPC and not an add-on. Do not install Custo [CustomNPC+ Dark Mode](https://github.com/KAMKEEL/CustomNPC-Plus-Dark-Mode) is a resource pack for CustomNPC+ that alters all GUIs within the mod to a dark variant that is both clean and pleasing to look at. -[![Discord Badge](https://img.shields.io/badge/CustomNPC-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rgeWsmQaKa) -[![Discord Badge](https://img.shields.io/badge/CustomNPC+-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/pQqRTvFeJ5) -[![Download CustomNPC+](https://img.shields.io/badge/Downloadâ €CustomNPCâ €Plus!-0081CB?style=for-the-badge&logo=material-ui&logoColor=white)](https://www.curseforge.com/minecraft/mc-mods/customnpc-plus) -[![Download PluginMod](https://img.shields.io/badge/Downloadâ €Pluginâ €Mod!-0081CB?style=for-the-badge&logo=material-ui&logoColor=white)](https://github.com/KAMKEEL/Plugin-Mod) - Support Me on Kofi +## Compiling / Building +Using IntelliJ, take the following steps: +1. Run `setupDecompWorkspace` under the `forgegradle` tab. +2. Refresh Gradle. +3. Run `genIntellijRuns` under the `other` tab to set up your Minecraft runs. + +or for Eclipse, run `gradlew setupDecompWorkspace eclipse` then import the project. + +Mixin code will not work if you do not add `--tweakClass org.spongepowered.asm.launch.MixinTweaker --mixin customnpcs.mixins.json` to your program arguments. diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 449e704a1..4b7b6bfe9 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -379,8 +379,10 @@ public class ScriptPlayerEventHandler { Entity source = NoppesUtilServer.GetDamageSourcee(event.source); PlayerDataScript handler = ScriptController.Instance.playerScripts; if(event.entityLiving instanceof EntityPlayer) { - IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityLiving); - EventHooks.onPlayerDeath(handler,scriptPlayer, event.source, source); + try { + IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityLiving); + EventHooks.onPlayerDeath(handler,scriptPlayer, event.source, source); + } catch (Exception ignored) {} } if(source instanceof EntityPlayer) { diff --git a/tools/mixin-0.8-SNAPSHOT.jar b/tools/mixin-0.8-SNAPSHOT.jar new file mode 100644 index 000000000..1015bf45f Binary files /dev/null and b/tools/mixin-0.8-SNAPSHOT.jar differ