From d5f33eaaa2b51eabe6a13abf0c5123a07601e4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Henke?= Date: Sat, 9 Jan 2021 12:26:56 +0100 Subject: [PATCH] added drill stopper --- gradle.properties | 2 +- .../blockentity/DrillBlockEntity.java | 3 +- .../quickiefabric/blocks/BlockDrillstop.java | 30 ++++++++++++++++++ .../quickiefabric/blocks/QuickieBlocks.java | 1 + .../quickiefabric/init/RegistryManager.java | 2 ++ .../quickiefabric/blockstates/drillstop.json | 7 ++++ .../assets/quickiefabric/lang/de_de.json | 1 + .../assets/quickiefabric/lang/en_us.json | 1 + .../quickiefabric/models/block/drillstop.json | 6 ++++ .../quickiefabric/models/item/drillstop.json | 10 ++++++ .../textures/block/drillstop.png | Bin 0 -> 1859 bytes .../data/quickiefabric/recipes/drillstop.json | 20 ++++++++++++ 12 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillstop.java create mode 100644 src/main/resources/assets/quickiefabric/blockstates/drillstop.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/drillstop.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/drillstop.json create mode 100644 src/main/resources/assets/quickiefabric/textures/block/drillstop.png create mode 100644 src/main/resources/data/quickiefabric/recipes/drillstop.json diff --git a/gradle.properties b/gradle.properties index 9cbfcb0..dd01d6a 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.5 + mod_version = 1.16.4.6 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java index 6fa7092..a53d535 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java @@ -1,5 +1,6 @@ package de.jottyfan.minecraft.quickiefabric.blockentity; +import de.jottyfan.minecraft.quickiefabric.blocks.QuickieBlocks; import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Tickable; @@ -29,7 +30,7 @@ public class DrillBlockEntity extends BlockEntity implements Tickable { if (drillstep < 1) { drillstep = MAXDRILLSTEP; BlockPos down = pos.down(); - if (!world.getBlockState(down).isOf(Blocks.BEDROCK)) { + if (!world.getBlockState(down).isOf(Blocks.BEDROCK) && !world.getBlockState(down).isOf(QuickieBlocks.DRILLSTOP)) { world.breakBlock(down, true); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillstop.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillstop.java new file mode 100644 index 0000000..49e9f34 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillstop.java @@ -0,0 +1,30 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.ArrayList; +import java.util.List; + +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 BlockDrillstop extends Block { + + public BlockDrillstop() { + super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + List list = new ArrayList<>(); + list.add(new ItemStack(QuickieBlocks.DRILLSTOP)); + return list; + } +} 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 75f6ba5..c856216 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -20,4 +20,5 @@ public class QuickieBlocks { public static final BlockCottonplant COTTONPLANT = new BlockCottonplant(); public static final BlockSulphor BLOCKSULPHOR = new BlockSulphor(); public static final BlockDrill DRILL = new BlockDrill(); + public static final BlockDrillstop DRILLSTOP = new BlockDrillstop(); } 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 c670e5d..2651d35 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -141,6 +141,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.KELPSTACK)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSULPHOR)); stacks.add(new ItemStack(QuickieBlocks.DRILL)); + stacks.add(new ItemStack(QuickieBlocks.DRILLSTOP)); }).build(); private static final void registerBlock(Block block, String name) { @@ -191,6 +192,7 @@ public class RegistryManager { registerBlock(QuickieBlocks.COTTONPLANT, "cottonplant"); registerBlock(QuickieBlocks.BLOCKSULPHOR, "blocksulphor"); registerBlock(QuickieBlocks.DRILL, "drill"); + registerBlock(QuickieBlocks.DRILLSTOP, "drillstop"); } public static final void registerItems() { diff --git a/src/main/resources/assets/quickiefabric/blockstates/drillstop.json b/src/main/resources/assets/quickiefabric/blockstates/drillstop.json new file mode 100644 index 0000000..b9e3922 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/drillstop.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/drillstop" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index 26f64bc..c1d5512 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -53,6 +53,7 @@ "block.quickiefabric.cottonplant": "Baumwollpflanze", "block.quickiefabric.blocksulphor": "Schwefelblock", "block.quickiefabric.drill": "Bohrer", + "block.quickiefabric.drillstop": "Bohrerstopper", "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 3b33018..bd77dcc 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -53,6 +53,7 @@ "block.quickiefabric.cottonplant": "cotton plant", "block.quickiefabric.blocksulphor": "block of sulfur", "block.quickiefabric.drill": "drill", + "block.quickiefabric.drillstop": "drill stopper", "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/drillstop.json b/src/main/resources/assets/quickiefabric/models/block/drillstop.json new file mode 100644 index 0000000..8f0680e --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/drillstop.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickiefabric:block/drillstop" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/drillstop.json b/src/main/resources/assets/quickiefabric/models/item/drillstop.json new file mode 100644 index 0000000..2f0c675 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/drillstop.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/drillstop", + "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/drillstop.png b/src/main/resources/assets/quickiefabric/textures/block/drillstop.png new file mode 100644 index 0000000000000000000000000000000000000000..04779cda145084cb8c4b79cd9a46eacb2ff22a1b GIT binary patch literal 1859 zcmV-J2fX-+P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1Y?maHfY{hw9L5=i)74xi_|9nA9Q0%~iORbBmh zpwx4au*X(hni){vUQxHY`6B) z_2Fc^)7fA=P^uQav`Eu{a6Zk7K#!Ysf?UriLmRr$o*+c;O9CL523K>;!mk8~y5(KS)(DXeZ183rs367uoVxZt2OhMn4O=s)EVa%>f|7 z+!nzg?F}o(+OlKiMLaWb3?L{Wa?wUI7+`CqB1kb>J0UMY#@ra=dG-}6PKFtK6Ns?d zX%B9qP9Vz|i~R8>AcvCG)>vzu^)`@=HaYE#v(7p1#wM4%_QqT9y!XLJpMnl1*x-T> zA;gfPM2$VrMi+eyF~*dH5++LUmC!%Ik|pbGvdu309CFO5AbpA{wz%R;D6ym}Raa~i z)m2|ZjWso9)J>d+4#JgSCy-r}hKZcwX;riN4YDHWeq zO}FFD{chadfkz*$>_oX80mtO@&Z!76AeqSc^H|23B z>2boFdc2fXc(Di2rSg7Ucwd;&cZv3WPA^Gsy!-af5_Z1O-oOQ`7xvFaB?r49-`oRUg|225tz;4)` z^+TVYTR%P5e(k8^pDfaUU~1w>r5*;a0004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&Mm zP!xqvTcuhm4t5Z62vS|NAS&XhRVYG*P%E_RVDi#GXws0RxHt-~1qXi?s}3&Cx;nTD zg5VE`o12rOiokCHPP;1h^vnQmCb8^qI_md<&fIKqmOLVQj`&eK_swUyKw>po`EZ^<*(F%nNQMdEiHNk^lk$e*DX!n11@)f z{wG~BBu5I+^5^rw`x$*x7U;VLLTm2an&&uu0Maz8*bT1G}&M@L;s zN?l7!UQ0_}OiW)*O<+z=U{6nCQBh)2Qe#t7WK>jZS66&mT76wze_vmKVPSz|V}WF3 zf@EZZWo3hBXM|~KhHPwyZEc5cZijDg^aknR00001VoOIv0Eh)0NB{r;32;bRa{vGf z6951U69E94oEQKA00(qQO+^Rg0SO8(7{=0LMgRZ+VM#> z-v5kW-F`$uQJc?g)uUBlR6c+TBmY1bsE2I229a|-A%!4KRC|nUs0&BL@xu{1qbHn< xX~h|Y)syI;WT1&$*QPv+C9{KYjSUpXqYq>$4OzL%^lAVA002ovPDHLkV1f*dSyTW3 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/quickiefabric/recipes/drillstop.json b/src/main/resources/data/quickiefabric/recipes/drillstop.json new file mode 100644 index 0000000..7e76a15 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/drillstop.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "sss", + "srs", + "sss" + ], + "key": { + "s": { + "item": "quickiefabric:speedpowder" + }, + "r": { + "item": "minecraft:obsidian" + } + }, + "result": { + "item": "quickiefabric:drillstop", + "count": 1 + } +} \ No newline at end of file