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

23w17a

Browse Source
This commit is contained in:
gnembon committed 2023-04-26 22:58:59 +02:00
1 parent 15b120f729
commit 07033af7dd
44 files changed
+309 -265
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/CarpetEventServer.java
+18 -18
View File
@@ -591,7 +591,7 @@ public class CarpetEventServer
return handler.call(() ->
Arrays.asList(
new EntityValue(player),
ValueConversions.of(itemstack, player.getLevel().registryAccess()),
ValueConversions.of(itemstack, player.level().registryAccess()),
StringValue.of(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand")
), player::createCommandSourceStack);
}
@@ -604,7 +604,7 @@ public class CarpetEventServer
return handler.call(() ->
Arrays.asList(
new EntityValue(player),
new BlockValue(null, player.getLevel(), blockpos),
new BlockValue(null, player.serverLevel(), blockpos),
StringValue.of(facing.getName())
), player::createCommandSourceStack);
}
@@ -622,9 +622,9 @@ public class CarpetEventServer
Vec3 vec3d = hitRes.getLocation().subtract(blockpos.getX(), blockpos.getY(), blockpos.getZ());
return Arrays.asList(
new EntityValue(player),
ValueConversions.of(itemstack, player.getLevel().registryAccess()),
ValueConversions.of(itemstack, player.level().registryAccess()),
StringValue.of(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand"),
new BlockValue(null, player.getLevel(), blockpos),
new BlockValue(null, player.serverLevel(), blockpos),
StringValue.of(enumfacing.getName()),
ListValue.of(
new NumericValue(vec3d.x),
@@ -648,7 +648,7 @@ public class CarpetEventServer
return Arrays.asList(
new EntityValue(player),
StringValue.of(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand"),
new BlockValue(null, player.getLevel(), blockpos),
new BlockValue(null, player.serverLevel(), blockpos),
StringValue.of(enumfacing.getName()),
ListValue.of(
new NumericValue(vec3d.x),
@@ -667,9 +667,9 @@ public class CarpetEventServer
{
return handler.call(() -> Arrays.asList(
new EntityValue(player),
ValueConversions.of(itemstack, player.getLevel().registryAccess()),
ValueConversions.of(itemstack, player.level().registryAccess()),
StringValue.of(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand"),
new BlockValue(null, player.getLevel(), pos)
new BlockValue(null, player.serverLevel(), pos)
), player::createCommandSourceStack);
}
};
@@ -680,9 +680,9 @@ public class CarpetEventServer
{
handler.call(() -> Arrays.asList(
new EntityValue(player),
ValueConversions.of(itemstack, player.getLevel().registryAccess()),
ValueConversions.of(itemstack, player.level().registryAccess()),
StringValue.of(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand"),
new BlockValue(null, player.getLevel(), pos)
new BlockValue(null, player.serverLevel(), pos)
), player::createCommandSourceStack);
return false;
}
@@ -693,7 +693,7 @@ public class CarpetEventServer
public boolean onBlockBroken(ServerPlayer player, BlockPos pos, BlockState previousBS)
{
return handler.call(
() -> Arrays.asList(new EntityValue(player), new BlockValue(previousBS, player.getLevel(), pos)),
() -> Arrays.asList(new EntityValue(player), new BlockValue(previousBS, player.serverLevel(), pos)),
player::createCommandSourceStack
);
}
@@ -713,7 +713,7 @@ public class CarpetEventServer
@Override
public void onTrade(ServerPlayer player, Merchant merchant, MerchantOffer tradeOffer)
{
RegistryAccess regs = player.getLevel().registryAccess();
RegistryAccess regs = player.level().registryAccess();
handler.call(() -> Arrays.asList(
new EntityValue(player),
merchant instanceof final AbstractVillager villager ? new EntityValue(villager) : Value.NULL,
@@ -728,7 +728,7 @@ public class CarpetEventServer
@Override
public boolean onItemAction(ServerPlayer player, InteractionHand enumhand, ItemStack itemstack)
{
handler.call(() -> Arrays.asList(new EntityValue(player), ValueConversions.of(itemstack, player.getLevel().registryAccess())), player::createCommandSourceStack);
handler.call(() -> Arrays.asList(new EntityValue(player), ValueConversions.of(itemstack, player.level().registryAccess())), player::createCommandSourceStack);
return false;
}
};
@@ -787,7 +787,7 @@ public class CarpetEventServer
handler.call(() ->
Arrays.asList(
new EntityValue(player),
ValueConversions.of(itemstack, player.getLevel().registryAccess()),
ValueConversions.of(itemstack, player.level().registryAccess()),
StringValue.of(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand")
), player::createCommandSourceStack);
return false;
@@ -802,7 +802,7 @@ public class CarpetEventServer
return handler.call(() ->
Arrays.asList(
new EntityValue(player),
ValueConversions.of(itemstack, player.getLevel().registryAccess()),
ValueConversions.of(itemstack, player.level().registryAccess()),
new StringValue(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand")
), player::createCommandSourceStack);
}
@@ -999,7 +999,7 @@ public class CarpetEventServer
{
return;
}
Registry<StatType<?>> registry = player.getLevel().registryAccess().registryOrThrow(Registries.STAT_TYPE);
Registry<StatType<?>> registry = player.level().registryAccess().registryOrThrow(Registries.STAT_TYPE);
handler.call(() -> Arrays.asList(
new EntityValue(player),
NBTSerializableValue.nameFromRegistryId(registry.getKey(stat.getType())),
@@ -1105,7 +1105,7 @@ public class CarpetEventServer
{
handler.call(
() -> Collections.singletonList(new EntityValue(entity)),
() -> entity.getServer().createCommandSourceStack().withLevel((ServerLevel) entity.level).withPermission(Vanilla.MinecraftServer_getRunPermissionLevel(entity.getServer()))
() -> entity.getServer().createCommandSourceStack().withLevel((ServerLevel) entity.level()).withPermission(Vanilla.MinecraftServer_getRunPermissionLevel(entity.getServer()))
);
}
})).collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
@@ -1124,7 +1124,7 @@ public class CarpetEventServer
{
handler.call(
() -> Arrays.asList(new EntityValue(entity), BooleanValue.of(created)),
() -> entity.getServer().createCommandSourceStack().withLevel((ServerLevel) entity.level).withPermission(Vanilla.MinecraftServer_getRunPermissionLevel(entity.getServer()))
() -> entity.getServer().createCommandSourceStack().withLevel((ServerLevel) entity.level()).withPermission(Vanilla.MinecraftServer_getRunPermissionLevel(entity.getServer()))
);
}
}))
@@ -1334,7 +1334,7 @@ public class CarpetEventServer
valArgs.add(EntityValue.of(player));
for (Object o : args)
{
valArgs.add(ValueConversions.guess(player.getLevel(), o));
valArgs.add(ValueConversions.guess(player.serverLevel(), o));
}
return valArgs;
}, player::createCommandSourceStack