Skip to content

Commit b5cc4f4

Browse files
cech12cech12
committed
updated to Minecraft 26.1.1 (Fabric 0.145.3+26.1.1, NeoForge 26.1.1.1-beta, Forge 63.0.0)
- updated Cloth Config support (26.1.154) (Fabric/Quilt) - updated ModMenu support (18.0.0-alpha.8) (Fabric/Quilt) - updated JEI support (29.3.0.22) (Fabric/Quilt & NeoForge) - temporary removed REI support until it is ported to 26.1.1 (Fabric/Quilt, NeoForge) - updated the texture "assets/solarcooker/textures/entity/chest/solar_coooker.png" - removed the texture "assets/solarcooker/textures/entity/chest/solar_coooker_reflector.png"
1 parent a6358c1 commit b5cc4f4

43 files changed

Lines changed: 294 additions & 321 deletions

Some content is hidden

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

‎.github/workflows/cicd-workflow.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77
push:
88
branches: [ "*" ]
9-
tags: ["1.21*"]
9+
tags: ["26*"]
1010
paths-ignore: ["**/*.md"]
1111
pull_request:
1212
branches: [ "*" ]
@@ -17,21 +17,21 @@ jobs:
1717
name: Build
1818
uses: cech12/MinecraftModActions/.github/workflows/build.yml@main
1919
with:
20-
java-version: 21
20+
java-version: 25
2121
# gametest:
2222
# needs: build
2323
# name: Game Test
2424
# uses: cech12/MinecraftModActions/.github/workflows/gametest.yml@main
2525
# with:
26-
# java-version: 21
26+
# java-version: 25
2727
publish-github:
2828
# needs: gametest
2929
needs: build
3030
if: startsWith(github.ref, 'refs/tags/')
3131
name: Publish Github
3232
uses: cech12/MinecraftModActions/.github/workflows/multi-publish-github.yml@main
3333
with:
34-
java-version: 21
34+
java-version: 25
3535
mod-name: Solar Cooker
3636
mod-id: solarcooker
3737
secrets:
@@ -42,12 +42,12 @@ jobs:
4242
name: Publish Forge on Curseforge
4343
uses: cech12/MinecraftModActions/.github/workflows/publish-curseforge.yml@main
4444
with:
45-
java-version: 21
45+
java-version: 25
4646
subproject: forge
4747
title-prefix: forge-
4848
curseforge-id: 436874
4949
game-versions: |
50-
1.21.11
50+
26.1.1
5151
release-type: release
5252
loaders: |
5353
forge
@@ -60,12 +60,12 @@ jobs:
6060
name: Publish Forge on Modrinth
6161
uses: cech12/MinecraftModActions/.github/workflows/publish-modrinth.yml@main
6262
with:
63-
java-version: 21
63+
java-version: 25
6464
subproject: forge
6565
title-prefix: forge-
6666
modrinth-id: IsSapAeq
6767
game-versions: |
68-
1.21.11
68+
26.1.1
6969
release-type: release
7070
loaders: |
7171
forge
@@ -78,12 +78,12 @@ jobs:
7878
name: Publish Neoforge on Curseforge
7979
uses: cech12/MinecraftModActions/.github/workflows/publish-curseforge.yml@main
8080
with:
81-
java-version: 21
81+
java-version: 25
8282
subproject: neoforge
8383
title-prefix: neoforge-
8484
curseforge-id: 436874
8585
game-versions: |
86-
1.21.11
86+
26.1.1
8787
release-type: release
8888
loaders: |
8989
neoforge
@@ -96,12 +96,12 @@ jobs:
9696
name: Publish Neoforge on Modrinth
9797
uses: cech12/MinecraftModActions/.github/workflows/publish-modrinth.yml@main
9898
with:
99-
java-version: 21
99+
java-version: 25
100100
subproject: neoforge
101101
title-prefix: neoforge-
102102
modrinth-id: IsSapAeq
103103
game-versions: |
104-
1.21.11
104+
26.1.1
105105
release-type: release
106106
loaders: |
107107
neoforge
@@ -114,12 +114,12 @@ jobs:
114114
name: Publish Fabric on Curseforge
115115
uses: cech12/MinecraftModActions/.github/workflows/publish-curseforge.yml@main
116116
with:
117-
java-version: 21
117+
java-version: 25
118118
subproject: fabric
119119
title-prefix: fabric-
120120
curseforge-id: 436874
121121
game-versions: |
122-
1.21.11
122+
26.1.1
123123
release-type: release
124124
loaders: |
125125
fabric
@@ -133,12 +133,12 @@ jobs:
133133
name: Publish Fabric on Modrinth
134134
uses: cech12/MinecraftModActions/.github/workflows/publish-modrinth.yml@main
135135
with:
136-
java-version: 21
136+
java-version: 25
137137
subproject: fabric
138138
title-prefix: fabric-
139139
modrinth-id: IsSapAeq
140140
game-versions: |
141-
1.21.11
141+
26.1.1
142142
release-type: release
143143
loaders: |
144144
fabric

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
name: Analyze
1111
uses: cech12/MinecraftModActions/.github/workflows/codeql-analysis.yml@main
1212
with:
13-
java-version: 21
13+
java-version: 25

