saturnclientmc/saturnclient
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge pull request 'Mojang session auth and version check; release 0.1.0-beta3' (#11) from mojang-session-auth into master

Browse Source 
Reviewed-on: #11
This commit was merged in pull request #11.
This commit is contained in:
selimaj-dev
2026-09-25 13:29:55 +00:00
parent 632591f8d8 39f140dae1
commit a97e5703c9
10 changed files with 178 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common
+1 -1
Submodule common updated: 510760d590...98da42992e
gradle.properties
+1 -1
View File
@@ -4,4 +4,4 @@ org.gradle.parallel=true
# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349
org.gradle.configuration-cache=false
mod_version=0.1.0-beta2
mod_version=0.1.0-beta3
versions/1.21.10/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java
+22
View File
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
import java.awt.image.BufferedImage;
import java.util.UUID;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.toast.SystemToast;
import net.minecraft.text.Text;
import org.saturnclient.common.provider.SaturnProvider;
import org.saturnclient.common.ref.asset.IdentifierRef;
import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
SaturnClient.LOGGER.error(message, throwable);
}
/** Shown longer than the vanilla default, since these ask the player to act. */
private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
@Override
public String getModVersion() {
return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
.map(mod -> mod.getMetadata().getVersion().getFriendlyString())
.orElse("unknown");
}
@Override
public void showWarning(String title, String message) {
MinecraftClient client = MinecraftClient.getInstance();
client.execute(() -> client.getToastManager().add(
SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
}
@Override
public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
IdentifierUtils.registerBufferedImageTextureFast(i, bi);
versions/1.21.11/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java
+22
View File
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
import java.awt.image.BufferedImage;
import java.util.UUID;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.toast.SystemToast;
import net.minecraft.text.Text;
import org.saturnclient.common.provider.SaturnProvider;
import org.saturnclient.common.ref.asset.IdentifierRef;
import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
SaturnClient.LOGGER.error(message, throwable);
}
/** Shown longer than the vanilla default, since these ask the player to act. */
private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
@Override
public String getModVersion() {
return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
.map(mod -> mod.getMetadata().getVersion().getFriendlyString())
.orElse("unknown");
}
@Override
public void showWarning(String title, String message) {
MinecraftClient client = MinecraftClient.getInstance();
client.execute(() -> client.getToastManager().add(
SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
}
@Override
public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
IdentifierUtils.registerBufferedImageTextureFast(i, bi);
versions/1.21.4/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java
+22
View File
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
import java.awt.image.BufferedImage;
import java.util.UUID;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.toast.SystemToast;
import net.minecraft.text.Text;
import org.saturnclient.common.provider.SaturnProvider;
import org.saturnclient.common.ref.asset.IdentifierRef;
import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -65,6 +70,23 @@ public class SaturnProviderImpl implements SaturnProvider {
SaturnClient.LOGGER.error(message, throwable);
}
/** Shown longer than the vanilla default, since these ask the player to act. */
private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
@Override
public String getModVersion() {
return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
.map(mod -> mod.getMetadata().getVersion().getFriendlyString())
.orElse("unknown");
}
@Override
public void showWarning(String title, String message) {
MinecraftClient client = MinecraftClient.getInstance();
client.execute(() -> client.getToastManager().add(
SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
}
@Override
public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
IdentifierUtils.registerBufferedImageTextureFast(i, bi);
versions/1.21.5/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java
+22
View File
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
import java.awt.image.BufferedImage;
import java.util.UUID;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.toast.SystemToast;
import net.minecraft.text.Text;
import org.saturnclient.common.provider.SaturnProvider;
import org.saturnclient.common.ref.asset.IdentifierRef;
import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -65,6 +70,23 @@ public class SaturnProviderImpl implements SaturnProvider {
SaturnClient.LOGGER.error(message, throwable);
}
/** Shown longer than the vanilla default, since these ask the player to act. */
private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
@Override
public String getModVersion() {
return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
.map(mod -> mod.getMetadata().getVersion().getFriendlyString())
.orElse("unknown");
}
@Override
public void showWarning(String title, String message) {
MinecraftClient client = MinecraftClient.getInstance();
client.execute(() -> client.getToastManager().add(
SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
}
@Override
public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
IdentifierUtils.registerBufferedImageTextureFast(i, bi);
versions/1.21.6/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java
+22
View File
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
import java.awt.image.BufferedImage;
import java.util.UUID;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.toast.SystemToast;
import net.minecraft.text.Text;
import org.saturnclient.common.provider.SaturnProvider;
import org.saturnclient.common.ref.asset.IdentifierRef;
import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
SaturnClient.LOGGER.error(message, throwable);
}
/** Shown longer than the vanilla default, since these ask the player to act. */
private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
@Override
public String getModVersion() {
return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
.map(mod -> mod.getMetadata().getVersion().getFriendlyString())
.orElse("unknown");
}
@Override
public void showWarning(String title, String message) {
MinecraftClient client = MinecraftClient.getInstance();
client.execute(() -> client.getToastManager().add(
SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
}
@Override
public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
IdentifierUtils.registerBufferedImageTextureFast(i, bi);
versions/1.21.7/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java
+22
View File
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
import java.awt.image.BufferedImage;
import java.util.UUID;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.toast.SystemToast;
import net.minecraft.text.Text;
import org.saturnclient.common.provider.SaturnProvider;
import org.saturnclient.common.ref.asset.IdentifierRef;
import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
SaturnClient.LOGGER.error(message, throwable);
}
/** Shown longer than the vanilla default, since these ask the player to act. */
private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
@Override
public String getModVersion() {
return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
.map(mod -> mod.getMetadata().getVersion().getFriendlyString())
.orElse("unknown");
}
@Override
public void showWarning(String title, String message) {
MinecraftClient client = MinecraftClient.getInstance();
client.execute(() -> client.getToastManager().add(
SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
}
@Override
public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
IdentifierUtils.registerBufferedImageTextureFast(i, bi);
versions/1.21.8/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java
+22
View File
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
import java.awt.image.BufferedImage;
import java.util.UUID;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.toast.SystemToast;
import net.minecraft.text.Text;
import org.saturnclient.common.provider.SaturnProvider;
import org.saturnclient.common.ref.asset.IdentifierRef;
import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
SaturnClient.LOGGER.error(message, throwable);
}
/** Shown longer than the vanilla default, since these ask the player to act. */
private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
@Override
public String getModVersion() {
return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
.map(mod -> mod.getMetadata().getVersion().getFriendlyString())
.orElse("unknown");
}
@Override
public void showWarning(String title, String message) {
MinecraftClient client = MinecraftClient.getInstance();
client.execute(() -> client.getToastManager().add(
SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
}
@Override
public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
IdentifierUtils.registerBufferedImageTextureFast(i, bi);
versions/1.21.9/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java
+22
View File
@@ -3,6 +3,11 @@ package org.saturnclient.impl.provider;
import java.awt.image.BufferedImage;
import java.util.UUID;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.toast.SystemToast;
import net.minecraft.text.Text;
import org.saturnclient.common.provider.SaturnProvider;
import org.saturnclient.common.ref.asset.IdentifierRef;
import org.saturnclient.common.ref.game.MinecraftClientRef;
@@ -59,6 +64,23 @@ public class SaturnProviderImpl implements SaturnProvider {
SaturnClient.LOGGER.error(message, throwable);
}
/** Shown longer than the vanilla default, since these ask the player to act. */
private static final SystemToast.Type WARNING_TOAST = new SystemToast.Type(15_000L);
@Override
public String getModVersion() {
return FabricLoader.getInstance().getModContainer(SaturnClient.MOD_ID)
.map(mod -> mod.getMetadata().getVersion().getFriendlyString())
.orElse("unknown");
}
@Override
public void showWarning(String title, String message) {
MinecraftClient client = MinecraftClient.getInstance();
client.execute(() -> client.getToastManager().add(
SystemToast.create(client, WARNING_TOAST, Text.literal(title), Text.literal(message))));
}
@Override
public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) {
IdentifierUtils.registerBufferedImageTextureFast(i, bi);