Skip to content

Commit dbe4cf0

Browse files
committed
Exposer block, Electrum Knife, Remove galosphere capes, temporarily remove molten lead
1 parent 68faad6 commit dbe4cf0

File tree

70 files changed

+674
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+674
-265
lines changed

CHANGELOG.txt

+19-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
1-
Other:
2-
- Updated to Minecraft: 1.17.1, Forge: 37.0.22 (forge is in beta)
3-
- Without Entities (Block Entity and entities itself)
4-
- Fixed bug where there was a small chance that random text appeared in stone on one side
1+
Build: Oreganized 1.19-1.0.3
2+
- Updated to 1.19!
3+
- Completely rewrote the mod.
4+
- Molten Lead is now registered as a liquid.
5+
- Molten Lead damage is less cruel, deals fire damage in the same way lava does but entities will still get stuck in it.
6+
- Added lava sounds to Molten Lead that will play randomly just like lava.
7+
- Electrum Armour now displays its speed benefits on its tool-tip.
8+
- Tweked the stats of Electrum tools slightly.
9+
- Rebalanced Ore generation again.
10+
- Added config for ore generation.
11+
- Changed Block of Lead recipe to use 9 ingots instead of 4.
12+
- Fixes duplication of recipes with the Lead Trapdoor when Supplimentaries is installed.
13+
- Removes the ability to duplicate lead using Tinker's Construct.
14+
- Updated several block and item textures.
15+
- Added optional compatibility with other mods.
16+
- Most recipes now utilise forge tags for ingredients.
17+
- Electrum Armour will display its own coloured points on the GUI when Detail Armor Bar is installed.
18+
- Several recipes for the Create mod, including crushing recipes for Lead and Silver, and the ability to make Molten Lead with a mixer and basin.
19+
- Electrum Knife for Farmer's Delight.

