Port to 1.21.7

.gitignore

@@ -31,3 +31,7 @@ bin/
 # fabric
 
 run/
+
+# others
+.envrc
+.direnv

build.gradle

@@ -36,15 +36,54 @@ dependencies {
 	implementation libs.kaleidoConfig
 	include libs.kaleidoConfig
 
-	modCompileOnly libs.emi
-	modLocalRuntime libs.emi
+	/*modCompileOnly libs.emi
+	modLocalRuntime libs.emi*/
 
 	modCompileOnly libs.modmenu
 	modLocalRuntime libs.modmenu
+}
+
+loom {
+	accessWidenerPath.set(file("src/main/resources/glowcase.accesswidener"))
+
+	runs {
+		client_mixin {
+			client()
+			ideConfigGenerated true
+			name = "Minecraft Client - (Mixin Swap)"
+			source sourceSets.main
+			vmArg "-Dmixin.debug.export=true"
+
+			try {
+				afterEvaluate {
+					def mixinDep = this.configurations.compileClasspath
+						.allDependencies
+						.findAll { it.name == "sponge-mixin" }
+						.first()
+
+					if (mixin != null) {
+						def mixinPath = this.configurations.compileClasspath.files(mixinDep).first().path;
+
+						println(mixinPath)
+
+						vmArg("-javaagent:\"${mixinPath}\"")
+
+						println("[Info]: Mixin Hotswap Run should be working")
+					} else {
+						println("[Warning]: Unable to locate file path for Mixin Jar, HotSwap Run will not work!")
+					}
+				}
+			} catch (Exception e) {
+				println("[Error]: MixinHotswap Run had a issue!")
+				e.printStackTrace()
+			}
+		}
+	}
+}
 
