From af9a8aed29a4b296be184d2e399ba0f63133bf36 Mon Sep 17 00:00:00 2001 From: jottyfan Date: Sun, 2 Aug 2020 15:44:20 +0200 Subject: [PATCH] added monster hoarder --- gradle.properties | 2 +- .../quickiefabric/blockentity/ItemHoarderBlockEntity.java | 3 ++- .../quickiefabric/blockentity/QuickieFabricBlockEntity.java | 1 + .../minecraft/quickiefabric/blocks/QuickieBlocks.java | 1 + .../minecraft/quickiefabric/init/RegistryManager.java | 5 +++++ src/main/resources/assets/quickiefabric/lang/de_de.json | 1 + src/main/resources/assets/quickiefabric/lang/en_us.json | 1 + 7 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 272e750..052f271 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.8.8+build.202 # Mod Properties - mod_version = 1.16.1.0 + mod_version = 1.16.1.1 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/ItemHoarderBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/ItemHoarderBlockEntity.java index d809d3a..1f47dbc 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/ItemHoarderBlockEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/ItemHoarderBlockEntity.java @@ -26,10 +26,12 @@ import net.minecraft.world.World; */ public class ItemHoarderBlockEntity extends LootableContainerBlockEntity implements Tickable { private DefaultedList stacks; + private float suckradius; public ItemHoarderBlockEntity() { super(QuickieFabricBlockEntity.ITEMHOARDER); stacks = DefaultedList.ofSize(54, ItemStack.EMPTY); + suckradius = 4f; // TODO: make it level up - able and start with 2 } // TODO: see https://fabricmc.net/wiki/tutorial:containers for a real chest @@ -55,7 +57,6 @@ public class ItemHoarderBlockEntity extends LootableContainerBlockEntity impleme public void tick() { BlockPos pos = getPos(); World world = getWorld(); - float suckradius = 4f; // TODO: make it level up - able and start with 2 Box box = new Box(pos).expand(suckradius); List entities = world.getEntities(null, box); for (Entity entity : entities) { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java index c8930e2..46bf626 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java @@ -9,4 +9,5 @@ import net.minecraft.block.entity.BlockEntityType; */ public class QuickieFabricBlockEntity { public static BlockEntityType ITEMHOARDER; + public static BlockEntityType MONSTERHOARDER; } 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 bc6270f..007ded3 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -14,4 +14,5 @@ public class QuickieBlocks { public static final BlockSandSalpeter SAND_SALPETER = new BlockSandSalpeter(); public static final BlockLavahoarder LAVAHOARDER = new BlockLavahoarder(); public static final BlockItemhoarder ITEMHOARDER = new BlockItemhoarder(); + public static final BlockMonsterhoarder MONSTERHOARDER = new BlockMonsterhoarder(); } 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 d557d6b..50a7ece 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -7,6 +7,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import de.jottyfan.minecraft.quickiefabric.blockentity.ItemHoarderBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.MonsterHoarderBlockEntity; import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity; import de.jottyfan.minecraft.quickiefabric.blocks.QuickieBlocks; import de.jottyfan.minecraft.quickiefabric.event.BreakBlockCallback; @@ -62,6 +63,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.SAND_SALPETER)); stacks.add(new ItemStack(QuickieBlocks.LAVAHOARDER)); stacks.add(new ItemStack(QuickieBlocks.ITEMHOARDER)); + stacks.add(new ItemStack(QuickieBlocks.MONSTERHOARDER)); }).build(); private static final void registerBlock(Block block, String name) { @@ -76,6 +78,8 @@ public class RegistryManager { public static final void registerBlockEntities() { QuickieFabricBlockEntity.ITEMHOARDER = Registry.register(Registry.BLOCK_ENTITY_TYPE, QUICKIEFABRIC + ":itemhoarderblockentity", BlockEntityType.Builder.create(ItemHoarderBlockEntity::new, QuickieBlocks.ITEMHOARDER).build(null)); + QuickieFabricBlockEntity.MONSTERHOARDER = Registry.register(Registry.BLOCK_ENTITY_TYPE, QUICKIEFABRIC + ":monsterhoarderblockentity", + BlockEntityType.Builder.create(MonsterHoarderBlockEntity::new, QuickieBlocks.MONSTERHOARDER).build(null)); } public static final void registerBlocks() { @@ -88,6 +92,7 @@ public class RegistryManager { registerBlock(QuickieBlocks.SAND_SALPETER, "sandsalpeter"); registerBlock(QuickieBlocks.LAVAHOARDER, "lavahoarder"); registerBlock(QuickieBlocks.ITEMHOARDER, "itemhoarder"); + registerBlock(QuickieBlocks.MONSTERHOARDER, "monsterhoarder"); } public static final void registerItems() { diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index aa85ab2..3de30ab 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -27,6 +27,7 @@ "block.quickiefabric.menu": "Bauplanwerkbank", "block.quickiefabric.lavahoarder": "Lavasauger", "block.quickiefabric.itemhoarder": "Itemsauger", + "block.quickiefabric.monsterhoarder": "Monstersauger", "msg.buildingplan.start": "beginne Konstruktionsaufnahme bei %s,%s,%s", "msg.buildingplan.end": "beende Konstruktionsaufnahme bei %s,%s,%s", "msg.buildingplan.null": "Der Bauplan ist kaputt.", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index 760dad1..15b7fa2 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -27,6 +27,7 @@ "block.quickiefabric.menu": "building plan crafting table", "block.quickiefabric.lavahoarder": "lava hoarder", "block.quickiefabric.itemhoarder": "item hoarder", + "block.quickiefabric.monsterhoarder": "monster hoarder", "msg.buildingplan.start": "started recording of construction at %s,%s,%s", "msg.buildingplan.end": "finished recording of construction at %s,%s,%s", "msg.buildingplan.null": "The building plan is damaged.",