Skip to content

Commit 3b7be07

Browse files
committed
Add Fabric support for 1.21.9+
- Added Fabric support for Minecraft 1.21.9 and 1.21.10 by porting to 1.21.9+build.1 - Updated to Gradle 9.1 and Loom 1.11 - Updated GitHub build workflow to include additional info in job summaries - Updated README
1 parent ca76b52 commit 3b7be07

26 files changed

Lines changed: 157 additions & 415 deletions

.github/workflows/build.yml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,29 @@ jobs:
2020
- name: Setup Gradle
2121
uses: gradle/actions/setup-gradle@v3
2222
with:
23-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
24-
add-job-summary: 'always' # maybe change to error only?
23+
cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/archloom' }}
24+
add-job-summary: 'always'
2525
- name: Make gradle wrapper executable
26-
if: ${{ runner.os != 'Windows' }}
2726
run: chmod +x ./gradlew
2827
- name: Build
2928
run: ./gradlew build
30-
- name: Capture fabric build artifact
29+
- name: Capture Fabric build artifact
3130
uses: actions/upload-artifact@v4
3231
with:
33-
name: "Make Bubbles Pop Fabric for Minecraft 1.21.2-1.21.4 (Unzip Me)"
32+
name: "Make Bubbles Pop Fabric for Minecraft 1.21.9-1.21.10 (Unzip Me)"
3433
path: fabric/build/libs/make_bubbles_pop-*.jar
35-
- name: Capture forge build artifact
36-
uses: actions/upload-artifact@v4
37-
with:
38-
name: "Make Bubbles Pop Forge for Minecraft 1.21.2-1.21.4 (Unzip Me)"
39-
path: forge/build/libs/make_bubbles_pop-*.jar
34+
- name: Set job summary
35+
id: summary
36+
shell: bash
37+
run: |
38+
cat << EOF >> $GITHUB_STEP_SUMMARY
39+
<picture>
40+
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/success.svg">
41+
<img alt="✅ Success" src="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/success.svg">
42+
</picture><br>
43+
44+
**${{ github.event.repository.name }}** built successfully! [See changes since last release](https://github.com/${{ github.repository }}/blob/${{ github.sha }}/CHANGES.md).
45+
46+
[Download artifacts via nightly.link](https://nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }})
47+
48+
EOF

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- **Added Fabric support for Minecraft 1.21.9** 🥉 **and 1.21.10** 🧩
2+
- Updated to Gradle 9.1 and Loom 1.11

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@
1010
</p>
1111

1212
<picture><source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/info.svg"><img alt="Info" src="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/info.svg"></picture><br>
13-
This branch hosts the 1.21.2-1.21.4 version of the mod.
14-
- Fabric version works in Minecraft 1.21.2-1.21.4
15-
- Forge version works in Minecraft 1.21.2-1.21.4
13+
This branch hosts the v0.3.2 1.21.9+ Fabric version of the mod.
14+
- Fabric version works in Minecraft 1.21.9-1.21.10
15+
- Forge version not ported
1616

1717
[Go to the master branch](https://github.com/Tschipcraft/make_bubbles_pop/tree/master)
1818

1919
## Features
2020

21-
This client-side mod makes bubble particles pop
22-
and completely overhauls their behavior to make them rise realistically to the water surface.
21+
This client-side mod makes bubble particles pop and completely overhauls their behavior to make them rise realistically to the water surface.
2322
It also adds bubble particles to opening chests, opening barrels and explosions underwater.
2423

2524
Fixes [MC-132067](https://bugs.mojang.com/browse/MC-132067).
@@ -28,7 +27,7 @@ Fixes [MC-132067](https://bugs.mojang.com/browse/MC-132067).
2827

2928
Download the latest release from [here](https://github.com/Tschipcraft/fabric_make_bubbles_pop_mod/releases/latest) and put the .jar file into the `mods` folder in your Minecraft directory.
3029

31-
To configure Make Bubbles Pop, install [MidnightLib](https://modrinth.com/mod/midnightlib) for Fabric or [Configured](https://www.curseforge.com/minecraft/mc-mods/configured) for Forge alongside it.
30+
To configure Make Bubbles Pop, install [MidnightLib](https://modrinth.com/mod/midnightlib) for Fabric alongside it.
3231

3332
This mod is also available on Modrinth and CurseForge!
3433

@@ -47,6 +46,10 @@ This mod is also available on Modrinth and CurseForge!
4746
</picture>
4847
</a>
4948

49+
## Development Builds
50+
51+
Development builds are available via [GitHub Actions](https://github.com/Tschipcraft/make_bubbles_pop/actions/workflows/build.yml). These builds are not guaranteed to be stable and may contain bugs.
52+
5053
## Demo Videos
5154

5255
https://user-images.githubusercontent.com/78470530/161437539-a666994e-2a25-4b80-aecd-240b1a979cfd.mp4

fabric/build.gradle

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
plugins {
2-
id 'fabric-loom' version '1.9-SNAPSHOT'
2+
id 'fabric-loom' version '1.11-SNAPSHOT'
33
id 'maven-publish'
44
}
55

6-
sourceCompatibility = JavaVersion.VERSION_17
7-
targetCompatibility = JavaVersion.VERSION_17
8-
9-
archivesBaseName = project.archives_base_name
106
version = project.mod_version
117
group = project.maven_group
128

9+
base {
10+
archivesName = project.archives_base_name
11+
}
12+
1313
repositories {
1414
// Add repositories to retrieve artifacts from in here.
1515
// You should only use this when depending on other mods because
@@ -46,21 +46,25 @@ processResources {
4646
}
4747

4848
tasks.withType(JavaCompile).configureEach {
49-
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
50-
it.options.release = 17
49+
it.options.release = 21
5150
}
5251

5352
java {
5453
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
5554
// if it is present.
5655
// If you remove this line, sources will not be generated.
5756
withSourcesJar()
57+
58+
sourceCompatibility = JavaVersion.VERSION_21
59+
targetCompatibility = JavaVersion.VERSION_21
5860
}
5961

6062
jar {
61-
from("LICENSE") {
62-
rename { "${it}_${project.archivesBaseName}"}
63-
}
63+
inputs.property "archivesName", project.base.archivesName
64+
65+
from("LICENSE") {
66+
rename { "${it}_${inputs.properties.archivesName}"}
67+
}
6468
}
6569

6670
// configure the maven publication

fabric/remappedSrc/net/tschipcraft/make_bubbles_pop/MakeBubblesPop.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

fabric/remappedSrc/net/tschipcraft/make_bubbles_pop/event/BlockInteractHandler.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

fabric/remappedSrc/net/tschipcraft/make_bubbles_pop/mixin/BubbleColumnPop.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

fabric/remappedSrc/net/tschipcraft/make_bubbles_pop/mixin/BubblePop.java

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)