Skip to content

Commit def387c

Browse files
kb-1000kb-1000
committed
Add support for 23w04a
Fixes #13
1 parent a5b6aa6 commit def387c

File tree

4 files changed

+48
-15
lines changed

4 files changed

+48
-15
lines changed

‎build.gradle.kts

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
import com.google.gson.Gson
2+
import com.google.gson.GsonBuilder
3+
import com.google.gson.JsonObject
4+
import java.io.FilterReader
5+
import java.io.Reader
6+
import java.io.StringReader
7+
18
plugins {
29
id("fabric-loom") version "1.0-SNAPSHOT"
310
id("io.github.juuxel.loom-quiltflower") version "1.8.0"
@@ -55,7 +62,7 @@ dependencies {
5562
compileOnly("net.minecraftforge:fmlloader:${forge_version}") {
5663
isTransitive = false
5764
}
58-
compileOnly("org.apache.maven:maven-artifact:3.8.5") {
65+
compileOnly("org.apache.maven:maven-artifact:3.8.7") {
5966
isTransitive = false
6067
}
6168
}
@@ -93,6 +100,17 @@ java {
93100
withSourcesJar()
94101
withJavadocJar()
95102
}
103+
/*object O {
104+
class RefmapModifier(reader: Reader) : FilterReader(run {
105+
val text = reader.readText()
106+
val gson = GsonBuilder().setPrettyPrinting().create()
107+
val tree = gson.fromJson(text, JsonObject::class.java)
108+
for (mappings in arrayOf(tree.getAsJsonObject("mappings"), tree.getAsJsonObject("data").getAsJsonObject("named:intermediary"))) {
109+
mappings.getAsJsonObject("de/kb1000/notelemetry/mixin/OptionsScreenMixin").addProperty("Lnet/minecraft/class_7845\$class_7939;method_47612(Lnet/minecraft/class_339;)Lnet/minecraft/class_339;", "Lnet/minecraft/class_7845\$class_7939;method_47612(Lnet/minecraft/class_339;)Lnet/minecraft/class_339;")
110+
}
111+
StringReader(gson.toJson(tree))
112+
})
113+
}*/
96114

97115
tasks.jar {
98116
from("LICENSE") {
@@ -102,15 +120,19 @@ tasks.jar {
102120
manifest {
103121
attributes(
104122
"MixinConfigs" to "no-telemetry.mixins.json",
105-
"Implementation-Version" to project.version
123+
"Implementation-Version" to project.version,
106124
)
107125
}
126+
127+
/*filesMatching("no-telemetry-refmap.json") {
128+
filter(O.RefmapModifier::class.java)
129+
}*/
108130
}
109131

110132
// configure the maven publication
111133
publishing {
112134
publications {
113-
val mavenJava by creating(MavenPublication::class) {
135+
create("mavenJava", MavenPublication::class) {
114136
from(components["java"])
115137
}
116138
}

‎gradle.properties

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/versions.html
6-
minecraft_version=1.19.3
7-
yarn_mappings=2
8-
loader_version=0.14.11
6+
minecraft_version=23w04a
7+
yarn_mappings=4
8+
loader_version=0.14.13
99

1010
# Forge
11-
forge_version=1.19.3-44.0.1
11+
forge_version=1.19.3-44.1.8
1212

1313
# Mod Properties
14-
mod_version=1.5.0
14+
mod_version=1.6.0
1515
maven_group=de.kb1000
1616
archives_base_name=no-telemetry

‎src/main/java/de/kb1000/notelemetry/mixin/OptionsScreenMixin.java

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
package de.kb1000.notelemetry.mixin;
22

3-
import net.minecraft.client.gui.screen.option.OptionsScreen;
43
import org.spongepowered.asm.mixin.Mixin;
5-
import org.spongepowered.asm.mixin.injection.At;
6-
import org.spongepowered.asm.mixin.injection.Coerce;
7-
import org.spongepowered.asm.mixin.injection.Redirect;
8-
import org.spongepowered.asm.mixin.injection.Slice;
4+
import org.spongepowered.asm.mixin.injection.*;
95

106
@Mixin(targets = "net.minecraft.client.gui.screen.option.OptionsScreen")
117
public class OptionsScreenMixin {
12-
@Redirect(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/ClickableWidget;)Lnet/minecraft/client/gui/widget/ClickableWidget;", ordinal = 0), slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screen/option/OptionsScreen;TELEMETRY_TEXT:Lnet/minecraft/text/Text;")))
8+
@Group(name = "removeTelemetryButton", min = 1)
9+
@Redirect(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/Widget;)Lnet/minecraft/client/gui/widget/Widget;", ordinal = 0), slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screen/option/OptionsScreen;TELEMETRY_TEXT:Lnet/minecraft/text/Text;")))
1310
private @Coerce Object removeTelemetryButton(@Coerce Object adder, @Coerce Object widget) {
1411
return widget;
1512
}
13+
14+
@Redirect(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/class_7845$class_7939;method_47612(Lnet/minecraft/class_339;)Lnet/minecraft/class_339;", ordinal = 0), slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screen/option/OptionsScreen;TELEMETRY_TEXT:Lnet/minecraft/text/Text;")))
15+
@Group(name = "removeTelemetryButton", min = 1)
16+
private @Coerce Object removeTelemetryButtonOld(@Coerce Object adder, @Coerce Object widget) {
17+
return widget;
18+
}
1619
}

