Skip to content

Commit 550f97d

Browse files
octylFractaloctylFractal
committed
Chunk section editing spike, Fabric-only for now
1 parent d3c59b1 commit 550f97d

44 files changed

Lines changed: 1372 additions & 560 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/checkstyle/checkstyle-suppression.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<suppress files=".*[\\/]worldedit[\\/]bukkit[\\/]adapter[\\/]impl[\\/].*\.java" checks="PackageName"/>
1010
<suppress files=".*[\\/]MathUtils.java" checks="MethodName"/>
1111
<suppress files=".*[\\/]bPermissionsResolver.java" checks="TypeName"/>
12-
<!-- This thing only works via the use of a finalizer. -->
13-
<suppress files=".*[\\/]TracedEditSession.java" checks="NoFinalizer"/>
1412
<!-- None of the old command stuff really matters -->
1513
<suppress files=".*[\\/]minecraft[\\/]util[\\/]commands[\\/].*\.java" checks=".*"/>
14+
<!-- The mixins are allowed to use weird method names -->
15+
<suppress files=".*Mixin.*\.java" checks="MethodName"/>
1616
</suppressions>

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
group=com.sk89q.worldedit
22
version=7.3.7-SNAPSHOT
33

4-
org.gradle.jvmargs=-Xmx1500M
4+
org.gradle.jvmargs=-Xmx1700M
55
org.gradle.parallel=true
66

77
loom_fabric_repository=https://maven.enginehub.org/artifactory/fabricmc/

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[plugins]
22
codecov = "org.enginehub.codecov:0.2.0"
33
neogradle-userdev = "net.neoforged.gradle.userdev:7.0.142"
4-
fabric-loom = "fabric-loom:1.6.12"
4+
fabric-loom = "fabric-loom:1.7.3"
55
sponge-spongegradle = "org.spongepowered.gradle.plugin:2.2.0"
66
sponge-vanillagradle = { id = "org.spongepowered.gradle.vanilla", version.ref = "sponge-vanillagradle" }
77

@@ -21,8 +21,8 @@ sponge-api = "12.0.0-20240616.151530-3"
2121
sponge-api-major = "12"
2222

2323
# https://parchmentmc.org/docs/getting-started; note that we use older MC versions some times which is OK
24-
parchment-minecraft = "1.20.6"
25-
parchment-mappings = "2024.06.16"
24+
parchment-minecraft = "1.21"
25+
parchment-mappings = "2024.07.28"
2626

