Skip to content

Commit

Permalink
updated to Minecraft 1.21.1 (Fabric 0.105.0+1.21.1, Neoforge 21.1.62,…
Browse files Browse the repository at this point in the history
… Forge 52.0.21)

- updated Cloth Config support (15.0.140) (Fabric/Quilt)
- updated ModMenu support (11.0.2) (Fabric/Quilt)
- updated JEI support (19.19.0.219) (Forge & NeoForge)
- updated REI support (16.0.788) (Fabric/Quilt & NeoForge)
- updated The One Probe support (1.21_neo-12.0.3) (NeoForge)
- fixed JEI loading errors since 19.19.0.219 (all loaders)
- fixed recipes and advancements by using the new common tags in Forge
  • Loading branch information
cech12 committed Oct 27, 2024
1 parent 138f726 commit 8d756fe
Show file tree
Hide file tree
Showing 25 changed files with 40 additions and 333 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/cicd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
title-prefix: forge-
curseforge-id: 436874
game-versions: |
1.21
1.21.1
release-type: release
loaders: |
Expand All @@ -70,7 +69,6 @@ jobs:
title-prefix: forge-
modrinth-id: IsSapAeq
game-versions: |
1.21
1.21.1
release-type: release
loaders: |
Expand All @@ -89,7 +87,6 @@ jobs:
title-prefix: neoforge-
curseforge-id: 436874
game-versions: |
1.21
1.21.1
release-type: release
loaders: |
Expand All @@ -108,7 +105,6 @@ jobs:
title-prefix: neoforge-
modrinth-id: IsSapAeq
game-versions: |
1.21
1.21.1
release-type: release
loaders: |
Expand All @@ -127,7 +123,6 @@ jobs:
title-prefix: fabric-
curseforge-id: 436874
game-versions: |
1.21
1.21.1
release-type: release
loaders: |
Expand All @@ -147,7 +142,6 @@ jobs:
title-prefix: fabric-
modrinth-id: IsSapAeq
game-versions: |
1.21
1.21.1
release-type: release
loaders: |
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/).

## [1.21.1-4.2.0.0] - 2024-10-27
### Changed
- updated to Minecraft 1.21.1 (Fabric 0.105.0+1.21.1, Neoforge 21.1.62, Forge 52.0.21)
- updated Cloth Config support (15.0.140) (Fabric/Quilt)
- updated ModMenu support (11.0.2) (Fabric/Quilt)
- updated JEI support (19.19.0.219) (Forge & NeoForge)
- updated REI support (16.0.788) (Fabric/Quilt & NeoForge)
- updated The One Probe support (1.21_neo-12.0.3) (NeoForge)

### Fixed
- fixed JEI loading errors since 19.19.0.219 (all loaders)
- fixed recipes and advancements by using the new common tags in Forge

## [1.21-4.1.1.0] - 2024-08-30
### Changed
- number config options are now text fields instead of sliders (Fabric)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,18 @@
import mezz.jei.api.recipe.RecipeType;
import mezz.jei.library.plugins.vanilla.cooking.AbstractCookingCategory;
import net.minecraft.world.item.crafting.RecipeHolder;

import javax.annotation.Nonnull;
import org.jetbrains.annotations.NotNull;

