From 9001500056c0d1b1bc7c8c07e3d613e7ecca98b6 Mon Sep 17 00:00:00 2001 From: Walrus Date: Sun, 1 Sep 2024 19:00:43 -0400 Subject: [PATCH] test for broken items --- .../CustomBlocks/BlockManager.java | 11 +++++++++ .../keeblarcraft/CustomBlocks/MoneyBlock.java | 22 ++++++++++++++++++ .../keeblarcraft/CustomItems/ItemManager.java | 9 ++++++- .../keeblarcraft/blockstates/money_block.json | 7 ++++++ .../assets/keeblarcraft/lang/en_us.json | 1 + .../models/block/money_block.json | 21 +++++++++++++++++ .../keeblarcraft/models/item/money_block.json | 3 +++ .../textures/block/money_block.png | Bin 0 -> 1471 bytes .../loot_tables/blocks/money_block.json | 20 ++++++++++++++++ .../minecraft/tags/blocks/mineable/axe.json | 7 ++++++ .../minecraft/tags/blocks/mineable/hoe.json | 7 ++++++ .../tags/blocks/mineable/pickaxe.json | 3 ++- .../tags/blocks/mineable/shovel.json | 7 ++++++ .../tags/blocks/needs_iron_tool.json | 7 ++++++ .../tags/blocks/needs_stone_tool.json | 7 ++++++ 15 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 src/main/java/jesse/keeblarcraft/CustomBlocks/MoneyBlock.java create mode 100644 src/main/resources/assets/keeblarcraft/blockstates/money_block.json create mode 100644 src/main/resources/assets/keeblarcraft/models/block/money_block.json create mode 100644 src/main/resources/assets/keeblarcraft/models/item/money_block.json create mode 100644 src/main/resources/assets/keeblarcraft/textures/block/money_block.png create mode 100644 src/main/resources/data/keeblarcraft/loot_tables/blocks/money_block.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/axe.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json 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 0000000000000000000000000000000000000000..a6c71a53c2585d25ee778c7d7ebae5cd3353a616 GIT binary patch literal 1471 zcmV;w1wi_VP)rc4wyF9M&ds;c`H;@kpt8Zd=oD_wW66_e{UNviZv^ zYNyKl^@H#7tKa;H{r)V9h13EbD4+(6W7vfL>6pE99^GY+)E9pDwYSK^Pkw4L#lQQD zpGlT@J98>U%z%?;w+Q~6qR9Z_Dw>u+Kka+i@Ywlk%Kin*pys3I(`TjSi-#I~xOoGB z<%PvV#cyssI8@w0tY1=)lv;fkOacaopH5yq=&UIFXOyUBpGy9?V-P?gQHK*ndrj2& zPc=$QN?KD~HO)=v=Y>s2<87WM5n*Ikz zK}1<-Zu9EpUsJEQ4m?&cjv(k_OhTm-a`~2UD19;*W5KgZeJ0}Nm#(rj ze;rST7#U*B5d4V!*%A-u=9ukxymkX#|2w>T17_OC-vBEDV#br*un)OZdWR@nryJDh zRj1i&F7xQ}3f+Yg{%xVshw=~>ThQ3gTYh$|0+I@@2jQ)lm$t7H*pFB{S?12l0$Tev zy`?48R1gQ@2y6oLyYR|Qm$&}R*mxiWfrBlf^fzVkQ34iPD0k;JFw@tm@CIMGQRfGL zG%U5iONAhTZ>=5w&!HU+z_&mI48Tj3d6)3oePwi8xwd+nm3#Mi{SW7;cLjO8?L{FR zW;?|l1#B`B#0Y9ZLqSnORZh1P7XFlSW;Whb{*(L@M34UpFmWWf6vS5~01q&# z7*(c*j&FXn&nw&SWAux62m&xp00EkUSs9z~1Oco|nNNR9nOk}4{M;~MS@BAWX(;Ih zp!(n6cB4IfTF>m@xMTJ4mrQ}k7o2Yh#Ss9aiX!w)l}M+@jSk=>f&*3EVVOi#cUa_m z4}PBMI46JkA&u(Cr0Qe55zEbMT$uhnHLp#t-Y4-LDh_c%xf62n+8NHQEmIqXST$7N zemmDUsRg*QFn_4vt6STgm|0_|bB<1b8B`c*NNsM7xPBMsyYbqRamkrfhWvAGhet~_ zE^3XXJMpCR`M(Om?O`os( zCnl3c1~MDa-(5vaOr^YyF)_8uIwjM=4GcKJMS|;C(w0y9s6^WGaHMQ$n}=R$GFfCG zvjI0-ZxDGFP^=jew^oqk5_RJfj12xDz~8SB^aD(4+0z~^=@N=hSu+oxnam1oY_J;O z0ERumB4|AAP5ME724Y8zS{$!9uFpwLpJ?cJNSP4Ukn=aj4*^GoYy@r zX+l$aV3clV9X>Oe4fyfS2L!cKI1CBG6bV&E&yDf%06wGDiy^ZCRToiV zIR2qR+z*NR4a9Q23~j+=K9%W zHozqT?T=5g_wN-tn{&k75OoHz4wrg_Gi|CTk8T~2*?__B68+s%wAU9&`lZKL>Vl{P zXAqHb4RJ)T4l*0iyMK;2o&prF6ys74&yNXDv}v5bOEBF%vdJ?E1G?L1DbEgRu5KVU z1yRb)E>jCFO3e;lkpFrAd1N*qY&>9UQK_H4M|q|_KJa)cVvfgu2A0QF-C=2*{t(ZP z(B2M%D4C?T7lOQZeLd4uz4`LW5#HgS&G6dO<_RZ0`jIXAa4PAQy7r9fV?RT$Xh_(jPC=!099Q