From fa2dee3d77ee9a2e37347311b8ca31b273b892ca Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 24 Jan 2015 22:03:30 -0500 Subject: [PATCH] Fix all worldgen issues. Use 1.8 textures. Implement 1.8 block pillars. Closes #168 Closes #159 Closes #130 --- .../java/com/cricketcraft/chisel/Chisel.java | 21 ++++--- .../com/cricketcraft/chisel/Features.java | 9 ++- .../chisel/world/GeneratorChisel.java | 54 ++++++++++++++---- .../resources/assets/chisel/lang/en_US.lang | 3 + ...PillarSide.png => andesitePillar-side.png} | Bin ...tePillarTop.png => andesitePillar-top.png} | Bin .../blocks/andesite/andesitePolished.png | Bin 0 -> 850 bytes .../blocks/andesite/polishedAndesite.png | Bin 747 -> 0 bytes .../textures/blocks/diorite/diorite.png | Bin 721 -> 984 bytes ...ePillarSide.png => dioritePillar-side.png} | Bin ...itePillarTop.png => dioritePillar-top.png} | Bin .../blocks/diorite/dioritePolished.png | Bin 0 -> 887 bytes .../blocks/diorite/polishedDiorite.png | Bin 610 -> 0 bytes .../textures/blocks/granite/granite.png | Bin 607 -> 979 bytes ...ePillarSide.png => granitePillar-side.png} | Bin ...itePillarTop.png => granitePillar-top.png} | Bin .../blocks/granite/granitePolished.png | Bin 0 -> 804 bytes .../blocks/granite/polishedGranite.png | Bin 508 -> 0 bytes 18 files changed, 65 insertions(+), 22 deletions(-) rename src/main/resources/assets/chisel/textures/blocks/andesite/{andesitePillarSide.png => andesitePillar-side.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/andesite/{andesitePillarTop.png => andesitePillar-top.png} (100%) create mode 100644 src/main/resources/assets/chisel/textures/blocks/andesite/andesitePolished.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/andesite/polishedAndesite.png rename src/main/resources/assets/chisel/textures/blocks/diorite/{dioritePillarSide.png => dioritePillar-side.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/diorite/{dioritePillarTop.png => dioritePillar-top.png} (100%) create mode 100644 src/main/resources/assets/chisel/textures/blocks/diorite/dioritePolished.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/diorite/polishedDiorite.png rename src/main/resources/assets/chisel/textures/blocks/granite/{granitePillarSide.png => granitePillar-side.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/granite/{granitePillarTop.png => granitePillar-top.png} (100%) create mode 100644 src/main/resources/assets/chisel/textures/blocks/granite/granitePolished.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/granite/polishedGranite.png diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 10e5cfb9..0aad18e9 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -126,11 +126,12 @@ public class Chisel { NetworkRegistry.INSTANCE.registerGuiHandler(this, new ChiselGuiHandler()); - registerWorldgen(Features.MARBLE, ChiselBlocks.marble, Configurations.marbleAmount); - registerWorldgen(Features.LIMESTONE, ChiselBlocks.limestone, Configurations.limestoneAmount); - registerWorldgen(Features.ANDESITE, ChiselBlocks.andesite, Configurations.andesiteAmount); - registerWorldgen(Features.GRANITE, ChiselBlocks.granite, Configurations.graniteAmount); - registerWorldgen(Features.DIORITE, ChiselBlocks.diorite, Configurations.dioriteAmount); + addWorldgen(Features.MARBLE, ChiselBlocks.marble, Configurations.marbleAmount); + addWorldgen(Features.LIMESTONE, ChiselBlocks.limestone, Configurations.limestoneAmount); + addWorldgen(Features.ANDESITE, ChiselBlocks.andesite, Configurations.andesiteAmount, 40, 100, 0.5); + addWorldgen(Features.GRANITE, ChiselBlocks.granite, Configurations.graniteAmount, 40, 100, 0.5); + addWorldgen(Features.DIORITE, ChiselBlocks.diorite, Configurations.dioriteAmount, 40, 100, 0.5); + GameRegistry.registerWorldGenerator(GeneratorChisel.INSTANCE, 1000); proxy.init(); MinecraftForge.EVENT_BUS.register(this); @@ -139,9 +140,15 @@ public class Chisel { FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.chisel.compat.WailaCompat.register"); } - private void registerWorldgen(Features feature, Block block, int amount) { + private void addWorldgen(Features feature, Block block, double... data) { if (feature.enabled()) { - GameRegistry.registerWorldGenerator(new GeneratorChisel(block, 32, amount), 1000); + if (data.length == 1) { + GeneratorChisel.INSTANCE.addFeature(block, 32, (int) data[0]); + } else if (data.length > 1 && data.length < 4) { + GeneratorChisel.INSTANCE.addFeature(block, 32, (int) data[0], (int) data[1], (int) data[2]); + } else if (data.length == 4) { + GeneratorChisel.INSTANCE.addFeature(block, 32, (int) data[0], (int) data[1], (int) data[2], data[3]); + } } } diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index bd95546d..92356f19 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -119,7 +119,8 @@ public enum Features { BlockCarvable andesite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); andesite.carverHelper.setChiselBlockName("andesite"); andesite.carverHelper.addVariation("tile.andesite.0.desc", 0, "andesite/andesite"); - andesite.carverHelper.addVariation("tile.andesite.1.desc", 1, "andesite/polishedAndesite"); + andesite.carverHelper.addVariation("tile.andesite.1.desc", 1, "andesite/andesitePolished"); + andesite.carverHelper.addVariation("tile.andesite.2.desc", 2, "andesite/andesitePillar"); andesite.carverHelper.registerAll(andesite, "andesite"); Carving.chisel.registerOre("andesite", "andesite"); } @@ -549,7 +550,8 @@ public enum Features { BlockCarvable diorite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); diorite.carverHelper.setChiselBlockName("diorite"); diorite.carverHelper.addVariation("tile.diorite.0.desc", 0, "diorite/diorite"); - diorite.carverHelper.addVariation("tile.diorite.1.desc", 1, "diorite/polishedDiorite"); + diorite.carverHelper.addVariation("tile.diorite.1.desc", 1, "diorite/dioritePolished"); + diorite.carverHelper.addVariation("tile.diorite.2.desc", 2, "diorite/dioritePillar"); diorite.carverHelper.registerAll(diorite, "diorite"); Carving.chisel.registerOre("diorite", "diorite"); } @@ -885,7 +887,8 @@ public enum Features { BlockCarvable granite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); granite.carverHelper.setChiselBlockName("granite"); granite.carverHelper.addVariation("tile.granite.0.desc", 0, "granite/granite"); - granite.carverHelper.addVariation("tile.granite.1.desc", 1, "granite/polishedGranite"); + granite.carverHelper.addVariation("tile.granite.1.desc", 1, "granite/granitePolished"); + granite.carverHelper.addVariation("tile.granite.1.desc", 2, "granite/granitePillar"); granite.carverHelper.registerAll(granite, "granite"); Carving.chisel.registerOre("granite", "granite"); } diff --git a/src/main/java/com/cricketcraft/chisel/world/GeneratorChisel.java b/src/main/java/com/cricketcraft/chisel/world/GeneratorChisel.java index c03eb7d8..75e9b5e2 100644 --- a/src/main/java/com/cricketcraft/chisel/world/GeneratorChisel.java +++ b/src/main/java/com/cricketcraft/chisel/world/GeneratorChisel.java @@ -1,34 +1,64 @@ package com.cricketcraft.chisel.world; +import java.util.Map; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; + +import com.google.common.collect.Maps; + import cpw.mods.fml.common.IWorldGenerator; public class GeneratorChisel implements IWorldGenerator { - WorldGenMinable gen; - int amount; + private class WorldGenInfo { - public GeneratorChisel(Block block, int count, int am) { - gen = new WorldGenMinable(block, count); - amount = am; + private int amount; + private int minY, maxY; + private double chance; + + private WorldGenInfo(int amount, int minY, int maxY, double chance) { + this.amount = amount; + this.minY = minY; + this.maxY = maxY; + this.chance = chance; + } } - protected void genStandardOre(World world, Random random, int x, int z, int bot, int top) { - for (int l = 0; l < amount; ++l) { - int i1 = x + random.nextInt(16); - int j1 = bot + random.nextInt(top - bot); - int k1 = z + random.nextInt(16); - gen.generate(world, random, i1, j1, k1); + public static final GeneratorChisel INSTANCE = new GeneratorChisel(); + + private final Map map = Maps.newHashMap(); + + public void addFeature(Block block, int count, int amount) { + addFeature(block, count, amount, 40, 128); + } + + public void addFeature(Block block, int count, int amount, int minY, int maxY) { + addFeature(block, count, amount, minY, maxY, 1); + } + + public void addFeature(Block block, int count, int amount, int minY, int maxY, double chance) { + map.put(new WorldGenMinable(block, count), new WorldGenInfo(amount, minY, maxY, chance)); + } + + protected void genStandardOre(WorldGenMinable gen, WorldGenInfo info, World world, Random random, int x, int z) { + for (int l = 0; l < info.amount; ++l) { + if (random.nextDouble() < info.chance) { + int avgX = x + random.nextInt(16); + int avgY = info.minY + random.nextInt(info.maxY - info.minY) + 1; + int avgZ = z + random.nextInt(16); + gen.generate(world, random, avgX, avgY, avgZ); + } } } @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - genStandardOre(world, random, chunkX * 16, chunkZ * 16, 40, 128); + for (WorldGenMinable gen : map.keySet()) { + genStandardOre(gen, map.get(gen), world, random, chunkX * 16, chunkZ * 16); + } } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index cf7e3b8c..a0ea9dee 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -52,16 +52,19 @@ tile.antiBlock.gray.desc=Gray Anti Block tile.diorite.name=Diorite tile.diorite.0.desc=Generates in your world tile.diorite.1.desc=Polished Diorite +tile.diorite.2.desc=Diorite Pillar #Andesite tile.andesite.name=Andesite tile.andesite.0.desc=Generates in your world tile.andesite.1.desc=Polished Andesite +tile.andesite.2.desc=Andesite Pillar #Granite tile.granite.name=Granite tile.granite.0.desc=Generates in your world tile.granite.1.desc=Polished Granite +tile.granite.2.desc=Granite Pillar #Auto Chisel tile.autoChisel.name=Auto Chisel diff --git a/src/main/resources/assets/chisel/textures/blocks/andesite/andesitePillarSide.png b/src/main/resources/assets/chisel/textures/blocks/andesite/andesitePillar-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/andesite/andesitePillarSide.png rename to src/main/resources/assets/chisel/textures/blocks/andesite/andesitePillar-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/andesite/andesitePillarTop.png b/src/main/resources/assets/chisel/textures/blocks/andesite/andesitePillar-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/andesite/andesitePillarTop.png rename to src/main/resources/assets/chisel/textures/blocks/andesite/andesitePillar-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/andesite/andesitePolished.png b/src/main/resources/assets/chisel/textures/blocks/andesite/andesitePolished.png new file mode 100644 index 0000000000000000000000000000000000000000..a77809c04b651d9f92c7ee1347cdd71823c5453c GIT binary patch literal 850 zcmV-Y1FigtP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*)C z4FU`k#3eKU0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~00081 zNklf;WlDS z#(tku*C5kWW3mK9$uzD=k~>zbdyFxJ0759nVF487?!e)2U>sAHMIvQ}-tSAsX+}!W zNy;z|9Dg-bWd#UAh$x+4?Tx0LS!PR&f+UfYWsbgFt~5=@hlhKV>WBdzK4d7p5JR9S zN~USYFtk`3P|72O!#T<2az!U;%6?x#1lY3K7}~Z+IE!}*>sp+xQCj2Nf^%T4qb%2~ zRt7Bv6x*E5T5~$rH0_KKn&!H&+hxQkSg&`i*9lifjG3920Q5}LgbvZswFCVv5`w~e zfmtQw`GycAN(lO4V4Nhx$n6Hk?8vee)ATP=NvNtFZ9C$8k6^~xj$&I-RU4Y7;nwxU z0Oxa!lnK)msOu|PmY}mt5@SnMc|zE7yA9-N&d~Qb@5u8UYb`N49zWi*zuVFemaeq` z=&rLIk2Rk^e`1;xN=0IDRQnR=Jl=bx6kM-2#%bpDwMI(8;ZX4WV$o^3X0zGz{Bowq zJz53Oir;T%v{VS8kTTNu17)>kWipzkPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0$fQ%K~y+T9gIjzpZbY$(&@8Js;2e9&5RJEX&3H{rz^k*=))` ze_waIm-TwJTrT(f?cLqodi}KDm&@hj^ULP?y0F%p1s6g}!MSEkNMW>&36-3i>2!wZ z`|9VfX;EZK4IJl#wO*I=`83O}xiDvEgKqbS5IRlsaXMj41p%rkN{!MZ{I%`6_3-fE z`-0M*4n3`XW2oyg&Xts*kQy=ILBH>XAx02Y!fLfp(om)dQKM0o=My0eswx!^hfK;i z&wuB6K}h6zs@ZH=@9(dk7Z4I~fnxgnVt~0B(?Uc(!7v1bo=04lG8UYlf2%s2oLmAx zX;(@&3`soVQN(7mY&^b22LMnUW*+L=wrxQyN)@Uq9f1{;Tm+N~sW@YJ2-o!o1OMXU zJ7ny1+7{$buJWRoav>Q2x$bsd4nQg5czkm+L6amA=#SfRstzkkLli~?mQ*83A*BHW zWfJ*8px}=&ahgtQwVJitt+H&^?fS0g`5s}6Bv%t?b$L02C!ntgD;W$SkhNjGy_IQd zq#WXFzfU-i@dBrD)O7&^M@&)7FgC!dgtC0<^#))_(_5uNDKs_$9meA<%W@b3aS%Z~ zpJ%PF)ks^$BG(IyA(8Q-i29UcZuEi8y&hO2B%{3Rl3MMv_58emJHAhn1goY_Py0|1 z#91~;l4=ZCj{Q?=q;=*vM^+S#j*r`||Ci%54iD{S^QhH2f=AG#)2X-H2aU$ZR_l{( dAJo6p{{ah_kqLrZ@_+yU002ovPDHLkV1hQFP0#=U diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/diorite.png b/src/main/resources/assets/chisel/textures/blocks/diorite/diorite.png index c833ac926b78daad6d349143389c9321721da833..711c838b30d14baa52a99f9089ffd45d56fcf7fc 100644 GIT binary patch literal 984 zcmV;}11J26P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*)3 z2^S`X%k7{500US_L_t(I%T1A6Pnrh+h9Bf4^P|<)0V+CB2f7w*Y@5a{wv`)CUDHF- z_ybH9(_i47*GvDv(zV&TG@3Or?!qV%s?}@_>J&t@s2@5r4j-0^B8bRg7pBRcAMhsc z^T=Mj_@&s~+=RhkARa#e;Mubu85$bGWcrG+u|H6$l!QVdEEWq!V=bTY`FzN)UbPLI zOlESq0t*XnLZJ`?0|U6-i)b_&pvaXg&8XFC#>dCW<#O!q?l3()MNdyJvc<)fqR;08 zpt-pTfM_%dz{yD(t@Z+bzaO1W4?t9zOCr=)sNF)wPr_&UR1?J}FsjR$=)oR7%a-mYGNG6Z4+dI)} zzhGiw3Yn~g!NDI;C{%20Y$2PNa1@Ssvf@FdQd3)7gT-Ru=qO1hb4nudiEucI!!gP8 z=Rc83Wtg0tLf+o~-LTPEO(gO!F4qj*-CbBL7GA#mnOv@bMx)`)o8MVm^YQfQAbov( zjE#*`C=@UnYtJu8lEl4xJ>>I6lF1{|=`?3&c>tD||E9IIg_@dbVzD>?9?uF54GoB* zh+L=B4eRv=W@l%S%S$LJQBWupSzYxa2m&oFHoRUh+uK1TNy6!L(As*9ii!#ZK|s;b z(ZS(ik{dT}Qd#*W@8AE0-QI~(sl@O16AbQPw|5eWM5wB&;^ZWaBuQMqevN1}c0Q0! zpYZC{uQW9^5sgOBY6T=oqPMq)OP4Ma2m}yCk@fX;N=r+z*=&rAj3NjZ&MTx+$D~q8 zOeQnCyL(8I#I0L5+1%X1Y&N0QYB@emk004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyIGf6~2R7gwhmETJn zK@foVzZ9RP=$mPvFN!Y`L{YRwBMttDq(McLNE2hCAWG4kCUTdkG$zIdB4|%fRIcy+ zjw!x|dFb20u*~j!vpX|8cWaiGR!&Z=+uL@zY$MCdDaWb3yu6~M(`yqGQ<=X<2S?}URRoh*RlJGC#^4|< zt5PWJH5&hdA{@$%kS{espjp)N!6m=@prlgiLSY{rGyb0EQFItaawl*tZwLXiEKN^; zK0PgSZwNH`;y}YtQ0V)6mwmOo+1V*ZB2kX2*Bjg0S=xZSxIKJqyT(R9fI7)D298ylO$!y}kE_Uh^FMc(CXj0N5)|e5*y78=s^!D? zperA~2jP2wLM&2NHkF`MeE1%8<-_-&EB~M0gR=b>6c(^md3)WA00000NkvXXu0mjf DVE8@( diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/dioritePillarSide.png b/src/main/resources/assets/chisel/textures/blocks/diorite/dioritePillar-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/diorite/dioritePillarSide.png rename to src/main/resources/assets/chisel/textures/blocks/diorite/dioritePillar-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/dioritePillarTop.png b/src/main/resources/assets/chisel/textures/blocks/diorite/dioritePillar-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/diorite/dioritePillarTop.png rename to src/main/resources/assets/chisel/textures/blocks/diorite/dioritePillar-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/dioritePolished.png b/src/main/resources/assets/chisel/textures/blocks/diorite/dioritePolished.png new file mode 100644 index 0000000000000000000000000000000000000000..8b4f8e35525f0d9a4f77a52e1be9b958a3d4ee71 GIT binary patch literal 887 zcmV--1Bm>IP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*)3 z2sIq#w-^Ng00Q?(L_t(I%TlIP z-c-Bfe^K=htP)aH^@36jIic=U(vEDU=}OU-FYGu832{Dmfts!72b}kL&pFo&<8XZa zdIDLN>2xju*xlV_Yio05~}*B1r+-?F#^AXXiOR zJwp_|lu9L1sRcfLIwhCO5e`RKUS7g9O-7?J*UIJU`0VU&0P^`G;J+(3ZY=Zh<6jI0 z0}_cO0Div@MG5lm-R~S8zQW_WF8TZsnifUZ)98A7f*1-Z%+1ZCsw(aF1=*}Yx7(vq zIp^}Si)~v7$H&JM3diVrn&EJW;ho?`U5e|p3ZF^$cYBl-4giIzwBoYI_ zacoS}MAJ0N6#!?e+z$ ztE;3^3ph@LNMwd)vxTmw(X=S#a*al#g{N9QXJ==J#l=N7H}BxOJ#5>?X|YUp|zMUm-rI^4bcJy+%;ilT7;{*P3v)>jRD{(Oq(<;(rad@buL zn0|jqK7T~JeL*xDVSRm_a=FH6G~)5&M`+qCk`y2wkK=jp;3oiX-TIbDBt|xC;P?9w zMG=5TqlM!%CWiO!{Xi@hBbl5-lKgnO-K)y#b(>%?fF${ml;# zJhp97DwQb|3T$qE2f)F>udJ=d_$NYXU@{(wM0=3g_rTlROszJ&k) N002ovPDHLkV1j&OnPLC{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/polishedDiorite.png b/src/main/resources/assets/chisel/textures/blocks/diorite/polishedDiorite.png deleted file mode 100644 index 43f3ceb52fe554e2330e80cf7741eda40b243e9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmV-o0-gPdP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0na3dyk<)MOzE@UF9v~Gm(P%4gjnuaX%kR}pVFVHt_sbKN5X79cBUi+V4$!70* zz1PprufbplLZQfTI2w;X;G@xdqhZzSmZX4T#2rB@b(7DRIKlaO5^kFJmzPP)df-%5 zEg0NOB(8iuUDGxcbX0(Fcpn(X8K~77@%RNqQhav1Jv5Hs<)uSir_+_32ryYJmSraG z;ehz!;*!Epx7$N$E?1z3Z9n2C6pE6TnFvHV5wN247MD~f64xHj3TcTyJ+(v$4+M4< zE`%ZpG41v?AB!2$=m9~xR;xABtWYYRogHku$slr;WuKnL(a@W-)oPbYP9y5LI%Ig8 zo}T%;rA#J=Og6y=6~al;k;r5M0;c!-eVQE~pRfR%kVEYE2jJW(AWLLoi8LBcxgrQi zr*n~rbKP>MBAA_>Q+Nxc=_J#EzmGh;2Za}#6!E?`F#{35d1W~Qq^^5X%gGpI~2)W2*6LX`CKkniNGtB`uzL?KUCqx wvO6w;%QXcD5Vw1oF1o%Yd~Ho-V@=!m21uGH5BV|Xvj6}907*qoM6N<$g8VNAoB#j- diff --git a/src/main/resources/assets/chisel/textures/blocks/granite/granite.png b/src/main/resources/assets/chisel/textures/blocks/granite/granite.png index 6db8b21a269e77caf45ff2868c1a11608f5f4604..07c7af8510340de84a17817a332b182d99efae3c 100644 GIT binary patch literal 979 zcmV;^11$WBP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*)2 z3@98AXLBn600UD=L_t(I%TOe8u{Gz(0A zVi1iOjWIJC#|uFdpK2Dvi-{p>j1Zk6dvFjz$x4tcZVN13H_FP^75cMfU0rL}*6ydh zgj>4$u(;@XJr5`6%ctr+ccz^7dsvIKg|VSQ=JWTFHrFGqEK^-$N2lbG^LcK^lI*Z= z0Kgy!R1~5U7z6>gFUb0J7RdTIb@Bv@vrz!P>Au7x@&MM*^7@#QD67h}jbmMl6MVX;Mn3uLU5Kd;;T3<(ac80=F;7fhH%R#5{>&CC!#f0HT=4Mkdhe^r(71eZOop zTfkx^?e{RgRN^U~0W;Ru8X=^(`;_f(VIiDvTkMS>y(n1D+C-%I& z25QQS!pm6#8d1hwfs71++DA@sU`+~f3@G#y;jB8hZMU?Ce1*eFn z7wCBJO*+5*2~o1s;@Ci3e#lj?A5Bf|W|yc^0GLb76AlLW>~j}eEqc0djPv2)y=dVi{{^hiw$kIrZhRDn!$Gp7#ktW2D@jPH~aqhp9fg1$nhB7NR013X$N4`>tk#-wQ6E0G(~s+ z2*>yC;zHjIUf=f|g zqi@iA@n~~_=AAnj z^myrb_ZWv>+{5kR5&lL`IvgOBm`BcKFly8Q`~$*hZrAe0n5X~%002ovPDHLkV1iN| ByNdt- literal 607 zcmV-l0-*hgP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0nkZAK~zXf?bSa^13?gn;r%jpwt@;Gf>;?L zh?2$>A|i;Qg`^PiPjz4w8^IugglGywmm=?X z7apC66rU!ZWGVmMB3|y}ps%g*h*&f<#AHaVFXfXb7R>^MGLFVqBWsn2ld+|IZjo{j zQBhc{h&ZF?2B6`GxRg(Rj$jg+cm+9*qx}40411DgRnJPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*)2 z3@9)?zaPi|00N{*L_t(I%T<$6Z_`#7hMxx8J&9{4spHm7XbAyDs3MgnZiaHdU$TEU z?FVp$gp^%Os|JlI;EmQwo8r##lGxZjaVpA%TT7hF?~~4X-$&2cIDPf|ZF2se^4O11 zz6SgsCG7Q|6Mp=gYHN=NHyJlsO0bBr8wLP>9G{@9{BzuY&N%*j!SLu1t^xp}FktfW z0{~{Y1YmS>%F|YZdEJ1f!@rk4%73$v5ADmm3rO4?DmoVgz+>$CNZ;gMXp=qQj$xFX7ADXCIP72 zSMMDTXjRrI4V%bw$)#k_vB{;RcR0W#$FywBZl5==Ut?M}X_`^F$x@;)K>8CjA-Gu- z3|h~Q0MLZs`qO)45+jqC$aDGmM&V28sYk>{4lYPBkrm4A+K4iLIQ>)8>e zWfS{TG$9zDyhRg&-FCZt+3fZiPXmN*po%KWrt_HS&))#>&pjMdFDgjMizoXmmodUQ z;OulvtF{SYz@Sr9Lu?fy&C(UU{fDKDi}fuB&JIy{Cza|3O85_U;GQ6!m*Z^RjN_17BzP$~=T4rSxwPBM5 iSIkpMvnEhf6@c&bOgPZ5L(eb(0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0c}Y{K~y+TO_Iw?0#Ovk=Z|U;6omAEili47 zkzt@k#4Jh-gBYlh3Z@W|BHD-x7eTWM0vD}X7PRy4>38loa}_=g=lPw-y}@Xh{=D2| zNc(^Nhp+B6&hO6E@8Ag&|L1)}37y(@fNM~%oUhNPQ7H6IcLkY*o~v8r3|h@_c{Uh6 zUScalN}5Eh%Leewo? zoO}m2E0Z7<(9)im1ogQntyl*U+?Cg)s0MoS>`=MW3Jyxv0WXHU?V}y(**uOO2?c33 z5?{c&yYtfoDOhU0y5HNDrh^}bGAW+ho5J|vcy^?ip!5$M@2w)Uo=Id&Q($(hsSF_E y$wPSx>rh>q;SYlSxhY130}v26i$X~A6bt{5B6O{M_4va80000