Implemented global Forge events. Reorganized NPC API files.

This commit is contained in:
luisc committed 2021-10-18 06:33:39 -05:00
1 parent c5ed7497c8
commit 72f2c3c60a
72 files changed
+321 -395

No files matched your search

@@ -10,6 +10,7 @@ import java.io.File;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.EventBus;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -18,6 +19,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import noppes.npcs.scripted.interfaces.*;
public abstract class NpcAPI {
private static NpcAPI instance = null;
@@ -31,8 +33,12 @@ public abstract class NpcAPI {
public abstract IEntity getIEntity(Entity var1);
public abstract IPlayer getIPlayer(EntityPlayerMP var1);
public abstract IBlock getIBlock(World var1, BlockPos var2);
public abstract IBlock getIBlock(World world, int x, int y, int z);
public abstract IContainer getIContainer(IInventory var1);
public abstract IContainer getIContainer(Container var1);
@@ -7,7 +7,6 @@ package noppes.npcs.scripted;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.inventory.IInventory;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -15,6 +14,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import noppes.npcs.scripted.interfaces.*;
import noppes.npcs.util.LRUHashMap;
public class ScriptBlock implements IBlock {
@@ -7,6 +7,7 @@ package noppes.npcs.scripted;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import noppes.npcs.scripted.interfaces.IPos;
public class ScriptBlockPos implements IPos {
private BlockPos blockPos;
@@ -6,15 +6,12 @@
package noppes.npcs.scripted;
import net.minecraft.block.Block;
import net.minecraft.block.BlockAir;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import noppes.npcs.NoppesUtilPlayer;
import noppes.npcs.scripted.CustomNPCsException;
import noppes.npcs.scripted.IContainer;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.IItemStack;
import noppes.npcs.scripted.interfaces.IContainer;
import noppes.npcs.scripted.interfaces.IItemStack;
public class ScriptContainer implements IContainer {
private IInventory inventory;
@@ -1,7 +1,7 @@
package noppes.npcs.scripted;
import net.minecraft.entity.Entity;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.scripted.entity.ScriptEntity;
/**
* Created by luisc on 9/8/2021.
@@ -1,15 +0,0 @@
package noppes.npcs.scripted;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.DamageSource;
import noppes.npcs.controllers.ScriptController;
public class ScriptEventDialog extends ScriptEvent{
/**
* @deprecated
*/
public boolean isClosing(){
return true;
}
}
@@ -1,6 +1,8 @@
package noppes.npcs.scripted;
import noppes.npcs.controllers.Faction;
import noppes.npcs.scripted.entity.ScriptNpc;
import noppes.npcs.scripted.entity.ScriptPlayer;
public class ScriptFaction {
private Faction faction;
@@ -13,9 +13,11 @@ import net.minecraft.nbt.NBTBase.NBTPrimitive;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import noppes.npcs.scripted.interfaces.IItemStack;
import noppes.npcs.scripted.interfaces.INbt;
public class ScriptItemStack implements IItemStack {
protected ItemStack item;
public ItemStack item;
public ScriptItemStack(ItemStack item){
this.item = item;
@@ -14,6 +14,7 @@ import net.minecraft.nbt.NBTTagInt;
import net.minecraft.nbt.NBTTagIntArray;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import noppes.npcs.scripted.interfaces.INbt;
import noppes.npcs.util.NBTJsonUtil;
public class ScriptNbt implements INbt {
@@ -4,6 +4,7 @@ import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.controllers.PixelmonHelper;
import noppes.npcs.scripted.entity.ScriptPixelmon;
public class ScriptPixelmonPlayerData {
private EntityPlayerMP player;
@@ -23,11 +23,14 @@ import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.blocks.tiles.TileBigSign;
import noppes.npcs.blocks.tiles.TileSign;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.controllers.ServerCloneController;
import noppes.npcs.scripted.entity.ScriptEntity;
import noppes.npcs.scripted.entity.ScriptPlayer;
import noppes.npcs.scripted.interfaces.IBlock;
import noppes.npcs.scripted.interfaces.IWorld;
public class ScriptWorld implements IWorld{
public class ScriptWorld implements IWorld {
private static Map<String,Object> tempData = new HashMap<String,Object>();
public WorldServer world;
public ScriptWorld(WorldServer world){
@@ -1,7 +1,8 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.entity;
import net.minecraft.entity.passive.EntityAnimal;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.interfaces.IAnimal;
public class ScriptAnimal<T extends EntityAnimal> extends ScriptLiving<T> implements IAnimal {
@@ -1,4 +1,4 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.entity;
import java.util.ArrayList;
import java.util.HashMap;
@@ -6,7 +6,6 @@ import java.util.List;
import java.util.Map;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
@@ -19,16 +18,17 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagString;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.Server;
import noppes.npcs.constants.EnumPacketClient;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.ScriptEntityParticle;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.interfaces.IEntity;
import noppes.npcs.scripted.interfaces.INbt;
public class ScriptEntity<T extends Entity> implements IEntity{
public class ScriptEntity<T extends Entity> implements IEntity {
protected T entity;
private Map<String,Object> tempData = new HashMap<String,Object>();
@@ -1,12 +1,8 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.entity;
import net.minecraft.entity.NPCEntityHelper;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.interfaces.IEntityLiving;
public class ScriptLiving<T extends EntityLiving> extends ScriptLivingBase<T> implements IEntityLiving {
@@ -1,27 +1,15 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.entity;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTBase.NBTPrimitive;
import net.minecraft.nbt.NBTTagString;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.MathHelper;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.interfaces.IEntityLivingBase;
public class ScriptLivingBase<T extends EntityLivingBase> extends ScriptEntity<T> implements IEntityLivingBase{
public class ScriptLivingBase<T extends EntityLivingBase> extends ScriptEntity<T> implements IEntityLivingBase {
protected T entity;
public ScriptLivingBase(T entity){
@@ -1,8 +1,8 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.monster.EntityMob;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.interfaces.IMonster;
public class ScriptMonster<T extends EntityMob> extends ScriptLiving<T> implements IMonster {
@@ -1,9 +1,6 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.entity;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.constants.EnumAnimation;
import noppes.npcs.constants.EnumJobType;
@@ -11,9 +8,11 @@ import noppes.npcs.constants.EnumRoleType;
import noppes.npcs.controllers.Line;
import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.roles.JobBard;
import noppes.npcs.scripted.ScriptFaction;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.constants.AnimationType;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.interfaces.ICustomNpc;
import noppes.npcs.scripted.roles.ScriptJobBard;
import noppes.npcs.scripted.roles.ScriptJobConversation;
import noppes.npcs.scripted.roles.ScriptJobFollower;
@@ -1,9 +1,9 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.entity;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.controllers.PixelmonHelper;
import noppes.npcs.scripted.interfaces.IPixelmon;
import noppes.npcs.util.ValueUtil;
public class ScriptPixelmon<T extends EntityTameable> extends ScriptAnimal<T> implements IPixelmon {
@@ -1,4 +1,4 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.entity;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
@@ -22,7 +22,10 @@ import noppes.npcs.controllers.PlayerQuestData;
import noppes.npcs.controllers.Quest;
import noppes.npcs.controllers.QuestController;
import noppes.npcs.controllers.QuestData;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.ScriptPixelmonPlayerData;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.interfaces.IPlayer;
import noppes.npcs.util.ValueUtil;
public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T> implements IPlayer {
@@ -7,8 +7,8 @@ package noppes.npcs.scripted.event;
import cpw.mods.fml.common.eventhandler.Cancelable;
import cpw.mods.fml.common.eventhandler.Event;
import noppes.npcs.scripted.IWorld;
import noppes.npcs.scripted.IEntity;
import noppes.npcs.scripted.interfaces.IWorld;
import noppes.npcs.scripted.interfaces.IEntity;
@Cancelable
public class ForgeEvent extends CustomNPCsEvent {
@@ -6,13 +6,15 @@
package noppes.npcs.scripted.event;
import cpw.mods.fml.common.eventhandler.Cancelable;
import cpw.mods.fml.common.eventhandler.Event;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityXPOrb;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import noppes.npcs.scripted.*;
import noppes.npcs.scripted.entity.ScriptLivingBase;
import noppes.npcs.scripted.entity.ScriptPlayer;
import noppes.npcs.scripted.interfaces.*;
public class PlayerEvent extends CustomNPCsEvent {
public final IPlayer player;
@@ -1,4 +1,4 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.event;
public
class ScriptEvent{
@@ -1,8 +1,8 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.event;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.DamageSource;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.scripted.entity.ScriptLivingBase;
public class ScriptEventAttack extends ScriptEvent{
@@ -1,8 +1,9 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.event;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.DamageSource;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.scripted.entity.ScriptLivingBase;
public class ScriptEventDamaged extends ScriptEvent{
@@ -0,0 +1,11 @@
package noppes.npcs.scripted.event;
public class ScriptEventDialog extends ScriptEvent{
/**
* @deprecated
*/
public boolean isClosing(){
return true;
}
}
@@ -1,8 +1,9 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.event;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.DamageSource;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.scripted.entity.ScriptLivingBase;
public class ScriptEventKilled extends ScriptEvent{
@@ -1,8 +1,8 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.event;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.DamageSource;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.scripted.entity.ScriptLivingBase;
public class ScriptEventTarget extends ScriptEvent{
@@ -3,7 +3,7 @@
// (powered by Fernflower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.entity.passive.EntityAnimal;
@@ -3,7 +3,7 @@
// (powered by Fernflower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
@@ -3,7 +3,7 @@
// (powered by FernFlower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
@@ -3,20 +3,14 @@
// (powered by FernFlower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.entity.EntityCreature;
import net.minecraft.item.ItemStack;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.constants.EnumAnimation;
import noppes.npcs.constants.EnumJobType;
import noppes.npcs.constants.EnumRoleType;
import noppes.npcs.controllers.Line;
import noppes.npcs.scripted.IItemStack;
import noppes.npcs.scripted.constants.AnimationType;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.ScriptFaction;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.entity.ScriptLivingBase;
import noppes.npcs.scripted.entity.ScriptPlayer;
import noppes.npcs.scripted.roles.*;
import noppes.npcs.util.ValueUtil;
public interface ICustomNpc<T extends EntityCreature> extends IEntityLiving<T> {
/**
@@ -3,7 +3,7 @@
// (powered by FernFlower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.util.DamageSource;
@@ -3,34 +3,11 @@
// (powered by FernFlower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagString;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.scripted.IWorld;
import noppes.npcs.scripted.IItemStack;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.scripted.ScriptEntity;
import noppes.npcs.scripted.ScriptEntityParticle;
import noppes.npcs.scripted.entity.ScriptEntity;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.constants.EntityType;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface IEntity<T extends Entity> {
/**
@@ -3,7 +3,7 @@
// (powered by Fernflower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.entity.EntityLiving;
@@ -1,11 +1,9 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.entity.ScriptEntity;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.entity.ScriptLivingBase;
public interface IEntityLivingBase<T extends EntityLivingBase> extends IEntity<T> {
/**
@@ -1,17 +1,6 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import java.util.ArrayList;
import java.util.List;
public interface IItemStack {
public String getName();
@@ -3,7 +3,7 @@
// (powered by Fernflower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.entity.monster.EntityMob;
@@ -3,7 +3,7 @@
// (powered by Fernflower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.nbt.NBTTagCompound;
@@ -3,7 +3,7 @@
// (powered by Fernflower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.entity.passive.EntityTameable;
@@ -1,22 +1,8 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraft.stats.StatBase;
import net.minecraft.stats.StatList;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.WorldSettings;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.NoppesStringUtils;
import noppes.npcs.NoppesUtilPlayer;
import noppes.npcs.Server;
import noppes.npcs.constants.EnumPacketClient;
import noppes.npcs.controllers.*;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.util.ValueUtil;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.ScriptPixelmonPlayerData;
public interface IPlayer<T extends EntityPlayerMP> extends IEntityLivingBase<T> {
/**
@@ -3,7 +3,7 @@
// (powered by Fernflower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.util.math.BlockPos;
@@ -3,7 +3,7 @@
// (powered by Fernflower decompiler)
//
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
public interface ITimers {
void start(int var1, int var2, boolean var3);
@@ -1,29 +1,10 @@
package noppes.npcs.scripted;
package noppes.npcs.scripted.interfaces;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagString;
import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntitySign;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.blocks.tiles.TileBigSign;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.controllers.ServerCloneController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import noppes.npcs.scripted.*;
import noppes.npcs.scripted.entity.ScriptEntity;
import noppes.npcs.scripted.entity.ScriptPlayer;
public interface IWorld {
/**
@@ -2,10 +2,6 @@ package noppes.npcs.scripted.roles;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.roles.JobConversation;
import noppes.npcs.roles.JobGuard;
import noppes.npcs.roles.JobItemGiver;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.ScriptPlayer;
import noppes.npcs.scripted.constants.JobType;
public class ScriptJobConversation extends ScriptJobInterface{
@@ -2,8 +2,7 @@ package noppes.npcs.scripted.roles;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.roles.JobFollower;
import noppes.npcs.roles.JobGuard;
import noppes.npcs.scripted.ScriptNpc;
import noppes.npcs.scripted.entity.ScriptNpc;
import noppes.npcs.scripted.constants.JobType;
public class ScriptJobFollower extends ScriptJobInterface{
@@ -2,7 +2,7 @@ package noppes.npcs.scripted.roles;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.roles.JobHealer;
import noppes.npcs.scripted.ScriptLivingBase;
import noppes.npcs.scripted.entity.ScriptLivingBase;
import noppes.npcs.scripted.constants.JobType;
public class ScriptJobHealer extends ScriptJobInterface{
@@ -1,10 +1,7 @@
package noppes.npcs.scripted.roles;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.roles.JobGuard;
import noppes.npcs.roles.JobItemGiver;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.ScriptPlayer;
import noppes.npcs.scripted.constants.JobType;
public class ScriptJobItemGiver extends ScriptJobInterface{
@@ -1,11 +1,7 @@
package noppes.npcs.scripted.roles;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.roles.JobGuard;
import noppes.npcs.roles.JobHealer;
import noppes.npcs.roles.JobPuppet;
import noppes.npcs.scripted.ScriptLivingBase;
import noppes.npcs.scripted.constants.JobType;
public class ScriptJobPuppet extends ScriptJobInterface{
@@ -1,18 +1,12 @@
package noppes.npcs.scripted.roles;
import java.util.ArrayList;
import java.util.Iterator;
import net.minecraft.entity.EntityLivingBase;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.roles.JobGuard;
import noppes.npcs.roles.JobItemGiver;
import noppes.npcs.roles.JobSpawner;
import noppes.npcs.scripted.ScriptItemStack;
import noppes.npcs.scripted.ScriptLivingBase;
import noppes.npcs.scripted.ScriptPlayer;
import noppes.npcs.scripted.entity.ScriptLivingBase;
import noppes.npcs.scripted.constants.JobType;
public class ScriptJobSpawner extends ScriptJobInterface{
@@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.roles.RoleFollower;
import noppes.npcs.scripted.ScriptPlayer;
import noppes.npcs.scripted.entity.ScriptPlayer;
import noppes.npcs.scripted.constants.RoleType;
public class ScriptRoleFollower extends ScriptRoleInterface{
@@ -6,9 +6,9 @@
package noppes.npcs.scripted.wrapper;
import net.minecraft.util.DamageSource;
import noppes.npcs.scripted.IDamageSource;
import noppes.npcs.scripted.interfaces.IDamageSource;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.IEntity;
import noppes.npcs.scripted.interfaces.IEntity;
public class ScriptDamageSource implements IDamageSource {
private DamageSource source;
@@ -8,20 +8,14 @@ package noppes.npcs.scripted.wrapper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.LogWriter;
import noppes.npcs.scripted.*;
import noppes.npcs.controllers.PixelmonHelper;
import noppes.npcs.entity.EntityProjectile;
import noppes.npcs.scripted.entity.*;
import noppes.npcs.scripted.interfaces.IEntity;
public class WrapperEntityData{
public IEntity base;
@@ -9,17 +9,15 @@ import java.io.File;
import java.util.Map;
import cpw.mods.fml.common.eventhandler.EventBus;
import net.minecraft.block.Block;
import net.minecraft.block.BlockAir;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
@@ -28,16 +26,11 @@ import noppes.npcs.CustomNpcs;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.scripted.*;
import noppes.npcs.containers.ContainerNpcInterface;
import noppes.npcs.controllers.DialogController;
import noppes.npcs.controllers.FactionController;
import noppes.npcs.controllers.QuestController;
import noppes.npcs.controllers.RecipeController;
import noppes.npcs.controllers.ServerCloneController;
import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.scripted.entity.ScriptPlayer;
import noppes.npcs.scripted.interfaces.*;
import noppes.npcs.util.LRUHashMap;
import noppes.npcs.util.NBTJsonUtil;
import noppes.npcs.util.JsonException;
public class WrapperNpcAPI extends NpcAPI {
private static final Map<Integer, ScriptWorld> worldCache = new LRUHashMap(10);
@@ -59,10 +52,22 @@ public class WrapperNpcAPI extends NpcAPI {
}
}
public IPlayer getIPlayer(EntityPlayerMP player) {
if (player != null && !player.worldObj.isRemote) {
return new ScriptPlayer(player);
} else {
return null;
}
}
public IBlock getIBlock(World world, BlockPos pos) {
return new ScriptBlock(world, world.getBlock(pos.getX(),pos.getY(),pos.getZ()), pos);
}
public IBlock getIBlock(World world, int x, int y, int z) {
return new ScriptBlock(world, world.getBlock(x, y, z), new BlockPos(x,y,z));
}
public INbt getINbt(NBTTagCompound compound) {
return compound == null?new ScriptNbt(new NBTTagCompound()):new ScriptNbt(compound);
}