Permalink
Browse files

Rename legacy things to bundled things.

  • Loading branch information...
me4502 committed Jan 3, 2018
1 parent 224b587 commit 011c9b089bd913d3047754f784f93a1338b74851
@@ -20,12 +20,12 @@
package com.sk89q.worldedit.bukkit;
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.
*/
class BukkitWorldData extends LegacyWorldData {
class BukkitWorldData extends BundledWorldData {
private static final BukkitWorldData INSTANCE = new BukkitWorldData();
private final BiomeRegistry biomeRegistry = new BukkitBiomeRegistry();
@@ -33,7 +33,7 @@
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.util.TreeGenerator.TreeType;
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 javax.annotation.Nullable;
@@ -97,7 +97,7 @@ public boolean generateTree(TreeType type, EditSession editSession, Vector posit
@Override
public WorldData getWorldData() {
return LegacyWorldData.getInstance();
return BundledWorldData.getInstance();
}
@Override
@@ -144,23 +144,6 @@ public String fromLegacyId(Integer id) {
}
}
/**
* 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.
*
@@ -177,23 +160,6 @@ public BlockMaterial getMaterialById(String id) {
}
}
/**
* 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.
*
@@ -30,7 +30,7 @@
* A block registry that uses {@link BundledBlockData} to serve information
* about blocks.
*/
public class LegacyBlockRegistry implements BlockRegistry {
public class BundledBlockRegistry implements BlockRegistry {
@Nullable
@Override
@@ -20,21 +20,21 @@
package com.sk89q.worldedit.world.registry;
/**
* An implementation of {@link WorldData} that uses legacy numeric IDs and
* a built-in block database.
* An implementation of {@link WorldData} that converts legacy numeric IDs and
* 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 final LegacyBlockRegistry blockRegistry = new LegacyBlockRegistry();
private static final BundledWorldData INSTANCE = new BundledWorldData();
private final BundledBlockRegistry blockRegistry = new BundledBlockRegistry();
private final NullItemRegistry itemRegistry = new NullItemRegistry();
private final NullEntityRegistry entityRegistry = new NullEntityRegistry();
private final NullBiomeRegistry biomeRegistry = new NullBiomeRegistry();
/**
* Create a new instance.
*/
protected LegacyWorldData() {
protected BundledWorldData() {
}
@Override
@@ -62,7 +62,7 @@ public BiomeRegistry getBiomeRegistry() {
*
* @return an instance
*/
public static LegacyWorldData getInstance() {
public static BundledWorldData getInstance() {
return INSTANCE;
}
@@ -25,7 +25,7 @@
import com.sk89q.worldedit.math.transform.AffineTransform;
import com.sk89q.worldedit.math.transform.Transform;
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.Ignore;
import org.junit.Test;
@@ -54,7 +54,7 @@ public void setUp() throws Exception {
@Test
public void testTransform() throws Exception {
BlockRegistry blockRegistry = new LegacyBlockRegistry();
BlockRegistry blockRegistry = new BundledBlockRegistry();
for (BlockType type : BlockType.values()) {
if (ignored.contains(type)) {
continue;
@@ -21,12 +21,12 @@
import com.sk89q.worldedit.world.registry.BiomeRegistry;
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.
*/
class ForgeWorldData extends LegacyWorldData {
class ForgeWorldData extends BundledWorldData {
private static final ForgeWorldData INSTANCE = new ForgeWorldData();
private final BiomeRegistry biomeRegistry = new ForgeBiomeRegistry();
@@ -20,12 +20,12 @@
package com.sk89q.worldedit.sponge;
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.
*/
class SpongeWorldData extends LegacyWorldData {
class SpongeWorldData extends BundledWorldData {
private static final SpongeWorldData INSTANCE = new SpongeWorldData();
private final BiomeRegistry biomeRegistry = new SpongeBiomeRegistry();

0 comments on commit 011c9b0

Please sign in to comment.