Skip to content

Commit

Permalink
Port part 2 (It compiles)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mrbysco
Mrbysco committed Aug 25, 2024
1 parent 625c8c6 commit e745e3c
Show file tree
Hide file tree
Showing 1,585 changed files with 20,812 additions and 22,017 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ dependencies {

localRuntime "mezz.jei:jei-${jei_minecraft}-neoforge:${jei_version}"

compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}:api"
compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}"

implementation "xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.debug=false

# Base info
mc_version=1.21.1
neo_version=21.1.15
neo_version=21.1.26
neogradle.subsystems.parchment.minecraftVersion=1.21
neogradle.subsystems.parchment.mappingsVersion=2024.07.28
neogradle.subsystems.conventions.runs.create-default-run-per-type=false
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/.cache/0ce9513b0186cea52ebc929e2f8c8ccda756a973
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.4 2024-01-29T23:32:45.1942324 Languages: en_us for mod: forcecraft
// 1.21.1 2024-08-25T23:46:34.846281257 Languages: en_us for mod: forcecraft
ca3fee7f03df586da2be292587f8a6b2f9277cae assets/forcecraft/lang/en_us.json
4 changes: 2 additions & 2 deletions src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-01-28T23:49:44.4734461 Registries
// 1.21.1 2024-08-25T23:46:34.844399119 Registries
60ee9492bc063eb6c2bab075da9af619affa45a5 data/forcecraft/damage_type/bleeding.json
acec5f281dd1e80bdfa05bfcbb148f13e9cee25a data/forcecraft/damage_type/liquid_force.json
31e8f7b75a4be931c36b0c89412a813e03ac9d0c data/forcecraft/neoforge/biome_modifier/add_chu_chu.json
Expand All @@ -8,7 +8,7 @@ b9c04c98b6567affe15ad2ea3275c29b1080f8c7 data/forcecraft/neoforge/biome_modifier
d8114e6ac0be1b9b32692e7316a7b07055e26234 data/forcecraft/neoforge/biome_modifier/add_force_ore.json
4e3ca4e05c849c078d7aa0c4aae2ce91aff0b047 data/forcecraft/neoforge/biome_modifier/add_force_ore_buried.json
a348918d7a560bbd136e0ea984c06bb92d593c3a data/forcecraft/neoforge/biome_modifier/add_force_tree.json
3516896800ecd44192d9edd10bf4b57e80cbbd59 data/forcecraft/neoforge/biome_modifier/add_swamp_chu_chu.json
466e4e733449a75540d71fa1abc808b93a08f88b data/forcecraft/neoforge/biome_modifier/add_swamp_chu_chu.json
92c01554f5ee191aea49da24b3718c72524e6b2e data/forcecraft/worldgen/configured_feature/force_tree.json
41064caedb29cd771aaa20f7feec3016bb3a6cc1 data/forcecraft/worldgen/configured_feature/force_tree_with_bees.json
da15370457f9a0174b1767bff1274c8311a5deb4 data/forcecraft/worldgen/configured_feature/ore_force.json
Expand Down
18 changes: 9 additions & 9 deletions src/generated/resources/.cache/179674195255ab63c9f5485ba69bb471229f1b08
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// 1.20.4 2024-01-28T23:49:44.4709458 Tags for minecraft:block mod id forcecraft
6682e317fdf17b7ed16b01be6244689ba18716a1 data/forcecraft/tags/blocks/needs_force_tool.json
5ec6a48a81a06d202f30aee8ebfbbb9b9564386b data/forge/tags/blocks/ores.json
f002772c304bb8350635523d7d3bb1c4fdb5796a data/forge/tags/blocks/ores/power.json
b73848b6920747aedc21ffb8aed7e3aa8d325f04 data/forge/tags/blocks/ores_in_ground/deepslate.json
5b2618b88b5b044099742e91e0a5e3ed254d91cf data/forge/tags/blocks/ores_in_ground/stone.json
d24fa89133e2e0d0fed52aec4122ab12ef2313f8 data/minecraft/tags/blocks/mineable/pickaxe.json
bbb8aafb9fe8b2ac991b03b55e4a2bee3318a1da data/minecraft/tags/blocks/needs_diamond_tool.json
f002772c304bb8350635523d7d3bb1c4fdb5796a data/minecraft/tags/blocks/needs_iron_tool.json
// 1.21.1 2024-08-25T23:46:34.836315186 Tags for minecraft:block mod id forcecraft
d964b17dbbb1870466808060f50c0991f7cfaf65 data/c/tags/block/ores.json
f002772c304bb8350635523d7d3bb1c4fdb5796a data/c/tags/block/ores/power.json
b73848b6920747aedc21ffb8aed7e3aa8d325f04 data/c/tags/block/ores_in_ground/deepslate.json
5b2618b88b5b044099742e91e0a5e3ed254d91cf data/c/tags/block/ores_in_ground/stone.json
f57a1c0d935679dbbcab3f2e8a06cae2238a6735 data/forcecraft/tags/block/needs_force_tool.json
d24fa89133e2e0d0fed52aec4122ab12ef2313f8 data/minecraft/tags/block/mineable/pickaxe.json
bbb8aafb9fe8b2ac991b03b55e4a2bee3318a1da data/minecraft/tags/block/needs_diamond_tool.json
f002772c304bb8350635523d7d3bb1c4fdb5796a data/minecraft/tags/block/needs_iron_tool.json
4 changes: 2 additions & 2 deletions src/generated/resources/.cache/2e50376a258ceefdeaf48c21f919aaa551c1fbe8
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-01-28T23:49:44.4694454 Item Models
// 1.21.1 2024-08-25T23:46:34.833589688 Item Models
38d04f9d765c05fdedcc2d4f9b2dd0c4073e699b assets/forcecraft/models/item/deepslate_power_ore.json
1c3dbd26b63a1f340d3c8ee3bd86528ce4725b84 assets/forcecraft/models/item/force_black_torch.json
88894b26fe4fead4fe1ddb0e752b8880310f94d1 assets/forcecraft/models/item/force_blue_torch.json
Expand Down Expand Up @@ -66,9 +66,9 @@ bb09f857b6278769856250e4bb9bfcf70f36e009 assets/forcecraft/models/item/force_lim
46e6a5f824e56408b7d37a989ed59597d9994e9a assets/forcecraft/models/item/force_magenta_torch.json
4bf248ddb919f56d691de81bf9c8522ec11f4fd4 assets/forcecraft/models/item/force_orange_torch.json
7a52e62da08ae6c84544535f553c045281586a38 assets/forcecraft/models/item/force_pink_torch.json
4e271f0b6074418983e9e8bacde2b7c21857a307 assets/forcecraft/models/item/force_planks.json
ba7d8e4a6ea40e05d94731ba82bf7915dc0d8b39 assets/forcecraft/models/item/force_plank_slab.json
53d8c4c8565b838c011814d87badd8ccc35c4415 assets/forcecraft/models/item/force_plank_stairs.json
4e271f0b6074418983e9e8bacde2b7c21857a307 assets/forcecraft/models/item/force_planks.json
9bffddf1042b848e34cd63c34d9b6dd0992280de assets/forcecraft/models/item/force_purple_torch.json
6d5aded3ade8458331b06b5419dbc76b0f719d18 assets/forcecraft/models/item/force_red_torch.json
63040ca7b337faeaec82d79b20dffb89382a6653 assets/forcecraft/models/item/force_torch.json
Expand Down
24 changes: 12 additions & 12 deletions src/generated/resources/.cache/4c771f18963704254e4ac70d3c4a47862c033e90
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// 1.20.4 2024-01-29T21:43:15.1733754 Tags for minecraft:item mod id forcecraft
53afa95f4f2972f61ad4870a14ffdad392433608 data/forcecraft/tags/items/baconator_food.json
f37c1227f073af48a0e3f526510a90a1f11811d7 data/forcecraft/tags/items/chu_jelly.json
ca0dfb4cd17d1a8bebda73a2ba9587fde8c1486d data/forcecraft/tags/items/ender.json
2266034e578a6f8f80f45b0fadae1a067a3319d6 data/forcecraft/tags/items/entity_flasks.json
ba8baa1de0654d18f27068517c95b5fb869c254a data/forcecraft/tags/items/force_furnace.json
eff2e9b711edce9a5ae1875f820c2b5272b0779f data/forcecraft/tags/items/force_logs.json
f6578c63f571b1fa389775ac66b9218c094d5150 data/forcecraft/tags/items/fortune.json
5ec6a48a81a06d202f30aee8ebfbbb9b9564386b data/forge/tags/items/ores.json
f002772c304bb8350635523d7d3bb1c4fdb5796a data/forge/tags/items/ores/power.json
b73848b6920747aedc21ffb8aed7e3aa8d325f04 data/forge/tags/items/ores_in_ground/deepslate.json
5b2618b88b5b044099742e91e0a5e3ed254d91cf data/forge/tags/items/ores_in_ground/stone.json
// 1.21.1 2024-08-25T23:46:34.845110648 Tags for minecraft:item mod id forcecraft
d964b17dbbb1870466808060f50c0991f7cfaf65 data/c/tags/item/ores.json
f002772c304bb8350635523d7d3bb1c4fdb5796a data/c/tags/item/ores/power.json
b73848b6920747aedc21ffb8aed7e3aa8d325f04 data/c/tags/item/ores_in_ground/deepslate.json
5b2618b88b5b044099742e91e0a5e3ed254d91cf data/c/tags/item/ores_in_ground/stone.json
53afa95f4f2972f61ad4870a14ffdad392433608 data/forcecraft/tags/item/baconator_food.json
f37c1227f073af48a0e3f526510a90a1f11811d7 data/forcecraft/tags/item/chu_jelly.json
ca0dfb4cd17d1a8bebda73a2ba9587fde8c1486d data/forcecraft/tags/item/ender.json
2266034e578a6f8f80f45b0fadae1a067a3319d6 data/forcecraft/tags/item/entity_flasks.json
ba8baa1de0654d18f27068517c95b5fb869c254a data/forcecraft/tags/item/force_furnace.json
eff2e9b711edce9a5ae1875f820c2b5272b0779f data/forcecraft/tags/item/force_logs.json
f6578c63f571b1fa389775ac66b9218c094d5150 data/forcecraft/tags/item/fortune.json
2 changes: 1 addition & 1 deletion src/generated/resources/.cache/5087c299c545f231f80b5b2735f6ccd716b4183c
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.4 2024-01-28T23:49:44.4739455 Tags for minecraft:damage_type mod id forcecraft
// 1.21.1 2024-08-25T23:46:34.845743938 Tags for minecraft:damage_type mod id forcecraft
4b412418d34f4755bb831ad081e1a540bf7dfe13 data/minecraft/tags/damage_type/bypasses_armor.json
Loading

0 comments on commit e745e3c

Please sign in to comment.