Skip to content

Commit

Permalink
add Fabric & Quilt support
Browse files Browse the repository at this point in the history
  • Loading branch information
cech12 committed Apr 25, 2024
1 parent f2e534c commit c44661b
Show file tree
Hide file tree
Showing 39 changed files with 811 additions and 19 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ body:
- Fabric
- Forge
- NeoForge
- Quilt
validations:
required: true
- type: input
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/cicd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,41 @@ jobs:
secrets:
github-token: ${{ secrets.GITHUB_TOKEN }}
modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
publish-fabric-on-curseforge:
needs: publish-github
if: startsWith(github.ref, 'refs/tags/')
name: Publish Fabric on Curseforge
uses: cech12/MinecraftModActions/.github/workflows/publish-curseforge.yml@main
with:
java-version: 17
subproject: fabric
title-prefix: fabric-
curseforge-id: 363593
game-versions: |
1.20.4
release-type: release
loaders: |
fabric
quilt
secrets:
github-token: ${{ secrets.GITHUB_TOKEN }}
curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }}
publish-fabric-on-modrinth:
needs: publish-github
if: startsWith(github.ref, 'refs/tags/')
name: Publish Fabric on Modrinth
uses: cech12/MinecraftModActions/.github/workflows/publish-modrinth.yml@main
with:
java-version: 17
subproject: fabric
title-prefix: fabric-
modrinth-id: yzHyAUSI
game-versions: |
1.20.4
release-type: release
loaders: |
fabric
quilt
secrets:
github-token: ${{ secrets.GITHUB_TOKEN }}
modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ 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.20.4-3.1.0.0] - 2024-04-25
### Added
- add Fabric (>=0.96.11+1.20.4) support (Fabric, Quilt)

