Skip to content

Commit

Permalink
feat: add forge support
Browse files Browse the repository at this point in the history
  • Loading branch information
klikli-dev committed Jun 14, 2024
1 parent 744b70d commit d8c77cd
Show file tree
Hide file tree
Showing 47 changed files with 154 additions and 110 deletions.
78 changes: 39 additions & 39 deletions .github/workflows/build_and_publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ jobs:
#tag: ${{ github.ref }}
artifacts: neo/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-neoforge-${{ steps.get_version.outputs.result }}.jar,neo/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-neoforge-${{ steps.get_version.outputs.result }}-slim.jar,neo/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-neoforge-${{ steps.get_version.outputs.result }}-sources.jar,common/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-common-${{ steps.get_version.outputs.result }}.jar,common/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-common-${{ steps.get_version.outputs.result }}-sources.jar
artifactContentType: application/java-archive
# - name: Create Forge Release
# id: create_forge_release
# uses: ncipollo/release-action@v1
# with:
# allowUpdates: true
# draft: false
# replacesArtifacts: false
# name: modonomicon-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}-${{ steps.get_release_type.outputs.result }}
# body: ${{ steps.changelog.outputs.changes }}
# token: ${{ github.token }}
# #tag: ${{ github.ref }}
# artifacts: forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar,forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}-slim.jar,forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}-sources.jar,common/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-common-${{ steps.get_version.outputs.result }}.jar,common/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-common-${{ steps.get_version.outputs.result }}-sources.jar
# artifactContentType: application/java-archive
- name: Create Forge Release
id: create_forge_release
uses: ncipollo/release-action@v1
with:
allowUpdates: true
draft: false
replacesArtifacts: false
name: modonomicon-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}-${{ steps.get_release_type.outputs.result }}
body: ${{ steps.changelog.outputs.changes }}
token: ${{ github.token }}
#tag: ${{ github.ref }}
artifacts: forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar,forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}-slim.jar,forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}-sources.jar,common/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-common-${{ steps.get_version.outputs.result }}.jar,common/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-common-${{ steps.get_version.outputs.result }}-sources.jar
artifactContentType: application/java-archive
- name: Create Fabric Release
id: create_fabric_release
uses: ncipollo/release-action@v1
Expand Down Expand Up @@ -130,32 +130,32 @@ jobs:
Find changes for all versions at https://github.com/klikli-dev/modonomicon/releases
dependencies: |
jei(optional)
# - name: Upload Forge Version to Mod Platforms
# uses: Kir-Antipov/mc-publish@v3.3.0
# if: ${{ steps.get_release_type.outputs.result != 'test' }}
# with:
# modrinth-id: 692GClaE
# modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
# curseforge-id: 538392
# curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }}
#
# files: |
# forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar
# forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}-sources.jar
#
# name: modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar
# version: ${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}
# version-type: ${{ steps.get_release_type.outputs.result }}
# loaders: |
# forge
# game-versions: |
# ${{ steps.get_mc_version.outputs.result }}
# changelog: |-
# ${{ steps.changelog.outputs.changes }}
#
# Find changes for all versions at https://github.com/klikli-dev/modonomicon/releases
# dependencies: |
# jei(optional)
- name: Upload Forge Version to Mod Platforms
uses: Kir-Antipov/mc-publish@v3.3.0
if: ${{ steps.get_release_type.outputs.result != 'test' }}
with:
modrinth-id: 692GClaE
modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
curseforge-id: 538392
curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }}

files: |
forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar
forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}-sources.jar
name: modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar
version: ${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}
version-type: ${{ steps.get_release_type.outputs.result }}
loaders: |
forge
game-versions: |
${{ steps.get_mc_version.outputs.result }}
changelog: |-
${{ steps.changelog.outputs.changes }}
Find changes for all versions at https://github.com/klikli-dev/modonomicon/releases
dependencies: |
jei(optional)
- name: Upload Fabric Version to Mod Platforms
uses: Kir-Antipov/mc-publish@v3.3.0
if: ${{ steps.get_release_type.outputs.result != 'test' }}
Expand Down
1 change: 0 additions & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id 'idea'
id 'java'
id 'maven-publish'
// id 'org.spongepowered.gradle.vanilla'
id 'fabric-loom'
}

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/resources/modonomicon.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"minVersion": "0.8",
"package": "com.klikli_dev.modonomicon.mixin",
"refmap": "${mod_id}.refmap.json",
"compatibilityLevel": "JAVA_21",
"compatibilityLevel": "JAVA_17",
"mixins": [
],
"client": [
Expand Down
12 changes: 6 additions & 6 deletions forge/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'idea'
id 'maven-publish'
id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
id 'org.spongepowered.mixin' version '0.7-SNAPSHOT'
id 'net.minecraftforge.gradle' version "${forgeradle_version}"
id 'org.spongepowered.mixin' version "0.7-SNAPSHOT"
id 'java-library'
}

Expand Down Expand Up @@ -97,11 +97,11 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }

dependencies {
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
annotationProcessor "org.spongepowered:mixin:0.8.5-SNAPSHOT:processor"
annotationProcessor "org.spongepowered:mixin:0.8.6:processor"

compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.5"))
implementation(jarJar("io.github.llamalad7:mixinextras-forge:0.3.5")) {
jarJar.ranged(it, "[0.3.5,)")
compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.6"))
implementation(jarJar("io.github.llamalad7:mixinextras-forge:0.3.6")) {
jarJar.ranged(it, "[0.3.6,)")
}

compileOnly project(":common")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
// 1.20.6 2024-06-07T20:41:53.1712612 Books: modonomicon
a30aec89de938ebb9f5e704d5262ad6f43865afd data/modonomicon/modonomicon/books/demo/book.json
20220ba7646d8d8556331b8bbeaf0d2f95f336b9 data/modonomicon/modonomicon/books/demo/categories/conditional.json
beb829bd9c24d3855aba996e5e08ffd8c5e41ccc data/modonomicon/modonomicon/books/demo/categories/features.json
5bee6456d3434ccb00d57ce279bc4b384b95fe42 data/modonomicon/modonomicon/books/demo/categories/formatting.json
99b4f77feb6cfcff5f822c398513ea5013587c61 data/modonomicon/modonomicon/books/demo/categories/hidden.json
2d4e9bc39733221848cfc39e2e17a43eb79f29da data/modonomicon/modonomicon/books/demo/categories/other.json
// 1.21 2024-06-14T11:00:01.345677 Books: modonomicon
d1966c22cbd9f7e253c22f6e95d16e1461379e4d data/modonomicon/modonomicon/books/demo/book.json
4d937a7e140cd8f12cf66624d4f9f0fea3d25e60 data/modonomicon/modonomicon/books/demo/categories/conditional.json
f6b8d25ca52be524ae7a0ef88e909c4ac4698361 data/modonomicon/modonomicon/books/demo/categories/features.json
7602d0f5e99044e312c487af3ea7ec6411d0c1b2 data/modonomicon/modonomicon/books/demo/categories/formatting.json
2037de6715bd9389e6c82c75858848613999c1a1 data/modonomicon/modonomicon/books/demo/categories/hidden.json
e9be47ba70195df3e759fe231a70b4532ecfcacf data/modonomicon/modonomicon/books/demo/categories/other.json
91921129e14250f4f9403e2ee1b4614da61f702a data/modonomicon/modonomicon/books/demo/commands/test_command.json
b9ad32b76e2efc9f44c8b76d56670f9dc63f2a94 data/modonomicon/modonomicon/books/demo/commands/test_command2.json
927643166c4e76606aa33bf3576453ca33418400 data/modonomicon/modonomicon/books/demo/entries/conditional/always_locked.json
8298ee5ccb34ba3a720ca90cc3c823fcdf68b205 data/modonomicon/modonomicon/books/demo/entries/features/command.json
abf891521b8c6ce78018818475f2dc60ad7efb33 data/modonomicon/modonomicon/books/demo/entries/features/condition_advancement.json
4479286b949d181d91acb81168151581792ef7f2 data/modonomicon/modonomicon/books/demo/entries/features/condition_level_1.json
dc4b9fcf8654fdf8fa22706511171971d27e016e data/modonomicon/modonomicon/books/demo/entries/features/condition_level_2.json
99dbb2d9b8b4874f325aa0335036847df4fb474e data/modonomicon/modonomicon/books/demo/entries/features/condition_root.json
a3c5998fdef3b0891514695a2081903b722f7e69 data/modonomicon/modonomicon/books/demo/entries/features/custom_icon.json
4178be10a7cb7687cc5216d313070d222972739d data/modonomicon/modonomicon/books/demo/entries/features/empty.json
953530451122f091d816e2795d96922529cc88e1 data/modonomicon/modonomicon/books/demo/entries/features/entity.json
1d0b9fcef8007c0112e4525a8bd6c3c54e316ddb data/modonomicon/modonomicon/books/demo/entries/features/image.json
2d124f84196d94d76caf20f79baa4002afde9a0a data/modonomicon/modonomicon/books/demo/entries/features/multiblock.json
1b2f70abc724c575358b40a8e0dc5630824378dc data/modonomicon/modonomicon/books/demo/entries/features/recipe.json
4e5ffd065b6ced42f8b70e8d67ac5692f2a250ef data/modonomicon/modonomicon/books/demo/entries/features/redirect.json
bf6516e011cc5562537901f83c7ba03a1c24b53b data/modonomicon/modonomicon/books/demo/entries/features/spotlight.json
c3f689b5d5fe29aa2ec0063ebc78697eab01881f data/modonomicon/modonomicon/books/demo/entries/features/two_parents.json
26cf6e65105f3be0f29e7dbd606cb17281c4854d data/modonomicon/modonomicon/books/demo/entries/formatting/advanced.json
820e09ba5a917e1b5b0ceb1806572b0801cfa52f data/modonomicon/modonomicon/books/demo/entries/formatting/always_locked.json
c4f3f19bb2b68d405c0d43d07460097c814fa1da data/modonomicon/modonomicon/books/demo/entries/formatting/basic.json
29f6991a4cd6c07f9247182f2f1b4294e3dc8351 data/modonomicon/modonomicon/books/demo/entries/formatting/link.json
4a0f243b77e13c86c07e8a81ccdac5d62ae54605 data/modonomicon/modonomicon/books/demo/entries/hidden/always_locked.json
9c5c701eb32476741892891bba1bac3b07fff429 data/modonomicon/modonomicon/books/demo/entries/other/a.json
4977c930c27884f8f580c7501b0b236686aa007e data/modonomicon/modonomicon/books/demo/entries/other/b.json
12d337eaf8d1c183a86d4bddf3e913f4eb2a4126 data/modonomicon/modonomicon/books/demo/entries/other/root.json
81cc81ae5db128b12850e1ee32da27f52af3e997 data/modonomicon/modonomicon/books/demo/entries/conditional/always_locked.json
9c1cd93f821b8d75c3b440aba9399a3a324ac830 data/modonomicon/modonomicon/books/demo/entries/features/command.json
3f4b5dcf418dabc39e48379da526f83810bcd3db data/modonomicon/modonomicon/books/demo/entries/features/condition_advancement.json
8d5c900f92888af78e90c20cfffd59c9bb66c462 data/modonomicon/modonomicon/books/demo/entries/features/condition_level_1.json
45ef048cf02d3a7e11c15836c9eb865050f9f5eb data/modonomicon/modonomicon/books/demo/entries/features/condition_level_2.json
8a70cb4a1ce959ef735dbd9c051f7b061513f810 data/modonomicon/modonomicon/books/demo/entries/features/condition_root.json
1ff9ff29111f0befffc51e68363d00d30243788c data/modonomicon/modonomicon/books/demo/entries/features/custom_icon.json
8abbcefc78f809438598e6f9b1bd8b1b929096d7 data/modonomicon/modonomicon/books/demo/entries/features/empty.json
8fb5b44d7b54f599942d1a9bcf55cd14c777e2d0 data/modonomicon/modonomicon/books/demo/entries/features/entity.json
74e2a5fb91574789b390caed06e635fedafd3e4c data/modonomicon/modonomicon/books/demo/entries/features/image.json
cccca6bb0ab5ae6510bb8a0333426e66e6c62538 data/modonomicon/modonomicon/books/demo/entries/features/multiblock.json
e2cb80ba9c55ac1ffe021e250335522c53df2409 data/modonomicon/modonomicon/books/demo/entries/features/recipe.json
78d45cfcf2fa553fda648771808efb93c2a46a1a data/modonomicon/modonomicon/books/demo/entries/features/redirect.json
9f0853bcee34ed1a52f9fb116033a1ebc8c74908 data/modonomicon/modonomicon/books/demo/entries/features/spotlight.json
8399e131f63049740e3642cfa60aba1483ceb191 data/modonomicon/modonomicon/books/demo/entries/features/two_parents.json
559dcdd6e09db7f1bad0ea7d1e85f7372b49ea41 data/modonomicon/modonomicon/books/demo/entries/formatting/advanced.json
ce1982da99d038c6b25ce04b87ea97ea9f71c2bb data/modonomicon/modonomicon/books/demo/entries/formatting/always_locked.json
e0a67e391143a034a114098d6512d7d29cb78dac data/modonomicon/modonomicon/books/demo/entries/formatting/basic.json
5549a62b7e53f283aa60cf00c88c5c0041727fee data/modonomicon/modonomicon/books/demo/entries/formatting/link.json
bc27dd0360889e1bd1510e546bcef7d6ba924ba6 data/modonomicon/modonomicon/books/demo/entries/hidden/always_locked.json
ad9bf7c6a5f334731ee95ff22deb1a002e5ad7bd data/modonomicon/modonomicon/books/demo/entries/other/a.json
c918f7d1599d098728a78350cc25e9564ab2e8e0 data/modonomicon/modonomicon/books/demo/entries/other/b.json
dbad1906d4c6e29bd8ac8512a46255198ac14d45 data/modonomicon/modonomicon/books/demo/entries/other/root.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.6 2024-06-07T20:41:53.1742635 Item Models: modonomicon
// 1.21 2024-06-14T11:00:01.347677 Item Models: modonomicon
b02e0bc9f75e0fde6807935577e74b75348413fb assets/modonomicon/models/item/modonomicon_blue.json
83adea7fd65acd9581797454e1a6dc6122d8a826 assets/modonomicon/models/item/modonomicon_green.json
4b35646623b74487675fa8ec1bb375535100c336 assets/modonomicon/models/item/modonomicon_purple.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.6 2024-06-07T20:41:53.17326 Languages: en_us
83072fd92a529dfbdb45fa79d1cbf8358395ee89 assets/modonomicon/lang/en_us.json
// 1.21 2024-06-14T11:00:01.3466746 Languages: en_us
bd9b85ca1a74cef1d6752951d075eddbb1139a27 assets/modonomicon/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.6 2024-06-07T20:41:53.1752627 Multiblocks: modonomicon
// 1.21 2024-06-14T11:00:01.347677 Multiblocks: modonomicon
9dc306d79a39ee2085be7e1384d8e39640d79e49 data/modonomicon/modonomicon/multiblocks/demo_dense.json
89b499dd4f3850c8099ad26ae3c286e95ac8cf99 data/modonomicon/modonomicon/multiblocks/demo_fluid.json
fc1e7363336d456dd0d1583fcfdaa27a8c4bf23e data/modonomicon/modonomicon/multiblocks/demo_predicate.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"book.modonomicon.demo.features.custom_icon.intro.text": "This entry has a custom texture with size 32x32 as icon!",
"book.modonomicon.demo.features.custom_icon.intro.title": "Custom Icon",
"book.modonomicon.demo.features.custom_icon.name": "Custom Icon",
"book.modonomicon.demo.features.description": "A category showcasing various **features** of Modonomicon.",
"book.modonomicon.demo.features.empty.description": "An entry showcasing empty pages.",
"book.modonomicon.demo.features.empty.intro.text": "Empty pages allow to add .. empty pages.",
"book.modonomicon.demo.features.empty.intro.title": "Empty Page Entry",
Expand Down Expand Up @@ -125,6 +126,7 @@
"modonomicon.command.success.save_progress": "Saved progress for book: %s. The unlock code has been copied to your clipboard.",
"modonomicon.command.test_command.success": "You got an apple, because reading is cool!",
"modonomicon.command.test_command2.success": "You got wheat, because clicking is cool!",
"modonomicon.gui.book.index_list_title": "Categories",
"modonomicon.gui.button.back": "Back",
"modonomicon.gui.button.back.tooltip": "Go back to the last page you visited",
"modonomicon.gui.button.exit": "Exit",
Expand All @@ -138,6 +140,7 @@
"modonomicon.gui.button.read_all.tooltip.shift_warning": "§l§cWarning:§r This may make it harder to read progress-oriented books.",
"modonomicon.gui.button.visualize": "Show Multiblock Preview",
"modonomicon.gui.button.visualize.tooltip": "Show Multiblock Preview",
"modonomicon.gui.category.index_list_title": "Entries",
"modonomicon.gui.hover.book_entry_link_locked_info": "You need to unlock this entry before you can open the link!",
"modonomicon.gui.hover.book_entry_link_locked_info.hint": "Hint: The entry is in the Category: %s",
"modonomicon.gui.hover.book_link": "Go to: %s",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"crafting_texture": "modonomicon:textures/gui/crafting_textures.png",
"creative_tab": "modonomicon:modonomicon",
"default_title_color": 0,
"description": "",
"display_mode": "node",
"font": "modonomicon:default",
"frame_texture": "modonomicon:textures/gui/book_frame.png",
"generate_book_item": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
"type": "modonomicon:entry_read",
"entry_id": "modonomicon:features/condition_root"
},
"description": "",
"display_mode": "node",
"entry_textures": "modonomicon:textures/gui/entry_textures.png",
"icon": {
"item": "minecraft:chest"
},
"name": "book.modonomicon.demo.conditional.name",
"show_category_button": true,
"sort_number": -1
"sort_number": 3
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
],
"background_texture_zoom_multiplier": 1.0,
"background_width": 512,
"description": "book.modonomicon.demo.features.description",
"display_mode": "node",
"entry_textures": "modonomicon:textures/gui/entry_textures.png",
"icon": {
"item": "minecraft:nether_star"
},
"name": "book.modonomicon.demo.features.name",
"show_category_button": true,
"sort_number": -1
"sort_number": 0
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
"background_parallax_layers": [],
"background_texture_zoom_multiplier": 1.0,
"background_width": 512,
"description": "",
"display_mode": "node",
"entry_textures": "modonomicon:textures/gui/entry_textures.png",
"entry_to_open": "modonomicon:formatting/basic",
"icon": {
"height": 16,
"texture": "minecraft:textures/item/book.png",
"width": 16
},
"name": "book.modonomicon.demo.formatting.name",
"open_entry_to_open_only_once": true,
"show_category_button": true,
"sort_number": -1
"sort_number": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
"background_parallax_layers": [],
"background_texture_zoom_multiplier": 1.0,
"background_width": 512,
"description": "",
"display_mode": "node",
"entry_textures": "modonomicon:textures/gui/entry_textures.png",
"icon": {
"item": "minecraft:book"
},
"name": "book.modonomicon.demo.hidden.name",
"show_category_button": false,
"sort_number": -1
"sort_number": 2
}
Loading

0 comments on commit d8c77cd

Please sign in to comment.