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

Use pattern matching for instanceof (#1019)

Browse Source
This commit is contained in:
altrisi authored and GitHub committed 2021-07-21 22:24:24 -03:00
1 parent 97e7d660e4
commit 7ebc990ef6
8 files changed
+24 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/value/EntityValue.java
+9 -18
View File
@@ -530,9 +530,8 @@ public class EntityValue extends Value
return Value.NULL;
});
put("spawn_point", (e, a) -> {
if (e instanceof ServerPlayerEntity)
if (e instanceof ServerPlayerEntity spe)
{
ServerPlayerEntity spe = (ServerPlayerEntity)e;
if (spe.getSpawnPointPosition() == null) return Value.FALSE;
return ListValue.of(
ValueConversions.of(spe.getSpawnPointPosition()),
@@ -631,9 +630,8 @@ public class EntityValue extends Value
String module = a.getString();
MemoryModuleType<?> moduleType = Registry.MEMORY_MODULE_TYPE.get(InputValidator.identifierOf(module));
if (moduleType == MemoryModuleType.DUMMY) return Value.NULL;
if (e instanceof LivingEntity)
if (e instanceof LivingEntity livingEntity)
{
LivingEntity livingEntity = (LivingEntity)e;
Brain<?> brain = livingEntity.getBrain();
Map<MemoryModuleType<?>, Optional<? extends Memory<?>>> memories = ((BrainInterface)brain).getMobMemories();
Optional<? extends Memory<?>> optmemory = memories.get(moduleType);
@@ -652,9 +650,8 @@ public class EntityValue extends Value
});
put("permission_level", (e, a) -> {
if (e instanceof ServerPlayerEntity)
if (e instanceof ServerPlayerEntity spe)
{
ServerPlayerEntity spe = (ServerPlayerEntity) e;
for (int i=4; i>=0; i--)
{
if (spe.hasPermissionLevel(i))
@@ -667,10 +664,9 @@ public class EntityValue extends Value
});
put("player_type", (e, a) -> {
if (e instanceof PlayerEntity)
if (e instanceof PlayerEntity p)
{
if (e instanceof EntityPlayerMPFake) return new StringValue(((EntityPlayerMPFake) e).isAShadow?"shadow":"fake");
PlayerEntity p = (PlayerEntity)e;
MinecraftServer server = p.getEntityWorld().getServer();
if (server.isDedicated()) return new StringValue("multiplayer");
boolean runningLan = server.isRemote();
@@ -927,9 +923,8 @@ public class EntityValue extends Value
e.refreshPositionAndAngles(x, y, z, yaw, pitch);
// we were sending to players for not-living entites, that were untracked. Living entities should be tracked.
//((ServerWorld) e.getEntityWorld()).getChunkManager().sendToNearbyPlayers(e, new EntityS2CPacket.(e));
if (e instanceof LivingEntity)
if (e instanceof LivingEntity le)
{
LivingEntity le = (LivingEntity)e;
le.prevBodyYaw = le.prevYaw = yaw;
le.prevHeadYaw = le.headYaw = yaw;
// seems universal for:
@@ -956,9 +951,8 @@ public class EntityValue extends Value
put("age", (e, v) -> e.age = Math.abs((int)NumericValue.asNumber(v).getLong()) );
put("health", (e, v) -> {
float health = (float) NumericValue.asNumber(v).getDouble();
if (health <= 0f && e instanceof ServerPlayerEntity)
if (health <= 0f && e instanceof ServerPlayerEntity player)
{
ServerPlayerEntity player = (ServerPlayerEntity) e;
if (player.currentScreenHandler != null)
{
// if player dies with open container, then that causes NPE on the client side
@@ -1273,8 +1267,7 @@ public class EntityValue extends Value
}); //requires mixing
put("spawn_point", (e, a) -> {
if (!(e instanceof ServerPlayerEntity)) return;
ServerPlayerEntity spe = (ServerPlayerEntity)e;
if (!(e instanceof ServerPlayerEntity spe)) return;
if (a == null)
{
spe.setSpawnPoint(null, null, 0, false, false);
@@ -1302,9 +1295,8 @@ public class EntityValue extends Value
}
spe.setSpawnPoint(world, pos, angle, forced, false);
}
else if (a instanceof BlockValue)
else if (a instanceof BlockValue bv)
{
BlockValue bv= (BlockValue)a;
if (bv.getPos()==null || bv.getWorld() == null)
throw new InternalExpressionException("block for spawn modification should be localised in the world");
spe.setSpawnPoint(bv.getWorld().getRegistryKey(), bv.getPos(), e.getYaw(), true, false); // yaw
@@ -1367,8 +1359,7 @@ public class EntityValue extends Value
});
put("effect", (e, v) ->
{
if (!(e instanceof LivingEntity)) return;
LivingEntity le = (LivingEntity)e;
if (!(e instanceof LivingEntity le)) return;
if (v == null)
{
le.clearStatusEffects();
src/main/java/carpet/script/value/NumericValue.java
+5 -10
View File
@@ -110,9 +110,8 @@ public class NumericValue extends Value
@Override
public Value add(Value v)
{ // TODO test if definintn add(NumericVlaue) woud solve the casting
if (v instanceof NumericValue)
if (v instanceof NumericValue nv)
{
NumericValue nv = (NumericValue)v;
if (longValue != null && nv.longValue != null)
{
return new NumericValue(longValue+nv.longValue);
@@ -122,9 +121,8 @@ public class NumericValue extends Value
return super.add(v);
}
public Value subtract(Value v) { // TODO test if definintn add(NumericVlaue) woud solve the casting
if (v instanceof NumericValue)
if (v instanceof NumericValue nv)
{
NumericValue nv = (NumericValue)v;
if (longValue != null && nv.longValue != null)
{
return new NumericValue(longValue-nv.longValue);
@@ -135,9 +133,8 @@ public class NumericValue extends Value
}
public Value multiply(Value v)
{
if (v instanceof NumericValue)
if (v instanceof NumericValue nv)
{
NumericValue nv = (NumericValue)v;
if (longValue != null && nv.longValue != null)
{
return new NumericValue(longValue*nv.longValue);
@@ -173,9 +170,8 @@ public class NumericValue extends Value
{
return -o.compareTo(this);
}
if (o instanceof NumericValue)
if (o instanceof NumericValue no)
{
NumericValue no = (NumericValue)o;
if (longValue != null && no.longValue != null)
return longValue.compareTo(no.longValue);
return Double.compare(value, no.value);
@@ -189,9 +185,8 @@ public class NumericValue extends Value
{
return o.equals(this);
}
if (o instanceof NumericValue)
if (o instanceof NumericValue no)
{
NumericValue no = (NumericValue)o;
if (longValue != null && no.longValue != null)
return longValue.equals(no.longValue);
return !this.subtract(no).getBoolean();
src/main/java/carpet/script/value/ValueConversions.java
+4 -8
View File
@@ -123,9 +123,8 @@ public class ValueConversions
{
return ((EntityValue)dimensionValue).getEntity().getEntityWorld();
}
else if (dimensionValue instanceof BlockValue)
else if (dimensionValue instanceof BlockValue bv)
{
BlockValue bv = (BlockValue)dimensionValue;
if (bv.getWorld() != null)
{
return bv.getWorld();
@@ -225,9 +224,8 @@ public class ValueConversions
private static Value fromEntityMemory(Entity e, Object v)
{
if (v instanceof GlobalPos)
if (v instanceof GlobalPos pos)
{
GlobalPos pos = (GlobalPos)v;
return of(pos);
}
if (v instanceof Entity)
@@ -250,9 +248,8 @@ public class ValueConversions
{
return ofUUID( (ServerWorld) e.getEntityWorld(), (UUID)v);
}
if (v instanceof DamageSource)
if (v instanceof DamageSource source)
{
DamageSource source = (DamageSource) v;
return ListValue.of(
new StringValue(source.getName()),
source.getAttacker()==null?Value.NULL:new EntityValue(source.getAttacker())
@@ -278,9 +275,8 @@ public class ValueConversions
{
v = new ArrayList(((Set) v));
}
if (v instanceof List)
if (v instanceof List l)
{
List l = (List)v;
if (l.isEmpty()) return ListValue.of();
Object el = l.get(0);
if (el instanceof Entity)