icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update EntityValue.java

Browse Source
This commit is contained in:
ch-yx authored and gnembon committed 2022-08-28 18:59:11 +02:00
1 parent a5f869d384
commit b19b2647b5
1 file changed
+31 -40
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/value/EntityValue.java
+31 -40
View File
@@ -1696,30 +1696,13 @@ public class EntityValue extends Value
}); });
//setter of ironman flower, blueness of skull, carryingitem //setter of ironman flower, blueness of skull, carryingitem
put("carrying_item",(e,v)->{ put("carrying_item",(e,v)->{
try{
if (e instanceof ServerPlayer pl){ if (e instanceof ServerPlayer pl){
ItemStack item; ItemStack item=getItemStackFromValue(v);
if(v instanceof ListValue){
List<Value> lv = ((ListValue) v).getItems();
if (3 == lv.size() && lv.get(2) instanceof NBTSerializableValue nbt)
item = NBTSerializableValue.parseItem(lv.get(0).getString(),nbt.getCompoundTag()).createItemStack(NumericValue.asNumber(lv.get(1)).getInt(),false);
else
return;
}
else if (v instanceof StringValue){
item = NBTSerializableValue.parseItem(v.getString(),null).createItemStack(1,false);
//return ValueConversions.of(((ServerPlayer) e).containerMenu.getCarried());
}
else{
return;
}
item=item.copy(); item=item.copy();
pl.containerMenu.setCarried(item); pl.containerMenu.setCarried(item);
pl.containerMenu.broadcastFullState(); pl.containerMenu.broadcastFullState();
} }
} catch (CommandSyntaxException e1) {
e1.printStackTrace();
}
}); });
@@ -1736,30 +1719,11 @@ public class EntityValue extends Value
}); });
put("item", (e, v) -> { put("item", (e, v) -> {
try{ ItemStack item=getItemStackFromValue(v);
ItemStack item;
if(v instanceof ListValue){
List<Value> lv = ((ListValue) v).getItems();
if (3 == lv.size() && lv.get(2) instanceof NBTSerializableValue nbt)
item = NBTSerializableValue.parseItem(lv.get(0).getString(),nbt.getCompoundTag()).createItemStack(NumericValue.asNumber(lv.get(1)).getInt(),false);
else
return;
}
else if (v instanceof StringValue){
item = NBTSerializableValue.parseItem(v.getString(),null).createItemStack(1,false);
}
else{
return;
}
item=item.copy();
if(e instanceof ItemEntity iteme) if(e instanceof ItemEntity iteme)
iteme.setItem(item); iteme.setItem(item);
if(e instanceof ItemFrame iteme) if(e instanceof ItemFrame iteme)
iteme.setItem(item); iteme.setItem(item);
} catch (CommandSyntaxException e1) {
e1.printStackTrace();
}
}); });
// "dimension" [] // "dimension" []
// "item" [] // "item" []
@@ -1767,6 +1731,33 @@ public class EntityValue extends Value
// "effect_"name [] // "effect_"name []
}}; }};
static public ItemStack getItemStackFromValue(Value value){
List<Value> items;
if(value instanceof ListValue blv && blv.length()==3){
items = blv.getItems();
}else if(value.isNull()){
return ItemStack.EMPTY;
}else{
items= List.of(StringValue.of(value.getString()),Value.ONE,Value.NULL);
}
String id=items.get(0).getString();
int count=((NumericValue)items.get(1)).getInt();
CompoundTag nbt=null;
if (!items.get(2).isNull()){
if(items.get(2) instanceof NBTSerializableValue nbtv){
nbt=nbtv.getCompoundTag();
}
else{
nbt=new NBTSerializableValue(items.get(2).getString()).getCompoundTag();
}
}
try{
return NBTSerializableValue.parseItem(id,nbt).createItemStack(count,false);
} catch (CommandSyntaxException e1) {
e1.printStackTrace();
}
return null;
}
public void setEvent(CarpetContext cc, String eventName, FunctionValue fun, List<Value> args) public void setEvent(CarpetContext cc, String eventName, FunctionValue fun, List<Value> args)
{ {
EntityEventsGroup.Event event = EntityEventsGroup.Event.byName.get(eventName); EntityEventsGroup.Event event = EntityEventsGroup.Event.byName.get(eventName);