Skip to content

Commit 119a412

Browse files
DeftuDeftu
committed
New file structure, new MC versions, etc...
1 parent ade0305 commit 119a412

24 files changed

+273
-171
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugins {
1616

1717
toolkitLoomHelper {
1818
useOneConfig {
19-
version = "1.0.0-alpha.70"
19+
version = "1.0.0-alpha.78"
2020
loaderVersion = "1.1.0-alpha.44"
2121

2222
usePolyMixin = true

‎root.gradle.kts‎

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

13-
"1.12.2-fabric"(11202, "yarn") {
14-
"1.12.2-forge"(11202, "srg") {
15-
"1.8.9-forge"(10809, "srg", file("versions/1.12.2-forge+1.8.9-forge.txt")) {
16-
"1.8.9-fabric"(10809, "yarn")
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+
}
52+
}
53+
}
54+
}
55+
}
56+
}
57+
}
58+
}
59+
}
60+
}
61+
}
62+
}
63+
}
64+
}
65+
}
66+
}
1767
}
1868
}
1969
}

‎settings.gradle.kts‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,46 @@ rootProject.buildFileName = "root.gradle.kts"
4242
listOf(
4343
"1.8.9-forge",
4444
"1.8.9-fabric",
45-
"1.12.2-fabric",
45+
4646
"1.12.2-forge",
47+
"1.12.2-fabric",
48+
49+
"1.16.5-forge",
50+
"1.16.5-fabric",
51+
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+
64+
"1.20.1-forge",
65+
"1.20.1-fabric",
66+
67+
"1.20.4-forge",
68+
"1.20.4-neoforge",
69+
"1.20.4-fabric",
70+
71+
"1.20.6-neoforge",
72+
"1.20.6-fabric",
73+
74+
"1.21.1-neoforge",
75+
"1.21.1-fabric",
76+
77+
"1.21.2-neoforge",
78+
"1.21.2-fabric",
79+
80+
"1.21.3-neoforge",
81+
"1.21.3-fabric",
82+
83+
"1.21.4-neoforge",
84+
"1.21.4-fabric",
4785
).forEach { version ->
4886
include(":$version")
4987
project(":$version").apply {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import net.minecraft.client.renderer.EntityRenderer;
55
import net.minecraft.client.renderer.GlStateManager;
66
import org.polyfrost.redaction.Redaction;
7-
import org.polyfrost.redaction.config.RedactionConfig;
7+
import org.polyfrost.redaction.client.RedactionClient;
8+
import org.polyfrost.redaction.client.RedactionConfig;
89
import org.lwjgl.util.glu.Project;
910
import org.objectweb.asm.Opcodes;
1011
import org.spongepowered.asm.mixin.Mixin;
@@ -21,7 +22,7 @@ public abstract class EntityRendererMixin {
2122

2223
@Inject(method = "renderHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GlStateManager;loadIdentity()V", shift = At.Shift.AFTER, ordinal = 0))
2324
private void modifyFov(float partialTicks, int xOffset, CallbackInfo ci) {
24-
Redaction.INSTANCE.setOverrideHand(true);
25+
RedactionClient.INSTANCE.setOverrideHand(true);
2526
}
2627

2728
@Inject(method = "renderHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemInFirstPerson(F)V"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import net.minecraft.client.gui.GuiScreen;
66
import net.minecraft.client.multiplayer.GuiConnecting;
77
import net.minecraft.client.multiplayer.ServerData;
8-
import org.polyfrost.redaction.config.RedactionConfig;
8+
import org.polyfrost.redaction.client.RedactionConfig;
99
import org.spongepowered.asm.mixin.Mixin;
1010
import org.spongepowered.asm.mixin.injection.At;
1111
import org.spongepowered.asm.mixin.injection.Inject;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
//#endif
1212

1313
import net.minecraft.client.multiplayer.ServerData;
14-
import org.polyfrost.redaction.config.RedactionConfig;
15-
import org.polyfrost.redaction.features.ServerManager;
14+
import org.polyfrost.redaction.client.RedactionConfig;
15+
import org.polyfrost.redaction.client.features.ServerManager;
1616
import org.spongepowered.asm.mixin.Final;
1717
import org.spongepowered.asm.mixin.Mixin;
1818
import org.spongepowered.asm.mixin.Shadow;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.polyfrost.redaction.mixin;
22

33
import org.polyfrost.redaction.Redaction;
4-
import org.polyfrost.redaction.config.RedactionConfig;
4+
import org.polyfrost.redaction.client.RedactionConfig;
55
import org.spongepowered.asm.mixin.Dynamic;
66
import org.spongepowered.asm.mixin.Mixin;
77
import org.spongepowered.asm.mixin.Pseudo;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import net.minecraft.client.resources.model.IBakedModel;
66
import net.minecraft.item.ItemStack;
77
import org.polyfrost.redaction.Redaction;
8-
import org.polyfrost.redaction.config.RedactionConfig;
8+
import org.polyfrost.redaction.client.RedactionConfig;
99
import org.spongepowered.asm.mixin.Mixin;
1010
import org.spongepowered.asm.mixin.injection.At;
1111
import org.spongepowered.asm.mixin.injection.Inject;

‎src/main/kotlin/org/polyfrost/redaction/Redaction.kt‎

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

‎src/main/kotlin/org/polyfrost/redaction/RedactionConstants.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.polyfrost.redaction
2+
3+
object RedactionConstants {
4+
5+
// Sets the variables from `gradle.properties`. Depends on the `bloom` DGT plugin.
6+
const val ID = "@MOD_ID@"
7+
const val NAME = "@MOD_NAME@"
8+
const val VERSION = "@MOD_VERSION@"
9+
10+
}

0 commit comments

Comments
 (0)