From f9537529f56e0d1d0d9b634f01aa91a4d144c026 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Mon, 17 Jul 2023 22:51:44 +0200 Subject: [PATCH] added blocksalpeter --- gradle.properties | 2 +- .../quickiefabric/blocks/BlockSalpeter.java | 28 ++++++++++++++++++ .../quickiefabric/blocks/QuickieBlocks.java | 1 + .../quickiefabric/init/RegistryManager.java | 2 ++ .../blockstates/blocksalpeter.json | 7 +++++ .../assets/quickiefabric/lang/de_de.json | 1 + .../assets/quickiefabric/lang/en_us.json | 1 + .../models/block/blocksalpeter.json | 6 ++++ .../models/item/blocksalpeter.json | 10 +++++++ .../textures/block/blocksalpeter.png | Bin 0 -> 6048 bytes .../quickiefabric/recipes/blocksalpeter.json | 17 +++++++++++ .../recipes/salpeter_from_block.json | 12 ++++++++ 12 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSalpeter.java create mode 100644 src/main/resources/assets/quickiefabric/blockstates/blocksalpeter.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/blocksalpeter.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/blocksalpeter.json create mode 100644 src/main/resources/assets/quickiefabric/textures/block/blocksalpeter.png create mode 100644 src/main/resources/data/quickiefabric/recipes/blocksalpeter.json create mode 100644 src/main/resources/data/quickiefabric/recipes/salpeter_from_block.json diff --git a/gradle.properties b/gradle.properties index 5d93061..49975cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.14.21 # Mod Properties - mod_version = 1.20.1.2 + mod_version = 1.20.1.3 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSalpeter.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSalpeter.java new file mode 100644 index 0000000..0b248a5 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSalpeter.java @@ -0,0 +1,28 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.Arrays; +import java.util.List; + +import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.ExperienceDroppingBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContextParameterSet.Builder; + +/** + * + * @author jotty + * + */ +public class BlockSalpeter extends ExperienceDroppingBlock { + + public BlockSalpeter() { + super(FabricBlockSettings.create().hardness(0.5f)); + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER, 9) }); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java index 19fdf32..98808db 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -20,6 +20,7 @@ public class QuickieBlocks { public static final BlockKelpstack KELPSTACK = new BlockKelpstack(); public static final BlockCottonplant COTTONPLANT = new BlockCottonplant(); public static final BlockSulphor BLOCKSULPHOR = new BlockSulphor(); + public static final BlockSalpeter BLOCKSALPETER = new BlockSalpeter(); public static final BlockDrillDown DRILL_DOWN = new BlockDrillDown(); public static final BlockDrillEast DRILL_EAST = new BlockDrillEast(); public static final BlockDrillSouth DRILL_SOUTH = new BlockDrillSouth(); diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index ce678c3..6864269 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -119,6 +119,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.MONSTERHOARDER)); stacks.add(new ItemStack(QuickieBlocks.KELPSTACK)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSULPHOR)); + stacks.add(new ItemStack(QuickieBlocks.BLOCKSALPETER)); stacks.add(new ItemStack(QuickieBlocks.DRILL_DOWN)); stacks.add(new ItemStack(QuickieBlocks.DRILL_EAST)); stacks.add(new ItemStack(QuickieBlocks.DRILL_SOUTH)); @@ -197,6 +198,7 @@ public class RegistryManager { registerBlock(QuickieBlocks.KELPSTACK, "kelpstack"); registerBlock(QuickieBlocks.COTTONPLANT, "cottonplant"); registerBlock(QuickieBlocks.BLOCKSULPHOR, "blocksulphor"); + registerBlock(QuickieBlocks.BLOCKSALPETER, "blocksalpeter"); registerBlock(QuickieBlocks.DRILL_DOWN, "drill"); registerBlock(QuickieBlocks.DRILL_EAST, "drilleast"); registerBlock(QuickieBlocks.DRILL_SOUTH, "drillsouth"); diff --git a/src/main/resources/assets/quickiefabric/blockstates/blocksalpeter.json b/src/main/resources/assets/quickiefabric/blockstates/blocksalpeter.json new file mode 100644 index 0000000..79d4545 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/blocksalpeter.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/blocksalpeter" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index 818523e..7814c4d 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -57,6 +57,7 @@ "block.quickiefabric.kelpstack": "Seegrassbündel", "block.quickiefabric.cottonplant": "Baumwollpflanze", "block.quickiefabric.blocksulphor": "Schwefelblock", + "block.quickiefabric.blocksalpeter": "Salpeterblock", "block.quickiefabric.drill": "Bohrer", "block.quickiefabric.drilleast": "Ost-Bohrer", "block.quickiefabric.drillsouth": "Süd-Bohrer", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index 9113ec4..9a100d7 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -57,6 +57,7 @@ "block.quickiefabric.kelpstack": "kelp bundle", "block.quickiefabric.cottonplant": "cotton plant", "block.quickiefabric.blocksulphor": "block of sulfur", + "block.quickiefabric.blocksalpeter": "block of salpeter", "block.quickiefabric.drill": "drill", "block.quickiefabric.drilleast": "east drill", "block.quickiefabric.drillsouth": "south drill", diff --git a/src/main/resources/assets/quickiefabric/models/block/blocksalpeter.json b/src/main/resources/assets/quickiefabric/models/block/blocksalpeter.json new file mode 100644 index 0000000..6e12e13 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/blocksalpeter.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickiefabric:block/blocksalpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/blocksalpeter.json b/src/main/resources/assets/quickiefabric/models/item/blocksalpeter.json new file mode 100644 index 0000000..e18f51d --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/blocksalpeter.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/blocksalpeter", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/textures/block/blocksalpeter.png b/src/main/resources/assets/quickiefabric/textures/block/blocksalpeter.png new file mode 100644 index 0000000000000000000000000000000000000000..2d5f6f99f64499a4bcb46bbfb15536df57da9e55 GIT binary patch literal 6048 zcmeHKdpJ~U+aDy7Efrf^-WtO$(wxVfBFDkVh)HCN-I|#-tQa$92IEwcB#~pXy$-2Q z_2yKh91@)*igY0DN}?z`QfiYI?;1MjdiQmGSJ(IL|613zX07!+zx(&x_wT-+d(GPC z;%xtenywlGf%t*xV9SQDn(|Xs5&lg{^&=w?%4*?mTcm6t6e$u5`A`6el!l2wBq)RU z2!!lGp@-MmL9*&(rxAUgl67*=K()K?tsb4On4J4i#GU13+@%XH{}{3GS=C5q{+&tv zmGc~1B~JQ#MNQXy^H0a89vIxzx=wHE{4jQ}uCTXtl}nsMo-~RDObk->gsF$)uUaS; zo?ZQN!uI{T9W}}i_W9{s<3DI*gd#8bD~3di(SxeAtN9yF^oECcGi#OA4xc zKGYqR@iI8mES9P|kg_hd9&zh~fjuM9DD-fZ-m^7V-UyP6mKZl3r+3-kuBkr!A=z12 zoTZ$9?NKf|`S(4642}2yrVd40RERUD?D_d;_YC*in?Kz%;67O~R&hM6)YIKHGKIaj z&d9qN+LwQ;$Kz$+ykAnXtVkJs)un4amTab^T3clI6?1%3az#$BZxuAe2CZLC+BFbF z)hg9It)IJ_S=Dksme~{Fjl;8#IWxxsbY8{ADYu>(_ZzyAX(&+%Vx(*nB|K?qiJG{S z<8Ok{yT1MBDou~m%8i`BM^{`{zZ z9p9)WS-UT7V~%x#abb>Qqtk5?ZLglBnRW<8+i#0`6S8{yyoov!G4kX`@0gXQk(-ccF`b_db{bUQ|bdl%4FY9{2b`HXJRF5u=hiZ z>HXrK>vzS8joFEfC-k>fF7?S-01TL^_6E5kV;Zk^r8Y!ty@75$u=Z8*GG#+-D}8Na ztd#{KEJob_nj^*k>2E|{UzYA8cOh4_fQ+i~DVXcsNJ^5e7 z6+`3FY0}86w}%v2t%9UALq#d zs}i%ZGtW-d<>ADS(tRdv1|rHUHHHW#F9JF|*#>J)o@lSdoZ6n3nN#!D<&@{IdSgbJ zzUa#Z;QgwcoWV_2CgJSkeh|s+_P_pT-_q@;y{cSMi6;&=N0lD6TBKXoJQd^-+_lCJ z>5_CaMuV}*-RMtu zup@0*?6xAmv0LtJtlbNH4;eRHc2n>m!HiXr;F5iJ#gXC-3$xXZ#JpOiQ+DL!Bi_bP zzg*9Qf~lKX!d2CmbdTyDH>iJ|m-3KVjc*9;yLjJt(euZLt6Q!oM6WV>OIUpB9@*Sb zeW=~KxN%fdsc7TboA$bQJYA;KE-bi$d`;|*^vF8pE@;nVnNN1$8wTu>8hj{>7qxbc zy+!D*^|ZUES{v<(gHNt-N;&rD_IqbbwOhP5^vL>xB8Qvnpi6qggXL&ju~e|XWM!~W z_m2)eR^QRC=Rff`d!=KRK01S5HgK%UW6Ev#ctS35UYyZ%fOH~K)kx5YoF zy%PC<>}HyDhvo~!%YVXH&^z}RyEkH|R|M5h?|%NP()C59@ABVvk1BNsc>H772!T-8 z4cXYZFl}r;bw#)r=0v5MJ6yKZyZY;6j;h;Y?G_y^Qd73Y< zydxl{J33bXJ3%X)p=zVK*xnY%#GAB0V+YD2=8c8x^m9sYF*mY;9#0hszZ7w_ae!cU` z=(WKIFDPhe>>43}W#i{-%WBWRW0-0Ziz6N^A-ctP+>Y75JW&J_wU08hvP zF*1P&eu*IvW)?CL!1V{ENDk-=1)8IVYwJ-+h-Z%SFlFIbA{)>TatIfLo5G#lxZ(a> z8V_Z$Ud>EKhY19r6hO)Z0f7>_%p5htONZ~}!&nq@1|s!0M{QxbAZ>(V5J|$2FgP?r z289q%>(!8EVjiE)wzd060Y90e{G?J59g7VO4aI~KF+#B~7Ehzmus8yiKtRI?v?MH0 z3dqob5(7EKEQc*9;ff)V6cPp^<(vRV7%VkMq2PJsC;tQ@7V9&8pyZMgQf{YL_P--xjg2(-AFA5e1%!I?^V!;4V z07E74s`#&#v}dwhK3m8o@P!1T87o-quaHuR|3$2?e3Q@2gfrI>*!(l^SLjc%&wybR zi$%8;a)agWF>TFJ^7ZLFAs6D&XKwj8E{DqF(a;;nK$GxPxR7upDw;r`5=j7u1ac|d85KUWON4xBC?E!{ zd|@47t>E&U(F$oalPKe_(V>2zJPWX3XdDGSD;Nn!$C-W<4Ey(oNFxI{0*L~m34AgK zO(Jl~Xd0h@M}t&&!%%2MKAB4X+Ufs$h;wV=V~A#0d0YIHR5R>3~jCVjul^d7pT;HU?H-W!b*Z-Sb zYG1w>!9e(rUMT!Mn8u9Lfxji^b2ix9B3cj?i0P!9n?dl%0+EBK1cAU9$WH}Xp+yKh zs3K*u7%KfLi?xUv2minfA`puDOj|2Aqqc)-R?e3!wc@&+?D@Y0KP9n#PO>xDu)I$* zU`u(QR^AnZs&{Ioi3@EmDI^B<*fkhsEHQG*y>$L%OkObwqgG z3d9!wl`B_9btfM=;ZwHMdMeMy$ERcP-T3(U<;zM+(eJ_qCAn?=@lDHYu5<;2$Yc)2 z=$1DV6YH2uxK5h$4qjYF)JR(s`|Yn zS(;1YdPG#GJ0x`*+6*)i|%bd z_xnL$eg2}oHr5VxKG*~f;kRPpHsPJ%IhHLh* zimu{zKcm8sbz>&AiWn@G*6*3ga5ao|xHCF9IQZlVVsR2azKN!Sa5P4wOt((x^xa+l U8zsLj53U~sli_SzYP~JyKUx%6dH?_b literal 0 HcmV?d00001 diff --git a/src/main/resources/data/quickiefabric/recipes/blocksalpeter.json b/src/main/resources/data/quickiefabric/recipes/blocksalpeter.json new file mode 100644 index 0000000..7169047 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blocksalpeter.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "sss", + "sss", + "sss" + ], + "key": { + "s": { + "item": "quickiefabric:salpeter" + } + }, + "result": { + "item": "quickiefabric:blocksalpeter", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/salpeter_from_block.json b/src/main/resources/data/quickiefabric/recipes/salpeter_from_block.json new file mode 100644 index 0000000..c5d3911 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/salpeter_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blocksalpeter" + } + ], + "result": { + "item": "quickiefabric:salpeter", + "count": 9 + } +} \ No newline at end of file