Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More Mod Compat 7 #7321

Open
wants to merge 10 commits into
base: mc1.20.1/dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Silent Gems compat
  • Loading branch information
Attack8 committed Sep 6, 2024
commit 8db1c0268da5cb374f222cc0fb1b8a43236a02cf
14 changes: 11 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ dependencies {
// implementation fg.deobf("curse.maven:ic2-classic-242942:5555152") not updated to 1.20
// implementation fg.deobf("curse.maven:druidcraft-340991:3101903") not updated to 1.20
// implementation fg.deobf("com.railwayteam.railways:Steam_Rails-forge-1.20.1:1.6.4+forge-mc1.20.1") { transitive = false }

//
// runtimeOnly fg.deobf("curse.maven:framedblocks-441647:5629578")
// runtimeOnly fg.deobf("curse.maven:galosphere-631098:4983871")
// runtimeOnly fg.deobf("curse.maven:elementary-ores-332609:4622524")
// runtimeOnly fg.deobf("curse.maven:flib-661261:5495793")
runtimeOnly fg.deobf("curse.maven:elementary-ores-332609:4622524")
runtimeOnly fg.deobf("curse.maven:flib-661261:5495793")
// runtimeOnly fg.deobf("curse.maven:infernal-expansion-395078:4002091") not updated to 1.20
// runtimeOnly fg.deobf("org.violetmoon.zeta:Zeta:1.0-9.44")
// runtimeOnly fg.deobf("org.violetmoon.quark:Quark:4.0-461.3475")
Expand Down Expand Up @@ -214,6 +214,14 @@ dependencies {
// runtimeOnly fg.deobf("curse.maven:blueprint-382216:5292242")
// runtimeOnly fg.deobf("curse.maven:windsweptmod-636321:4817132") not updated to 1.20
// runtimeOnly fg.deobf("curse.maven:good-ending-690161:5024405")
runtimeOnly fg.deobf("curse.maven:terrablender-563928:5378180")
runtimeOnly fg.deobf("curse.maven:regions-unexplored-659110:5558225")
runtimeOnly fg.deobf("curse.maven:vampirism-become-a-vampire-233029:5526512")
runtimeOnly fg.deobf("curse.maven:applied-energistics-2-223794:5641282")
runtimeOnly fg.deobf("curse.maven:silent-lib-242998:4585754")
runtimeOnly fg.deobf("curse.maven:silents-gems-220311:5193708")
runtimeOnly fg.deobf("curse.maven:project-vibrant-journeys-300297:5676296")


// https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-02T22:36:27.2901169 Create's Processing Recipes
// 1.20.1 2024-09-06T15:13:15.0209174 Create's Processing Recipes
3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json
8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json
8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json
Expand Down Expand Up @@ -56,20 +56,70 @@ c9f6c53c34c4891a245dd9515eb573b40b4f3e0b data/create/recipes/crushing/compat/exn
b04f95c02f37a0398c209a02ad08a8b0e9aaaaa9 data/create/recipes/crushing/compat/galosphere/lumiere.json
bea05bc584958f479078cd6c16a06c50eae859cc data/create/recipes/crushing/compat/neapolitan/ice.json
2358ce4b7a3acb08d3d0a3e64295fb97dea2ec02 data/create/recipes/crushing/compat/quark/moss_block.json
2631b2bdcf091f4d400e0a9d2be6f1f772edfdc9 data/create/recipes/crushing/compat/silentgems/alexandrite_ore.json
d11b5a993f5ed0105eb63361d8e9e8739d8a5273 data/create/recipes/crushing/compat/silentgems/ammolite_ore.json
3f60a2cdfec1d15ad4dd8ccc5fd4e7d14ccafc14 data/create/recipes/crushing/compat/silentgems/black_diamond_ore.json
21c0ee3b80c3c9b5612367b63a981fe526d5d996 data/create/recipes/crushing/compat/silentgems/carnelian_ore.json
1f5eaa337f7b3262b83d99b2d8e8179bbf20fc89 data/create/recipes/crushing/compat/silentgems/citrine_ore.json
f3257c0e08c4da373862ab9128df3a28fec17d26 data/create/recipes/crushing/compat/silentgems/iolite_ore.json
ea65f0bb86c444401491f2f020dc040d263f4def data/create/recipes/crushing/compat/silentgems/kyanite_ore.json
36f7fe4671a8ec1f8aa7a78260ce306033501691 data/create/recipes/crushing/compat/silentgems/moldavite_ore.json
f900b850c6202c0445bdfcb4eb69d8e18dce5d26 data/create/recipes/crushing/compat/silentgems/alexandrite_end_ore.json
1ba7a7d31046886b6e76a58ef1adff51f47454a7 data/create/recipes/crushing/compat/silentgems/alexandrite_nether_ore.json
31f65b4e7aaa1680ecfb25ecd2c0786d0b18e5ab data/create/recipes/crushing/compat/silentgems/alexandrite_ore.json
dec3f626882dd2ec0f6122b7e79469c0cfef54f2 data/create/recipes/crushing/compat/silentgems/ammolite_end_ore.json
44d33b87d554a6ce811fd86499aa5eacd6f990a5 data/create/recipes/crushing/compat/silentgems/ammolite_nether_ore.json
95f9b4a7003acf50653624c4d783a6de4e0226d8 data/create/recipes/crushing/compat/silentgems/ammolite_ore.json
ff92b169d65290dfcbc5946ebdb142c4d237ee7b data/create/recipes/crushing/compat/silentgems/black_diamond_end_ore.json
4d52b622b039b27b5f69e15cc2e30dee5f0d5501 data/create/recipes/crushing/compat/silentgems/black_diamond_nether_ore.json
f18602944e64e83e0be66aa547f24fd8470c7577 data/create/recipes/crushing/compat/silentgems/black_diamond_ore.json
db66e88cdcf0c6e9fad3796be18bc680b5eb96a8 data/create/recipes/crushing/compat/silentgems/carnelian_end_ore.json
2539e16e283e21dc0d3115d1638d2d04800d33c7 data/create/recipes/crushing/compat/silentgems/carnelian_nether_ore.json
bcfbaf0ecb5ab7153eeef80905a69cbe63b7755d data/create/recipes/crushing/compat/silentgems/carnelian_ore.json
caba493b22df7f0792ae7bd980b17ea5d6ad54c1 data/create/recipes/crushing/compat/silentgems/citrine_end_ore.json
0c2651ebb5a562ad348b3f44fbe3596a24fde75d data/create/recipes/crushing/compat/silentgems/citrine_nether_ore.json
155765ae779878297cf976eb772be798e9e25561 data/create/recipes/crushing/compat/silentgems/citrine_ore.json
b660c56278840f733b11a8198afc3b8f86a9cada data/create/recipes/crushing/compat/silentgems/deepslate_alexandrite_ore.json
86bcc4f60356e5adb203e942de4393eb129847e2 data/create/recipes/crushing/compat/silentgems/deepslate_ammolite_ore.json
fb99e7f90ba32c8a0174e875ca0ff8d030fb6acd data/create/recipes/crushing/compat/silentgems/deepslate_black_diamond_ore.json
f5460586ea360d4f559b37bf474435dd54be5e47 data/create/recipes/crushing/compat/silentgems/deepslate_carnelian_ore.json
ebd39e46fbb0e4f733a96659aa57b1fa2c41d63e data/create/recipes/crushing/compat/silentgems/deepslate_citrine_ore.json
0e0d7f9542eec348b520afa92279daa22f71eefd data/create/recipes/crushing/compat/silentgems/deepslate_heliodor_ore.json
6e9e9b38792e86f83f4211011ebb2bbdadb2f79b data/create/recipes/crushing/compat/silentgems/deepslate_iolite_ore.json
4cfe43127c0fc34a2ae61e5754a4b30d0c0c676a data/create/recipes/crushing/compat/silentgems/deepslate_kyanite_ore.json
0dbe3d3cfddb3a0cdd8b334829e5e74f5d0bae4e data/create/recipes/crushing/compat/silentgems/deepslate_moldavite_ore.json
7b04727aea7bc74bc252288e920e97d79c06a8e2 data/create/recipes/crushing/compat/silentgems/deepslate_peridot_ore.json
647388ea8f0adbe959aafe68feb65eba51682cab data/create/recipes/crushing/compat/silentgems/deepslate_rose_quartz_ore.json
176158d55d84fce29430fda5bf2fa0793999bcae data/create/recipes/crushing/compat/silentgems/deepslate_ruby_ore.json
4613b83f8fc93667ea27cb0ce48e444aa4d73132 data/create/recipes/crushing/compat/silentgems/deepslate_sapphire_ore.json
761126bf0b74a2d9e7d4c1848e619483769eecb3 data/create/recipes/crushing/compat/silentgems/deepslate_topaz_ore.json
cd42d8256b980eafa23687a40e8111c07b972970 data/create/recipes/crushing/compat/silentgems/deepslate_turquoise_ore.json
6f42c33c36886c556dcfbb31bd9bd3938a1d1727 data/create/recipes/crushing/compat/silentgems/deepslate_white_diamond_ore.json
f6a37d9b53dbfb7ee46be1783463d39f7e904102 data/create/recipes/crushing/compat/silentgems/heliodor_end_ore.json
997028c9d74f8b831643a0a099f8ca07b3e12047 data/create/recipes/crushing/compat/silentgems/heliodor_nether_ore.json
3169e8b2954a7c96cd702b0c79818aa5a0ce4cf5 data/create/recipes/crushing/compat/silentgems/heliodor_ore.json
442c7abc7ecec2e314b4fc20751981e43063eb99 data/create/recipes/crushing/compat/silentgems/iolite_end_ore.json
4a65384dbb82969949667cbf7d3a7730fccc9766 data/create/recipes/crushing/compat/silentgems/iolite_nether_ore.json
40d54595e138de33950174f0234ae3ed783e1b19 data/create/recipes/crushing/compat/silentgems/iolite_ore.json
17bea79fd7ffb80bc0cff9ee10552ae267c9b402 data/create/recipes/crushing/compat/silentgems/kyanite_end_ore.json
22d77ad9b0f95bec656fb02d2e13f3c1df71f0ea data/create/recipes/crushing/compat/silentgems/kyanite_nether_ore.json
a45ee21a958e229a690daf6cdd8f26f87870f436 data/create/recipes/crushing/compat/silentgems/kyanite_ore.json
aa47ba8cc7e57d7256b95d1d5a6fb7a78c9c89f9 data/create/recipes/crushing/compat/silentgems/moldavite_end_ore.json
b2901739de77748d36c84c44e7e1eb900e68d0dd data/create/recipes/crushing/compat/silentgems/moldavite_nether_ore.json
6af3123f09b59dc4c99e65aad9af17eb761e32ff data/create/recipes/crushing/compat/silentgems/moldavite_ore.json
b6ede472556ea7fd4d28a701e0024f7397c54e39 data/create/recipes/crushing/compat/silentgems/peridot_end_ore.json
619b0b258c7a40c8ecdcf8018a83907b6e10b2ef data/create/recipes/crushing/compat/silentgems/peridot_nether_ore.json
466501f69b3c8b3ca7ad63f8db29f23136269e94 data/create/recipes/crushing/compat/silentgems/peridot_ore.json
ff54345899fa142839e496a737fa0a740b0d32db data/create/recipes/crushing/compat/silentgems/rose_quartz_ore.json
f56ebf1009c8c05bcd3e41f92b594c8a0575cb01 data/create/recipes/crushing/compat/silentgems/rose_quartz_end_ore.json
9e48053aea52dbbcc3cbacb8475b773b45e57829 data/create/recipes/crushing/compat/silentgems/rose_quartz_nether_ore.json
290bd5015083523ec3c5bc9f06aa8753146d2d6a data/create/recipes/crushing/compat/silentgems/rose_quartz_ore.json
c4e876bf316b5b745d4627984d5080b4d1422fb6 data/create/recipes/crushing/compat/silentgems/ruby_end_ore.json
52f4d98ce2fe720202442c92bfb886dba5f6f4be data/create/recipes/crushing/compat/silentgems/ruby_nether_ore.json
701ed26488cda81ee2ddd48e51f96890dee99899 data/create/recipes/crushing/compat/silentgems/ruby_ore.json
2254159a9c399e5566a64918ce5fed5abc28ad0e data/create/recipes/crushing/compat/silentgems/sapphire_end_ore.json
c6e70ec3904b09cdcf95cce8983ee25410f8fdf0 data/create/recipes/crushing/compat/silentgems/sapphire_nether_ore.json
f71bbcece1d63299ccf5bf892883abc67bab1d7d data/create/recipes/crushing/compat/silentgems/sapphire_ore.json
2ec4771bc54e234dab27b856d2ef0be31ec0144e data/create/recipes/crushing/compat/silentgems/topaz_end_ore.json
a23e10e76df0d950179966f96290104e5d159d4a data/create/recipes/crushing/compat/silentgems/topaz_nether_ore.json
7e65a919156d62f2316b91198477eb3745285711 data/create/recipes/crushing/compat/silentgems/topaz_ore.json
4fb0c49b9385436cd85445c1ff0d7c0a69121596 data/create/recipes/crushing/compat/silentgems/turquoise_ore.json
2e58e355e95d4ba20b6cd8aa7865482b05c26b93 data/create/recipes/crushing/compat/silentgems/turquoise_end_ore.json
4caa2c0d7aa674a8607c0d27f0c62ed520a1a9d1 data/create/recipes/crushing/compat/silentgems/turquoise_nether_ore.json
542b5464d5fcb53f7749e6f90650688625a74a48 data/create/recipes/crushing/compat/silentgems/turquoise_ore.json
234cbbfb6a79159ec9be322b703bec85c236647a data/create/recipes/crushing/compat/silentgems/white_diamond_end_ore.json
8962adf5513f70570cd159124578fa618457533e data/create/recipes/crushing/compat/silentgems/white_diamond_nether_ore.json
a3d158cb34d211f8d03d819af03b358577b2a835 data/create/recipes/crushing/compat/silentgems/white_diamond_ore.json
5198e4e42ba81b048e1c2512fff64ecd4f9afe70 data/create/recipes/crushing/compat/simplefarming/barley.json
7a3f91add5e9cbaafd5ab29acf2b26fa6f0f9eec data/create/recipes/crushing/compat/simplefarming/oat.json
4c344201ebf58640d386d68adf864446bd3d8389 data/create/recipes/crushing/compat/simplefarming/rice.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "create:crushing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "silentgems"
}
],
"ingredients": [
{
"item": "silentgems:alexandrite_end_ore"
}
],
"processingTime": 350,
"results": [
{
"count": 2,
"item": "silentgems:alexandrite"
},
{
"chance": 0.25,
"item": "silentgems:alexandrite"
},
{
"chance": 0.75,
"item": "create:experience_nugget"
},
{
"chance": 0.12,
"item": "minecraft:end_stone"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "create:crushing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "silentgems"
}
],
"ingredients": [
{
"item": "silentgems:alexandrite_nether_ore"
}
],
"processingTime": 350,
"results": [
{
"count": 2,
"item": "silentgems:alexandrite"
},
{
"chance": 0.25,
"item": "silentgems:alexandrite"
},
{
"chance": 0.75,
"item": "create:experience_nugget"
},
{
"chance": 0.12,
"item": "minecraft:netherrack"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
{
"chance": 0.12,
"item": "minecraft:netherrack"
"item": "minecraft:cobblestone"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "create:crushing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "silentgems"
}
],
"ingredients": [
{
"item": "silentgems:ammolite_end_ore"
}
],
"processingTime": 350,
"results": [
{
"count": 2,
"item": "silentgems:ammolite"
},
{
"chance": 0.25,
"item": "silentgems:ammolite"
},
{
"chance": 0.75,
"item": "create:experience_nugget"
},
{
"chance": 0.12,
"item": "minecraft:end_stone"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "create:crushing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "silentgems"
}
],
"ingredients": [
{
"item": "silentgems:ammolite_nether_ore"
}
],
"processingTime": 350,
"results": [
{
"count": 2,
"item": "silentgems:ammolite"
},
{
"chance": 0.25,
"item": "silentgems:ammolite"
},
{
"chance": 0.75,
"item": "create:experience_nugget"
},
{
"chance": 0.12,
"item": "minecraft:netherrack"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
{
"chance": 0.12,
"item": "minecraft:end_stone"
"item": "minecraft:cobblestone"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "create:crushing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "silentgems"
}
],
"ingredients": [
{
"item": "silentgems:black_diamond_end_ore"
}
],
"processingTime": 350,
"results": [
{
"count": 2,
"item": "silentgems:black_diamond"
},
{
"chance": 0.25,
"item": "silentgems:black_diamond"
},
{
"chance": 0.75,
"item": "create:experience_nugget"
},
{
"chance": 0.12,
"item": "minecraft:end_stone"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "create:crushing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "silentgems"
}
],
"ingredients": [
{
"item": "silentgems:black_diamond_nether_ore"
}
],
"processingTime": 350,
"results": [
{
"count": 2,
"item": "silentgems:black_diamond"
},
{
"chance": 0.25,
"item": "silentgems:black_diamond"
},
{
"chance": 0.75,
"item": "create:experience_nugget"
},
{
"chance": 0.12,
"item": "minecraft:netherrack"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
{
"chance": 0.12,
"item": "minecraft:netherrack"
"item": "minecraft:cobblestone"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "create:crushing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "silentgems"
}
],
"ingredients": [
{
"item": "silentgems:carnelian_end_ore"
}
],
"processingTime": 350,
"results": [
{
"count": 2,
"item": "silentgems:carnelian"
},
{
"chance": 0.25,
"item": "silentgems:carnelian"
},
{
"chance": 0.75,
"item": "create:experience_nugget"
},
{
"chance": 0.12,
"item": "minecraft:end_stone"
}
]
}
Loading