-	modCompileOnly("foundry.veil:veil-fabric-1.21.1:1.0.0.228") {
-		exclude group: "maven.modrinth"
-		exclude group: "me.fallenbreath"
+fabricApi {
+	configureDataGeneration {
+		client = true
 	}
 }
 

gradle.properties

@@ -14,10 +14,10 @@ modId=glowcase
 modName=Glowcase
 modDescription=Blocks for showcasing mods!
 authors=HavenKing, ModFest
-contributors=Sisby folk, Sammy.K, Chai, dooiji, Superkat32, Hyperpigeon, ShiroJR, maximumpower55, CallMeEcho, quaternary, afamiliarquiet, Emi, comp500, LemmaEOF, acikek, hammy275, TheEpicBlock, Tomate0613, SkyNotTheLimit, Patbox, AmyMialee, Ampflower
+contributors=Sisby folk, Sammy.K, Chai, dooiji, Superkat32, Hyperpigeon, ShiroJR, maximumpower55, CallMeEcho, quaternary, afamiliarquiet, Emi, comp500, LemmaEOF, acikek, hammy275, TheEpicBlock, Tomate0613, SkyNotTheLimit, Patbox, AmyMialee, Ampflower, Awakened Redstone
 license=CC0-1.0
 # Mod Version
-baseVersion=2.2.0
+baseVersion=2.3.0
 # Branch Metadata
 branch=1.21
 tagBranch=1.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

libs.versions.toml

@@ -1,18 +1,18 @@
 [versions]
-loom = "1.7.+"
+loom = "1.11.+"
 minotaur = "2.+"
 
-kaleidoConfig = "0.3.1+1.3.2"
+kaleidoConfig = "0.3.3+1.3.2"
 
-mc = "1.21.1"
-fl = "0.16.10"
-yarn = "1.21.1+build.3"
-fapi = "0.115.4+1.21.1"
+mc = "1.21.7"
+fl = "0.16.14"
+yarn = "1.21.7+build.2"
+fapi = "0.128.2+1.21.7"
 
 placeholder = "2.4.0+1.21"
-polydex = "1.2.2+1.21"
-emi = "1.1.19+1.21.1"
-modmenu = "11.0.3"
+polydex = "1.6.0+1.21.6"
+# emi = "1.1.19+1.21.1"
+modmenu = "15.0.0-beta.3"
 
 [plugins]
 loom = { id = "fabric-loom", version.ref = "loom" }
@@ -28,5 +28,5 @@ placeholder = { group = "eu.pb4", name = "placeholder-api", version.ref = "place
 polydex = { group = "eu.pb4", name = "polydex", version.ref = "polydex" }
 kaleidoConfig = { group = "folk.sisby", name = "kaleido-config", version.ref = "kaleidoConfig" }
 
-emi = { group = "dev.emi", name = "emi-fabric", version.ref = "emi" }
+# emi = { group = "dev.emi", name = "emi-fabric", version.ref = "emi" }
 modmenu = { group = "com.terraformersmc", name = "modmenu", version.ref = "modmenu" }

shell.nix

@@ -0,0 +1,19 @@
+let
+  nixpkgsVer = "b43c397f6c213918d6cfe6e3550abfe79b5d1c51";
+  pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgsVer}.tar.gz") { config = {}; overlays = []; };
+  libs = with pkgs; [
+    libpulseaudio
+    libGL
+    glfw
+    openal
+    stdenv.cc.cc.lib
+  ];
+in pkgs.mkShell {
+  name = "glowcase";
+
+  buildInputs = with pkgs; [
+    jdk21
+  ] ++ libs;
+
+  LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
+}

src/main/generated/.cache/48ceaf6122fff3d0bb361090dab2a848b18bf253

@@ -0,0 +1,63 @@
+// 1.21.7	-999999999-01-01T00:00:00	Glowcase/Model Definitions
+76ba62a8d2d3caef77edcf480af230448d9c9859 assets/glowcase/blockstates/config_link_block.json
+c48bfc1ca019b7d69fbcec16a9ad47c891650e14 assets/glowcase/blockstates/entity_display_block.json
+06436f199ed99a3101970c74b4ebff1e00295fc0 assets/glowcase/blockstates/hyperlink_block.json
+30f3ed5fba7c4e23901c5e69d3a42fa1f2b4b6a5 assets/glowcase/blockstates/item_acceptor_block.json
+ad7376f72875887d7c0417925de8f8c5b10dd67e assets/glowcase/blockstates/item_display_block.json
+c9840685535fd61fc07306b3c5a57a30dba9bdd1 assets/glowcase/blockstates/item_provider_block.json
+f0e524812a58e18dfdc74d12e14e423c1972deb2 assets/glowcase/blockstates/outline_block.json
+a3de34664293589a2c15680928768a26bda1f771 assets/glowcase/blockstates/particle_display.json
+22ebee7608059b9ac57efc7372fe808293118346 assets/glowcase/blockstates/popup_block.json
+d01d21a5099962640751d1ece44f3f879e9fbd77 assets/glowcase/blockstates/recipe_block.json
+5ab1defe217da19477a8e6997866280985fc3113 assets/glowcase/blockstates/screen_block.json
+3c71ba28fc0b7fa1ceace538624d75559fb3c554 assets/glowcase/blockstates/sound_block.json
+0cfaecca3376c654c3ef3e2e9428ddd1a19710d4 assets/glowcase/blockstates/sprite_block.json
+77c1f611de210c71d016923b4b5b24b0488253fd assets/glowcase/blockstates/text_block.json
+f574067204425aa46ed3fd071c58b2a7d79f8841 assets/glowcase/items/collection_case.json
+b75620052282e85e65fa3880c68678cc431fc0e0 assets/glowcase/items/config_link_block.json
+421e2d84a91f8c94074ef6578f277de1cfe2731a assets/glowcase/items/entity_display_block.json
+97c331c0af17c435c3d4691ca2b7437e244665f2 assets/glowcase/items/hyperlink_block.json
+77e2b068d2549e2313cdc242de78039ee1bfbe88 assets/glowcase/items/item_acceptor_block.json
+45401bf39e79f96e7a80669cf8bc918e7040ff47 assets/glowcase/items/item_display_block.json
+36f58494dba5f1f4c06e8c0b50404000f732c694 assets/glowcase/items/item_provider_block.json
+af5496f4c54dfd6f73b9bd7d7e1ed412c9305621 assets/glowcase/items/lock.json
+993fc5212381122e9a4c94802b702e8a3d2c489a assets/glowcase/items/note.json
+305c8feab2dd159cfb758bbb8b92c462efc56c95 assets/glowcase/items/outline_block.json
+d91a0c26a26050f433171f041482e1fac93a6d8b assets/glowcase/items/particle_display.json
+a4eace74ef001587907ec7710bab911e2fdd278e assets/glowcase/items/popup_block.json
+892f9c46e3ca0fd886bc8347d50a791be65e7c98 assets/glowcase/items/recipe_block.json
+6bb86f13fb90583f76878dbd2181256a9f8b3bbb assets/glowcase/items/screen_block.json
+1449a401c9788251827959567e3041216c1b904f assets/glowcase/items/sound_block.json
+991337288059214cbe1b092b1b646fb2c54f7651 assets/glowcase/items/sprite_block.json
+132a17ee3afc3f5e863cb2dfe0b7d101fabf8441 assets/glowcase/items/tablet.json
+a7ded49a0cd3dd443d492c48e65eed1a8fab4004 assets/glowcase/items/text_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/config_link_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/entity_display_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/hyperlink_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/item_display_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/item_provider_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/outline_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/particle_display.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/popup_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/recipe_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/screen_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/sound_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/sprite_block.json
+7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/text_block.json
+545c81474e2bd0a7c122c5af68f251295c84adca assets/glowcase/models/item/collection_case.json
+4683bf38d04be2253aecfffb8409e83b89d29acb assets/glowcase/models/item/config_link_block.json
+b8c568923c99597df2f0919d0e4537e0f32de31d assets/glowcase/models/item/entity_display_block.json
+45df37e0bbb7ca27a1a561b1935403690f52840d assets/glowcase/models/item/hyperlink_block.json
+9bb8ea6dca0b8018fd67754ba088a52d8ee58c75 assets/glowcase/models/item/item_display_block.json
+5831177698aeeccf16e55e0cc189c1f98436a881 assets/glowcase/models/item/item_provider_block.json
+9ed56aa644836c7f96fc3f8d4dd0ca1f77737d45 assets/glowcase/models/item/lock.json
+bcbcee91be44678eac77ca724ed7767b9b537df5 assets/glowcase/models/item/note.json
+d131cb646e0a2c6ff38d83bebbf37b51d75618bd assets/glowcase/models/item/outline_block.json
+bec71161001fad4f70f4bed7a49d284f7145f30e assets/glowcase/models/item/particle_display.json
+dfa2fa26b679ab662a5550066eaf596804e2adbf assets/glowcase/models/item/popup_block.json
+f9d20fc7bde07036aaceb54848b73609c2c04a68 assets/glowcase/models/item/recipe_block.json
+14f0098f5a6104ccbd982a0cbd2c5c9df4655b45 assets/glowcase/models/item/screen_block.json
+460b9962c1b9eae386618587ce8e7fddc4b07dd9 assets/glowcase/models/item/sound_block.json
+dae11663be5030d2491a44a79610d1c1caa08403 assets/glowcase/models/item/sprite_block.json
+2dbdeba90986220f9bac334e6aea26fe6c7b1136 assets/glowcase/models/item/tablet.json
+e8e5c6ab743edcec7bfc5f806f6cade57e3215c4 assets/glowcase/models/item/text_block.json

src/main/generated/assets/glowcase/blockstates/config_link_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "glowcase:block/config_link_block"
+    }
+  }
+}

