Skip to content

Commit

Permalink
Port to NeoForge 1.21.1
Browse files Browse the repository at this point in the history
  • Loading branch information
JDDev0 committed Nov 20, 2024
1 parent a71be54 commit 48c4b73
Show file tree
Hide file tree
Showing 60 changed files with 173 additions and 167 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ Download on Modrinth: [Energized Power - The Aether](https://modrinth.com/mod/en

**This mod requires [Energized Power](https://github.com/JDDev0/EnergizedPower) and [The Aether](https://github.com/The-Aether-Team/The-Aether)**

**The fabric edition of this mod requires the Fabric API.**

*Feel free to include this mod in your ModPack :-)*
53 changes: 42 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
id 'net.neoforged.gradle.userdev' version '7.0.5'
id 'net.neoforged.gradle.userdev' version '7.0.165'
}

version = mod_version
Expand Down Expand Up @@ -42,8 +42,7 @@ base {
archivesName = mod_id
}

// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
java.toolchain.languageVersion = JavaLanguageVersion.of(21)

// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
Expand Down Expand Up @@ -79,7 +78,30 @@ runs {

server {
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
programArgument '--nogui'
arguments '--nogui'

// Change run folder location
workingDirectory project.file('run')

// Fix mixin dependencies
systemProperty 'mixin.env.remapRefMap', 'true'
systemProperty 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
}

gameTestServer {
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
arguments '--nogui'

// Change run folder location
workingDirectory project.file('run')

// Fix mixin dependencies
systemProperty 'mixin.env.remapRefMap', 'true'
systemProperty 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
}

junit {
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id

// Change run folder location
workingDirectory project.file('run')
Expand All @@ -101,7 +123,7 @@ runs {
systemProperty 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
arguments '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
}
}

Expand All @@ -126,19 +148,20 @@ dependencies {
implementation "net.neoforged:neoforge:${neo_version}"

// Energized Power dependency
compileOnly "curse.maven:energized-power-782147:5797578"
compileOnly "curse.maven:energized-power-782147:5797585"

localRuntime "curse.maven:energized-power-782147:5797578"
localRuntime "curse.maven:energized-power-782147:5797585"

// The Aether
compileOnly "curse.maven:aether-255308:5889512"
compileOnly "curse.maven:aether-255308:5904253"

localRuntime "curse.maven:aether-255308:5889512"
localRuntime "curse.maven:aether-255308:5904253"
localRuntime "curse.maven:owo-lib-532610:5900556"

// For more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
localRuntime "me.shedaniel:RoughlyEnoughItems-neoforge:13.1.773"
localRuntime "me.shedaniel:RoughlyEnoughItems-neoforge:16.0.788"
}

// This block of code expands all declared replace properties in the specified resource targets.
Expand All @@ -155,7 +178,7 @@ tasks.withType(ProcessResources).configureEach {
]
inputs.properties replaceProperties

filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
filesMatching(['META-INF/neoforge.mods.toml']) {
expand replaceProperties + [project: project]
}
}
Expand Down Expand Up @@ -191,3 +214,11 @@ publishing {
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
}

// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
idea {
module {
downloadSources = true
downloadJavadoc = true
}
}
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
org.gradle.debug=false

minecraft_version=1.20.2
minecraft_version_range=[1.20.2,1.21)
minecraft_version=1.21.1
minecraft_version_range=[1.21.1,1.22)

neo_version=20.2.86
neo_version_range=[20.2,)
neo_version=21.1.77
neo_version_range=[21.1,)
loader_version_range=[1,)

mapping_channel=official
mapping_version=1.20.2
mapping_version=1.21.1

