Rename legacy things to bundled things.

This commit is contained in:
Matthew Miller 2018-01-03 16:49:57 +10:00
parent f5f1d357d9
commit d5012bb072
8 changed files with 18 additions and 52 deletions

View File

@ -20,12 +20,12 @@
package com.sk89q.worldedit.bukkit; package com.sk89q.worldedit.bukkit;
import com.sk89q.worldedit.world.registry.BiomeRegistry; import com.sk89q.worldedit.world.registry.BiomeRegistry;
import com.sk89q.worldedit.world.registry.LegacyWorldData; import com.sk89q.worldedit.world.registry.BundledWorldData;
/** /**
* World data for the Bukkit platform. * World data for the Bukkit platform.
*/ */
class BukkitWorldData extends LegacyWorldData { class BukkitWorldData extends BundledWorldData {
private static final BukkitWorldData INSTANCE = new BukkitWorldData(); private static final BukkitWorldData INSTANCE = new BukkitWorldData();
private final BiomeRegistry biomeRegistry = new BukkitBiomeRegistry(); private final BiomeRegistry biomeRegistry = new BukkitBiomeRegistry();

View File

@ -33,7 +33,7 @@ import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.util.TreeGenerator.TreeType; import com.sk89q.worldedit.util.TreeGenerator.TreeType;
import com.sk89q.worldedit.world.biome.BaseBiome; import com.sk89q.worldedit.world.biome.BaseBiome;
import com.sk89q.worldedit.world.registry.LegacyWorldData; import com.sk89q.worldedit.world.registry.BundledWorldData;
import com.sk89q.worldedit.world.registry.WorldData; import com.sk89q.worldedit.world.registry.WorldData;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -97,7 +97,7 @@ public class NullWorld extends AbstractWorld {
@Override @Override
public WorldData getWorldData() { public WorldData getWorldData() {
return LegacyWorldData.getInstance(); return BundledWorldData.getInstance();
} }
@Override @Override

View File

@ -144,23 +144,6 @@ public class BundledBlockData {
} }
} }
/**
* Get the material properties for the given block.
*
* @param id the legacy numeric ID
* @return the material's properties, or null
*/
@Nullable
@Deprecated
public BlockMaterial getMaterialById(int id) {
BlockEntry entry = findById(id);
if (entry != null) {
return entry.material;
} else {
return null;
}
}
/** /**
* Get the material properties for the given block. * Get the material properties for the given block.
* *
@ -177,23 +160,6 @@ public class BundledBlockData {
} }
} }
/**
* Get the states for the given block.
*
* @param id the legacy numeric ID
* @return the block's states, or null if no information is available
*/
@Nullable
@Deprecated
public Map<String, ? extends State> getStatesById(int id) {
BlockEntry entry = findById(id);
if (entry != null) {
return entry.states;
} else {
return null;
}
}
/** /**
* Get the states for the given block. * Get the states for the given block.
* *

View File

@ -30,7 +30,7 @@ import java.util.Map;
* A block registry that uses {@link BundledBlockData} to serve information * A block registry that uses {@link BundledBlockData} to serve information
* about blocks. * about blocks.
*/ */
public class LegacyBlockRegistry implements BlockRegistry { public class BundledBlockRegistry implements BlockRegistry {
@Nullable @Nullable
@Override @Override

View File

@ -20,13 +20,13 @@
package com.sk89q.worldedit.world.registry; package com.sk89q.worldedit.world.registry;
/** /**
* An implementation of {@link WorldData} that uses legacy numeric IDs and * An implementation of {@link WorldData} that converts legacy numeric IDs and
* a built-in block database. * a contains a built-in block database.
*/ */
public class LegacyWorldData implements WorldData { public class BundledWorldData implements WorldData {
private static final LegacyWorldData INSTANCE = new LegacyWorldData(); private static final BundledWorldData INSTANCE = new BundledWorldData();
private final LegacyBlockRegistry blockRegistry = new LegacyBlockRegistry(); private final BundledBlockRegistry blockRegistry = new BundledBlockRegistry();
private final NullItemRegistry itemRegistry = new NullItemRegistry(); private final NullItemRegistry itemRegistry = new NullItemRegistry();
private final NullEntityRegistry entityRegistry = new NullEntityRegistry(); private final NullEntityRegistry entityRegistry = new NullEntityRegistry();
private final NullBiomeRegistry biomeRegistry = new NullBiomeRegistry(); private final NullBiomeRegistry biomeRegistry = new NullBiomeRegistry();
@ -34,7 +34,7 @@ public class LegacyWorldData implements WorldData {
/** /**
* Create a new instance. * Create a new instance.
*/ */
protected LegacyWorldData() { protected BundledWorldData() {
} }
@Override @Override
@ -62,7 +62,7 @@ public class LegacyWorldData implements WorldData {
* *
* @return an instance * @return an instance
*/ */
public static LegacyWorldData getInstance() { public static BundledWorldData getInstance() {
return INSTANCE; return INSTANCE;
} }

View File

@ -25,7 +25,7 @@ import com.sk89q.worldedit.blocks.BlockType;
import com.sk89q.worldedit.math.transform.AffineTransform; import com.sk89q.worldedit.math.transform.AffineTransform;
import com.sk89q.worldedit.math.transform.Transform; import com.sk89q.worldedit.math.transform.Transform;
import com.sk89q.worldedit.world.registry.BlockRegistry; import com.sk89q.worldedit.world.registry.BlockRegistry;
import com.sk89q.worldedit.world.registry.LegacyBlockRegistry; import com.sk89q.worldedit.world.registry.BundledBlockRegistry;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
@ -54,7 +54,7 @@ public class BlockTransformExtentTest {
@Test @Test
public void testTransform() throws Exception { public void testTransform() throws Exception {
BlockRegistry blockRegistry = new LegacyBlockRegistry(); BlockRegistry blockRegistry = new BundledBlockRegistry();
for (BlockType type : BlockType.values()) { for (BlockType type : BlockType.values()) {
if (ignored.contains(type)) { if (ignored.contains(type)) {
continue; continue;

View File

@ -21,12 +21,12 @@ package com.sk89q.worldedit.forge;
import com.sk89q.worldedit.world.registry.BiomeRegistry; import com.sk89q.worldedit.world.registry.BiomeRegistry;
import com.sk89q.worldedit.world.registry.ItemRegistry; import com.sk89q.worldedit.world.registry.ItemRegistry;
import com.sk89q.worldedit.world.registry.LegacyWorldData; import com.sk89q.worldedit.world.registry.BundledWorldData;
/** /**
* World data for the Forge platform. * World data for the Forge platform.
*/ */
class ForgeWorldData extends LegacyWorldData { class ForgeWorldData extends BundledWorldData {
private static final ForgeWorldData INSTANCE = new ForgeWorldData(); private static final ForgeWorldData INSTANCE = new ForgeWorldData();
private final BiomeRegistry biomeRegistry = new ForgeBiomeRegistry(); private final BiomeRegistry biomeRegistry = new ForgeBiomeRegistry();

View File

@ -20,12 +20,12 @@
package com.sk89q.worldedit.sponge; package com.sk89q.worldedit.sponge;
import com.sk89q.worldedit.world.registry.BiomeRegistry; import com.sk89q.worldedit.world.registry.BiomeRegistry;
import com.sk89q.worldedit.world.registry.LegacyWorldData; import com.sk89q.worldedit.world.registry.BundledWorldData;
/** /**
* World data for the Sponge platform. * World data for the Sponge platform.
*/ */
class SpongeWorldData extends LegacyWorldData { class SpongeWorldData extends BundledWorldData {
private static final SpongeWorldData INSTANCE = new SpongeWorldData(); private static final SpongeWorldData INSTANCE = new SpongeWorldData();
private final BiomeRegistry biomeRegistry = new SpongeBiomeRegistry(); private final BiomeRegistry biomeRegistry = new SpongeBiomeRegistry();