From 677418fdce8a02ee5f9d0d8e06518b2aa9a09ccd Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 20 Oct 2018 11:37:11 +0200 Subject: [PATCH] recipes for the tools --- .../ellpeck/naturesaura/blocks/ModBlocks.java | 1 + .../ellpeck/naturesaura/items/ModItems.java | 1 + .../naturesaura/items/tools/ItemShovelNA.java | 5 +++-- .../blockstates/ancient_planks.json | 14 +++++++++++++ .../assets/naturesaura/lang/en_US.lang | 2 ++ .../models/item/ancient_stick.json | 6 ++++++ .../naturesaura/recipes/ancient_planks.json | 15 ++++++++++++++ .../recipes/ancient_planks_from_bark.json | 15 ++++++++++++++ .../naturesaura/recipes/ancient_stick.json | 16 +++++++++++++++ .../naturesaura/recipes/infused_axe.json | 19 ++++++++++++++++++ .../naturesaura/recipes/infused_hoe.json | 19 ++++++++++++++++++ .../naturesaura/recipes/infused_pickaxe.json | 19 ++++++++++++++++++ .../naturesaura/recipes/infused_shovel.json | 19 ++++++++++++++++++ .../naturesaura/recipes/infused_sword.json | 19 ++++++++++++++++++ .../textures/blocks/ancient_planks.png | Bin 0 -> 328 bytes .../textures/items/ancient_stick.png | Bin 0 -> 274 bytes .../textures/items/infused_iron_axe.png | Bin 505 -> 501 bytes .../textures/items/infused_iron_hoe.png | Bin 534 -> 515 bytes .../textures/items/infused_iron_pickaxe.png | Bin 534 -> 529 bytes .../textures/items/infused_iron_shovel.png | Bin 485 -> 469 bytes .../textures/items/infused_iron_sword.png | Bin 596 -> 583 bytes 21 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/naturesaura/blockstates/ancient_planks.json create mode 100644 src/main/resources/assets/naturesaura/models/item/ancient_stick.json create mode 100644 src/main/resources/assets/naturesaura/recipes/ancient_planks.json create mode 100644 src/main/resources/assets/naturesaura/recipes/ancient_planks_from_bark.json create mode 100644 src/main/resources/assets/naturesaura/recipes/ancient_stick.json create mode 100644 src/main/resources/assets/naturesaura/recipes/infused_axe.json create mode 100644 src/main/resources/assets/naturesaura/recipes/infused_hoe.json create mode 100644 src/main/resources/assets/naturesaura/recipes/infused_pickaxe.json create mode 100644 src/main/resources/assets/naturesaura/recipes/infused_shovel.json create mode 100644 src/main/resources/assets/naturesaura/recipes/infused_sword.json create mode 100644 src/main/resources/assets/naturesaura/textures/blocks/ancient_planks.png create mode 100644 src/main/resources/assets/naturesaura/textures/items/ancient_stick.png diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java index 71445834..f7b18a66 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java @@ -8,6 +8,7 @@ public final class ModBlocks { public static final Block ANCIENT_LOG = new BlockAncientLog(); public static final Block ANCIENT_BARK = new BlockImpl("ancient_bark", Material.WOOD).setSoundType(SoundType.WOOD).setHardness(2F); + public static final Block ANCIENT_PLANKS = new BlockImpl("ancient_planks", Material.WOOD).setSoundType(SoundType.WOOD).setHardness(2F); public static final Block ANCIENT_LEAVES = new BlockAncientLeaves(); public static final Block ANCIENT_SAPLING = new BlockAncientSapling(); public static final Block NATURE_ALTAR = new BlockNatureAltar(); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java index dff6c1b0..11941843 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java @@ -13,6 +13,7 @@ public final class ModItems { public static final Item GOLD_FIBER = new ItemGoldFiber(); public static final Item GOLD_LEAF = new ItemImpl("gold_leaf"); public static final Item INFUSED_IRON = new ItemImpl("infused_iron"); + public static final Item ANCIENT_STICK = new ItemImpl("ancient_stick"); public static final Item.ToolMaterial TOOL_MATERIAL_INFUSED_IRON = EnumHelper.addToolMaterial(NaturesAura.MOD_ID.toUpperCase(Locale.ROOT) + "_INFUSED_IRON", 3, 300, 6.25F, 2.25F, 16); diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java index 5e2d7af8..0c7fc5f6 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java @@ -34,8 +34,9 @@ public class ItemShovelNA extends ItemSpade implements IModItem, IModelProvider EnumActionResult result = EnumActionResult.PASS; if (this == ModItems.INFUSED_SHOVEL) { ItemStack stack = player.getHeldItem(hand); - for (int x = -1; x <= 1; x++) { - for (int y = -1; y <= 1; y++) { + int range = player.isSneaking() ? 0 : 1; + for (int x = -range; x <= range; x++) { + for (int y = -range; y <= range; y++) { BlockPos actualPos = pos.add(x, 0, y); if (player.canPlayerEdit(actualPos.offset(facing), facing, stack)) { if (facing != EnumFacing.DOWN diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_planks.json b/src/main/resources/assets/naturesaura/blockstates/ancient_planks.json new file mode 100644 index 00000000..5fe35ed4 --- /dev/null +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_planks.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "naturesaura:blocks/ancient_planks" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/lang/en_US.lang b/src/main/resources/assets/naturesaura/lang/en_US.lang index 52a40b91..f5bd9c24 100644 --- a/src/main/resources/assets/naturesaura/lang/en_US.lang +++ b/src/main/resources/assets/naturesaura/lang/en_US.lang @@ -9,6 +9,7 @@ tile.naturesaura.decayed_leaves.name=Decayed Leaves tile.naturesaura.golden_leaves.name=Golden Leaves tile.naturesaura.gold_powder.name=Gold Powder tile.naturesaura.wood_stand.name=Wooden Stand +tile.naturesaura.ancient_planks.name=Ancient Planks item.naturesaura.eye.name=Environmental Eye item.naturesaura.gold_fiber.name=Brilliant Fiber @@ -19,6 +20,7 @@ item.naturesaura.infused_iron_axe.name=Botanist's Handaxe item.naturesaura.infused_iron_shovel.name=Botanist's Shovel item.naturesaura.infused_iron_sword.name=Botanist's Blade item.naturesaura.infused_iron_hoe.name=Botanist's Hoe +item.naturesaura.ancient_stick.name=Ancient Wood Rod container.naturesaura.tree_ritual.name=Tree Infusion container.naturesaura.altar.name=Natural Altar diff --git a/src/main/resources/assets/naturesaura/models/item/ancient_stick.json b/src/main/resources/assets/naturesaura/models/item/ancient_stick.json new file mode 100644 index 00000000..63f7b2c8 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/ancient_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/ancient_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/ancient_planks.json b/src/main/resources/assets/naturesaura/recipes/ancient_planks.json new file mode 100644 index 00000000..8c7dc2b4 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/ancient_planks.json @@ -0,0 +1,15 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "W" + ], + "key": { + "W": { + "item": "naturesaura:ancient_log" + } + }, + "result": { + "item": "naturesaura:ancient_planks", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/ancient_planks_from_bark.json b/src/main/resources/assets/naturesaura/recipes/ancient_planks_from_bark.json new file mode 100644 index 00000000..b9c1e7a2 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/ancient_planks_from_bark.json @@ -0,0 +1,15 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "W" + ], + "key": { + "W": { + "item": "naturesaura:ancient_bark" + } + }, + "result": { + "item": "naturesaura:ancient_planks", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/ancient_stick.json b/src/main/resources/assets/naturesaura/recipes/ancient_stick.json new file mode 100644 index 00000000..1ac4da65 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/ancient_stick.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "W", + "W" + ], + "key": { + "W": { + "item": "naturesaura:ancient_planks" + } + }, + "result": { + "item": "naturesaura:ancient_stick", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/infused_axe.json b/src/main/resources/assets/naturesaura/recipes/infused_axe.json new file mode 100644 index 00000000..c3b9d7ee --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/infused_axe.json @@ -0,0 +1,19 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "AA", + "AS", + " S" + ], + "key": { + "A": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:ancient_stick" + } + }, + "result": { + "item": "naturesaura:infused_iron_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/infused_hoe.json b/src/main/resources/assets/naturesaura/recipes/infused_hoe.json new file mode 100644 index 00000000..395ca4ff --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/infused_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "AA", + " S", + " S" + ], + "key": { + "A": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:ancient_stick" + } + }, + "result": { + "item": "naturesaura:infused_iron_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/infused_pickaxe.json b/src/main/resources/assets/naturesaura/recipes/infused_pickaxe.json new file mode 100644 index 00000000..82e05f8e --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/infused_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "AAA", + " S ", + " S " + ], + "key": { + "A": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:ancient_stick" + } + }, + "result": { + "item": "naturesaura:infused_iron_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/infused_shovel.json b/src/main/resources/assets/naturesaura/recipes/infused_shovel.json new file mode 100644 index 00000000..2593d760 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/infused_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "A", + "S", + "S" + ], + "key": { + "A": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:ancient_stick" + } + }, + "result": { + "item": "naturesaura:infused_iron_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/infused_sword.json b/src/main/resources/assets/naturesaura/recipes/infused_sword.json new file mode 100644 index 00000000..d425be44 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/infused_sword.json @@ -0,0 +1,19 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "A", + "A", + "S" + ], + "key": { + "A": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:ancient_stick" + } + }, + "result": { + "item": "naturesaura:infused_iron_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/textures/blocks/ancient_planks.png b/src/main/resources/assets/naturesaura/textures/blocks/ancient_planks.png new file mode 100644 index 0000000000000000000000000000000000000000..955d632dadb342d396a5a1774b88fbab659851eb GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt3(J;P+JIo?1u$2?se zLoEDjCmHe`GT?D7)|sYvMn^W{Mbj15&PMAE2PJP*U05LhGSWWm*29(GzV|1)>)w7G zy#IQ5yUEAh`*+(cj>=X@d3O3Bk5$~!iwAmV7&x7aZhl&_a)aMzy?4d$A4&`CK9}MX z+}Cv}R``eFy#}^FKOcUk)GztT?e-_!WGebYI|4B?)9? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/naturesaura/textures/items/ancient_stick.png b/src/main/resources/assets/naturesaura/textures/items/ancient_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..1d7d963c6736fba8eb4b4d18c1f1ea6fb02b5f93 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QJXPB%t#~Y|-f~SjP zh=u>s{)4;?3Oufn4ZM4#`{it;9x+HP|L{QN-GL1=@`ISSMD(;zzmP94-@Emjc+!f8 zd-orlS$m~n2Vb$wZo4G0=~)wM^nQQmR*~G`$~mb&^K{AtU9T&%I&(BCv(+LTGS0S0 zY%>u~x^c;8gF-H!qQrBV+ny)ewn%q$1dozA)JMFFnss$#LI9LG`le4cAS zp-@n{T#oA)0$J-`&+{@HKnChhK2;wY#2*Pzhq#6~Ac-jiwAO8!eJ<$sE2i4xo)$5G zlQP5&z)yTPmQ9M@r!@JPvj|dbx7%IU4q4HW1hGK^dGt2n83G9uMhe!R60|n~$A-wo z>yH40M8rbYNu!26BgwQgpy6|*llZIsbOhXlz)Uk~_bEOa)5!19=w-}lDsi2x!^Rts zQ-w3cFoS#_T+%EUG66S&MCj8drc$|oT;>@y#D+7-sL7)eBGwknHxRYXXnlG^=gm;> z6$Jb@4Z%sB{#B<>%kY}IwLp_i5@0OQnyz0&= ztaQk{5rG();PlcAx0C82VQ}FOWdD*%X6yb(kgXGG%M)NjAHk&bjPG0mWibIgXQ#mKBL?aaPaqCRq6-23JfP9ngr?sit<9=` ziHM$*A#MPE;=6LQPW_KF8h&1|2vS5*wCGwOFFKMSHb@|M--kRyAcn%oAho9$!TlD; zhDh)2R{%mHl0x1|qlP^r$@FN0IxqbsN$s|tjewgF=xN3WKFx;>I^8W(_jSN&N@1B& zhmAKNrwV6?VFvkb5YXjug9*41Btl<*VxlW~p2st4hz)0uQIkg{M66TL-@tjhN>9^m z>a>>k4g&t`hTvpQe{xu-hf$OEH%kdwCjqHP#40gBn4L7~Ic!sJ$0sxi5$>+*^7>!E z`ElH$y&Y4#EKyC`y2lQzw6cNklexm*G(sHlm`&r_pOzkB@6k!k4WtuV=>eXs3wTGook<5nV(u!v|hDwa^6HknL@ zVv$HhY%CTNEBK#8WaoKoUuLm2%OHPO!0I`iM+N#oW<8nf9J)Uf^nQIbKl?cQ8o{2X zg@k{KSr;I5F+c_E?7ffBc<#dc9t+755|_sOp?uDxGwF;3->9bZHbnEKhsH+_>8l-K z2=Yjxi!@;_Xq$vyOXg4ip zAxE23I(Vr27#15L+05U#J1WosW#1qB7?poo;hC2pfq56$w!QK!YjDuOygC3$%<)Vs zFfU}~oikImTX3ZFCaJ-K$*vdL^I{W=(TZ8J3~ERU7MNU zQVACGNG+3i{F;ZylM7VrJt<}<^Y2ucs!U%B*!eJ95&}X$E?ur!u=e4pJXNF#<^mbl bmuXpl3jbHekXw|h00000NkvXXu0mjfjHk)E delta 450 zcmV;z0X_bM1eOGlBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCx3@YL_t(IPi<1! zQUXB?TyB;_P*gxlQBgpyMMQ2XebE=MKT}IfefRjymX2g=7U-(k%uJF_Cp%U!7_>s6 zkVW|YezAn^X~W^L$LI6;#0CNZv4X`QA~{VXHcrAGC6K<#V1Dh5qXNAkv#!KN3ay_W zoZmjGpKUb0x`+d2XTkeJ&(3h+hixL;37Sd(s{W-ce2c zt%K@|gUW}4_+(8O+&GfxAWfJ<8rO5Ey`G}{)I{oX!<~l^yG{79-@-Qvy56s$FKhIl-`v3p{07*qoM6N<$f>SHcKmY&$ diff --git a/src/main/resources/assets/naturesaura/textures/items/infused_iron_pickaxe.png b/src/main/resources/assets/naturesaura/textures/items/infused_iron_pickaxe.png index ba67f9b0de8237b0ae62506c7ad721ef45dbb7c6..07ff2ca0343ebc74b6bbe58f45ec976c3843455f 100644 GIT binary patch delta 444 zcmV;t0Ym9z}olT3EDGjrz5bhTtMsm0@QEf$Mu5{X12 z@FFmWVEzVVU>hnSeYFYwjXHTz&&+img=GoZc>(#GJ@8Hf0K!6Svr&Gsqr>~1qVqj} zfcrB>^`(jOs)5|1Cv~YJ1G5+x@ zrzZ%)h73p}xF81Ed0rdhqUs`*N{N_%8D5ZgXKXonl#RzRrx65vy%-Ptoy%p!JD6V+W2jECRkV)#@ym;-Ppyj@BJ mI1~RXiBtkrg-Q_RXxbl?mvv3za;(V!0000#Cok$58O7mFlZcL8#4onMI|%>?^RdoG`FhPj`?rUG z+II)d9}hb(d&tg;h)oiLkOYQdEGjm@sGG38h%o0kio$DISn;Wh#ARwJfwI(j*CAuh zFoxV?5&8F$Kh8g>qYyG_+)Crx%L)1WA1&0sItVvyWf2Q-epy5^`jd7BH@!T(iYvN? zyAG|B34MEuB|6EK02X;eVj_h)+;G}5A2 z5=dn{+1*!8MIkD}2HR*47T>+u)OMp+6c6Yifidn=?YNEO;f^q+wTnwKq>I(A$ r9B-2n0nWt#N+Oj&RiP3rb2RM_F&Y4#EKyC`y2lQzw5@NklxbXNct{{QL3GoLA_{fFXW)sIvN3y(L?~G^H%C>Fgx~?)IIm@z? z=Xtzip}qwqB2B|WP6jcP-OTUqU2jGD$IJKoGs2E@uLucu z;#Pl%;ro6SEy%aSg5aP^)xehmEFcG6HQ#DZ+4jL;#DhYvYewu^w=M&NZIDfiW-S9f z;gD|avfamIPKf2M3nE;LAOQIxp3^9Zn2g-2VJ!)x7|Eo+L-FR21wb;1CRj*p;0N?U g>15QHf(xEff04OVJcp4|3IG5A07*qoM6N<$f|lmC#{d8T delta 400 zcmV;B0dM}*1LXsdBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCx2E+L_t(IPjyk- zPQpMC-O@{fg@O+fqoM`~v=U2c47SEsU%Y&iubOD$lkpFX_>rS$=(O9VoMf}Jvvba# znN_V;OF53COi0eMEakc`?^vj>0SQUkwq4r+U8rei=mZ_|A{=1(w*kp2N-ChRruq-v zZu`=w^!J96pNuB2bAJlb{)_c#w1G--gDIN8g?1Wx(?|LiJ zKVE*gJ|*lpcanf`CvNqJ7@p@9(T04tJR~?MQYG-E01L=LS8ctT?6d7?*ylkZ*EAz` zty`CY!8XXIMYEQHo^S|HdTjS8KPSX;*8~wRMG%1en4QsR&}K4nyN0zTjAA5b#{o@` ux-0;aNi@MiVgo;*4@xJa#uVJ}l==fCB2=8~)T7P-0000&Y4#EKyC`y2lQ#*gd5=)O-UXzr}#IiDlsJGtwkDxoz z4+Lco(PMo=mxrJaQ_!7j=NykmXu&w+%=8{Az`VZ#PKB z1cHb}uh-+OM(;rQAVS(hmL+S~X$mw$W8V@W=ytn2OMnQnS3fr>dX`|>?kz88o~jW% zN&>a+VHU_NepM;{m|+5QW~bB1aT6^=VK#s78|<<0Q6a69rG?WNq53#ScGL=i<~s2P ziq&{(akkWLj%5e;=LnKL!J&hdDJ7K}5_%wBt~z2^uCtJOMO31PR} zhbtj$HrsGD!qk?J{5#V;ctcSXo+S_@13@gwanDopQ|^70O5arqH6wonfKh>&5Wt>m z!%fL{j$-FYieD}e$bb0In8D?8@oXftSS-T39iZ$>iRN$8GE{(nTrKkO)q`YAAc#nGyIsy|^bSN0W=MO;uw?Cei2}Q!k#7kQbUGcLB|rq(%b#VM zJ)39Q?oBUeo~RK#N&>a&VHU_Ne63UBG0g<#%uc71iJ!vixCNa(dw^KQZb i5qkR{WH%%fMG?QsoTzsBY4kq;0000