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..6bf8445 100644 --- a/core/src/main/java/mc/core/world/block/AbstractBlock.java +++ b/core/src/main/java/mc/core/world/block/AbstractBlock.java @@ -1,13 +1,8 @@ package mc.core.world.block; -import com.flowpowered.nbt.Tag; import lombok.Getter; import lombok.Setter; -import java.util.HashMap; -import java.util.Map; -import java.util.stream.Stream; - public abstract class AbstractBlock implements Block { @Getter @Setter @@ -16,7 +11,6 @@ public abstract class AbstractBlock implements Block { private int light = 0; @Getter private final BlockType blockType; - private final Map> nbtTagsMap = new HashMap<>(); protected AbstractBlock(BlockType type) { this.blockType = type; @@ -28,19 +22,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(); diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/Crypter.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/Crypter.java deleted file mode 100644 index 7259f93..0000000 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/Crypter.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * DmitriyMX - * 2018-06-11 - */ -package mc.core.network.proto_1_12_2; - -import lombok.extern.slf4j.Slf4j; - -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.util.Random; - -@Slf4j -public class Crypter { - private static final Crypter instance = new Crypter(); - private KeyPair keyPair; - private byte[] verifyToken; - - public static KeyPair getKeyPair() { - if (instance.keyPair == null) { - try { - KeyPairGenerator keypairgenerator = KeyPairGenerator.getInstance("RSA"); - keypairgenerator.initialize(1024); - instance.keyPair = keypairgenerator.generateKeyPair(); - } catch (NoSuchAlgorithmException e) { - log.error("WTF?! Algorithm \"RSA\" not defined?!", e); - } - } - - return instance.keyPair; - } - - public static byte[] getVerifyToken() { - if (instance.verifyToken == null) { - instance.verifyToken = new byte[4]; - Random rand = new Random(); - rand.nextBytes(instance.verifyToken); - } - - return instance.verifyToken; - } -}