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

25w36b

Browse Source
This commit is contained in:
gnembon committed 2025-09-04 02:08:10 +02:00
1 parent 6533716c93
commit f371e2e8bd
29 files changed
+222 -153
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/CarpetEventServer.java
+4 -4
View File
@@ -886,7 +886,7 @@ public class CarpetEventServer
new NumericValue(amount),
StringValue.of(source.getMsgId()),
source.getEntity() == null ? Value.NULL : new EntityValue(source.getEntity())
), () -> target.getServer().createCommandSourceStack());
), () -> target.level().getServer().createCommandSourceStack());
}
};
public static final Event PLAYER_DEALS_DAMAGE = new Event("player_deals_damage", 3, false)
@@ -896,7 +896,7 @@ public class CarpetEventServer
{
return handler.call(() ->
Arrays.asList(new EntityValue(source.getEntity()), new NumericValue(amount), new EntityValue(target)),
() -> source.getEntity().getServer().createCommandSourceStack()
() -> source.getEntity().level().getServer().createCommandSourceStack()
);
}
};
@@ -1108,7 +1108,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.level().getServer().createCommandSourceStack().withLevel((ServerLevel) entity.level()).withPermission(Vanilla.MinecraftServer_getRunPermissionLevel(entity.level().getServer()))
);
}
})).collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
@@ -1127,7 +1127,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.level().getServer().createCommandSourceStack().withLevel((ServerLevel) entity.level()).withPermission(Vanilla.MinecraftServer_getRunPermissionLevel(entity.level().getServer()))
);
}
}))
src/main/java/carpet/script/EntityEventsGroup.java
+3 -3
View File
@@ -49,7 +49,7 @@ public class EntityEventsGroup
{
return;
}
CarpetScriptServer scriptServer = Vanilla.MinecraftServer_getScriptServer(entity.getServer());
CarpetScriptServer scriptServer = Vanilla.MinecraftServer_getScriptServer(entity.level().getServer());
if (scriptServer.stopAll)
{
return; // executed after world is closin down
@@ -64,7 +64,7 @@ public class EntityEventsGroup
iterator.remove();
continue;
}
if (key.user() != null && entity.getServer().getPlayerList().getPlayerByName(key.user()) == null)
if (key.user() != null && entity.level().getServer().getPlayerList().getPlayerByName(key.user()) == null)
{
iterator.remove();
continue;
@@ -170,7 +170,7 @@ public class EntityEventsGroup
public CarpetEventServer.CallbackResult call(CarpetEventServer.Callback tickCall, Entity entity, Object... args)
{
assert args.length == argcount - 1;
return tickCall.execute((entity instanceof ServerPlayer player ? player.createCommandSourceStack() : entity.getServer().createCommandSourceStack()), makeArgs(entity, args));
return tickCall.execute((entity instanceof ServerPlayer player ? player.createCommandSourceStack() : entity.level().getServer().createCommandSourceStack()), makeArgs(entity, args));
}
protected List<Value> makeArgs(Entity entity, Object... args)
src/main/java/carpet/script/annotation/Param.java
+1 -1
View File
@@ -212,7 +212,7 @@ public interface Param
registerStrictConverter(Component.class, false, new SimpleTypeConverter<>(FormattedTextValue.class, FormattedTextValue::getText, "text"));
registerStrictConverter(Component.class, true, new SimpleTypeConverter<>(StringValue.class, FormattedTextValue::getTextByValue, "text"));
registerStrictConverter(ServerPlayer.class, false, new SimpleTypeConverter<>(EntityValue.class,
v -> EntityValue.getPlayerByValue(v.getEntity().getServer(), v), "online player entity"));
v -> EntityValue.getPlayerByValue(v.getEntity().level().getServer(), v), "online player entity"));
registerStrictConverter(Boolean.class, false, new SimpleTypeConverter<>(BooleanValue.class, BooleanValue::getBoolean, "boolean"));
registerStrictConverter(Boolean.class, true, new SimpleTypeConverter<>(NumericValue.class, NumericValue::getBoolean, "boolean"));
}
src/main/java/carpet/script/utils/ShapeDispatcher.java
+1 -1
View File
@@ -762,7 +762,7 @@ public class ShapeDispatcher
{
return p -> {
ParticleOptions particle;
Registry<Block> blocks = p.getServer().registryAccess().lookupOrThrow(Registries.BLOCK);
Registry<Block> blocks = p.level().getServer().registryAccess().lookupOrThrow(Registries.BLOCK);
if (this.isitem)
{
if (Block.byItem(this.item.getItem()).defaultBlockState().isAir())
src/main/java/carpet/script/utils/ShapesRenderer.java
+11 -4
View File
@@ -33,6 +33,7 @@ import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState;
import net.minecraft.client.renderer.entity.state.EntityRenderState;
import net.minecraft.client.renderer.item.ItemStackRenderState;
import net.minecraft.client.renderer.texture.OverlayTexture;
@@ -438,11 +439,17 @@ public class ShapesRenderer
}
if (BlockEntity != null)
{
BlockEntityRenderer<BlockEntity> blockEntityRenderer = client.getBlockEntityRenderDispatcher().getRenderer(BlockEntity);
if (blockEntityRenderer != null)
BlockEntityRenderer<BlockEntity, BlockEntityRenderState> blockEntityRenderer = client.getBlockEntityRenderDispatcher().getRenderer(BlockEntity);
BlockEntityRenderState state = client.getBlockEntityRenderDispatcher().tryExtractRenderState(BlockEntity, partialTick, null);
if (blockEntityRenderer != null && state != null)
{
blockEntityRenderer.submit(BlockEntity, partialTick,
matrices, light, OverlayTexture.NO_OVERLAY, camera1.getPosition(), null, client.gameRenderer.getFeatureRenderDispatcher().getSubmitNodeStorage());
// testme partial positions
blockEntityRenderer.submit(state, matrices,client.gameRenderer.getFeatureRenderDispatcher().getSubmitNodeStorage());
//blockEntityRenderer.submit(BlockEntity, partialTick,
// matrices, light, OverlayTexture.NO_OVERLAY, camera1.getPosition(), null, client.gameRenderer.getFeatureRenderDispatcher().getSubmitNodeStorage());
}
}
src/main/java/carpet/script/utils/SnoopyCommandSource.java
+3 -3
View File
@@ -70,12 +70,12 @@ public class SnoopyCommandSource extends CommandSourceStack
{
super(player.commandSource(), player.position(), player.getRotationVector(),
player.level() instanceof final ServerLevel serverLevel ? serverLevel : null,
player.getServer().getProfilePermissions(player.nameAndId()), player.getName().getString(), player.getDisplayName(),
player.level().getServer().getProfilePermissions(player.nameAndId()), player.getName().getString(), player.getDisplayName(),
player.level().getServer(), player);
this.output = player.commandSource();
this.position = player.position();
this.world = player.level() instanceof final ServerLevel serverLevel ? serverLevel : null;
this.level = player.getServer().getProfilePermissions(player.nameAndId());
this.level = player.level().getServer().getProfilePermissions(player.nameAndId());
this.simpleName = player.getName().getString();
this.name = player.getDisplayName();
this.server = player.level().getServer();
@@ -86,7 +86,7 @@ public class SnoopyCommandSource extends CommandSourceStack
this.error = error;
this.chatOutput = output;
this.signingContext = CommandSigningContext.ANONYMOUS;
this.taskChainer = TaskChainer.immediate(player.getServer());
this.taskChainer = TaskChainer.immediate(player.level().getServer());
}
private SnoopyCommandSource(CommandSource output, Vec3 pos, Vec2 rot, ServerLevel world, int level, String simpleName, Component name, MinecraftServer server, @Nullable Entity entity, CommandResultCallback consumer, EntityAnchorArgument.Anchor entityAnchor, CommandSigningContext context, TaskChainer chainer,
src/main/java/carpet/script/value/EntityValue.java
+6 -6
View File
@@ -134,7 +134,7 @@ public class EntityValue extends Value
{
if (entity instanceof ServerPlayer serverPlayer && Vanilla.ServerPlayer_isInvalidEntityObject(serverPlayer))
{
ServerPlayer newPlayer = entity.getServer().getPlayerList().getPlayer(entity.getUUID());
ServerPlayer newPlayer = entity.level().getServer().getPlayerList().getPlayer(entity.getUUID());
if (newPlayer != null)
{
entity = newPlayer;
@@ -458,14 +458,14 @@ public class EntityValue extends Value
put("scoreboard_tags", (e, a) -> ListValue.wrap(e.getTags().stream().map(StringValue::new)));
put("entity_tags", (e, a) -> {
EntityType<?> type = e.getType();
return ListValue.wrap(e.getServer().registryAccess().lookupOrThrow(Registries.ENTITY_TYPE).getTags().filter(entry -> entry.stream().anyMatch(h -> h.value() == type)).map(entry -> ValueConversions.of(entry)));
return ListValue.wrap(e.level().getServer().registryAccess().lookupOrThrow(Registries.ENTITY_TYPE).getTags().filter(entry -> entry.stream().anyMatch(h -> h.value() == type)).map(entry -> ValueConversions.of(entry)));
});
// deprecated
put("has_tag", (e, a) -> BooleanValue.of(e.getTags().contains(a.getString())));
put("has_scoreboard_tag", (e, a) -> BooleanValue.of(e.getTags().contains(a.getString())));
put("has_entity_tag", (e, a) -> {
Optional<HolderSet.Named<EntityType<?>>> tag = e.getServer().registryAccess().lookupOrThrow(Registries.ENTITY_TYPE).get(TagKey.create(Registries.ENTITY_TYPE, InputValidator.identifierOf(a.getString())));
Optional<HolderSet.Named<EntityType<?>>> tag = e.level().getServer().registryAccess().lookupOrThrow(Registries.ENTITY_TYPE).get(TagKey.create(Registries.ENTITY_TYPE, InputValidator.identifierOf(a.getString())));
if (tag.isEmpty())
{
return Value.NULL;
@@ -505,7 +505,7 @@ public class EntityValue extends Value
put("despawn_timer", (e, a) -> e instanceof LivingEntity le ? new NumericValue(le.getNoActionTime()) : Value.NULL);
put("blue_skull", (e, a) -> e instanceof WitherSkull w ? BooleanValue.of(w.isDangerous()) : Value.NULL);
put("offering_flower", (e, a) -> e instanceof IronGolem ig ? BooleanValue.of(ig.getOfferFlowerTick() > 0) : Value.NULL);
put("item", (e, a) -> e instanceof ItemEntity ie ? ValueConversions.of(ie.getItem(), e.getServer().registryAccess()) : e instanceof ItemFrame frame ? ValueConversions.of(frame.getItem(), e.getServer().registryAccess()) : Value.NULL);
put("item", (e, a) -> e instanceof ItemEntity ie ? ValueConversions.of(ie.getItem(), e.level().getServer().registryAccess()) : e instanceof ItemFrame frame ? ValueConversions.of(frame.getItem(), e.level().getServer().registryAccess()) : Value.NULL);
put("count", (e, a) -> (e instanceof ItemEntity ie) ? new NumericValue(ie.getItem().getCount()) : Value.NULL);
put("pickup_delay", (e, a) -> (e instanceof ItemEntity ie) ? new NumericValue(Vanilla.ItemEntity_getPickupDelay(ie)) : Value.NULL);
put("portal_cooldown", (e, a) -> new NumericValue(Vanilla.Entity_getPublicNetherPortalCooldown(e)));
@@ -693,7 +693,7 @@ public class EntityValue extends Value
}
if (e instanceof LivingEntity le)
{
return ValueConversions.of(le.getItemBySlot(where), e.getServer().registryAccess());
return ValueConversions.of(le.getItemBySlot(where), e.level().getServer().registryAccess());
}
return Value.NULL;
});
@@ -1376,7 +1376,7 @@ public class EntityValue extends Value
if (params.size() > blockLocator.offset)
{
Value worldValue = params.get(blockLocator.offset);
world = ValueConversions.dimFromValue(worldValue, spe.getServer()).dimension();
world = ValueConversions.dimFromValue(worldValue, spe.level().getServer()).dimension();
if (params.size() > blockLocator.offset + 1)
{
angle = NumericValue.asNumber(params.get(blockLocator.offset + 1), "angle").getFloat();
src/main/java/carpet/script/value/ScreenValue.java
+1 -1
View File
@@ -200,7 +200,7 @@ public class ScreenValue extends Value
this.screenHandler = null;
return false;
}
int runPermissionLevel = Vanilla.MinecraftServer_getRunPermissionLevel(player.getServer());
int runPermissionLevel = Vanilla.MinecraftServer_getRunPermissionLevel(player.level().getServer());
CommandSourceStack source = player.createCommandSourceStack().withPermission(runPermissionLevel);
CarpetScriptHost executingHost = appHost.retrieveForExecution(source, player);
try
src/main/java/carpet/script/value/ValueConversions.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class ValueConversions
return ListValue.of(StringValue.of(Colors.mapColourName.get(color)), ofRGB(color.col));
}
public static <T extends Number> Value of(MinMaxBounds<T> range)
public static <T extends Number & Comparable<T>> Value of(MinMaxBounds<T> range)
{
return ListValue.of(
range.min().map(NumericValue::of).orElse(Value.NULL),