Skip to content

Commit bf73f3a

Browse files
committed
fix: Separate 1.20.4 from 1.20.2 to fix mixin crash
1 parent 914e95b commit bf73f3a

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

gradle/mc-1.20.2/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mc.version.title = 1.20.2-1.20.4
2-
mc.version.supported = 1.20.2, 1.20.3, 1.20.4
1+
mc.version.title = 1.20.2
2+
mc.version.supported = 1.20.2
33

44
preprocessor.mc_version_number = 12002

gradle/mc-1.20.4/gradle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
mc.version.title = 1.20.3-1.20.4
2+
mc.version.supported = 1.20.3, 1.20.4
3+
4+
preprocessor.mc_version_number = 12004

gradle/mc-1.20.4/mc.versions.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[versions]
2+
amecsApi = "1.7.0"
3+
fabric-api = "0.97.3+1.20.4"
4+
java = "17"
5+
minecraft = "1.20.4"
6+
nmuk = "1.2.0"
7+
8+
[libraries]
9+
amecsApi = { group = "de.siphalor.amecs-api", name = "amecs-api-mc1.20.2", version.ref = "amecsApi" }
10+
fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" }
11+
minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
12+
nmuk = { group = "de.siphalor.nmuk", name = "nmuk-mc1.20.0", version.ref = "nmuk" }

src/main/java/de/siphalor/amecs/mixin/MixinEntryListWidget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public abstract class MixinEntryListWidget {
2323
@Shadow protected abstract int addEntry(AbstractSelectionList.Entry<?> entry);
2424

2525
@Inject(method = "<init>", at = @At("RETURN"))
26-
//# if MC_VERSION_NUMBER >= 12005
26+
//# if MC_VERSION_NUMBER >= 12003
2727
public void onConstruct(Minecraft client, int width, int height, int y0, int itemHeight, CallbackInfo ci) {
2828
//# else
2929
//- public void onConstruct(Minecraft client, int width, int height, int y0, int y1, int itemHeight, CallbackInfo ci) {

0 commit comments

Comments
 (0)