src/main/generated/assets/glowcase/blockstates/entity_display_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "glowcase:block/entity_display_block"
+    }
+  }
+}

src/main/generated/assets/glowcase/blockstates/hyperlink_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "glowcase:block/hyperlink_block"
+    }
+  }
+}

src/main/generated/assets/glowcase/blockstates/item_acceptor_block.json

@@ -0,0 +1,34 @@
+{
+  "variants": {
+    "facing=east,powered=false": {
+      "model": "glowcase:block/item_acceptor_block",
+      "y": 90
+    },
+    "facing=east,powered=true": {
+      "model": "glowcase:block/item_acceptor_block_on",
+      "y": 90
+    },
+    "facing=north,powered=false": {
+      "model": "glowcase:block/item_acceptor_block"
+    },
+    "facing=north,powered=true": {
+      "model": "glowcase:block/item_acceptor_block_on"
+    },
+    "facing=south,powered=false": {
+      "model": "glowcase:block/item_acceptor_block",
+      "y": 180
+    },
+    "facing=south,powered=true": {
+      "model": "glowcase:block/item_acceptor_block_on",
+      "y": 180
+    },
+    "facing=west,powered=false": {
+      "model": "glowcase:block/item_acceptor_block",
+      "y": 270
+    },
+    "facing=west,powered=true": {
+      "model": "glowcase:block/item_acceptor_block_on",
+      "y": 270
+    }
+  }
+}

src/main/generated/assets/glowcase/blockstates/item_display_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "glowcase:block/item_display_block"
+    }
+  }
+}

src/main/generated/assets/glowcase/blockstates/item_provider_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "glowcase:block/item_provider_block"
+    }
+  }
+}

src/main/generated/assets/glowcase/blockstates/outline_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "glowcase:block/outline_block"
+    }
+  }
+}

src/main/generated/assets/glowcase/blockstates/particle_display.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "glowcase:block/particle_display"
+    }
+  }
+}