public class SolarCookingCategory extends AbstractCookingCategory<SolarCookingRecipe> {

public SolarCookingCategory(IGuiHelper guiHelper) {
super(guiHelper, Constants.SOLAR_COOKER_BLOCK.get(), "gui.jei.category.smelting", (int) (200 * Services.CONFIG.getCookTimeFactor()));
super(guiHelper, new RecipeType<>(Constants.id(Constants.SOLAR_COOKING_NAME), (Class<? extends RecipeHolder<SolarCookingRecipe>>) (Object) RecipeHolder.class),
Constants.SOLAR_COOKER_BLOCK.get(), "gui.jei.category.smelting", (int) (200 * Services.CONFIG.getCookTimeFactor()));
}

@Override
@Nonnull
public RecipeType<RecipeHolder<SolarCookingRecipe>> getRecipeType() {
Class<? extends RecipeHolder<SolarCookingRecipe>> holderClass = (Class<? extends RecipeHolder<SolarCookingRecipe>>) (Object) RecipeHolder.class;
return new RecipeType<>(Constants.id(Constants.SOLAR_COOKING_NAME), holderClass);
public boolean isHandled(@NotNull RecipeHolder<SolarCookingRecipe> recipeHolder) {
return true;
}

}
2 changes: 1 addition & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'java'
id 'idea'
id 'maven-publish'
id 'fabric-loom' version '[1.6.6,1.7)'
id 'fabric-loom' version '[1.7.4,1.8)'
}
base {
archivesName = "${mod_id}-fabric"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
@Mod.EventBusSubscriber(modid= Constants.MOD_ID, bus= Mod.EventBusSubscriber.Bus.MOD)
public class ForgeSolarCookerMod {

public ForgeSolarCookerMod() {
final IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
public ForgeSolarCookerMod(FMLJavaModLoadingContext context) {
final IEventBus eventBus = context.getModEventBus();
ModBlocks.BLOCKS.register(eventBus);
ModBlockEntityTypes.BLOCK_ENTITY_TYPES.register(eventBus);
ModItems.ITEMS.register(eventBus);
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

18 changes: 0 additions & 18 deletions forge/src/main/resources/data/solarcooker/recipe/reflector.json

This file was deleted.

This file was deleted.

23 changes: 0 additions & 23 deletions forge/src/main/resources/data/solarcooker/recipe/solar_cooker.json

This file was deleted.

36 changes: 18 additions & 18 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Project
group=de.cech12.solarcooker
mod_version=4.1.1.0
mod_version=4.2.0.0
mod_id=solarcooker
mod_name=Solar Cooker
mod_author=Cech12
Expand All @@ -15,37 +15,37 @@ description=A mod which adds a Solar Cooker.

# Common
java_version=21
minecraft_version=1.21
minecraft_version_range=[1.21, 1.22)
minecraft_version=1.21.1
minecraft_version_range=[1.21.1, 1.22)

# Fabric
fabric_version=0.100.3+1.21
fabric_loader_version=0.15.11
cloth_config_version=15.0.127
mod_menu_version=11.0.1
fabric_version=0.105.0+1.21.1
fabric_loader_version=0.16.5
cloth_config_version=15.0.140
mod_menu_version=11.0.2

# Forge
forge_version=51.0.18
forge_version_range=[51.0.18,)
forge_version=52.0.21
forge_version_range=[52.0.21,)
forge_loader_version_range=[50,)

# NeoForge
neoforge_version=21.0.94-beta
neoforge_version_range=[21.0.94-beta,)
neoforge_version=21.1.62
neoforge_version_range=[21.1.62,)
neoforge_loader_version_range=[2,)

# jei
jei_version=19.0.0.11
jei_version_range=[19.0.0.11,)
jei_version=19.19.0.219
jei_version_range=[19.19.0.219,)

# rei
rei_version=16.0.729
rei_version_range=[16.0.729,)
architectury_version=13.0.2
rei_version=16.0.788
rei_version_range=[16.0.788,)
architectury_version=13.0.8

#the one probe
top_version=1.21_neo-12.0.0-1
top_version_range=[1.21_neo-12.0.0,)
top_version=1.21_neo-12.0.3-5
top_version_range=[1.21_neo-12.0.3,)

# Gradle
org.gradle.jvmargs=-Xmx3G
Expand Down
2 changes: 1 addition & 1 deletion neoforge/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'idea'
id 'maven-publish'
id 'net.neoforged.gradle.userdev' version '7.0.150'
id 'net.neoforged.gradle.userdev' version '7.0.165'
id 'java-library'
}
base {
Expand Down

This file was deleted.

Loading

0 comments on commit 8d756fe

Please sign in to comment.