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

mappings

Browse Source
This commit is contained in:
gnembon committed 2021-09-22 21:12:11 -03:00
1 parent 54ec1f223c
commit 7b9e5e6feb
12 files changed
+33 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/CarpetEventServer.java
+6 -6
View File
@@ -494,7 +494,7 @@ public class CarpetEventServer
{
return Arrays.asList(
new EntityValue(player),
new BlockValue(null, player.method_37908(), blockpos),
new BlockValue(null, player.getWorld(), blockpos),
StringValue.of(facing.getName())
);
}, player::getCommandSource);
@@ -515,7 +515,7 @@ public class CarpetEventServer
new EntityValue(player),
ValueConversions.of(itemstack),
StringValue.of(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand"),
new BlockValue(null, player.method_37908(), blockpos),
new BlockValue(null, player.getWorld(), blockpos),
StringValue.of(enumfacing.getName()),
ListValue.of(
new NumericValue(vec3d.x),
@@ -539,7 +539,7 @@ public class CarpetEventServer
return Arrays.asList(
new EntityValue(player),
StringValue.of(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand"),
new BlockValue(null, player.method_37908(), blockpos),
new BlockValue(null, player.getWorld(), blockpos),
StringValue.of(enumfacing.getName()),
ListValue.of(
new NumericValue(vec3d.x),
@@ -559,7 +559,7 @@ public class CarpetEventServer
new EntityValue(player),
ValueConversions.of(itemstack),
StringValue.of(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand"),
new BlockValue(null, player.method_37908(), pos)
new BlockValue(null, player.getWorld(), pos)
), player::getCommandSource);
}
};
@@ -569,7 +569,7 @@ public class CarpetEventServer
public void onBlockBroken(ServerPlayerEntity player, BlockPos pos, BlockState previousBS)
{
handler.call(
() -> Arrays.asList(new EntityValue(player), new BlockValue(previousBS, player.method_37908(), pos)),
() -> Arrays.asList(new EntityValue(player), new BlockValue(previousBS, player.getWorld(), pos)),
player::getCommandSource
);
}
@@ -1083,7 +1083,7 @@ public class CarpetEventServer
valArgs.add(EntityValue.of(player));
for (Object o: args)
{
valArgs.add(ValueConversions.guess(player.method_37908(), o));
valArgs.add(ValueConversions.guess(player.getWorld(), o));
}
return valArgs;
}, player::getCommandSource
src/main/java/carpet/script/api/WorldAccess.java
+1 -1
View File
@@ -97,7 +97,7 @@ import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.chunk.WorldChunk;
import net.minecraft.world.explosion.Explosion;
import net.minecraft.world.gen.ChunkRandom;
import net.minecraft.world.gen.random.ChunkRandom;
import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
import net.minecraft.world.gen.feature.StructureFeature;
src/main/java/carpet/script/utils/ShapeDispatcher.java
+6 -6
View File
@@ -718,7 +718,7 @@ public class ShapeDispatcher
ParticleEffect particle = replacementParticle();
int partno = Math.min(1000,20*subdivisions);
Random rand = p.world.getRandom();
ServerWorld world = p.method_37908();
ServerWorld world = p.getWorld();
Vec3d ccenter = relativiseRender(world, center, 0 );
@@ -796,7 +796,7 @@ public class ShapeDispatcher
ParticleEffect particle = replacementParticle();
int partno = (int)Math.min(1000,Math.sqrt(20*subdivisions*(1+height)));
Random rand = p.world.getRandom();
ServerWorld world = p.method_37908();
ServerWorld world = p.getWorld();
Vec3d ccenter = relativiseRender(world, center, 0 );
@@ -1275,7 +1275,7 @@ public class ShapeDispatcher
int parts = 0;
for (ServerPlayerEntity player : playerList)
{
ServerWorld world = player.method_37908();
ServerWorld world = player.getWorld();
world.spawnParticles(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);
@@ -1292,7 +1292,7 @@ public class ShapeDispatcher
int dev = 2*divider;
for (ServerPlayerEntity player : playerList)
{
ServerWorld world = player.method_37908();
ServerWorld world = player.getWorld();
world.spawnParticles(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);
@@ -1321,7 +1321,7 @@ public class ShapeDispatcher
Vec3d at = from.add(towards.multiply( rand.nextDouble()));
for (ServerPlayerEntity player : players)
{
player.method_37908().spawnParticles(player, particle, true,
player.getWorld().spawnParticles(player, particle, true,
at.x, at.y, at.z, 1,
0.0, 0.0, 0.0, 0.0);
pcount ++;
@@ -1339,7 +1339,7 @@ public class ShapeDispatcher
{
for (ServerPlayerEntity player : players)
{
player.method_37908().spawnParticles(player, particle, true,
player.getWorld().spawnParticles(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/value/BlockValue.java
+1 -1
View File
@@ -123,7 +123,7 @@ public class BlockValue extends Value
data = new NbtCompound();
return null;
}
data = be.method_38244(); // toNBT
data = be.createNbt();
return data;
}
return null;