Skip to content

Commit 30a5122

Browse files
chore(port)!: Port to 1.21.7
Port to 1.21.7
2 parents 993f867 + f5feb07 commit 30a5122

File tree

220 files changed

+2657
-1874
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+2657
-1874
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ bin/
3131
# fabric
3232

3333
run/
34+
35+
# others
36+
.envrc
37+
.direnv

build.gradle

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,54 @@ dependencies {
3636
implementation libs.kaleidoConfig
3737
include libs.kaleidoConfig
3838

39-
modCompileOnly libs.emi
40-
modLocalRuntime libs.emi
39+
/*modCompileOnly libs.emi
40+
modLocalRuntime libs.emi*/
4141

4242
modCompileOnly libs.modmenu
4343
modLocalRuntime libs.modmenu
44+
}
45+
46+
loom {
47+
accessWidenerPath.set(file("src/main/resources/glowcase.accesswidener"))
48+
49+
runs {
50+
client_mixin {
51+
client()
52+
ideConfigGenerated true
53+
name = "Minecraft Client - (Mixin Swap)"
54+
source sourceSets.main
55+
vmArg "-Dmixin.debug.export=true"
56+
57+
try {
58+
afterEvaluate {
59+
def mixinDep = this.configurations.compileClasspath
60+
.allDependencies
61+
.findAll { it.name == "sponge-mixin" }
62+
.first()
63+
64+
if (mixin != null) {
65+
def mixinPath = this.configurations.compileClasspath.files(mixinDep).first().path;
66+
67+
println(mixinPath)
68+
69+
vmArg("-javaagent:\"${mixinPath}\"")
70+
71+
println("[Info]: Mixin Hotswap Run should be working")
72+
} else {
73+
println("[Warning]: Unable to locate file path for Mixin Jar, HotSwap Run will not work!")
74+
}
75+
}
76+
} catch (Exception e) {
77+
println("[Error]: MixinHotswap Run had a issue!")
78+
e.printStackTrace()
79+
}
80+
}
81+
}
82+
}
4483