‎.github/workflows/update-gradle-wrapper.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
name: Update Gradle Wrapper
1111
uses: cech12/MinecraftModActions/.github/workflows/update-gradle-wrapper.yml@main
1212
with:
13-
java-version: 21
13+
java-version: 25
1414
secrets:
1515
github-token: ${{ secrets.GITHUB_TOKEN }}

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [this versioning scheme](https://gist.github.com/cech12/69319028e88c50349a6b044000a6607b).
55

6+
## [26.1.1-5.0.0.0] - 2026-04-03
7+
### Changed
8+
- updated to Minecraft 26.1.1 (Fabric 0.145.3+26.1.1, NeoForge 26.1.1.1-beta, Forge 63.0.0)
9+
- updated Cloth Config support (26.1.154) (Fabric/Quilt)
10+
- updated ModMenu support (18.0.0-alpha.8) (Fabric/Quilt)
11+
- updated JEI support (29.3.0.22) (Fabric/Quilt & NeoForge)
12+
- temporary removed REI support until it is ported to 26.1.1 (Fabric/Quilt, NeoForge)
13+
- updated the texture "assets/solarcooker/textures/entity/chest/solar_coooker.png"
14+
15+
### Removed
16+
- removed the texture "assets/solarcooker/textures/entity/chest/solar_coooker_reflector.png"
17+
618
## [1.21.11-4.10.0.0] - 2026-02-01
719
### Changed
820
- updated to Minecraft 1.21.11 (Fabric 0.141.2+1.21.11, NeoForge 21.11.37-beta, Forge 61.0.8)

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
22
// see https://fabricmc.net/develop/ for new versions
3-
id 'fabric-loom' version '1.15-SNAPSHOT' apply false
3+
id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT' apply false
44
// see https://projects.neoforged.net/neoforged/moddevgradle for new versions
5-
id 'net.neoforged.moddev' version '2.0.140' apply false
5+
id 'net.neoforged.moddev' version '2.0.141' apply false
66
// see https://files.minecraftforge.net/net/minecraftforge/forgegradle/index.html for new versions
7-
id 'net.minecraftforge.gradle' version '7.0.0' apply false
7+
id 'net.minecraftforge.gradle' version '7.0.17' apply false
88
// see https://plugins.gradle.org/plugin/net.minecraftforge.accesstransformers
99
id 'net.minecraftforge.accesstransformers' version '5.0.3' apply false
1010
}

