From 2dbed5813e574cbd340141fa6c2c21fe228c3c7f Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 9 Nov 2018 12:42:08 +0100 Subject: [PATCH] added the farming stencil --- .../blocks/tiles/TileEntityPlacer.java | 8 +++++- .../ellpeck/naturesaura/items/ModItems.java | 1 + .../assets/naturesaura/lang/en_US.lang | 1 + .../models/item/farming_stencil.json | 6 +++++ .../book/en_us/entries/using/placer.json | 5 ++++ .../naturesaura/recipes/farming_stencil.json | 24 ++++++++++++++++++ .../textures/items/farming_stencil.png | Bin 0 -> 547 bytes 7 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/naturesaura/models/item/farming_stencil.json create mode 100644 src/main/resources/assets/naturesaura/recipes/farming_stencil.json create mode 100644 src/main/resources/assets/naturesaura/textures/items/farming_stencil.png diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityPlacer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityPlacer.java index 00dfde46..dfb25fcf 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityPlacer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityPlacer.java @@ -3,6 +3,7 @@ package de.ellpeck.naturesaura.blocks.tiles; import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.aura.chunk.AuraChunk; import de.ellpeck.naturesaura.blocks.ModBlocks; +import de.ellpeck.naturesaura.items.ModItems; import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketParticles; import net.minecraft.block.state.IBlockState; @@ -90,7 +91,12 @@ public class TileEntityPlacer extends TileEntityImpl implements ITickable { for (EntityItemFrame frame : frames) { ItemStack frameStack = frame.getDisplayedItem(); - if (!frameStack.isEmpty() && Helper.areItemsEqual(stack, frameStack, false)) + if (frameStack.isEmpty()) + continue; + if(Helper.areItemsEqual(stack, frameStack, false)) + return true; + + if(state.getBlock() == Blocks.FARMLAND && frameStack.getItem() == ModItems.FARMING_STENCIL) return true; } return false; diff --git a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java index f3897b5c..90ef680e 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java @@ -27,4 +27,5 @@ public final class ModItems { public static final Item SHOCKWAVE_CREATOR = new ItemShockwaveCreator(); public static final Item MULTIBLOCK_MAKER = new ItemMultiblockMaker(); public static final Item AURA_BOTTLE = new ItemAuraBottle(); + public static final Item FARMING_STENCIL = new ItemImpl("farming_stencil"); } diff --git a/src/main/resources/assets/naturesaura/lang/en_US.lang b/src/main/resources/assets/naturesaura/lang/en_US.lang index 65554bb4..c58f2e76 100644 --- a/src/main/resources/assets/naturesaura/lang/en_US.lang +++ b/src/main/resources/assets/naturesaura/lang/en_US.lang @@ -48,6 +48,7 @@ item.naturesaura.aura_bottle.overworld.name=Bottled Sunlight item.naturesaura.aura_bottle.nether.name=Bottled Ghosts item.naturesaura.aura_bottle.end.name=Bottled Darkness item.naturesaura.aura_bottle.other.name=Bottled Substance +item.naturesaura.farming_stencil.name=Farming Stencil container.naturesaura.tree_ritual.name=Ritual of the Forest container.naturesaura.altar.name=Natural Altar Infusion diff --git a/src/main/resources/assets/naturesaura/models/item/farming_stencil.json b/src/main/resources/assets/naturesaura/models/item/farming_stencil.json new file mode 100644 index 00000000..c4ca70bc --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/farming_stencil.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/farming_stencil" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/placer.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/placer.json index aeaa798b..829aed86 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/placer.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/placer.json @@ -16,6 +16,11 @@ "type": "crafting", "text": "Creating the $(item)Imperceptible Builder$()", "recipe": "naturesaura:placer" + }, + { + "type": "crafting", + "text": "The $(item)Farming Stencil$() can be used with the builder to allow it to place things on $(item)Farmland$(). Just place it in one of the item frames like you would with a normal block.", + "recipe": "naturesaura:farming_stencil" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/farming_stencil.json b/src/main/resources/assets/naturesaura/recipes/farming_stencil.json new file mode 100644 index 00000000..a50870f3 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/farming_stencil.json @@ -0,0 +1,24 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "WHW", + "WDW", + "WWW" + ], + "key": { + "W": { + "type": "forge:ore_dict", + "ore": "plankWood" + }, + "D": { + "item": "minecraft:dirt", + "data": 0 + }, + "H": { + "item": "naturesaura:infused_iron_hoe" + } + }, + "result": { + "item": "naturesaura:farming_stencil" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/textures/items/farming_stencil.png b/src/main/resources/assets/naturesaura/textures/items/farming_stencil.png new file mode 100644 index 0000000000000000000000000000000000000000..8dcd05da16c763268fae1089bcb532f86714d7eb GIT binary patch literal 547 zcmV+;0^I$HP)N2bZe?^J zG%hhNF=Hy6O8@`?p-DtRR5(wiQfW&kuh+FZhMj#KG@jxV7V|LuiKHM+)!FM$T-1R); zMnwsU2f0uub|xLzq=#I~M=ekyT{ukl3ndx?mU@ut!~OCgw$py7q(JN^dT~RYxyGbd z3tnMSL%_Z^hHZE&M6n*TU}dNS7i5LIRtpiTSy3FZp;n3+XK+XUE~&#_!hunH6HX`- z&fp^J#ePx}1h+;RFe}UD%N$s7q#M_Z15n8Oiy9UgOi8UMPdoJ$u&@1OpODMm`Qa`p z;ap~1ZDK;tY8<6hP(K4smb&=C9;y2YOZrZ0Xjd^vr0!SVnA002ovPDHLkV1m#%;NAcL literal 0 HcmV?d00001