45-
modCompileOnly("foundry.veil:veil-fabric-1.21.1:1.0.0.228") {
46-
exclude group: "maven.modrinth"
47-
exclude group: "me.fallenbreath"
84+
fabricApi {
85+
configureDataGeneration {
86+
client = true
4887
}
4988
}
5089

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ modId=glowcase
1414
modName=Glowcase
1515
modDescription=Blocks for showcasing mods!
1616
authors=HavenKing, ModFest
17-
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
17+
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
1818
license=CC0-1.0
1919
# Mod Version
20-
baseVersion=2.2.0
20+
baseVersion=2.3.0
2121
# Branch Metadata
2222
branch=1.21
2323
tagBranch=1.21

gradle/wrapper/gradle-wrapper.jar

-19.5 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libs.versions.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[versions]
2-
loom = "1.7.+"
2+
loom = "1.11.+"
33
minotaur = "2.+"
44

5-
kaleidoConfig = "0.3.1+1.3.2"
5+
kaleidoConfig = "0.3.3+1.3.2"
66

7-
mc = "1.21.1"
8-
fl = "0.16.10"
9-
yarn = "1.21.1+build.3"
10-
fapi = "0.115.4+1.21.1"
7+
mc = "1.21.7"
8+
fl = "0.16.14"
9+
yarn = "1.21.7+build.2"
10+
fapi = "0.128.2+1.21.7"
1111

1212
placeholder = "2.4.0+1.21"
13-
polydex = "1.2.2+1.21"
14-
emi = "1.1.19+1.21.1"
15-
modmenu = "11.0.3"
13+
polydex = "1.6.0+1.21.6"
14+
# emi = "1.1.19+1.21.1"
15+
modmenu = "15.0.0-beta.3"
1616

1717
[plugins]
1818
loom = { id = "fabric-loom", version.ref = "loom" }
@@ -28,5 +28,5 @@ placeholder = { group = "eu.pb4", name = "placeholder-api", version.ref = "place
2828
polydex = { group = "eu.pb4", name = "polydex", version.ref = "polydex" }
2929
kaleidoConfig = { group = "folk.sisby", name = "kaleido-config", version.ref = "kaleidoConfig" }
3030

31-
emi = { group = "dev.emi", name = "emi-fabric", version.ref = "emi" }
31+
# emi = { group = "dev.emi", name = "emi-fabric", version.ref = "emi" }
3232
modmenu = { group = "com.terraformersmc", name = "modmenu", version.ref = "modmenu" }

shell.nix

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
let
2+
nixpkgsVer = "b43c397f6c213918d6cfe6e3550abfe79b5d1c51";
3+
pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgsVer}.tar.gz") { config = {}; overlays = []; };
4+
libs = with pkgs; [
5+
libpulseaudio
6+
libGL
7+
glfw
8+
openal
9+
stdenv.cc.cc.lib
10+
];
11+
in pkgs.mkShell {
12+
name = "glowcase";
13+
14+
buildInputs = with pkgs; [
15+
jdk21
16+
] ++ libs;
17+
18+
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
19+
}
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
// 1.21.7 -999999999-01-01T00:00:00 Glowcase/Model Definitions
2+
76ba62a8d2d3caef77edcf480af230448d9c9859 assets/glowcase/blockstates/config_link_block.json
3+
c48bfc1ca019b7d69fbcec16a9ad47c891650e14 assets/glowcase/blockstates/entity_display_block.json
4+
06436f199ed99a3101970c74b4ebff1e00295fc0 assets/glowcase/blockstates/hyperlink_block.json
5+
30f3ed5fba7c4e23901c5e69d3a42fa1f2b4b6a5 assets/glowcase/blockstates/item_acceptor_block.json
6+
ad7376f72875887d7c0417925de8f8c5b10dd67e assets/glowcase/blockstates/item_display_block.json
7+
c9840685535fd61fc07306b3c5a57a30dba9bdd1 assets/glowcase/blockstates/item_provider_block.json
8+
f0e524812a58e18dfdc74d12e14e423c1972deb2 assets/glowcase/blockstates/outline_block.json
9+
a3de34664293589a2c15680928768a26bda1f771 assets/glowcase/blockstates/particle_display.json
10+
22ebee7608059b9ac57efc7372fe808293118346 assets/glowcase/blockstates/popup_block.json
11+
d01d21a5099962640751d1ece44f3f879e9fbd77 assets/glowcase/blockstates/recipe_block.json
12+
5ab1defe217da19477a8e6997866280985fc3113 assets/glowcase/blockstates/screen_block.json
13+
3c71ba28fc0b7fa1ceace538624d75559fb3c554 assets/glowcase/blockstates/sound_block.json
14+
0cfaecca3376c654c3ef3e2e9428ddd1a19710d4 assets/glowcase/blockstates/sprite_block.json
15+
77c1f611de210c71d016923b4b5b24b0488253fd assets/glowcase/blockstates/text_block.json
16+
f574067204425aa46ed3fd071c58b2a7d79f8841 assets/glowcase/items/collection_case.json
17+
b75620052282e85e65fa3880c68678cc431fc0e0 assets/glowcase/items/config_link_block.json
18+
421e2d84a91f8c94074ef6578f277de1cfe2731a assets/glowcase/items/entity_display_block.json
19+
97c331c0af17c435c3d4691ca2b7437e244665f2 assets/glowcase/items/hyperlink_block.json
20+
77e2b068d2549e2313cdc242de78039ee1bfbe88 assets/glowcase/items/item_acceptor_block.json
21+
45401bf39e79f96e7a80669cf8bc918e7040ff47 assets/glowcase/items/item_display_block.json
22+
36f58494dba5f1f4c06e8c0b50404000f732c694 assets/glowcase/items/item_provider_block.json
23+
af5496f4c54dfd6f73b9bd7d7e1ed412c9305621 assets/glowcase/items/lock.json
24+
993fc5212381122e9a4c94802b702e8a3d2c489a assets/glowcase/items/note.json
25+
305c8feab2dd159cfb758bbb8b92c462efc56c95 assets/glowcase/items/outline_block.json
26+
d91a0c26a26050f433171f041482e1fac93a6d8b assets/glowcase/items/particle_display.json
27+
a4eace74ef001587907ec7710bab911e2fdd278e assets/glowcase/items/popup_block.json
28+
892f9c46e3ca0fd886bc8347d50a791be65e7c98 assets/glowcase/items/recipe_block.json
29+
6bb86f13fb90583f76878dbd2181256a9f8b3bbb assets/glowcase/items/screen_block.json
30+
1449a401c9788251827959567e3041216c1b904f assets/glowcase/items/sound_block.json
31+
991337288059214cbe1b092b1b646fb2c54f7651 assets/glowcase/items/sprite_block.json
32+
132a17ee3afc3f5e863cb2dfe0b7d101fabf8441 assets/glowcase/items/tablet.json
33+
a7ded49a0cd3dd443d492c48e65eed1a8fab4004 assets/glowcase/items/text_block.json
34+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/config_link_block.json
35+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/entity_display_block.json
36+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/hyperlink_block.json
37+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/item_display_block.json
38+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/item_provider_block.json
39+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/outline_block.json
40+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/particle_display.json
41+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/popup_block.json
42+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/recipe_block.json
43+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/screen_block.json
44+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/sound_block.json
45+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/sprite_block.json
46+
7ae15c6da8ce1c1ffcbb0c4f0f9b4b5454042167 assets/glowcase/models/block/text_block.json
47+
545c81474e2bd0a7c122c5af68f251295c84adca assets/glowcase/models/item/collection_case.json
48+
4683bf38d04be2253aecfffb8409e83b89d29acb assets/glowcase/models/item/config_link_block.json
49+
b8c568923c99597df2f0919d0e4537e0f32de31d assets/glowcase/models/item/entity_display_block.json
50+
45df37e0bbb7ca27a1a561b1935403690f52840d assets/glowcase/models/item/hyperlink_block.json
51+
9bb8ea6dca0b8018fd67754ba088a52d8ee58c75 assets/glowcase/models/item/item_display_block.json
52+
5831177698aeeccf16e55e0cc189c1f98436a881 assets/glowcase/models/item/item_provider_block.json
53+
9ed56aa644836c7f96fc3f8d4dd0ca1f77737d45 assets/glowcase/models/item/lock.json
54+
bcbcee91be44678eac77ca724ed7767b9b537df5 assets/glowcase/models/item/note.json
55+
d131cb646e0a2c6ff38d83bebbf37b51d75618bd assets/glowcase/models/item/outline_block.json
56+
bec71161001fad4f70f4bed7a49d284f7145f30e assets/glowcase/models/item/particle_display.json
57+
dfa2fa26b679ab662a5550066eaf596804e2adbf assets/glowcase/models/item/popup_block.json
58+
f9d20fc7bde07036aaceb54848b73609c2c04a68 assets/glowcase/models/item/recipe_block.json
59+
14f0098f5a6104ccbd982a0cbd2c5c9df4655b45 assets/glowcase/models/item/screen_block.json
60+
460b9962c1b9eae386618587ce8e7fddc4b07dd9 assets/glowcase/models/item/sound_block.json
61+
dae11663be5030d2491a44a79610d1c1caa08403 assets/glowcase/models/item/sprite_block.json
62+
2dbdeba90986220f9bac334e6aea26fe6c7b1136 assets/glowcase/models/item/tablet.json
63+
e8e5c6ab743edcec7bfc5f806f6cade57e3215c4 assets/glowcase/models/item/text_block.json

0 commit comments

Comments
 (0)