MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/paulevsGitch/BetterEnd

Browse source
This commit is contained in:
Aleksey 2020-10-23 15:37:44 +03:00
commit 0c36cb3b9e
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -8,7 +8,7 @@
loader_version = 0.10.1+build.209 loader_version = 0.10.1+build.209
# Mod Properties # Mod Properties
mod_version = 0.3.2-alpha mod_version = 0.4.0-alpha
maven_group = ru.betterend maven_group = ru.betterend
archives_base_name = better-end archives_base_name = better-end

26
src/main/java/ru/betterend/world/structures/StructureWorld.java
View file

@ -112,10 +112,17 @@ public class StructureWorld {
public Part(CompoundTag tag) { public Part(CompoundTag tag) {
ListTag map = tag.getList("blocks", 10); ListTag map = tag.getList("blocks", 10);
ListTag map2 = tag.getList("states", 10);
BlockState[] states = new BlockState[map2.size()];
for (int i = 0; i < states.length; i++) {
states[i] = NbtHelper.toBlockState((CompoundTag) map2.get(i));
}
map.forEach((element) -> { map.forEach((element) -> {
CompoundTag block = (CompoundTag) element; CompoundTag block = (CompoundTag) element;
BlockPos pos = NbtHelper.toBlockPos(block.getCompound("pos")); BlockPos pos = NbtHelper.toBlockPos(block.getCompound("pos"));
BlockState state = Block.getStateFromRawId(block.getInt("state")); int stateID = block.getInt("state");
BlockState state = stateID < states.length ? states[stateID] : Block.getStateFromRawId(stateID);
blocks.put(pos, state); blocks.put(pos, state);
}); });
} }
@ -127,7 +134,6 @@ public class StructureWorld {
void placeChunk(Chunk chunk) { void placeChunk(Chunk chunk) {
blocks.forEach((pos, state) -> { blocks.forEach((pos, state) -> {
//if (pos.getY() > 10)
chunk.setBlockState(pos, state, false); chunk.setBlockState(pos, state, false);
}); });
} }
@ -138,12 +144,26 @@ public class StructureWorld {
tag.putInt("z", z); tag.putInt("z", z);
ListTag map = new ListTag(); ListTag map = new ListTag();
tag.put("blocks", map); tag.put("blocks", map);
ListTag stateMap = new ListTag();
tag.put("states", stateMap);
int[] id = new int[1];
Map<BlockState, Integer> states = Maps.newHashMap();
blocks.forEach((pos, state) -> { blocks.forEach((pos, state) -> {
int stateID = states.getOrDefault(states, -1);
if (stateID < 0) {
stateID = id[0] ++;
states.put(state, stateID);
stateMap.add(NbtHelper.fromBlockState(state));
}
CompoundTag block = new CompoundTag(); CompoundTag block = new CompoundTag();
block.put("pos", NbtHelper.fromBlockPos(pos)); block.put("pos", NbtHelper.fromBlockPos(pos));
block.putInt("state", Block.getRawIdFromState(state)); block.putInt("state", stateID);
map.add(block); map.add(block);
}); });
return tag; return tag;
} }
} }