MaterialData is gone

2026-02-16 02:20:57 +00:00 · 2021-02-22 19:47:15 -07:00
parent a328ff2f2a
commit 358bd350b5
52 changed files with 266 additions and 365 deletions
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
@@ -9,7 +9,6 @@ import com.dfsek.terra.api.addons.annotations.Version;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.TerraEventManager;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.Biome;
@@ -262,7 +261,6 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
    public void register(TypeRegistry registry) {
        registry
                .registerLoader(BlockData.class, (t, o, l) -> handle.createBlockData((String) o))
-                .registerLoader(MaterialData.class, (t, o, l) -> handle.createMaterialData((String) o))
                .registerLoader(Biome.class, (t, o, l) -> new BukkitBiome(org.bukkit.block.Biome.valueOf((String) o)))
                .registerLoader(EntityType.class, (t, o, l) -> EntityType.valueOf((String) o));
        genericLoaders.register(registry);
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitItemHandle.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitItemHandle.java
@@ -1,13 +1,11 @@
 package com.dfsek.terra.bukkit.handles;

-import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
-import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.platform.inventory.Item;
 import com.dfsek.terra.api.platform.inventory.item.Enchantment;
 import com.dfsek.terra.bukkit.util.MinecraftUtils;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;
-import com.dfsek.terra.bukkit.world.inventory.BukkitItemStack;
+import org.bukkit.Material;
 import org.bukkit.NamespacedKey;

 import java.util.Arrays;
@@ -15,9 +13,10 @@ import java.util.Set;
 import java.util.stream.Collectors;

 public class BukkitItemHandle implements ItemHandle {
+
    @Override
-    public ItemStack newItemStack(MaterialData material, int amount) {
-        return new BukkitItemStack(new org.bukkit.inventory.ItemStack(((BukkitMaterialData) material).getHandle(), amount));
+    public Item createItem(String data) {
+        return BukkitAdapter.adapt(Material.matchMaterial(data));
    }

    @Override
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java
@@ -2,14 +2,11 @@ package com.dfsek.terra.bukkit.handles;

 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
 import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
 import org.bukkit.Bukkit;
-import org.bukkit.Material;

 public class BukkitWorldHandle implements WorldHandle {
    @Override
@@ -22,22 +19,12 @@ public class BukkitWorldHandle implements WorldHandle {
        return block.getBlockData();
    }

-    @Override
-    public MaterialData getType(Block block) {
-        return block.getType();
-    }
-
    @Override
    public BlockData createBlockData(String data) {
        org.bukkit.block.data.BlockData bukkitData = Bukkit.createBlockData(data);
        return BukkitBlockData.newInstance(bukkitData);
    }

-    @Override
-    public MaterialData createMaterialData(String data) {
-        return new BukkitMaterialData(Material.matchMaterial(data));
-    }
-
    @Override
    public EntityType getEntity(String id) {
        return new BukkitEntityType(org.bukkit.entity.EntityType.valueOf(id));
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java
@@ -6,11 +6,13 @@ import com.dfsek.terra.api.platform.CommandSender;
 import com.dfsek.terra.api.platform.block.Axis;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.BlockFace;
+import com.dfsek.terra.api.platform.block.BlockType;
 import com.dfsek.terra.api.platform.block.data.Bisected;
 import com.dfsek.terra.api.platform.block.data.Rail;
 import com.dfsek.terra.api.platform.block.data.RedstoneWire;
 import com.dfsek.terra.api.platform.block.data.Slab;
 import com.dfsek.terra.api.platform.block.data.Stairs;
+import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.inventory.item.Enchantment;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
@@ -18,9 +20,12 @@ import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.Transformer;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.BukkitPlayer;
+import com.dfsek.terra.bukkit.world.block.BukkitBlockTypeAndItem;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
+import com.dfsek.terra.bukkit.world.inventory.BukkitItemStack;
 import com.dfsek.terra.bukkit.world.inventory.meta.BukkitEnchantment;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.TreeType;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
@@ -384,4 +389,20 @@ public final class BukkitAdapter {
    public static com.dfsek.terra.api.platform.entity.Player adapt(Player player) {
        return new BukkitPlayer(player);
    }
+
+    public static BukkitBlockTypeAndItem adapt(Material material) {
+        return new BukkitBlockTypeAndItem(material);
+    }
+
+    public static Material adapt(BlockType type) {
+        return ((BukkitBlockTypeAndItem) type).getHandle();
+    }
+
+    public static ItemStack adapt(org.bukkit.inventory.ItemStack in) {
+        return new BukkitItemStack(in);
+    }
+
+    public static org.bukkit.inventory.ItemStack adapt(ItemStack in) {
+        return ((BukkitItemStack) in).getHandle();
+    }
 }
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java
@@ -2,14 +2,12 @@ package com.dfsek.terra.bukkit.world;

 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.tree.Tree;
 import org.bukkit.TreeType;

 import java.util.Random;
-import java.util.Set;

 public class BukkitTree implements Tree {
    private final TreeType delegate;
@@ -26,18 +24,18 @@ public class BukkitTree implements Tree {
        WorldHandle handle = main.getWorldHandle();
        switch(type) {
            case CRIMSON_FUNGUS:
-                return MaterialSet.get(handle.createMaterialData("minecraft:crimson_nylium"));
+                return MaterialSet.get(handle.createBlockData("minecraft:crimson_nylium"));
            case WARPED_FUNGUS:
-                return MaterialSet.get(handle.createMaterialData("minecraft:warped_nylium"));
+                return MaterialSet.get(handle.createBlockData("minecraft:warped_nylium"));
            case BROWN_MUSHROOM:
            case RED_MUSHROOM:
-                return MaterialSet.get(handle.createMaterialData("minecraft:mycelium"), handle.createMaterialData("minecraft:grass_block"),
-                        handle.createMaterialData("minecraft:podzol"));
+                return MaterialSet.get(handle.createBlockData("minecraft:mycelium"), handle.createBlockData("minecraft:grass_block"),
+                        handle.createBlockData("minecraft:podzol"));
            case CHORUS_PLANT:
-                return MaterialSet.get(handle.createMaterialData("minecraft:end_stone"));
+                return MaterialSet.get(handle.createBlockData("minecraft:end_stone"));
            default:
-                return MaterialSet.get(handle.createMaterialData("minecraft:grass_block"), handle.createMaterialData("minecraft:dirt"),
-                        handle.createMaterialData("minecraft:podzol"));
+                return MaterialSet.get(handle.createBlockData("minecraft:grass_block"), handle.createBlockData("minecraft:dirt"),
+                        handle.createBlockData("minecraft:podzol"));
        }
    }

@@ -47,7 +45,7 @@ public class BukkitTree implements Tree {
    }

    @Override
-    public Set<MaterialData> getSpawnable() {
+    public MaterialSet getSpawnable() {
        return spawnable;
    }
 }
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java
@@ -4,7 +4,7 @@ import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.block.BlockType;
 import com.dfsek.terra.api.platform.block.state.BlockState;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
@@ -53,8 +53,8 @@ public class BukkitBlock implements Block {
    }

    @Override
-    public MaterialData getType() {
-        return new BukkitMaterialData(delegate.getType());
+    public BlockType getType() {
+        return BukkitAdapter.adapt(delegate.getType());
    }

    @Override
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockTypeAndItem.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockTypeAndItem.java
@@ -0,0 +1,52 @@
+package com.dfsek.terra.bukkit.world.block;
+
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockType;
+import com.dfsek.terra.api.platform.inventory.Item;
+import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.bukkit.world.BukkitAdapter;
+import org.bukkit.Material;
+
+public class BukkitBlockTypeAndItem implements BlockType, Item {
+    private final Material delegate;
+
+    public BukkitBlockTypeAndItem(Material delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Material getHandle() {
+        return delegate;
+    }
+
+    @Override
+    public BlockData getDefaultData() {
+        return BukkitAdapter.adapt(delegate.createBlockData());
+    }
+
+    @Override
+    public boolean isSolid() {
+        return delegate.isSolid();
+    }
+
+    @Override
+    public ItemStack newItemStack(int amount) {
+        return BukkitAdapter.adapt(new org.bukkit.inventory.ItemStack(delegate, amount));
+    }
+
+    @Override
+    public double getMaxDurability() {
+        return delegate.getMaxDurability();
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if(!(obj instanceof BukkitBlockTypeAndItem)) return false;
+        return delegate == ((BukkitBlockTypeAndItem) obj).delegate;
+    }
+}
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitMaterialData.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitMaterialData.java
@@ -1,62 +0,0 @@
-package com.dfsek.terra.bukkit.world.block;
-
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
-import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
-import org.bukkit.Material;
-
-public class BukkitMaterialData implements MaterialData {
-    private final Material delegate;
-
-    public BukkitMaterialData(Material delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public boolean matches(MaterialData other) {
-        return ((BukkitMaterialData) other).getHandle().equals(delegate);
-    }
-
-    @Override
-    public boolean matches(BlockData other) {
-        return ((BukkitMaterialData) other.getMaterial()).getHandle().equals(delegate);
-    }
-
-    @Override
-    public boolean isSolid() {
-        return delegate.isSolid();
-    }
-
-    @Override
-    public boolean isAir() {
-        return delegate.isAir();
-    }
-
-    @Override
-    public double getMaxDurability() {
-        return delegate.getMaxDurability();
-    }
-
-    @Override
-    public BlockData createBlockData() {
-        return BukkitBlockData.newInstance(delegate.createBlockData());
-    }
-
-    @Override
-    public Material getHandle() {
-        return delegate;
-    }
-
-    @Override
-    public int hashCode() {
-        return delegate.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if(!(obj instanceof BukkitMaterialData)) return false;
-        BukkitMaterialData other = (BukkitMaterialData) obj;
-
-        return other.getHandle().equals(this.delegate);
-    }
-}
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockData.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockData.java
@@ -1,9 +1,9 @@
 package com.dfsek.terra.bukkit.world.block.data;

 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.block.BlockType;
 import com.dfsek.terra.bukkit.TerraBukkitPlugin;
-import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;
+import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import org.bukkit.block.data.AnaloguePowerable;
 import org.bukkit.block.data.Directional;
 import org.bukkit.block.data.MultipleFacing;
@@ -52,13 +52,13 @@ public class BukkitBlockData implements BlockData {
    }

    @Override
-    public MaterialData getMaterial() {
-        return new BukkitMaterialData(delegate.getMaterial());
+    public BlockType getBlockType() {
+        return BukkitAdapter.adapt(delegate.getMaterial());
    }

    @Override
-    public boolean matches(MaterialData materialData) {
-        return delegate.getMaterial().equals(((BukkitMaterialData) materialData).getHandle());
+    public boolean matches(BlockData data) {
+        return delegate.getMaterial() == ((BukkitBlockData) data).getHandle().getMaterial();
    }

    @Override
@@ -76,4 +76,9 @@ public class BukkitBlockData implements BlockData {
    public String getAsString() {
        return delegate.getAsString(false);
    }
+
+    @Override
+    public boolean isAir() {
+        return delegate.getMaterial().isAir();
+    }
 }
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/inventory/BukkitItemStack.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/inventory/BukkitItemStack.java
@@ -1,9 +1,9 @@
 package com.dfsek.terra.bukkit.world.inventory;

-import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.inventory.Item;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
-import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;
+import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitItemStack implements ItemStack {
    private org.bukkit.inventory.ItemStack delegate;
@@ -23,8 +23,8 @@ public class BukkitItemStack implements ItemStack {
    }

    @Override
-    public MaterialData getType() {
-        return new BukkitMaterialData(delegate.getType());
+    public Item getType() {
+        return BukkitAdapter.adapt(delegate.getType());
    }

    @Override
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
@@ -6,7 +6,6 @@ import com.dfsek.terra.api.addons.TerraAddon;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.TerraEventManager;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.World;
@@ -216,7 +215,6 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
        genericLoaders.register(registry);
        registry
                .registerLoader(BlockData.class, (t, o, l) -> worldHandle.createBlockData((String) o))
-                .registerLoader(MaterialData.class, (t, o, l) -> worldHandle.createMaterialData((String) o))
                .registerLoader(com.dfsek.terra.api.platform.world.Biome.class, (t, o, l) -> new FabricBiome(biomeFixer.translate((String) o)));
    }

--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java
@@ -1,16 +1,16 @@
 package com.dfsek.terra.fabric.inventory;

-import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
-import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.platform.inventory.Item;
 import com.dfsek.terra.api.platform.inventory.item.Enchantment;

 import java.util.Collections;
 import java.util.Set;

 public class FabricItemHandle implements ItemHandle {
+
    @Override
-    public ItemStack newItemStack(MaterialData material, int amount) {
+    public Item createItem(String data) {
        return null;
    }

--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemStack.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemStack.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.inventory;

-import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.inventory.Item;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;

@@ -18,7 +18,7 @@ public class FabricItemStack implements ItemStack {
    }

    @Override
-    public MaterialData getType() {
+    public Item getType() {
        return null;
    }

--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
@@ -1,7 +1,6 @@
 package com.dfsek.terra.fabric.world;

 import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.tree.Tree;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
@@ -13,7 +12,6 @@ import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.feature.ConfiguredFeature;

 import java.util.Random;
-import java.util.Set;

 public class FabricTree implements Tree {
    private final ConfiguredFeature<?, ?> delegate;
@@ -30,8 +28,8 @@ public class FabricTree implements Tree {
    }

    @Override
-    public Set<MaterialData> getSpawnable() {
-        return MaterialSet.get(TerraFabricPlugin.getInstance().getWorldHandle().createMaterialData("minecraft:grass_block"),
-                TerraFabricPlugin.getInstance().getWorldHandle().createMaterialData("minecraft:podzol"));
+    public MaterialSet getSpawnable() {
+        return MaterialSet.get(TerraFabricPlugin.getInstance().getWorldHandle().createBlockData("minecraft:grass_block"),
+                TerraFabricPlugin.getInstance().getWorldHandle().createBlockData("minecraft:podzol"));
    }
 }
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java
@@ -2,11 +2,9 @@ package com.dfsek.terra.fabric.world;

 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.fabric.world.block.FabricBlockData;
-import com.dfsek.terra.fabric.world.block.FabricMaterialData;
 import com.dfsek.terra.fabric.world.block.data.FabricMultipleFacing;
 import com.dfsek.terra.fabric.world.block.data.FabricOrientable;
 import com.dfsek.terra.fabric.world.block.data.FabricSlab;
@@ -31,11 +29,6 @@ public class FabricWorldHandle implements WorldHandle {
        return block.getBlockData();
    }

-    @Override
-    public MaterialData getType(Block block) {
-        return block.getType();
-    }
-
    @Override
    public FabricBlockData createBlockData(String data) {
        BlockArgumentParser parser = new BlockArgumentParser(new StringReader(data), true);
@@ -58,11 +51,6 @@ public class FabricWorldHandle implements WorldHandle {
        }
    }

-    @Override
-    public MaterialData createMaterialData(String data) {
-        return new FabricMaterialData(createBlockData(data).getHandle().getBlock());
-    }
-
    @Override
    public EntityType getEntity(String id) {
        return null;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java
@@ -4,7 +4,7 @@ import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.block.BlockType;
 import com.dfsek.terra.api.platform.block.state.BlockState;
 import com.dfsek.terra.fabric.world.FabricAdapters;
 import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess;
@@ -46,7 +46,7 @@ public class FabricBlock implements Block {

    @Override
    public boolean isEmpty() {
-        return getBlockData().getMaterial().isAir();
+        return false;
    }

    @Override
@@ -55,8 +55,8 @@ public class FabricBlock implements Block {
    }

    @Override
-    public MaterialData getType() {
-        return getBlockData().getMaterial();
+    public BlockType getType() {
+        return getBlockData().getBlockType();
    }

    @Override
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.world.block;

 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.block.BlockType;
 import net.minecraft.block.BlockState;

 public class FabricBlockData implements BlockData {
@@ -12,13 +12,13 @@ public class FabricBlockData implements BlockData {
    }

    @Override
-    public MaterialData getMaterial() {
-        return new FabricMaterialData(delegate.getBlock());
+    public BlockType getBlockType() {
+        return null;
    }

    @Override
-    public boolean matches(MaterialData materialData) {
-        return ((FabricMaterialData) materialData).getHandle().is(delegate.getBlock());
+    public boolean matches(BlockData other) {
+        return false;
    }

    @Override
@@ -35,6 +35,11 @@ public class FabricBlockData implements BlockData {
        return delegate.toString();
    }

+    @Override
+    public boolean isAir() {
+        return false;
+    }
+
    @Override
    public BlockState getHandle() {
        return delegate;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricMaterialData.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricMaterialData.java
@@ -1,63 +0,0 @@
-package com.dfsek.terra.fabric.world.block;
-
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
-import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
-
-public class FabricMaterialData implements MaterialData {
-    private final Block delegate;
-
-    public FabricMaterialData(Block delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public boolean matches(MaterialData other) {
-        return delegate.equals(((FabricMaterialData) other).getHandle());
-    }
-
-    @Override
-    public boolean matches(BlockData other) {
-        return delegate.equals(((FabricMaterialData) other.getMaterial()).getHandle());
-    }
-
-    @Override
-    public boolean isSolid() {
-        return !delegate.is(Blocks.AIR);
-    }
-
-    @Override
-    public boolean isAir() {
-        return delegate.is(Blocks.AIR); // TODO: better impl
-    }
-
-    @Override
-    public double getMaxDurability() {
-        return 0;
-    }
-
-    @Override
-    public BlockData createBlockData() {
-        return new FabricBlockData(delegate.getDefaultState());
-    }
-
-    @Override
-    public Block getHandle() {
-        return delegate;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return delegate.asItem().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if(obj instanceof FabricMaterialData) {
-            return ((FabricMaterialData) obj).matches(this);
-        }
-        return false;
-    }
-}
--- a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
@@ -6,7 +6,6 @@ import com.dfsek.terra.api.addons.TerraAddon;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.TerraEventManager;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.Biome;
@@ -123,7 +122,6 @@ public class StandalonePlugin implements TerraPlugin {
        registry
                .registerLoader(BlockData.class, (t, o, l) -> worldHandle.createBlockData((String) o))
                .registerLoader(Biome.class, (t, o, l) -> new RawBiome(o.toString()))
-                .registerLoader(MaterialData.class, (t, o, l) -> worldHandle.createMaterialData((String) o));
        new GenericLoaders(this).register(registry);
    }

--- a/platforms/region/src/main/java/com/dfsek/terra/platform/Data.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/platform/Data.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.platform;

 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.block.BlockType;
 import net.querz.nbt.tag.CompoundTag;

-public class Data implements BlockData, MaterialData {
+public class Data implements BlockData, BlockType {
    private final CompoundTag data;
    private final String noProp;

@@ -38,39 +38,20 @@ public class Data implements BlockData, MaterialData {


    @Override
-    public MaterialData getMaterial() {
+    public BlockType getBlockType() {
        return this;
    }

-    @Override
-    public boolean matches(MaterialData materialData) {
-        return ((Data) materialData).noProp.equals(noProp);
-    }
-
    @Override
    public boolean matches(BlockData other) {
        return ((Data) other).noProp.equals(noProp);
    }

-    @Override
-    public boolean isSolid() {
-        return !isAir(); //TODO: actual implementation
-    }
-
    @Override
    public boolean isAir() {
        return noProp.equals("minecraft:air");
    }

-    @Override
-    public double getMaxDurability() {
-        return 0;
-    }
-
-    @Override
-    public BlockData createBlockData() {
-        return this;
-    }

    @Override
    public BlockData clone() {
@@ -101,4 +82,14 @@ public class Data implements BlockData, MaterialData {
        if(!(obj instanceof Data)) return false;
        return ((Data) obj).noProp.equals(noProp);
    }
+
+    @Override
+    public BlockData getDefaultData() {
+        return this;
+    }
+
+    @Override
+    public boolean isSolid() {
+        return false;
+    }
 }
--- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlock.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlock.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.block.BlockType;
 import com.dfsek.terra.api.platform.block.state.BlockState;
 import net.jafama.FastMath;

@@ -56,7 +56,7 @@ public class DirectBlock implements Block {
    }

    @Override
-    public MaterialData getType() {
+    public BlockType getType() {
        return new Data(world.getData(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()));
    }

--- a/platforms/region/src/main/java/com/dfsek/terra/platform/RawTree.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/platform/RawTree.java
@@ -1,12 +1,10 @@
 package com.dfsek.terra.platform;

 import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.tree.Tree;

-import java.util.Collections;
 import java.util.Random;
-import java.util.Set;

 public class RawTree implements Tree { // TODO: implement
    @Override
@@ -15,7 +13,7 @@ public class RawTree implements Tree { // TODO: implement
    }

    @Override
-    public Set<MaterialData> getSpawnable() {
-        return Collections.emptySet();
+    public MaterialSet getSpawnable() {
+        return MaterialSet.empty();
    }
 }
--- a/platforms/region/src/main/java/com/dfsek/terra/platform/RawWorldHandle.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/platform/RawWorldHandle.java
@@ -2,7 +2,6 @@ package com.dfsek.terra.platform;

 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.api.platform.handle.WorldHandle;

@@ -17,21 +16,11 @@ public class RawWorldHandle implements WorldHandle {
        return null;
    }

-    @Override
-    public MaterialData getType(Block block) {
-        return null;
-    }
-
    @Override
    public BlockData createBlockData(String data) {
        return new Data(data);
    }

-    @Override
-    public MaterialData createMaterialData(String data) {
-        return new Data(data);
-    }
-
    @Override
    public EntityType getEntity(String id) {
        return null;