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 0000000..2d5f6f9 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/blocksalpeter.png differ 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