Mirrors/FastAsyncWorldEdit
3
0
Fork 1
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-19 17:30:08 +01:00
Code Issues Projekte Releases Wiki Aktivität

Address vector deprecations

Quellcode durchsuchen
Dieser Commit ist enthalten in:
dordsor21 2024-05-31 18:15:56 +01:00
Ursprung d466e8e488
Commit ef9c2c0bd3
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 1E53E88969FFCF0B
9 geänderte Dateien mit 18 neuen und 18 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_19_R3/PaperweightAdapter.java
Datei anzeigen

@ -862,7 +862,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
ConfiguredFeature<?, ?> k = originalWorld.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).get(ResourceLocation.tryParse(type.getId())); ConfiguredFeature<?, ?> k = originalWorld.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).get(ResourceLocation.tryParse(type.getId()));
ServerChunkCache chunkManager = originalWorld.getChunkSource(); ServerChunkCache chunkManager = originalWorld.getChunkSource();
WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this); WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this);
return k != null && k.place(proxyLevel, chunkManager.getGenerator(), random, new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); return k != null && k.place(proxyLevel, chunkManager.getGenerator(), random, new BlockPos(pt.x(), pt.y(), pt.z()));
} }
public boolean generateStructure(StructureType type, World world, EditSession session, BlockVector3 pt) { public boolean generateStructure(StructureType type, World world, EditSession session, BlockVector3 pt) {
@ -874,7 +874,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
ServerChunkCache chunkManager = originalWorld.getChunkSource(); ServerChunkCache chunkManager = originalWorld.getChunkSource();
WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this); WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this);
ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.x(), pt.y(), pt.z()));
StructureStart structureStart = k.generate(originalWorld.registryAccess(), chunkManager.getGenerator(), chunkManager.getGenerator().getBiomeSource(), chunkManager.randomState(), originalWorld.getStructureManager(), originalWorld.getSeed(), chunkPos, 0, proxyLevel, biome -> true); StructureStart structureStart = k.generate(originalWorld.registryAccess(), chunkManager.getGenerator(), chunkManager.getGenerator().getBiomeSource(), chunkManager.randomState(), originalWorld.getStructureManager(), originalWorld.getSeed(), chunkPos, 0, proxyLevel, biome -> true);
if (!structureStart.isValid()) { if (!structureStart.isValid()) {

4
worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightFaweAdapter.java
Datei anzeigen

@ -543,7 +543,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
populator, populator,
generator, generator,
serverLevel.random, serverLevel.random,
new BlockPos(pt.getX(), pt.getY(), pt.getZ()) new BlockPos(pt.x(), pt.y(), pt.z())
)) { )) {
return null; return null;
} }
@ -575,7 +575,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
ServerChunkCache chunkManager = serverLevel.getChunkSource(); ServerChunkCache chunkManager = serverLevel.getChunkSource();
ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.x(), pt.y(), pt.z()));
//FAWE start //FAWE start
FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel); FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel);

4
worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R1/PaperweightAdapter.java
Datei anzeigen

@ -908,7 +908,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
ConfiguredFeature<?, ?> k = originalWorld.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).get(ResourceLocation.tryParse(type.getId())); ConfiguredFeature<?, ?> k = originalWorld.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).get(ResourceLocation.tryParse(type.getId()));
ServerChunkCache chunkManager = originalWorld.getChunkSource(); ServerChunkCache chunkManager = originalWorld.getChunkSource();
WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this); WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this);
return k != null && k.place(proxyLevel, chunkManager.getGenerator(), random, new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); return k != null && k.place(proxyLevel, chunkManager.getGenerator(), random, new BlockPos(pt.x(), pt.y(), pt.z()));
} }
public boolean generateStructure(StructureType type, World world, EditSession session, BlockVector3 pt) { public boolean generateStructure(StructureType type, World world, EditSession session, BlockVector3 pt) {
@ -920,7 +920,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
ServerChunkCache chunkManager = originalWorld.getChunkSource(); ServerChunkCache chunkManager = originalWorld.getChunkSource();
WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this); WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this);
ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.x(), pt.y(), pt.z()));
StructureStart structureStart = k.generate(originalWorld.registryAccess(), chunkManager.getGenerator(), chunkManager.getGenerator().getBiomeSource(), chunkManager.randomState(), chunkManager.chunkMap.structureTemplateManager, originalWorld.getSeed(), chunkPos, 0, proxyLevel, biome -> true); StructureStart structureStart = k.generate(originalWorld.registryAccess(), chunkManager.getGenerator(), chunkManager.getGenerator().getBiomeSource(), chunkManager.randomState(), chunkManager.chunkMap.structureTemplateManager, originalWorld.getSeed(), chunkPos, 0, proxyLevel, biome -> true);
if (!structureStart.isValid()) { if (!structureStart.isValid()) {

4
worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightFaweAdapter.java
Datei anzeigen

@ -544,7 +544,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
populator, populator,
generator, generator,
serverLevel.random, serverLevel.random,
new BlockPos(pt.getX(), pt.getY(), pt.getZ()) new BlockPos(pt.x(), pt.y(), pt.z())
)) { )) {
return null; return null;
} }
@ -576,7 +576,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
ServerChunkCache chunkManager = serverLevel.getChunkSource(); ServerChunkCache chunkManager = serverLevel.getChunkSource();
ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.x(), pt.y(), pt.z()));
//FAWE start //FAWE start
FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel); FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel);

4
worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java
Datei anzeigen

