From 534b445b4ea0b7599f1f6152d5c79f7c865fbc59 Mon Sep 17 00:00:00 2001 From: blu <87286496+Bluelightning26@users.noreply.github.com> Date: Sat, 30 Nov 2024 07:34:43 -0500 Subject: [PATCH] work early morning nov 30 --- .../pengi/potatoperks/block/ModBlocks.java | 22 ++++++++++++++---- .../net/pengi/potatoperks/item/ModItems.java | 10 ++++++++ .../blockstates/petrified_potato_ore.json | 7 ++++++ .../blockstates/purple_potato_block.json | 7 ++++++ .../assets/potatoperks/lang/en_us.json | 7 +++++- .../models/block/petrified_potato_ore.json | 6 +++++ .../models/block/purple_potato_block.json | 6 +++++ .../potatoperks/models/item/blue_potato.json | 6 +++++ .../models/item/orange_potato.json | 6 +++++ .../models/item/petrified_potato_ore.json | 3 +++ .../models/item/purple_potato.json | 6 +++++ .../models/item/purple_potato_block.json | 3 +++ .../textures/block/petrified_potato_ore.png | Bin 0 -> 705 bytes .../textures/block/purple_potato_block.png | Bin 0 -> 942 bytes .../potatoperks/textures/item/blue_potato.png | Bin 0 -> 418 bytes .../textures/item/orange_potato.png | Bin 0 -> 424 bytes .../textures/item/purple_potato.png | Bin 0 -> 428 bytes .../data/potatoperks/recipe/blue_potato.json | 13 +++++++++++ .../potatoperks/recipe/blue_potato_block.json | 18 ++++++++++++++ .../potatoperks/recipe/orange_potato.json | 13 +++++++++++ .../recipe/orange_potato_block.json | 18 ++++++++++++++ .../potatoperks/recipe/purple_potato.json | 13 +++++++++++ .../recipe/purple_potato_block.json | 18 ++++++++++++++ 23 files changed, 177 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/potatoperks/blockstates/petrified_potato_ore.json create mode 100644 src/main/resources/assets/potatoperks/blockstates/purple_potato_block.json create mode 100644 src/main/resources/assets/potatoperks/models/block/petrified_potato_ore.json create mode 100644 src/main/resources/assets/potatoperks/models/block/purple_potato_block.json create mode 100644 src/main/resources/assets/potatoperks/models/item/blue_potato.json create mode 100644 src/main/resources/assets/potatoperks/models/item/orange_potato.json create mode 100644 src/main/resources/assets/potatoperks/models/item/petrified_potato_ore.json create mode 100644 src/main/resources/assets/potatoperks/models/item/purple_potato.json create mode 100644 src/main/resources/assets/potatoperks/models/item/purple_potato_block.json create mode 100644 src/main/resources/assets/potatoperks/textures/block/petrified_potato_ore.png create mode 100644 src/main/resources/assets/potatoperks/textures/block/purple_potato_block.png create mode 100644 src/main/resources/assets/potatoperks/textures/item/blue_potato.png create mode 100644 src/main/resources/assets/potatoperks/textures/item/orange_potato.png create mode 100644 src/main/resources/assets/potatoperks/textures/item/purple_potato.png create mode 100644 src/main/resources/data/potatoperks/recipe/blue_potato.json create mode 100644 src/main/resources/data/potatoperks/recipe/blue_potato_block.json create mode 100644 src/main/resources/data/potatoperks/recipe/orange_potato.json create mode 100644 src/main/resources/data/potatoperks/recipe/orange_potato_block.json create mode 100644 src/main/resources/data/potatoperks/recipe/purple_potato.json create mode 100644 src/main/resources/data/potatoperks/recipe/purple_potato_block.json diff --git a/src/main/java/net/pengi/potatoperks/block/ModBlocks.java b/src/main/java/net/pengi/potatoperks/block/ModBlocks.java index f4759ac..bd904b8 100644 --- a/src/main/java/net/pengi/potatoperks/block/ModBlocks.java +++ b/src/main/java/net/pengi/potatoperks/block/ModBlocks.java @@ -18,7 +18,7 @@ public class ModBlocks { public static final Block PINK_POTATO_BLOCK = registerBlock("pink_potato_block", new Block(AbstractBlock.Settings.create() - .strength(1f) + .strength(0.5f) .requiresTool() .sounds(BlockSoundGroup.FLOWERING_AZALEA) .velocityMultiplier(1.25f) @@ -27,7 +27,7 @@ public class ModBlocks { public static final Block BLUE_POTATO_BLOCK = registerBlock("blue_potato_block", new Block(AbstractBlock.Settings.create() - .strength(1f) + .strength(0.5f) .requiresTool() .sounds(BlockSoundGroup.FLOWERING_AZALEA) .jumpVelocityMultiplier(2f) @@ -35,13 +35,25 @@ public class ModBlocks { )); public static final Block ORANGE_POTATO_BLOCK = registerBlock("orange_potato_block", - new ExperienceDroppingBlock(UniformIntProvider.create(5,10), AbstractBlock.Settings.create() - .strength(1f) + new Block(AbstractBlock.Settings.create() + .strength(0.5f) .requiresTool() .sounds(BlockSoundGroup.FLOWERING_AZALEA) )); + public static final Block PETRIFIED_POTATO_ORE = registerBlock("petrified_potato_ore", + new ExperienceDroppingBlock(UniformIntProvider.create(2,5), AbstractBlock.Settings.create() + .strength(2f) + .requiresTool() + .sounds(BlockSoundGroup.AZALEA_LEAVES) + )); + public static final Block PURPLE_POTATO_BLOCK = registerBlock("purple_potato_block", + new Block(AbstractBlock.Settings.create() + .strength(0.5f) + .requiresTool() + .sounds(BlockSoundGroup.FLOWERING_AZALEA) + )); @@ -63,6 +75,8 @@ public static void registerModBlocks() { entries.add(ModBlocks.PINK_POTATO_BLOCK); entries.add(ModBlocks.BLUE_POTATO_BLOCK); entries.add(ModBlocks.ORANGE_POTATO_BLOCK); + entries.add(ModBlocks.PETRIFIED_POTATO_ORE); + entries.add(ModBlocks.PURPLE_POTATO_BLOCK); }); } } diff --git a/src/main/java/net/pengi/potatoperks/item/ModItems.java b/src/main/java/net/pengi/potatoperks/item/ModItems.java index 4d736f4..15bcc68 100644 --- a/src/main/java/net/pengi/potatoperks/item/ModItems.java +++ b/src/main/java/net/pengi/potatoperks/item/ModItems.java @@ -12,6 +12,11 @@ public class ModItems { public static final Item PINK_POTATO = registerItem("pink_potato", new Item(new Item.Settings())); + public static final Item BLUE_POTATO = registerItem("blue_potato", new Item(new Item.Settings())); + + public static final Item ORANGE_POTATO = registerItem("orange_potato", new Item(new Item.Settings())); + + public static final Item PURPLE_POTATO = registerItem("purple_potato", new Item(new Item.Settings())); @@ -23,7 +28,12 @@ public static void registerModItems(){ PotatoPerks.LOGGER.info("Registering Mod Items for " + PotatoPerks.MOD_ID); ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(entries -> { + entries.add(PINK_POTATO); + entries.add(BLUE_POTATO); + entries.add(ORANGE_POTATO); + entries.add(PURPLE_POTATO); + } ); } } diff --git a/src/main/resources/assets/potatoperks/blockstates/petrified_potato_ore.json b/src/main/resources/assets/potatoperks/blockstates/petrified_potato_ore.json new file mode 100644 index 0000000..687fba5 --- /dev/null +++ b/src/main/resources/assets/potatoperks/blockstates/petrified_potato_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "potatoperks:block/petrified_potato_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/potatoperks/blockstates/purple_potato_block.json b/src/main/resources/assets/potatoperks/blockstates/purple_potato_block.json new file mode 100644 index 0000000..ae34bea --- /dev/null +++ b/src/main/resources/assets/potatoperks/blockstates/purple_potato_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "potatoperks:block/purple_potato_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/potatoperks/lang/en_us.json b/src/main/resources/assets/potatoperks/lang/en_us.json index 6a2e9b4..488d19f 100644 --- a/src/main/resources/assets/potatoperks/lang/en_us.json +++ b/src/main/resources/assets/potatoperks/lang/en_us.json @@ -1,8 +1,13 @@ { "item.potatoperks.pink_potato": "Pink Potato", + "item.potatoperks.blue_potato": "Blue Potato", + "item.potatoperks.orange_potato": "Orange Potato", + "item.potatoperks.purple_potato": "Purple Potato", "block.potatoperks.pink_potato_block": "Block of Pink Potato", "block.potatoperks.blue_potato_block": "Block of Blue Potato", - "block.potatoperks.orange_potato_block": "Block of Orange Potato" + "block.potatoperks.orange_potato_block": "Block of Orange Potato", + "block.potatoperks.petrified_potato_ore": "Petrified Potato Ore", + "block.potatoperks.purple_potato_block": "Block of Purple Potato" } \ No newline at end of file diff --git a/src/main/resources/assets/potatoperks/models/block/petrified_potato_ore.json b/src/main/resources/assets/potatoperks/models/block/petrified_potato_ore.json new file mode 100644 index 0000000..37905d5 --- /dev/null +++ b/src/main/resources/assets/potatoperks/models/block/petrified_potato_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "potatoperks:block/petrified_potato_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/potatoperks/models/block/purple_potato_block.json b/src/main/resources/assets/potatoperks/models/block/purple_potato_block.json new file mode 100644 index 0000000..e994a73 --- /dev/null +++ b/src/main/resources/assets/potatoperks/models/block/purple_potato_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "potatoperks:block/purple_potato_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/potatoperks/models/item/blue_potato.json b/src/main/resources/assets/potatoperks/models/item/blue_potato.json new file mode 100644 index 0000000..8756805 --- /dev/null +++ b/src/main/resources/assets/potatoperks/models/item/blue_potato.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "potatoperks:item/blue_potato" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/potatoperks/models/item/orange_potato.json b/src/main/resources/assets/potatoperks/models/item/orange_potato.json new file mode 100644 index 0000000..9a42e38 --- /dev/null +++ b/src/main/resources/assets/potatoperks/models/item/orange_potato.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "potatoperks:item/orange_potato" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/potatoperks/models/item/petrified_potato_ore.json b/src/main/resources/assets/potatoperks/models/item/petrified_potato_ore.json new file mode 100644 index 0000000..710c876 --- /dev/null +++ b/src/main/resources/assets/potatoperks/models/item/petrified_potato_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "potatoperks:block/petrified_potato_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/potatoperks/models/item/purple_potato.json b/src/main/resources/assets/potatoperks/models/item/purple_potato.json new file mode 100644 index 0000000..802c79a --- /dev/null +++ b/src/main/resources/assets/potatoperks/models/item/purple_potato.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "potatoperks:item/purple_potato" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/potatoperks/models/item/purple_potato_block.json b/src/main/resources/assets/potatoperks/models/item/purple_potato_block.json new file mode 100644 index 0000000..d82eb3e --- /dev/null +++ b/src/main/resources/assets/potatoperks/models/item/purple_potato_block.json @@ -0,0 +1,3 @@ +{ + "parent": "potatoperks:block/purple_potato_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/potatoperks/textures/block/petrified_potato_ore.png b/src/main/resources/assets/potatoperks/textures/block/petrified_potato_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..df92269e02fe92bf2ab8dbcdb6c49cb6fbd29d89 GIT binary patch literal 705 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&Rm5z@+Wz;uvBf z7#r-EAsi@B8+mw}+HI4tvrgtsVXBK*yB9q=*-#N0z~X8<#YxjKK=JF6HA|OYbLR76 z&5!${)Kn!@_2JP%-Y!uaorUbW(he|CO;<>zPT??Yt?)Tw^ zzYfgUV)XBU<*#otQ<%1w#ZD$U|n>2d{Uq5oXebSw`OH?MFoHFC}uK$0}J&OJR;tuBm g;ftIfd+JWfr_NHWnz(JkK2Y-UboFyt=akR{0GFgM5C8xG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/potatoperks/textures/block/purple_potato_block.png b/src/main/resources/assets/potatoperks/textures/block/purple_potato_block.png new file mode 100644 index 0000000000000000000000000000000000000000..a56f2553a6c6d4976378af6d17d559b1a08d3035 GIT binary patch literal 942 zcmV;f15x~mP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR915TFA91ONa40RR915C8xG05nx`@&Et>7)eAyR5%eGlgp0eG!%w^Uy|5~ zD@j!)T|Lt^fIx^@%pf6#_u*OKA=t2H3opQqJsSjQkcOtGFREKosj6I^*ceupEc^WD z|Ne8xci;X!ynG$eY(K*7RA1HsCthM!(fW7nGTP&W`q*0OPr4_f+#?o`S3VHb{)c#69VG7 zGr)W$U>u!yZ%?2e5se?~@$k_3yF1sezeI9F;Lk^dLO}!`!h~aSrEs})5McnPiR)E@ zNozvyH(MbLwNLvBB4r3>7VA$_eEiuJnsWR1p|8wby4*l#v)kwOy#0tT0-PjBC! zX%ri@We4lLAMPdk>I}*l&Si;-Nz4Stpmkj9_vyCE%7P>)UE7~2iI7zaVOLdG*Q4MY`gCo(+g)z_D2*vVv|XuxaE z@MMj6zKP_%J@sr;0umcC**@<7^RzuHEy1GdrOx4btxG>_XqIL$;!9!XH~5fuubTIp z`H3(#wvMz3ZUPS1cpe@0Wh#t$wEO?>Sz5*$IJKL0@aWIm%YK_9X>m47XCp%wqXOdu jMFlCgg3Oka{5HG{<`o&jY5tahpz!f@^>bP0l+XkKQ=Nl_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/potatoperks/textures/item/orange_potato.png b/src/main/resources/assets/potatoperks/textures/item/orange_potato.png new file mode 100644 index 0000000000000000000000000000000000000000..822194c46e76e612139ff7f83dceaa44a9fc5ec9 GIT binary patch literal 424 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K#jCgkbj7-Auq zoFKv4)6(=HWXZ|;6w|cR=NG(4bez_*aiZzp;)0|Lp&@BM{{50X94*G!7ROoeGJ5&x%u;!O#7p1@Wpd9S{LZ=2u|x9c22 r%#0$;4onKp4kkPgE^$njuaII$JD9zyebuRNpiuI3^>bP0l+XkK*pZB{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/potatoperks/textures/item/purple_potato.png b/src/main/resources/assets/potatoperks/textures/item/purple_potato.png new file mode 100644 index 0000000000000000000000000000000000000000..108fa86014047bb6b7ec8682f3b089fad6d5b1bd GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K#jCg$nl7-Auq zoFKv4)6%4H{Lz#86w_e88H-;eI!%PW&w#aPs8;6Kx3+ z43~H=9nn91SV2R9%}jVnq{l4g6VDPpa6EA~WI4((;n@lqUN*Tzvkh(nAD_O}Uy;VP zLE9l|{{Ooyfe8m#k{e8_S+p8VyR|nMHyD_GnETVH%is>f1dSszIVvZ-HDLI3YeE7FL+<{Ya!(~S;hd=-0e;%0S_-F2KePbOPQTBe$9gGT| z6L|mJvEk|0t7Y2FmZHtf>|*Sp%%PCY_VJ-wqs7Ox?ti~qJPiv9Pc-k~k(aM$yv>oc uIGd%jk)exGfpLPOf)rapX3I%_8(xMz=Q7@F=O+9Fg_NhOpUXO@geCwYwT;^V literal 0 HcmV?d00001 diff --git a/src/main/resources/data/potatoperks/recipe/blue_potato.json b/src/main/resources/data/potatoperks/recipe/blue_potato.json new file mode 100644 index 0000000..a476eb7 --- /dev/null +++ b/src/main/resources/data/potatoperks/recipe/blue_potato.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "potatoperks:blue_potato_block" + } + ], + "result": { + "count": 9, + "id": "potatoperks:blue_potato" + } +} \ No newline at end of file diff --git a/src/main/resources/data/potatoperks/recipe/blue_potato_block.json b/src/main/resources/data/potatoperks/recipe/blue_potato_block.json new file mode 100644 index 0000000..30909ae --- /dev/null +++ b/src/main/resources/data/potatoperks/recipe/blue_potato_block.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "potatoperks:blue_potato" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "count": 1, + "id": "potatoperks:blue_potato_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/potatoperks/recipe/orange_potato.json b/src/main/resources/data/potatoperks/recipe/orange_potato.json new file mode 100644 index 0000000..c495790 --- /dev/null +++ b/src/main/resources/data/potatoperks/recipe/orange_potato.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "potatoperks:orange_potato_block" + } + ], + "result": { + "count": 9, + "id": "potatoperks:orange_potato" + } +} \ No newline at end of file diff --git a/src/main/resources/data/potatoperks/recipe/orange_potato_block.json b/src/main/resources/data/potatoperks/recipe/orange_potato_block.json new file mode 100644 index 0000000..83a9e18 --- /dev/null +++ b/src/main/resources/data/potatoperks/recipe/orange_potato_block.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "potatoperks:orange_potato" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "count": 1, + "id": "potatoperks:orange_potato_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/potatoperks/recipe/purple_potato.json b/src/main/resources/data/potatoperks/recipe/purple_potato.json new file mode 100644 index 0000000..fc26212 --- /dev/null +++ b/src/main/resources/data/potatoperks/recipe/purple_potato.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "potatoperks:purple_potato_block" + } + ], + "result": { + "count": 9, + "id": "potatoperks:purple_potato" + } +} \ No newline at end of file diff --git a/src/main/resources/data/potatoperks/recipe/purple_potato_block.json b/src/main/resources/data/potatoperks/recipe/purple_potato_block.json new file mode 100644 index 0000000..c6030b1 --- /dev/null +++ b/src/main/resources/data/potatoperks/recipe/purple_potato_block.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "potatoperks:purple_potato" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "count": 1, + "id": "potatoperks:purple_potato_block" + } +} \ No newline at end of file