diff --git a/src/main/java/jesse/keeblarcraft/CustomBlocks/BlockManager.java b/src/main/java/jesse/keeblarcraft/CustomBlocks/BlockManager.java index 90eaa36..22d9097 100644 --- a/src/main/java/jesse/keeblarcraft/CustomBlocks/BlockManager.java +++ b/src/main/java/jesse/keeblarcraft/CustomBlocks/BlockManager.java @@ -17,6 +17,7 @@ import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.block.MapColor; import net.minecraft.block.ExperienceDroppingBlock; import net.minecraft.item.BlockItem; import net.minecraft.registry.Registries; @@ -75,5 +76,15 @@ public class BlockManager { Block exampleBlockOre = new ExperienceDroppingBlock(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).sounds(BlockSoundGroup.ANCIENT_DEBRIS).requiresTool(), UniformIntProvider.create(4, 20)); RegisterBlock("example_block_ore", exampleBlockOre); RegisterBlock("example_block", exampleBlock); + RegisterBlock("money_block", MONEY_BLOCK); } + + ////CUSTOM BLOCKS BELOW + public static final Block MONEY_BLOCK = new MoneyBlock(FabricBlockSettings.create() + .mapColor(MapColor.GOLD) + .requiresTool() + .strength(5.0F, 6.0F) + .sounds(BlockSoundGroup.METAL) + .luminance(100)); + } diff --git a/src/main/java/jesse/keeblarcraft/CustomBlocks/MoneyBlock.java b/src/main/java/jesse/keeblarcraft/CustomBlocks/MoneyBlock.java new file mode 100644 index 0000000..5cd9bf5 --- /dev/null +++ b/src/main/java/jesse/keeblarcraft/CustomBlocks/MoneyBlock.java @@ -0,0 +1,22 @@ +package jesse.keeblarcraft.CustomBlocks; + +import net.minecraft.block.Block; + +//Testing to make a money block the idea is to be able to put the money in your bank at somepoint +public class MoneyBlock extends Block { + + // CommonServerUtils commonServerUtils = new CommonServerUtils(); + + // public static final BlockItem MONEY_BLOCK_ITEM = new BlockItem(BlockManager.MONEY_BLOCK, new FabricItemSettings()); + + public MoneyBlock(Settings sett) { + super(sett); + + // ItemManager.RegisterItem("money_block", MONEY_BLOCK_ITEM); + + // @Override + // public ActionResult onUse(World world, PlayerEntity player, Hand hand, BlockHitResult hit) { + // return this.getBlock().onUse(this.asBlockState(), world, hit.getBlockPos(), player, hand, hit); + // } + } +} diff --git a/src/main/java/jesse/keeblarcraft/CustomItems/ItemManager.java b/src/main/java/jesse/keeblarcraft/CustomItems/ItemManager.java index e687f57..ff20dda 100644 --- a/src/main/java/jesse/keeblarcraft/CustomItems/ItemManager.java +++ b/src/main/java/jesse/keeblarcraft/CustomItems/ItemManager.java @@ -14,7 +14,10 @@ import java.util.ArrayList; import java.util.List; import jesse.keeblarcraft.Keeblarcraft; +import jesse.keeblarcraft.CustomBlocks.MoneyBlock; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; @@ -48,6 +51,11 @@ public class ItemManager { itemList.add(newItem); } + public static void RegisterBlockItem(String name, BlockItem blockitem) { + Item newItem = Registry.register(Registries.ITEM, new Identifier(Keeblarcraft.MOD_ID, name), blockitem); + itemList.add(newItem); + } + ///////////////////////////////////////////////////////////////////////////// /// @fn RegisterAllItems /// @@ -66,5 +74,4 @@ public class ItemManager { // Item exampleItem = new Item(new FabricItemSettings()); // RegisterItem("metaljacket_helmet", exampleItem); } - } diff --git a/src/main/resources/assets/keeblarcraft/blockstates/money_block.json b/src/main/resources/assets/keeblarcraft/blockstates/money_block.json new file mode 100644 index 0000000..b4b3274 --- /dev/null +++ b/src/main/resources/assets/keeblarcraft/blockstates/money_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "keeblarcraft:block/money_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/keeblarcraft/lang/en_us.json b/src/main/resources/assets/keeblarcraft/lang/en_us.json index 67759b7..8396e60 100644 --- a/src/main/resources/assets/keeblarcraft/lang/en_us.json +++ b/src/main/resources/assets/keeblarcraft/lang/en_us.json @@ -7,5 +7,6 @@ "itemgroup.keeblarcraft": "Keeblarcraft Modded Items", "block.keeblarcraft.example_block": "Keeblarcraft example block", + "block.keeblarcraft.money_block": "Money! Money! Money!", "block.keeblarcraft.example_block_ore": "Keeblarcraft example block ore" } \ No newline at end of file diff --git a/src/main/resources/assets/keeblarcraft/models/block/money_block.json b/src/main/resources/assets/keeblarcraft/models/block/money_block.json new file mode 100644 index 0000000..20dcea5 --- /dev/null +++ b/src/main/resources/assets/keeblarcraft/models/block/money_block.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "1": "keeblarcraft:block/money_block" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#1"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#1"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#1"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/keeblarcraft/models/item/money_block.json b/src/main/resources/assets/keeblarcraft/models/item/money_block.json new file mode 100644 index 0000000..4066565 --- /dev/null +++ b/src/main/resources/assets/keeblarcraft/models/item/money_block.json @@ -0,0 +1,3 @@ +{ + "parent": "keeblarcraft:block/money_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/keeblarcraft/textures/block/money_block.png b/src/main/resources/assets/keeblarcraft/textures/block/money_block.png new file mode 100644 index 0000000..a6c71a5 Binary files /dev/null and b/src/main/resources/assets/keeblarcraft/textures/block/money_block.png differ diff --git a/src/main/resources/data/keeblarcraft/loot_tables/blocks/money_block.json b/src/main/resources/data/keeblarcraft/loot_tables/blocks/money_block.json new file mode 100644 index 0000000..7817f60 --- /dev/null +++ b/src/main/resources/data/keeblarcraft/loot_tables/blocks/money_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "conditions": "minecraft:survives_explosions" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "keeblarcraft:money_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json new file mode 100644 index 0000000..684af50 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -0,0 +1,7 @@ +{ + "replace": "false", + "values": [ + + + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json new file mode 100644 index 0000000..684af50 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json @@ -0,0 +1,7 @@ +{ + "replace": "false", + "values": [ + + + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 1ca2bd7..a8ecc6b 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "keeblarcraft:example_block", - "keeblarcraft:example_block_ore" + "keeblarcraft:example_block_ore", + "keeblarcraft:money_block" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json new file mode 100644 index 0000000..684af50 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json @@ -0,0 +1,7 @@ +{ + "replace": "false", + "values": [ + + + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json new file mode 100644 index 0000000..b16758e --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -0,0 +1,7 @@ +{ + "replace": "false", + "values": [ + "keeblarcraft:example_block" + + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json new file mode 100644 index 0000000..7e430cf --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json @@ -0,0 +1,7 @@ +{ + "replace": "false", + "values": [ + "keeblarcraft:money_block" + + ] +} \ No newline at end of file