From a687e935b24d993a2e2464068dba1020d04938cc Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sat, 28 Oct 2023 22:38:48 +0200 Subject: [PATCH] added block speedpowder --- gradle.properties | 2 +- .../blocks/BlockSpeedpowder.java | 34 ++++++++++++++++++ .../quickiefabric/blocks/QuickieBlocks.java | 3 ++ .../quickiefabric/init/RegistryManager.java | 2 ++ .../blockstates/blockspeedpowder.json | 7 ++++ .../assets/quickiefabric/lang/de_de.json | 1 + .../assets/quickiefabric/lang/en_us.json | 1 + .../models/block/blockspeedpowder.json | 6 ++++ .../models/item/blockspeedpowder.json | 10 ++++++ .../textures/block/blockspeedpowder.png | Bin 0 -> 4909 bytes ...edpowder_from_salpetersulforcoalblock.json | 16 +++++++++ .../blockspeedpowder_from_speedpowder.json | 17 +++++++++ .../recipes/speedpowder_from_block.json | 12 +++++++ 13 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpeedpowder.java create mode 100644 src/main/resources/assets/quickiefabric/blockstates/blockspeedpowder.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/blockspeedpowder.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/blockspeedpowder.json create mode 100644 src/main/resources/assets/quickiefabric/textures/block/blockspeedpowder.png create mode 100644 src/main/resources/data/quickiefabric/recipes/blockspeedpowder_from_salpetersulforcoalblock.json create mode 100644 src/main/resources/data/quickiefabric/recipes/blockspeedpowder_from_speedpowder.json create mode 100644 src/main/resources/data/quickiefabric/recipes/speedpowder_from_block.json diff --git a/gradle.properties b/gradle.properties index 808684c..1f1fc47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.14.22 # Mod Properties - mod_version = 1.20.2.0 + mod_version = 1.20.2.1 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpeedpowder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpeedpowder.java new file mode 100644 index 0000000..d661ab3 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpeedpowder.java @@ -0,0 +1,34 @@ +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.GravelBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContextParameterSet.Builder; +import net.minecraft.world.explosion.Explosion; + +/** + * + * @author jotty + * + */ +public class BlockSpeedpowder extends GravelBlock { + + public BlockSpeedpowder() { + super(FabricBlockSettings.create()); + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SPEEDPOWDER, 9) }); + } + + @Override + public boolean shouldDropItemsOnExplosion(Explosion explosion) { + return true; + } +} 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 98808db..6c3d30f 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -1,5 +1,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks; +import net.minecraft.item.ItemConvertible; + /** * * @author jotty @@ -34,4 +36,5 @@ public class QuickieBlocks { public static final BlockStackerNorth BLOCKSTACKERNORTH = new BlockStackerNorth(); public static final BlockStackerSouth BLOCKSTACKERSOUTH = new BlockStackerSouth(); public static final BlockSpreader BLOCKSPREADER = new BlockSpreader(); + public static final BlockSpeedpowder BLOCKSPEEDPOWDER = new BlockSpeedpowder();; } 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 6864269..7065eaa 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -120,6 +120,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.KELPSTACK)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSULPHOR)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSALPETER)); + stacks.add(new ItemStack(QuickieBlocks.BLOCKSPEEDPOWDER)); stacks.add(new ItemStack(QuickieBlocks.DRILL_DOWN)); stacks.add(new ItemStack(QuickieBlocks.DRILL_EAST)); stacks.add(new ItemStack(QuickieBlocks.DRILL_SOUTH)); @@ -199,6 +200,7 @@ public class RegistryManager { registerBlock(QuickieBlocks.COTTONPLANT, "cottonplant"); registerBlock(QuickieBlocks.BLOCKSULPHOR, "blocksulphor"); registerBlock(QuickieBlocks.BLOCKSALPETER, "blocksalpeter"); + registerBlock(QuickieBlocks.BLOCKSPEEDPOWDER, "blockspeedpowder"); registerBlock(QuickieBlocks.DRILL_DOWN, "drill"); registerBlock(QuickieBlocks.DRILL_EAST, "drilleast"); registerBlock(QuickieBlocks.DRILL_SOUTH, "drillsouth"); diff --git a/src/main/resources/assets/quickiefabric/blockstates/blockspeedpowder.json b/src/main/resources/assets/quickiefabric/blockstates/blockspeedpowder.json new file mode 100644 index 0000000..9087abb --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/blockspeedpowder.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/blockspeedpowder" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index cfc864c..8551cfe 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -58,6 +58,7 @@ "block.quickiefabric.cottonplant": "Baumwollpflanze", "block.quickiefabric.blocksulphor": "Schwefelblock", "block.quickiefabric.blocksalpeter": "Salpeterblock", + "block.quickiefabric.blockspeedpowder": "Fluchtpulverblock", "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 3b6ed6e..d726d3a 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -58,6 +58,7 @@ "block.quickiefabric.cottonplant": "cotton plant", "block.quickiefabric.blocksulphor": "block of sulfur", "block.quickiefabric.blocksalpeter": "block of salpeter", + "block.quickiefabric.blockspeedpowder": "block of speedpowder", "block.quickiefabric.drill": "drill", "block.quickiefabric.drilleast": "east drill", "block.quickiefabric.drillsouth": "south drill", diff --git a/src/main/resources/assets/quickiefabric/models/block/blockspeedpowder.json b/src/main/resources/assets/quickiefabric/models/block/blockspeedpowder.json new file mode 100644 index 0000000..54586d2 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/blockspeedpowder.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickiefabric:block/blockspeedpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/blockspeedpowder.json b/src/main/resources/assets/quickiefabric/models/item/blockspeedpowder.json new file mode 100644 index 0000000..95b38d4 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/blockspeedpowder.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/blockspeedpowder", + "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/blockspeedpowder.png b/src/main/resources/assets/quickiefabric/textures/block/blockspeedpowder.png new file mode 100644 index 0000000000000000000000000000000000000000..2b5b745f6e789da65527bcb61b6651fe83a78b43 GIT binary patch literal 4909 zcmeHLc~BE+7LNu4i>RQ8x`1SZqo^e5oFp;fN;sm1TMk8~lXRek93}w*j2D6of+7Qo zg?NBKtx~#<2!r4Sh#;ct#VEMSppFWjC<=Hi`z0V^%~VZUweugT>U8%ze&2h)_r6#8 zlJ4i@HOchvrWg!nlF(Za0Pg1c%LE6$?cNN+;8vd)6siq?hWeDX&zpXvvCWnSXiRC+7q3e?w-rHshnba8y;Ne(%E{>KiM%XP?&BO zP^_wOJ#=ukjd1e26i=wNe*UqY5%UrcUwoOBSbTAQaK^5T>@zDvBMX1{@bq$%o%;ui z6~|8cueDdrD6+nJ&#I(opuMj8hS~E)ba&@dzBx&xw$h)8!A5Vkn^1AZ8!&SF1I*gp zh0lwQtYK$PIJnHZ=|%yr&aUllm__yLh(#F8xD=Gn_Y?B@pVI+J6s*hUdDpwzG^`Hv zm_I!&&b(_!At%gu;r-AuzZBEL;HcKxhu6tb*MBUoVwoPDVC-U5Hkov#np0(({HyT~ zWf?g|8M*yui?0$cY<{r*R83!1lCjB=1vgsG7#--^l`Z_PA$7bSXglSztiWLRpWc? zZ%xnZVCC6Z>14N?WRKG8&x;SG?VK$``1bqeZa^j{iii{6xW-JsbbLRKCIPPTU8hS1#C)#9OPQ$Cd9dcB)z4Yclg5j&!sp|G07Z z3yi&QY}*doi@t#lR-5{0?@PJn)f2`?E0lZJ6*yzUx)-d&+SrVL@Llt&K3!jgQaQM< ztG5qpGezAUd~S9mXgeJW+ACDFlp|5fNw8EYMo2oj3iKTY!*$WAU`aHh#fy ztT{`-qf#Crgdu`NDn1g0dMB!pz(k)QNn*5wEhV@(n{ss=03b)SFkUB*QD`_i9>IXi z0nd6dnSeK#Xrp~;=uT&#=I*Cq#h#opLj!JMg#dFnC87DyCISc{bc!VgeR>dKc zju!>9}L1ej{JlaE}^@sx?!vX!Fhb9Q@QgQ&IQO2qz zh({cv(AtlNkV;1URk7+ALpo9k8HqvUz*GZPrF^xdmr&$4;-RM?5|yhAUV!YcEVZcY z3t3;qrq>wK86604AHn^~`g86EV_+o`aRf?9tUf%UfJe};&ygx6sFY)Pge7bW%%DO< z3LRz>=@1nrirGwv$fPrA5*kdENtlvRP(p=93o9gu9twbyP=G^Y(;z8Khlvasi$SE* z=wc$9NnsP6*oc!%CZ#awQpP95e= z62&kLVn~@RmV_ZTKuIMWPo-K8gL0yBI1(YN6p;pno^XzvpO8nOlAtdVzZh660}edG zQdAME`=SU!M4Zgpr36ChKR$=Zv}J z-*Lh<7>pV+z;8$fh8LKH|V^7A>B{1P3jgc!`$)a|u(98QfNIc`cCqP30Y? z!C)p%(_iB-`2{n9&{!)Jc^E%7wXwt!?>ohU{|Lt45(?acSeHs}-1QAKp4r&*vdg-} za!uhv@5L+HlTVb;C+9W{?2|jKswrFP*fXcvag{~-5@vc#`khS5oF%&)KTWB6bz%3D zFV;)a=HGp+aSbvtAWxfgbl7idl!?*6-M|#h( z<$h1CznJCekF(ERzrm<%R{jV6%x#>xyQYP|Grmm7IK5d(K$8@9lrVI1#t>>sEG9Dxt=i zcat7yDV04JSKo9lyVHVH&Hea3 zPjIAE?2@$Q{+fNt&2E*swimG2S9VvQzm*L3&gn=ys6A2n>l@sx)w>(iM}j*h5>W5e{~on`}hrY^q)RE4MYdytML4E}@B9lCVx)_~cC<64gph?Sq*2ebUv z4w$_48hF#Nt>)M4vAlk6sZPpH{`m!_