From 3a3bcaeeaee47cb1c222a2f826d2511c68fd599d Mon Sep 17 00:00:00 2001 From: 08draven Date: Sun, 17 Nov 2024 14:11:24 -0500 Subject: [PATCH] reicpe changes --- app/bin/main/net/xuyezo/main/Generator.class | Bin 2835 -> 2836 bytes app/bin/main/net/xuyezo/main/Handler.class | Bin 3633 -> 4025 bytes .../main/java/net/xuyezo/main/Generator.java | 15 ++-- .../main/java/net/xuyezo/main/Handler.java | 64 +++++++++--------- 4 files changed, 42 insertions(+), 37 deletions(-) diff --git a/app/bin/main/net/xuyezo/main/Generator.class b/app/bin/main/net/xuyezo/main/Generator.class index 5522a5526cf316bb235447b314e54d65afa6f78b..9e754ed8fc9808aae9b382bade9936a0a36dbf40 100644 GIT binary patch delta 1306 zcmZ8hOKcNY6g_XoGvm*Y*r8*`34~0*MEDJ%O=Fgp8{fzZ<+7)rB^rX9P$pD<**oR zZ$Ybo%b@X#S4tNyR)ZM7r{b zyfPPtCn3<|q5+L6#iuU%7+f%>o$obfNk&-v8{k4R;l(#!n zV*(}&uB|N@{1vn|rGtf*OyOa$(3&~_Q?QWf|7ZRY-3F5U+6)5HNb#Eu!;nD}5fflN zEeeNE;DyPJAy`;P--=nZ>liVMP8|dJg7pGffnvOlY~J#0FYY-{vEc2#6|)`x+M_^KD6|-@IyE&L@cu1PFtQVdQOPIt- zc|7Th19COtnWrK&s?q5PjcIfyLK7ODjnJe<=R(wXR I_|8sz0Mr$|(*OVf delta 1309 zcmYjQO>9(E7(Ms>&zna((|V^=W(N8LwvOWf!W&VGOcmRKj#>po)TCq6^c4z5QVAN< zNk|v&NO?pTCQ3<2O&}Uw80*5ViHX6jF~Nl!*SOF$U_JM~vAVhUeD}WZyXQOSdslOD z&i~=>Z@&Xj!|Tib*UP`Xo64fwMVCN%xiSzpgg+AC0Z4&hc4nb5cW!)UZZ=vFFo%Zg zDfFP%#a4mtx6aR2-hAiGnYo2Zqq#71ey%wm;6ZGQZ;KsX7KH#sY>)pGrCnL{1?b|$QSm@-5?zG)n>FA9kF;=9IaLqzc@^9yHGQG6!uv<40w#+Zxe z1UgPPFElIj&2zKr{V2dV>Lhu#$z*$|ULUTfF^WDPhcOYLfqFb`mE)_{y71%6_Q5e$ zKqmxTz-Yk67HV?e44qZf%+OuMo?d$m8G+DSMXuMDj`XDa6>@9H+gS31^wbAC;(j2kUp z!-yHC`F{MPlWz?s&jmsT&dSD}rL>S~g4_QQ5Lnq*TylkUGnti*Xvq=MQRw8CY{-Pq z^%QbkyWpT3%G<4w7~)=KT;uss`ZkGecm;V()3$kR#|8A^Q?&YV0|U5;L442sC))Tk zKl+^?-(}K0l#piW>&S4u&*Dl&g&yJqLZe|k3`3(59w8xhTPCtJdK49EZ_>QoJadr3 z4qCq5#!+ zzc<*b2_f#m7R7aVf5A4^(Xq}{!FLZN(}2t5W0PGuuly<~yYkwt!lqfFC9RLKMOsJTBZLZ>9o2$Adm0Q&JuYZd}+Si4n|dQtR0N0;CMTjP{E0IFnPuA5jwqm dLemadP_>mzr-73?dX>Kg*s7r7CSG$={{V(~)NlX* diff --git a/app/bin/main/net/xuyezo/main/Handler.class b/app/bin/main/net/xuyezo/main/Handler.class index 4a6bed3fac505a0232467f7bfd2a31340d03fe49..61662eed74b79023b3b789872717c84017ae9672 100644 GIT binary patch delta 2065 zcmaKt`EyfM6vsc8yu6pTPl{s2)KV7~OIvIQ0i~m2Xkr^klajR56iY3%KxGM*;;uo# z1rZmX8z>+usk=7S)`%cl1$V`D#=k%vfAI&`Ve!1Q4{&s7XHIUu=iPJ8z2|dYdW$k= z=YD+Tt-XMc?|XAwTrHmJh%eL{i3W0*My*MZ8H(KMNPT@E>d13ULbmJ)Mk8TI44Xu< zVofCEcf`3SQCoERf>DD8>s41lNsPQ)Vl{dR^C)G$$yKyi z`Pz7`RZ(pH>?tnIWdUs_2AAithz^5x#i&Hrl8S|EmM!b-u4qbhEpInj%o1y}){?ZV z?=-o_POjHPee(h#TUu_i!j?`A2O4VSKyw>?(S~NH+Jwm}+nXmFVzJg)p-A-{dsmmq z>a6Y$`syO#W2akVa$Qyr)CHoxOVV-1mTz;WDW zlC&Koec|e0Al%UE56p@NV|h&Ac9T0;XZ@x172dBHeZql5iA8PQor#qO8?8b2Ox@xU zgNH4TUgmm~$E@jksmEfA$yT1Qmg{~;}ZR4UNv~dT4PLdy+*IK(H9n zz~oKVNnblx2Ue`=zR_;zTPC}CTan+ny1uJpaYt8IM|(pev0O2(#QMo|PQj#RedeD+ zq5S2tiG3#T@}5=bnNV#p#%{p}Cj0Fx(qg`_-xfYJ`N$SLa+$4;_=(AB{Wn?igzK4{VXb28 zk=eb%g$q+`ib-M%aB~JljA1-pDk)?JXHhFkn6WfaOfzS5HRsSS+G56$kSA}Kc}g*n zH#ncYl<=j*`cdfogE9_Nu3Su3IY};1`BbRUl&J!ysA4Wul}uHQOjGSlSJ!ZnTE)f6 z9{gLVQfo!KgG<#$E>qi>sovuZ^$D{$Marxd)C4p}k}u!v)q3tkQKVAb#odfxyxPt^ zY(SGDFXvu1GS)3=hn8*$JiOvQ+225})tomzxd{&8H+bN0&YxI#Y&oT zDlO^N_A|yS)6>6|{Bp0BAv1z4vO~IBuBdW*-6KzD&&Yn>X>w?pnvz+QErY_iFN=5& zYaOQyTDRjInx|3v@Z2rUk|kC+em_grfn+Rhr1>}&_t>^dcTG2XsPO8}jOp1KtMUvp zCbK6K=s7kp>kU<4=sS-dJPuWtKmu0?R5kMYsTH(>g4P@=s1qeDO1=EgWxljv3CTv5 zGmkYiNjtBU=Ed18t}XJLwSyLR$q&_ww9+g54bUd9hWYFf4hQMrTWRwzvi^+izv64@>9X`#%5Q zIq4b0g^n-(y)p{Gi<`ra7E97m+tAqP3%53eeReEBy@mi53D^SRhEUeIOheFg`Wu3E zS!YN?gW_j=%X=ufIT`0xM27w~|maVATh-=f(Zl;KdhQx7ws;#W#O`H(O?`Tidw|BJ# z67AiQu3iqrQd$;pVgPSxIEAiy`jG(<%t4jnR=$AdCJOHiFp9&i6sWSglh(Y67|a{Nd(o^4^9NCBFmsMlc>ga2P0~8IeTFScsI7ke9+pq)N3sAcx>_t699%(Gk*BWgADxJh$6+_t^WSm?YIxcfKJ( z$#H}RNB{_o6;*s|AEZ``3DQHiCiL^P^W!i~`tNg5IHi&#| z6f@B#7IN<;tp;jqGpc7%6HAF&np{{#^*Cw{#$UlzUdSUR;1gUUbUxfR@w2k-LK8n# zXoPnZ*CE-XU?D!`t!*Zgv!LEafke5)p)r(5#K+*5*mD~PC2oj{zc?L%&v=*|eEuIf CMs^AS diff --git a/app/src/main/java/net/xuyezo/main/Generator.java b/app/src/main/java/net/xuyezo/main/Generator.java index e11e6df..30868f3 100644 --- a/app/src/main/java/net/xuyezo/main/Generator.java +++ b/app/src/main/java/net/xuyezo/main/Generator.java @@ -12,6 +12,10 @@ import org.jetbrains.annotations.NotNull; public class Generator extends ChunkGenerator { + public static int getHash(int x,int z) { + return (((x * 223) ^ (z * 82395) ^ (x * 9634) ^ (z * 23958)) & 0x2FF3); + } + @Override public void generateNoise(WorldInfo worldInfo, Random random, int chunkX, int chunkZ, ChunkGenerator.ChunkData chunkData) { @@ -30,9 +34,9 @@ public class Generator extends ChunkGenerator { int x2 = chunkX * 16 + x; int z2 = chunkZ * 16 + z; - if ((((x2 * 223) ^ (z2 * 82395) ^ (x2 * 9634) ^ (z2 * 23958)) & 0xFF3) == (y & (y * 7))) { - for (int a = 0; a < 3; a++) { - for (int b = 0; b < 3; b++) { + if (Generator.getHash(x2,z2) == (y & (y * 7))) { + for (int a = 0; a < 6; a++) { + for (int b = 0; b < 6; b++) { chunkData.setBlock((x+a)%16, y, (z+b)%16, Material.STONE); } } @@ -44,14 +48,13 @@ public class Generator extends ChunkGenerator { @Override public boolean canSpawn(World world, int x, int z) { - int h = (((x * 223) ^ (z * 82395) ^ (x * 9634) ^ (z * 23958)) & 0xFF3); - return (h >= 0 && h < 256); + return true; } @Override public int getBaseHeight(@NotNull WorldInfo worldInfo, @NotNull Random random, int x, int z, @NotNull HeightMap heightMap) { - int h = (((x * 223) ^ (z * 82395) ^ (x * 9634) ^ (z * 23958)) & 0xFF3); + int h = Generator.getHash(x,z); h = Math.max(h, worldInfo.getMinHeight()); return Math.min(h,worldInfo.getMaxHeight()); } diff --git a/app/src/main/java/net/xuyezo/main/Handler.java b/app/src/main/java/net/xuyezo/main/Handler.java index efc79db..2a5425c 100644 --- a/app/src/main/java/net/xuyezo/main/Handler.java +++ b/app/src/main/java/net/xuyezo/main/Handler.java @@ -21,33 +21,46 @@ public class Handler implements Listener { e.setCancelled(true); for (Block b : e.blockList()) { Location loc = b.getLocation(); + if (b.getType() == Material.STONE) { b.setType(Material.LAVA); } else if (b.getType() == Material.COBBLESTONE) { Material[] items = { - Material.COPPER_ORE, - Material.COPPER_ORE, + Material.COAL_ORE, Material.COPPER_ORE, Material.IRON_ORE, - - Material.COPPER_ORE, - Material.COPPER_ORE, - Material.COPPER_ORE, - Material.IRON_ORE, - - Material.COPPER_ORE, - Material.COPPER_ORE, - Material.COPPER_ORE, - Material.IRON_ORE, - - Material.GOLD_ORE, - Material.ICE + Material.GOLD_ORE }; - - b.setType(items[new Random().nextInt(items.length)]); + + b.setType(Material.AIR); + if (new Random().nextInt(8) != 0) continue; + b.getWorld().dropItem(loc, new ItemStack(items[new Random().nextInt(items.length)])); } else if (b.getType() == Material.GRAVEL) { b.setType(Material.AIR); - b.getWorld().dropItem(loc, new ItemStack(Material.QUARTZ)); + if (new Random().nextInt(8) != 0) continue; + b.getWorld().dropItem(loc, new ItemStack(Material.NETHER_QUARTZ_ORE)); + } else if (b.getType() == Material.COAL_ORE) { + Material[] items = { + Material.GRASS_BLOCK, + Material.GRASS_BLOCK, + Material.GRASS_BLOCK, + Material.DIAMOND_ORE + }; + + b.setType(Material.AIR); + if (new Random().nextInt(8) != 0) continue; + b.getWorld().dropItem(loc, new ItemStack(items[new Random().nextInt(items.length)])); + } else if (b.getType() == Material.NETHER_QUARTZ_ORE) { + Material[] items = { + Material.EMERALD_ORE, + Material.LAPIS_ORE, + Material.REDSTONE_ORE, + Material.ANCIENT_DEBRIS + }; + + b.setType(Material.AIR); + if (new Random().nextInt(8) != 0) continue; + b.getWorld().dropItem(loc, new ItemStack(items[new Random().nextInt(items.length)])); } } } @@ -61,7 +74,7 @@ public class Handler implements Listener { ItemStack i = p.getInventory().getItem(p.getInventory().getHeldItemSlot()); - if (i != null && !i.isEmpty()) + if (i != null && !i.isEmpty() && b.isPreferredTool(i)) return; Location loc = b.getLocation(); @@ -71,8 +84,6 @@ public class Handler implements Listener { if (b.getType() == Material.STONE) { e.setCancelled(true); b.setType(Material.COBBLESTONE); - - b.getWorld().dropItem(loc, new ItemStack(Material.GRAVEL)); } else if (b.getType() == Material.COBBLESTONE) { e.setCancelled(true); b.setType(Material.AIR); @@ -81,18 +92,9 @@ public class Handler implements Listener { Material.GRAVEL, Material.GRAVEL, Material.SAND, - Material.SAND, - Material.CLAY_BALL, - Material.CLAY_BALL, Material.RED_SAND, - Material.GRAVEL, - Material.GRAVEL, - Material.SAND, - Material.SAND, Material.CLAY_BALL, - Material.CLAY_BALL, - Material.RED_SAND, - Material.IRON_NUGGET + Material.CLAY_BALL }; for (int j = 0; j < 3; j++) {