mod_id=energizedpowerta
mod_name=Energized Power - The Aether
mod_license=MIT
mod_version=1.20.2-1.0.1-neoforge
mod_version=1.21.1-1.0.1-neoforge
mod_group_id=me.jddev0.energizedpowerta
mod_authors=JDDev0
mod_description=Compatibility between Energized Power and The Aether
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.2 2024-10-09T18:18:35.692441635 Tags for minecraft:item mod id energizedpowerta
fbc839e6107f58b02025bde2f92e2c47bcfab23d data/forge/tags/items/tools/hammers.json
// 1.21.1 2024-11-20T18:20:14.0073431 Tags for minecraft:item mod id energizedpowerta
fbc839e6107f58b02025bde2f92e2c47bcfab23d data/c/tags/item/tools/hammers.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2024-10-09T18:18:35.693058278 Item Models: energizedpowerta
// 1.21.1 2024-11-20T18:20:14.007743146 Item Models: energizedpowerta
46746a4f42ff31bfbec9452b1369d48e79414caf assets/energizedpowerta/models/item/gravitite_hammer.json
e467680a6eed8b530def493629c0145139dac0b8 assets/energizedpowerta/models/item/holystone_hammer.json
84dea1acba9016f54def0d42b3056d76393a0992 assets/energizedpowerta/models/item/skyroot_dirty_water_bucket.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.2 2024-10-09T18:18:35.69322667 Tags for minecraft:block mod id energizedpowerta
c312db18017fa8a67569ba599124d6c6ab6579b5 data/aether/tags/blocks/allowed_bucket_pickup.json
// 1.21.1 2024-11-20T18:20:14.007852417 Tags for minecraft:block mod id energizedpowerta
c312db18017fa8a67569ba599124d6c6ab6579b5 data/aether/tags/block/allowed_bucket_pickup.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.2 2024-10-09T18:18:35.693782701 Tags for minecraft:fluid mod id energizedpowerta
c9aff5cb098ddb0598e489f4ef989fc180b24b05 data/aether/tags/fluids/allowed_bucket_pickup.json
// 1.21.1 2024-11-20T18:20:14.008147979 Tags for minecraft:fluid mod id energizedpowerta
c9aff5cb098ddb0598e489f4ef989fc180b24b05 data/aether/tags/fluid/allowed_bucket_pickup.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
// 1.20.2 2024-10-09T18:18:35.693354766 Recipes
7561a98187af5eaf92f88fdcb81d46663b7ffd6e data/energizedpowerta/advancements/recipes/compat/aether/crafting/gravitite_hammer.json
8474de460e928ec8231f605acda2b8cf2aef27b5 data/energizedpowerta/advancements/recipes/compat/aether/crafting/holystone_hammer.json
428b616ca869e1e5190d399c21647458eeec3879 data/energizedpowerta/advancements/recipes/compat/aether/crafting/item_conveyor_belt_loader.json
fae583609c4ef5b78bfd6c9c08f13963696d39b1 data/energizedpowerta/advancements/recipes/compat/aether/crafting/item_conveyor_belt_merger.json
8c79ada12242a9268bf9d5f0031d38b522d1384e data/energizedpowerta/advancements/recipes/compat/aether/crafting/item_conveyor_belt_sorter.json
b339aca9ed3873ed120b163ba527d9872521f197 data/energizedpowerta/advancements/recipes/compat/aether/crafting/item_conveyor_belt_splitter.json
00516b1fe9bc06af7f528509db350646441c1e2d data/energizedpowerta/advancements/recipes/compat/aether/crafting/item_conveyor_belt_switch.json
46bb7ab58f032191a987a3e3c420f904412ed8c8 data/energizedpowerta/advancements/recipes/compat/aether/crafting/skyroot_hammer.json
fc18e30a8f71af9e481cd2830b8ec0f31512a866 data/energizedpowerta/advancements/recipes/compat/aether/crafting/zanite_hammer.json
143d8d5b0c3ccc628e2326bc88197ebe4e6a01d8 data/energizedpowerta/recipes/compat/aether/crafting/gravitite_hammer.json
06fc909d1e488c90ddc50bf9ac8133626425301f data/energizedpowerta/recipes/compat/aether/crafting/holystone_hammer.json
4c2e57ea0c3bab7a6f4e6b98fbf2a2a8b2030019 data/energizedpowerta/recipes/compat/aether/crafting/item_conveyor_belt_loader.json
dc5ff079dae02db1dac63e32aa98e9c7fdfaabb7 data/energizedpowerta/recipes/compat/aether/crafting/item_conveyor_belt_merger.json
8d99f247649355f9913d7a75dbe3318c22e2df8f data/energizedpowerta/recipes/compat/aether/crafting/item_conveyor_belt_sorter.json
579f9d746cc99a711f02da922a979f6468dc66cf data/energizedpowerta/recipes/compat/aether/crafting/item_conveyor_belt_splitter.json
5805f54a8f55cb2f2f6d02e6c0ee3354e86cabdc data/energizedpowerta/recipes/compat/aether/crafting/item_conveyor_belt_switch.json
b7032a23f8aab2b727c9135630fa0196039cd806 data/energizedpowerta/recipes/compat/aether/crafting/skyroot_hammer.json
d9216a90df97e44eef648bc1c11d1a02bbe749ea data/energizedpowerta/recipes/compat/aether/crafting/zanite_hammer.json
76edf0e0d85215737d29d9c93ef664ea6a1b516e data/energizedpowerta/recipes/compat/aether/crusher/holystone_from_crushing_holystone_bricks.json
f4bf0229e659e41e5d0f7d15f145013a9b7bbbc5 data/energizedpowerta/recipes/compat/aether/growing/blue_berry_from_growing_berry_bush_stem.json
2996a37b18396951eeb0205cdb1912442c867bba data/energizedpowerta/recipes/compat/aether/growing/purple_flower_from_growing_purple_flower.json
44ec984b84ac4139f19aa03fae12d20762520797 data/energizedpowerta/recipes/compat/aether/growing/white_flower_from_growing_white_flower.json
82293414b07e4b3838bb8c40451f2f3097e47e88 data/energizedpowerta/recipes/compat/aether/pulverizer/ambrosium_shard_from_pulverizer_ambrosium_ores.json
2b63376af10b5d7739dca0e9ca2dcca6466ae426 data/energizedpowerta/recipes/compat/aether/pulverizer/zanite_gemstone_from_pulverizer_zanite_ores.json
14e328947fea0432b0c9a5d9bdb2ced3525976f3 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_axe.json
1aa2d1405de956a85656a58cfc03078b8206449c data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_boat.json
4920a7e93e4626e1abedc4207eca9c8ebea7b826 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_bookshelf.json
7048261500081052a79826a3d9c94172a4594171 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_bucket.json
788028ca2e83ec86638535c4be6a5f8fb2e9a3ac data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_chest_boat.json
fd020a54d310e50eddecacaac0841983b7a1e856 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_door.json
624945749b3857ce04db6db214ac24ae4103a8e1 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_fence.json
2c5bef62ab4f99c64764340d0a87a627070827f0 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_fence_gate.json
5169a682d1f4f64b945913449afff1282220f315 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_hammer.json
c98cdecb50fc834bc0e3d4de6ef75792316a3223 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_hoe.json
67b0f669f2b755f3d7551a2e6010b4036768c5f6 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_logs.json
bf51010359f1c8fab43cec04e954805b6bc13f65 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_pickaxe.json
dce8647d851dfa105e5e3067ed5a4c8825378b66 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_pressure_plate.json
9b25506eb72907b98cf446b1fa10415469a9b433 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_shovel.json
05d8a581edebff250e913fb59b6712e9cfa67487 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_sign.json
c5ed04e7a2e8c24901d0fcd207e8b008622850f3 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_sword.json
ec4fca6351967ef3119f63b60184ba9860a43287 data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_trapdoor.json
d84763dd792b526bad5dee681f13e56234750c0f data/energizedpowerta/recipes/compat/aether/sawmill/skyroot_sticks_from_sawing_skyroot_planks.json
// 1.21.1 2024-11-20T18:20:14.007904523 Recipes
544fd4f70a6fa2a0fc48589be65f88d82627c76b data/energizedpowerta/advancement/recipes/compat/aether/crafting/gravitite_hammer.json
40862a9078858e3ac90e12a6f6d18b822bd66dc7 data/energizedpowerta/advancement/recipes/compat/aether/crafting/holystone_hammer.json
602afa195c26819398f1375bc6a4a26d2f3e83d7 data/energizedpowerta/advancement/recipes/compat/aether/crafting/item_conveyor_belt_loader.json
e3b3f741eeebba3738fedd51d4aca98b50f5688d data/energizedpowerta/advancement/recipes/compat/aether/crafting/item_conveyor_belt_merger.json
f385fc6afe22261f946a674e2deac7a3cd78b900 data/energizedpowerta/advancement/recipes/compat/aether/crafting/item_conveyor_belt_sorter.json
c87df3c05ac844793312034a79d62e473b6e2014 data/energizedpowerta/advancement/recipes/compat/aether/crafting/item_conveyor_belt_splitter.json
b988467a40b8067687af263fb8437981fcdd47d1 data/energizedpowerta/advancement/recipes/compat/aether/crafting/item_conveyor_belt_switch.json
1e8ced60bede6d7abb64df7f515e91ecb090de37 data/energizedpowerta/advancement/recipes/compat/aether/crafting/skyroot_hammer.json
20f8fe443cfdd64b564befda644c4deba3be6eed data/energizedpowerta/advancement/recipes/compat/aether/crafting/zanite_hammer.json
25f30473c9d69da527eb410e102f9de7c2da9563 data/energizedpowerta/recipe/compat/aether/crafting/gravitite_hammer.json
ea072468ce74808daae90b8a9fa3a064bdd11b78 data/energizedpowerta/recipe/compat/aether/crafting/holystone_hammer.json
deee9a84cb95bd72435332c995ef406117024e83 data/energizedpowerta/recipe/compat/aether/crafting/item_conveyor_belt_loader.json
91e40eace0eac2941ebd76c1b4368a0c6431fbbc data/energizedpowerta/recipe/compat/aether/crafting/item_conveyor_belt_merger.json
8e3a095333400ef4220b7a5a60815b6b8fc7088f data/energizedpowerta/recipe/compat/aether/crafting/item_conveyor_belt_sorter.json
93c11e117430b67ef821095427ebf9f1e9276679 data/energizedpowerta/recipe/compat/aether/crafting/item_conveyor_belt_splitter.json
bc8dfbd0103e39922920e82e507c1937798c3df5 data/energizedpowerta/recipe/compat/aether/crafting/item_conveyor_belt_switch.json
ed566327fbff33388c168ed0ad499be42b9e250e data/energizedpowerta/recipe/compat/aether/crafting/skyroot_hammer.json
2956dbb9331a56928bc62a95abd164fb99fd609b data/energizedpowerta/recipe/compat/aether/crafting/zanite_hammer.json
76edf0e0d85215737d29d9c93ef664ea6a1b516e data/energizedpowerta/recipe/compat/aether/crusher/holystone_from_crushing_holystone_bricks.json
f4bf0229e659e41e5d0f7d15f145013a9b7bbbc5 data/energizedpowerta/recipe/compat/aether/growing/blue_berry_from_growing_berry_bush_stem.json
2996a37b18396951eeb0205cdb1912442c867bba data/energizedpowerta/recipe/compat/aether/growing/purple_flower_from_growing_purple_flower.json
44ec984b84ac4139f19aa03fae12d20762520797 data/energizedpowerta/recipe/compat/aether/growing/white_flower_from_growing_white_flower.json
82293414b07e4b3838bb8c40451f2f3097e47e88 data/energizedpowerta/recipe/compat/aether/pulverizer/ambrosium_shard_from_pulverizer_ambrosium_ores.json
2b63376af10b5d7739dca0e9ca2dcca6466ae426 data/energizedpowerta/recipe/compat/aether/pulverizer/zanite_gemstone_from_pulverizer_zanite_ores.json
14e328947fea0432b0c9a5d9bdb2ced3525976f3 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_axe.json
1aa2d1405de956a85656a58cfc03078b8206449c data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_boat.json
4920a7e93e4626e1abedc4207eca9c8ebea7b826 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_bookshelf.json
7048261500081052a79826a3d9c94172a4594171 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_bucket.json
788028ca2e83ec86638535c4be6a5f8fb2e9a3ac data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_chest_boat.json
fd020a54d310e50eddecacaac0841983b7a1e856 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_door.json
624945749b3857ce04db6db214ac24ae4103a8e1 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_fence.json
2c5bef62ab4f99c64764340d0a87a627070827f0 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_fence_gate.json
5169a682d1f4f64b945913449afff1282220f315 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_hammer.json
c98cdecb50fc834bc0e3d4de6ef75792316a3223 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_hoe.json
67b0f669f2b755f3d7551a2e6010b4036768c5f6 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_logs.json
bf51010359f1c8fab43cec04e954805b6bc13f65 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_pickaxe.json
dce8647d851dfa105e5e3067ed5a4c8825378b66 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_pressure_plate.json
9b25506eb72907b98cf446b1fa10415469a9b433 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_shovel.json
05d8a581edebff250e913fb59b6712e9cfa67487 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_sign.json
c5ed04e7a2e8c24901d0fcd207e8b008622850f3 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_sword.json
ec4fca6351967ef3119f63b60184ba9860a43287 data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_planks_from_sawing_skyroot_trapdoor.json
d84763dd792b526bad5dee681f13e56234750c0f data/energizedpowerta/recipe/compat/aether/sawmill/skyroot_sticks_from_sawing_skyroot_planks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"conditions": {
"items": [
{
"tag": "aether:processed/gravitite"
"items": "#aether:processed/gravitite"
}
]
},
Expand All @@ -28,6 +28,5 @@
"recipes": [
"energizedpowerta:compat/aether/crafting/gravitite_hammer"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"aether:holystone"
]
"items": "aether:holystone"
}
]
},
Expand All @@ -30,6 +28,5 @@
"recipes": [
"energizedpowerta:compat/aether/crafting/holystone_hammer"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"energizedpower:item_conveyor_belt"
]
"items": "energizedpower:item_conveyor_belt"
}
]
},
Expand All @@ -30,6 +28,5 @@
"recipes": [
"energizedpowerta:compat/aether/crafting/item_conveyor_belt_loader"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"energizedpower:item_conveyor_belt_loader"
]
"items": "energizedpower:item_conveyor_belt_loader"
}
]
},
Expand All @@ -30,6 +28,5 @@
"recipes": [
"energizedpowerta:compat/aether/crafting/item_conveyor_belt_merger"
]
},
"sends_telemetry_event": false
}
}
Loading

0 comments on commit 48c4b73

Please sign in to comment.