‎src/main/resources/no-telemetry-forge-refmap.json

+9-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
},
77
"de/kb1000/notelemetry/mixin/OptionsScreenMixin": {
88
"init": "Lnet/minecraft/client/gui/screens/OptionsScreen;m_7856_()V",
9-
"Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/ClickableWidget;)Lnet/minecraft/client/gui/widget/ClickableWidget;": "Lnet/minecraft/client/gui/components/GridWidget$RowHelper;m_261261_(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;",
9+
"Lnet/minecraft/class_7845$class_7939;method_47612(Lnet/minecraft/class_339;)Lnet/minecraft/class_339;": "Lnet/minecraft/client/gui/components/GridWidget$RowHelper;m_261261_(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;",
10+
"Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/Widget;)Lnet/minecraft/client/gui/widget/Widget;": "Lnet/minecraft/client/gui/components/GridWidget$RowHelper;m_264139_(Lnet/minecraft/client/gui/layouts/LayoutElement;)Lnet/minecraft/client/gui/layouts/LayoutElement;",
1011
"Lnet/minecraft/client/gui/screen/option/OptionsScreen;TELEMETRY_TEXT:Lnet/minecraft/text/Text;": "Lnet/minecraft/client/gui/screens/OptionsScreen;f_260594_:Lnet/minecraft/network/chat/Component;",
1112
"net.minecraft.client.gui.screen.option.OptionsScreen": "net/minecraft/client/gui/screens/OptionsScreen"
1213
},
@@ -22,6 +23,13 @@
2223
"net.minecraft.client.util.telemetry.TelemetryManager": "net/minecraft/client/ClientTelemetryManager",
2324
"Lnet/minecraft/SharedConstants;isDevelopment:Z": "Lnet/minecraft/SharedConstants;f_136183_:Z"
2425
},
26+
"de/kb1000/notelemetry/mixin/OptionsScreenMixin": {
27+
"init": "Lnet/minecraft/client/gui/screens/OptionsScreen;m_7856_()V",
28+
"Lnet/minecraft/class_7845$class_7939;method_47612(Lnet/minecraft/class_339;)Lnet/minecraft/class_339;": "Lnet/minecraft/client/gui/components/GridWidget$RowHelper;m_261261_(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;",
29+
"Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/Widget;)Lnet/minecraft/client/gui/widget/Widget;": "Lnet/minecraft/client/gui/components/GridWidget$RowHelper;m_264139_(Lnet/minecraft/client/gui/layouts/LayoutElement;)Lnet/minecraft/client/gui/layouts/LayoutElement;",
30+
"Lnet/minecraft/client/gui/screen/option/OptionsScreen;TELEMETRY_TEXT:Lnet/minecraft/text/Text;": "Lnet/minecraft/client/gui/screens/OptionsScreen;f_260594_:Lnet/minecraft/network/chat/Component;",
31+
"net.minecraft.client.gui.screen.option.OptionsScreen": "net/minecraft/client/gui/screens/OptionsScreen"
32+
},
2533
"de/kb1000/notelemetry/mixin/Post1193TelemetryManagerMixin": {
2634
"net.minecraft.client.util.telemetry.TelemetryManager": "net/minecraft/client/telemetry/ClientTelemetryManager",
2735
"Lnet/minecraft/SharedConstants;isDevelopment:Z": "Lnet/minecraft/SharedConstants;f_136183_:Z",

0 commit comments

Comments
 (0)