Skip to content

Commit c2b49c8

Browse files
DeftuDeftu
committed
new versions. clean up. omnicore v1. twoconfig. all that stuff
1 parent cae9e32 commit c2b49c8

28 files changed

+425
-394
lines changed

‎build.gradle.kts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ plugins {
1616

1717
toolkitLoomHelper {
1818
useOneConfig {
19-
version = "1.0.0-alpha.78"
20-
loaderVersion = "1.1.0-alpha.44"
19+
version = "1.0.0-alpha.153"
20+
loaderVersion = "1.1.0-alpha.49"
2121

2222
usePolyMixin = true
2323
polyMixinVersion = "0.8.4+build.2"
@@ -29,6 +29,9 @@ toolkitLoomHelper {
2929
}
3030
}
3131

32+
useDevAuth("1.2.1")
33+
useMixinExtras("0.4.1")
34+
3235
// Turns off the server-side run configs, as we're building a client-sided mod.
3336
disableRunConfigs(GameSide.SERVER)
3437

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ org.gradle.parallel=true
66
mod.name=REDACTION
77
mod.version=2.0.0-alpha.1
88
mod.id=redaction
9-
mod.group=org.polyfrost
9+
mod.group=org.polyfrost

src/main/java/org/polyfrost/redaction/mixin/EntityRendererMixin.java renamed to old/EntityRendererMixin.java

File renamed without changes.

src/main/java/org/polyfrost/redaction/mixin/EntityRendererMixin_OptiFine.java renamed to old/EntityRendererMixin_OptiFine.java

File renamed without changes.

src/main/java/org/polyfrost/redaction/mixin/PatcherEntityRendererHookMixin.java renamed to old/PatcherEntityRendererHookMixin.java

File renamed without changes.

src/main/java/org/polyfrost/redaction/mixin/RenderItemMixin.java renamed to old/RenderItemMixin.java

File renamed without changes.

‎root.gradle.kts‎

Lines changed: 19 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,25 @@ preprocess {
1010
// "1.8.9-forge"(10809, "srg")
1111
// }
1212

13-
"1.21.4-neoforge"(1_21_04, "srg") {
14-
"1.21.4-fabric"(1_21_04, "yarn") {
15-
"1.21.3-fabric"(1_21_04, "yarn") {
16-
"1.21.3-neoforge"(1_21_03, "srg") {
17-
"1.21.2-neoforge"(1_21_02, "srg") {
18-
"1.21.2-fabric"(1_21_02, "yarn") {
19-
"1.21.1-fabric"(1_21_01, "yarn", file("versions/mappings/1.21.2-fabric+1.21.1-fabric.txt")) {
20-
"1.21.1-neoforge"(1_21_01, "srg") {
21-
"1.20.6-neoforge"(1_20_06, "srg", file("versions/mappings/1.21.1-neoforge+1.20.6-neoforge.txt")) {
22-
"1.20.6-fabric"(1_20_06, "yarn") {
23-
"1.20.4-fabric"(1_20_04, "yarn") {
24-
"1.20.4-neoforge"(1_20_04, "srg") {
25-
"1.20.4-forge"(1_20_04, "srg", file("versions/mappings/1.20.4-neoforge+1.20.4-forge.txt")) {
26-
"1.20.1-forge"(1_20_01, "srg", file("versions/mappings/1.20.4-forge+1.20.1-forge.txt")) {
27-
"1.20.1-fabric"(1_20_01, "yarn") {
28-
"1.19.4-fabric"(1_19_04, "yarn") {
29-
"1.19.4-forge"(1_19_04, "srg") {
30-
"1.19.2-forge"(1_19_02, "srg", file("versions/mappings/1.19.4-forge+1.19.2-forge.txt")) {
31-
"1.19.2-fabric"(1_19_02, "yarn") {
32-
"1.18.2-fabric"(1_18_02, "yarn", file("versions/mappings/1.19.2-fabric+1.18.2-fabric.txt")) {
33-
"1.18.2-forge"(1_18_02, "srg") {
34-
"1.17.1-forge"(1_17_01, "srg") {
35-
"1.17.1-fabric"(1_17_01, "yarn") {
36-
"1.16.5-fabric"(1_16_05, "yarn", file("versions/mappings/1.17.1-fabric+1.16.5-fabric.txt")) {
37-
"1.16.5-forge"(1_16_05, "srg") {
38-
"1.12.2-forge"(1_12_02, "srg", file("versions/mappings/1.16.5-forge+1.12.2-forge.txt")) {
39-
"1.12.2-fabric"(1_12_02, "yarn") {
40-
"1.8.9-fabric"(1_08_09, "yarn", file("versions/mappings/1.12.2-fabric+1.8.9-fabric.txt")) {
41-
"1.8.9-forge"(1_08_09, "srg")
42-
}
43-
}
44-
}
45-
}
46-
}
47-
}
48-
}
49-
}
50-
}
51-
}
13+
"1.21.8-fabric"(1_21_08, "yarn") {
14+
"1.21.8-neoforge"(1_21_08, "srg") {
15+
"1.21.5-neoforge"(1_21_05, "srg") {
16+
"1.21.5-fabric"(1_21_05, "yarn") {
17+
"1.21.4-fabric"(1_21_04, "yarn") {
18+
"1.21.4-neoforge"(1_21_04, "srg") {
19+
"1.21.1-neoforge"(1_21_01, "srg") {
20+
"1.21.1-fabric"(1_21_01, "yarn") {
21+
"1.20.4-fabric"(1_20_04, "yarn") {
22+
"1.20.4-neoforge"(1_20_04, "srg") {
23+
"1.20.4-forge"(1_20_04, "srg") {
24+
"1.20.1-forge"(1_20_01, "srg") {
25+
"1.20.1-fabric"(1_20_01, "yarn") {
26+
"1.16.5-fabric"(1_16_05, "yarn") {
27+
"1.16.5-forge"(1_16_05, "srg") {
28+
"1.12.2-forge"(1_12_02, "srg", file("versions/mappings/1.16.5-forge+1.12.2-forge.txt")) {
29+
"1.12.2-fabric"(1_12_02, "yarn") {
30+
"1.8.9-fabric"(1_08_09, "yarn") {
31+
"1.8.9-forge"(1_08_09, "srg")
5232
}
5333
}
5434
}

‎settings.gradle.kts‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ pluginManagement {
2323
}
2424

2525
plugins {
26-
kotlin("jvm") version("2.0.0")
27-
id("dev.deftu.gradle.multiversion-root") version("2.35.0")
26+
kotlin("jvm") version("2.0.20")
27+
id("dev.deftu.gradle.multiversion-root") version("2.55.0")
2828
}
2929
}
3030

@@ -49,39 +49,24 @@ listOf(
4949
"1.16.5-forge",
5050
"1.16.5-fabric",
5151

52-
"1.17.1-forge",
53-
"1.17.1-fabric",
54-
55-
"1.18.2-forge",
56-
"1.18.2-fabric",
57-
58-
"1.19.2-forge",
59-
"1.19.2-fabric",
60-
61-
"1.19.4-forge",
62-
"1.19.4-fabric",
63-
6452
"1.20.1-forge",
6553
"1.20.1-fabric",
6654

6755
"1.20.4-forge",
6856
"1.20.4-neoforge",
6957
"1.20.4-fabric",
7058

71-
"1.20.6-neoforge",
72-
"1.20.6-fabric",
73-
7459
"1.21.1-neoforge",
7560
"1.21.1-fabric",
7661

77-
"1.21.2-neoforge",
78-
"1.21.2-fabric",
79-
80-
"1.21.3-neoforge",
81-
"1.21.3-fabric",
82-
8362
"1.21.4-neoforge",
8463
"1.21.4-fabric",
64+
65+
"1.21.5-neoforge",
66+
"1.21.5-fabric",
67+
68+
"1.21.8-neoforge",
69+
"1.21.8-fabric",
8570
).forEach { version ->
8671
include(":$version")
8772
project(":$version").apply {

‎src/main/java/org/polyfrost/redaction/mixin/MinecraftAccessor.java‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/main/java/org/polyfrost/redaction/mixin/GuiMainMenuMixin.java renamed to src/main/java/org/polyfrost/redaction/mixin/client/Mixin_LastJoinedServer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package org.polyfrost.redaction.mixin;
1+
package org.polyfrost.redaction.mixin.client;
22

3+
//#if MC <= 1.12.2
34
import net.minecraft.client.gui.GuiButton;
45
import net.minecraft.client.gui.GuiMainMenu;
56
import net.minecraft.client.gui.GuiScreen;
@@ -12,8 +13,7 @@
1213
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1314

1415
@Mixin(GuiMainMenu.class)
15-
public class GuiMainMenuMixin extends GuiScreen {
16-
16+
public class Mixin_LastJoinedServer extends GuiScreen {
1717
@Inject(method = "addSingleplayerMultiplayerButtons", at = @At("TAIL"))
1818
protected void onGuiInit(int p_73969_1_, int p_73969_2_, CallbackInfo ci) {
1919
String ip = RedactionConfig.INSTANCE.getLastServerIP();
@@ -30,5 +30,5 @@ protected void onActionPerformed(GuiButton button, CallbackInfo ci) {
3030
this.mc.displayGuiScreen(new GuiConnecting(this, this.mc, new ServerData(ip, ip, false)));
3131
}
3232
}
33-
34-
}
33+
}
34+
//#endif

0 commit comments

Comments
 (0)