Merge branch '1.20.6'

* 1.20.6: (23 commits)
  Fixed advancements
  Fixed advancements
  Fixed recipes
  format
  Updated branch
  added back mixins
  wip
  wip
  Fixes
  Working oxidizables
  bumped version
  test
  Added back missing inits
  Added back code
  Fixed imports
  fixed imports
  Fixed import
  build improvements
  Refactored oxidization/waxables, fixed forge config settings
  port changes
  ...

Author: Faboslav

.github/scripts/generate-run-matrix.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+matrix_content="{\"include\":["
+enabled_platforms=$(awk -F= '/enabled_platforms/{print $2}' gradle.properties | tr -d ' ')
+
+for platform in $(echo $enabled_platforms | tr ',' ' '); do
+  versions=$(awk -F= '/minecraft_version/{print $2}' gradle.properties | tr -d ' ')
+  for version in $(echo $versions | tr ',' ' '); do
+    matrix_entry="{\"mod_loader\":\"$platform\",\"version\":\"$version\",\"script\":\"client\"},"
+    matrix_content+="$matrix_entry"
+    matrix_entry="{\"mod_loader\":\"$platform\",\"version\":\"$version\",\"script\":\"server\"},"
+    matrix_content+="$matrix_entry"
+  done
+done
+
+matrix_content="${matrix_content%,}]}"
+echo "Generated matrix: $matrix_content"
+echo "::set-output name=matrix::$matrix_content"

.github/workflows/build.yml

@@ -11,54 +11,99 @@ on:
 
 jobs:
     build:
+        name: "Build project"
         runs-on: ubuntu-latest
-        strategy:
-            fail-fast: false
-            matrix:
-                mod_loader: [ fabric, forge, neoforge ]
-                script: [ client, server ]
-
-        name: Run ${{ matrix.mod_loader }} ${{ matrix.script }}
         timeout-minutes: 15
+        outputs:
+            matrix: ${{ steps.set-matrix.outputs.matrix }}
 
         steps:
             -   name: "Checkout repository"
-                uses: actions/checkout@v4.1.1
+                uses: actions/checkout@v4
                 with:
                     fetch-depth: 0
 
-            -   name: "Check if the mod loader is supported"
-                id: check-mod-loader
+            -   name: "Parse gradle properties"
+                id: gradle-properties
                 run: |
-                    if [ -d ${{ matrix.mod_loader }} ]; then
-                        echo "Mod loader is supported"
-                        echo "is_mod_loader_supported=true" >> $GITHUB_OUTPUT
-                    else
-                        echo "Mod loader is not supported"
-                        echo "is_mod_loader_supported=false" >> $GITHUB_OUTPUT
-                    fi
+                    while IFS='=' read -r key value; do
+                      key=$(echo $key | awk '{$1=$1;print}')
+                        value=$(echo $value | awk '{$1=$1;print}')
+                    
+                        case "$key" in
+                          minecraft_version) echo "MINECRAFT_VERSION=$value" >> $GITHUB_OUTPUT ;;
+                          mod_name) echo "MOD_NAME=$value" >> $GITHUB_OUTPUT ;;
+                          mod_version) echo "MOD_VERSION=$value" >> $GITHUB_OUTPUT ;;
+                          enabled_platforms) echo "ENABLED_PLATFORMS=$value" >> $GITHUB_OUTPUT ;;
+                        esac
+                    done < gradle.properties
+
+            - name: "Set up JDK 17"
+              if: steps.gradle-properties.outputs.MINECRAFT_VERSION != '1.20.6' && steps.gradle-properties.outputs.MINECRAFT_VERSION != '1.21'
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 17
+                  distribution: temurin
+
+            - name: "Set up JDK 21"
+              if: steps.gradle-properties.outputs.MINECRAFT_VERSION == '1.20.6' || steps.gradle-properties.outputs.MINECRAFT_VERSION == '1.21'
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 21
+                  distribution: temurin
 
-            -   name: "Set up JDK"
-                if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
-                uses: actions/[email protected]
+            -   name: "Run gradle build"
+                uses: gradle/gradle-build-action@v3
                 with:
-                    java-version: 17
-                    distribution: temurin
+                    cache-write-only: true
+                    generate-job-summary: false
+                    gradle-version: wrapper
+                    arguments: build
+
+            -   name: "Generate matrix for the run job"
+                id: set-matrix
+                run: ./.github/scripts/generate-run-matrix.sh
+
+    run:
+        name: Run ${{ matrix.mod_loader }} ${{ matrix.script }}
+        runs-on: ubuntu-latest
+        needs: build
+        strategy:
+            fail-fast: false
+            matrix: ${{fromJson(needs.build.outputs.matrix)}}
+        timeout-minutes: 15
+
+        steps:
+            -   name: "Checkout repository"
+                uses: actions/checkout@v4
+                with:
+                    fetch-depth: 0
+
+            - name: "Set up JDK 17"
+              if: matrix.version != '1.20.6' && matrix.version != '1.21'
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 17
+                  distribution: temurin
+
+            - name: "Set up JDK 21"
+              if: matrix.version == '1.20.6' || matrix.version == '1.21'
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 21
+                  distribution: temurin
 
             -   name: "Setup Gradle and run build"
