upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-15 19:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Added several more functions to pre-existing classes:"

Browse Source 
This reverts commit e9a8f8cebc.
This commit is contained in:
KAMKEEL committed 2022-11-06 00:10:04 -04:00
1 parent 0d3436c71b
commit 6ae465c5d0
51 files changed
+226 -1024
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/scripted/ScriptTileEntity.java
+7 -23
View File
@@ -4,39 +4,27 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.WorldServer;
import noppes.npcs.scripted.interfaces.*;
import noppes.npcs.scripted.interfaces.IBlock;
import noppes.npcs.scripted.interfaces.INbt;
import noppes.npcs.scripted.interfaces.ITileEntity;
public class ScriptTileEntity<T extends TileEntity> implements ITileEntity {
protected T tileEntity;
protected IWorld world;
public ScriptTileEntity(T tileEntity) {
this.tileEntity = tileEntity;
this.world = NpcAPI.Instance().getIWorld(tileEntity.getWorldObj());
}
public ScriptTileEntity(T tileEntity) { this.tileEntity = tileEntity; }
public int getBlockMetadata(){
return tileEntity.getBlockMetadata();
}
public IWorld getWorld(){
return world;
}
public void setWorld(IWorld world) {
this.tileEntity.setWorldObj(world.getMCWorld());
this.world = world;
public ScriptWorld getWorld(){
return (ScriptWorld) NpcAPI.Instance().getIWorld((WorldServer) tileEntity.getWorldObj());
}
public TileEntity getMCTileEntity() {
return this.tileEntity;
}
public void markDirty()
{
this.tileEntity.markDirty();
}
public void readFromNBT(INbt nbt){
this.tileEntity.readFromNBT(nbt.getMCNBT());
}
@@ -45,12 +33,8 @@ public class ScriptTileEntity<T extends TileEntity> implements ITileEntity {
return this.tileEntity.getDistanceFrom(x,y,z);
}
public double getDistanceFrom(IPos pos){
return this.getDistanceFrom(pos.getX(),pos.getY(),pos.getZ());
}
public IBlock getBlockType(){
return NpcAPI.Instance().getIBlock(world, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
return NpcAPI.Instance().getIBlock(tileEntity.getWorldObj(), tileEntity.getBlockType(), new BlockPos(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord));
}
public boolean isInvalid(){