mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-04-06 14:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings in platforms

Browse Source
This commit is contained in:
Octavia Togami 2024-03-31 16:50:55 -07:00 committed by Maddy Miller
parent 8b3a8a5f81
commit 0b0f052300
43 changed files with 161 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildSrc/src/main/kotlin/LibsConfig.kt
View File

@ -52,6 +52,7 @@ fun Project.applyLibrariesConfiguration() {
exclude(dependency("com.google.guava:guava"))
exclude(dependency("com.google.code.gson:gson"))
exclude(dependency("com.google.errorprone:error_prone_annotations"))
exclude(dependency("com.google.guava:failureaccess"))
exclude(dependency("org.checkerframework:checker-qual"))
exclude(dependency("org.jetbrains:annotations"))
exclude(dependency("org.apache.logging.log4j:log4j-api"))

34
verification/src/changes/accepted-bukkit-public-api-changes.json
View File

@ -1,11 +1,25 @@
{
"Removal of override method that exists in superclass": [
{
"type": "com.sk89q.worldedit.bukkit.BukkitWorld",
"member": "Method com.sk89q.worldedit.bukkit.BukkitWorld.fullySupports3DBiomes()",
"changes": [
"METHOD_REMOVED"
]
}
]
}
"Incorrect removal detection due to problems with classpath": [
{
"type": "com.sk89q.worldedit.bukkit.BukkitWorld",
"member": "Method com.sk89q.worldedit.bukkit.BukkitWorld.fullySupports3DBiomes()",
"changes": [
"METHOD_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.bukkit.BukkitServerInterface",
"member": "Method com.sk89q.worldedit.bukkit.BukkitServerInterface.getId()",
"changes": [
"METHOD_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.bukkit.BukkitWorld",
"member": "Method com.sk89q.worldedit.bukkit.BukkitWorld.getId()",
"changes": [
"METHOD_REMOVED"
]
}
]
}

11
verification/src/changes/accepted-cli-public-api-changes.json
View File

@ -1,2 +1,11 @@
{
}
"Incorrect removal detection due to problems with classpath": [
{
"type": "com.sk89q.worldedit.cli.schematic.ClipboardWorld",
"member": "Method com.sk89q.worldedit.cli.schematic.ClipboardWorld.getId()",
"changes": [
"METHOD_REMOVED"
]
}
]
}

11
verification/src/changes/accepted-fabric-public-api-changes.json
View File

@ -1,2 +1,11 @@
{
}
"Incorrect removal detection due to problems with classpath": [
{
"type": "com.sk89q.worldedit.fabric.FabricWorld",
"member": "Method com.sk89q.worldedit.fabric.FabricWorld.getId()",
"changes": [
"METHOD_REMOVED"
]
}
]
}

11
verification/src/changes/accepted-forge-public-api-changes.json
View File

@ -1,2 +1,11 @@
{
}
"Incorrect removal detection due to problems with classpath": [
{
"type": "com.sk89q.worldedit.forge.ForgeWorld",
"member": "Method com.sk89q.worldedit.forge.ForgeWorld.getId()",
"changes": [
"METHOD_REMOVED"
]
}
]
}

6
worldedit-bukkit/adapters/adapter-1.18.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R2/PaperweightAdapter.java
View File

@ -297,11 +297,11 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
}
private static Block getBlockFromType(BlockType blockType) {
return Registry.BLOCK.get(ResourceLocation.tryParse(blockType.getId()));
return Registry.BLOCK.get(ResourceLocation.tryParse(blockType.id()));
}
private static Item getItemFromType(ItemType itemType) {
return Registry.ITEM.get(ResourceLocation.tryParse(itemType.getId()));
return Registry.ITEM.get(ResourceLocation.tryParse(itemType.id()));
}
@Override
@ -599,7 +599,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
@Override
public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
ItemStack stack = new ItemStack(Registry.ITEM.get(ResourceLocation.tryParse(item.getType().getId())), item.getAmount());
ItemStack stack = new ItemStack(Registry.ITEM.get(ResourceLocation.tryParse(item.getType().id())), item.getAmount());
stack.setTag(((CompoundTag) fromNative(item.getNbt())));
return CraftItemStack.asCraftMirror(stack);
}

7
worldedit-bukkit/adapters/adapter-1.19.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_19_R3/PaperweightAdapter.java
View File

