From 79520978ad76bad92977734ff32f4b2a4e4ac7a9 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 25 Oct 2020 22:46:08 +0300 Subject: [PATCH] Missing names list --- src/main/java/ru/betterend/BetterEnd.java | 40 ++++++++++++++++++ .../ru/betterend/registry/BiomeRegistry.java | 7 +-- .../ru/betterend/registry/BlockRegistry.java | 2 + .../textures/block/crystal_moss_side.png | Bin 0 -> 2151 bytes .../textures/block/crystal_moss_top.png | Bin 0 -> 1992 bytes 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/betterend/textures/block/crystal_moss_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/crystal_moss_top.png 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 0000000000000000000000000000000000000000..9c1308c8c1ee070115ae7a45f7106f4824c68f97 GIT binary patch literal 2151 zcmbVOdr;GM9Iqf#K$IyH&f8{)Pn0xinx<_=VM;|{l$RCo@rP-WwpnS@HGvj(PUqaz zO*c5_1D_KW&ndd|JfA~lD!Q8w5Je}Vhllf=yW`+=f~U9r0;R(pI&ZzE`6c=MKA+F` zk?(aycIM28urXl@g(4y?)tC#;k@7J#2>h0n+evT=b*Ih|6^igt@-axUVN;Ak5z@e$ z3#0;52E_qFnShFN`w-86d-VN5)JvBg)Wiu8Q>mX3asVZC=B&LB!>Z>CJRCZrfeu# z@NkeuNg|Ajz#*+(sUk5wPQ*hvrqZIA7FDScOhsWNrPf3K4-C{itd+_&ruenMl>xR( zlAA(Nuh*;es+EGrhN|>>J&NHdjw1kph$SwG_8~5DTpxpx6B!ThmUzJh$&9o`D3S~? zaM~M!(;c97iT*T!grPp#jjEKG98wREWdb;Nk*BanoMlk1kaKb_Nd#C`0PD63k|5fJ zmrw^DzaRioYcd5i2K3@|1|&pjMllG(pO693qPfJ)p}CwW6nPkKMlrBCPL9S+C3`qp z5DC{d#cAsS^Iaw}@4w{_LyI8?1#`W978EJ_#z&M6u2&P4F+^o`2;7e$xVrmM* zdZ8wP<*g9+>LCn09wsEN2WrLwWCaGkh zQ1Ad@;7;A+!epY-T%ts~7%t6dfI-+wo@Xfr*U=hA#Ud6$V?}fv!6JG!u0?b-#t<}4 zYjqsnx8Eo*MRIZF{k?t83Jl=*N0qQ>36j8BgrxN#9UMUbN)>@vXpGb9aShGr$Ue3# z4-Z~7y0Aa1?1}}9Iu*uXYLZ4siy(`+Dj zuhU=X%lwOU@vGgxUNw7d^>aUPKmJem{^T%r+GXRw1Vv#v9#oz+y`@3_UA3NP{pM01 z91J^o8JM!*A~2^p7ohflDg4v=#*GR^P(qqj&2F0y>l(ez+itjjOGHabyfrP_k(KN>U(}ViK6%>MarH#r#4{qE*bzA*dcnEX z9V}j6bvI~IWaQf1uUZS(T}OhAWf8-_9Q5{mO5Zd{VC3)|tQWPpT=aCM8VU z1jS|jGGy7B;{Dr~ceXt`cx!K0&57FciCZr;%`Hkig`o34JhbszlBUzg6-|ku7w#Ro z=7YK2mmW7~KRs|bVp&jhWhPebm={alc&C7U-Zbm><+z43+qTs{INKd=UO~s$77(>h zgSvvNy^EeKo7wj3#Yt}_4x93QXinYQ$C<%#kq0KHl^?lzBfRTbEO~JM*fWF6_ud=3 z*>qu1ylY9>rY#}02dc42zJ%KicbNEv%A<={|M>ie9LMu7Lvw6HF4ni7EO?{!+Ua(& z!<@3A@#1f;?Mu^(i_5pPJwC2IrFj3{_?FXI8J*Uas!fig&#I2yOJ5v}=T6vTKR%}W z(TTEoKUY-oW{s0vk5uUrm47)B~~2G!>sKG~Y| zHXifvZe&Yq+rzw1e~;a5o?SZiI`P(Y>ADzS8$3TZDe8V$4E!W literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0b21af28f7735ec8b08d1b299029bd536d1d73e2 GIT binary patch literal 1992 zcmbVN4NMbP9Pbzg#81!=aiHh9DGKdfTiVi-ia-_WEHns6oj8uWE4}sO>fM#LsN4Jq zMr4A^&i-9;N!Vy>q76qIZvz0-dD$v7=aBKcE1OgriYf^y;yg(pZs{@iK zngC=Xxeyb_NC1UWB$mTUNlY{#fyD|4RzPB@5Edh_9FZyk?*nquXxxCLtCx9YaXS@g zWLX;mK@NvQHYDK}|3iP1;zJvI0CKnn&4L z7078iYJ$b)qqQ<#H*pSwoTv>Fi(uX)4-m(EIGdd|dxYZ{M3@N+VPzQ(EB0YIFKM+t z_zP(*79W~nmlkjud2M?kn#pk42q>LkC_9Z2OA9!ObH^0387Y=xjMP8a;XC$OV?&Z? z0%a*WgQCo1fzpk!07*%FU}AyDRiqWC9Lxezt;B;<2me3^`bIQ=2M8b?im{%)n`>@Sr&2ItxV zzx4GXZsY4@gq3SwG}os(4wRJ$1b*u^>V%BQUBdLAt(SDuA3SWqnUY@l__`BwxJ zlrN8(TKeIQkEZm7jdb?xKYXi>%^at#_=Ot@VSZfu=oMyGZvBTSHxQp!+qEtLeewQUS9|d8x!3Oum(+y;$3NXNTx1B}H+#!=utOKoF&tgm zl%qX%Zt4Zo>dU_mhD?}u`>5QM5YC>IyZzU!nA}}3Ts}^JB&PMv(bYTLA$>TsXSg&+i}VilDJ>x?Cy)-ksH`}xv;sh zMRsLY_-7lF-`82}_TVd#PhWrZY|znMv#(SXEL4~E&j{_#n|T@ypV7K4`R*TA+@Zv* zx{>&MWa5o4rXkN8`<_gW367oR8ai}D@yj87X7IU#HCJ1ttFPY*eQ@I^N_Tk2+rpc& QtNg!KvouwGG%