From 70835fe1ea37c17ccd5251842a1c4964da1b7ca9 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 4 Nov 2018 12:13:31 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=20=D0=B8?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=20Taggable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/mc/world/anvil/AnvilBlock.java | 15 --------------- core/src/main/java/mc/core/nbt/Taggable.java | 11 ----------- .../java/mc/core/world/block/AbstractBlock.java | 16 ---------------- .../src/main/java/mc/core/world/block/Block.java | 4 +--- 4 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 core/src/main/java/mc/core/nbt/Taggable.java diff --git a/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java b/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java index d48811c..95316a5 100644 --- a/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java +++ b/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java @@ -40,21 +40,6 @@ public class AnvilBlock implements Block { return location; } - @Override - public Tag getTag(String name) { - return null; - } - - @Override - public void setTag(Tag tag) { - - } - - @Override - public Stream> tagStream() { - return null; - } - @Override public String toString() { return "AnvilBlock{" + diff --git a/core/src/main/java/mc/core/nbt/Taggable.java b/core/src/main/java/mc/core/nbt/Taggable.java deleted file mode 100644 index 0e3a46c..0000000 --- a/core/src/main/java/mc/core/nbt/Taggable.java +++ /dev/null @@ -1,11 +0,0 @@ -package mc.core.nbt; - -import com.flowpowered.nbt.Tag; - -import java.util.stream.Stream; - -public interface Taggable { - Tag getTag(String name); - void setTag(Tag tag); - Stream> tagStream(); -} diff --git a/core/src/main/java/mc/core/world/block/AbstractBlock.java b/core/src/main/java/mc/core/world/block/AbstractBlock.java index b00b8af..0e0fd68 100644 --- a/core/src/main/java/mc/core/world/block/AbstractBlock.java +++ b/core/src/main/java/mc/core/world/block/AbstractBlock.java @@ -6,7 +6,6 @@ import lombok.Setter; import java.util.HashMap; import java.util.Map; -import java.util.stream.Stream; public abstract class AbstractBlock implements Block { @Getter @@ -28,19 +27,4 @@ public abstract class AbstractBlock implements Block { else if (light < 0) this.light = 0; else this.light = light; } - - @Override - public Tag getTag(String name) { - return nbtTagsMap.get(name); - } - - @Override - public void setTag(Tag tag) { - nbtTagsMap.put(tag.getName(), tag); - } - - @Override - public Stream> tagStream() { - return nbtTagsMap.values().stream(); - } } diff --git a/core/src/main/java/mc/core/world/block/Block.java b/core/src/main/java/mc/core/world/block/Block.java index b54a7d0..a23d3df 100644 --- a/core/src/main/java/mc/core/world/block/Block.java +++ b/core/src/main/java/mc/core/world/block/Block.java @@ -1,8 +1,6 @@ package mc.core.world.block; -import mc.core.nbt.Taggable; - -public interface Block extends Taggable{ +public interface Block { int getLight(); void setLight(int light); BlockType getBlockType();