diff --git a/src/main/java/ru/betterend/mixin/common/ServerWorldMixin.java b/src/main/java/ru/betterend/mixin/common/ServerWorldMixin.java index 07921ee3..afecf839 100644 --- a/src/main/java/ru/betterend/mixin/common/ServerWorldMixin.java +++ b/src/main/java/ru/betterend/mixin/common/ServerWorldMixin.java @@ -33,11 +33,8 @@ public class ServerWorldMixin { private void be_onServerWorldInit(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey registryKey, DimensionType dimensionType, WorldGenerationProgressListener worldGenerationProgressListener, ChunkGenerator chunkGenerator, boolean debugWorld, long l, List list, boolean bl, CallbackInfo info) { File beData = new File(FabricLoader.getInstance().getGameDir().getParent().toString(), "saves/" + properties.getLevelName() + "/betterend_data.nbt"); ModMetadata meta = FabricLoader.getInstance().getModContainer(BetterEnd.MOD_ID).get().getMetadata(); - String version = meta.getVersion().toString(); + String version = BetterEnd.isDevEnvironment() ? "development" : meta.getVersion().toString(); boolean fix = false; - if (version.equals("${version}")) { - version = "development"; - } if (beData.exists()) { CompoundTag root; try { diff --git a/src/main/java/ru/betterend/util/DataFixerUtil.java b/src/main/java/ru/betterend/util/DataFixerUtil.java index 99085b14..d9885a2e 100644 --- a/src/main/java/ru/betterend/util/DataFixerUtil.java +++ b/src/main/java/ru/betterend/util/DataFixerUtil.java @@ -19,12 +19,16 @@ public class DataFixerUtil { private static final Map REPLACEMENT = Maps.newHashMap(); public static void init() { - addFix("minecraft:stone", "minecraft:glowstone"); + //addFix("minecraft:stone", "minecraft:glowstone"); // Example } public static void fixData(File dir) { + if (REPLACEMENT.isEmpty()) { + return; + } + List regions = getAllRegions(dir, null); - regions.forEach((file) -> { + regions.parallelStream().forEach((file) -> { try { System.out.println("Fixing " + file); boolean[] changed = new boolean[1]; diff --git a/src/main/resources/assets/betterend/textures/block/filalux_lantern.png b/src/main/resources/assets/betterend/textures/block/filalux_lantern.png new file mode 100644 index 00000000..4a47f30b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/filalux_lantern.png differ diff --git a/src/main/resources/assets/betterend/textures/block/filalux_lantern_block.png b/src/main/resources/assets/betterend/textures/block/filalux_lantern_block.png new file mode 100644 index 00000000..824b97f5 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/filalux_lantern_block.png differ diff --git a/src/main/resources/assets/betterend/textures/block/filalux_middle.png b/src/main/resources/assets/betterend/textures/block/filalux_middle.png new file mode 100644 index 00000000..09bcde64 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/filalux_middle.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_leaves.png b/src/main/resources/assets/betterend/textures/block/lucernia_leaves.png new file mode 100644 index 00000000..626abc19 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_leaves.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_log_side.png b/src/main/resources/assets/betterend/textures/block/lucernia_log_side.png new file mode 100644 index 00000000..b2f33147 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_log_stripped_side.png b/src/main/resources/assets/betterend/textures/block/lucernia_log_stripped_side.png new file mode 100644 index 00000000..cc3d3b75 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_log_stripped_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_log_stripped_top.png b/src/main/resources/assets/betterend/textures/block/lucernia_log_stripped_top.png new file mode 100644 index 00000000..bbb0c428 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_log_stripped_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_log_top.png b/src/main/resources/assets/betterend/textures/block/lucernia_log_top.png new file mode 100644 index 00000000..d9e4f84a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_log_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_planks.png b/src/main/resources/assets/betterend/textures/block/lucernia_planks.png new file mode 100644 index 00000000..9d911b72 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_planks.png differ