Merge branch 'dev'

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'idea'
 }
 
-version = "1.10"
+version = "1.10.1"
 group= "kamkeel.customnpc-plus"
 archivesBaseName = "CustomNPC-Plus"
 

src/main/java/kamkeel/npcs/network/PacketUtil.java

@@ -230,6 +230,10 @@ public class PacketUtil {
             tabCompound.setInteger("TotalScripts", containers.size());
             GuiDataPacket.sendGuiData(player, tabCompound);
         }
+
+        NBTTagCompound loadComplete = new NBTTagCompound();
+        loadComplete.setInteger("LoadComplete", 1);
+        GuiDataPacket.sendGuiData(player, loadComplete);
     }
 
     public static void saveScripts(IScriptHandler data, ByteBuf buffer) throws IOException {

src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java

@@ -49,9 +49,6 @@ public final class CustomGuiClosePacket extends AbstractPacket {
 
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if (!(player.openContainer instanceof ContainerCustomGui))
-            return;
-
         NBTTagCompound comp = ByteBufUtils.readNBT(in);
         EventHooks.onCustomGuiClose((IPlayer) NpcAPI.Instance().getIEntity(player), (new ScriptGui()).fromNBT(comp));
     }

src/main/java/noppes/npcs/CustomNpcs.java

@@ -41,7 +41,7 @@ import noppes.npcs.scripted.NpcAPI;
 import java.io.File;
 import java.util.Set;
 
-@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10")
+@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.1")
 public class CustomNpcs {
 
     @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy")

src/main/java/noppes/npcs/EventHooks.java

@@ -390,6 +390,11 @@ public class EventHooks {
         return NpcAPI.EVENT_BUS.post(event);
     }
 
+    public static boolean onPlayerRightClick(PlayerDataScript handler, PlayerEvent.RightClickEvent event) {
+        handler.callScript(EnumScriptType.RIGHT_CLICK, event);
+        return NpcAPI.EVENT_BUS.post(event);
+    }
+
     public static boolean onProfileChange(PlayerDataScript handler, IPlayer player, IProfile profile, int newSlot, int prevSlot, boolean post) {
         PlayerEvent.ProfileEvent.Changed event = new PlayerEvent.ProfileEvent.Changed(player, profile, newSlot, prevSlot, post);
         handler.callScript(EnumScriptType.PROFILE_CHANGE, event);

src/main/java/noppes/npcs/ScriptItemEventHandler.java

@@ -154,6 +154,7 @@ public class ScriptItemEventHandler {
 
                     ItemNpcTool.setColor(held.getTagCompound(), color);
                     e.setCanceled(true);
+                    return;
                 }
             }
         }

src/main/java/noppes/npcs/ScriptPlayerEventHandler.java

@@ -23,6 +23,7 @@ import net.minecraftforge.event.entity.item.ItemTossEvent;
 import net.minecraftforge.event.entity.living.*;
 import net.minecraftforge.event.entity.player.*;
 import net.minecraftforge.event.world.BlockEvent;
+import noppes.npcs.api.IWorld;
 import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.api.item.IItemCustomizable;
 import noppes.npcs.config.ConfigMain;
@@ -34,8 +35,10 @@ import noppes.npcs.controllers.ScriptController;
 import noppes.npcs.controllers.data.*;
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.items.ItemNpcTool;
+import noppes.npcs.items.ItemScripted;
 import noppes.npcs.quests.QuestItem;
 import noppes.npcs.scripted.NpcAPI;
+import noppes.npcs.scripted.event.ItemEvent;
 
 import static noppes.npcs.config.ConfigMain.TrackedQuestUpdateFrequency;
 
@@ -123,9 +126,46 @@ public class ScriptPlayerEventHandler {
 
         if (!event.entityPlayer.worldObj.isRemote && event.entityPlayer.worldObj instanceof WorldServer && event.entityPlayer instanceof EntityPlayerMP) {
             PlayerDataScript handler = ScriptController.Instance.getPlayerScripts(event.entityPlayer);
-            IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer);
-            noppes.npcs.scripted.event.player.PlayerEvent.InteractEvent ev = new noppes.npcs.scripted.event.player.PlayerEvent.InteractEvent(scriptPlayer, 1, NpcAPI.Instance().getIEntity(event.target));
-            event.setCanceled(EventHooks.onPlayerInteract(handler, ev));
+            IPlayer ip = NoppesUtilServer.getIPlayer(event.entityPlayer);
+
+            noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent rightClickEvent = new noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent(ip, 1, NpcAPI.Instance().getIEntity(event.target));
+            boolean rightClick = EventHooks.onPlayerRightClick(handler, rightClickEvent);
+
+            noppes.npcs.scripted.event.player.PlayerEvent.InteractEvent ev = new noppes.npcs.scripted.event.player.PlayerEvent.InteractEvent(ip, 1, NpcAPI.Instance().getIEntity(event.target));
+            boolean interact = EventHooks.onPlayerInteract(handler, ev);
+
+            event.setCanceled(rightClick || interact);
+        }
+    }
+
+    @SubscribeEvent
+    public void invoke(PlayerInteractEvent event) {
+        if (event.entityPlayer == null || event.entityPlayer.worldObj == null || event.entityPlayer.worldObj.isRemote || !(event.entityPlayer instanceof EntityPlayerMP))
+            return;
+
+        if(event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK)
+            return;
+
+        IPlayer ip = NoppesUtilServer.getIPlayer(event.entityPlayer);
+        PlayerDataScript handler = ScriptController.Instance.getPlayerScripts(event.entityPlayer);
+        PlayerData pd = PlayerData.get(event.entityPlayer);
+        if (pd == null) {
+            return;
+        }
+
+        if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR){
+            if (pd.hadInteract) {
+                pd.hadInteract = false;
+                return;
+            }
+            noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent rightClickEvent = new noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent(ip, 0, null);
+            event.setCanceled(EventHooks.onPlayerRightClick(handler, rightClickEvent));
+        } else if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK){
+            pd.hadInteract = true;
+            IWorld iw = (IWorld) NpcAPI.Instance().getIWorld(event.world);
+            Object blockCtx = NpcAPI.Instance().getIBlock(iw, event.x, event.y, event.z);
+            noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent rightClickEvent = new noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent(ip, 2, blockCtx);
+            event.setCanceled(EventHooks.onPlayerRightClick(handler, rightClickEvent));
         }
     }
 

