Merge pull request #9 from Lucaslah/1.19.4-patch

feat: update to 1.19.4
This commit is contained in:
2023-03-23 10:20:56 -04:00
committed by GitHub
7 changed files with 31 additions and 40 deletions

View File

@@ -9,11 +9,14 @@ Should be compatible with any mods, but if you do find a mod that is not please
**Fabric API not required.**\
**Mod is client size only, this mod will not do anything if used on the server.**
For Minecraft versions 1.19.1 and 1.19.2 use NRB v1.2.1, the latest version only supports 1.19.3+.
For Minecraft versions 1.19.1 and 1.19.2 use NRB v1.2.1.\
For Minecraft 1.19.3 use NRB v1.4.0.\
The latest version (v1.4.1) only supports 1.19.4+.
## Released Versions
| Version | MC Version | Mod loaders | Git tag | Supported |
|---------|---------------|----------------------|---------------------------------------------------------------------------|-----------|
| 1.4.1 | 1.19.4 | fabric, forge, quilt | [1.4.1](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.4.1) | yes |
| 1.4.0 | 1.19.3 | fabric, forge, quilt | [1.4.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.4.0) | yes |
| 1.3.1 | 1.19.3 | fabric | [1.3.1](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.3.1) | no |
| 1.3.0 | 1.19.3 | fabric | [1.3.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.3.0) | no |

View File

@@ -1,10 +1,11 @@
package me.lucaslah.nrb.mixin;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.screen.GameMenuScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.gui.widget.GridWidget;
import net.minecraft.client.gui.widget.Widget;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.text.Text;
import org.spongepowered.asm.mixin.Mixin;
@@ -23,29 +24,16 @@ public abstract class GameMenuScreenMixin extends Screen {
@Inject(method = "initWidgets()V", at = @At(value = "RETURN"))
public void initWidgets(CallbackInfo ci) {
final List<Element> widgets = ((ScreenAccessor) this).getChildren();
List<? extends Element> buttons = null;
final List<Drawable> drawables = ((ScreenAccessor) this).getDrawables();
for (Element clickableWidget : widgets) {
if (clickableWidget instanceof GridWidget widget) {
List<? extends Element> children = widget.children();
if (children != null) {
buttons = children;
}
}
}
if (buttons != null) {
for (Element element : buttons) {
if (element instanceof ClickableWidget button) {
if (button.getMessage().getString().equals(I18n.translate("menu.playerReporting"))) {
if (this.client != null) {
button.active = this.client.isIntegratedServerRunning() && !Objects.requireNonNull(this.client.getServer()).isRemote();
}
button.setMessage(Text.translatable("menu.shareToLan"));
for (Drawable drawable : drawables) {
if (drawable instanceof ClickableWidget widget) {
if (widget.getMessage().getString().equals(I18n.translate("menu.playerReporting"))) {
if (this.client != null) {
widget.active = this.client.isIntegratedServerRunning() && !Objects.requireNonNull(this.client.getServer()).isRemote();
}
widget.setMessage(Text.translatable("menu.shareToLan"));
}
}
}

View File

@@ -1,6 +1,6 @@
package me.lucaslah.nrb.mixin;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.screen.Screen;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@@ -10,5 +10,5 @@ import java.util.List;
@Mixin(Screen.class)
public interface ScreenAccessor {
@Accessor
List<Element> getChildren();
List<Drawable> getDrawables();
}

View File

@@ -37,17 +37,17 @@ shadowJar {
exclude "architectury.common.json"
configurations = [project.configurations.shadowCommon]
classifier "dev-shadow"
setArchiveClassifier("dev-shadow")
}
remapJar {
input.set shadowJar.archiveFile
dependsOn shadowJar
classifier null
setArchiveClassifier(null)
}
jar {
classifier "dev"
setArchiveClassifier("dev")
}
sourcesJar {

View File

@@ -27,8 +27,8 @@
],
"depends": {
"fabricloader": ">=0.14.6",
"minecraft": ">=1.19.3",
"fabricloader": ">=0.14.17",
"minecraft": "~1.19.4",
"java": ">=17"
}
}

View File

@@ -43,17 +43,17 @@ shadowJar {
exclude "architectury.common.json"
configurations = [project.configurations.shadowCommon]
classifier "dev-shadow"
setArchiveClassifier("dev-shadow")
}
remapJar {
input.set shadowJar.archiveFile
dependsOn shadowJar
classifier null
setArchiveClassifier(null)
}
jar {
classifier "dev"
setArchiveClassifier("dev")
}
sourcesJar {

View File

@@ -1,19 +1,19 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx2G
org.gradle.jvmargs=-Xmx4G
# Minecraft Properties
minecraft_version=1.19.3
yarn_mappings=1.19.3+build.3
fabric_loader_version=0.14.11
minecraft_version=1.19.4
yarn_mappings=1.19.4+build.1
fabric_loader_version=0.14.17
quilt_loader_version=0.18.1-beta.23
enabled_platforms=quilt,fabric,forge
# Mod Properties
mod_version = 1.4.0
mod_version = 1.4.1
maven_group = me.lucaslah
archives_base_name = no-report-button
# Dependencies
architectury_version=6.2.43
fabric_version=0.68.1+1.19.3
forge_version=1.19.3-44.0.18
fabric_version=0.75.3+1.19.4
forge_version=1.19.4-45.0.9