diff --git a/gradle.properties b/gradle.properties index 007e8ad..108cf58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.10.6+build.214 # Mod Properties - mod_version = 1.16.4.1 + mod_version = 1.16.4.2 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java new file mode 100644 index 0000000..ebca09d --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java @@ -0,0 +1,29 @@ +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.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext.Builder; + +/** + * + * @author jotty + * + */ +public class BlockSulphor extends Block { + + public BlockSulphor() { + super(FabricBlockSettings.of(Material.WOOL).hardness(0.5f)); + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SULPHOR, 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 86d5223..e4c14a4 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -18,4 +18,5 @@ public class QuickieBlocks { public static final BlockMonsterhoarder MONSTERHOARDER = new BlockMonsterhoarder(); public static final BlockKelpstack KELPSTACK = new BlockKelpstack(); public static final BlockCottonplant COTTONPLANT = new BlockCottonplant(); + public static final BlockSulphor BLOCKSULPHOR = new BlockSulphor(); } 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 06199ee..10903f7 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -20,6 +20,7 @@ import de.jottyfan.minecraft.quickiefabric.tools.QuickieTools; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder; import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback; +import net.fabricmc.fabric.api.registry.FuelRegistry; import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry; import net.minecraft.block.Block; import net.minecraft.block.Blocks; @@ -137,6 +138,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.ITEMHOARDER)); stacks.add(new ItemStack(QuickieBlocks.MONSTERHOARDER)); stacks.add(new ItemStack(QuickieBlocks.KELPSTACK)); + stacks.add(new ItemStack(QuickieBlocks.BLOCKSULPHOR)); }).build(); private static final void registerBlock(Block block, String name) { @@ -183,6 +185,7 @@ public class RegistryManager { registerBlock(QuickieBlocks.MONSTERHOARDER, "monsterhoarder"); registerBlock(QuickieBlocks.KELPSTACK, "kelpstack"); registerBlock(QuickieBlocks.COTTONPLANT, "cottonplant"); + registerBlock(QuickieBlocks.BLOCKSULPHOR, "blocksulphor"); } public static final void registerItems() { @@ -215,6 +218,9 @@ public class RegistryManager { ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.COTTONSEED, 0.5f); ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.COTTON, 0.75f); + + FuelRegistry.INSTANCE.add(QuickieItems.SULPHOR, 200); + FuelRegistry.INSTANCE.add(QuickieBlocks.BLOCKSULPHOR, 2000); } public static final void registerTools() { diff --git a/src/main/resources/assets/quickiefabric/blockstates/blocksulphor.json b/src/main/resources/assets/quickiefabric/blockstates/blocksulphor.json new file mode 100644 index 0000000..44fe326 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/blocksulphor.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/blocksulphor" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index ec02e4b..6dc831d 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -51,6 +51,7 @@ "block.quickiefabric.monsterhoarder": "Monstersauger", "block.quickiefabric.kelpstack": "Seegrassbündel", "block.quickiefabric.cottonplant": "Baumwollpflanze", + "block.quickiefabric.blocksulphor": "Schwefelblock", "container.quickiefabric.backpack": "Rucksack", "msg.buildingplan.start": "beginne Konstruktionsaufnahme bei %s,%s,%s", "msg.buildingplan.end": "beende Konstruktionsaufnahme bei %s,%s,%s", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index 589d764..f6c898f 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -51,6 +51,7 @@ "block.quickiefabric.monsterhoarder": "monster hoarder", "block.quickiefabric.kelpstack": "kelp bundle", "block.quickiefabric.cottonplant": "cotton plant", + "block.quickiefabric.blocksulphor": "block of sulfur", "container.quickiefabric.backpack": "backpack", "msg.buildingplan.start": "started recording of construction at %s,%s,%s", "msg.buildingplan.end": "finished recording of construction at %s,%s,%s", diff --git a/src/main/resources/assets/quickiefabric/models/block/blocksulphor.json b/src/main/resources/assets/quickiefabric/models/block/blocksulphor.json new file mode 100644 index 0000000..3e95136 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/blocksulphor.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickiefabric:block/blocksulphor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/blocksulphor.json b/src/main/resources/assets/quickiefabric/models/item/blocksulphor.json new file mode 100644 index 0000000..c223119 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/blocksulphor.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/blocksulphor", + "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/blocksulphor.png b/src/main/resources/assets/quickiefabric/textures/block/blocksulphor.png new file mode 100644 index 0000000..ff97253 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/blocksulphor.png differ diff --git a/src/main/resources/data/quickiefabric/recipes/blocksulphor.json b/src/main/resources/data/quickiefabric/recipes/blocksulphor.json new file mode 100644 index 0000000..27a72f0 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blocksulphor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "sss", + "sss", + "sss" + ], + "key": { + "s": { + "item": "quickiefabric:sulphor" + } + }, + "result": { + "item": "quickiefabric:blocksulphor", + "count": 1 + } +} \ No newline at end of file