## [1.20.4-3.0.0.0] - 2024-04-06
### Changed
- updated to Minecraft 1.20.4 (Forge 49.0.38, Neoforge 20.4.218)
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
[![License](https://img.shields.io/github/license/cech12/BrickFurnace)](http://opensource.org/licenses/MIT)
[![](https://img.shields.io/discord/752506676719910963.svg?style=flat&color=informational&logo=discord&label=Discord)](https://discord.gg/gRUFH5t)

This **Minecraft Forge** mod adds **Brick Furnaces** to the game.
This Minecraft mod adds **Brick Furnaces** to the game. (Forge, NeoForge, Fabric, Quilt)

The Fabric / Quilt version needs the following mods:

- Fabric API ([Github](https://github.com/FabricMC/fabric), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/fabric-api), [Modrinth](https://modrinth.com/mod/fabric-api))
- Cloth Config API ([Github](https://github.com/shedaniel/cloth-config), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/cloth-config), [Modrinth](https://modrinth.com/mod/cloth-config))

![All Furnaces](material/all_furnaces.png)

Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ subprojects {
"forge_version": forge_version,
"forge_version_range": forge_version_range,
"forge_loader_version_range": forge_loader_version_range,
//"fabric_version": fabric_version,
//"fabric_loader_version": fabric_loader_version,
"fabric_version": fabric_version,
"fabric_loader_version": fabric_loader_version,
"cloth_config_version": cloth_config_version,
"mod_menu_version": mod_menu_version,
"neoforge_version": neoforge_version,
"neoforge_version_range": neoforge_version_range,
"neoforge_loader_version_range": neoforge_loader_version_range,
Expand Down
5 changes: 5 additions & 0 deletions common/src/main/java/de/cech12/brickfurnace/CommonLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import de.cech12.brickfurnace.platform.Services;
import net.minecraft.core.Holder;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.ai.village.poi.PoiType;
import net.minecraft.world.entity.ai.village.poi.PoiTypes;
import net.minecraft.world.level.block.Block;
Expand All @@ -27,6 +28,10 @@ public static void init() {
Services.CONFIG.init();
}

public static ResourceLocation id(String name) {
return new ResourceLocation(Constants.MOD_ID, name);
}

/**
* Initialize method that should be called by every loader mod when the mod blocks are registered.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ public static void tick(Level level, BlockPos pos, BlockState state, AbstractBri
entity.dataAccess.set(RECIPES_USED, entity.dataAccess.get(BURN_TIME)); //changed because of private variable
if (entity.isBurning()) {
dirty = true;
if (Services.PLATFORM.hasCraftingRemainingItem(fuel)) entity.items.set(1, Services.PLATFORM.getCraftingRemainingItem(fuel));
else if (!fuel.isEmpty()) {
if (Services.PLATFORM.hasCraftingRemainingItem(fuel)) {
entity.items.set(1, Services.PLATFORM.getCraftingRemainingItem(fuel));
} else if (!fuel.isEmpty()) {
fuel.shrink(1);
if (fuel.isEmpty()) {
entity.items.set(1, Services.PLATFORM.getCraftingRemainingItem(fuel));
Expand Down
24 changes: 23 additions & 1 deletion common/src/main/resources/assets/brickfurnace/lang/de_de.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,27 @@
"block.brickfurnace.brick_smoker": "Ziegel-Räucherofen",

"top.brickfurnace.fuel": "Fuel",
"top.brickfurnace.n_ticks": "%d ticks"
"top.brickfurnace.n_ticks": "%d ticks",

"text.autoconfig.brickfurnace.title": "Brick Furnaces Settings",

"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED": "Vanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[0]": "§6§lVanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[1]": "If enabled, the vanilla blasting, smelting, and",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[2]": "smoking recipes are used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[3]": "§7§oDefault: true",

"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR": "Cook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[0]": "§6§lCook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[1]": "Cook time factor of all added brick furnaces in relation",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[2]": "to corresponding vanilla furnaces. (percent)",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[3]": "§7§o50 - half the time, 100 same time, 200 twice the time",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[4]": "§7§oDefault: 100",

"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST": "Recipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[0]": "§6§lRecipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[1]": "A comma separated list of all vanilla recipes that",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[2]": "should not be used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[3]": "§7§oExample: baked_potato,baked_potato_from_smoking,othermod:other_baked_food",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[4]": "§7§oDefault: <empty>"
}
24 changes: 23 additions & 1 deletion common/src/main/resources/assets/brickfurnace/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,27 @@
"block.brickfurnace.brick_smoker": "Brick Smoker",

"top.brickfurnace.fuel": "Fuel",
"top.brickfurnace.n_ticks": "%d ticks"
"top.brickfurnace.n_ticks": "%d ticks",

"text.autoconfig.brickfurnace.title": "Brick Furnaces Settings",

"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED": "Vanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[0]": "§6§lVanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[1]": "If enabled, the vanilla blasting, smelting, and",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[2]": "smoking recipes are used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[3]": "§7§oDefault: true",

"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR": "Cook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[0]": "§6§lCook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[1]": "Cook time factor of all added brick furnaces in relation",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[2]": "to corresponding vanilla furnaces. (percent)",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[3]": "§7§o50 - half the time, 100 same time, 200 twice the time",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[4]": "§7§oDefault: 100",

"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST": "Recipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[0]": "§6§lRecipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[1]": "A comma separated list of all vanilla recipes that",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[2]": "should not be used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[3]": "§7§oExample: baked_potato,baked_potato_from_smoking,othermod:other_baked_food",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[4]": "§7§oDefault: <empty>"
}
24 changes: 23 additions & 1 deletion common/src/main/resources/assets/brickfurnace/lang/es_es.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,27 @@
"block.brickfurnace.brick_smoker": "Ahumador de ladrillos",

"top.brickfurnace.fuel": "Fuel",
"top.brickfurnace.n_ticks": "%d ticks"
"top.brickfurnace.n_ticks": "%d ticks",

"text.autoconfig.brickfurnace.title": "Brick Furnaces Settings",

"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED": "Vanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[0]": "§6§lVanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[1]": "If enabled, the vanilla blasting, smelting, and",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[2]": "smoking recipes are used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[3]": "§7§oDefault: true",

"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR": "Cook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[0]": "§6§lCook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[1]": "Cook time factor of all added brick furnaces in relation",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[2]": "to corresponding vanilla furnaces. (percent)",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[3]": "§7§o50 - half the time, 100 same time, 200 twice the time",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[4]": "§7§oDefault: 100",

"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST": "Recipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[0]": "§6§lRecipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[1]": "A comma separated list of all vanilla recipes that",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[2]": "should not be used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[3]": "§7§oExample: baked_potato,baked_potato_from_smoking,othermod:other_baked_food",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[4]": "§7§oDefault: <empty>"
}
24 changes: 23 additions & 1 deletion common/src/main/resources/assets/brickfurnace/lang/ko_kr.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,27 @@
"block.brickfurnace.brick_smoker": "벽돌 훈연기",

"top.brickfurnace.fuel": "Fuel",
"top.brickfurnace.n_ticks": "%d ticks"
"top.brickfurnace.n_ticks": "%d ticks",

"text.autoconfig.brickfurnace.title": "Brick Furnaces Settings",

"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED": "Vanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[0]": "§6§lVanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[1]": "If enabled, the vanilla blasting, smelting, and",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[2]": "smoking recipes are used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[3]": "§7§oDefault: true",

"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR": "Cook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[0]": "§6§lCook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[1]": "Cook time factor of all added brick furnaces in relation",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[2]": "to corresponding vanilla furnaces. (percent)",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[3]": "§7§o50 - half the time, 100 same time, 200 twice the time",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[4]": "§7§oDefault: 100",

"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST": "Recipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[0]": "§6§lRecipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[1]": "A comma separated list of all vanilla recipes that",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[2]": "should not be used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[3]": "§7§oExample: baked_potato,baked_potato_from_smoking,othermod:other_baked_food",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[4]": "§7§oDefault: <empty>"
}
24 changes: 23 additions & 1 deletion common/src/main/resources/assets/brickfurnace/lang/pt_br.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,27 @@
"block.brickfurnace.brick_smoker": "Defumador de Tijolos",

"top.brickfurnace.fuel": "Combustível",
"top.brickfurnace.n_ticks": "%d ticks"
"top.brickfurnace.n_ticks": "%d ticks",

"text.autoconfig.brickfurnace.title": "Brick Furnaces Settings",

"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED": "Vanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[0]": "§6§lVanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[1]": "If enabled, the vanilla blasting, smelting, and",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[2]": "smoking recipes are used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[3]": "§7§oDefault: true",

"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR": "Cook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[0]": "§6§lCook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[1]": "Cook time factor of all added brick furnaces in relation",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[2]": "to corresponding vanilla furnaces. (percent)",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[3]": "§7§o50 - half the time, 100 same time, 200 twice the time",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[4]": "§7§oDefault: 100",

"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST": "Recipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[0]": "§6§lRecipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[1]": "A comma separated list of all vanilla recipes that",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[2]": "should not be used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[3]": "§7§oExample: baked_potato,baked_potato_from_smoking,othermod:other_baked_food",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[4]": "§7§oDefault: <empty>"
}
24 changes: 23 additions & 1 deletion common/src/main/resources/assets/brickfurnace/lang/pt_pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,27 @@
"block.brickfurnace.brick_smoker": "Defumador de Tijolos",

"top.brickfurnace.fuel": "Combustível",
"top.brickfurnace.n_ticks": "%d ticks"
"top.brickfurnace.n_ticks": "%d ticks",

"text.autoconfig.brickfurnace.title": "Brick Furnaces Settings",

"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED": "Vanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[0]": "§6§lVanilla Recipes enabled",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[1]": "If enabled, the vanilla blasting, smelting, and",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[2]": "smoking recipes are used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.VANILLA_RECIPES_ENABLED.@Tooltip[3]": "§7§oDefault: true",

"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR": "Cook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[0]": "§6§lCook time factor",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[1]": "Cook time factor of all added brick furnaces in relation",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[2]": "to corresponding vanilla furnaces. (percent)",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[3]": "§7§o50 - half the time, 100 same time, 200 twice the time",
"text.autoconfig.brickfurnace.option.COOK_TIME_FACTOR.@Tooltip[4]": "§7§oDefault: 100",

"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST": "Recipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[0]": "§6§lRecipe blocked list",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[1]": "A comma separated list of all vanilla recipes that",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[2]": "should not be used by the brick furnaces.",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[3]": "§7§oExample: baked_potato,baked_potato_from_smoking,othermod:other_baked_food",
"text.autoconfig.brickfurnace.option.RECIPE_BLOCKED_LIST.@Tooltip[4]": "§7§oDefault: <empty>"
}
Loading

0 comments on commit c44661b

Please sign in to comment.