build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,13 @@ dependencies {
103103
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
104104

105105
// compile against the JEI API but do not include it at runtime
106-
//compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
107-
//compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
106+
//compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"))
107+
//compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}"))
108108
// at runtime, use the full JEI jar for Forge
109-
//runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
109+
//runtimeOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}"))
110110

111111
//implementation fg.deobf("curse.maven:detailab-520755:3865073")
112+
implementation fg.deobf("curse.maven:farmers-delight-398521:3916069")
112113

113114
runtimeOnly fg.deobf("curse.maven:catalogue-459701:3873264")
114115
runtimeOnly fg.deobf("curse.maven:configured-457570:3872190")

src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05

+26-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19 2022-07-10T12:47:31.024499379 oreganized Block States
1+
// 1.19 2022-07-30T13:32:13.290574228 oreganized Block States
22
d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json
33
05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json
44
5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json
@@ -11,6 +11,7 @@ c1a188e052dc339804e5a201559b11fb8b43fec4 assets/oreganized/blockstates/cyan_crys
1111
8b7ca6fbce4b9d9e566adde74d2c27386cd1bdf8 assets/oreganized/blockstates/deepslate_lead_ore.json
1212
91256f551a38187fc36c676586147444a26b6ef5 assets/oreganized/blockstates/deepslate_silver_ore.json
1313
f0b8760d1a59408e5a3e68a4ad55e45c0601c07b assets/oreganized/blockstates/electrum_block.json
14+
7f04b6058aeb477dc9a34745e1fec155c141ea74 assets/oreganized/blockstates/exposer.json
1415
7098288ccd6ba925fb22bad6197a39f177bd82bf assets/oreganized/blockstates/glance.json
1516
5382067f2b58b89788f38327e94e1a196cf01482 assets/oreganized/blockstates/glance_brick_slab.json
1617
7273d1ccc83ec55f1b3aad15748a9b33f124d688 assets/oreganized/blockstates/glance_brick_stairs.json
@@ -33,8 +34,6 @@ afb1d4d0ee24999ae3023290f97fdccda3979a19 assets/oreganized/blockstates/lime_crys
3334
c716019d58b098ac26affc31be09491e2de296e2 assets/oreganized/blockstates/lime_crystal_glass_pane.json
3435
23860a3cdce3dabc87834f8b22b164a9d12bad71 assets/oreganized/blockstates/magenta_crystal_glass.json
3536
b2da99204da7dab9df568e4bc6111eebcb057972 assets/oreganized/blockstates/magenta_crystal_glass_pane.json
36-
ccf62408a271b0101097d7d557b49b34fd07d083 assets/oreganized/blockstates/molten_lead_block.json
37-
10ba525a3b9d3eddc1e79feed3ef2f7e7cfff0b8 assets/oreganized/blockstates/molten_lead_cauldron.json
3837
d9536dcff6be202d9b5d821c54ea54391f8ee1de assets/oreganized/blockstates/orange_crystal_glass.json
3938
3468335e1b3d19afd9713cf2171f7f28771ff751 assets/oreganized/blockstates/orange_crystal_glass_pane.json
4039
ea33f3305a768cacbe05a2cdc8475284c39afcad assets/oreganized/blockstates/pink_crystal_glass.json
@@ -154,6 +153,30 @@ e608b753dce2a8b19cb7dbee4045c14c15eecef7 assets/oreganized/models/block/cyan_cry
154153
28e5c8efea3bcd11f22ff5d8fc42e027451a8c94 assets/oreganized/models/block/deepslate_lead_ore.json
155154
5f9de10cb0e348003b4ad9fa8bfc1fa9278e3df1 assets/oreganized/models/block/deepslate_silver_ore.json
156155
70dd1a0c1846410be1610e21f3f6e7458dc530a3 assets/oreganized/models/block/electrum_block.json
156+
79199d09033b0b4eb01d1f7fd1cd4e36690015e2 assets/oreganized/models/block/exposer_level_0_down.json
157+
79199d09033b0b4eb01d1f7fd1cd4e36690015e2 assets/oreganized/models/block/exposer_level_0_east.json
158+
79199d09033b0b4eb01d1f7fd1cd4e36690015e2 assets/oreganized/models/block/exposer_level_0_north.json
159+
79199d09033b0b4eb01d1f7fd1cd4e36690015e2 assets/oreganized/models/block/exposer_level_0_south.json
160+
79199d09033b0b4eb01d1f7fd1cd4e36690015e2 assets/oreganized/models/block/exposer_level_0_up.json
161+
79199d09033b0b4eb01d1f7fd1cd4e36690015e2 assets/oreganized/models/block/exposer_level_0_west.json
162+
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_down.json
163+
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_east.json
164+
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_north.json
165+
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_south.json
166+
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_up.json
167+
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_west.json
168+
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_down.json
169+
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_east.json
170+
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_north.json
171+
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_south.json
172+
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_up.json
173+
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_west.json
174+
7285bb4a2d49cb5fdfb8610f9ce4a84b929aefc0 assets/oreganized/models/block/exposer_level_3_down.json
175+
7285bb4a2d49cb5fdfb8610f9ce4a84b929aefc0 assets/oreganized/models/block/exposer_level_3_east.json
176+
7285bb4a2d49cb5fdfb8610f9ce4a84b929aefc0 assets/oreganized/models/block/exposer_level_3_north.json
177+
7285bb4a2d49cb5fdfb8610f9ce4a84b929aefc0 assets/oreganized/models/block/exposer_level_3_south.json
178+
7285bb4a2d49cb5fdfb8610f9ce4a84b929aefc0 assets/oreganized/models/block/exposer_level_3_up.json
179+
7285bb4a2d49cb5fdfb8610f9ce4a84b929aefc0 assets/oreganized/models/block/exposer_level_3_west.json
157180
9b44bee43c08518c3880b29784895a8ee563d01a assets/oreganized/models/block/glance.json
158181
de9c306cb47beaa419a6155f46f93488fba9277e assets/oreganized/models/block/glance_brick_slab.json
159182
888929741f7ed5f4893e5800b74a2ba78993be32 assets/oreganized/models/block/glance_brick_slab_top.json
@@ -318,11 +341,6 @@ f61dd79a1da013e1fc0b59cf0991c6e5e97b0694 assets/oreganized/models/block/magenta_
318341
3c85ff6451d8a472d8e7cae8a2ae7fc2d47ced30 assets/oreganized/models/block/magenta_crystal_glass_pane_side_out.json
319342
23db59d9843ded540b0b71ec72d9a7c1654034c7 assets/oreganized/models/block/magenta_crystal_glass_pane_side_rot.json
320343
64b8bf65885c03ae44e23aee011008ccb67cb60d assets/oreganized/models/block/magenta_crystal_glass_rot.json
321-
ac3aac106f1b01d711ade6ff06de35c94ae2b1bd assets/oreganized/models/block/molten_lead_block.json
322-
d6b67784754f6683734081c363b4f9b72f1f388b assets/oreganized/models/block/molten_lead_cauldron0.json
323-
e831cbb457d1314e3c0f5a7706992c90c35337a6 assets/oreganized/models/block/molten_lead_cauldron1.json
324-
e831cbb457d1314e3c0f5a7706992c90c35337a6 assets/oreganized/models/block/molten_lead_cauldron2.json
325-
a93195bb7d6904f9512a944718ed3e277dd49825 assets/oreganized/models/block/molten_lead_cauldron3.json
326344
35086543e21148211924a5e13792cce6bb365d83 assets/oreganized/models/block/orange_crystal_glass.json
327345
b4262704315207fff392059489bc6ff455edcd6f assets/oreganized/models/block/orange_crystal_glass_in.json
328346
ee10355a9987ec39116788eda5ecab7efb1bf0ed assets/oreganized/models/block/orange_crystal_glass_out.json

src/generated/resources/.cache/22579552b8e6a9abf2bad23255903c22fcc2f0b3

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19 2022-07-10T12:37:41.049939266 Oreganized Loot Tables
1+
// 1.19 2022-07-30T13:10:31.987466537 Oreganized Loot Tables
22
0cfa73831c075466c39360be7ce4755e59a5f8da data/oreganized/loot_tables/blocks/black_crystal_glass.json
33
71d8ec7dc9eb667593d9f684600abd9f6d1f5bd6 data/oreganized/loot_tables/blocks/black_crystal_glass_pane.json
44
03c4dbd47ced3a72deb8b79f023e191962ca002b data/oreganized/loot_tables/blocks/blue_crystal_glass.json
@@ -34,8 +34,6 @@ c3cf5284c81383861b5dc333abbc086b9d67e7a3 data/oreganized/loot_tables/blocks/lime
3434
9a01eff8459c71b063f18574f79c50c8b976f561 data/oreganized/loot_tables/blocks/lime_crystal_glass_pane.json
3535
c91a0f4453062a391208a2c051e625a45474b67d data/oreganized/loot_tables/blocks/magenta_crystal_glass.json
3636
eba4bf07df7aff653844212fb750c59bfcb15ee9 data/oreganized/loot_tables/blocks/magenta_crystal_glass_pane.json
37-
2b2a4bde1a1c86393b28fa3ff9b81ef1ddeed22d data/oreganized/loot_tables/blocks/molten_lead_block.json
38-
548d115eeb79b74d3fbe03951bdc179110ed6f8a data/oreganized/loot_tables/blocks/molten_lead_cauldron.json
3937
abf48d37c2092903482490b6105185b2a7da62dc data/oreganized/loot_tables/blocks/orange_crystal_glass.json
4038
650517ab8dcfc1f28e5fe5d01c05ac33f3038188 data/oreganized/loot_tables/blocks/orange_crystal_glass_pane.json
4139
bc1e5be8102dd19b826a8f4e420d4151d855211a data/oreganized/loot_tables/blocks/pink_crystal_glass.json

src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19 2022-07-07T13:40:59.299117329 oreganized Item Models
1+
// 1.19 2022-08-05T13:25:12.62855995 oreganized Item Models
22
18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json
33
30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json
44
8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json
@@ -18,11 +18,13 @@ e92973bf0ef016b526e0992bc6af2b1d48157391 assets/oreganized/models/item/electrum_
1818
9814ea39a7c3d2359241c5f886e71b159c30fe5a assets/oreganized/models/item/electrum_helmet.json
1919
dabbb804096b43b53b35e91e6af0be9e3159d7c4 assets/oreganized/models/item/electrum_hoe.json
2020
a81f54a67369904cffeb3725f1391afced85c5fd assets/oreganized/models/item/electrum_ingot.json
21+
11e1d020c32c5e56cd1342822536378ea1069379 assets/oreganized/models/item/electrum_knife.json
2122
af1a71e7fe638c335ee624f94b200fc5ec347b55 assets/oreganized/models/item/electrum_leggings.json
2223
2d8ac3c987dcd961d7505b71cda23b4c149a1348 assets/oreganized/models/item/electrum_nugget.json
2324
225acc16e9cf1908e9199f83cfe63342fc724cf2 assets/oreganized/models/item/electrum_pickaxe.json
2425
ba6dafcb3b21faf4eb7886b812f205e91e59a49d assets/oreganized/models/item/electrum_shovel.json
2526
05cacc76a2e9820c58a78e8456d69278e41ce32f assets/oreganized/models/item/electrum_sword.json
27+
1eeae5d92f8a92dc5ea2c30f17913213fb30af80 assets/oreganized/models/item/exposer.json
2628
5d88c542b8ca2e9e8768e2624f1b560ef793d32c assets/oreganized/models/item/glance.json
2729
c907552eecc918e0bc5f5bd7a457004fd6940136 assets/oreganized/models/item/glance_brick_slab.json
2830
7fb0d10cd561abd9015d83d39160efefe46afc3e assets/oreganized/models/item/glance_brick_stairs.json
@@ -47,7 +49,6 @@ e5cb92ebff46639ff0dafa4ddf23cf47c7477ad3 assets/oreganized/models/item/light_gra
4749
632ad6e9e36a3b06e53e546073f56426fa9e27a9 assets/oreganized/models/item/lime_crystal_glass_pane.json
4850
1f00a2ac13d144011fbf0b44f53f3dd4bb904959 assets/oreganized/models/item/magenta_crystal_glass.json
4951
4cbb48e036379c1a25aff26c097e960db03958b7 assets/oreganized/models/item/magenta_crystal_glass_pane.json
50-
ab4ff89f9d171d8a8310df55e33939984a25bef1 assets/oreganized/models/item/molten_lead_bucket.json
5152
bcb950b6e54bac7158608bb0328613fe054cb335 assets/oreganized/models/item/music_disc_18.json
5253
22ca1d1b310f6919b9c4be77e6cdc206cf4430d8 assets/oreganized/models/item/music_disc_pillaged.json
5354
110e0f09c46505e5a10a1aee46723aa83234b34e assets/oreganized/models/item/music_disc_shulk.json

src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19 2022-07-10T12:37:41.048072763 Oreganized Block Tags
1+
// 1.19 2022-07-30T13:10:31.994678843 Oreganized Block Tags
22
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json
33
d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json
44
4e9173550595ca2ada5744dc749553e93b05954f data/forge/tags/blocks/ore_rates/singular.json
@@ -12,7 +12,6 @@ bb0420ecbadc747d984fcef0fe7fc67586bc3231 data/forge/tags/blocks/storage_blocks/l
1212
05f4708355ed88fe57116020dd93ac53f3098dba data/forge/tags/blocks/storage_blocks/raw_silver.json
1313
bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/blocks/storage_blocks/silver.json
1414
7a1e2c391ad442cdc57f69ce1737207bc52bfb84 data/minecraft/tags/blocks/beacon_base_blocks.json
15-
82c03c405a971b2a7fc3fd43a9fb6c221f463ce0 data/minecraft/tags/blocks/cauldrons.json
1615
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json
1716
5a8e60c552af80b2db83e902fa1815f0de135415 data/minecraft/tags/blocks/mineable/pickaxe.json
1817
18d101d6d861d499b4d27ac8d272972b51567954 data/minecraft/tags/blocks/slabs.json

src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19 2022-07-07T13:45:36.965862533 Oreganized Item Tags
1+
// 1.19 2022-08-05T13:25:12.631352696 Oreganized Item Tags
22
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/items/glass.json
33
d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/items/glass_panes.json
44
e49cb4f6d619d05263a53690780f08940350b817 data/forge/tags/items/ingots.json
@@ -27,7 +27,7 @@ a10882e76648ec622d3959e59ab410862e79a73a data/minecraft/tags/items/music_discs.j
2727
18d101d6d861d499b4d27ac8d272972b51567954 data/minecraft/tags/items/slabs.json
2828
0cf9d7544e86c09563b78276d5c89d9043425222 data/minecraft/tags/items/stairs.json
2929
a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/items/walls.json
30-
6cd0e8de228bbf9c1a7f34a398208f2f02158897 data/oreganized/tags/items/consumable.json
30+
bf92248aa238b9249b37556429d1099621ccd963 data/oreganized/tags/items/consumable.json
3131
8a4260a519a095e1c7ae01a46a060b752181db1b data/oreganized/tags/items/crystal_glass.json
3232
da4735d89f606e1f2dd3959668141d3c1475bb67 data/oreganized/tags/items/crystal_glass_panes.json
33-
f7810c755845dc955112f7b0cedf68260ad693cc data/oreganized/tags/items/lead_source.json
33+
2542d04a20bde23c78d886bbd71133ceceba0097 data/oreganized/tags/items/lead_source.json
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.19 2022-07-10T12:37:41.049371117 Languages: en_us
2-
ca609cec87743b116a5122163589dd1942d2e4dc assets/oreganized/lang/en_us.json
1+
// 1.19 2022-08-05T13:25:12.630672062 Languages: en_us
2+
19943815d27716197455eda0e1e0868749c87bd7 assets/oreganized/lang/en_us.json

0 commit comments

Comments
 (0)