Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.

2025-07-10 06:28:36 +00:00 · 2018-08-10 20:29:06 +10:00
parent 4d6045813c
commit 628c9cc0b7
185 changed files with 307 additions and 268 deletions
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/block/ExtentBlockCopy.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/block/ExtentBlockCopy.java
@ -24,10 +24,11 @@ import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.jnbt.CompoundTagBuilder;
 import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.internal.helper.MCDirections;
@ -125,9 +126,13 @@ public class ExtentBlockCopy implements RegionFunction {

 //                    Direction newDirection = Direction.findClosest(applyAbsolute, Flag.CARDINAL | Flag.ORDINAL | Flag.SECONDARY_ORDINAL);

+//<<<<<<< HEAD
                    if (newDirection != null) {
                        Map<String, Tag> values = ReflectionUtils.getMap(tag.getValue());
                        values.put("Rot", new ByteTag((byte) MCDirections.toRotation(newDirection)));
+//=======
+//                        return state.toBaseBlock(builder.build());
+//>>>>>>> f54d6afb... Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.
                    }
                }
            }
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/entity/ExtentEntityCopy.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/entity/ExtentEntityCopy.java
@ -163,16 +163,12 @@ public class ExtentEntityCopy implements EntityFunction {
            boolean hasFacing = tag.containsKey("Facing");

            if (hasTilePosition) {
-<<<<<<< HEAD
 //<<<<<<< HEAD
                changed = true;
 //                Vector tilePosition = new Vector(tag.asInt("TileX"), tag.asInt("TileY"), tag.asInt("TileZ"));
 //                Vector newTilePosition = transform.apply(tilePosition.subtract(from)).add(to);
 //=======
-                Vector3 tilePosition = new Vector3(tag.asInt("TileX"), tag.asInt("TileY"), tag.asInt("TileZ"));
-=======
                Vector3 tilePosition = Vector3.at(tag.asInt("TileX"), tag.asInt("TileY"), tag.asInt("TileZ"));
->>>>>>> 2c8b2fe0... Move vectors to static creators, for caching
                BlockVector3 newTilePosition = transform.apply(tilePosition.subtract(from)).add(to).toBlockPoint();
 //>>>>>>> 399e0ad5... Refactor vector system to be cleaner

@ -213,7 +209,7 @@ public class ExtentEntityCopy implements EntityFunction {
                double pitch = Math.toRadians(rotation.getFloat(1));

                double xz = Math.cos(pitch);
-                Vector3 direction = new Vector3(-xz * Math.sin(yaw), -Math.sin(pitch), xz * Math.cos(yaw));
+                Vector3 direction = Vector3.at(-xz * Math.sin(yaw), -Math.sin(pitch), xz * Math.cos(yaw));
                direction = transform.apply(direction);
                FloatTag yawTag = new FloatTag((float)direction.toYaw());
                FloatTag pitchTag = new FloatTag((float)direction.toPitch());
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BlockMask.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BlockMask.java
@ -3,8 +3,8 @@ package com.sk89q.worldedit.function.mask;
 import com.boydti.fawe.object.collection.FastBitSet;
 import com.boydti.fawe.util.MainUtil;
 import com.boydti.fawe.util.StringMan;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.extent.NullExtent;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.registry.state.AbstractProperty;
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/SolidBlockMask.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/SolidBlockMask.java
@ -1,6 +1,6 @@
 package com.sk89q.worldedit.function.mask;

-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BlockState;
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/BlockMapEntryPlacer.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/BlockMapEntryPlacer.java
@ -20,8 +20,10 @@
 package com.sk89q.worldedit.function.operation;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/BlockPattern.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/BlockPattern.java
@ -3,6 +3,7 @@ package com.sk89q.worldedit.function.pattern;
 import static com.google.common.base.Preconditions.checkNotNull;

 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockStateHolder;

 /**
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/ClipboardPattern.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/ClipboardPattern.java
@ -1,6 +1,6 @@
 package com.sk89q.worldedit.function.pattern;

-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import static com.google.common.base.Preconditions.checkNotNull;

--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/Pattern.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/Pattern.java
@ -21,7 +21,7 @@ package com.sk89q.worldedit.function.pattern;

 import com.sk89q.minecraft.util.commands.Link;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.command.UtilityCommands;
 import com.sk89q.worldedit.extent.Extent;
@ -37,17 +37,17 @@ import com.sk89q.worldedit.world.block.BlockState;
 */
@Link(clazz = UtilityCommands.class, value = "patterns")
@Deprecated
-public interface Pattern extends com.sk89q.worldedit.patterns.Pattern{
+public interface Pattern{

-    @Override
-    default BaseBlock next(BlockVector3 position) {
-        return new BaseBlock(apply(position));
-    }
-
-    @Override
-    default BaseBlock next(int x, int y, int z) {
-        return new BaseBlock(apply(BlockVector3.at(x, y, z)));
-    }
+//    @Override
+//    default BaseBlock next(BlockVector3 position) {
+//        return new BaseBlock(apply(position));
+//    }
+//
+//    @Override
+//    default BaseBlock next(int x, int y, int z) {
+//        return new BaseBlock(apply(BlockVector3.at(x, y, z)));
+//    }

    /**
     * Return a {@link BlockStateHolder} for the given position.
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RandomPattern.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RandomPattern.java
@ -4,7 +4,7 @@ import com.boydti.fawe.object.collection.RandomCollection;
 import com.boydti.fawe.object.random.SimpleRandom;
 import com.boydti.fawe.object.random.TrueRandom;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import static com.google.common.base.Preconditions.checkNotNull;