Skip to content

Commit

Permalink
Ported to 1.20.1, removed seaweed and switched to using kelp/dried ke…
Browse files Browse the repository at this point in the history
…lp blocks
  • Loading branch information
Buuz135 committed Oct 1, 2023
1 parent 83088c0 commit 3358767
Show file tree
Hide file tree
Showing 162 changed files with 858 additions and 1,255 deletions.
26 changes: 15 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ sourceSets.main.resources {
}

minecraft {
mappings channel: 'official', version: '1.19.2'
mappings channel: 'official', version: '1.20.1'
runs {
client = {
property 'mixin.env.remapRefMap', 'true'
Expand Down Expand Up @@ -68,6 +68,7 @@ minecraft {
source sourceSets.main
}
}
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
}

repositories {
Expand All @@ -85,19 +86,22 @@ repositories {
}

dependencies {
minecraft 'net.minecraftforge:forge:1.19.2-43.1.13'
//compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.5.174")
// at runtime, use the full JEI jar
compileOnly fg.deobf("mezz.jei:jei-1.19.1-common-api:11.2.0.241")
compileOnly fg.deobf("mezz.jei:jei-1.19.1-forge-api:11.2.0.241")
minecraft 'net.minecraftforge:forge:1.20.1-47.1.1'


if (findProject(':titanium') != null) {
implementation project(':titanium')
} else {
implementation fg.deobf(project.dependencies.create('com.hrznstudio:titanium:1.20.1-3.8.21'))
}
compileOnly fg.deobf("mezz.jei:jei-1.20.1-common-api:15.2.0.23")
compileOnly fg.deobf("mezz.jei:jei-1.20.1-forge-api:15.2.0.23")
// at runtime, use the full JEI jar for Forge
runtimeOnly fg.deobf("mezz.jei:jei-1.19.1-forge:11.2.0.241")
implementation fg.deobf(project.dependencies.create('com.hrznstudio:titanium:1.19.2-3.7.0-22'))
//compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.2-67:api")
//runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.2-67")
runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.1.0.19")
//runtimeOnly fg.deobf("curse.maven:diet-443570:3300992")
//runtimeOnly fg.deobf("curse.maven:appleskin-248787:3395800")
compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-forge-1.18.2:9.1.103")
implementation fg.deobf("curse.maven:patchouli-306770:4636277")
compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-forge-1.20.1:14.0.12")
//runtimeOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-forge-1.18.2:9.1.103")
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx2G
modGroup=com.buuz135
modVersion=0.3.8
modVersion=0.4.0
modBaseName=sushigocrafting
minecraftVersion=1.19.2
minecraftVersion=1.20.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// 1.20.1 2023-10-01T16:25:07.2861588 Tags for minecraft:block mod id sushigocrafting
1eb3932dc2e19470298938affe8bd08c6039397b data/minecraft/tags/blocks/bee_growables.json
1eb3932dc2e19470298938affe8bd08c6039397b data/minecraft/tags/blocks/crops.json
b310b9b8b01a9a63ac922bbdef060e8080520dfb data/minecraft/tags/blocks/leaves.json
a57b1227a346e6bb880267ad9f8348b763efe539 data/minecraft/tags/blocks/logs.json
519d0d6c760ab3e0dbf1490e14f3f22a2f9ebcc5 data/minecraft/tags/blocks/saplings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// 1.20.1 2023-10-01T16:25:07.2885639 Block Models: sushigocrafting
2434d381450ff0d5e656d3d48bd95bb0621b90fa assets/sushigocrafting/models/block/cucumber_crop_0.json
5be2947612b32e2be42b21577dc32c34d3ef05a9 assets/sushigocrafting/models/block/cucumber_crop_1.json
84b28437d223f3c4cfefc9a3ea78694902b31323 assets/sushigocrafting/models/block/cucumber_crop_2.json
8bf03f81ddd93e4a167000fb7c519816fd50c46b assets/sushigocrafting/models/block/cucumber_crop_3.json
8f48b50fa7435da37e66470fb5408dc0cf5366a5 assets/sushigocrafting/models/block/rice_crop_0.json
cb0bca108123b13e6f952c69c21d3097c74bc1b7 assets/sushigocrafting/models/block/rice_crop_1.json
8df6c5a294eb4b51018866986dda6703c15230f8 assets/sushigocrafting/models/block/rice_crop_2.json
de88ff314d214ed5c55ca0d671667bab9d8b5c4d assets/sushigocrafting/models/block/sesame_crop_0.json
f1bab7d9befd4469e786162e6c817058442587bd assets/sushigocrafting/models/block/sesame_crop_1.json
5dd75d32c161c5cabc5879485a202c236d3a0ac1 assets/sushigocrafting/models/block/sesame_crop_2.json
1fcb24ee36c8793174d8e5883c0b8c7af1b160ad assets/sushigocrafting/models/block/sesame_crop_3.json
4d87688535e7c92e7c8b35f23b2f9432935e419f assets/sushigocrafting/models/block/soy_crop_0.json
b39eff4088596a92ec2dbd5456005587ccfbb087 assets/sushigocrafting/models/block/soy_crop_1.json
9aa1b105027530b3082893fd4eb6de77bb2db8d2 assets/sushigocrafting/models/block/soy_crop_2.json
31a80b4bd4163b6c0c3da95c3fa9e061da430c23 assets/sushigocrafting/models/block/soy_crop_3.json
06593925b2768aea5b0e5c84a5ef5cda548f3b02 assets/sushigocrafting/models/block/wasabi_crop_0.json
9735905aba168a5f244078dc87ef40487f5772e0 assets/sushigocrafting/models/block/wasabi_crop_1.json
c5c00cb7f1cf8fdf77a7792e71cfd550aa428976 assets/sushigocrafting/models/block/wasabi_crop_2.json
546b6eaeb82e31060eba2a2ae50a1b1c4a41dc20 assets/sushigocrafting/models/block/wasabi_crop_3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// 1.20.1 2023-10-01T16:40:50.9403225 Block States: sushigocrafting
e723ed89da166ca28521d95a6565ff513311ff5c assets/sushigocrafting/blockstates/avocado_leaves.json
aff2ac9aec03cc6c9608f6e978dc8ccce8bf7753 assets/sushigocrafting/blockstates/avocado_leaves_logged.json
cde5da82cf436113a444c8031d13242e62464f2f assets/sushigocrafting/blockstates/avocado_log.json
18ebc41a4ba378d3620cd089559911136fce1cd8 assets/sushigocrafting/blockstates/avocado_sapling.json
82b879c9e74e5909ebd1d1a3a252cc85e4b85018 assets/sushigocrafting/blockstates/cucumber_crop.json
b476d18140d9c2bdf45b6376cd23fb73adc0ad2b assets/sushigocrafting/blockstates/cutting_board.json
7aec5c78b93a26ca9b963aada362531331acc81a assets/sushigocrafting/blockstates/fermentation_barrel.json
f446ffa87a031af7cdcf98127b41b59d1e16d44c assets/sushigocrafting/blockstates/rice_cooker.json
9d625a221b915863fd68231430b04a21925ecbef assets/sushigocrafting/blockstates/rice_crop.json
245eb5921173e8dd0999f88416834ca3a4701fe0 assets/sushigocrafting/blockstates/roller.json
68fbe79d9e4efe95899a0053411641d039170b60 assets/sushigocrafting/blockstates/sesame_crop.json
c459e00a83fe2bb11916d065e264723d3e0c68c0 assets/sushigocrafting/blockstates/soy_crop.json
054b91cdee074745894d57443c06d04e497634f9 assets/sushigocrafting/blockstates/wasabi_crop.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// 1.20.1 2023-10-01T16:25:07.2920645 Tags for minecraft:item mod id sushigocrafting
6f1b9961c64fcac0298de81fdef9bc69db03d466 data/diet/tags/items/fruits.json
2edb19c04f197d462b8d4572a3dba9c4fea2d883 data/diet/tags/items/grains.json
b7e226156b80da16f44d0af3472c64650df71a1d data/diet/tags/items/proteins.json
ff5430ea7930620e2ed34c0931c63ae268ddd382 data/diet/tags/items/vegetables.json
4c5b3a94213d51a2a4a608f95ecbed820b7f5e70 data/forge/tags/items/crops.json
59797b0de6d37c155d54c4ad2e24e0b7c441d098 data/forge/tags/items/crops/cucumber.json
45fc65804195794f80150238eaa3c6f9fbfea606 data/forge/tags/items/crops/rice.json
c30430446abeaf09dca457d20bc1dc0882685bb9 data/forge/tags/items/crops/sesame_seed.json
13ed228870403dee9732daa3c02c2109bd29bd39 data/forge/tags/items/crops/soy_bean.json
c06c6b6bb227233c1ee9425652d219976e86f0b3 data/forge/tags/items/crops/wasabi_root.json
3928f99669604c01e4214ab0f257a144cada698d data/forge/tags/items/fruits.json
3928f99669604c01e4214ab0f257a144cada698d data/forge/tags/items/fruits/avocado.json
b7a5dc99a61731d35bda6bcbb438af3946d804ed data/forge/tags/items/raw_fishes.json
3fe6df0882f02c83c296f5dfaed148dab475c556 data/forge/tags/items/raw_fishes/salmon.json
ec193d2be5d0dd269f12482a8b861fb11a953bef data/forge/tags/items/raw_fishes/shrimp.json
1a281932a855dc9fe6db01b007f18f9c7a9a0ded data/forge/tags/items/raw_fishes/tuna.json
942d8cf685dbcd80cb56b444f59262b6ef87bd64 data/forge/tags/items/seeds.json
5c3c2256a2c019ea2d05b964de015d53d235556c data/forge/tags/items/seeds/cucumber_seeds.json
84b971ebf27f2f52ef9038073f7fda1e9e07915b data/forge/tags/items/seeds/rice_seeds.json
8791a038e89fff147b9d90f74dcfc7f7c7deb2f1 data/forge/tags/items/seeds/sesame_seeds.json
c28eec1aa23cd82356737e2e4e79221c7c7c1f23 data/forge/tags/items/seeds/soy_seeds.json
44b9308d93e508da1e54417fae5ba0065f44ec30 data/forge/tags/items/seeds/wasabi_seeds.json
f9b8fb05d9ffb5c86ac06e71373c87cca426d587 data/forge/tags/items/tools/knife.json
b89fed35b1e5eb0ef971a076017a49fa65bfefdc data/minecraft/tags/items/fishes.json
a57b1227a346e6bb880267ad9f8348b763efe539 data/minecraft/tags/items/logs.json
519d0d6c760ab3e0dbf1490e14f3f22a2f9ebcc5 data/minecraft/tags/items/saplings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// 1.20.1 2023-10-01T16:40:50.9393223 Loot Tables
731ba8e0bc503b1589fc927aed187c62fd8d23f3 data/sushigocrafting/loot_tables/blocks/avocado_leaves.json
5a846e55691f51d74be354809f0a2acd811cdd07 data/sushigocrafting/loot_tables/blocks/avocado_leaves_logged.json
d34d3ab031007e85ffaaa4a260eb305d824b3494 data/sushigocrafting/loot_tables/blocks/avocado_log.json
5f4850ff9d2d64fb4c75d016ef8ceff2e7830fe0 data/sushigocrafting/loot_tables/blocks/avocado_sapling.json
27e5df97599b5966d383205247ea2186611a4e74 data/sushigocrafting/loot_tables/blocks/cooler_box.json
86429bcf2ff3e656c0ea6378d8e3c1109d1b149e data/sushigocrafting/loot_tables/blocks/cucumber_crop.json
d883674518bfe6e763f831d3a9a929ac66740e1f data/sushigocrafting/loot_tables/blocks/cutting_board.json
e2327898d0326e9ab0c08c2a67ca2790e6d91271 data/sushigocrafting/loot_tables/blocks/fermentation_barrel.json
c776dcdae20a0ebea3ade9470fa2f801c57ef9c9 data/sushigocrafting/loot_tables/blocks/rice_cooker.json
103508545d502e5f0284ca1f74c6b63135e04ba4 data/sushigocrafting/loot_tables/blocks/rice_crop.json
37c700ed5aa393873d3bbbfeff85530f93e832d1 data/sushigocrafting/loot_tables/blocks/roller.json
64fbe2ef16d988564a181ea7188a9131e528cf60 data/sushigocrafting/loot_tables/blocks/sesame_crop.json
1a835ac76aa255a5df01c996a2b33e64aee89c84 data/sushigocrafting/loot_tables/blocks/soy_crop.json
fdb7798f761b7ff6bd876b4632d72401f3387c32 data/sushigocrafting/loot_tables/blocks/wasabi_crop.json
f78e1de61438834959e7126afa94aff57bd3ef8e data/sushigocrafting/loot_tables/entities/shrimp.json
47a4ee1f2468640224c7099b3b6f81a3119564b9 data/sushigocrafting/loot_tables/entities/tuna.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
// 1.20.1 2023-10-01T17:05:26.6029164 Item Models: sushigocrafting
4cd15e5d7d7f7ed1af1296b975f649dc4441a1c3 assets/sushigocrafting/models/item/avocado.json
32ef2721f3d0eba94adb5e064ac72685df96b837 assets/sushigocrafting/models/item/avocado_leaves.json
1e0e6a82d55af7c01faf3eca1846c83e1cb307f3 assets/sushigocrafting/models/item/avocado_leaves_logged.json
1d85cbcb8095104b3f1c7de96f9c8ebe624926a1 assets/sushigocrafting/models/item/avocado_log.json
9337de4a429412db86eeb5674eedc0b48c8b8582 assets/sushigocrafting/models/item/avocado_maki.json
5269ce0b3ebabb927590028f4f9d963e0d73447f assets/sushigocrafting/models/item/avocado_sapling.json
8dac1291a260230181ea84af43f9d3046c04ec3f assets/sushigocrafting/models/item/avocado_slices.json
3ee03d61c50c9431778d2753d521d400f7a3f15b assets/sushigocrafting/models/item/cheese.json
22a14b238ba43a15ff4054bf1f30e88c2d21eac9 assets/sushigocrafting/models/item/chicken_temaki.json
2ea53965c22bac7af2b9272535751ce5f4072cc1 assets/sushigocrafting/models/item/cleaver_knife.json
3878d627b731e7b405b90122ca868c48b31dd3de assets/sushigocrafting/models/item/cooked_rice.json
8e5ed62a2131b583c766097c53b34866a64a9093 assets/sushigocrafting/models/item/cooler_box.json
0dbfc2337e7ae307c04288e7c8b00385bf64ad73 assets/sushigocrafting/models/item/crab_california.json
3369645fbcfada31e1c22515c9b35e913708431d assets/sushigocrafting/models/item/crab_cheese_california.json
b5d6298ecd685eb064a955f6a18698a86eabe3ba assets/sushigocrafting/models/item/crab_cucumber_california.json
49d8877bc87a3eb2f1aa1d24194adf626ffc018a assets/sushigocrafting/models/item/crab_maki.json
f33d55a3d8a582fb1cf24d57ee8fe52aec5c332b assets/sushigocrafting/models/item/cucumber.json
ecf9729e0ff11a84851399a1ceef5b2d15bfe72d assets/sushigocrafting/models/item/cucumber_maki.json
8f410374399b467952e2b028eea6082896b5ed12 assets/sushigocrafting/models/item/cucumber_seeds.json
146b6d242d7f3b0411d2febfd067158d01eff016 assets/sushigocrafting/models/item/cucumber_slices.json
7ca097980d5e3313101588a722ddc8e6b4add0b3 assets/sushigocrafting/models/item/cutting_board.json
e8866b3cfd48429a8f1af64e3b54be130e931ca2 assets/sushigocrafting/models/item/fermentation_barrel.json
fd9b7478ab2e8c335279760f0f424865f6b8ae9c assets/sushigocrafting/models/item/imitation_crab.json
4e3c5ccb7d32eaca887a8c069cbe2cf737da5cdd assets/sushigocrafting/models/item/nori_sheets.json
74de256ea6e749fc29c3063cfd22e3fc330086d2 assets/sushigocrafting/models/item/onigiri.json
b7544f9614a05dfef1266a391bb4527b28af4d30 assets/sushigocrafting/models/item/raw_tuna.json
0524e040068416cb27cf5c7bf56a1e7387cee6a0 assets/sushigocrafting/models/item/rice.json
f4653dbce9782fa62028e7addf80c6e6cec38280 assets/sushigocrafting/models/item/rice_cooker.json
a3670f556934f563a1f4888cc87c724913818c5c assets/sushigocrafting/models/item/rice_seeds.json
0e2da304db3755df1c18805e974d8ad9fb96cd1a assets/sushigocrafting/models/item/roller.json
47c892336a271d6ed19eb1c708b86acf158d35e0 assets/sushigocrafting/models/item/salmon_california.json
8f81f6cd90a45a5b59d6de306d4b20b0a758127c assets/sushigocrafting/models/item/salmon_cheese_california.json
67834ae7b82c20d3a8bc35751e1e9ede93a4fdef assets/sushigocrafting/models/item/salmon_cucumber_california.json
0378d328c517bbdd80d6fcbac4c32302ecf4845f assets/sushigocrafting/models/item/salmon_fillet.json
60d7a7428695a70bac94704d13640134687860d2 assets/sushigocrafting/models/item/salmon_gunkan.json
9283432ce3d3482af4d2543400e9cf04e5dbe2dc assets/sushigocrafting/models/item/salmon_maki.json
c2898ce1e28ae153067d3b0bb8fc0a458ffd9940 assets/sushigocrafting/models/item/salmon_nigiri.json
a8d039fe3ccda05ff860b6cbb062d86dbbb08272 assets/sushigocrafting/models/item/salmon_temaki.json
cf71b7687f6ea124fc5cd756e6ff2a1c2ef2e9e1 assets/sushigocrafting/models/item/seaweed_on_a_stick.json
9c219f5745434c8099f6f6dcf5e6a460aa317ff4 assets/sushigocrafting/models/item/sesame_seed.json
3695ff088c52be9464f806c4a749102ead2a1b7d assets/sushigocrafting/models/item/sesame_seeds.json
6d0e3273f4a3fc2e0b6fcc3baae1587f4aa8b32a assets/sushigocrafting/models/item/shrimp.json
cae438c8228b838720ca6052d4502a47ede076a6 assets/sushigocrafting/models/item/shrimp_bucket.json
9a3e7adebd546dffc3d38bb499887e89541b79d1 assets/sushigocrafting/models/item/shrimp_nigiri.json
6a8edc0adb172c3eb0c0157d4e850d08f93e6abc assets/sushigocrafting/models/item/shrimp_temaki.json
1e6c5c5389eb3bbb23ab373b704b491002330104 assets/sushigocrafting/models/item/soy_bean.json
9e7dceb18a83ece1461ad9efdbfe304a2525de54 assets/sushigocrafting/models/item/soy_sauce.json
a75702805ca727007ac80aa7505812bcccb7de72 assets/sushigocrafting/models/item/soy_seeds.json
712a4631e4a00a3a6295c52759fd5cdc0cabd99f assets/sushigocrafting/models/item/tobiko.json
6bfaab901fb28018f65596fc288ff5f758568a86 assets/sushigocrafting/models/item/tobiko_crab_california.json
348728575c9169ac5604c9ba16e31c4a7fe0cb27 assets/sushigocrafting/models/item/tobiko_crab_cheese_california.json
335fcf4c7502f3f8c0464b234ec6c63ff3c6e216 assets/sushigocrafting/models/item/tobiko_crab_cucumber_california.json
8f5003dd75a5ed43b055ec955a080f94675a82f9 assets/sushigocrafting/models/item/tobiko_salmon_california.json
4d21d35d770e253b628b998e4e0482eb2e01c855 assets/sushigocrafting/models/item/tobiko_salmon_cheese_california.json
18d15312009c7b077097354903f3ae4a9cb1daf9 assets/sushigocrafting/models/item/tobiko_salmon_cucumber_california.json
c4388eeab005eb0eb40b6c0aeb030b4956004400 assets/sushigocrafting/models/item/tobiko_tuna_california.json
8c4209fed6980d5c5c6411b58863c6209076544a assets/sushigocrafting/models/item/tobiko_tuna_cheese_california.json
231c0fd43d55edb9ad0378443be94bcc6b3033b7 assets/sushigocrafting/models/item/tobiko_tuna_cucumber_california.json
a9b54dc2e973b1e2a89bb3f88055ddbf9d55f9ad assets/sushigocrafting/models/item/tuna_bucket.json
4fbefae3f91a1a0df145f124ac47c5d5a1081493 assets/sushigocrafting/models/item/tuna_california.json
544912e200eb498690f3709071f5ce7b119b0419 assets/sushigocrafting/models/item/tuna_cheese_california.json
f723bb875a349d03c1c68dfe1e389734585da64b assets/sushigocrafting/models/item/tuna_cucumber_california.json
69b9098756f9dd4241a9acb3692cd1a2cf186698 assets/sushigocrafting/models/item/tuna_fillet.json
920594648b5b00a1982c36be5752189eb6a64326 assets/sushigocrafting/models/item/tuna_gunkan.json
451fb6b8324a80701ba614ed9135a7e2d2dccfa2 assets/sushigocrafting/models/item/tuna_maki.json
e664d36c18c510080c3a5b0dd102c5471cf74c08 assets/sushigocrafting/models/item/tuna_nigiri.json
106de276424de4ac51d3886371c6bfccd86d4b90 assets/sushigocrafting/models/item/tuna_temaki.json
2e96afaeae61ba6599469769deb7c6ac9a6dcfb2 assets/sushigocrafting/models/item/wakame_gunkan.json
1820214874ab42032bbcdde119cfb02a5acaecf5 assets/sushigocrafting/models/item/wasabi_paste.json
359b92d5c7ed3fd7e6edd0a92e0da7bb5b4823c4 assets/sushigocrafting/models/item/wasabi_root.json
9937d8462bce1c80b560a2aede3d93e2d789d492 assets/sushigocrafting/models/item/wasabi_seeds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// 1.20.1 2023-10-01T16:40:50.9398224 Recipes
1f2f35aced095661a8462df0cfef3ae321f3975a data/sushigocrafting/advancements/recipes/misc/seaweed_on_a_stick.json
c2897cb848f03ebeb3456eaa76e9ee664d787bb4 data/sushigocrafting/recipes/cleaver_knife.json
e7e5a6de0459319e7c9946080925432c680c84e1 data/sushigocrafting/recipes/cooler_box.json
eb8b1ef8c85e561b1a2d6dbdc050c3a2955e949a data/sushigocrafting/recipes/cutting_board.json
839917fddd87922d9381257a07860d3ac257a939 data/sushigocrafting/recipes/fermentation_barrel.json
765dcb05415c4fcde30a3a46801d9cc540748d40 data/sushigocrafting/recipes/rice_cooker.json
512f0e79818fcc6d1406249dc4fa35d1bb6b06b5 data/sushigocrafting/recipes/roller.json
4d65ecd9cda9a48eabaf0753b0b7ca3bacab4ba0 data/sushigocrafting/recipes/seaweed_on_a_stick.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// 1.20.1 2023-10-01T17:05:26.6059249 Languages: en_us
55681ad798e8c26d95204b3f431c7fc93a6969f0 assets/sushigocrafting/lang/en_us.json
Loading

0 comments on commit 3358767

Please sign in to comment.