From 65f3adee478a2521806d468028cc67429992f791 Mon Sep 17 00:00:00 2001 From: Maxx <53229958+MBatt1@users.noreply.github.com> Date: Thu, 24 Oct 2024 18:37:19 -0500 Subject: [PATCH] redstoen + other ore tweaks --- .../blocks/ParadiseLostBlocks.java | 7 +- .../id/paradiselost/datagen/LootTableGen.java | 3 + .../items/ParadiseLostItemGroups.java | 1 + .../paradiselost/items/ParadiseLostItems.java | 1 + src/main/resources/asset_helper.py | 5 +- .../blockstates/floestone_redstone_ore.json | 7 ++ .../assets/paradise_lost/lang/en_us.json | 3 +- .../models/block/floestone_redstone_ore.json | 6 ++ .../models/item/floestone_redstone_ore.json | 3 + .../textures/block/chiseled_floestone.png | Bin 482 -> 468 bytes .../textures/block/cobbled_floestone.png | Bin 535 -> 520 bytes .../textures/block/floestone_redstone_ore.png | Bin 0 -> 609 bytes .../textures/block/golden_mossy_floestone.png | Bin 758 -> 750 bytes .../textures/block/mossy_floestone.png | Bin 733 -> 727 bytes .../tags/block/mineable/pickaxe.json | 1 + .../loot_table/blocks/cherine_ore.json | 16 ++++- .../blocks/floestone_redstone_ore.json | 63 ++++++++++++++++++ .../worldgen/biome/autumnal_tundra.json | 3 +- .../worldgen/biome/continental_plateau.json | 3 +- .../worldgen/biome/highlands.json | 3 +- .../worldgen/biome/highlands_forest.json | 3 +- .../worldgen/biome/highlands_grand_glade.json | 3 +- .../worldgen/biome/highlands_shield.json | 3 +- .../worldgen/biome/highlands_thicket.json | 3 +- .../worldgen/biome/tradewinds.json | 3 +- .../worldgen/biome/wisteria_woods.json | 3 +- .../ore_floestone_redstone.json | 18 +++++ .../ore_floestone_redstone.json | 27 ++++++++ 28 files changed, 169 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/assets/paradise_lost/blockstates/floestone_redstone_ore.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/floestone_redstone_ore.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/floestone_redstone_ore.json create mode 100644 src/main/resources/assets/paradise_lost/textures/block/floestone_redstone_ore.png create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/floestone_redstone_ore.json create mode 100644 src/main/resources/data/paradise_lost/worldgen/configured_feature/ore_floestone_redstone.json create mode 100644 src/main/resources/data/paradise_lost/worldgen/placed_feature/ore_floestone_redstone.json diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java index 08189e62f..c14c8a64c 100644 --- a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java +++ b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java @@ -244,10 +244,11 @@ private static Settings flower() { // Tall Flowers public static final ParadiseLostTallBrushBlock WILD_FLAX = add("wild_flax", new ParadiseLostTallBrushBlock(flower()), flammablePlant, cutoutMippedRenderLayer); - + // Ores - public static final ExperienceDroppingBlock CHERINE_ORE = add("cherine_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), create().requiresTool().strength(3f))); - public static final ExperienceDroppingBlock OLVITE_ORE = add("olvite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(1, 3), create().requiresTool().strength(3f))); + public static final ExperienceDroppingBlock CHERINE_ORE = add("cherine_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), create().requiresTool().strength(1f, 3f))); + public static final ExperienceDroppingBlock OLVITE_ORE = add("olvite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(1, 3), create().requiresTool().strength(1.5f, 3f))); + public static final RedstoneOreBlock FLOESTONE_REDSTONE_ORE = add("floestone_redstone_ore", new RedstoneOreBlock(copy(REDSTONE_ORE).strength(1.5f, 3f))); public static final ExperienceDroppingBlock SURTRUM = add("surtrum", new SurtrumOreBlock(UniformIntProvider.create(2, 5), create().sounds(BlockSoundGroup.NETHER_GOLD_ORE).requiresTool().strength(9f, 20f))); public static final Block METAMORPHIC_SHELL = add("metamorphic_shell", new Block(create().sounds(BlockSoundGroup.TUFF).requiresTool().strength(40f, 6f))); public static final PoofBlock SURTRUM_AIR = add("surtrum_air", new PoofBlock(create().replaceable().sounds(BlockSoundGroup.NETHER_GOLD_ORE))); diff --git a/src/main/java/net/id/paradiselost/datagen/LootTableGen.java b/src/main/java/net/id/paradiselost/datagen/LootTableGen.java index be2f747fe..d601b50c6 100644 --- a/src/main/java/net/id/paradiselost/datagen/LootTableGen.java +++ b/src/main/java/net/id/paradiselost/datagen/LootTableGen.java @@ -10,6 +10,8 @@ import net.minecraft.block.TallPlantBlock; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.data.server.loottable.BlockLootTableGenerator; +import net.minecraft.data.server.loottable.vanilla.VanillaBlockLootTableGenerator; +import net.minecraft.data.server.loottable.vanilla.VanillaLootTableProviders; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantments; import net.minecraft.item.Item; @@ -217,6 +219,7 @@ public void generate() { // Ores addOreDrops(CHERINE_ORE, ParadiseLostItems.CHERINE); addOreDrops(OLVITE_ORE, ParadiseLostItems.OLVITE); + addDrop(FLOESTONE_REDSTONE_ORE, this::redstoneOreDrops); addOreDrops(SURTRUM, ParadiseLostItems.RAW_SURTRUM); addDrop(METAMORPHIC_SHELL); addOreDrops(LEVITA_ORE, ParadiseLostItems.LEVITA_GEM); diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java index 7f89f3024..83ea43075 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java @@ -115,6 +115,7 @@ public class ParadiseLostItemGroups { // ores entries.add(CHERINE_ORE); entries.add(OLVITE_ORE); + entries.add(FLOESTONE_REDSTONE_ORE); entries.add(SURTRUM); entries.add(METAMORPHIC_SHELL); entries.add(LEVITA_ORE); diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java index 52e4cb988..f2938319e 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java @@ -230,6 +230,7 @@ private static Settings food(FoodComponent foodComponent) { // ores public static final BlockItem CHERINE_ORE = add(ParadiseLostBlocks.CHERINE_ORE); public static final BlockItem OLVITE_ORE = add(ParadiseLostBlocks.OLVITE_ORE); + public static final BlockItem FLOESTONE_REDSTONE_ORE = add(ParadiseLostBlocks.FLOESTONE_REDSTONE_ORE); public static final BlockItem SURTRUM = add(ParadiseLostBlocks.SURTRUM, new Settings().fireproof()); public static final BlockItem METAMORPHIC_SHELL = add(ParadiseLostBlocks.METAMORPHIC_SHELL); public static final BlockItem LEVITA_ORE = add(ParadiseLostBlocks.LEVITA_ORE); diff --git a/src/main/resources/asset_helper.py b/src/main/resources/asset_helper.py index 03c8a2f42..bb5eb832d 100644 --- a/src/main/resources/asset_helper.py +++ b/src/main/resources/asset_helper.py @@ -80,10 +80,7 @@ def generate_slab_block(block_id, base_block_id, texture): -generate_standard_item("aurel_hanging_sign") -generate_standard_item("mother_aurel_hanging_sign") -generate_standard_item("orange_hanging_sign") -generate_standard_item("wisteria_hanging_sign") +generate_standard_block("floestone_redstone_ore") diff --git a/src/main/resources/assets/paradise_lost/blockstates/floestone_redstone_ore.json b/src/main/resources/assets/paradise_lost/blockstates/floestone_redstone_ore.json new file mode 100644 index 000000000..9418b51f8 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/blockstates/floestone_redstone_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "paradise_lost:block/floestone_redstone_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/lang/en_us.json b/src/main/resources/assets/paradise_lost/lang/en_us.json index 638f5ef68..6a18ce707 100644 --- a/src/main/resources/assets/paradise_lost/lang/en_us.json +++ b/src/main/resources/assets/paradise_lost/lang/en_us.json @@ -53,7 +53,7 @@ "block.paradise_lost.cobbled_floestone_wall": "Cobbled Floestone Wall", "block.paradise_lost.mossy_floestone": "Mossy Cobbled Floestone", - "block.paradise_lost.golden_mossy_floestone": "Golden Mossy Floestone", + "block.paradise_lost.golden_mossy_floestone": "Golden Mossy Cobbled Floestone", "block.paradise_lost.mossy_floestone_slab": "Mossy Cobbled Floestone Slab", "block.paradise_lost.mossy_floestone_stairs": "Mossy Cobbled Floestone Stairs", "block.paradise_lost.mossy_floestone_wall": "Mossy Cobbled Floestone Wall", @@ -210,6 +210,7 @@ "block.paradise_lost.cherine_ore": "Cherine Ore", "block.paradise_lost.olvite_ore": "Olvite Ore", + "block.paradise_lost.floestone_redstone_ore": "Floestone Redstone Ore", "block.paradise_lost.surtrum": "Surtrum", "block.paradise_lost.metamorphic_shell": "Metamorphic Shell", "block.paradise_lost.levita_ore": "Levita Ore", diff --git a/src/main/resources/assets/paradise_lost/models/block/floestone_redstone_ore.json b/src/main/resources/assets/paradise_lost/models/block/floestone_redstone_ore.json new file mode 100644 index 000000000..4d390a2f2 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/floestone_redstone_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "paradise_lost:block/floestone_redstone_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/item/floestone_redstone_ore.json b/src/main/resources/assets/paradise_lost/models/item/floestone_redstone_ore.json new file mode 100644 index 000000000..4385f1ffa --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/floestone_redstone_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "paradise_lost:block/floestone_redstone_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/textures/block/chiseled_floestone.png b/src/main/resources/assets/paradise_lost/textures/block/chiseled_floestone.png index 9701f304af2ae29739af76930b6711916625c45b..ff208853f8f5b3876c0c37f33f17df84b0fc6ce4 100644 GIT binary patch delta 429 zcmV;e0aE_r1JnbMF@KIpL_t(2k!4b`YU4lWoW-XB-N0K&0N(cMCF4eX9 z6hm73@O6eunt*IvH?DiGWKM}G+EaH^RlAIa5M3V@VX zt4+S%Hk4UfGn4Z-H$UwDLo3}h)XdT||NSRSudL12+wo*1C32paq9D3vp3fGy*H

zCDchw&d+Cy@njTWkvJd(0CW zi|`bI$QGqEN9Fr_dU?W%Hzh)>?Q&t*4zS#vmk^%4^ XN~z##p`x_h00000NkvXXu0mjfti8`Q delta 443 zcmV;s0Yv`P1L6aaF@Ky%L_t(2k!4ani`zgDeK9Khu_M6|%u3=42cO$;=Q1IeUzaLv zeu_z&6bYofyYh%^Y|LS4F-JfdWU(HqU50M9;WA_dVR6 z0jwV%i|szLdA3@8!+%DG0I+blFXl4mc*25#icjUA=L~XEM|kG$LBF`ud&BNV`|g6`S3M+jkn`+Ou#JNH-!6clV3= z%;uRsDT%rE4|n(1%bSokPz4kK03~rFqBOYnTI>#`rjemRn4xkmwYF>BD^9H~Hai** zDTx6LbkHEq#D5r@XY6bCbr7R(gRq*^+R8a)4?x?NF<}+^3+IFDKbVQ}A*(|3< z#2reO(~Abekxs+4rzE~!-u(RWi_A#d7QYLYQ#!rqtMVeN5?C(Za_x0-W;{|Ex&mJV zh#HY}dJ+B~jfZynI;002ovPDHLkV1h;!)S&JYui8=#b0C%4Ww<*olbWWv=kFeiid!g(j|}~ z`3t%f`log5+O>@b)1i=|H7KCgB+z1Gq?1l3O?EuRbol6}={Vl^-ur#JgU_En0;p{R z0Dv|LfGjm-Woz5`t_N^+c>y3+3P6DWA4!X1LBm;U=thdDtbZ)2TjxTupG?kTrP|b$ zm7RV2&ht`4zU#F~TIb5j0th&luCmm;9-Yt)ht#&Ah5!byUcT5q>}uN_9zFqZbMxb2 zx050ojZR{vwATCm<8rkwe&5AXELZFB!~1tMT@(xMK!{vJiU@%3`tkTQjFsZ{1OwoD zI%}Pq&vR{(+J83MBy`A96SU5;6QP%tl_I*H&S+@_lck218IqL$1LcrqQ7oMAt}ZXA zo;JyRo)6C7zS(TH+9aFJcDY*bANSfMS!#yEq0#E@{?GC8vq2D$?{c*c$%#OT*mpe@ zC@cH?=@Ez1;o$GDpTs~-NJ_XQ@?GzIr=*Y~noQ2Z)>=7!9a(B(rSklia!A2ow348# zEZY+t0Ovbi8X5VnFDv`?%QWOrelWFdloaFfDS$k`<@};pND+n9l~+#lQbf$kxYY0; X@hw1Baom1r00000NkvXXu0mjfh4c1w delta 496 zcmVaWhqmxBqCNS<9}&mtSc-$#OAgg#g-usIKdq+q)J3;QaDxRjm^d@9*yk zqGwN^)K!%i`p;NxQztL9|K;;1-X2e;P6JzXG7=F3(5CF}?)ZYp_1Fx6lhc8*_Uh-a zAdHrac@ReYk$*DvjI|Dltt*u!B0f1CaA<5s%9O)w_m6sI`FFXPZ<=ORt&8G@As@yM z@fSP&ijdoomXd<75)R|Ku`5m;1**50000Px%8%ab#R49>6l0Rq@VHn1rJ1^~#+;=e$Vz_Wn3UO#ato2+Rgn)~Sf=Hd>CfKba zwp64og=oOi4nA{{5L~6c=?Rb zVr6^b&Wd%=?Fk`8DUs5J;P7}V1z<0Bj2fc=jr||a>?r_ByV;EL$>t0mS2@7@0TY6I zKB)j`t1)If-1n3-bF&vOUmuoAPitE<>-QT|W={y}Pg+?kN)k0TH$N{|EAMt|(%aqI z&ugVygTcqUx9gd7G>{|rhyPAC+j60RrKQ$`jmDHIRiEzw$Y#<2+}{U;($wkOY_tLV z>2~XxGysKA-VZ40=mosA;(epDvx$Pz8Zl{b5Gq0kx*0CZ;Z7&|mv01BaW-e0}MK78iq&k;dw(Edg{ vtGKp9)8U@)0$h#Z+di2gm5AoP$9?ZVKe-Y|E1c7e00000NkvXXu0mjf!z~pv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/paradise_lost/textures/block/golden_mossy_floestone.png b/src/main/resources/assets/paradise_lost/textures/block/golden_mossy_floestone.png index f42e2a4f87be9edb83a4d7fcb874bd4b143cf597..c26915f732fa1120877ebb593362af412c7f75c8 100644 GIT binary patch delta 713 zcmV;)0yh2j1?~lqF@LB@L_t(2kv)-JPt$N1#ZTFvuqgxwZP%{Z3rq}~LnrlyhJ+Ur zja>K=E*6dY1vK$H_!)?IUK=imdSikSL^2^J%na7KC~mHsUAMMu6Sm>P+`K69`Z?!0 z=XrkA`{xf12j@y!xzCKX=xL63Rg)_|?~rHAzqWhEOm6@X7=QBU>0yscY(d68^I2-5VZ#IP*Kah=ZJOe!fWHHIF}DFy2Dhqsp7Om7Gb z@p*>;DEZ3V!)I0|0BZ^$JRj|0ST+*5EQ%59xS6~6JY#;&ty+OcGgv zA%dGHC&kw_BB@0UgLB~l3&Xm_Yp-Wo1 zUT<{KZ50#Wn<0*OIb0#VVMC+5aO>)onVUZ=UdPFg&3Bu&^BmW)GaT=#*Bd#daNO(V zc$eVj1Azd~v46CkqkgH;8c>T`%RZ7xB}sTbYVor0^>sw_ zSEWMg`m(@~>1>i-?WUMl%YSd1_%OHM!C3~{`RVOh(sn+Gglsk8F7XUxA<;G9J* z9#7b=Uub6xDp&Y5;`iEmdMt<(MM>k`!QpdzpF(2EME0m((sfhUO=mMseBL4CzoOHY v<@A530z;HMlzc@s+TrlPZMDn#HYJmf#P=MW49C#vZdR!p$AG6jF4cI z@DcQ2JgA8=9*uX8{1IL`dN9$Gm>3l*l4yX4@)Z{f`<7h_fu?=iLR-2}N~?!e&(A!W z$#2H?>Baq>i=IM0=g2IXO?|vms2CBSBFf#qx8KT1bsm81=6{||JO`kwi}sz19smGX zdDvk@Vrp4-bBug1Zi08}Nnmua)sg~;n?d&W$WS4l>kWqjeqWtCfcj=Vx?QMnC&g0$ zoFJ|L*z|Vt`O7zcZk}YbM@%7~OQf;@Qj`*+D~iVz9B^co04R!wcM4T0pb<)lUdZPF zu#za6rg?Cfw0{8rmfpWAruMJ(wlsJ3OQP6uwcRWh_2_o=;K(I5$M+MqnRlLNfaefOi@~GG&Dko9z4<2#p$nyeo9xCS9zxpTlgTm zxzWK^jZj7L*z1aOaWhDW4)pj(Ji5AQY-q0Fz}C!UGJjD{0+y}Z?b8Uo*~hbY!Y#3M zO(CBxV&P%2E zexk^<@=iffJORJ2t<_aYt?rim`LlXL^rLEv9^JNk`^PIrB&L=DFo1*QDj7g|3V;xO zr{e80B7X$K04hdAc5}A1h1nFPoep(+YTn8kH-lRkfor;&S;M^VX1h3D&d8rZV4~HaCwErV5^G?Cy3xKAn3$WC>x+r)1 zK5hvt(N~sN*)gRW%P>ZKucN)KwzkG9vHF`C3rb&VkeXKJzAP~SW0>^l2p z_bDPsjH#BjnDM{VE;pwUXoMPxvbTS{kk2uxsFm;!oGWUG9Zf2w00000NkvXXu0mjf Dl@4cy diff --git a/src/main/resources/assets/paradise_lost/textures/block/mossy_floestone.png b/src/main/resources/assets/paradise_lost/textures/block/mossy_floestone.png index f4bc4630c55f3d62c4474086c25312ffeacbd021..9aff50ed3f518533d06f8e862d953be63e68249e 100644 GIT binary patch delta 690 zcmV;j0!{th1=j_TF@KRsL_t(2kv);mP7_fW#ZNm^Y)9L1aQ@ue!hn`&g9zvtV`7Xf zj0f$D@zjJba=R2t< z&z@eMn2va-nUR%|O{ljn8)l*4TmI-9aU`G2p(CX-jED~{_DLXMCBZm}?|Z#(vxo!v0?_SKqlZ^SLb&YFb+fH+AW z-+rhv0jMj0)k>f{uIspNwI?(%Lnjw`+Zl4YPCkFx7Ms0c9x!V<0L5+skU(E zdj4;!y~n9$-k4kJ{2H)6JAZ7wl6BVaeU)6r`j#(ZF@H%)I_tADhhtR;0Q()%{Ru)n z0m zholR{w-gkxg5Jw+(>xy;J zB+oy*Tz|1ID$!6LDcURMR1hrdT_FIlKC6uEV0PJY-CAwaj?!zgYS`IJGYgYTR_*&{ zoFu{Gvg5kC`m`$QxUTXGxet<4b$dVhzUA{TTWy9-shw^B(5=6Yi^r0gB Y2WlZ#50Rk3-v9sr07*qoM6N<$f)=@1&Hw-a delta 696 zcmV;p0!RJV1>FUZF@KjyL_t(2kv)>lP7_fa#Sd*|2I!rE4tKCl`RK%{7Ddv!!I=1g zk&PQ)fCteBapeQBb>W6YlP=V_uqp&i7@1OO9Xd0;?R+rpEka#P;`)F7Ilr89CbnO_ z*oa9O`1Q%SI+`YuTpQX#E~^oB);#?bG5~@iR@T-5_(7Q2h<^zH01w4{4K{BxK@qpL zbpWO`K*%IxK9K_0l=A6kTTjBkuimYcZA%@ccK_svf7{V8OEA_}=I0M4S9o6i$Z0Lc}= zmR8KDl&X|Eu6xk_&RL`p6~Ir^b6mInX z%j*puwL_?gJwQG0%GypT&5pH`dU&kMt-!9 zIE$)l6_wIVlJu?Ml1OrrF96qbu}Jl0U6zO+gc?x?d!8v;^)Fx3*$1nmW3SQty;RUd zQAkR>9H%Z<=Otmr@>