From 24280e7649f7c9705c28f49e183728d2b8e59abf Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 13 Mar 2021 17:00:52 +0300 Subject: [PATCH] Data fixer enhancements, new textures --- .../betterend/mixin/common/ServerWorldMixin.java | 5 +---- .../java/ru/betterend/util/DataFixerUtil.java | 8 ++++++-- .../betterend/textures/block/filalux_lantern.png | Bin 0 -> 302 bytes .../textures/block/filalux_lantern_block.png | Bin 0 -> 263 bytes .../betterend/textures/block/filalux_middle.png | Bin 0 -> 227 bytes .../betterend/textures/block/lucernia_leaves.png | Bin 0 -> 241 bytes .../textures/block/lucernia_log_side.png | Bin 0 -> 265 bytes .../textures/block/lucernia_log_stripped_side.png | Bin 0 -> 220 bytes .../textures/block/lucernia_log_stripped_top.png | Bin 0 -> 222 bytes .../betterend/textures/block/lucernia_log_top.png | Bin 0 -> 282 bytes .../betterend/textures/block/lucernia_planks.png | Bin 0 -> 431 bytes 11 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/betterend/textures/block/filalux_lantern.png create mode 100644 src/main/resources/assets/betterend/textures/block/filalux_lantern_block.png create mode 100644 src/main/resources/assets/betterend/textures/block/filalux_middle.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_leaves.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_log_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_log_stripped_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_log_stripped_top.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_log_top.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_planks.png 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 0000000000000000000000000000000000000000..4a47f30b8e077f142e30cac46e5d1da7f269232c GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~rvRT2S0Ei` zZ&v7Q-yY#s5$nIdt9gHK)7@>e?(Ud*{ql_aw^zS-dg#Nu>mNVd%59s~diMX0C;vNa z?Y4RP?2pN~S>E`nW75Ofg0?_Y#7ctvf*Jl}10jvQi-9UCJY5_^B&L@3oEB;};9#hH zvBgQ5v*rK)t66T*wma0z*cong@Eq%DXr3q6Iq`1&y{fkDUjh&9jr>wjEWb3&c;)QV zcD>Tq&dYUu`Z%RK$@EGQo6yoAkJfV=I96}cNtbx~%HeYNPusuD4}46NV6244$rjF6*2UngB@xi7fyC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..824b97f5aa0033e83684a4c700628c1dff0f790d GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~tpJ}8S0Ei` zZ&v7Q-yY%CQxLJVFZ;&1>9?;heDU{?$4yc;1B*-tA z;Xg76_qr_tlqvLdaSV}|n%f`9$E?WVlIV8OtNQ=zGK1Um@9t}Hi4&1@z9_5buqffH z-is5#Sv_A@N+`O$;3%GwyllpYCTWQTy@@Uxj?UN_m-JLd=-i9C_htv@T}kY6yve;BCi6bS>0#(KIq zhDc0}?PKISpuoXgxM=PF{~s94RfL3|s(f?V!@xA@DC>Kdm^l~aKdP(F%{OXWB~X}E z*Iazp^cL&9e=$qGX18xxV00^IrF!#>b<>ZCZ0MOP%W1k+;YwHB@2hdG`bP0l+XkK*aTU+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..626abc19f676be9b81036807e486ef7f2973221b GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~=>VS)S0G(& z@376&=W>A6ogA;{J@G#_b^JRxv-Rx%gTXpafYO{LL4Lsu|DnK~Y4#PMV7{k|V~E65 z+XaPG=&EV!P{$S;`TKLlJo6=DPw>-KbU43U_s+aJxx zV93F=n(5yEW7cZFFE5#L{L50+%Eet%Pi4ElE%kM~UB{*0dhqtGIRQbZ-zvSVv#FSK zW}5oC>2qIuJhZ&NI7y2`a<}z)j@-PRwu&7KEJGJv?pOPCdP*8&#Vb|j84Grbikj%f z{IvWa|LVl7H~a2rq`q2xb}h#_X~k3jl5cN%|DHS2&g~sbWCCC5C7`nyJYD@<);T3K F0RRiDXbS)U literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cc3d3b75822fac261383486380f682af1ffbce86 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(i*Bzcd zhx~lb#Q0oH_PLqm^RUqWX?fVjRkad81*M)Yjv*3LUHciiSPXfX9%udfufG14Enied zo5c-DkJERj@*kDlaNx6GCnE>*`j;H?57@7*=QdK`5*FdL{Au;HdV!^1ZWtPt)J8UN zOI@(LXR!TqjIPkd#Z!1EG|pb#kd}LD!EgRW6Pco4I50|gvgY*v747HLzoN;Ubk5ws Q7w7;6Pgg&ebxsLQ0HZxkr2qf` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bbb0c42854b58f1d5475f10970065e017b9f077b GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(i*Bzcd zhx~lb#Q0oH_PLqm^RUqWX?fVjRkad81?8SDjv*3LeFHp&SPVHP>He?(l%OAc_NWL` zR$79CqYT3}AFkua?}@YJPFTeCDdvdfcCExK9LM;T{EbDf2k$+s>LYzSKh^p8>J2Gt zmoDUYjGwlD(S=>p9<(jmD1X|zO!UQ#?3GXMNWQ#PvoX2+wcPiZa3=kvugZ0MqL_`l T-GpWVoxtGf>gTe~DWM4fVEj>h literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d9e4f84a0a954216bd3e77cbb5ac04041a96b36b GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~^#Gp`S0J75 zYFp~*&=lm_6Ye%G+HFCC`yoG{Gci6FlYMSx`8+K2e_9@9$u~(FsFb%P$S;`TKN8So zaa;?O=>K`b^qR5dI0#3*ROVQGw_M-lbIU;GV`FQWh+_YjghTDhjdzRpo-}1z>ma&HSMjK~%DSb_`iddD zLpoprSS?cGINziWKD!y{<*hyU1&+O4N*--@jI^z7c<>A!pAv;T60Dq1d> Q1auRFr>mdKI;Vst0ElOBEdT%j literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9d911b725c397dbcfd3b73d216816f0fa46f9869 GIT binary patch literal 431 zcmV;g0Z{&lP)Px$X-PyuR5*=wQ!#GCFbupxOk^01;31webZv+BD}779+CCuYk|3}H7;+$3b%=JL zDa%31g#vXZdFRu^_s9G15E+FvptZ$qTz}%f^`>DE02J0>hz!Jl-UBNO6jtgA9wI}r z0ML2H$^xX*^#YDl!_M$IZ*l&QCtL^daLWS@qCRT{Hti zk!WpEAl~JtAKo?rM4Qet=<72ij_QM4gZwV|>3#%`2N_7OZzb9`pmLcOwT$UJFMQBi z@kRbVNcba(sP@&GHrHA*Q