2727
# https://repo.spongepowered.org/service/rest/repository/browse/maven-public/org/spongepowered/vanillagradle/
2828
sponge-vanillagradle = "0.2.1-20240617.053350-83"

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pluginManagement {
99
}
1010
plugins {
1111
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
12-
id("fabric-loom") version "1.6.12"
12+
id("fabric-loom") version "1.7.3"
1313
}
1414
dependencyResolutionManagement {
1515
repositories {

‎worldedit-bukkit/adapters/adapter-1.20.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightAdapter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import com.sk89q.worldedit.extent.Extent;
4141
import com.sk89q.worldedit.internal.Constants;
4242
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
43-
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
43+
import com.sk89q.worldedit.internal.wna.NativeWorld;
4444
import com.sk89q.worldedit.math.BlockVector2;
4545
import com.sk89q.worldedit.math.BlockVector3;
4646
import com.sk89q.worldedit.regions.Region;
@@ -435,8 +435,8 @@ public void setBiome(Location location, BiomeType biome) {
435435
}
436436

437437
@Override
438-
public WorldNativeAccess<?, ?, ?> createWorldNativeAccess(World world) {
439-
return new PaperweightWorldNativeAccess(this,
438+
public NativeWorld<?, ?, ?> createWorldNativeAccess(World world) {
439+
return new PaperweightNativeWorld(this,
440440
new WeakReference<>(((CraftWorld) world).getHandle()));
441441
}
442442

worldedit-bukkit/adapters/adapter-1.20.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightWorldNativeAccess.java renamed to worldedit-bukkit/adapters/adapter-1.20.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightNativeWorld.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.sk89q.worldedit.bukkit.BukkitAdapter;
2323
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
24-
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
24+
import com.sk89q.worldedit.internal.wna.NativeWorld;
2525
import com.sk89q.worldedit.util.SideEffect;
2626
import com.sk89q.worldedit.util.SideEffectSet;
2727
import com.sk89q.worldedit.world.block.BlockState;
@@ -41,15 +41,15 @@
4141
import java.util.Objects;
4242
import javax.annotation.Nullable;
4343

44-
public class PaperweightWorldNativeAccess implements WorldNativeAccess<LevelChunk, net.minecraft.world.level.block.state.BlockState, BlockPos> {
44+
public class PaperweightNativeWorld implements NativeWorld<LevelChunk, net.minecraft.world.level.block.state.BlockState, BlockPos> {
4545
private static final int UPDATE = 1;
4646
private static final int NOTIFY = 2;
4747

4848
private final PaperweightAdapter adapter;
4949
private final WeakReference<ServerLevel> world;
5050
private SideEffectSet sideEffectSet;
5151

52-
public PaperweightWorldNativeAccess(PaperweightAdapter adapter, WeakReference<ServerLevel> world) {
52+
public PaperweightNativeWorld(PaperweightAdapter adapter, WeakReference<ServerLevel> world) {
5353
this.adapter = adapter;
5454
this.world = world;
5555
}
@@ -64,8 +64,8 @@ public void setCurrentSideEffectSet(SideEffectSet sideEffectSet) {
6464
}
6565

6666
@Override
67-
public LevelChunk getChunk(int x, int z) {
68-
return getWorld().getChunk(x, z);
67+
public LevelChunk getChunk(int chunkX, int chunkZ) {
68+
return getWorld().getChunk(chunkX, chunkZ);
6969
}
7070

7171
@Override

‎worldedit-bukkit/adapters/adapter-1.20.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightAdapter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import com.sk89q.worldedit.extent.Extent;
4141
import com.sk89q.worldedit.internal.Constants;
4242
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
43-
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
43+
import com.sk89q.worldedit.internal.wna.NativeWorld;
4444
import com.sk89q.worldedit.math.BlockVector2;
4545
import com.sk89q.worldedit.math.BlockVector3;
4646
import com.sk89q.worldedit.regions.Region;
@@ -435,8 +435,8 @@ public void setBiome(Location location, BiomeType biome) {
435435
}
436436

437437
@Override
438-
public WorldNativeAccess<?, ?, ?> createWorldNativeAccess(World world) {
439-
return new PaperweightWorldNativeAccess(this, new WeakReference<>(((CraftWorld) world).getHandle()));
438+
public NativeWorld<?, ?, ?> createWorldNativeAccess(World world) {
439+
return new PaperweightNativeWorld(this, new WeakReference<>(((CraftWorld) world).getHandle()));
440440
}
441441

442442
private static net.minecraft.core.Direction adapt(Direction face) {

worldedit-bukkit/adapters/adapter-1.20.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightWorldNativeAccess.java renamed to worldedit-bukkit/adapters/adapter-1.20.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightNativeWorld.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.sk89q.worldedit.bukkit.BukkitAdapter;
2323
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
24-
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
24+
import com.sk89q.worldedit.internal.wna.NativeWorld;
2525
import com.sk89q.worldedit.util.SideEffect;
2626
import com.sk89q.worldedit.util.SideEffectSet;
2727
import com.sk89q.worldedit.world.block.BlockState;
@@ -41,15 +41,15 @@
4141
import java.util.Objects;
4242
import javax.annotation.Nullable;
4343

44-
public class PaperweightWorldNativeAccess implements WorldNativeAccess<LevelChunk, net.minecraft.world.level.block.state.BlockState, BlockPos> {
44+
public class PaperweightNativeWorld implements NativeWorld<LevelChunk, net.minecraft.world.level.block.state.BlockState, BlockPos> {
4545
private static final int UPDATE = 1;
4646
private static final int NOTIFY = 2;
4747

4848
private final PaperweightAdapter adapter;
4949
private final WeakReference<ServerLevel> world;
5050
private SideEffectSet sideEffectSet;
5151

52-
public PaperweightWorldNativeAccess(PaperweightAdapter adapter, WeakReference<ServerLevel> world) {
52+
public PaperweightNativeWorld(PaperweightAdapter adapter, WeakReference<ServerLevel> world) {
5353
this.adapter = adapter;
5454
this.world = world;
5555
}
@@ -64,8 +64,8 @@ public void setCurrentSideEffectSet(SideEffectSet sideEffectSet) {
6464
}
6565

6666
@Override
67-
public LevelChunk getChunk(int x, int z) {
68-
return getWorld().getChunk(x, z);
67+
public LevelChunk getChunk(int chunkX, int chunkZ) {
68+
return getWorld().getChunk(chunkX, chunkZ);
6969
}
7070

7171
@Override

‎worldedit-bukkit/adapters/adapter-1.20.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R4/PaperweightAdapter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import com.sk89q.worldedit.extent.Extent;
4141
import com.sk89q.worldedit.internal.Constants;
4242
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
43-
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
43+
import com.sk89q.worldedit.internal.wna.NativeWorld;
4444
import com.sk89q.worldedit.math.BlockVector2;
4545
import com.sk89q.worldedit.math.BlockVector3;
4646
import com.sk89q.worldedit.regions.Region;
@@ -437,8 +437,8 @@ public void setBiome(Location location, BiomeType biome) {
437437
}
438438

439439
@Override
440-
public WorldNativeAccess<?, ?, ?> createWorldNativeAccess(World world) {
441-
return new PaperweightWorldNativeAccess(this, new WeakReference<>(((CraftWorld) world).getHandle()));
440+
public NativeWorld<?, ?, ?> createWorldNativeAccess(World world) {
441+
return new PaperweightNativeWorld(this, new WeakReference<>(((CraftWorld) world).getHandle()));
442442
}
443443

444444
private static net.minecraft.core.Direction adapt(Direction face) {

worldedit-bukkit/adapters/adapter-1.20.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R4/PaperweightWorldNativeAccess.java renamed to worldedit-bukkit/adapters/adapter-1.20.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R4/PaperweightNativeWorld.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.sk89q.worldedit.bukkit.BukkitAdapter;
2323
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
24-
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
24+
import com.sk89q.worldedit.internal.wna.NativeWorld;
2525
import com.sk89q.worldedit.util.SideEffect;
2626
import com.sk89q.worldedit.util.SideEffectSet;
2727
import com.sk89q.worldedit.world.block.BlockState;
@@ -41,15 +41,15 @@
4141
import java.util.Objects;
4242
import javax.annotation.Nullable;
4343

44-
public class PaperweightWorldNativeAccess implements WorldNativeAccess<LevelChunk, net.minecraft.world.level.block.state.BlockState, BlockPos> {
44+
public class PaperweightNativeWorld implements NativeWorld<LevelChunk, net.minecraft.world.level.block.state.BlockState, BlockPos> {
4545
private static final int UPDATE = 1;
4646
private static final int NOTIFY = 2;
4747

4848
private final PaperweightAdapter adapter;
4949
private final WeakReference<ServerLevel> world;
5050
private SideEffectSet sideEffectSet;
5151

52-
public PaperweightWorldNativeAccess(PaperweightAdapter adapter, WeakReference<ServerLevel> world) {
52+
public PaperweightNativeWorld(PaperweightAdapter adapter, WeakReference<ServerLevel> world) {
5353
this.adapter = adapter;
5454
this.world = world;
5555
}
@@ -64,8 +64,8 @@ public void setCurrentSideEffectSet(SideEffectSet sideEffectSet) {
6464
}
6565

6666
@Override
67-
public LevelChunk getChunk(int x, int z) {
68-
return getWorld().getChunk(x, z);
67+
public LevelChunk getChunk(int chunkX, int chunkZ) {
68+
return getWorld().getChunk(chunkX, chunkZ);
6969
}
7070

7171
@Override

0 commit comments

Comments
 (0)