-                if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
                 uses: gradle/[email protected]
                 with:
-                    cache-read-only: false
+                    cache-read-only: true
                     gradle-version: wrapper
                     arguments: ${{ matrix.mod_loader }}:build
 
             -   name: "Accept eula"
-                if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
                 run: mkdir -p ${{ matrix.mod_loader }}/run && echo "eula=true" > ${{ matrix.mod_loader }}/run/eula.txt
 
             -   name: Run ${{ matrix.mod_loader }} ${{ matrix.script }}
-                if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
                 uses: modmuss50/xvfb-action@v1
                 with:
                     run: ./.github/scripts/run-${{ matrix.script }}.sh ${{ matrix.mod_loader }}

.github/workflows/publish.yml

@@ -57,6 +57,8 @@ jobs:
                     -   branch: "1.20.4"
                         secondary_game_version: "1.20.3"
 
+                    -   branch: "1.20.5"
+                        secondary_game_version: "1.20.6"
         steps:
             -   name: "Checkout repository"
                 uses: actions/[email protected]
@@ -136,6 +138,7 @@ jobs:
                 with:
                     github-token: ${{ secrets.GITHUB_TOKEN }}
                     github-tag: mc${{ steps.gradle-properties.outputs.MINECRAFT_VERSION }}-${{ steps.gradle-properties.outputs.MOD_VERSION }}
