1.9.4 update + random stuff.
This commit is contained in:
TheBukor
parent
e47feb2122
commit
8ec8133c89
@ -7,10 +7,11 @@
|
||||
<classpathentry kind="lib" path="C:/Users/DELL/AppData/Roaming/.minecraft/workspace/eclipse/Build Path/1.8.8.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/DELL/AppData/Roaming/.minecraft/workspace/eclipse/Build Path/1.8.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/DELL/AppData/Roaming/.minecraft/workspace/eclipse/Build Path/Skript.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/DELL/AppData/Roaming/.minecraft/workspace/eclipse/Build Path/1.9 (2).jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/DELL/AppData/Roaming/.minecraft/workspace/eclipse/Build Path/VanishNoPacket.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/DELL/AppData/Roaming/.minecraft/workspace/eclipse/Build Path/WorldEdit.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/DELL/AppData/Roaming/.minecraft/workspace/eclipse/Build Path/WorldGuard.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/DELL/AppData/Roaming/.minecraft/workspace/eclipse/Build Path/ProtocolLib.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/DELL/AppData/Roaming/.minecraft/workspace/eclipse/Build Path/1.9.4.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/DELL/AppData/Roaming/.minecraft/workspace/eclipse/Build Path/1.9.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
||||
2
bin/.gitignore
vendored
2
bin/.gitignore
vendored
@ -1,3 +1 @@
|
||||
/me/
|
||||
/protocollib/
|
||||
/org/
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
name: SkStuff
|
||||
author: TheBukor
|
||||
description: A Skript addon which adds extra functionalities such as NBT and extended WorldEdit support.
|
||||
version: 1.6.3.1
|
||||
version: 1.6.3.2
|
||||
main: me.TheBukor.SkStuff.SkStuff
|
||||
softdepend: [Skript, WorldEdit, VanishNoPacket]
|
||||
@ -16,6 +16,7 @@ import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.kitteh.vanish.event.VanishStatusChangeEvent;
|
||||
import org.mcstats.Metrics;
|
||||
|
||||
import com.sk89q.worldedit.EditSession;
|
||||
@ -76,6 +77,7 @@ import me.TheBukor.SkStuff.expressions.ExprNBTListIndex;
|
||||
import me.TheBukor.SkStuff.expressions.ExprNBTOf;
|
||||
import me.TheBukor.SkStuff.expressions.ExprNewEditSession;
|
||||
import me.TheBukor.SkStuff.expressions.ExprNoClip;
|
||||
import me.TheBukor.SkStuff.expressions.ExprRegionsWithinLocation;
|
||||
import me.TheBukor.SkStuff.expressions.ExprSchematicArea;
|
||||
import me.TheBukor.SkStuff.expressions.ExprSelectionArea;
|
||||
import me.TheBukor.SkStuff.expressions.ExprSelectionOfPlayer;
|
||||
@ -93,6 +95,7 @@ import me.TheBukor.SkStuff.util.NMSInterface;
|
||||
import me.TheBukor.SkStuff.util.NMS_v1_7_R4;
|
||||
import me.TheBukor.SkStuff.util.NMS_v1_8_R3;
|
||||
import me.TheBukor.SkStuff.util.NMS_v1_9_R1;
|
||||
import me.TheBukor.SkStuff.util.NMS_v1_9_R2;
|
||||
import me.TheBukor.SkStuff.util.ReflectionUtils;
|
||||
|
||||
public class SkStuff extends JavaPlugin {
|
||||
@ -279,24 +282,35 @@ public class SkStuff extends JavaPlugin {
|
||||
Skript.registerExpression(ExprFlagsOfWGRegion.class, Flag.class, ExpressionType.PROPERTY, "[skstuff] [all] [w[orld[ ]]g[uard]] flags of %protectedregion%");
|
||||
Skript.registerExpression(ExprWGMemberOwner.class, OfflinePlayer.class, ExpressionType.PROPERTY, "[the] [skstuff] (0¦members|1¦owner[s]) of [[the] (world[ ]guard|wg) region] %protectedregion%");
|
||||
}
|
||||
exprAmount += 3;
|
||||
Skript.registerExpression(ExprRegionsWithinLocation.class, ProtectedRegion.class, ExpressionType.SIMPLE, "[all] [the] regions (containing|within|inside) %location%");
|
||||
exprAmount += 4;
|
||||
}
|
||||
}
|
||||
if (Bukkit.getPluginManager().getPlugin("VanishNoPacket") != null) {
|
||||
getLogger().info("VanishNoPacket was found! Registering vanishing features...");
|
||||
Skript.registerEffect(EffToggleVanish.class, "toggle vanish (state|mode) of %player% (0¦|1¦(silently|quietly))", "toggle %player%'s vanish (state|mode) (0¦|1¦(silently|quietly))");
|
||||
Skript.registerEvent("Vanish toggle event", SimpleEvent.class, VanishStatusChangeEvent.class, "[player] vanish [(state|mode)] (chang|toggl)(e|ing)");
|
||||
Skript.registerExpression(ExprVanishState.class, Boolean.class, ExpressionType.PROPERTY, "vanish (state|mode) of %player%", "%player%'s vanish (state|mode)");
|
||||
EventValues.registerEventValue(VanishStatusChangeEvent.class, Player.class, new Getter<Player, VanishStatusChangeEvent>() {
|
||||
@Override
|
||||
@Nullable
|
||||
public Player get(VanishStatusChangeEvent e) {
|
||||
return e.getPlayer();
|
||||
}
|
||||
}, 0);
|
||||
effAmount += 1;
|
||||
evtAmount += 1;
|
||||
exprAmount += 1;
|
||||
}
|
||||
try {
|
||||
Metrics metrics = new Metrics(this);
|
||||
metrics.start();
|
||||
getLogger().info("Hooked into Metrics! Woohoo!!");
|
||||
} catch (IOException ex) {
|
||||
getLogger().warning("Sorry, I've failed to hook SkStuff into Metrics. I'm really sorry.");
|
||||
getLogger().warning("Here's an error for you: " + ex.getMessage());
|
||||
}
|
||||
getLogger().info("Everything ready! Loaded a total of " + condAmount + " conditions, " + effAmount + " effects, " + evtAmount + "events, " + exprAmount + " expressions and " + typeAmount + " types!");
|
||||
getLogger().info("Everything ready! Loaded a total of " + condAmount + " conditions, " + effAmount + " effects, " + evtAmount + " events, " + exprAmount + " expressions and " + typeAmount + " types!");
|
||||
} else {
|
||||
getLogger().info("Unable to find Skript or Skript isn't accepting registrations, disabling SkStuff...");
|
||||
Bukkit.getPluginManager().disablePlugin(this);;
|
||||
@ -313,7 +327,10 @@ public class SkStuff extends JavaPlugin {
|
||||
getLogger().info("It looks like you're either running 1.8.4, 1.8.7, 1.8.8 or 1.8.9!");
|
||||
} else if (version.equals("v1_9_R1.")) {
|
||||
nmsMethods = new NMS_v1_9_R1();
|
||||
getLogger().info("It looks like you're running 1.9!");
|
||||
getLogger().info("It looks like you're either running 1.9.0 or 1.9.2!");
|
||||
} else if (version.equals("v1_9_R2.")) {
|
||||
nmsMethods = new NMS_v1_9_R2();
|
||||
getLogger().info("It looks like you're running 1.9.4!");
|
||||
} else {
|
||||
getLogger().warning("It looks like you're running an unsupported server version, some features will not be available :(");
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ import javax.annotation.Nullable;
|
||||
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockState;
|
||||
import org.bukkit.block.DoubleChest;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
@ -50,8 +51,8 @@ public class ExprInventoryOwner extends SimpleExpression<Object> {
|
||||
return new Entity[] { (Entity) holder };
|
||||
} else if (holder instanceof BlockState) {
|
||||
return new Block[] { ((BlockState) holder).getBlock() };
|
||||
} else if (holder instanceof Block) { //Only happens for double chests, I believe
|
||||
return new Block[] { (Block) holder };
|
||||
} else if (holder instanceof DoubleChest) {
|
||||
return new Block[] { ((DoubleChest) holder).getLocation().getBlock() };
|
||||
} else {
|
||||
Skript.error("Something went wrong when trying to get the owner of the specified inventory!");
|
||||
Skript.error("Post the below info on the SkStuff thread in SkUnity:");
|
||||
|
||||
@ -0,0 +1,62 @@
|
||||
package me.TheBukor.SkStuff.expressions;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.event.Event;
|
||||
|
||||
import com.sk89q.worldedit.Vector;
|
||||
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
|
||||
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
|
||||
|
||||
import ch.njol.skript.lang.Expression;
|
||||
import ch.njol.skript.lang.SkriptParser.ParseResult;
|
||||
import ch.njol.skript.lang.util.SimpleExpression;
|
||||
import ch.njol.util.Kleenean;
|
||||
|
||||
public class ExprRegionsWithinLocation extends SimpleExpression<ProtectedRegion> {
|
||||
private Expression<Location> location;
|
||||
|
||||
@Override
|
||||
public boolean isSingle() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<? extends ProtectedRegion> getReturnType() {
|
||||
return ProtectedRegion.class;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public boolean init(Expression<?>[] expr, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
|
||||
location = (Expression<Location>) expr[0];
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(@Nullable Event e, boolean debug) {
|
||||
return "all the regions containing " + location.toString(e, debug);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
protected ProtectedRegion[] get(Event e) {
|
||||
WorldGuardPlugin wg = (WorldGuardPlugin) Bukkit.getPluginManager().getPlugin("WorldGuard");
|
||||
Location loc = location.getSingle(e);
|
||||
Vector vec = new Vector(loc.getX(), loc.getY(), loc.getZ());
|
||||
Map<String, ProtectedRegion> regions = wg.getRegionManager(loc.getWorld()).getRegions();
|
||||
List<ProtectedRegion> regionsInside = new ArrayList<ProtectedRegion>();
|
||||
for (ProtectedRegion region : regions.values()) {
|
||||
if (region.contains(vec)) {
|
||||
regionsInside.add(region);
|
||||
}
|
||||
}
|
||||
return regionsInside.toArray(new ProtectedRegion[0]);
|
||||
}
|
||||
}
|
||||
@ -482,8 +482,8 @@ public class NMS_v1_7_R4 implements NMSInterface {
|
||||
if (itemStack == null || itemStack.getType() == Material.AIR)
|
||||
return null;
|
||||
NBTTagCompound itemNBT = CraftItemStack.asNMSCopy(itemStack).getTag();
|
||||
if (itemNBT == null || itemNBT.isEmpty())
|
||||
itemNBT = null;
|
||||
if (itemNBT == null)
|
||||
itemNBT = new NBTTagCompound();
|
||||
return itemNBT;
|
||||
}
|
||||
|
||||
|
||||
@ -496,8 +496,8 @@ public class NMS_v1_8_R3 implements NMSInterface {
|
||||
if (itemStack == null || itemStack.getType() == Material.AIR)
|
||||
return null;
|
||||
NBTTagCompound itemNBT = CraftItemStack.asNMSCopy(itemStack).getTag();
|
||||
if (itemNBT == null || itemNBT.isEmpty())
|
||||
itemNBT = null;
|
||||
if (itemNBT == null)
|
||||
itemNBT = new NBTTagCompound();
|
||||
return itemNBT;
|
||||
}
|
||||
|
||||
|
||||
@ -497,8 +497,8 @@ public class NMS_v1_9_R1 implements NMSInterface {
|
||||
if (itemStack == null || itemStack.getType() == Material.AIR)
|
||||
return null;
|
||||
NBTTagCompound itemNBT = CraftItemStack.asNMSCopy(itemStack).getTag();
|
||||
if (itemNBT == null || itemNBT.isEmpty())
|
||||
itemNBT = null;
|
||||
if (itemNBT == null)
|
||||
itemNBT = new NBTTagCompound();
|
||||
return itemNBT;
|
||||
}
|
||||
|
||||
|
||||
703
src/me/TheBukor/SkStuff/util/NMS_v1_9_R2.java
Normal file
703
src/me/TheBukor/SkStuff/util/NMS_v1_9_R2.java
Normal file
@ -0,0 +1,703 @@
|
||||
package me.TheBukor.SkStuff.util;
|
||||
|
||||
import java.io.EOFException;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.NotSerializableException;
|
||||
import java.io.OutputStream;
|
||||
import java.io.StreamCorruptedException;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
|
||||
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
|
||||
import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import ch.njol.skript.Skript;
|
||||
import ch.njol.skript.classes.Changer;
|
||||
import ch.njol.skript.classes.ClassInfo;
|
||||
import ch.njol.skript.classes.Parser;
|
||||
import ch.njol.skript.classes.Serializer;
|
||||
import ch.njol.skript.lang.ParseContext;
|
||||
import ch.njol.skript.registrations.Classes;
|
||||
import ch.njol.util.coll.CollectionUtils;
|
||||
import ch.njol.yggdrasil.Fields;
|
||||
import net.minecraft.server.v1_9_R2.BlockPosition;
|
||||
import net.minecraft.server.v1_9_R2.EntityInsentient;
|
||||
import net.minecraft.server.v1_9_R2.IBlockData;
|
||||
import net.minecraft.server.v1_9_R2.Item;
|
||||
import net.minecraft.server.v1_9_R2.MinecraftKey;
|
||||
import net.minecraft.server.v1_9_R2.MojangsonParseException;
|
||||
import net.minecraft.server.v1_9_R2.MojangsonParser;
|
||||
import net.minecraft.server.v1_9_R2.NBTBase;
|
||||
import net.minecraft.server.v1_9_R2.NBTCompressedStreamTools;
|
||||
import net.minecraft.server.v1_9_R2.NBTTagByte;
|
||||
import net.minecraft.server.v1_9_R2.NBTTagCompound;
|
||||
import net.minecraft.server.v1_9_R2.NBTTagDouble;
|
||||
import net.minecraft.server.v1_9_R2.NBTTagFloat;
|
||||
import net.minecraft.server.v1_9_R2.NBTTagInt;
|
||||
import net.minecraft.server.v1_9_R2.NBTTagList;
|
||||
import net.minecraft.server.v1_9_R2.NBTTagLong;
|
||||
import net.minecraft.server.v1_9_R2.NBTTagShort;
|
||||
import net.minecraft.server.v1_9_R2.NBTTagString;
|
||||
import net.minecraft.server.v1_9_R2.PathfinderGoal;
|
||||
import net.minecraft.server.v1_9_R2.PathfinderGoalSelector;
|
||||
import net.minecraft.server.v1_9_R2.TileEntity;
|
||||
import net.minecraft.server.v1_9_R2.World;
|
||||
|
||||
public class NMS_v1_9_R2 implements NMSInterface {
|
||||
|
||||
@Override
|
||||
public Object getNBTTag(Object compound, String tag) {
|
||||
if (compound instanceof NBTTagCompound) {
|
||||
return ((NBTTagCompound) compound).get(tag);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setNBTTag(Object compound, String tag, Object toSet) {
|
||||
if (compound instanceof NBTTagCompound && (toSet instanceof NBTBase || toSet instanceof Number || toSet instanceof String)) {
|
||||
NBTBase converted = null;
|
||||
if (toSet instanceof Number) {
|
||||
converted = convertToNBT((Number) toSet);
|
||||
} else if (toSet instanceof String) {
|
||||
converted = convertToNBT((String) toSet);
|
||||
} else { //Already an NBTBase
|
||||
converted = (NBTBase) toSet; //No need to convert anything
|
||||
}
|
||||
((NBTTagCompound) compound).set(tag, converted);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeNBTTag(Object compound, String tag) {
|
||||
if (compound instanceof NBTTagCompound) {
|
||||
((NBTTagCompound) compound).remove(tag);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte getTypeId(Object nbtBase) {
|
||||
if (nbtBase instanceof NBTBase) {
|
||||
return ((NBTBase) nbtBase).getTypeId();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getNBTTagValue(Object compound, String tag, byte typeId) {
|
||||
if (compound instanceof NBTTagCompound) {
|
||||
switch (typeId) {
|
||||
case 1:
|
||||
return ((NBTTagCompound) compound).getByte(tag);
|
||||
case 2:
|
||||
return ((NBTTagCompound) compound).getShort(tag);
|
||||
case 3:
|
||||
return ((NBTTagCompound) compound).getInt(tag);
|
||||
case 4:
|
||||
return ((NBTTagCompound) compound).getLong(tag);
|
||||
case 5:
|
||||
return ((NBTTagCompound) compound).getFloat(tag);
|
||||
case 6:
|
||||
return ((NBTTagCompound) compound).getDouble(tag);
|
||||
case 7: //Byte array, only used in chunk files. Also doesn't have support for the MojangsonParser.
|
||||
break;
|
||||
case 8:
|
||||
return ((NBTTagCompound) compound).getString(tag);
|
||||
case 9:
|
||||
int i;
|
||||
NBTTagList list = null;
|
||||
for (i = 1; i <= 11; i++) { //To get a list I need to know the type of the tags it contains inside,
|
||||
//since I can't predict what type the list will have, I just loop all of the IDs until I find a non-empty list.
|
||||
list = ((NBTTagCompound) compound).getList(tag, i); //Try to get the list with the ID "loop-number".
|
||||
if (!list.isEmpty()) { //If list is not empty.
|
||||
break; //Stop loop.
|
||||
}
|
||||
}
|
||||
return list; //May be null
|
||||
case 10:
|
||||
return ((NBTTagCompound) compound).getCompound(tag);
|
||||
case 11: //Integer array, this one is only used on the chunk files (and maybe schematic files?).
|
||||
return ((NBTTagCompound) compound).getIntArray(tag);
|
||||
default: //This should never happen, but it's better to have this just in case it spills errors everywhere.
|
||||
break;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addToCompound(Object compound, Object toAdd) {
|
||||
if (compound instanceof NBTTagCompound && toAdd instanceof NBTTagCompound) {
|
||||
((NBTTagCompound) compound).a((NBTTagCompound) toAdd);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeFromCompound(Object compound, String ... toRemove) {
|
||||
if (compound instanceof NBTTagCompound) {
|
||||
for (String s : toRemove) {
|
||||
((NBTTagCompound) compound).remove(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound parseRawNBT(String rawNBT) {
|
||||
NBTTagCompound parsedNBT = null;
|
||||
try {
|
||||
parsedNBT = MojangsonParser.parse(rawNBT);
|
||||
} catch (MojangsonParseException ex) {
|
||||
Skript.warning("Error when parsing NBT - " + ex.getMessage());
|
||||
return null;
|
||||
}
|
||||
return parsedNBT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object[] getContents(Object nbtList) {
|
||||
if (nbtList instanceof NBTTagList) {
|
||||
Object[] contents = new Object[((NBTTagList) nbtList).size()];
|
||||
for (int i = 0; i < ((NBTTagList) nbtList).size(); i++) {
|
||||
if (getIndex(nbtList, i) != null) {
|
||||
contents[i] = getIndex(nbtList, i);
|
||||
}
|
||||
}
|
||||
return contents;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addToList(Object nbtList, Object toAdd) {
|
||||
if (nbtList instanceof NBTTagList && toAdd instanceof NBTBase) {
|
||||
((NBTTagList) nbtList).add((NBTBase) toAdd);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeFromList(Object nbtList, int index) {
|
||||
if (nbtList instanceof NBTTagList && index >= 0 && index < ((NBTTagList) nbtList).size()) {
|
||||
((NBTTagList) nbtList).remove(index);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setIndex(Object nbtList, int index, Object toSet) {
|
||||
if (nbtList instanceof NBTTagList && index >= 0 && index < ((NBTTagList) nbtList).size()) {
|
||||
if (toSet instanceof NBTBase) {
|
||||
((NBTTagList) nbtList).a(index, (NBTBase) toSet);
|
||||
} else if (toSet instanceof Number) {
|
||||
((NBTTagList) nbtList).a(index, convertToNBT((Number) toSet));
|
||||
} else if (toSet instanceof String) {
|
||||
((NBTTagList) nbtList).a(index, convertToNBT((String) toSet));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getIndex(Object nbtList, int index) {
|
||||
if (nbtList instanceof NBTTagList && index >= 0 && index < ((NBTTagList) nbtList).size()) {
|
||||
NBTBase value = ((NBTTagList) nbtList).h(index);
|
||||
if (value instanceof NBTTagByte) {
|
||||
return ((NBTTagByte) value).f(); //Byte stored inside a NBTNumber
|
||||
} else if (value instanceof NBTTagShort) {
|
||||
return ((NBTTagShort) value).e(); //Short inside a NBTNumber
|
||||
} else if (value instanceof NBTTagInt) {
|
||||
return ((NBTTagInt) value).d(); //Integer inside a NBTNumber
|
||||
} else if (value instanceof NBTTagLong) {
|
||||
return ((NBTTagLong) value).c(); //Long inside a NBTNumber
|
||||
} else if (value instanceof NBTTagFloat) {
|
||||
return ((NBTTagFloat) value).h(); //Float inside a NBTNumber
|
||||
} else if (value instanceof NBTTagDouble) {
|
||||
return ((NBTTagDouble) value).g(); //Double inside a NBTNumber
|
||||
} else if (value instanceof NBTTagString) {
|
||||
return ((NBTTagString) value).a_(); //String inside the NBTTagString
|
||||
} else if (value instanceof NBTBase) {
|
||||
return value; //No need to convert this
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clearPathfinderGoals(Entity entity) {
|
||||
EntityInsentient nmsEnt = (EntityInsentient) ((CraftEntity) entity).getHandle();
|
||||
((LinkedHashSet<?>) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear();
|
||||
((LinkedHashSet<?>) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear();
|
||||
((LinkedHashSet<?>) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear();
|
||||
((LinkedHashSet<?>) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removePathfinderGoal(Object entity, Class<?> goalClass, boolean isTargetSelector) {
|
||||
if (entity instanceof EntityInsentient) {
|
||||
((EntityInsentient) entity).setGoalTarget(null);
|
||||
if (isTargetSelector) {
|
||||
Iterator<?> goals = ((LinkedHashSet<?>) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).targetSelector)).iterator();
|
||||
while (goals.hasNext()) {
|
||||
Object goal = goals.next();
|
||||
if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) {
|
||||
goals.remove();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Iterator<?> goals = ((LinkedHashSet<?>) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).goalSelector)).iterator();
|
||||
while (goals.hasNext()) {
|
||||
Object goal = goals.next();
|
||||
if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) {
|
||||
goals.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addPathfinderGoal(Object entity, int priority, Object goal, boolean isTargetSelector) {
|
||||
if (entity instanceof EntityInsentient && goal instanceof PathfinderGoal) {
|
||||
if (isTargetSelector)
|
||||
((EntityInsentient) entity).targetSelector.a(priority, (PathfinderGoal) goal);
|
||||
else
|
||||
((EntityInsentient) entity).goalSelector.a(priority, (PathfinderGoal) goal);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerCompoundClassInfo() {
|
||||
Classes.registerClass(new ClassInfo<NBTTagCompound>(NBTTagCompound.class, "compound").user("((nbt)?( ?tag)?) ?compounds?").name("NBT Compound").changer(new Changer<NBTTagCompound>() {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
@Nullable
|
||||
public Class<?>[] acceptChange(ChangeMode mode) {
|
||||
if (mode == ChangeMode.ADD || mode == ChangeMode.REMOVE) {
|
||||
return CollectionUtils.array(String.class, NBTTagCompound.class);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void change(NBTTagCompound[] NBT, @Nullable Object[] delta, ChangeMode mode) {
|
||||
if (mode == ChangeMode.ADD) {
|
||||
if (delta[0] instanceof String) {
|
||||
NBTTagCompound parsedNBT = parseRawNBT((String) delta[0]);
|
||||
addToCompound(NBT[0], parsedNBT);
|
||||
} else {
|
||||
addToCompound(NBT[0], delta[0]);
|
||||
}
|
||||
} else if (mode == ChangeMode.REMOVE) {
|
||||
if (delta[0] instanceof NBTTagCompound)
|
||||
return;
|
||||
for (Object s : delta) {
|
||||
NBT[0].remove((String) s);
|
||||
}
|
||||
}
|
||||
}
|
||||
}).parser(new Parser<NBTTagCompound>() {
|
||||
|
||||
@Override
|
||||
public String getVariableNamePattern() {
|
||||
return ".+";
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public NBTTagCompound parse(String rawNBT, ParseContext context) {
|
||||
if (rawNBT.startsWith("nbt:{") && rawNBT.endsWith("}")) {
|
||||
NBTTagCompound NBT = parseRawNBT(rawNBT.substring(4));
|
||||
return NBT;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(NBTTagCompound compound, int arg1) {
|
||||
return compound.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toVariableNameString(NBTTagCompound compound) {
|
||||
return compound.toString();
|
||||
}
|
||||
}).serializer(new Serializer<NBTTagCompound>() {
|
||||
|
||||
@Override
|
||||
public Fields serialize(NBTTagCompound compound) throws NotSerializableException {
|
||||
Fields f = new Fields();
|
||||
f.putObject("asString", compound.toString());
|
||||
return f;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deserialize(NBTTagCompound compound, Fields f) throws StreamCorruptedException, NotSerializableException {
|
||||
assert false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean canBeInstantiated() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected NBTTagCompound deserialize(Fields fields) throws StreamCorruptedException, NotSerializableException {
|
||||
String raw = fields.getObject("asString", String.class);
|
||||
NBTTagCompound compound = parseRawNBT(raw);
|
||||
if (compound == null) {
|
||||
throw new StreamCorruptedException("Unable to parse NBT from a variable: " + raw);
|
||||
}
|
||||
return compound;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public NBTTagCompound deserialize(String s) {
|
||||
NBTTagCompound compound = parseRawNBT(s);
|
||||
return compound;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mustSyncDeserialization() {
|
||||
return true;
|
||||
}
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerNBTListClassInfo() {
|
||||
Classes.registerClass(new ClassInfo<NBTTagList>(NBTTagList.class, "nbtlist").user("nbt ?list ?(tag)?").name("NBT List").changer(new Changer<NBTTagList>() {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
@Nullable
|
||||
public Class<?>[] acceptChange(ChangeMode mode) {
|
||||
if (mode == ChangeMode.ADD) {
|
||||
return CollectionUtils.array(Byte.class, Short.class, Integer.class, Long.class, Float.class, Double.class, String.class, NBTTagCompound.class, NBTTagList.class);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void change(NBTTagList[] nbtList, @Nullable Object[] delta, ChangeMode mode) {
|
||||
if (delta.length == 0)
|
||||
return;
|
||||
if (delta[0] instanceof Number) {
|
||||
addToList(nbtList[0], convertToNBT((Number) delta[0]));
|
||||
} else if (delta[0] instanceof String) {
|
||||
addToList(nbtList[0], convertToNBT((String) delta[0]));
|
||||
} else if (delta[0] instanceof NBTBase) {
|
||||
addToList(nbtList[0], delta[0]);
|
||||
}
|
||||
}
|
||||
}).parser(new Parser<NBTTagList>() {
|
||||
|
||||
@Override
|
||||
public String getVariableNamePattern() {
|
||||
return ".+";
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public NBTTagList parse(String listString, ParseContext context) {
|
||||
if (listString.startsWith("[") && listString.endsWith("]")) {
|
||||
NBTTagCompound tempNBT = parseRawNBT("{SkStuffIsCool:[0:" + listString.substring(1) + "}");
|
||||
NBTTagList parsedList = (NBTTagList) tempNBT.get("SkStuffIsCool");
|
||||
return parsedList;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(NBTTagList nbtList, int arg1) {
|
||||
return nbtList.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toVariableNameString(NBTTagList nbtList) {
|
||||
return nbtList.toString();
|
||||
}
|
||||
}).serializer(new Serializer<NBTTagList>() {
|
||||
|
||||
@Override
|
||||
public Fields serialize(NBTTagList nbtList) throws NotSerializableException {
|
||||
Fields f = new Fields();
|
||||
f.putObject("asString", nbtList.toString());
|
||||
return f;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deserialize(NBTTagList nbtList, Fields f) throws StreamCorruptedException, NotSerializableException {
|
||||
assert false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean canBeInstantiated() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected NBTTagList deserialize(Fields fields) throws StreamCorruptedException, NotSerializableException {
|
||||
String s = fields.getObject("asString", String.class);
|
||||
NBTTagCompound tempNBT = parseRawNBT("{SkStuffIsCool:" + s + "}");
|
||||
NBTTagList nbtList = (NBTTagList) tempNBT.get("SkStuffIsCool");
|
||||
if (tempNBT == null || nbtList == null) {
|
||||
throw new StreamCorruptedException("Unable to parse NBT list from a variable: " + s);
|
||||
}
|
||||
return nbtList;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public NBTTagList deserialize(String s) {
|
||||
NBTTagCompound tempNBT = parseRawNBT("{SkStuffIsCool:" + s + "}");
|
||||
NBTTagList nbtList = (NBTTagList) tempNBT.get("SkStuffIsCool");
|
||||
return nbtList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mustSyncDeserialization() {
|
||||
return true;
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound getEntityNBT(Entity entity) {
|
||||
net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
||||
NBTTagCompound NBT = new NBTTagCompound();
|
||||
nmsEntity.e(NBT);
|
||||
return NBT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound getTileNBT(Block block) {
|
||||
NBTTagCompound NBT = new NBTTagCompound();
|
||||
World nmsWorld = ((CraftWorld) block.getWorld()).getHandle();
|
||||
TileEntity tileEntity = nmsWorld.getTileEntity(new BlockPosition(block.getX(), block.getY(), block.getZ()));
|
||||
if (tileEntity == null)
|
||||
return null;
|
||||
tileEntity.save(NBT);
|
||||
return NBT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound getItemNBT(ItemStack itemStack) {
|
||||
if (itemStack == null || itemStack.getType() == Material.AIR)
|
||||
return null;
|
||||
NBTTagCompound itemNBT = CraftItemStack.asNMSCopy(itemStack).getTag();
|
||||
if (itemNBT == null)
|
||||
itemNBT = new NBTTagCompound();
|
||||
return itemNBT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setEntityNBT(Entity entity, Object newCompound) {
|
||||
if (newCompound instanceof NBTTagCompound) {
|
||||
net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
||||
nmsEntity.f((NBTTagCompound) newCompound);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTileNBT(Block block, Object newCompound) {
|
||||
if (newCompound instanceof NBTTagCompound) {
|
||||
World nmsWorld = ((CraftWorld) block.getWorld()).getHandle();
|
||||
TileEntity tileEntity = nmsWorld.getTileEntity(new BlockPosition(block.getX(), block.getY(), block.getZ()));
|
||||
if (tileEntity == null)
|
||||
return;
|
||||
tileEntity.a((NBTTagCompound) newCompound);
|
||||
tileEntity.update();
|
||||
IBlockData tileEntType = nmsWorld.getType(new BlockPosition(block.getX(), block.getY(), block.getZ()));
|
||||
nmsWorld.notify(tileEntity.getPosition(), tileEntType, tileEntType, 3);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getItemWithNBT(ItemStack itemStack, Object compound) {
|
||||
net.minecraft.server.v1_9_R2.ItemStack nmsItem = CraftItemStack.asNMSCopy(itemStack);
|
||||
if (compound instanceof NBTTagCompound && itemStack != null) {
|
||||
if (itemStack.getType() == Material.AIR)
|
||||
return null;
|
||||
if (((NBTTagCompound) compound).isEmpty())
|
||||
return itemStack;
|
||||
nmsItem.setTag((NBTTagCompound) compound);
|
||||
ItemStack newItem = CraftItemStack.asBukkitCopy(nmsItem);
|
||||
return newItem;
|
||||
} else if (compound == null) {
|
||||
nmsItem.setTag(null);
|
||||
ItemStack newItem = CraftItemStack.asBukkitCopy(nmsItem);
|
||||
return newItem;
|
||||
}
|
||||
return itemStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound getFileNBT(File file) {
|
||||
FileInputStream fis = null;
|
||||
try {
|
||||
fis = new FileInputStream(file);
|
||||
} catch (FileNotFoundException ex) {
|
||||
return null; //File doesn't exist.
|
||||
}
|
||||
NBTTagCompound fileNBT = null;
|
||||
try {
|
||||
fileNBT = NBTCompressedStreamTools.a(fis);
|
||||
fis.close();
|
||||
} catch (IOException ex) {
|
||||
if (ex instanceof EOFException) {
|
||||
; //Nothing.
|
||||
} else {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
return fileNBT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFileNBT(File file, Object newCompound) {
|
||||
if (newCompound instanceof NBTTagCompound) {
|
||||
OutputStream os = null;
|
||||
try {
|
||||
os = new FileOutputStream(file);
|
||||
} catch (FileNotFoundException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
try {
|
||||
NBTCompressedStreamTools.a((NBTTagCompound) newCompound, os);
|
||||
os.close();
|
||||
} catch (IOException ex) {
|
||||
if (ex instanceof EOFException) {
|
||||
; //Ignore, just end of the file
|
||||
} else {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTBase convertToNBT(Number number) {
|
||||
if (number instanceof Byte) {
|
||||
return new NBTTagByte((byte) number);
|
||||
} else if (number instanceof Short) {
|
||||
return new NBTTagShort((short) number);
|
||||
} else if (number instanceof Integer) {
|
||||
return new NBTTagInt((int) number);
|
||||
} else if (number instanceof Long) {
|
||||
return new NBTTagLong((long) number);
|
||||
} else if (number instanceof Float) {
|
||||
return new NBTTagFloat((float) number);
|
||||
} else if (number instanceof Double) {
|
||||
return new NBTTagDouble((double) number);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagString convertToNBT(String string) {
|
||||
return new NBTTagString(string);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMCId(ItemStack itemStack) {
|
||||
net.minecraft.server.v1_9_R2.ItemStack nmsItem = CraftItemStack.asNMSCopy(itemStack);
|
||||
MinecraftKey mcKey = Item.REGISTRY.b(nmsItem.getItem());
|
||||
return mcKey.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getItemFromMcId(String mcId) {
|
||||
MinecraftKey mcKey = new MinecraftKey(mcId);
|
||||
Item nmsItem = (Item) Item.REGISTRY.get(mcKey);
|
||||
return CraftItemStack.asNewCraftStack(nmsItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getNoClip(Entity entity) {
|
||||
net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
||||
return nmsEntity.noclip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setNoClip(Entity entity, boolean noclip) {
|
||||
net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
||||
nmsEntity.noclip = noclip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getFireProof(Entity entity) {
|
||||
net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
||||
return nmsEntity.isFireProof();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFireProof(Entity entity, boolean fireProof) {
|
||||
net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
||||
ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof);
|
||||
}
|
||||
|
||||
/*
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public ItemStack[] getEndermanBlocks(Entity enderman) {
|
||||
EntityEnderman nmsEnder = ((CraftEnderman) enderman).getHandle();
|
||||
Set<net.minecraft.server.v1_9_R2.Block> nmsBlocks = (Set<net.minecraft.server.v1_9_R1.Block>) ReflectionUtils.getField("c", EntityEnderman.class, nmsEnder);
|
||||
ItemStack[] items = new ItemStack[nmsBlocks.size()];
|
||||
int i = 0;
|
||||
for (net.minecraft.server.v1_9_R2.Block nmsBlock : nmsBlocks) {
|
||||
IBlockData nmsBlockData = nmsBlock.getBlockData();
|
||||
int dataValue = nmsBlock.toLegacyData(nmsBlockData);
|
||||
net.minecraft.server.v1_9_R2.ItemStack nmsItem = new net.minecraft.server.v1_9_R1.ItemStack(nmsBlock, 1, dataValue);
|
||||
ItemStack bukkitItem = CraftItemStack.asCraftMirror(nmsItem);
|
||||
items[i] = bukkitItem;
|
||||
i++;
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void setEndermanBlocks(Entity enderman, ItemStack... blocks) {
|
||||
EntityEnderman nmsEnder = ((CraftEnderman) enderman).getHandle();
|
||||
Set<net.minecraft.server.v1_9_R2.Block> nmsBlocks = (Set<net.minecraft.server.v1_9_R1.Block>) ReflectionUtils.getField("c", EntityEnderman.class, nmsEnder);
|
||||
for (ItemStack block : blocks) {
|
||||
if (!block.getType().isBlock())
|
||||
return;
|
||||
// TODO Figure out how to get a Blocks from a Bukkit ItemStack
|
||||
// Blocks.class has a PRIVATE method to get from a MC id.
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
@Override
|
||||
public Location getLastLocation(Entity entity) {
|
||||
net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
||||
org.bukkit.World world = nmsEntity.world.getWorld();
|
||||
Location lastEntLoc = new Location(world, nmsEntity.M, nmsEntity.N, nmsEntity.O);
|
||||
return lastEntLoc;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getEntityStepLength(Entity entity) {
|
||||
net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
||||
return nmsEntity.P;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setEntityStepLength(Entity entity, float length) {
|
||||
net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
||||
nmsEntity.P = length;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user