AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-12 08:58:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

update block store

Browse Source
This commit is contained in:
bixilon 2020-06-04 01:53:57 +02:00
parent 166093e641
commit 8f24a7f727
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 11 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Block.java
View File

@ -9,18 +9,19 @@ public enum Block {
COBBLESTONE(new Identifier("stone"), 4), COBBLESTONE(new Identifier("stone"), 4),
WHITE_WOOL(new Identifier("wool"), 35, 0), WHITE_WOOL(new Identifier("wool"), 35, 0),
RED_WOOL(new Identifier("wool", "red_wool"), 35, 14), RED_WOOL(new Identifier("wool", "red_wool"), 35, 14),
DROPPER(new Identifier("dropper", "dropper"), 158, BlockRotation.RotationType.NORMAL); DROPPER_DOWN(new Identifier("dropper", "dropper"), 158, 0),
DROPPER_EAST(new Identifier("dropper", "dropper"), 158, 1),
DROPPER_NORTH(new Identifier("dropper", "dropper"), 158, 2),
DROPPER_SOUTH(new Identifier("dropper", "dropper"), 158, 3),
DROPPER_UP(new Identifier("dropper", "dropper"), 158, 4),
DROPPER_WEST(new Identifier("dropper", "dropper"), 158, 5);
//ToDo all blocks
//ToDo post water update block states
Identifier identifier; Identifier identifier;
int legacyId; int legacyId;
int legacyData; int legacyData;
BlockRotation.RotationType rotationType;
Block(Identifier identifier, int legacyId, BlockRotation.RotationType rotationType) {
this.identifier = identifier;
this.legacyId = legacyId;
this.rotationType = rotationType;
}
Block(Identifier identifier, int legacyId, int legacyData) { Block(Identifier identifier, int legacyId, int legacyData) {
this.identifier = identifier; this.identifier = identifier;
@ -46,7 +47,4 @@ public enum Block {
return legacyData; return legacyData;
} }
public BlockRotation.RotationType getRotationType() {
return rotationType;
}
} }

58
src/main/java/de/bixilon/minosoft/game/datatypes/blocks/BlockRotation.java
View File

@ -1,39 +1,17 @@
package de.bixilon.minosoft.game.datatypes.blocks; package de.bixilon.minosoft.game.datatypes.blocks;
// Only for reference, will be removed very soon
@Deprecated
public interface BlockRotation { public interface BlockRotation {
int getId();
enum RotationType {
BARELY,
NORMAL,
EXTENDED
}
enum Barely implements BlockRotation { enum Barely implements BlockRotation {
EAST(0), EAST(0),
NORTH(1), NORTH(1),
SOUTH(2), SOUTH(2),
WEST(3); WEST(3);
int id;
Barely(int id) { Barely(int id) {
this.id = id;
} }
public static Barely byId(int id) {
for (Barely b : values()) {
if (b.getId() == id) {
return b;
}
}
return null;
}
public int getId() {
return id;
}
} }
enum Normal implements BlockRotation { enum Normal implements BlockRotation {
@ -44,23 +22,7 @@ public interface BlockRotation {
UP(4), UP(4),
WEST(5); WEST(5);
int id;
Normal(int id) { Normal(int id) {
this.id = id;
}
public static Normal byId(int id) {
for (Normal n : values()) {
if (n.getId() == id) {
return n;
}
}
return null;
}
public int getId() {
return id;
} }
} }
@ -82,23 +44,7 @@ public interface BlockRotation {
SOUTH_EAST(14), SOUTH_EAST(14),
SOUTH_SOUTH_EAST(15); SOUTH_SOUTH_EAST(15);
int id;
Extended(int id) { Extended(int id) {
this.id = id;
}
public static Extended byId(int id) {
for (Extended e : values()) {
if (e.getId() == id) {
return e;
}
}
return null;
}
public int getId() {
return id;
} }
} }
} }