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 0000000..2b5b745 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/blockspeedpowder.png differ diff --git a/src/main/resources/data/quickiefabric/recipes/blockspeedpowder_from_salpetersulforcoalblock.json b/src/main/resources/data/quickiefabric/recipes/blockspeedpowder_from_salpetersulforcoalblock.json new file mode 100644 index 0000000..2853468 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockspeedpowder_from_salpetersulforcoalblock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blocksalpeter" + },{ + "item": "quickiefabric:blocksulphor" + },{ + "item": "minecraft:coal_block" + } + ], + "result": { + "item": "quickiefabric:blockspeedpowder", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockspeedpowder_from_speedpowder.json b/src/main/resources/data/quickiefabric/recipes/blockspeedpowder_from_speedpowder.json new file mode 100644 index 0000000..d24bb10 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockspeedpowder_from_speedpowder.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "sss", + "sss", + "sss" + ], + "key": { + "s": { + "item": "quickiefabric:speedpowder" + } + }, + "result": { + "item": "quickiefabric:blockspeedpowder", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/speedpowder_from_block.json b/src/main/resources/data/quickiefabric/recipes/speedpowder_from_block.json new file mode 100644 index 0000000..67fc02f --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/speedpowder_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blockspeedpowder" + } + ], + "result": { + "item": "quickiefabric:speedpowder", + "count": 9 + } +} \ No newline at end of file