diff --git a/CustomNPC-Plus-1.21.iml b/CustomNPC-Plus-1.21.iml deleted file mode 100644 index 371deae12..000000000 --- a/CustomNPC-Plus-1.21.iml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Scripting_Documentation.pdf b/Scripting_Documentation.pdf new file mode 100644 index 000000000..629f97237 Binary files /dev/null and b/Scripting_Documentation.pdf differ diff --git a/build.gradle b/build.gradle index 86bf1de90..0b162a9a5 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,6 @@ buildscript { apply plugin: 'forge' -version = "1.4" group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 8d16e739b..c58bc5286 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -61,7 +61,7 @@ import noppes.npcs.entity.old.EntityNpcNagaMale; import noppes.npcs.entity.old.EntityNpcSkeleton; import noppes.npcs.scripted.wrapper.WrapperNpcAPI; -@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.3") +@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.3.2") public class CustomNpcs { @ConfigProp(info = "Disable Chat Bubbles") diff --git a/src/main/java/noppes/npcs/blocks/BlockPedestal.java b/src/main/java/noppes/npcs/blocks/BlockPedestal.java index 68c401f18..2caaa5786 100644 --- a/src/main/java/noppes/npcs/blocks/BlockPedestal.java +++ b/src/main/java/noppes/npcs/blocks/BlockPedestal.java @@ -8,6 +8,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.tileentity.TileEntity; @@ -41,7 +42,7 @@ public class BlockPedestal extends BlockTrigger{ par1World.markBlockForUpdate(i, j, k); updateSurrounding(par1World, i, j, k); } - else if(item == null || item.getItem() == null || !(item.getItem() instanceof ItemSword)) + else if(item == null || item.getItem() == null || item.getItem() instanceof ItemBlock) return true; else if(item != null && weapon == null){ tile.setInventorySlotContents(0, item);