From 83682ce03db88b1f2311a5716b96ae422007c49b Mon Sep 17 00:00:00 2001 From: jottyfan Date: Sat, 19 Dec 2020 19:41:10 +0100 Subject: [PATCH] added blocksulphor --- gradle.properties | 2 +- .../quickiefabric/blocks/BlockSulphor.java | 29 ++++++++++++++++++ .../quickiefabric/blocks/QuickieBlocks.java | 1 + .../quickiefabric/init/RegistryManager.java | 6 ++++ .../blockstates/blocksulphor.json | 7 +++++ .../assets/quickiefabric/lang/de_de.json | 1 + .../assets/quickiefabric/lang/en_us.json | 1 + .../models/block/blocksulphor.json | 6 ++++ .../models/item/blocksulphor.json | 10 ++++++ .../textures/block/blocksulphor.png | Bin 0 -> 2118 bytes .../quickiefabric/recipes/blocksulphor.json | 17 ++++++++++ 11 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java create mode 100644 src/main/resources/assets/quickiefabric/blockstates/blocksulphor.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/blocksulphor.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/blocksulphor.json create mode 100644 src/main/resources/assets/quickiefabric/textures/block/blocksulphor.png create mode 100644 src/main/resources/data/quickiefabric/recipes/blocksulphor.json 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 0000000000000000000000000000000000000000..ff9725321df20b5a91d25ed84a699cf351760808 GIT binary patch literal 2118 zcmV-M2)Xx(P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bvk|ik){O1&N1SAm4aahgf26OyzK*U=ryV|N} zURXvDf)K)8a!51&^Y3Z?g&z}n<0Yn$L$LVy>@ycMl0CokBO?_s;!{oq3vH;61G`>}*lH`-H;Spaa4e zMrtSd8M}?p7i)Lsj}ERj+V|f(cC)8B$5~zR0Z0X-i@HnMEer&l{-6tM6uYKAf~(4OR}Q=v&?KN~fK=y`C&lew|mw&WsbZf;TF*F}>f$mqr;@YBGW zgPEULXwRGXe2o%j?u3yjhQ^E0UoP{L@t<6eqd8aV64~@%g}8X-G{RWStvg165Sogq zY<%}+-txx25$nL9Y?u=kSZqBms?aO9+~(O~oLFz{DGiEU9RMQCEeM7j7_fnyP#_zb zBjmzy0zU0puiJbK{#xdn^kdGo%GXhzlr^w8{l!c`wMH=o50N zh!bx_BuJDbSxRuh2MHm>ur#Vf7k!i%VvH%~SdvRVNeU^ZlyWMWvx9_54mp~fa?Yh- z(gN27Ul)uhrE+!ESE-@Knrg14A$^)}(n5 zjXcUku1z=nlo@86Y35lT)|Ayx*6545-?K)_+G5P_aq-0(%rRaUwB$qNS5V9qS+ zl(}Dd`+>Dy_KxBKi3vbM>o&gDh~M2Fpo>$&S<8g74b}WS>q1gakPz zOZxQ3u(mM_z|x@b)13)wC)l6h+*@$Rb3h&|s1;>(`U$giv->@A>p&Q+1_K>ESe4|T z7~CCQ=(g^(<}?D6eowTq`yF&TXC|Tp3bwCu99cSu6(YVY-!S;Vo9>dmqPskd8%2fG zZoJU?SPwF+)iZ4RB}i)QSm`z{P>0;iTC5$9ml2uDn^$1GCC$WUH3wQMbfW7JBUV;T zYC4++wa;OnJjYxP79-)DaE(PyMvjOm%E1W4@OS1u87w;GMGujk<@q}$+>YaD?Vra{ z8%7>@`q3Z@x=9CTqLa8dh=O z!({Px-YUQ7*t-@5&iV^}h#AL>Rcq3Rf5Dj)POz`6yj7IqhQr9Aq}bq!$_TAv%Xacq z))SysPQE47Ee2i>DkI8)IXe1dp?cOr9o$}_Jc@RfCdH=fX#Fdp^?a52DG{bruYR>h zT*H+lt6pt3j|(kjM8Z>5Zk>;x@Z2lBYYcC~VBRrA*DV7nANu02-pLC|O~r7SGMi%! zVHI`Ph5Vh2BrO4;zUMYe6YY)T()AMf+tAId&@TxVlzwl&#@_V_R0ju;18`3-Q7Pf- z2OjNKrqQn|wl3Y3Y*VDbbkv3Z-Hy$}^iM^;OyJNjH%%tjgJFFw^)oJ{x!DD1>lq-K z#jDuf6(Y%0AaUf=`U1}%DvG_>#Jjyqzk4cO)lq3~?JbLc3U58lyEy+Z&p&b$Cr)gT z81r9)hTnr&vIi>w00B@?OjJd9Yz3r}1gxD6uAULDp9-&{60@QQwx$@frx~@T9<`_y zw5b`lsS&lQ8n&q#wy7YususAa6t}Dqx~mtttQfnk5Vox&ysZ2+*kaw;T;JJOz6A}k3q-JY=0002B zNkl(>x(Y>aQkAk8um#>r@ zBI>*Kie-rdQa7vRW=~@l8i1ERHdyZ#g8VmbKruU8-8V@Cq$2h9yf>s>WI_SZ9<6B2 zW&v^Tc~R%nWTd*g5tbcMAasQ-_?ge w%$ySb25e2s!81V06YQmVy{-~1BY&U&0Mr>UmZ`M02><{907*qoM6N<$f&+L8I{*Lx literal 0 HcmV?d00001 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