Merge branch 'dev'

Author: OptiJava

.github/release-drafter.yml

@@ -0,0 +1,8 @@
+dir=$(ls -l ./versions | awk '/^d/ {print $NF}')
+out_dir="./out"
+
+for i in $dir
+do
+    tmp_dir="./versions/$i/build/libs/*.jar"
+    cp $tmp_dir $out_dir
+done

.github/scripts/build_output.sh

@@ -0,0 +1,16 @@
+dir=$(ls -l ./versions | awk '/^d/ {print $NF}')
+
+# create dirs
+mkdir processed_artifacts
+for i in $dir
+do
+    tmp_dir="./processed_artifacts/$i"
+    mkdir "$tmp_dir"
+done
+
+# sort files
+for i in $dir
+do
+    dst_dir="processed_artifacts/$i"
+    find "artifacts" -type f -name "*$i*.jar" -exec mv {} "$dst_dir" \;
+done

.github/scripts/sort_artifacts.sh

@@ -37,10 +37,7 @@ jobs:
       - name: collect artifacts to out folder
         run: |
           mkdir out
-          mv ./versions/1.17.1/build/libs/* ./out
-          mv ./versions/1.18.2/build/libs/* ./out
-          mv ./versions/1.19.3/build/libs/* ./out
-          mv ./versions/1.20.1/build/libs/* ./out
+          bash ./.github/scripts/build_output.sh
       - name: capture build artifacts
         if: ${{ runner.os == 'Linux' && matrix.java == '17' }}
         uses: actions/upload-artifact@v3.1.2

.github/workflows/build.yml

@@ -37,15 +37,7 @@ jobs:
 
       - name: sort artifacts by game version
         run: |
-          mkdir processed_artifacts
-          mkdir processed_artifacts/17
-          mkdir processed_artifacts/18
-          mkdir processed_artifacts/19
-          mkdir processed_artifacts/20
-          cp artifacts/*1.17*.jar processed_artifacts/17
-          cp artifacts/*1.18*.jar processed_artifacts/18
-          cp artifacts/*1.19*.jar processed_artifacts/19
-          cp artifacts/*1.20*.jar processed_artifacts/20
+          bash ./.github/scripts/sort_artifacts.sh
 
       - name: show details for debug
         if: ${{ inputs.debug == true }}
@@ -65,11 +57,6 @@ jobs:
           echo @@@@@###########################################@@@@@
         continue-on-error: true
 
-      - name: Publish GitHub Release
-        uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        continue-on-error: true
       - name: Publish Minecraft Mods 1.17
         uses: Kir-Antipov/mc-publish@v3.3
         with:
@@ -79,14 +66,14 @@ jobs:
           curseforge-id: 891699
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
-          files: processed_artifacts/17/*.jar
+          files: processed_artifacts/1.17.1/*.jar
 
           name: v${{ inputs.version }} For Minecraft 1.17
           version: v${{ inputs.version }}
           version-type: ${{ inputs.release_type }}
 
           loaders: fabric
-          game-versions: '1.17'
+          game-versions: '1.17.1'
           game-version-filter: any
           dependencies: |-
             carpet(required)
@@ -107,14 +94,14 @@ jobs:
           curseforge-id: 891699
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
-          files: processed_artifacts/18/*.jar
+          files: processed_artifacts/1.18.2/*.jar
 
           name: v${{ inputs.version }} For Minecraft 1.18
           version: v${{ inputs.version }}
           version-type: ${{ inputs.release_type }}
 
           loaders: fabric
-          game-versions: '1.18'
+          game-versions: '1.18.2'
           game-version-filter: any
           dependencies: |-
             carpet(required)
@@ -134,7 +121,7 @@ jobs:
           curseforge-id: 891699
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
-          files: processed_artifacts/19/*.jar
+          files: processed_artifacts/1.19.3/*.jar
 
           name: v${{ inputs.version }} For Minecraft 1.19.3
           version: v${{ inputs.version }}
@@ -161,7 +148,7 @@ jobs:
           curseforge-id: 891699
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
-          files: processed_artifacts/20/*.jar
+          files: processed_artifacts/1.20.1/*.jar
 
           name: v${{ inputs.version }} For Minecraft 1.20.1
           version: v${{ inputs.version }}

.github/workflows/publish.yml

@@ -62,12 +62,14 @@ processResources {
     inputs.property "version", simple_version
     inputs.property "minecraft_requirement_version", project.minecraft_requirement_version
     inputs.property "carpet_requirement_version", project.carpet_requirement_version
+    inputs.property "loader_requirement_version", project.loader_requirement_version
 
     filesMatching("fabric.mod.json") {
         def valueMap = [
 				"version": simple_version,
 				"carpet_requirement_version": project.carpet_requirement_version,
 				"minecraft_requirement_version": project.minecraft_requirement_version,
+                "loader_requirement_version": project.loader_requirement_version,
 		]
 		expand valueMap
     }
@@ -80,7 +82,7 @@ tasks.withType(JavaCompile).configureEach {
 
 
 loom {
-    accessWidenerPath.set(file("src/main/resources/opt-carpet-addition.accesswidener"))
+    accessWidenerPath.set(file("opt-carpet-addition.accesswidener"))
 
     runConfigs.all {
 		// to make sure it generates all "Minecraft Client (:subproject_name)" applications
@@ -99,7 +101,8 @@ java {
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
     // If you remove this line, sources will not be generated.
-    withSourcesJar()
+
+    //withSourcesJar()
 }
 
 

common.gradle

@@ -1,8 +1,12 @@
+# Gradle Configurations
 org.gradle.jvmargs=-Xmx3g
 org.gradle.parallel=true
 
-loader_version=0.14.22
+# Fabric Configurations
+loader_version=0.15.6
+loader_requirement_version=>=0.15
 
+# Mod Metadata
 mod_version=1.6.0
 maven_group=io.github.optijava
 archives_base_name=opt-carpet-addition

gradle.properties

@@ -114,7 +114,7 @@ public void onGameStarted() {
 
     @Override
     //#if MC >= 11900
-    //$$public void registerCommands(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess commandBuildContext) {
+    //$$ public void registerCommands(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess commandBuildContext) {
     //#else
     public void registerCommands(CommandDispatcher<ServerCommandSource> dispatcher) {
     //#endif

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java

@@ -128,7 +128,6 @@ public class OptCarpetSettings {
     public static boolean disabledEntityTick = false;
 
     //#if MC < 11900
-    //$$
     @Rule(
             desc = "Disable error stack when update suppression.",
             category = {RuleCategory.BUGFIX}
@@ -196,4 +195,18 @@ public class OptCarpetSettings {
             validate = CustomItemDiscardTimeValidator.class
     )
     public static int customItemDiscardTime = -1;
+
+    //#if MC >= 12000
+    //$$ @Rule(
+    //$$         desc = "Disallow redstone wire connects to open trapdoor(in version >= 1.20)",
+    //$$         category = RuleCategory.FEATURE
+    //$$ )
+    //$$ public static boolean disallowRedstoneWireConnectsToOpenTrapdoor = false;
+    //#endif
+
+    @Rule(
+            desc = "Don't enable this rule unless you need blockUpdate logger! Enabling this rule may cause performance issues, so this rule was false by default. Before you set this rule to true, everyone can not use blockUpdate logger.",
+            category = {RuleCategory.FEATURE, RuleCategory.OPTIMIZATION}
+    )
+    public static boolean allowBlockUpdateLogger = false;
 }

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java

@@ -1,6 +1,7 @@
 package io.github.optijava.opt_carpet_addition.logger;
 
 import carpet.logging.LoggerRegistry;
+import io.github.optijava.opt_carpet_addition.logger.blockUpdate.BlockUpdateLogger;
 import io.github.optijava.opt_carpet_addition.logger.cceSuppressionCrashLogger.CCESuppressionCrashLogger;
 import io.github.optijava.opt_carpet_addition.logger.disk.DiskHUDLogger;
 //#if MC < 11900
@@ -19,11 +20,14 @@ private LoggerRegister() {
 
     public static boolean __cceSuppressionCrash = false;
 
+    public static boolean __blockUpdate = false;
+
     public static void registry() {
         LoggerRegistry.registerLogger("disk", DiskHUDLogger.INSTANCE);
         //#if MC < 11900
         LoggerRegistry.registerLogger("updateSuppression", UpdateSuppressionLogger.INSTANCE);
         //#endif
         LoggerRegistry.registerLogger("cceSuppressionCrash", CCESuppressionCrashLogger.INSTANCE);
+        LoggerRegistry.registerLogger("blockUpdate", BlockUpdateLogger.INSTANCE);
     }
 }