@ -314,11 +314,11 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
}
private static Block getBlockFromType(BlockType blockType) {
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId()));
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id()));
}
private static Item getItemFromType(ItemType itemType) {
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId()));
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id()));
}
public BiomeType adapt(Biome biome) {
@ -633,7 +633,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
@Override
public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
ItemStack stack = new ItemStack(
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())),
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())),
item.getAmount()
);
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbt())));
@ -735,6 +735,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
levelProperties.settings.getDataConfiguration()
);
@SuppressWarnings("deprecation")
PrimaryLevelData.SpecialWorldProperty specialWorldProperty =
levelProperties.isFlatWorld()
? PrimaryLevelData.SpecialWorldProperty.FLAT

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

@ -314,11 +314,11 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
}
private static Block getBlockFromType(BlockType blockType) {
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId()));
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id()));
}
private static Item getItemFromType(ItemType itemType) {
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId()));
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id()));
}
@Override
@ -633,7 +633,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
@Override
public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
ItemStack stack = new ItemStack(
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())),
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())),
item.getAmount()
);
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbt())));
@ -735,6 +735,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
levelProperties.settings.getDataConfiguration()
);
@SuppressWarnings("deprecation")
PrimaryLevelData.SpecialWorldProperty specialWorldProperty =
levelProperties.isFlatWorld()
? PrimaryLevelData.SpecialWorldProperty.FLAT

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

@ -314,11 +314,11 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
}
private static Block getBlockFromType(BlockType blockType) {
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId()));
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id()));
}
private static Item getItemFromType(ItemType itemType) {
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId()));
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id()));
}
@Override
@ -632,7 +632,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
@Override
public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
ItemStack stack = new ItemStack(
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())),
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())),
item.getAmount()
);
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbt())));
@ -734,6 +734,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
levelProperties.settings.getDataConfiguration()
);
@SuppressWarnings("deprecation")
PrimaryLevelData.SpecialWorldProperty specialWorldProperty =
levelProperties.isFlatWorld()
? PrimaryLevelData.SpecialWorldProperty.FLAT

7
worldedit-bukkit/adapters/adapter-1.20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R1/PaperweightAdapter.java
View File

@ -314,11 +314,11 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
}
private static Block getBlockFromType(BlockType blockType) {
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId()));
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id()));
}
private static Item getItemFromType(ItemType itemType) {
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId()));
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id()));
}
@Override
@ -633,7 +633,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
@Override
public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
ItemStack stack = new ItemStack(
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())),
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())),
item.getAmount()
);
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbt())));
@ -735,6 +735,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
levelProperties.settings.getDataConfiguration()
);
@SuppressWarnings("deprecation")
PrimaryLevelData.SpecialWorldProperty specialWorldProperty =
levelProperties.isFlatWorld()
? PrimaryLevelData.SpecialWorldProperty.FLAT

2
worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandRegistration.java
View File