src/main/java/noppes/npcs/blocks/tiles/TileVariant.java

@@ -7,6 +7,7 @@ import net.minecraft.network.Packet;
 import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.Facing;
 
 import static noppes.npcs.items.ItemNpcTool.BRUSH_COLOR_TAG;
 
@@ -18,6 +19,11 @@ public class TileVariant extends TileEntity {
     public int variant = 14;
     public int rotation;
 
+    //    Rotation = 0 Couch is Facing North
+    //    Rotation = 1 Couch is Facing East
+    //    Rotation = 2 Couch is Facing South
+    //    Rotation = 3 Couch is Facing West
+
     public void readFromNBT(NBTTagCompound compound) {
         super.readFromNBT(compound);
         version = compound.getInteger("CNPCVersion");

src/main/java/noppes/npcs/client/ImageDownloadAlt.java

@@ -98,8 +98,6 @@ public class ImageDownloadAlt extends SimpleTexture {
         this.imageThread = new Thread("Texture Downloader #" + threadDownloadCounter.incrementAndGet()) {
             public void run() {
                 HttpURLConnection connection = null;
-                ImageDownloadAlt.logger.debug("Downloading http texture from {} to {}", new Object[]{ImageDownloadAlt.this.imageUrl, ImageDownloadAlt.this.cacheFile});
-
                 try {
                     URL url = new URL(ImageDownloadAlt.this.imageUrl);
                     connection = (HttpURLConnection) (url).openConnection(Minecraft.getMinecraft().getProxy());

src/main/java/noppes/npcs/client/gui/GuiScript.java

@@ -27,6 +27,7 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall
     public Map<String, List<String>> languages = new HashMap<String, List<String>>();
 
     private static int activeConsole = 0;
+    boolean loaded = false;
 
     public GuiScript(EntityNPCInterface npc) {
         super(npc);
@@ -258,12 +259,15 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall
         }
         this.languages = languages;
         initGui();
+        loaded = true;
     }
 
     @Override
     public void save() {
-        setScript();
-        NPCScriptPacket.Save(script.writeToNBT(new NBTTagCompound()));
+        if(loaded){
+            setScript();
+            NPCScriptPacket.Save(script.writeToNBT(new NBTTagCompound()));
+        }
     }
 
     @Override

src/main/java/noppes/npcs/client/gui/SubGuiMagic.java

@@ -93,6 +93,8 @@ public class SubGuiMagic extends SubGuiInterface implements ITextfieldListener,
         addLabel(new GuiNpcLabel(50, "magic.interaction", guiLeft + 170, guiTop + 30 + 160 + 5));
         interactionField = new GuiNpcTextField(90, this, fontRendererObj, guiLeft + 245, guiTop + 30 + 160, 45, 20, "");
         interactionField.setFloatsOnly();
+        interactionField.setMinMaxDefaultFloat(-Float.MAX_VALUE, Float.MAX_VALUE, 0.0f);
+
         addTextField(interactionField);
         if (selectedInteraction != null) {
             interactionField.setText(interactionValues.get(selectedInteraction) + "");

src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java

@@ -119,6 +119,7 @@ public class GuiNpcAdvanced extends GuiNPCInterface2 implements IGuiData {
     @Override
     public void setGuiData(NBTTagCompound compound) {
         if (compound.hasKey("RoleData")) {
+            npc.advanced.setRole(compound.getByte("RoleData"));
             if (npc.roleInterface != null)
                 npc.roleInterface.readFromNBT(compound);
 

src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java

@@ -39,6 +39,11 @@ public class GuiNPCEventScripts extends GuiScriptInterface {
     }
 
     public void setGuiData(NBTTagCompound compound) {
+        if(compound.hasKey("LoadComplete")){
+            loaded = true;
+            return;
+        }
+
         if (!compound.hasKey("Tab")) {
             script.setLanguage(compound.getString("ScriptLanguage"));
             script.setEnabled(compound.getBoolean("ScriptEnabled"));
@@ -58,16 +63,18 @@ public class GuiNPCEventScripts extends GuiScriptInterface {
     }
 
     public void save() {
-        super.save();
-        List<ScriptContainer> containers = this.script.getScripts();
-        for (int i = 0; i < containers.size(); i++) {
-            ScriptContainer container = containers.get(i);
-            EventScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+        if(loaded) {
+            super.save();
+            List<ScriptContainer> containers = this.script.getScripts();
+            for (int i = 0; i < containers.size(); i++) {
+                ScriptContainer container = containers.get(i);
+                EventScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            }
+            NBTTagCompound scriptData = new NBTTagCompound();
+            scriptData.setString("ScriptLanguage", this.script.getLanguage());
+            scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
+            scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
+            EventScriptPacket.Save(-1, containers.size(), scriptData);
         }
-        NBTTagCompound scriptData = new NBTTagCompound();
-        scriptData.setString("ScriptLanguage", this.script.getLanguage());
-        scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
-        scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
-        EventScriptPacket.Save(-1, containers.size(), scriptData);
     }
 }

src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java

@@ -35,6 +35,11 @@ public class GuiScriptAllNPCs extends GuiScriptInterface {
     }
 
     public void setGuiData(NBTTagCompound compound) {
+        if(compound.hasKey("LoadComplete")){
+            loaded = true;
+            return;
+        }
+
         if (!compound.hasKey("Tab")) {
             script.setLanguage(compound.getString("ScriptLanguage"));
             script.setEnabled(compound.getBoolean("ScriptEnabled"));
@@ -54,16 +59,18 @@ public class GuiScriptAllNPCs extends GuiScriptInterface {
     }
 
     public void save() {
-        super.save();
-        List<ScriptContainer> containers = this.script.getScripts();
-        for (int i = 0; i < containers.size(); i++) {
-            ScriptContainer container = containers.get(i);
-            GlobalNPCScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+        if(loaded){
+            super.save();
+            List<ScriptContainer> containers = this.script.getScripts();
+            for (int i = 0; i < containers.size(); i++) {
+                ScriptContainer container = containers.get(i);
+                GlobalNPCScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            }
+            NBTTagCompound scriptData = new NBTTagCompound();
+            scriptData.setString("ScriptLanguage", this.script.getLanguage());
+            scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
+            scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
+            GlobalNPCScriptPacket.Save(-1, containers.size(), scriptData);
         }
-        NBTTagCompound scriptData = new NBTTagCompound();
-        scriptData.setString("ScriptLanguage", this.script.getLanguage());
-        scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
-        scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
-        GlobalNPCScriptPacket.Save(-1, containers.size(), scriptData);
     }
 }

src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java

@@ -30,10 +30,13 @@ public class GuiScriptBlock extends GuiScriptInterface {
     public void setGuiData(NBTTagCompound compound) {
         this.tileScripted.setNBT(compound);
         super.setGuiData(compound);
+        loaded = true;
     }
 
     public void save() {
-        super.save();
-        BlockScriptPacket.Save(tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord, this.tileScripted.getNBT(new NBTTagCompound()));
+        if(loaded) {
+            super.save();
+            BlockScriptPacket.Save(tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord, this.tileScripted.getNBT(new NBTTagCompound()));
+        }
     }
 }

src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java

@@ -29,7 +29,7 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback
     public final GuiNPCManageEffects parent;
     public final CustomEffect effect;
     private final EffectScript scriptHandler;
-
+    boolean loaded = false;
 
     public GuiScriptEffect(GuiNPCManageEffects parent, CustomEffect effect) {
         this.drawDefaultBackground = true;
@@ -315,6 +315,11 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback
     }
 
     public void setGuiData(NBTTagCompound compound) {
+        if(compound.hasKey("LoadComplete")){
+            loaded = true;
+            return;
+        }
+
         if (!compound.hasKey("Tab")) {
             this.scriptHandler.setLanguage(compound.getString("ScriptLanguage"));
             this.scriptHandler.setEnabled(compound.getBoolean("ScriptEnabled"));
@@ -326,7 +331,6 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback
             this.scriptHandler.container = container;
             this.initGui();
         }
-
     }
 
     private void copiedSetGuiData(NBTTagCompound compound) {
@@ -350,19 +354,21 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback
     }
 
     public void save() {
-        this.setScript();
+        if(loaded) {
+            this.setScript();
 
-        List<ScriptContainer> containers = this.scriptHandler.getScripts();
-        for (int i = 0; i < containers.size(); i++) {
-            ScriptContainer container = containers.get(i);
-            EffectScriptPacket.Save(effect.id, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            List<ScriptContainer> containers = this.scriptHandler.getScripts();
+            for (int i = 0; i < containers.size(); i++) {
+                ScriptContainer container = containers.get(i);
+                EffectScriptPacket.Save(effect.id, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            }
+            NBTTagCompound scriptData = new NBTTagCompound();
+            scriptData.setString("ScriptLanguage", this.scriptHandler.getLanguage());
+            scriptData.setBoolean("ScriptEnabled", this.scriptHandler.getEnabled());
+            scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.scriptHandler.getConsoleText()));
+
+            EffectScriptPacket.Save(effect.id, -1, containers.size(), scriptData);
         }
-        NBTTagCompound scriptData = new NBTTagCompound();
-        scriptData.setString("ScriptLanguage", this.scriptHandler.getLanguage());
-        scriptData.setBoolean("ScriptEnabled", this.scriptHandler.getEnabled());
-        scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.scriptHandler.getConsoleText()));
-
-        EffectScriptPacket.Save(effect.id, -1, containers.size(), scriptData);
     }
 
     public void textUpdate(String text) {

src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java

@@ -65,6 +65,11 @@ public class GuiScriptForge extends GuiScriptInterface {
     }
 
     public void setGuiData(NBTTagCompound compound) {
+        if(compound.hasKey("LoadComplete")){
+            loaded = true;
+            return;
+        }
+
         if (!compound.hasKey("Tab")) {
             script.setLanguage(compound.getString("ScriptLanguage"));
             script.setEnabled(compound.getBoolean("ScriptEnabled"));
@@ -84,16 +89,18 @@ public class GuiScriptForge extends GuiScriptInterface {
     }
 
     public void save() {
-        super.save();
-        List<ScriptContainer> containers = this.script.getScripts();
-        for (int i = 0; i < containers.size(); i++) {
-            ScriptContainer container = containers.get(i);
-            ForgeScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+        if(loaded) {
+            super.save();
+            List<ScriptContainer> containers = this.script.getScripts();
+            for (int i = 0; i < containers.size(); i++) {
+                ScriptContainer container = containers.get(i);
+                ForgeScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            }
+            NBTTagCompound scriptData = new NBTTagCompound();
+            scriptData.setString("ScriptLanguage", this.script.getLanguage());
+            scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
+            scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
+            ForgeScriptPacket.Save(-1, containers.size(), scriptData);
         }
-        NBTTagCompound scriptData = new NBTTagCompound();
-        scriptData.setString("ScriptLanguage", this.script.getLanguage());
-        scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
-        scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
-        ForgeScriptPacket.Save(-1, containers.size(), scriptData);
     }
 }

src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java

@@ -25,6 +25,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
     public Map<String, List<String>> languages = new HashMap();
     private int scriptLimit = 1;
     public List<String> hookList = new ArrayList<String>();
+    protected boolean loaded = false;
 
     public GuiScriptInterface() {
         this.drawDefaultBackground = true;
@@ -338,7 +339,8 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
     }
 
     public void save() {
-        this.setScript();
+        if(loaded)
+            this.setScript();
     }
 
     public void textUpdate(String text) {

src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java

@@ -44,12 +44,15 @@ public class GuiScriptItem extends GuiScriptInterface {
             this.item.setMCNbt(compound);
             this.item.loadScriptData();
             super.setGuiData(compound);
+            loaded = true;
         }
     }
 
     public void save() {
-        super.save();
-        ItemScriptPacket.Save(this.item.getMCNbt());
+        if(loaded) {
+            super.save();
+            ItemScriptPacket.Save(this.item.getMCNbt());
+        }
     }
 
     protected String getConsoleText() {

src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java

@@ -30,6 +30,7 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall
     public final GuiNPCManageLinked parent;
     public final LinkedItem linkedItem;
     private final LinkedItemScript scriptHandler;
+    boolean loaded = false;
 
     public GuiScriptLinkedItem(GuiNPCManageLinked parent, LinkedItem linkedItem) {
         this.drawDefaultBackground = true;
@@ -326,6 +327,11 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall
     }
 
     public void setGuiData(NBTTagCompound compound) {
+        if(compound.hasKey("LoadComplete")){
+            loaded = true;
+            return;
+        }
+
         if (!compound.hasKey("Tab")) {
             this.scriptHandler.setLanguage(compound.getString("ScriptLanguage"));
             this.scriptHandler.setEnabled(compound.getBoolean("ScriptEnabled"));
@@ -361,19 +367,21 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall
     }
 
     public void save() {
-        this.setScript();
+        if(loaded) {
+            this.setScript();
 
-        List<ScriptContainer> containers = this.scriptHandler.getScripts();
-        for (int i = 0; i < containers.size(); i++) {
-            ScriptContainer container = containers.get(i);
-            LinkedItemScriptPacket.Save(linkedItem.id, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            List<ScriptContainer> containers = this.scriptHandler.getScripts();
+            for (int i = 0; i < containers.size(); i++) {
+                ScriptContainer container = containers.get(i);
+                LinkedItemScriptPacket.Save(linkedItem.id, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            }
+            NBTTagCompound scriptData = new NBTTagCompound();
+            scriptData.setString("ScriptLanguage", this.scriptHandler.getLanguage());
+            scriptData.setBoolean("ScriptEnabled", this.scriptHandler.getEnabled());
+            scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.scriptHandler.getConsoleText()));
+
+            LinkedItemScriptPacket.Save(linkedItem.id, -1, containers.size(), scriptData);
         }
-        NBTTagCompound scriptData = new NBTTagCompound();
-        scriptData.setString("ScriptLanguage", this.scriptHandler.getLanguage());
-        scriptData.setBoolean("ScriptEnabled", this.scriptHandler.getEnabled());
-        scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.scriptHandler.getConsoleText()));
-
-        LinkedItemScriptPacket.Save(linkedItem.id, -1, containers.size(), scriptData);
     }
 
     public void textUpdate(String text) {

src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java

@@ -18,6 +18,7 @@ public class GuiScriptPlayers extends GuiScriptInterface {
         hookList.add(EnumScriptType.INIT.function);
         hookList.add(EnumScriptType.TICK.function);
         hookList.add(EnumScriptType.INTERACT.function);
+        hookList.add(EnumScriptType.RIGHT_CLICK.function);
         hookList.add(EnumScriptType.ATTACK.function);
         hookList.add(EnumScriptType.ATTACKED.function);
         hookList.add(EnumScriptType.DAMAGED_ENTITY.function);
@@ -90,6 +91,11 @@ public class GuiScriptPlayers extends GuiScriptInterface {
     }
 
     public void setGuiData(NBTTagCompound compound) {
+        if(compound.hasKey("LoadComplete")){
+            loaded = true;
+            return;
+        }
+
         if (!compound.hasKey("Tab")) {
             script.setLanguage(compound.getString("ScriptLanguage"));
             script.setEnabled(compound.getBoolean("ScriptEnabled"));
@@ -109,16 +115,18 @@ public class GuiScriptPlayers extends GuiScriptInterface {
     }
 
     public void save() {
-        super.save();
-        List<ScriptContainer> containers = this.script.getScripts();
-        for (int i = 0; i < containers.size(); i++) {
-            ScriptContainer container = containers.get(i);
-            PlayerScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+        if(loaded) {
+            super.save();
+            List<ScriptContainer> containers = this.script.getScripts();
+            for (int i = 0; i < containers.size(); i++) {
+                ScriptContainer container = containers.get(i);
+                PlayerScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            }
+            NBTTagCompound scriptData = new NBTTagCompound();
+            scriptData.setString("ScriptLanguage", this.script.getLanguage());
+            scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
+            scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
+            PlayerScriptPacket.Save(-1, containers.size(), scriptData);
         }
-        NBTTagCompound scriptData = new NBTTagCompound();
-        scriptData.setString("ScriptLanguage", this.script.getLanguage());
-        scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
-        scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
-        PlayerScriptPacket.Save(-1, containers.size(), scriptData);
     }
 }

src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java

@@ -100,7 +100,7 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface {
             setCouchWood(var1.getBlockMetadata());
             if (tile.hasCornerLeft) {
                 GL11.glPushMatrix();
-                GL11.glRotatef(90, 0, 1, 0);
+                GL11.glRotatef(270, 0, 1, 0);
                 modelCouchCorner.CouchBack.render(0.0625F);
                 GL11.glPopMatrix();
             } else if (tile.hasCornerRight)
@@ -119,8 +119,12 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface {
             float[] color = ColorUtil.hexToRGB(tile.color);
             GL11.glColor3f(color[0], color[1], color[2]);
 
-            if (tile.hasCornerLeft)
+            if (tile.hasCornerLeft){
+                GL11.glPushMatrix();
+                GL11.glRotatef(270, 0, 1, 0);
                 modelCouchCorner.Cussion.render(0.0625F);
+                GL11.glPopMatrix();
+            }
             else if (tile.hasCornerRight)
                 modelCouchCorner.Cussion.render(0.0625F);
             else if (tile.hasLeft && tile.hasRight)

src/main/java/noppes/npcs/controllers/ScriptContainer.java

@@ -92,22 +92,20 @@ public class ScriptContainer {
 
     private String getFullCode() {
         if (!this.evaluated) {
-            this.fullscript = this.script;
-            if (!this.fullscript.isEmpty()) {
-                this.fullscript = this.fullscript + "\n";
-            }
-
-            Iterator var1 = this.scripts.iterator();
-
-            while (var1.hasNext()) {
-                String loc = (String) var1.next();
-                String code = (String) ScriptController.Instance.scripts.get(loc);
+            // build includes first
+            StringBuilder sb = new StringBuilder();
+            for (String loc : this.scripts) {
+                String code = ScriptController.Instance.scripts.get(loc);
                 if (code != null && !code.isEmpty()) {
-                    this.fullscript = this.fullscript + code + "\n";
+                    sb.append(code).append("\n");
                 }
             }
-
-            this.unknownFunctions = new HashSet<String>();
+            // then your per‐hook script
+            if (this.script != null && !this.script.isEmpty()) {
+                sb.append(this.script).append("\n");
+            }
+            this.fullscript = sb.toString();
+            this.unknownFunctions = new HashSet<>();
         }
         return this.fullscript;
     }

src/main/java/noppes/npcs/controllers/data/DataScript.java

@@ -242,7 +242,7 @@ public class DataScript implements INpcScriptHandler {
     @Override
     public void callScript(String hookName, Event event) {
         try {
-            EnumScriptType enumScriptType = EnumScriptType.valueOf(hookName);
+            EnumScriptType enumScriptType = EnumScriptType.valueOfIgnoreCase(hookName);
             this.callScript(enumScriptType, event);
         } catch (IllegalArgumentException ignored) {
         }

src/main/java/noppes/npcs/controllers/data/action/Action.java

@@ -1,7 +1,6 @@
 package noppes.npcs.controllers.data.action;
 
 import noppes.npcs.api.handler.data.IAction;
-import noppes.npcs.config.ConfigScript;
 import noppes.npcs.scripted.ScriptedActionManager;
 
 import java.util.HashMap;
@@ -128,7 +127,7 @@ public class Action implements IAction {
     }
 
     @Override
-    public IAction addData(String key, Object v) {
+    public IAction setData(String key, Object v) {
         dataStore.put(key, v);
         return this;
     }
@@ -139,6 +138,11 @@ public class Action implements IAction {
         return this;
     }
 
+    @Override
+    public boolean hasData(String key) {
+        return dataStore.containsKey(key);
+    }
+
     @Override
     public int getUpdateEveryXTick() {
         return updateEveryXTick;

src/main/java/noppes/npcs/scripted/ScriptWorld.java

@@ -136,7 +136,11 @@ public class ScriptWorld implements IWorld {
     }
 
     public IBlock getTopBlock(int x, int z) {
-        return NpcAPI.Instance().getIBlock(this, x, world.getTopSolidOrLiquidBlock(x, z), z);
+        int yAbove = world.getTopSolidOrLiquidBlock(x, z);
+        if (yAbove <= 0) {
+            return null;
+        }
+        return NpcAPI.Instance().getIBlock(this, x, yAbove - 1, z);
     }
 
     public IBlock getTopBlock(IPos pos) {

src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java

@@ -13,13 +13,16 @@ import noppes.npcs.api.IDamageSource;
 import noppes.npcs.api.entity.IEntity;
 import noppes.npcs.api.entity.IEntityLivingBase;
 import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.api.event.IItemEvent;
 import noppes.npcs.api.event.IPlayerEvent;
 import noppes.npcs.api.handler.data.IPlayerEffect;
 import noppes.npcs.api.handler.data.IProfile;
+import noppes.npcs.api.item.IItemCustomizable;
 import noppes.npcs.api.item.IItemStack;
 import noppes.npcs.constants.EnumScriptType;
 import noppes.npcs.scripted.NpcAPI;
 import noppes.npcs.scripted.event.CustomNPCsEvent;
+import noppes.npcs.scripted.event.ItemEvent;
 
 public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent {
     public final IPlayer player;
@@ -650,6 +653,38 @@ public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent {
         }
     }
 
+    @Cancelable
+    public static class RightClickEvent extends PlayerEvent implements IPlayerEvent.RightClickEvent {
+
+        /**
+         * 0:air, 1:entity, 2:block
+         */
+        public final int type;
+        public final Object target;
+
+        public RightClickEvent(IPlayer player, int type, Object target) {
+            super(player);
+            this.type = type;
+            this.target = target;
+        }
+
+        public String getHookName() {
+            return EnumScriptType.RIGHT_CLICK.function;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public Object getTarget() {
+            return target;
+        }
+
+        public IPlayer getPlayer() {
+            return player;
+        }
+    }
+
     public static class UpdateEvent extends PlayerEvent implements IPlayerEvent.UpdateEvent {
         public UpdateEvent(IPlayer player) {
             super(player);