quick 1.19.2 port

This commit is contained in:
Jill 2022-11-10 14:22:53 +03:00
parent b043f18088
commit a154072f03
4 changed files with 26 additions and 26 deletions

View File

@ -32,7 +32,8 @@ dependencies {
modLocalRuntime("maven.modrinth:lazydfu:0.1.2") // lazydfu - improves start times modLocalRuntime("maven.modrinth:lazydfu:0.1.2") // lazydfu - improves start times
//modLocalRuntime("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } // required for suggestion tweaker //modLocalRuntime("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } // required for suggestion tweaker
modLocalRuntime("maven.modrinth:suggestion-tweaker:${project.suggestion_tweaker_version}") // suggestion tweaker - dev QOL, improves command suggestions // does not function on 1.19.2
//modLocalRuntime("maven.modrinth:suggestion-tweaker:${project.suggestion_tweaker_version}") // suggestion tweaker - dev QOL, improves command suggestions
modApi("com.terraformersmc:modmenu:${project.modmenu_version}") modApi("com.terraformersmc:modmenu:${project.modmenu_version}")

View File

@ -3,24 +3,24 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.18.2 minecraft_version=1.19.2
accepted_minecraft_version=1.18,1.18.1,1.18.2 accepted_minecraft_version=1.19,1.19.1,1.19.2
yarn_mappings=1.18.2+build.4 yarn_mappings=1.19.2+build.28
loader_version=0.14.10 loader_version=0.14.10
# Mod Properties # Mod Properties
mod_version = 1.0+1.18 mod_version = 1.0+1.19
mod_version_friendly = 1.0 for 1.18.2 mod_version_friendly = 1.0 for 1.19.2
maven_group = zone.oat maven_group = zone.oat
archives_base_name = gmod-title-screen archives_base_name = gmod-title-screen
# Dependencies # Dependencies
fabric_version=0.66.0+1.18.2 fabric_version=0.66.0+1.19.2
# https://modrinth.com/mod/modmenu # https://modrinth.com/mod/modmenu
modmenu_version=3.2.3 modmenu_version=4.1.0
# Dev environment # Dev environment
# https://modrinth.com/mod/suggestion-tweaker # https://modrinth.com/mod/suggestion-tweaker
suggestion_tweaker_version = 1.18.x-1.2.0 #suggestion_tweaker_version = 1.19.1-1.3.1
# https://modrinth.com/mod/cloth-config # https://modrinth.com/mod/cloth-config
cloth_config_version = 6.3.81 cloth_config_version = 8.2.88

View File

@ -22,7 +22,6 @@ import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.texture.TextureManager; import net.minecraft.client.texture.TextureManager;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Formatting; import net.minecraft.util.Formatting;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.Util; import net.minecraft.util.Util;
@ -41,7 +40,7 @@ import java.util.function.Consumer;
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public class CustomTitleScreen extends Screen { public class CustomTitleScreen extends Screen {
public static final Text VERSION_TEXT = new TranslatableText("menu.gmod-title-screen.version", SharedConstants.getGameVersion().getName(), FabricLoader.getInstance().getModContainer("gmod-title-screen").get().getMetadata().getVersion().getFriendlyString()); public static final Text VERSION_TEXT = Text.translatable("menu.gmod-title-screen.version", SharedConstants.getGameVersion().getName(), FabricLoader.getInstance().getModContainer("gmod-title-screen").get().getMetadata().getVersion().getFriendlyString());
private static final Identifier ACCESSIBILITY_ICON_TEXTURE = new Identifier("textures/gui/accessibility.png"); private static final Identifier ACCESSIBILITY_ICON_TEXTURE = new Identifier("textures/gui/accessibility.png");
private final boolean isMinceraft; private final boolean isMinceraft;
@Nullable @Nullable
@ -112,7 +111,7 @@ public class CustomTitleScreen extends Screen {
} }
private void openLink(String url) { private void openLink(String url) {
this.client.setScreen(new ConfirmChatLinkScreen(openInBrowser -> { this.client.setScreen(new ConfirmLinkScreen(openInBrowser -> {
if (openInBrowser) { if (openInBrowser) {
Util.getOperatingSystem().open(url); Util.getOperatingSystem().open(url);
} }
@ -122,7 +121,7 @@ public class CustomTitleScreen extends Screen {
} }
public CustomTitleScreen() { public CustomTitleScreen() {
super(new TranslatableText("narrator.screen.title")); super(Text.translatable("narrator.screen.title"));
this.isMinceraft = (double)new Random().nextFloat() < 1.0E-4; this.isMinceraft = (double)new Random().nextFloat() < 1.0E-4;
} }
@ -193,7 +192,7 @@ public class CustomTitleScreen extends Screen {
buttonsY, buttonsY,
130, 130,
buttonHeight, buttonHeight,
new TranslatableText("menu.gmod-title-screen.singleplayer"), Text.translatable("menu.gmod-title-screen.singleplayer"),
button -> this.client.setScreen(new SelectWorldScreen(this)), button -> this.client.setScreen(new SelectWorldScreen(this)),
this.textRenderer this.textRenderer
)); ));
@ -203,7 +202,7 @@ public class CustomTitleScreen extends Screen {
buttonsY + buttonSpacing * 1, buttonsY + buttonSpacing * 1,
130, 130,
buttonHeight, buttonHeight,
new TranslatableText("menu.gmod-title-screen.multiplayer"), Text.translatable("menu.gmod-title-screen.multiplayer"),
button -> { button -> {
this.client.setScreen(new MultiplayerScreen(this)); this.client.setScreen(new MultiplayerScreen(this));
}, },
@ -216,10 +215,10 @@ public class CustomTitleScreen extends Screen {
buttonsY + buttonSpacing * 2 + buttonSectionSpacing, buttonsY + buttonSpacing * 2 + buttonSectionSpacing,
98, 98,
buttonHeight, buttonHeight,
new TranslatableText("menu.gmod-title-screen.modmenu").formatted(modsButtonActive ? Formatting.RESET : Formatting.GRAY), Text.translatable("menu.gmod-title-screen.modmenu").formatted(modsButtonActive ? Formatting.RESET : Formatting.GRAY),
button -> this.client.setScreen(new ModsScreen(this)), button -> this.client.setScreen(new ModsScreen(this)),
textRenderer, textRenderer,
new DisabledTooltipSupplier(new TranslatableText("menu.gmod-title-screen.modmenu.not-installed")) new DisabledTooltipSupplier(Text.translatable("menu.gmod-title-screen.modmenu.not-installed"))
)); ));
modsButton.active = modsButtonActive; modsButton.active = modsButtonActive;
@ -228,7 +227,7 @@ public class CustomTitleScreen extends Screen {
buttonsY + buttonSpacing * 3 + buttonSectionSpacing, buttonsY + buttonSpacing * 3 + buttonSectionSpacing,
98, 98,
buttonHeight, buttonHeight,
new TranslatableText("menu.gmod-title-screen.dupes").formatted(Formatting.GRAY), Text.translatable("menu.gmod-title-screen.dupes").formatted(Formatting.GRAY),
button -> {}, button -> {},
textRenderer textRenderer
)).active = false; )).active = false;
@ -237,7 +236,7 @@ public class CustomTitleScreen extends Screen {
buttonsY + buttonSpacing * 4 + buttonSectionSpacing, buttonsY + buttonSpacing * 4 + buttonSectionSpacing,
98, 98,
buttonHeight, buttonHeight,
new TranslatableText("menu.gmod-title-screen.demos").formatted(Formatting.GRAY), Text.translatable("menu.gmod-title-screen.demos").formatted(Formatting.GRAY),
button -> {}, button -> {},
textRenderer textRenderer
)).active = false; )).active = false;
@ -246,7 +245,7 @@ public class CustomTitleScreen extends Screen {
buttonsY + buttonSpacing * 5 + buttonSectionSpacing, buttonsY + buttonSpacing * 5 + buttonSectionSpacing,
98, 98,
buttonHeight, buttonHeight,
new TranslatableText("menu.gmod-title-screen.saves").formatted(Formatting.GRAY), Text.translatable("menu.gmod-title-screen.saves").formatted(Formatting.GRAY),
button -> {}, button -> {},
textRenderer textRenderer
)).active = false; )).active = false;
@ -256,7 +255,7 @@ public class CustomTitleScreen extends Screen {
buttonsY + buttonSpacing * 6 + buttonSectionSpacing * 2, buttonsY + buttonSpacing * 6 + buttonSectionSpacing * 2,
98, 98,
buttonHeight, buttonHeight,
new TranslatableText("menu.gmod-title-screen.options"), Text.translatable("menu.gmod-title-screen.options"),
button -> this.client.setScreen(new OptionsScreen(this, this.client.options)), button -> this.client.setScreen(new OptionsScreen(this, this.client.options)),
textRenderer textRenderer
)); ));
@ -266,7 +265,7 @@ public class CustomTitleScreen extends Screen {
buttonsY + buttonSpacing * 7 + buttonSectionSpacing * 3, buttonsY + buttonSpacing * 7 + buttonSectionSpacing * 3,
98, 98,
buttonHeight, buttonHeight,
new TranslatableText("menu.gmod-title-screen.quit"), Text.translatable("menu.gmod-title-screen.quit"),
button -> this.client.scheduleStop(), button -> this.client.scheduleStop(),
textRenderer textRenderer
)); ));
@ -284,7 +283,7 @@ public class CustomTitleScreen extends Screen {
256, 256,
256, 256,
button -> this.client.setScreen(new LanguageOptionsScreen(this, this.client.options, this.client.getLanguageManager())), button -> this.client.setScreen(new LanguageOptionsScreen(this, this.client.options, this.client.getLanguageManager())),
new TranslatableText("narrator.button.language") Text.translatable("narrator.button.language")
) )
); );
this.addDrawableChild(new TexturedButtonWidget( this.addDrawableChild(new TexturedButtonWidget(
@ -299,7 +298,7 @@ public class CustomTitleScreen extends Screen {
32, 32,
64, 64,
button -> this.client.setScreen(new AccessibilityOptionsScreen(this, this.client.options)), button -> this.client.setScreen(new AccessibilityOptionsScreen(this, this.client.options)),
new TranslatableText("narrator.button.accessibility") Text.translatable("narrator.button.accessibility")
)); ));
version = this.addDrawableChild( version = this.addDrawableChild(

View File

@ -32,7 +32,7 @@
"depends": { "depends": {
"fabricloader": ">=0.14.6", "fabricloader": ">=0.14.6",
"fabric": "*", "fabric": "*",
"minecraft": "~1.18.2", "minecraft": ["1.19","1.19.1","1.19.2"],
"java": ">=17", "java": ">=17",
"cloth-config": ">=6.0.0" "cloth-config": ">=6.0.0"
}, },