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/utils/Colors.java
+64 -64
View File
@@ -1,7 +1,7 @@
package carpet.script.utils;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.MapColor;
import java.util.Map;
@@ -89,68 +89,68 @@ public class Colors
entry(SoundType.POLISHED_DEEPSLATE, "polished_deepslate")
);
public static final Map<MaterialColor, String> mapColourName = Map.ofEntries(
entry(MaterialColor.NONE , "air" ),
entry(MaterialColor.GRASS , "grass" ),
entry(MaterialColor.SAND , "sand" ),
entry(MaterialColor.WOOL , "wool" ),
entry(MaterialColor.FIRE , "tnt" ),
entry(MaterialColor.ICE , "ice" ),
entry(MaterialColor.METAL , "iron" ),
entry(MaterialColor.PLANT , "foliage" ),
entry(MaterialColor.SNOW , "snow" ),
entry(MaterialColor.CLAY , "clay" ),
entry(MaterialColor.DIRT , "dirt" ),
entry(MaterialColor.STONE , "stone" ),
entry(MaterialColor.WATER , "water" ),
entry(MaterialColor.WOOD , "wood" ),
entry(MaterialColor.QUARTZ , "quartz" ),
entry(MaterialColor.COLOR_ORANGE , "adobe" ),
entry(MaterialColor.COLOR_MAGENTA , "magenta" ),
entry(MaterialColor.COLOR_LIGHT_BLUE, "light_blue"),
entry(MaterialColor.COLOR_YELLOW , "yellow" ),
entry(MaterialColor.COLOR_LIGHT_GREEN , "lime" ),
entry(MaterialColor.COLOR_PINK , "pink" ),
entry(MaterialColor.COLOR_GRAY , "gray" ),
entry(MaterialColor.COLOR_LIGHT_GRAY, "light_gray"),
entry(MaterialColor.COLOR_CYAN , "cyan" ),
entry(MaterialColor.COLOR_PURPLE , "purple" ),
entry(MaterialColor.COLOR_BLUE , "blue" ),
entry(MaterialColor.COLOR_BROWN , "brown" ),
entry(MaterialColor.COLOR_GREEN , "green" ),
entry(MaterialColor.COLOR_RED , "red" ),
entry(MaterialColor.COLOR_BLACK , "black" ),
entry(MaterialColor.GOLD , "gold" ),
entry(MaterialColor.DIAMOND , "diamond" ),
entry(MaterialColor.LAPIS , "lapis" ),
entry(MaterialColor.EMERALD , "emerald" ),
entry(MaterialColor.PODZOL , "obsidian" ),
entry(MaterialColor.NETHER , "netherrack"), //TODO fix these
entry(MaterialColor.TERRACOTTA_WHITE , "white_terracotta" ),
entry(MaterialColor.TERRACOTTA_ORANGE , "orange_terracotta" ),
entry(MaterialColor.TERRACOTTA_MAGENTA , "magenta_terracotta" ),
entry(MaterialColor.TERRACOTTA_LIGHT_BLUE, "light_blue_terracotta" ),
entry(MaterialColor.TERRACOTTA_YELLOW , "yellow_terracotta" ),
entry(MaterialColor.TERRACOTTA_LIGHT_GREEN , "lime_terracotta" ),
entry(MaterialColor.TERRACOTTA_PINK , "pink_terracotta" ),
entry(MaterialColor.TERRACOTTA_GRAY , "gray_terracotta" ),
entry(MaterialColor.TERRACOTTA_LIGHT_GRAY, "light_gray_terracotta" ),
entry(MaterialColor.TERRACOTTA_CYAN , "cyan_terracotta" ),
entry(MaterialColor.TERRACOTTA_PURPLE , "purple_terracotta" ),
entry(MaterialColor.TERRACOTTA_BLUE , "blue_terracotta" ),
entry(MaterialColor.TERRACOTTA_BROWN , "brown_terracotta" ),
entry(MaterialColor.TERRACOTTA_GREEN , "green_terracotta" ),
entry(MaterialColor.TERRACOTTA_RED , "red_terracotta" ),
entry(MaterialColor.TERRACOTTA_BLACK , "black_terracotta" ),
entry(MaterialColor.CRIMSON_NYLIUM , "crimson_nylium" ),
entry(MaterialColor.CRIMSON_STEM , "crimson_stem" ),
entry(MaterialColor.CRIMSON_HYPHAE , "crimson_hyphae" ),
entry(MaterialColor.WARPED_NYLIUM , "warped_nylium" ),
entry(MaterialColor.WARPED_STEM , "warped_stem" ),
entry(MaterialColor.WARPED_HYPHAE , "warped_hyphae" ),
entry(MaterialColor.WARPED_WART_BLOCK , "warped_wart" ),
entry(MaterialColor.DEEPSLATE , "deepslate" ),
entry(MaterialColor.RAW_IRON , "raw_iron" ),
entry(MaterialColor.GLOW_LICHEN , "glow_lichen" )
public static final Map<MapColor, String> mapColourName = Map.ofEntries(
entry(MapColor.NONE , "air" ),
entry(MapColor.GRASS , "grass" ),
entry(MapColor.SAND , "sand" ),
entry(MapColor.WOOL , "wool" ),
entry(MapColor.FIRE , "tnt" ),
entry(MapColor.ICE , "ice" ),
entry(MapColor.METAL , "iron" ),
entry(MapColor.PLANT , "foliage" ),
entry(MapColor.SNOW , "snow" ),
entry(MapColor.CLAY , "clay" ),
entry(MapColor.DIRT , "dirt" ),
entry(MapColor.STONE , "stone" ),
entry(MapColor.WATER , "water" ),
entry(MapColor.WOOD , "wood" ),
entry(MapColor.QUARTZ , "quartz" ),
entry(MapColor.COLOR_ORANGE , "adobe" ),
entry(MapColor.COLOR_MAGENTA , "magenta" ),
entry(MapColor.COLOR_LIGHT_BLUE, "light_blue"),
entry(MapColor.COLOR_YELLOW , "yellow" ),
entry(MapColor.COLOR_LIGHT_GREEN , "lime" ),
entry(MapColor.COLOR_PINK , "pink" ),
entry(MapColor.COLOR_GRAY , "gray" ),
entry(MapColor.COLOR_LIGHT_GRAY, "light_gray"),
entry(MapColor.COLOR_CYAN , "cyan" ),
entry(MapColor.COLOR_PURPLE , "purple" ),
entry(MapColor.COLOR_BLUE , "blue" ),
entry(MapColor.COLOR_BROWN , "brown" ),
entry(MapColor.COLOR_GREEN , "green" ),
entry(MapColor.COLOR_RED , "red" ),
entry(MapColor.COLOR_BLACK , "black" ),
entry(MapColor.GOLD , "gold" ),
entry(MapColor.DIAMOND , "diamond" ),
entry(MapColor.LAPIS , "lapis" ),
entry(MapColor.EMERALD , "emerald" ),
entry(MapColor.PODZOL , "obsidian" ),
entry(MapColor.NETHER , "netherrack"), //TODO fix these
entry(MapColor.TERRACOTTA_WHITE , "white_terracotta" ),
entry(MapColor.TERRACOTTA_ORANGE , "orange_terracotta" ),
entry(MapColor.TERRACOTTA_MAGENTA , "magenta_terracotta" ),
entry(MapColor.TERRACOTTA_LIGHT_BLUE, "light_blue_terracotta" ),
entry(MapColor.TERRACOTTA_YELLOW , "yellow_terracotta" ),
entry(MapColor.TERRACOTTA_LIGHT_GREEN , "lime_terracotta" ),
entry(MapColor.TERRACOTTA_PINK , "pink_terracotta" ),
entry(MapColor.TERRACOTTA_GRAY , "gray_terracotta" ),
entry(MapColor.TERRACOTTA_LIGHT_GRAY, "light_gray_terracotta" ),
entry(MapColor.TERRACOTTA_CYAN , "cyan_terracotta" ),
entry(MapColor.TERRACOTTA_PURPLE , "purple_terracotta" ),
entry(MapColor.TERRACOTTA_BLUE , "blue_terracotta" ),
entry(MapColor.TERRACOTTA_BROWN , "brown_terracotta" ),
entry(MapColor.TERRACOTTA_GREEN , "green_terracotta" ),
entry(MapColor.TERRACOTTA_RED , "red_terracotta" ),
entry(MapColor.TERRACOTTA_BLACK , "black_terracotta" ),
entry(MapColor.CRIMSON_NYLIUM , "crimson_nylium" ),
entry(MapColor.CRIMSON_STEM , "crimson_stem" ),
entry(MapColor.CRIMSON_HYPHAE , "crimson_hyphae" ),
entry(MapColor.WARPED_NYLIUM , "warped_nylium" ),
entry(MapColor.WARPED_STEM , "warped_stem" ),
entry(MapColor.WARPED_HYPHAE , "warped_hyphae" ),
entry(MapColor.WARPED_WART_BLOCK , "warped_wart" ),
entry(MapColor.DEEPSLATE , "deepslate" ),
entry(MapColor.RAW_IRON , "raw_iron" ),
entry(MapColor.GLOW_LICHEN , "glow_lichen" )
);
}
src/main/java/carpet/script/utils/EntityTools.java
+3 -3
View File
@@ -12,12 +12,12 @@ public class EntityTools
*/
public static void genericJump(Entity e)
{
if (!e.isOnGround() && !e.isInWaterOrBubble() && !e.isInLava())
if (!e.onGround() && !e.isInWaterOrBubble() && !e.isInLava())
{
return;
}
float m = e.level.getBlockState(e.blockPosition()).getBlock().getJumpFactor();
float g = e.level.getBlockState(BlockPos.containing(e.getX(), e.getBoundingBox().minY - 0.5000001D, e.getZ())).getBlock().getJumpFactor();
float m = e.level().getBlockState(e.blockPosition()).getBlock().getJumpFactor();
float g = e.level().getBlockState(BlockPos.containing(e.getX(), e.getBoundingBox().minY - 0.5000001D, e.getZ())).getBlock().getJumpFactor();
float jumpVelocityMultiplier = m == 1.0D ? g : m;
float jumpStrength = (0.42F * jumpVelocityMultiplier);
Vec3 vec3d = e.getDeltaMovement();
src/main/java/carpet/script/utils/ShapeDispatcher.java
+33 -33
View File
@@ -767,15 +767,15 @@ public class ShapeDispatcher
{
return;
}
particle = getParticleData("block_marker " + blocks.getKey(Block.byItem(this.item.getItem())), p.level.registryAccess());
particle = getParticleData("block_marker " + blocks.getKey(Block.byItem(this.item.getItem())), p.level().registryAccess());
}
else
{
particle = getParticleData("block_marker " + blocks.getKey(this.blockState.getBlock()), p.level.registryAccess());
particle = getParticleData("block_marker " + blocks.getKey(this.blockState.getBlock()), p.level().registryAccess());
}
Vec3 v = relativiseRender(p.level, this.pos, 0);
p.getLevel().sendParticles(p, particle, true, v.x, v.y, v.z, 1, 0.0, 0.0, 0.0, 0.0);
Vec3 v = relativiseRender(p.level(), this.pos, 0);
p.serverLevel().sendParticles(p, particle, true, v.x, v.y, v.z, 1, 0.0, 0.0, 0.0, 0.0);
};
}
@@ -868,14 +868,14 @@ public class ShapeDispatcher
double density = Math.max(2.0, from.distanceTo(to) / 50 / (a + 0.1));
return p ->
{
if (p.level.dimension() == shapeDimension)
if (p.level().dimension() == shapeDimension)
{
particleMesh(
Collections.singletonList(p),
replacementParticle(p.level.registryAccess()),
replacementParticle(p.level().registryAccess()),
density,
relativiseRender(p.level, from, 0),
relativiseRender(p.level, to, 0)
relativiseRender(p.level(), from, 0),
relativiseRender(p.level(), to, 0)
);
}
};
@@ -966,19 +966,19 @@ public class ShapeDispatcher
Vec3 vecA = vertexList.get(i);
if (relative.get(i))
{
vecA = relativiseRender(p.level, vecA, 0);
vecA = relativiseRender(p.level(), vecA, 0);
}
i++;
Vec3 vecB = vertexList.get(i);
if (relative.get(i))
{
vecB = relativiseRender(p.level, vecB, 0);
vecB = relativiseRender(p.level(), vecB, 0);
}
i++;
Vec3 vecC = vertexList.get(i);
if (relative.get(i))
{
vecC = relativiseRender(p.level, vecC, 0);
vecC = relativiseRender(p.level(), vecC, 0);
}
alterDrawTriangles(vecA, vecB, vecC);
}
@@ -987,19 +987,19 @@ public class ShapeDispatcher
Vec3 vec0 = vertexList.get(0);
if (relative.get(0))
{
vec0 = relativiseRender(p.level, vec0, 0);
vec0 = relativiseRender(p.level(), vec0, 0);
}
Vec3 vec1 = vertexList.get(1);
if (relative.get(1))
{
vec1 = relativiseRender(p.level, vec1, 0);
vec1 = relativiseRender(p.level(), vec1, 0);
}
for (int i = 2; i < vertexList.size(); i++)
{
Vec3 vec = vertexList.get(i);
if (relative.get(i))
{
vec = relativiseRender(p.level, vec, 0);
vec = relativiseRender(p.level(), vec, 0);
}
alterDrawTriangles(vec0, vec1, vec);
vec1 = vec;
@@ -1009,19 +1009,19 @@ public class ShapeDispatcher
Vec3 vecA = vertexList.get(0);
if (relative.get(0))
{
vecA = relativiseRender(p.level, vecA, 0);
vecA = relativiseRender(p.level(), vecA, 0);
}
Vec3 vecB = vertexList.get(1);
if (relative.get(1))
{
vecB = relativiseRender(p.level, vecB, 0);
vecB = relativiseRender(p.level(), vecB, 0);
}
for (int i = 2; i < vertexList.size(); i++)
{
Vec3 vec = vertexList.get(i);
if (relative.get(i))
{
vec = relativiseRender(p.level, vec, 0);
vec = relativiseRender(p.level(), vec, 0);
}
alterDrawTriangles(vecA, vecB, vec);
vecA = vecB;
@@ -1061,16 +1061,16 @@ public class ShapeDispatcher
public Consumer<ServerPlayer> alternative()
{
return p -> {
if (p.level.dimension() != this.shapeDimension)
if (p.level().dimension() != this.shapeDimension)
{
return;
}
if (fa > 0.0f)
{
ParticleOptions locparticledata = getParticleData(String.format(Locale.ROOT, "dust %.1f %.1f %.1f %.1f", fr, fg, fb, fa), p.level.registryAccess());
ParticleOptions locparticledata = getParticleData(String.format(Locale.ROOT, "dust %.1f %.1f %.1f %.1f", fr, fg, fb, fa), p.level().registryAccess());
for (Vec3 v : getAlterPoint(p))
{
p.getLevel().sendParticles(p, locparticledata, true,
p.serverLevel().sendParticles(p, locparticledata, true,
v.x, v.y, v.z, 1,
0.0, 0.0, 0.0, 0.0);
}
@@ -1205,13 +1205,13 @@ public class ShapeDispatcher
double density = Math.max(2.0, from.distanceTo(to) / 50) / (a + 0.1);
return p ->
{
if (p.level.dimension() == shapeDimension)
if (p.level().dimension() == shapeDimension)
{
drawParticleLine(
Collections.singletonList(p),
replacementParticle(p.level.registryAccess()),
relativiseRender(p.level, from, 0),
relativiseRender(p.level, to, 0),
replacementParticle(p.level().registryAccess()),
relativiseRender(p.level(), from, 0),
relativiseRender(p.level(), to, 0),
density
);
}
@@ -1279,8 +1279,8 @@ public class ShapeDispatcher
return p ->
{
int partno = Math.min(1000, 20 * subdivisions);
RandomSource rand = p.level.getRandom();
ServerLevel world = p.getLevel();
RandomSource rand = p.level().getRandom();
ServerLevel world = p.serverLevel();
ParticleOptions particle = replacementParticle(world.registryAccess());
Vec3 ccenter = relativiseRender(world, center, 0);
@@ -1376,8 +1376,8 @@ public class ShapeDispatcher
return p ->
{
int partno = (int) Math.min(1000, Math.sqrt(20 * subdivisions * (1 + height)));
RandomSource rand = p.level.getRandom();
ServerLevel world = p.getLevel();
RandomSource rand = p.level().getRandom();
ServerLevel world = p.serverLevel();
ParticleOptions particle = replacementParticle(world.registryAccess());
Vec3 ccenter = relativiseRender(world, center, 0);
@@ -2183,7 +2183,7 @@ public class ShapeDispatcher
int parts = 0;
for (ServerPlayer player : playerList)
{
ServerLevel world = player.getLevel();
ServerLevel world = player.serverLevel();
world.sendParticles(player, particle, true,
(towards.x) / 2 + from.x, (towards.y) / 2 + from.y, (towards.z) / 2 + from.z, particles / 3,
towards.x / 6, towards.y / 6, towards.z / 6, 0.0);
@@ -2200,7 +2200,7 @@ public class ShapeDispatcher
int dev = 2 * divider;
for (ServerPlayer player : playerList)
{
ServerLevel world = player.getLevel();
ServerLevel world = player.serverLevel();
world.sendParticles(player, particle, true,
(towards.x) / center + from.x, (towards.y) / center + from.y, (towards.z) / center + from.z, particles / divider,
towards.x / dev, towards.y / dev, towards.z / dev, 0.0);
@@ -2224,7 +2224,7 @@ public class ShapeDispatcher
int pcount = 0;
if (distance < 100)
{
RandomSource rand = players.get(0).level.random;
RandomSource rand = players.get(0).level().random;
int particles = (int) (distance / density) + 1;
Vec3 towards = to.subtract(from);
for (int i = 0; i < particles; i++)
@@ -2232,7 +2232,7 @@ public class ShapeDispatcher
Vec3 at = from.add(towards.scale(rand.nextDouble()));
for (ServerPlayer player : players)
{
player.getLevel().sendParticles(player, particle, true,
player.serverLevel().sendParticles(player, particle, true,
at.x, at.y, at.z, 1,
0.0, 0.0, 0.0, 0.0);
pcount++;
@@ -2253,7 +2253,7 @@ public class ShapeDispatcher
{
for (ServerPlayer player : players)
{
player.getLevel().sendParticles(player, particle, true,
player.serverLevel().sendParticles(player, particle, true,
delta.x + from.x, delta.y + from.y, delta.z + from.z, 1,
0.0, 0.0, 0.0, 0.0);
pcount++;
src/main/java/carpet/script/utils/SnoopyCommandSource.java
+4 -4
View File
@@ -66,16 +66,16 @@ public class SnoopyCommandSource extends CommandSourceStack
public SnoopyCommandSource(ServerPlayer player, Component[] error, List<Component> output)
{
super(player, player.position(), player.getRotationVector(),
player.level instanceof final ServerLevel serverLevel ? serverLevel : null,
player.level() instanceof final ServerLevel serverLevel ? serverLevel : null,
player.server.getProfilePermissions(player.getGameProfile()), player.getName().getString(), player.getDisplayName(),
player.level.getServer(), player);
player.level().getServer(), player);
this.output = player;
this.position = player.position();
this.world = player.level instanceof final ServerLevel serverLevel ? serverLevel : null;
this.world = player.level() instanceof final ServerLevel serverLevel ? serverLevel : null;
this.level = player.server.getProfilePermissions(player.getGameProfile());
this.simpleName = player.getName().getString();
this.name = player.getDisplayName();
this.server = player.level.getServer();
this.server = player.level().getServer();
this.entity = player;
this.resultConsumer = (ctx, succ, res) -> {
};
src/main/java/carpet/script/utils/Tracer.java
+2 -2
View File
@@ -31,7 +31,7 @@ public class Tracer
Vec3 pos = source.getEyePosition(partialTicks);
Vec3 rotation = source.getViewVector(partialTicks);
Vec3 reachEnd = pos.add(rotation.x * reach, rotation.y * reach, rotation.z * reach);
return source.level.clip(new ClipContext(pos, reachEnd, ClipContext.Block.OUTLINE, fluids ?
return source.level().clip(new ClipContext(pos, reachEnd, ClipContext.Block.OUTLINE, fluids ?
ClipContext.Fluid.ANY : ClipContext.Fluid.NONE, source));
}
@@ -45,7 +45,7 @@ public class Tracer
public static EntityHitResult rayTraceEntities(Entity source, Vec3 start, Vec3 end, AABB box, Predicate<Entity> predicate, double maxSqDistance)
{
Level world = source.level;
Level world = source.level();
double targetDistance = maxSqDistance;
Entity target = null;
Vec3 targetHitPos = null;
src/main/java/carpet/script/utils/WorldTools.java
+1 -1
View File
@@ -165,7 +165,7 @@ public class WorldTools
List<ServerPlayer> players = world.getChunkSource().chunkMap.getPlayers(chunkPos, false);
if (!players.isEmpty())
{
ClientboundLevelChunkWithLightPacket packet = new ClientboundLevelChunkWithLightPacket(worldChunk, world.getLightEngine(), null, null, false); // false seems to update neighbours as well.
ClientboundLevelChunkWithLightPacket packet = new ClientboundLevelChunkWithLightPacket(worldChunk, world.getLightEngine(), null, null); // false seems to update neighbours as well.
players.forEach(p -> p.connection.send(packet));
}
}