diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java index f4e48125..dae46513 100644 --- a/src/main/java/ru/betterend/BetterEnd.java +++ b/src/main/java/ru/betterend/BetterEnd.java @@ -1,5 +1,9 @@ package ru.betterend; +import java.util.List; + +import com.google.common.collect.Lists; + import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.util.Identifier; @@ -50,6 +54,10 @@ public class BetterEnd implements ModInitializer { StructureRegistry.register(); FabricLoader.getInstance().getEntrypoints("betterend", BetterEndPlugin.class).forEach(BetterEndPlugin::register); + + if (isDevEnvironment()) { + printMissingNames(); + } } public static Identifier makeID(String path) { @@ -59,4 +67,36 @@ public class BetterEnd implements ModInitializer { public static String getStringId(String id) { return String.format("%s:%s", MOD_ID, id); } + + private static boolean isDevEnvironment() { + return FabricLoader.getInstance().isDevelopmentEnvironment(); + } + + private static void printMissingNames() { + List missingNames = Lists.newArrayList(); + + ItemRegistry.getModBlocks().forEach((block) -> { + String name = block.getName().asString(); + if (name.contains(".betterend.")) { + missingNames.add(name); + } + }); + + ItemRegistry.getModItems().forEach((item) -> { + String name = item.getName().asString(); + if (name.contains(".betterend.")) { + missingNames.add(name); + } + }); + + if (!missingNames.isEmpty()) { + System.out.println("========================================"); + System.out.println(" MISSING NAMES LIST "); + System.out.println("========================================"); + missingNames.forEach((name) -> { + System.out.println(name); + }); + System.out.println("========================================"); + } + } } diff --git a/src/main/java/ru/betterend/registry/BiomeRegistry.java b/src/main/java/ru/betterend/registry/BiomeRegistry.java index 97bdafe9..640b157e 100644 --- a/src/main/java/ru/betterend/registry/BiomeRegistry.java +++ b/src/main/java/ru/betterend/registry/BiomeRegistry.java @@ -144,12 +144,7 @@ public class BiomeRegistry { EndBiome endBiome = CLIENT.get(biome); if (endBiome == null) { Identifier id = MinecraftClient.getInstance().world.getRegistryManager().get(Registry.BIOME_KEY).getId(biome); - if (id == null) { - endBiome = END; - } - else { - endBiome = ID_MAP.getOrDefault(id, END); - } + endBiome = id == null ? END : ID_MAP.getOrDefault(id, END); CLIENT.put(biome, endBiome); } return endBiome; diff --git a/src/main/java/ru/betterend/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index 32cf7409..ecb93bee 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -52,12 +52,14 @@ public class BlockRegistry { public static final Block END_MOSS = registerBlock("end_moss", new BlockTerrain(MaterialColor.CYAN)); public static final Block CHORUS_NYLIUM = registerBlock("chorus_nylium", new BlockTerrain(MaterialColor.MAGENTA)); public static final Block CAVE_MOSS = registerBlock("cave_moss", new BlockTerrain(MaterialColor.PURPLE)); + public static final Block CRYSTAL_MOSS = registerBlock("crystal_moss", new BlockTerrain(MaterialColor.PINK)); // Roads // public static final Block END_MYCELIUM_PATH = registerBlock("end_mycelium_path", new BlockPath(END_MYCELIUM)); public static final Block END_MOSS_PATH = registerBlock("end_moss_path", new BlockPath(END_MOSS)); public static final Block CHORUS_NYLIUM_PATH = registerBlock("chorus_nylium_path", new BlockPath(CHORUS_NYLIUM)); public static final Block CAVE_MOSS_PATH = registerBlock("cave_moss_path", new BlockPath(CAVE_MOSS)); + public static final Block CRYSTAL_MOSS_PATH = registerBlock("crystal_moss_path", new BlockPath(CAVE_MOSS)); // Rocks // public static final StoneMaterial FLAVOLITE = new StoneMaterial("flavolite", MaterialColor.SAND); diff --git a/src/main/resources/assets/betterend/textures/block/crystal_moss_side.png b/src/main/resources/assets/betterend/textures/block/crystal_moss_side.png new file mode 100644 index 00000000..9c1308c8 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/crystal_moss_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/crystal_moss_top.png b/src/main/resources/assets/betterend/textures/block/crystal_moss_top.png new file mode 100644 index 00000000..0b21af28 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/crystal_moss_top.png differ