From c2eeed58284ce83d549e62c8c14950f49d13bfc2 Mon Sep 17 00:00:00 2001 From: wiiv Date: Sun, 23 Oct 2016 17:14:44 +0100 Subject: [PATCH 1/3] Look at the stars Steve... or just build something, IDK. --- .../botania/textures/items/lookingGlass.png | Bin 0 -> 16008 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/lookingGlass.png diff --git a/src/main/resources/assets/botania/textures/items/lookingGlass.png b/src/main/resources/assets/botania/textures/items/lookingGlass.png new file mode 100644 index 0000000000000000000000000000000000000000..7d71d564e3485462d44640e63b39c809974bb033 GIT binary patch literal 16008 zcmeI3Ux*t;9LFcM+V=ElrXJU`y((fSyOX=6Nj7Hp zn%q69MbJm}Mbw9a_+Sx1^i4%jw9uCdK9pKfRHWEi4%>(8S?xNrn@u*8WH@cbms!~C z{^mEo@9#IC`IEfl<;nez4iDWo1OOPG7|&1P=O%KmzXN}6yXrvv*iaikYyoiR2)RSx zjkoRvK>5j-p0Q^NkExnji9+2hqG+>H!@U8>>}uAab`;s+BAPX-*~rqzpGCrko{bzz z7NkOL49ywii*Cs#c{>}4kVNgPHLgmnov3QH*kOud6V^mIDvAAqbgdmzo3EGM(sWHk zWmG{`+rn{j-?-YGX`9xZIUr@*JuoqzlR}}LyKlXfO5fC$z4sVK&_dcb(wbhVA#n;> z=6qd4dynCvZ0|RE+bDG=r%Q==2G)+6#(*&5@xt7t;LT75k5wJ3BWRoTY11s{yj3>o zBMgs?xvMJtz#*fmn+@y1j7W!c=DVYY^3X;(ydG166cb|UX-QJ0w3=$cwG>lJ9{j0&7ZVy!xx z5j%~6p6vytj+te%j>|&1ct-5k9EfrknL1ImY*^LML_UWbqK2WX5Ee%@Ed~XtD9J)v zN~8s-B%q)nEg_G>bXt~DE`UNI7~UhDH??`PQLwakrs$@IaWY*>7mLLhKB;6K3MDckd0WLcl)Pf623&4 ze6~V^ZaVZZJ2dE~LpzaAR1G^9Yh|OF15xCA(>vJ@;GcLXmr5q%$&5%h(-D(K6P0K3 z20nr|d?+u+MFC-(92c7p<>k02AZ(N4 zV)LQA92W(IZE{>}K9rZ^qJXeXj*HEQ@^V}h5Vpy2vH4J5j*9}qHaRXfAIi&dQ9#%x z$HnGDc{wf$2;1bi*nB82$3+2Qn;aLL59Q^!C?IT;<6`rnyc`z=gl%$MY(A8i0Kno70G>Mzz>0&PzXC8X0dVmM0P5=i z++)7_%$NHBSR03Vq|05BXLE^+3=k6UN;IHe~!2Mey zVCB*ZcwRjLo<6C%BmCmvjdnu%#bt2ycPF%T{xZ1j_VwW0*|T8X=5^qcYwv)!4}L}Z zGbyk26^RHqf7z|%yI;QdnzsU1gn-3WU}E0o!fU;|6`V7@B*99E$myRyZ&yM@e1YJz zYaQ%-#Y-~0G1SE*wKWIw>z{I&(3Nxv5amH4XU}{CE?#f|uC{9^?ht|{^&5^Ktc>j> z3ED#;OQ5F$Uo2P&W&<{C3xUm>N5GbiBjD7h=h~GF6bKHdCF=AO=^27w0eSkvX}yP* ze{{g5OPAdW?s}2@zZ>r(GLF?;WJsg}EaGf@X&7v9{s3403;|{ZL19u2sQ_Q0(-*FU hmR4?nGrui+`*F|L;1Q$z!E3}jv3Gy|{XIus_!}-9CyxLC literal 0 HcmV?d00001 From dc863b22a02cbbc232f5d4e49b0f91fd53463295 Mon Sep 17 00:00:00 2001 From: wiiv Date: Sun, 23 Oct 2016 22:49:30 +0100 Subject: [PATCH 2/3] another trio --- .../botania/textures/items/unused/astrolabe.png | Bin 0 -> 16450 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/unused/astrolabe.png diff --git a/src/main/resources/assets/botania/textures/items/unused/astrolabe.png b/src/main/resources/assets/botania/textures/items/unused/astrolabe.png new file mode 100644 index 0000000000000000000000000000000000000000..a69286fccac78a8aac63f1b76e380738ecbe552e GIT binary patch literal 16450 zcmeI3UyK_^9mjtTcS&||Fr-&*^QLd*Zm(VoLnVDJt z*_*RR0g4c4MzYtx`OWt?GoRng?D}E9e(=Df+eSV*0sz~lCX0vg^&axMYa{;Najj+G z%jWvzQ4e6tz2p;tXP?^+@X&M4^o&1K+OL~#HEvjL8O58`I&KY+f4EsU%wx!pmeH(J z8;>pj?B!V0vBqPMr%FnxK7r<($&(Fq_~e0U^W-rzXT=^ajO3d-4p2qD5p7m0HBWDj z$7oy~|0dOPEJ~aB$HrrONr%yy(!uD2+d$D&JS~|@Iup(0;%X|B(K4TmCKNR#D@i%2 zNQtDbDY}-3wo9xqf`8>3maQKuKGN>Vkys)qkUr5H?#;mO7ayeN^$cco6 zTS(rCnr}3vnzu6u(uq?>`8vmt%Zh>@3E%dt=N5EHk+4wm7$j11*K286}N$hg$l{M+^;&MqKizQs(HRqGtpGB zfGgsTW8rP9CRAH1OQ~emma?j5NQQ}0QrfV~im4&Pux$#UR0_-2g)X}0JlQBXba19v zu8G6tt2uzDOoNjrEFTuNjYR^Br9cEsH`bkHj7CGDEfq1*VUxs;e~o4w1Dw4ria>L z^u@Kc9Y@8Xhg02Xc!+Gh@mOc?bx*VIVMR1_3+skSjIesD0?v1GqsmK#ga8Evr zAI?!Bok}HBd6}(d6$hOrs>~D}eDn0kO+ZbzHLRnr@aQ06$k7%CsR}(t)6+Ak#SiKD z|AE~7gRt&k?cRFc&mX-Ry`NE;SfUdK2;UUA_kgl`I5d_Ig<;9`LAO@WKghw%zr3=qC4aPj#tUV)1N!Z!sjJ|D&_a4|smrohGL z!*~TQ1_<92xcGb+ufW9s;hO>%pAX{|xELUOQ{dwBVY~tt1B7o1Tzo!^SKwlR@J)e> z&xi2}TnrGtDRA-mFkXR+0m3&0Ec+Ew(#{$fO!SrZ%+W|&j5VbefsmidIVr7I#t{|-HgCJL(8`!trl)NpuF(Xsn*R~ zx4}B{SY$vG01}|z=lSpb09OaTZ+-iv?(a@r=Q?l%uW7$uGc@Tpd-{%o28cv@zSGGw zRJiL4yXmM`FSlUzLJJmO{S&p>Kx+aJ@$RR_;P&fSgoQu<+K;St`14ZV~SL*oR1MuR~4`Jvtbnpr+TD2jI-LFWX_67zhNkh<)>E)!_b6>Z zD3e7K&NUH}k&!YQ$Jsc2o&qE`4M2X7f&;Y(;ZBgC7K`x6-dwx{@2vctipTVLWam#m zPTk#wMApKkBTFPbblxNo87>i#LV9hN?(}dP*NuS8pSJ4+>ZtIwD+IOJ%-A_O9 Date: Mon, 24 Oct 2016 04:58:46 +0200 Subject: [PATCH 3/3] Fixed aoe tool broken blocks losing nbt data References an already deleted tileEntity causing the item to not have the required nbt tag. --- .../botania/common/item/equipment/tool/ToolCommons.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index f200b3a16..28a813d78 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -22,6 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; @@ -90,6 +91,7 @@ public final class ToolCommons { } if(!player.capabilities.isCreativeMode) { + TileEntity tile = world.getTileEntity(pos); IBlockState localState = world.getBlockState(pos); blk.onBlockHarvested(world, pos, localState, player); @@ -97,7 +99,7 @@ public final class ToolCommons { blk.onBlockDestroyedByPlayer(world, pos, state); if(!dispose || !ItemElementiumPick.isDisposable(blk)) - blk.harvestBlock(world, player, pos, state, world.getTileEntity(pos), stack); + blk.harvestBlock(world, player, pos, state, tile, stack); } damageItem(stack, 1, player, 80);