@ -863,7 +863,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
ConfiguredFeature<?, ?> k = originalWorld.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).get(ResourceLocation.tryParse(type.getId())); ConfiguredFeature<?, ?> k = originalWorld.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).get(ResourceLocation.tryParse(type.getId()));
ServerChunkCache chunkManager = originalWorld.getChunkSource(); ServerChunkCache chunkManager = originalWorld.getChunkSource();
WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this); WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this);
return k != null && k.place(proxyLevel, chunkManager.getGenerator(), random, new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); return k != null && k.place(proxyLevel, chunkManager.getGenerator(), random, new BlockPos(pt.x(), pt.y(), pt.z()));
} }
public boolean generateStructure(StructureType type, World world, EditSession session, BlockVector3 pt) { public boolean generateStructure(StructureType type, World world, EditSession session, BlockVector3 pt) {
@ -875,7 +875,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
ServerChunkCache chunkManager = originalWorld.getChunkSource(); ServerChunkCache chunkManager = originalWorld.getChunkSource();
WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this); WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this);
ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.x(), pt.y(), pt.z()));
StructureStart structureStart = k.generate(originalWorld.registryAccess(), chunkManager.getGenerator(), chunkManager.getGenerator().getBiomeSource(), chunkManager.randomState(), originalWorld.getStructureManager(), originalWorld.getSeed(), chunkPos, 0, proxyLevel, biome -> true); StructureStart structureStart = k.generate(originalWorld.registryAccess(), chunkManager.getGenerator(), chunkManager.getGenerator().getBiomeSource(), chunkManager.randomState(), originalWorld.getStructureManager(), originalWorld.getSeed(), chunkPos, 0, proxyLevel, biome -> true);
if (!structureStart.isValid()) { if (!structureStart.isValid()) {

4
worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightFaweAdapter.java
Datei anzeigen

@ -547,7 +547,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
populator, populator,
generator, generator,
serverLevel.random, serverLevel.random,
new BlockPos(pt.getX(), pt.getY(), pt.getZ()) new BlockPos(pt.x(), pt.y(), pt.z())
)) { )) {
return null; return null;
} }
@ -579,7 +579,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
ServerChunkCache chunkManager = serverLevel.getChunkSource(); ServerChunkCache chunkManager = serverLevel.getChunkSource();
ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.x(), pt.y(), pt.z()));
//FAWE start //FAWE start
FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel); FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel);

4
worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R3/PaperweightAdapter.java
Datei anzeigen

@ -863,7 +863,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
ConfiguredFeature<?, ?> k = originalWorld.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).get(ResourceLocation.tryParse(type.getId())); ConfiguredFeature<?, ?> k = originalWorld.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).get(ResourceLocation.tryParse(type.getId()));
ServerChunkCache chunkManager = originalWorld.getChunkSource(); ServerChunkCache chunkManager = originalWorld.getChunkSource();
WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this); WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this);
return k != null && k.place(proxyLevel, chunkManager.getGenerator(), random, new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); return k != null && k.place(proxyLevel, chunkManager.getGenerator(), random, new BlockPos(pt.x(), pt.y(), pt.z()));
} }
public boolean generateStructure(StructureType type, World world, EditSession session, BlockVector3 pt) { public boolean generateStructure(StructureType type, World world, EditSession session, BlockVector3 pt) {
@ -875,7 +875,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
ServerChunkCache chunkManager = originalWorld.getChunkSource(); ServerChunkCache chunkManager = originalWorld.getChunkSource();
WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this); WorldGenLevel proxyLevel = PaperweightServerLevelDelegateProxy.newInstance(session, originalWorld, this);
ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.x(), pt.y(), pt.z()));
StructureStart structureStart = k.generate(originalWorld.registryAccess(), chunkManager.getGenerator(), chunkManager.getGenerator().getBiomeSource(), chunkManager.randomState(), originalWorld.getStructureManager(), originalWorld.getSeed(), chunkPos, 0, proxyLevel, biome -> true); StructureStart structureStart = k.generate(originalWorld.registryAccess(), chunkManager.getGenerator(), chunkManager.getGenerator().getBiomeSource(), chunkManager.randomState(), originalWorld.getStructureManager(), originalWorld.getSeed(), chunkPos, 0, proxyLevel, biome -> true);
if (!structureStart.isValid()) { if (!structureStart.isValid()) {

4
worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightFaweAdapter.java
Datei anzeigen

@ -547,7 +547,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
populator, populator,
generator, generator,
serverLevel.random, serverLevel.random,
new BlockPos(pt.getX(), pt.getY(), pt.getZ()) new BlockPos(pt.x(), pt.y(), pt.z())
)) { )) {
return null; return null;
} }
@ -579,7 +579,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
ServerChunkCache chunkManager = serverLevel.getChunkSource(); ServerChunkCache chunkManager = serverLevel.getChunkSource();
ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.x(), pt.y(), pt.z()));
//FAWE start //FAWE start
FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel); FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel);

4
worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightFaweAdapter.java
Datei anzeigen

@ -561,7 +561,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
populator, populator,
generator, generator,
serverLevel.random, serverLevel.random,
new BlockPos(pt.getX(), pt.getY(), pt.getZ()) new BlockPos(pt.x(), pt.y(), pt.z())
)) { )) {
return null; return null;
} }
@ -593,7 +593,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
ServerChunkCache chunkManager = serverLevel.getChunkSource(); ServerChunkCache chunkManager = serverLevel.getChunkSource();
ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ())); ChunkPos chunkPos = new ChunkPos(new BlockPos(pt.x(), pt.y(), pt.z()));
//FAWE start //FAWE start
FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel); FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel);