Skip to content

Commit da44ab2

Browse files
klikli-devklikli-dev
authored
feat: update to 1.21.11 (various display bugs, but ready for modders to build against) (#318)
* chore: update dep versions * chore: disable forge, does not support gradle 9 yet. * feat: update ResourceLocation to Identifier * feat: update rendertype import * feat: update read/write resource location to identifier * feat: various updates * feat: various updates * feat: update component style click detection and handling * feat: update accesswideners * feat: various small updates * chore: run datagen * feat: update github action to automatically handle modloader builds missing
1 parent 80feed1 commit da44ab2

238 files changed

Lines changed: 1321 additions & 1284 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build_and_publish.yaml‎

Lines changed: 51 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,15 @@ jobs:
5858
token: ${{ github.token }}
5959
tag: ${{ github.ref_name }}
6060
mcVersion: ${{ steps.get_mc_version.outputs.result }}
61+
- name: Check Artifacts
62+
id: check_artifacts
63+
run: |
64+
echo "neo_exists=$(test -f neo/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-neoforge-${{ steps.get_version.outputs.result }}.jar && echo true || echo false)" >> $GITHUB_OUTPUT
65+
echo "forge_exists=$(test -f forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar && echo true || echo false)" >> $GITHUB_OUTPUT
66+
echo "fabric_exists=$(test -f fabric/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-fabric-${{ steps.get_version.outputs.result }}.jar && echo true || echo false)" >> $GITHUB_OUTPUT
6167
- name: Create Neo Release
6268
id: create_neo_release
69+
if: steps.check_artifacts.outputs.neo_exists == 'true'
6370
uses: ncipollo/release-action@v1
6471
with:
6572
allowUpdates: true
@@ -71,21 +78,23 @@ jobs:
7178
#tag: ${{ github.ref }}
7279
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
7380
artifactContentType: application/java-archive
74-
# - name: Create Forge Release
75-
# id: create_forge_release
76-
# uses: ncipollo/release-action@v1
77-
# with:
78-
# allowUpdates: true
79-
# draft: false
80-
# replacesArtifacts: false
81-
# name: modonomicon-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}-${{ steps.get_release_type.outputs.result }}
82-
# body: ${{ steps.changelog.outputs.changes }}
83-
# token: ${{ github.token }}
84-
# #tag: ${{ github.ref }}
85-
# 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
86-
# artifactContentType: application/java-archive
81+
- name: Create Forge Release
82+
id: create_forge_release
83+
if: steps.check_artifacts.outputs.forge_exists == 'true'
84+
uses: ncipollo/release-action@v1
85+
with:
86+
allowUpdates: true
87+
draft: false
88+
replacesArtifacts: false
89+
name: modonomicon-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}-${{ steps.get_release_type.outputs.result }}
90+
body: ${{ steps.changelog.outputs.changes }}
91+
token: ${{ github.token }}
92+
#tag: ${{ github.ref }}
93+
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
94+
artifactContentType: application/java-archive
8795
- name: Create Fabric Release
8896
id: create_fabric_release
97+
if: steps.check_artifacts.outputs.fabric_exists == 'true'
8998
uses: ncipollo/release-action@v1
9099
with:
91100
allowUpdates: true
@@ -101,12 +110,12 @@ jobs:
101110
uses: stefanzweifel/git-auto-commit-action@v5
102111
if: ${{ steps.get_release_type.outputs.result != 'test' }}
103112
with:
104-
branch: version/1.21.10
113+
branch: version/1.21.11
105114
commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
106115
file_pattern: CHANGELOG.md
107116
- name: Upload Neo Version to Mod Platforms
108117
uses: Kir-Antipov/mc-publish@v3.3.0
109-
if: ${{ steps.get_release_type.outputs.result != 'test' }}
118+
if: ${{ steps.get_release_type.outputs.result != 'test' && steps.check_artifacts.outputs.neo_exists == 'true' }}
110119
with:
111120
modrinth-id: 692GClaE
112121
modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
@@ -130,35 +139,35 @@ jobs:
130139
Find changes for all versions at https://github.com/klikli-dev/modonomicon/releases
131140
dependencies: |
132141
jei(optional)
133-
# - name: Upload Forge Version to Mod Platforms
134-
# uses: Kir-Antipov/mc-publish@v3.3.0
135-
# if: ${{ steps.get_release_type.outputs.result != 'test' }}
136-
# with:
137-
# modrinth-id: 692GClaE
138-
# modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
139-
# curseforge-id: 538392
140-
# curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }}
141-
#
142-
# files: |
143-
# forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar
144-
# forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}-sources.jar
145-
#
146-
# name: modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar
147-
# version: ${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}
148-
# version-type: ${{ steps.get_release_type.outputs.result }}
149-
# loaders: |
150-
# forge
151-
# game-versions: |
152-
# ${{ steps.get_mc_version.outputs.result }}
153-
# changelog: |-
154-
# ${{ steps.changelog.outputs.changes }}
155-
#
156-
# Find changes for all versions at https://github.com/klikli-dev/modonomicon/releases
157-
# dependencies: |
158-
# jei(optional)
142+
- name: Upload Forge Version to Mod Platforms
143+
uses: Kir-Antipov/mc-publish@v3.3.0
144+
if: ${{ steps.get_release_type.outputs.result != 'test' && steps.check_artifacts.outputs.forge_exists == 'true' }}
145+
with:
146+
modrinth-id: 692GClaE
147+
modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
148+
curseforge-id: 538392
149+
curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }}
150+
151+
files: |
152+
forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar
153+
forge/build/libs/modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}-sources.jar
154+
155+
name: modonomicon-${{ steps.get_mc_version.outputs.result }}-forge-${{ steps.get_version.outputs.result }}.jar
156+
version: ${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}
157+
version-type: ${{ steps.get_release_type.outputs.result }}
158+
loaders: |
159+
forge
160+
game-versions: |
161+
${{ steps.get_mc_version.outputs.result }}
162+
changelog: |-
163+
${{ steps.changelog.outputs.changes }}
164+
165+
Find changes for all versions at https://github.com/klikli-dev/modonomicon/releases
166+
dependencies: |
167+
jei(optional)
159168
- name: Upload Fabric Version to Mod Platforms
160169
uses: Kir-Antipov/mc-publish@v3.3.0
161-
if: ${{ steps.get_release_type.outputs.result != 'test' }}
170+
if: ${{ steps.get_release_type.outputs.result != 'test' && steps.check_artifacts.outputs.fabric_exists == 'true' }}
162171
with:
163172
modrinth-id: 692GClaE
164173
modrinth-token: ${{ secrets.MODRINTH_API_KEY }}

‎build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
plugins {
2-
id 'fabric-loom' version '1.11-SNAPSHOT' apply(false)
2+
id 'fabric-loom' version "${loom_version}" apply(false)
33
}
44

5-
65
subprojects {
76
apply plugin: 'java'
87

‎common/src/main/java/com/klikli_dev/modonomicon/Modonomicon.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.klikli_dev.modonomicon.registry.DataComponentRegistry;
1111
import com.klikli_dev.modonomicon.registry.ItemRegistry;
1212
import com.klikli_dev.modonomicon.registry.SoundRegistry;
13-
import net.minecraft.resources.ResourceLocation;
13+
import net.minecraft.resources.Identifier;
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
1616

@@ -33,7 +33,7 @@ public static void init() {
3333
SoundRegistry.load();
3434
}
3535

36-
public static ResourceLocation loc(String path) {
37-
return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
36+
public static Identifier loc(String path) {
37+
return Identifier.fromNamespaceAndPath(MOD_ID, path);
3838
}
3939
}

‎common/src/main/java/com/klikli_dev/modonomicon/api/ModonomiconAPI.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.klikli_dev.modonomicon.api.multiblock.MultiblockPreviewData;
1414
import com.klikli_dev.modonomicon.api.stub.ModonomiconAPIStub;
1515
import net.minecraft.core.BlockPos;
16-
import net.minecraft.resources.ResourceLocation;
16+
import net.minecraft.resources.Identifier;
1717
import net.minecraft.world.level.Level;
1818
import net.minecraft.world.level.block.Rotation;
1919
import org.apache.logging.log4j.LogManager;
@@ -47,7 +47,7 @@ static ModonomiconAPI get() {
4747
@Deprecated
4848
CategoryEntryMap getEntryMap();
4949

50-
Multiblock getMultiblock(ResourceLocation id);
50+
Multiblock getMultiblock(Identifier id);
5151

5252
/**
5353
* Gets the multiblock currently previewed by the player, or null if none.

0 commit comments

Comments
 (0)