added 'portal_cooldown' and 'portal_timer' to entity API (query and modify)
This commit is contained in:
1 parent
66c222a77a
commit
ab86fc9292
5 files changed
+65
No files matched your search
@@ -11,4 +11,8 @@ public interface EntityInterface
|
||||
boolean isPermanentVehicle();
|
||||
|
||||
void setPermanentVehicle(boolean permanent);
|
||||
|
||||
int getPortalTimer();
|
||||
|
||||
void setPortalTimer(int amount);
|
||||
}
|
||||
@@ -14,6 +14,7 @@ public abstract class Entity_scarpetEventsMixin implements EntityInterface
|
||||
{
|
||||
@Shadow public boolean removed;
|
||||
|
||||
@Shadow protected int netherPortalTime;
|
||||
private boolean permanentVehicle;
|
||||
|
||||
private final EntityEventsGroup events = new EntityEventsGroup();
|
||||
@@ -36,6 +37,18 @@ public abstract class Entity_scarpetEventsMixin implements EntityInterface
|
||||
permanentVehicle = permanent;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPortalTimer()
|
||||
{
|
||||
return netherPortalTime;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPortalTimer(int amount)
|
||||
{
|
||||
netherPortalTime = amount;
|
||||
}
|
||||
|
||||
@Inject(method = "tick", at = @At("HEAD"))
|
||||
private void onTickCall(CallbackInfo ci)
|
||||
{
|
||||
|
||||
@@ -259,6 +259,8 @@ public class EntityValue extends Value
|
||||
put("item", (e, a) -> (e instanceof ItemEntity)?ListValue.fromItemStack(((ItemEntity) e).getStack()):Value.NULL);
|
||||
put("count", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntity) e).getStack().getCount()):Value.NULL);
|
||||
put("pickup_delay", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntityInterface) e).getPickupDelayCM()):Value.NULL);
|
||||
put("portal_cooldown", (e , a) ->new NumericValue(((EntityInterface)e).getPortalTimer()));
|
||||
put("portal_timer", (e , a) ->new NumericValue(e.netherPortalCooldown));
|
||||
// ItemEntity -> despawn timer via ssGetAge
|
||||
put("is_baby", (e, a) -> (e instanceof LivingEntity)?new NumericValue(((LivingEntity) e).isBaby()):Value.NULL);
|
||||
put("target", (e, a) -> {
|
||||
@@ -825,6 +827,20 @@ public class EntityValue extends Value
|
||||
}
|
||||
});
|
||||
|
||||
put("portal_cooldown", (e , v) ->
|
||||
{
|
||||
if (v==null)
|
||||
throw new InternalExpressionException("'portal_cooldown' requires a value to set");
|
||||
e.netherPortalCooldown = NumericValue.asNumber(v).getInt();
|
||||
});
|
||||
|
||||
put("portal_timer", (e , v) ->
|
||||
{
|
||||
if (v==null)
|
||||
throw new InternalExpressionException("'portal_timer' requires a value to set");
|
||||
((EntityInterface) e).setPortalTimer(NumericValue.asNumber(v).getInt());
|
||||
});
|
||||
|
||||
put("ai", (e, v) ->
|
||||
{
|
||||
if (e instanceof MobEntity)
|
||||
|
||||
Reference in new issue
Block a user