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

25w02a

Browse Source
This commit is contained in:
gnembon committed 2025-01-09 13:41:19 +01:00
1 parent d9c7334400
commit b16eec89e7
34 files changed
+299 -347
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/api/WorldAccess.java
+13 -15
View File
@@ -50,6 +50,7 @@ import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.level.Ticket;
import net.minecraft.server.level.TicketType;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.ServerExplosion;
import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -99,12 +100,10 @@ import net.minecraft.world.entity.ai.village.poi.PoiRecord;
import net.minecraft.world.entity.ai.village.poi.PoiType;
import net.minecraft.world.entity.item.FallingBlockEntity;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.DiggerItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.ShearsItem;
import net.minecraft.world.item.SwordItem;
import net.minecraft.world.item.TridentItem;
import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraft.world.item.enchantment.Enchantments;
@@ -149,7 +148,7 @@ public class WorldAccess
DIRECTION_MAP.put("x", Direction.EAST);
}
private static final Map<String, TicketType<?>> ticketTypes = Map.of(
private static final Map<String, TicketType> ticketTypes = Map.of(
"portal", TicketType.PORTAL,
"teleport", TicketType.ENDER_PEARL,
"unknown", TicketType.UNKNOWN
@@ -646,7 +645,7 @@ public class WorldAccess
{
ServerLevel world = ((CarpetContext) c).level();
DistanceManager foo = world.getChunkSource().chunkMap.getDistanceManager();
Long2ObjectOpenHashMap<SortedArraySet<Ticket<?>>> levelTickets = Vanilla.ChunkTicketManager_getTicketsByPosition(foo);
Long2ObjectOpenHashMap<List<Ticket>> levelTickets = Vanilla.ChunkTicketManager_getTicketsByPosition(foo);
List<Value> res = new ArrayList<>();
if (lv.isEmpty())
@@ -654,7 +653,7 @@ public class WorldAccess
for (long key : levelTickets.keySet())
{
ChunkPos chpos = new ChunkPos(key);
for (Ticket<?> ticket : levelTickets.get(key))
for (Ticket ticket : levelTickets.get(key))
{
res.add(ListValue.of(
new StringValue(ticket.getType().toString()),
@@ -669,10 +668,10 @@ public class WorldAccess
{
BlockArgument blockArgument = BlockArgument.findIn((CarpetContext) c, lv, 0);
BlockPos pos = blockArgument.block.getPos();
SortedArraySet<Ticket<?>> tickets = levelTickets.get(new ChunkPos(pos).toLong());
List<Ticket> tickets = levelTickets.get(new ChunkPos(pos).toLong());
if (tickets != null)
{
for (Ticket<?> ticket : tickets)
for (Ticket ticket : tickets)
{
res.add(ListValue.of(
new StringValue(ticket.getType().toString()),
@@ -819,8 +818,7 @@ public class WorldAccess
Boolean[] result = new Boolean[]{true};
cc.server().executeBlocking(() ->
{
Clearable.tryClear(world.getBlockEntity(targetPos));
boolean success = world.setBlock(targetPos, finalSourceBlockState, 2);
boolean success = world.setBlock(targetPos, finalSourceBlockState, Block.UPDATE_CLIENTS | Block.UPDATE_SKIP_BLOCK_ENTITY_SIDEEFFECTS );
if (finalData != null)
{
BlockEntity be = world.getBlockEntity(targetPos);
@@ -914,11 +912,11 @@ public class WorldAccess
//postMine() durability from item classes
float hardness = state.getDestroySpeed(world, where);
int damageAmount = 0;
if ((item instanceof DiggerItem && hardness > 0.0) || item instanceof ShearsItem)
if ((tool.is(ItemTags.PICKAXES) && hardness > 0.0) || item instanceof ShearsItem)
{
damageAmount = 1;
}
else if (item instanceof TridentItem || item instanceof SwordItem)
else if (item instanceof TridentItem || tool.is(ItemTags.SWORDS))
{
damageAmount = 2;
}
@@ -1678,7 +1676,7 @@ public class WorldAccess
throw new InternalExpressionException("'add_chunk_ticket' requires block position, ticket type and radius");
}
String type = lv.get(locator.offset).getString();
TicketType<?> ticket = ticketTypes.get(type.toLowerCase(Locale.ROOT));
TicketType ticket = ticketTypes.get(type.toLowerCase(Locale.ROOT));
if (ticket == null)
{
throw new InternalExpressionException("Unknown ticket type: " + type);
@@ -1692,15 +1690,15 @@ public class WorldAccess
ChunkPos target = new ChunkPos(pos);
if (ticket == TicketType.PORTAL) // portal
{
cc.level().getChunkSource().addRegionTicket(TicketType.PORTAL, target, radius, pos);
cc.level().getChunkSource().addTicketWithRadius(TicketType.PORTAL, target, radius);
}
else if (ticket == TicketType.ENDER_PEARL) // post teleport
{
cc.level().getChunkSource().addRegionTicket(TicketType.ENDER_PEARL, target, radius, target);
cc.level().getChunkSource().addTicketWithRadius(TicketType.ENDER_PEARL, target, radius);
}
else
{
cc.level().getChunkSource().addRegionTicket(TicketType.UNKNOWN, target, radius, target);
cc.level().getChunkSource().addTicketWithRadius(TicketType.UNKNOWN, target, radius);
}
return new NumericValue(ticket.timeout());
});