‎buildSrc/src/main/groovy/multiloader-common.gradle‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,6 @@ repositories {
2626
}
2727
filter { includeGroupAndSubgroups('org.spongepowered') }
2828
}
29-
exclusiveContent {
30-
forRepositories(
31-
maven {
32-
name = 'ParchmentMC'
33-
url = 'https://maven.parchmentmc.org/'
34-
},
35-
maven {
36-
name = "NeoForge"
37-
url = 'https://maven.neoforged.net/releases'
38-
}
39-
)
40-
filter { includeGroup('org.parchmentmc.data') }
41-
}
4229
maven {
4330
name = 'BlameJared Maven (JEI / CraftTweaker / Bookshelf)'
4431
url = 'https://maven.blamejared.com'
@@ -49,20 +36,6 @@ repositories {
4936
maven { url = "https://maven.terraformersmc.com/releases/" }
5037
}
5138

52-
// Declare capabilities on the outgoing configurations.
53-
// Read more about capabilities here: https://docs.gradle.org/current/userguide/component_capabilities.html#sec:declaring-additional-capabilities-for-a-local-component
54-
['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each { variant ->
55-
configurations."$variant".outgoing {
56-
capability("$group:${project.name}:$version")
57-
capability("$group:${base.archivesName.get()}:$version")
58-
capability("$group:$mod_id-${project.name}-${minecraft_version}:$version")
59-
capability("$group:$mod_id:$version")
60-
}
61-
publishing.publications.configureEach {
62-
suppressPomMetadataWarningsFor(variant)
63-
}
64-
}
65-
6639
sourcesJar {
6740
from(rootProject.file('LICENSE')) {
6841
rename { "${it}_${mod_name}" }

‎buildSrc/src/main/groovy/multiloader-loader.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ configurations {
1313

1414
dependencies {
1515
compileOnly(project(':common')) {
16-
capabilities {
17-
requireCapability "$group:$mod_id"
18-
}
1916
def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String)
2017
attributes {
2118
attribute(loaderAttribute, 'common')

‎common/build.gradle‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ neoForge {
1010
if (at.exists()) {
1111
accessTransformers.from(at.absolutePath)
1212
}
13-
parchment {
14-
minecraftVersion = parchment_minecraft
15-
mappingsVersion = parchment_version
16-
}
1713
}
1814

1915
dependencies {

‎common/src/main/java/de/cech12/solarcooker/blockentity/SolarCookerBlockEntity.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import net.minecraft.core.Direction;
1313
import net.minecraft.core.HolderLookup;
1414
import net.minecraft.core.NonNullList;
15-
import net.minecraft.core.RegistryAccess;
1615
import net.minecraft.nbt.CompoundTag;
1716
import net.minecraft.network.chat.Component;
1817
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
@@ -248,13 +247,13 @@ public static void tick(Level level, BlockPos pos, BlockState state, SolarCooker
248247
boolean isSunlit = entity.isSunlit();
249248
if (isSunlit && !entity.items.get(INPUT).isEmpty()) {
250249
RecipeHolder<? extends AbstractCookingRecipe> recipe = entity.getRecipe();
251-
if (entity.canSmelt(level.registryAccess(), recipe)) {
250+
if (entity.canSmelt(recipe)) {
252251
entity.cookTime++;
253252
if (entity.cookTime == entity.cookTimeTotal) {
254253
entity.cookTime = 0;
255254
entity.cookTimeTotal = entity.getRecipeCookTime();
256255
if (!level.isClientSide()) {
257-
entity.smeltItem(level.registryAccess(), recipe);
256+
entity.smeltItem(recipe);
258257
dirty = true;
259258
}
260259
}
@@ -292,7 +291,7 @@ public static void tick(Level level, BlockPos pos, BlockState state, SolarCooker
292291
}
293292

294293
public boolean shouldLidBeOpen(int numPlayersUsing) {
295-
boolean recipeActive = this.cookTime > 0 || (this.getLevel() != null && (this.canSmelt(this.getLevel().registryAccess(), getRecipe())));
294+
boolean recipeActive = this.cookTime > 0 || (this.getLevel() != null && (this.canSmelt(getRecipe())));
296295
return numPlayersUsing > 0 || (recipeActive && this.isSunlit());
297296
}
298297

@@ -359,13 +358,13 @@ public static void playSound(Level level, BlockPos pos, SoundEvent soundEvent) {
359358
double x = (double)pos.getX() + 0.5D;
360359
double y = (double)pos.getY() + 0.5D;
361360
double z = (double)pos.getZ() + 0.5D;
362-
level.playSound(null, x, y, z, soundEvent, SoundSource.BLOCKS, 0.5F, level.random.nextFloat() * 0.1F + 0.9F);
361+
level.playSound(null, x, y, z, soundEvent, SoundSource.BLOCKS, 0.5F, level.getRandom().nextFloat() * 0.1F + 0.9F);
363362
}
364363
}
365364

366-
protected boolean canSmelt(RegistryAccess registryAccess, @Nullable RecipeHolder<?> recipe) {
365+
protected boolean canSmelt(@Nullable RecipeHolder<?> recipe) {
367366
if (!this.items.get(INPUT).isEmpty() && recipe != null && recipe.value() instanceof AbstractCookingRecipe cookingRecipe) {
368-
ItemStack recipeOutput = cookingRecipe.assemble(new SingleRecipeInput(this.items.get(INPUT)), registryAccess);
367+
ItemStack recipeOutput = cookingRecipe.assemble(new SingleRecipeInput(this.items.get(INPUT)));
369368
if (!recipeOutput.isEmpty()) {
370369
ItemStack output = this.items.get(OUTPUT);
371370
if (output.isEmpty()) return true;
@@ -376,10 +375,10 @@ protected boolean canSmelt(RegistryAccess registryAccess, @Nullable RecipeHolder
376375
return false;
377376
}
378377

379-
private void smeltItem(RegistryAccess registryAccess, @Nullable RecipeHolder<?> recipe) {
380-
if (recipe != null && this.canSmelt(registryAccess, recipe) && recipe.value() instanceof AbstractCookingRecipe cookingRecipe) {
378+
private void smeltItem(@Nullable RecipeHolder<?> recipe) {
379+
if (recipe != null && this.canSmelt(recipe) && recipe.value() instanceof AbstractCookingRecipe cookingRecipe) {
381380
ItemStack itemstack = this.items.get(INPUT);
382-
ItemStack itemstack1 = cookingRecipe.assemble(new SingleRecipeInput(itemstack), registryAccess);
381+
ItemStack itemstack1 = cookingRecipe.assemble(new SingleRecipeInput(itemstack));
383382
ItemStack itemstack2 = this.items.get(OUTPUT);
384383
if (itemstack2.isEmpty()) {
385384
this.items.set(1, itemstack1.copy());

0 commit comments

Comments
 (0)