+                    github-commitish: ${{ steps.gradle-properties.outputs.MINECRAFT_VERSION }}
 
                     curseforge-id: ${{ matrix.curseforge_id }}
                     curseforge-token: ${{ secrets.CURSEFORGE_RELEASE_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.11
+
+- 1.20.6/1.20.1 port
+- Fixed not working mob config settings on forge
+- Refactored internal oxidizatiton/waxable system
+
 ## 2.0.10
 
 - Fixed crash related to rascal spawns in mineshafts

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
 }
 
 architectury {
@@ -16,7 +16,10 @@ subprojects {
 
 	dependencies {
 		minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-		mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}"
+		mappings loom.layered {
+			it.mappings("net.fabricmc:yarn:${rootProject.yarn_mappings}")
+			it.mappings("dev.architectury:yarn-mappings-patch-neoforge:1.20.5+build.3")
+		}
 	}
 }
 
@@ -28,19 +31,41 @@ allprojects {
 	version = rootProject.mod_version
 	archivesBaseName = "${rootProject.mod_id}-mc${rootProject.minecraft_version}"
 
+	processResources {
+		def expandProps = [
+			'modId'              : mod_id,
+			'modName'            : mod_name,
+			'modDescription'     : mod_description,
+			'modVersion'         : mod_version,
+			'modAuthor'          : mod_author,
+			"minecraftVersion"   : minecraft_version,
+			"fabricLoaderVersion": fabric_loader_version,
+			"fabricApiVersion"   : fabric_api_version,
+			"neoForgeVersion"	 : neoforge_version
+		]
+
+		filesMatching(['fabric.mod.json', 'META-INF/neoforge.mods.toml']) {
+			expand expandProps
+		}
+
+		inputs.properties(expandProps)
+	}
+
 	repositories {
 		maven {
 			name = "Jitpack"
 			url 'https://jitpack.io/'
 		}
 	}
 
-	tasks.withType(JavaCompile) {
-		options.encoding = "UTF-8"
-		options.release = 17
+	tasks.withType(JavaCompile).configureEach {
+		it.options.release = 21
 	}
 
 	java {
 		withSourcesJar()
+
+		sourceCompatibility = JavaVersion.VERSION_21
+		targetCompatibility = JavaVersion.VERSION_21
 	}
 }

common/src/main/java/com/faboslav/friendsandfoes/FriendsAndFoes.java

@@ -3,13 +3,14 @@
 import com.faboslav.friendsandfoes.api.MoobloomVariantManager;
 import com.faboslav.friendsandfoes.config.FriendsAndFoesConfig;
 import com.faboslav.friendsandfoes.config.omegaconfig.OmegaConfig;
+import com.faboslav.friendsandfoes.events.lifecycle.AddSpawnBiomeModificationsEvent;
 import com.faboslav.friendsandfoes.events.lifecycle.DatapackSyncEvent;
 import com.faboslav.friendsandfoes.events.lifecycle.RegisterReloadListenerEvent;
 import com.faboslav.friendsandfoes.events.lifecycle.SetupEvent;
 import com.faboslav.friendsandfoes.init.*;
 import com.faboslav.friendsandfoes.modcompat.ModChecker;
-import com.faboslav.friendsandfoes.network.MessageHandler;
-import com.faboslav.friendsandfoes.network.packet.MoobloomVariantsSyncPacket;
+import com.faboslav.friendsandfoes.packets.MessageHandler;
+import com.faboslav.friendsandfoes.packets.MoobloomVariantsSyncPacket;
 import com.faboslav.friendsandfoes.platform.BiomeModifications;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
@@ -44,6 +45,7 @@ public static void init() {
 		ModChecker.setupModCompat();
 
 		FriendsAndFoesActivities.init();
+		FriendsAndFoesArmorMaterials.init();
 		FriendsAndFoesBlockSetTypes.init();
 		FriendsAndFoesBlocks.init();
 		FriendsAndFoesCriteria.init();
@@ -59,6 +61,7 @@ public static void init() {
 		FriendsAndFoesVillagerProfessions.init();
 
 		RegisterReloadListenerEvent.EVENT.addListener(FriendsAndFoes::registerServerDataListeners);
+		AddSpawnBiomeModificationsEvent.EVENT.addListener(FriendsAndFoesEntityTypes::addSpawnBiomeModifications);
 		SetupEvent.EVENT.addListener(FriendsAndFoes::setup);
 		DatapackSyncEvent.EVENT.addListener(MoobloomVariantsSyncPacket::sendToClient);
 	}

common/src/main/java/com/faboslav/friendsandfoes/advancements/criterion/CompleteHideAndSeekGameCriterion.java

@@ -3,6 +3,7 @@
 import com.faboslav.friendsandfoes.entity.RascalEntity;
 import com.faboslav.friendsandfoes.init.FriendsAndFoesCriteria;
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.advancement.AdvancementCriterion;
 import net.minecraft.advancement.criterion.AbstractCriterion;
@@ -37,7 +38,7 @@ public record Conditions(Optional<LootContextPredicate> player, Optional<LootCon
 							 Optional<ItemPredicate> item) implements AbstractCriterion.Conditions
 	{
 		public static final Codec<CompleteHideAndSeekGameCriterion.Conditions> CODEC = RecordCodecBuilder.create((instance) -> {
-			return instance.group(Codecs.createStrictOptionalFieldCodec(EntityPredicate.LOOT_CONTEXT_PREDICATE_CODEC, "player").forGetter(CompleteHideAndSeekGameCriterion.Conditions::player), Codecs.createStrictOptionalFieldCodec(EntityPredicate.LOOT_CONTEXT_PREDICATE_CODEC, "rascal").forGetter(CompleteHideAndSeekGameCriterion.Conditions::rascal), Codecs.createStrictOptionalFieldCodec(ItemPredicate.CODEC, "item").forGetter(CompleteHideAndSeekGameCriterion.Conditions::item)).apply(instance, CompleteHideAndSeekGameCriterion.Conditions::new);
+			return instance.group(EntityPredicate.LOOT_CONTEXT_PREDICATE_CODEC.optionalFieldOf("player").forGetter(CompleteHideAndSeekGameCriterion.Conditions::player), EntityPredicate.LOOT_CONTEXT_PREDICATE_CODEC.optionalFieldOf("rascal").forGetter(CompleteHideAndSeekGameCriterion.Conditions::rascal), ItemPredicate.CODEC.optionalFieldOf( "item").forGetter(CompleteHideAndSeekGameCriterion.Conditions::item)).apply(instance, CompleteHideAndSeekGameCriterion.Conditions::new);
 		});
 
 		public static AdvancementCriterion<Conditions> any() {

common/src/main/java/com/faboslav/friendsandfoes/block/CopperButtonBlock.java

@@ -27,14 +27,14 @@ public SoundEvent getClickSound(boolean powered) {
 	}
 
 	@Override
-	public ActionResult onUse(
+	protected ActionResult onUse(
 		BlockState state,
 		World world,
 		BlockPos pos,
 		PlayerEntity player,
-		Hand hand,
 		BlockHitResult hit
 	) {
+		Hand hand = Hand.MAIN_HAND;
 		ItemStack itemStack = player.getStackInHand(hand);
 		Item itemInHand = itemStack.getItem();
 
@@ -47,6 +47,6 @@ public ActionResult onUse(
 			}
 		}
 
-		return super.onUse(state, world, pos, player, hand, hit);
+		return super.onUse(state, world, pos, player, hit);
 	}
 }