From b164b66297e4fc1b41e7d3445d59117aaaf44f58 Mon Sep 17 00:00:00 2001 From: Jkibbels Date: Sun, 1 Sep 2024 19:29:38 -0400 Subject: [PATCH] merge fix --- .../EventMgr/ServerTickListener.java | 5 +--- .../Utils/ServerTickListener.java | 25 ------------------ .../textures/item/money_block.png | Bin 0 -> 1471 bytes .../loot_tables/blocks/money_block.json | 2 +- 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java create mode 100644 src/main/resources/assets/keeblarcraft/textures/item/money_block.png diff --git a/src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java b/src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java index 48c9579..1ee6032 100644 --- a/src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java +++ b/src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java @@ -1,8 +1,5 @@ -<<<<<<<< HEAD:src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java + package jesse.keeblarcraft.EventMgr; -======== -package jesse.keeblarcraft.Utils; ->>>>>>>> d94f405 ([5] Initial implementation of some attribute stuff. Nothing in this commit actually works but the game still launches! Will need to move item and armor stuff to a more generic file as well to make it less unique so it can be used broadly. Directory structure extended to add items and resources):src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java import jesse.CommonServerUtils; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; diff --git a/src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java b/src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java deleted file mode 100644 index 48c9579..0000000 --- a/src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java +++ /dev/null @@ -1,25 +0,0 @@ -<<<<<<<< HEAD:src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java -package jesse.keeblarcraft.EventMgr; -======== -package jesse.keeblarcraft.Utils; ->>>>>>>> d94f405 ([5] Initial implementation of some attribute stuff. Nothing in this commit actually works but the game still launches! Will need to move item and armor stuff to a more generic file as well to make it less unique so it can be used broadly. Directory structure extended to add items and resources):src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java - -import jesse.CommonServerUtils; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; -import net.minecraft.server.MinecraftServer; - -// This interface is responsible for the end tick of a server world event tick -public class ServerTickListener implements ServerTickEvents.EndTick { - CommonServerUtils config = new CommonServerUtils(); - @Override - public void onEndTick(MinecraftServer server) { - if (server != null) { - config.SetServerInstance(server); - } - } - - // Static method to register the server tick listener - public static void InitializeServerTicks() { - ServerTickEvents.END_SERVER_TICK.register(new ServerTickListener()); - } -} diff --git a/src/main/resources/assets/keeblarcraft/textures/item/money_block.png b/src/main/resources/assets/keeblarcraft/textures/item/money_block.png new file mode 100644 index 0000000000000000000000000000000000000000..a6c71a53c2585d25ee778c7d7ebae5cd3353a616 GIT binary patch literal 1471 zcmV;w1wi_VP)rc4wyF9M&ds;c`H;@kpt8Zd=oD_wW66_e{UNviZv^ zYNyKl^@H#7tKa;H{r)V9h13EbD4+(6W7vfL>6pE99^GY+)E9pDwYSK^Pkw4L#lQQD zpGlT@J98>U%z%?;w+Q~6qR9Z_Dw>u+Kka+i@Ywlk%Kin*pys3I(`TjSi-#I~xOoGB z<%PvV#cyssI8@w0tY1=)lv;fkOacaopH5yq=&UIFXOyUBpGy9?V-P?gQHK*ndrj2& zPc=$QN?KD~HO)=v=Y>s2<87WM5n*Ikz zK}1<-Zu9EpUsJEQ4m?&cjv(k_OhTm-a`~2UD19;*W5KgZeJ0}Nm#(rj ze;rST7#U*B5d4V!*%A-u=9ukxymkX#|2w>T17_OC-vBEDV#br*un)OZdWR@nryJDh zRj1i&F7xQ}3f+Yg{%xVshw=~>ThQ3gTYh$|0+I@@2jQ)lm$t7H*pFB{S?12l0$Tev zy`?48R1gQ@2y6oLyYR|Qm$&}R*mxiWfrBlf^fzVkQ34iPD0k;JFw@tm@CIMGQRfGL zG%U5iONAhTZ>=5w&!HU+z_&mI48Tj3d6)3oePwi8xwd+nm3#Mi{SW7;cLjO8?L{FR zW;?|l1#B`B#0Y9ZLqSnORZh1P7XFlSW;Whb{*(L@M34UpFmWWf6vS5~01q&# z7*(c*j&FXn&nw&SWAux62m&xp00EkUSs9z~1Oco|nNNR9nOk}4{M;~MS@BAWX(;Ih zp!(n6cB4IfTF>m@xMTJ4mrQ}k7o2Yh#Ss9aiX!w)l}M+@jSk=>f&*3EVVOi#cUa_m z4}PBMI46JkA&u(Cr0Qe55zEbMT$uhnHLp#t-Y4-LDh_c%xf62n+8NHQEmIqXST$7N zemmDUsRg*QFn_4vt6STgm|0_|bB<1b8B`c*NNsM7xPBMsyYbqRamkrfhWvAGhet~_ zE^3XXJMpCR`M(Om?O`os( zCnl3c1~MDa-(5vaOr^YyF)_8uIwjM=4GcKJMS|;C(w0y9s6^WGaHMQ$n}=R$GFfCG zvjI0-ZxDGFP^=jew^oqk5_RJfj12xDz~8SB^aD(4+0z~^=@N=hSu+oxnam1oY_J;O z0ERumB4|AAP5ME724Y8zS{$!9uFpwLpJ?cJNSP4Ukn=aj4*^GoYy@r zX+l$aV3clV9X>Oe4fyfS2L!cKI1CBG6bV&E&yDf%06wGDiy^ZCRToiV zIR2qR+z*NR4a9Q23~j+=K9%W zHozqT?T=5g_wN-tn{&k75OoHz4wrg_Gi|CTk8T~2*?__B68+s%wAU9&`lZKL>Vl{P zXAqHb4RJ)T4l*0iyMK;2o&prF6ys74&yNXDv}v5bOEBF%vdJ?E1G?L1DbEgRu5KVU z1yRb)E>jCFO3e;lkpFrAd1N*qY&>9UQK_H4M|q|_KJa)cVvfgu2A0QF-C=2*{t(ZP z(B2M%D4C?T7lOQZeLd4uz4`LW5#HgS&G6dO<_RZ0`jIXAa4PAQy7r9fV?RT$Xh_(jPC=!099Q