4.0.0

Author: KrLite

build.gradle

@@ -18,7 +18,6 @@ dependencies {
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
 	implementation include("com.github.KrLite:Pierced:${project.pierced_version}")
-	implementation include("com.github.KrLite:Equator-Utils:${project.equator_utils_version}")
 }
 
 processResources {

gradle.properties

@@ -13,4 +13,3 @@ archives_base_name = splasher
 # Dependencies
 fabric_version = 0.76.0+1.19.4
 pierced_version = v1.2
-equator_utils_version = v1.0.5

src/main/java/net/krlite/splasher/Splasher.java

@@ -4,12 +4,9 @@
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
 import net.fabricmc.loader.api.FabricLoader;
-import net.krlite.equator.util.Pusher;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.sound.PositionedSoundInstance;
-import net.minecraft.client.sound.SoundInstance;
-import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
@@ -19,12 +16,13 @@
 
 import java.util.ArrayList;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class Splasher implements ModInitializer {
 	public static final String MOD_ID = "splasher";
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 	public static final SplasherConfig CONFIG = new SplasherConfig(FabricLoader.getInstance().getConfigDir().resolve(MOD_ID + ".toml").toFile());
-	public static final Pusher PUSHER = new Pusher(CONFIG.randomRate == SplasherConfig.RandomRate.JEB);
+	private static final AtomicBoolean shouldSplash = new AtomicBoolean(CONFIG.randomRate == SplasherConfig.RandomRate.JEB);
 
 	public record Node(double x, double y) {
 		public double getCross(Node p1, Node p2) {
@@ -57,6 +55,14 @@ public Rect rotate(Node origin, double clockwiseDegree) {
 		}
 	}
 
+	public static void push() {
+		shouldSplash.set(true);
+	}
+
+	public static boolean shouldSplash() {
+		return shouldSplash.getAndSet(false);
+	}
+
 	// Splash text data
 	private static final ArrayList<Formatting> FORMATTINGS = new ArrayList<>();
 	private static int color = 0xFFFF00;
@@ -71,8 +77,9 @@ public void onInitialize() {
 			if (screen instanceof TitleScreen) {
 				ScreenMouseEvents.beforeMouseClick(screen)
 						.register((currentScreen, mouseX, mouseY, button) -> {
-							if (isMouseOverSplashText(new Node(scaledWidth / 2.0 + 90, 70 - 6), new Node(mouseX, mouseY)) && CONFIG.randomRate.onClick()) {
-								PUSHER.push(Splasher::playClickingSound);
+							if (isMouseOverSplashText(new Node(scaledWidth / 2.0 + (CONFIG.lefty ? -90 : 90), 70 - 6), new Node(mouseX, mouseY)) && CONFIG.randomRate.onClick()) {
+								push();
+								playClickingSound();
 							}
 						});
 			}
@@ -88,7 +95,7 @@ public static boolean isMouseOverSplashText(Node origin, Node mouse) {
 		return new Rect(
 				origin.append(new Node(-width / 2, -height / 2)),
 				origin.append(new Node(width / 2, height / 2))
-		).rotate(origin, -20).contains(mouse);
+		).rotate(origin, CONFIG.lefty ? 20 : -20).contains(mouse);
 	}
 
 	public static void updateSize(float width, float height) {

src/main/java/net/krlite/splasher/SplasherConfig.java

@@ -27,7 +27,10 @@ public SplasherConfig(File file) {
 	public boolean colorful = false;
 
 	@Table("splash")
+	@Comment("Moves splash texts to the left")
+	public boolean lefty = false;
 
+	@Table("splash")
 	@Comment("Controls the splash text random rate")
 	@Comment
 	@Comment("Never  - Never reload splash texts")

src/main/java/net/krlite/splasher/mixin/ResourceReloader.java

@@ -13,6 +13,6 @@
 public class ResourceReloader {
     @Inject(method = "reloadResources()Ljava/util/concurrent/CompletableFuture;", at = @At("TAIL"))
     public void reload(CallbackInfoReturnable<CompletableFuture<Void>> cir) {
-        Splasher.PUSHER.push();
+        Splasher.push();
     }
 }

src/main/java/net/krlite/splasher/mixin/SplashTextColorer.java

@@ -1,7 +1,6 @@
 package net.krlite.splasher.mixin;
 
 import net.krlite.splasher.Splasher;
-import net.krlite.splasher.SplasherConfig;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.screen.TitleScreen;

src/main/java/net/krlite/splasher/mixin/SplashTextResourceSupplierReplacer.java

@@ -6,7 +6,6 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.resource.SplashTextResourceSupplier;
 import net.minecraft.client.util.Session;
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
@@ -16,7 +15,6 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.List;
-import java.util.Objects;
 
 import static net.krlite.splasher.Splasher.CONFIG;
 

src/main/java/net/krlite/splasher/mixin/TitleScreenWidget.java

@@ -20,7 +20,7 @@ class MinecraftClientTrigger {
     @Inject(method = "setScreen", at = @At("TAIL"))
     private void trigger(Screen screen, CallbackInfo ci) {
         if (screen instanceof TitleScreen) {
-            if ((Splasher.CONFIG.randomRate.onReload() && Splasher.initialized)) Splasher.PUSHER.push();
+            if ((Splasher.CONFIG.randomRate.onReload() && Splasher.initialized)) Splasher.push();
             else if (!Splasher.initialized) Splasher.initialized = true;
         }
     }
@@ -36,7 +36,18 @@ protected TitleScreenWidget(Text title) {
 
     @Inject(method = "render", at = @At("HEAD"))
     private void render(MatrixStack matrixStack, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        Splasher.PUSHER.pull(() -> splashText = MinecraftClient.getInstance().getSplashTextLoader().get());
+        if (Splasher.shouldSplash())
+            splashText = MinecraftClient.getInstance().getSplashTextLoader().get();
+    }
+
+    @ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;translate(FFF)V"), index = 0)
+    private float translateX(float x) {
+        return Splasher.CONFIG.lefty ? MinecraftClient.getInstance().getWindow().getScaledWidth() - x : x;
+    }
+
+    @ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/RotationAxis;rotationDegrees(F)Lorg/joml/Quaternionf;"))
+    private float rotate(float angle) {
+        return Splasher.CONFIG.lefty ? -angle : angle;
     }
 
     @ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;scale(FFF)V"), index = 0)