@ -68,6 +68,7 @@ public class CommandRegistration {
return null;
}
@SuppressWarnings("deprecation")
public boolean register(List<CommandInfo> registered) {
CommandMap commandMap = getCommandMap();
if (registered == null || commandMap == null) {
@ -82,6 +83,7 @@ public class CommandRegistration {
return true;
}
@SuppressWarnings("deprecation")
public CommandMap getCommandMap() {
if (serverCommandMap != null) {
return serverCommandMap;

2
worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java
View File

@ -277,6 +277,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
@EventHandler
public void onPluginEnable(PluginEnableEvent event) {
Plugin plugin = event.getPlugin();
@SuppressWarnings("deprecation")
String name = plugin.getDescription().getName();
if (plugin instanceof PermissionsProvider) {
setPluginPermissionsResolver(plugin);
@ -289,6 +290,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
@EventHandler
public void onPluginDisable(PluginDisableEvent event) {
@SuppressWarnings("deprecation")
String name = event.getPlugin().getDescription().getName();
if (event.getPlugin() instanceof PermissionsProvider

1
worldedit-bukkit/src/main/java/com/sk89q/wepif/PluginPermissionsResolver.java
View File

@ -98,6 +98,7 @@ public class PluginPermissionsResolver implements PermissionsResolver {
}
@Override
@SuppressWarnings("deprecation")
public String getDetectionMessage() {
return "Using plugin '" + this.plugin.getDescription().getName() + "' for permissions.";
}

6
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
View File

@ -92,7 +92,7 @@ public class BukkitAdapter {
* @return If they are equal
*/
public static boolean equals(BlockType blockType, Material type) {
return Objects.equals(blockType.getId(), type.getKey().toString());
return Objects.equals(blockType.id(), type.getKey().toString());
}
/**
@ -334,7 +334,7 @@ public class BukkitAdapter {
*/
public static Material adapt(ItemType itemType) {
checkNotNull(itemType);
return Material.matchMaterial(itemType.getId());
return Material.matchMaterial(itemType.id());
}
/**
@ -345,7 +345,7 @@ public class BukkitAdapter {
*/
public static Material adapt(BlockType blockType) {
checkNotNull(blockType);
return Material.matchMaterial(blockType.getId());
return Material.matchMaterial(blockType.id());
}
/**

2
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java
View File

@ -40,7 +40,7 @@ class BukkitBiomeRegistry implements BiomeRegistry {
@Override
public Component getRichName(BiomeType biomeType) {
return TranslatableComponent.of(
TranslationManager.makeTranslationKey("biome", biomeType.getId())
TranslationManager.makeTranslationKey("biome", biomeType.id())
);
}

1
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntityProperties.java
View File

@ -152,6 +152,7 @@ class BukkitEntityProperties implements EntityProperties {
}
@Override
@SuppressWarnings("deprecation")
public boolean isTagged() {
return entity instanceof LivingEntity && entity.getCustomName() != null;
}

4
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java
View File

@ -197,6 +197,7 @@ public class BukkitServerInterface extends AbstractPlatform implements MultiUser
}
@Override
@SuppressWarnings("deprecation")
public String getVersion() {
return plugin.getDescription().getVersion();
}
@ -207,12 +208,13 @@ public class BukkitServerInterface extends AbstractPlatform implements MultiUser
}
@Override
@SuppressWarnings("deprecation")
public String getPlatformVersion() {
return plugin.getDescription().getVersion();
}
@Override
public String getId() {
public String id() {
return "enginehub:bukkit";
}

24
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
View File

@ -22,6 +22,7 @@ package com.sk89q.worldedit.bukkit;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
@ -29,6 +30,7 @@ import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.bukkit.adapter.UnsupportedVersionEditException;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.internal.util.LogManagerCompat;
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
import com.sk89q.worldedit.math.BlockVector2;
@ -69,6 +71,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
@ -167,7 +170,7 @@ public class BukkitWorld extends AbstractWorld {
}
@Override
public String getId() {
public String id() {
return getWorld().getName().replace(" ", "_").toLowerCase(Locale.ROOT);
}
@ -272,8 +275,23 @@ public class BukkitWorld extends AbstractWorld {
if (bukkitType == TreeType.CHORUS_PLANT) {
pt = pt.add(0, 1, 0); // bukkit skips the feature gen which does this offset normally, so we have to add it back
}
return type != null && world.generateTree(BukkitAdapter.adapt(world, pt), bukkitType,
new EditSessionBlockChangeDelegate(editSession));
return type != null && world.generateTree(
BukkitAdapter.adapt(world, pt),
ThreadLocalRandom.current(),
bukkitType,
block -> {
Mask mask = editSession.getMask();
var blockVector = BukkitAdapter.asBlockVector(block.getLocation());
if (mask != null && !mask.test(blockVector)) {
return false;
}
try {
editSession.setBlock(blockVector, BukkitAdapter.adapt(block.getBlockData()));
} catch (MaxChangedBlocksException ignored) {
}
return false;
}
);
}
@Override

2
worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIBlockRegistry.java
View File

@ -52,7 +52,7 @@ public class CLIBlockRegistry extends BundledBlockRegistry {
@Override
public Map<String, ? extends Property<?>> getProperties(BlockType blockType) {
Map<String, FileRegistries.BlockProperty> properties =
CLIWorldEdit.inst.getFileRegistries().getDataFile().blocks.get(blockType.getId()).properties;
CLIWorldEdit.inst.getFileRegistries().getDataFile().blocks.get(blockType.id()).properties;
Maps.EntryTransformer<String, FileRegistries.BlockProperty, Property<?>> entryTransform =
(key, value) -> createProperty(value.type, key, value.values);
return ImmutableMap.copyOf(Maps.transformEntries(properties, entryTransform));

4
worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIPlatform.java
View File

@ -112,7 +112,7 @@ class CLIPlatform extends AbstractPlatform {
@Override
public World matchWorld(World world) {
return this.worlds.stream()
.filter(w -> w.getId().equals(world.getId()))
.filter(w -> w.id().equals(world.id()))
.findAny()
.orElse(null);
}
@ -146,7 +146,7 @@ class CLIPlatform extends AbstractPlatform {
}
@Override
public String getId() {
public String id() {
return "enginehub:cli";
}

2
worldedit-cli/src/main/java/com/sk89q/worldedit/cli/schematic/ClipboardWorld.java
View File

@ -73,7 +73,7 @@ public class ClipboardWorld extends AbstractWorld implements Clipboard, CLIWorld
}
@Override
public String getId() {
public String id() {
return getName().replace(" ", "_").toLowerCase(Locale.ROOT);
}

1
worldedit-core/src/test/java/com/sk89q/minecraft/util/commands/CommandContextTest.java
View File

@ -34,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@SuppressWarnings("deprecation")
public class CommandContextTest {
private static final Logger LOGGER = LogManagerCompat.getLogger();

11
worldedit-core/src/test/java/com/sk89q/worldedit/util/collection/BlockMapTest.java
View File

@ -20,8 +20,6 @@
package com.sk89q.worldedit.util.collection;
import com.google.common.collect.ImmutableMap;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.StringTag;
import com.sk89q.worldedit.BaseWorldEditTest;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.registry.Registry;
@ -29,6 +27,7 @@ import com.sk89q.worldedit.util.test.VariedVectorGenerator;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import org.enginehub.linbus.tree.LinCompoundTag;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@ -91,7 +90,9 @@ class BlockMapTest extends BaseWorldEditTest {
private final BaseBlock air = checkNotNull(BlockTypes.AIR).getDefaultState().toBaseBlock();
private final BaseBlock oakWood = checkNotNull(BlockTypes.OAK_WOOD).getDefaultState().toBaseBlock();
private final BaseBlock chestWithNbt = checkNotNull(BlockTypes.CHEST).getDefaultState().toBaseBlock(new CompoundTag(ImmutableMap.of("dummy", new StringTag("value"))));
private final BaseBlock chestWithNbt = checkNotNull(BlockTypes.CHEST).getDefaultState().toBaseBlock(
LinCompoundTag.builder().putString("dummy", "value").build()
);
private AutoCloseable mocks;
@ -176,6 +177,7 @@ class BlockMapTest extends BaseWorldEditTest {
@Test
@DisplayName("never calls the forEach action")
@SuppressWarnings("try")
void neverCallsForEachAction() throws Exception {
try (AutoCloseable ignored = MockitoAnnotations.openMocks(this)) {
BlockMap<BaseBlock> map = BlockMap.createForBaseBlock();
@ -186,6 +188,7 @@ class BlockMapTest extends BaseWorldEditTest {
@Test
@DisplayName("never calls the replaceAll function")
@SuppressWarnings("try")
void neverCallsReplaceAllFunction() throws Exception {
try (AutoCloseable ignored = MockitoAnnotations.openMocks(this)) {
BlockMap<BaseBlock> map = BlockMap.createForBaseBlock();
@ -255,6 +258,7 @@ class BlockMapTest extends BaseWorldEditTest {
@Test
@DisplayName("inserts on merge, without calling merge function")
@SuppressWarnings("try")
void insertsOnMerge() throws Exception {
try (AutoCloseable ignored = MockitoAnnotations.openMocks(this)) {
BlockMap<BaseBlock> map = BlockMap.createForBaseBlock();
@ -450,6 +454,7 @@ class BlockMapTest extends BaseWorldEditTest {
@Test
@DisplayName("calls the forEach action once")
@SuppressWarnings("try")
void neverCallsForEachAction() {
generator.makeVectorsStream().sequential().forEach(vec -> {
try (AutoCloseable ignored = MockitoAnnotations.openMocks(this)) {

4
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricAdapter.java
View File

@ -209,7 +209,7 @@ public final class FabricAdapter {
}
public static Block adapt(BlockType blockType) {
return FabricWorldEdit.getRegistry(Registries.BLOCK).get(new ResourceLocation(blockType.getId()));
return FabricWorldEdit.getRegistry(Registries.BLOCK).get(new ResourceLocation(blockType.id()));
}
public static BlockType adapt(Block block) {
@ -217,7 +217,7 @@ public final class FabricAdapter {
}
public static Item adapt(ItemType itemType) {
return FabricWorldEdit.getRegistry(Registries.ITEM).get(new ResourceLocation(itemType.getId()));
return FabricWorldEdit.getRegistry(Registries.ITEM).get(new ResourceLocation(itemType.id()));
}
public static ItemType adapt(Item item) {

4
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBiomeRegistry.java
View File

@ -34,7 +34,7 @@ class FabricBiomeRegistry implements BiomeRegistry {
@Override
public Component getRichName(BiomeType biomeType) {
return TranslatableComponent.of(Util.makeDescriptionId("biome", new ResourceLocation(biomeType.getId())));
return TranslatableComponent.of(Util.makeDescriptionId("biome", new ResourceLocation(biomeType.id())));
}
@Deprecated
@ -62,7 +62,7 @@ class FabricBiomeRegistry implements BiomeRegistry {
@SuppressWarnings("deprecation")
@Override
public String getName() {
return biome.getId();
return biome.id();
}
}

3
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBlockMaterial.java
View File

@ -51,11 +51,13 @@ public class FabricBlockMaterial extends PassthroughBlockMaterial {
}
@Override
@SuppressWarnings("deprecation")
public boolean isLiquid() {
return block.liquid();
}
@Override
@SuppressWarnings("deprecation")
public boolean isSolid() {
return block.isSolid();
}
@ -71,6 +73,7 @@ public class FabricBlockMaterial extends PassthroughBlockMaterial {
}
@Override
@SuppressWarnings("deprecation")
public boolean isMovementBlocker() {
return block.blocksMotion();
}

2
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlatform.java
View File

@ -184,7 +184,7 @@ class FabricPlatform extends AbstractPlatform implements MultiUserPlatform {
}
@Override
public String getId() {
public String id() {
return "enginehub:fabric";
}

2
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java
View File

@ -183,7 +183,7 @@ public class FabricWorld extends AbstractWorld {
}
@Override
public String getId() {
public String id() {
return getName() + "_" + getDimensionRegistryKey(getWorld());
}

4
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeAdapter.java
View File

@ -195,7 +195,7 @@ public final class ForgeAdapter {
}
public static Block adapt(BlockType blockType) {
return ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockType.getId()));
return ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockType.id()));
}
public static BlockType adapt(Block block) {
@ -203,7 +203,7 @@ public final class ForgeAdapter {
}
public static Item adapt(ItemType itemType) {
return ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemType.getId()));
return ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemType.id()));
}
public static ItemType adapt(Item item) {

4
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeBiomeRegistry.java
View File

@ -34,7 +34,7 @@ class ForgeBiomeRegistry implements BiomeRegistry {
@Override
public Component getRichName(BiomeType biomeType) {
return TranslatableComponent.of(Util.makeDescriptionId("biome", new ResourceLocation(biomeType.getId())));
return TranslatableComponent.of(Util.makeDescriptionId("biome", new ResourceLocation(biomeType.id())));
}
@Deprecated
@ -62,7 +62,7 @@ class ForgeBiomeRegistry implements BiomeRegistry {
@SuppressWarnings("deprecation")
@Override
public String getName() {
return biome.getId();
return biome.id();
}
}

2
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java
View File

@ -207,7 +207,7 @@ class ForgePlatform extends AbstractPlatform implements MultiUserPlatform {
}
@Override
public String getId() {
public String id() {
return "enginehub:forge";
}

4
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java
View File

@ -179,7 +179,7 @@ public class ForgeWorld extends AbstractWorld {
}
@Override
public String getId() {
public String id() {
return getName() + "_" + getDimensionRegistryKey(getWorld());
}
@ -516,7 +516,7 @@ public class ForgeWorld extends AbstractWorld {
for (BlockVector2 chunk : chunks) {
nativeChunks.add(getWorld().getChunk(chunk.x(), chunk.z(), ChunkStatus.BIOMES, false));
}
((ServerLevel) getWorld()).getChunkSource().chunkMap.resendBiomesForChunks(nativeChunks);
getWorld().getChunkSource().chunkMap.resendBiomesForChunks(nativeChunks);
}
@Override

3
worldedit-sponge/build.gradle.kts
View File

@ -58,6 +58,9 @@ dependencies {
implementation("org.bstats:bstats-sponge:3.0.0")
implementation("it.unimi.dsi:fastutil")
testImplementation("org.mockito:mockito-core:${Versions.MOCKITO}")
// Silence some warnings, since apparently this isn't on the compile classpath like it should be.
compileOnly("com.google.errorprone:error_prone_annotations:2.11.0")
}
configure<BasePluginExtension> {

2
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java
View File

@ -218,7 +218,7 @@ public class SpongeAdapter {
public static ItemStack adapt(BaseItemStack itemStack) {
ItemStack stack = ItemStack.builder()
.itemType(() -> Sponge.game().registry(RegistryTypes.ITEM_TYPE)
.value(ResourceKey.resolve(itemStack.getType().getId())))
.value(ResourceKey.resolve(itemStack.getType().id())))
.quantity(itemStack.getAmount())
.build();
LinCompoundTag nbt = itemStack.getNbt();

2
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBiomeRegistry.java
View File

@ -37,7 +37,7 @@ class SpongeBiomeRegistry implements BiomeRegistry {
@Override
public Component getRichName(com.sk89q.worldedit.world.biome.BiomeType biomeType) {
return TranslatableComponent.of(
TranslationManager.makeTranslationKey("biome", biomeType.getId())
TranslationManager.makeTranslationKey("biome", biomeType.id())
);
}

3
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java
View File

@ -51,11 +51,13 @@ public class SpongeBlockMaterial extends PassthroughBlockMaterial {
}
@Override
@SuppressWarnings("deprecation")
public boolean isLiquid() {
return block.liquid();
}
@Override
@SuppressWarnings("deprecation")
public boolean isSolid() {
return block.isSolid();
}
@ -71,6 +73,7 @@ public class SpongeBlockMaterial extends PassthroughBlockMaterial {
}
@Override
@SuppressWarnings("deprecation")
public boolean isMovementBlocker() {
return block.blocksMotion();
}

6
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java
View File

@ -46,14 +46,14 @@ public class SpongeBlockRegistry extends BundledBlockRegistry {
@Override
public Component getRichName(BlockType blockType) {
return SpongeTextAdapter.convert(Sponge.game().registry(RegistryTypes.BLOCK_TYPE)
.value(ResourceKey.resolve(blockType.getId())).asComponent());
.value(ResourceKey.resolve(blockType.id())).asComponent());
}
@Override
public BlockMaterial getMaterial(BlockType blockType) {
org.spongepowered.api.block.BlockType spongeBlockType =
Sponge.game().registry(RegistryTypes.BLOCK_TYPE)
.value(ResourceKey.resolve(blockType.getId()));
.value(ResourceKey.resolve(blockType.id()));
return materialMap.computeIfAbsent(
spongeBlockType.defaultState(),
m -> {
@ -71,7 +71,7 @@ public class SpongeBlockRegistry extends BundledBlockRegistry {
public Map<String, ? extends Property<?>> getProperties(BlockType blockType) {
org.spongepowered.api.block.BlockType spongeBlockType =
Sponge.game().registry(RegistryTypes.BLOCK_TYPE)
.value(ResourceKey.resolve(blockType.getId()));
.value(ResourceKey.resolve(blockType.id()));
Map<String, Property<?>> map = new TreeMap<>();
Collection<StateProperty<?>> propertyKeys = spongeBlockType
.defaultState().stateProperties();

2
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeItemRegistry.java
View File

@ -34,7 +34,7 @@ public class SpongeItemRegistry extends BundledItemRegistry {
@Override
public Component getRichName(ItemType itemType) {
return SpongeTextAdapter.convert(Sponge.game().registry(RegistryTypes.ITEM_TYPE)
.value(ResourceKey.resolve(itemType.getId())).asComponent());
.value(ResourceKey.resolve(itemType.id())).asComponent());
}
@Override

2
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlatform.java
View File

@ -165,7 +165,7 @@ class SpongePlatform extends AbstractPlatform implements MultiUserPlatform {
}
@Override
public String getId() {
public String id() {
return "enginehub:sponge";
}

13
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java
View File

@ -110,7 +110,7 @@ public final class SpongeWorld extends AbstractWorld {
*
* @param world the world
*/
protected SpongeWorld(ServerWorld world) {
SpongeWorld(ServerWorld world) {
checkNotNull(world);
this.worldRef = new WeakReference<>(world);
this.worldNativeAccess = new SpongeWorldNativeAccess(new WeakReference<>((ServerLevel) world));
@ -139,7 +139,7 @@ public final class SpongeWorld extends AbstractWorld {
}
@Override
public String getId() {
public String id() {
return getWorld().key().asString();
}
@ -214,9 +214,9 @@ public final class SpongeWorld extends AbstractWorld {
LinCompoundTag nbt = baseBlock.getNbt();
if (nbt != null) {
BlockEntityArchetype.builder()
.blockEntity((BlockEntityType)
.blockEntity(
Sponge.game().registry(RegistryTypes.BLOCK_ENTITY_TYPE)
.value(ResourceKey.resolve(baseBlock.getNbtId()))
.<BlockEntityType>value(ResourceKey.resolve(baseBlock.getNbtId()))
)
.blockEntityData(NbtAdapter.adaptFromWorldEdit(nbt))
.state(newState)
@ -319,7 +319,8 @@ public final class SpongeWorld extends AbstractWorld {
case MANGROVE -> TreeFeatures.MANGROVE;
case TALL_MANGROVE -> TreeFeatures.TALL_MANGROVE;
case CHERRY -> TreeFeatures.CHERRY;
case RANDOM -> createTreeFeatureGenerator(TreeGenerator.TreeType.values()[ThreadLocalRandom.current().nextInt(TreeGenerator.TreeType.values().length)]);
case RANDOM ->
createTreeFeatureGenerator(TreeGenerator.TreeType.values()[ThreadLocalRandom.current().nextInt(TreeGenerator.TreeType.values().length)]);
default -> null;
};
}
@ -455,7 +456,7 @@ public final class SpongeWorld extends AbstractWorld {
@Override
public Entity createEntity(Location location, BaseEntity entity) {
Optional<EntityType<?>> entityType = Sponge.game().registry(RegistryTypes.ENTITY_TYPE)
.findValue(ResourceKey.resolve(entity.getType().id()));
.findValue(ResourceKey.resolve(entity.getType().id()));
if (entityType.isEmpty()) {
return null;
}

2
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java
View File

@ -170,7 +170,7 @@ public class SpongeWorldEdit {
id,
input -> {
BlockType spongeBlockType = Sponge.game().registry(RegistryTypes.BLOCK_TYPE).value(
ResourceKey.resolve(input.getBlockType().getId())
ResourceKey.resolve(input.getBlockType().id())
);
return SpongeAdapter.adapt(spongeBlockType.defaultState());
}

4
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java
View File

@ -65,7 +65,7 @@ public class ConfigurateConfiguration extends LocalConfiguration {
traceUnflushedSessions = node.node("debugging", "trace-unflushed-sessions").getBoolean(traceUnflushedSessions);
wandItem = node.node("wand-item").getString(wandItem).toLowerCase(Locale.ROOT);
try {
wandItem = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(wandItem)).getId();
wandItem = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(wandItem)).id();
} catch (Throwable ignored) {
}
@ -116,7 +116,7 @@ public class ConfigurateConfiguration extends LocalConfiguration {
navigationWand = node.node("navigation-wand", "item").getString(navigationWand).toLowerCase(Locale.ROOT);
try {
navigationWand = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(navigationWand)).getId();
navigationWand = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(navigationWand)).id();
} catch (Throwable ignored) {
}
navigationWandMaxDistance = node.node("navigation-wand", "max-distance").getInt(navigationWandMaxDistance);

2
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java
View File

@ -191,7 +191,7 @@ public class SpongeTransmogrifier {
public static org.spongepowered.api.block.BlockState transmogToMinecraft(BlockState blockState) {
org.spongepowered.api.block.BlockType mcBlock = Sponge.game().registry(RegistryTypes.BLOCK_TYPE)
.value(ResourceKey.resolve(blockState.getBlockType().getId()));
.value(ResourceKey.resolve(blockState.getBlockType().id()));
org.spongepowered.api.block.BlockState newState = mcBlock.defaultState();
Map<Property<?>, Object> states = blockState.getStates();
return transmogToMinecraftProperties(newState, states);