Merge pull request #82 from dima-dencep/1.20.x/dev

4.0.5

build.gradle

@@ -23,7 +23,7 @@ subprojects {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         mappings loom.layered() {
             officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-1.20.4:${rootProject.parchment_version}@zip")
+            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
         }
     }
 
@@ -44,6 +44,14 @@ subprojects {
             }
         }
     }
+
+    processResources {
+        // inputs.property "project", project
+
+        filesMatching(["META-INF/neoforge.mods.toml", "fabric.mod.json"]) {
+            expand "project": project
+        }
+    }
 }
 
 allprojects {
@@ -56,22 +64,6 @@ allprojects {
     group = rootProject.maven_group
 
     repositories {
-        maven {
-            name "Modrinth"
-            url "https://api.modrinth.com/maven"
-
-            content {
-                includeGroup "maven.modrinth"
-            }
-        }
-        maven {
-            name "CurseForge"
-            url "https://cursemaven.com"
-
-            content {
-                includeGroup "curse.maven"
-            }
-        }
         maven { url "https://maven.shedaniel.me" }
         maven { url "https://maven.neoforged.net/releases" }
         maven { url "https://maven.terraformersmc.com/releases" }

common/src/main/java/com/github/dimadencep/mods/rrls/ConfigExpectPlatform.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/ConfigExpectPlatform.java

@@ -8,11 +8,11 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls;
+package org.redlance.dima_dencep.mods.rrls;
 
-import com.github.dimadencep.mods.rrls.config.DoubleLoad;
-import com.github.dimadencep.mods.rrls.config.HideType;
-import com.github.dimadencep.mods.rrls.config.Type;
+import org.redlance.dima_dencep.mods.rrls.config.DoubleLoad;
+import org.redlance.dima_dencep.mods.rrls.config.HideType;
+import org.redlance.dima_dencep.mods.rrls.config.Type;
 import dev.architectury.injectables.annotations.ExpectPlatform;
 
 public class ConfigExpectPlatform {

common/src/main/java/com/github/dimadencep/mods/rrls/Rrls.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/Rrls.java

@@ -8,7 +8,7 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls;
+package org.redlance.dima_dencep.mods.rrls;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

common/src/main/java/com/github/dimadencep/mods/rrls/config/AprilFool.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/config/AprilFool.java

@@ -8,7 +8,7 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.config;
+package org.redlance.dima_dencep.mods.rrls.config;
 
 import java.util.Calendar;
 

common/src/main/java/com/github/dimadencep/mods/rrls/config/DoubleLoad.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/config/DoubleLoad.java

@@ -8,7 +8,7 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.config;
+package org.redlance.dima_dencep.mods.rrls.config;
 
 public enum DoubleLoad {
     FORCE_LOAD,

common/src/main/java/com/github/dimadencep/mods/rrls/config/HideType.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/config/HideType.java

@@ -8,7 +8,7 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.config;
+package org.redlance.dima_dencep.mods.rrls.config;
 
 public enum HideType { // TODO dehardcode
     ALL,

common/src/main/java/com/github/dimadencep/mods/rrls/config/Type.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/config/Type.java

@@ -8,7 +8,7 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.config;
+package org.redlance.dima_dencep.mods.rrls.config;
 
 public enum Type {
     PROGRESS,

common/src/main/java/com/github/dimadencep/mods/rrls/duck/OverlayExtender.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/duck/OverlayExtender.java

@@ -8,9 +8,9 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.duck;
+package org.redlance.dima_dencep.mods.rrls.duck;
 
-import com.github.dimadencep.mods.rrls.utils.OverlayHelper;
+import org.redlance.dima_dencep.mods.rrls.utils.OverlayHelper;
 import net.minecraft.client.gui.GuiGraphics;
 
 @SuppressWarnings("unused")

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/LoadingOverlayMixin.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/LoadingOverlayMixin.java

@@ -8,11 +8,12 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.mixins;
+package org.redlance.dima_dencep.mods.rrls.mixins;
 
-import com.github.dimadencep.mods.rrls.ConfigExpectPlatform;
-import com.github.dimadencep.mods.rrls.utils.DummyGuiGraphics;
-import com.github.dimadencep.mods.rrls.utils.OverlayHelper;
+import org.redlance.dima_dencep.mods.rrls.ConfigExpectPlatform;
+import org.redlance.dima_dencep.mods.rrls.config.Type;
+import org.redlance.dima_dencep.mods.rrls.utils.DummyGuiGraphics;
+import org.redlance.dima_dencep.mods.rrls.utils.OverlayHelper;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -63,14 +64,14 @@ private static int replaceAlpha(int color, int alpha) {
         int j = graphics.guiHeight();
 
         switch (ConfigExpectPlatform.type()) {
-            case PROGRESS -> {
+            case Type.PROGRESS -> {
                 int s = (int) ((double) j * 0.8325);
                 int r = (int) (Math.min(i * 0.75, j) * 0.5);
 
                 this.drawProgressBar(graphics, i / 2 - r, s - 5, i / 2 + r, s + 5, 0.8F);
             }
 
-            case TEXT -> graphics.drawCenteredString(
+            case Type.TEXT -> graphics.drawCenteredString(
                     minecraft.font, ConfigExpectPlatform.reloadText(), i / 2, 70,
                     ConfigExpectPlatform.rgbProgress() ? ThreadLocalRandom.current().nextInt(0, 0xFFFFFF) : -1
             );
@@ -169,4 +170,4 @@ private static int replaceAlpha(int color, int alpha) {
     public boolean isPauseScreen() {
         return super.isPauseScreen();
     }
-}
+}

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/MinecraftClientMixin.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/MinecraftClientMixin.java

@@ -8,12 +8,12 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.mixins;
+package org.redlance.dima_dencep.mods.rrls.mixins;
 
-import com.github.dimadencep.mods.rrls.ConfigExpectPlatform;
-import com.github.dimadencep.mods.rrls.Rrls;
-import com.github.dimadencep.mods.rrls.config.DoubleLoad;
-import com.github.dimadencep.mods.rrls.utils.OverlayHelper;
+import org.redlance.dima_dencep.mods.rrls.config.DoubleLoad;
+import org.redlance.dima_dencep.mods.rrls.ConfigExpectPlatform;
+import org.redlance.dima_dencep.mods.rrls.Rrls;
+import org.redlance.dima_dencep.mods.rrls.utils.OverlayHelper;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/TitleScreenMixin.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/TitleScreenMixin.java

@@ -8,9 +8,9 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.mixins;
+package org.redlance.dima_dencep.mods.rrls.mixins;
 
-import com.github.dimadencep.mods.rrls.ConfigExpectPlatform;
+import org.redlance.dima_dencep.mods.rrls.ConfigExpectPlatform;
 import net.minecraft.client.gui.screens.TitleScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/GameRendererMixin.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/compat/GameRendererMixin.java

@@ -8,12 +8,12 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.mixins.compat;
+package org.redlance.dima_dencep.mods.rrls.mixins.compat;
 
-import com.github.dimadencep.mods.rrls.ConfigExpectPlatform;
-import com.github.dimadencep.mods.rrls.Rrls;
-import com.github.dimadencep.mods.rrls.utils.DummyGuiGraphics;
-import com.github.dimadencep.mods.rrls.utils.OverlayHelper;
+import org.redlance.dima_dencep.mods.rrls.ConfigExpectPlatform;
+import org.redlance.dima_dencep.mods.rrls.Rrls;
+import org.redlance.dima_dencep.mods.rrls.utils.DummyGuiGraphics;
+import org.redlance.dima_dencep.mods.rrls.utils.OverlayHelper;
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/OverlayMixin.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/compat/OverlayMixin.java

@@ -8,10 +8,10 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.mixins.compat;
+package org.redlance.dima_dencep.mods.rrls.mixins.compat;
 
-import com.github.dimadencep.mods.rrls.duck.OverlayExtender;
-import com.github.dimadencep.mods.rrls.utils.OverlayHelper;
+import org.redlance.dima_dencep.mods.rrls.duck.OverlayExtender;
+import org.redlance.dima_dencep.mods.rrls.utils.OverlayHelper;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import net.minecraft.client.gui.screens.Overlay;
 import org.spongepowered.asm.mixin.Mixin;

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/RendererKeyboardMouseMixin.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/compat/RendererKeyboardMouseMixin.java

@@ -8,9 +8,9 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.mixins.compat;
+package org.redlance.dima_dencep.mods.rrls.mixins.compat;
 
-import com.github.dimadencep.mods.rrls.utils.OverlayHelper;
+import org.redlance.dima_dencep.mods.rrls.utils.OverlayHelper;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.KeyboardHandler;

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/ServerPackManagerMixin.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/compat/ServerPackManagerMixin.java

@@ -8,9 +8,9 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.mixins.compat;
+package org.redlance.dima_dencep.mods.rrls.mixins.compat;
 
-import com.github.dimadencep.mods.rrls.ConfigExpectPlatform;
+import org.redlance.dima_dencep.mods.rrls.ConfigExpectPlatform;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/workaround/GuiGraphicsMixin.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/workaround/GuiGraphicsMixin.java

@@ -8,7 +8,7 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.mixins.workaround;
+package org.redlance.dima_dencep.mods.rrls.mixins.workaround;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

common/src/main/java/com/github/dimadencep/mods/rrls/mixins/workaround/VertexBufferMixin.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/workaround/VertexBufferMixin.java

@@ -8,7 +8,7 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.mixins.workaround;
+package org.redlance.dima_dencep.mods.rrls.mixins.workaround;
 
 import net.minecraft.client.renderer.ShaderInstance;
 import com.mojang.blaze3d.vertex.VertexBuffer;

common/src/main/java/com/github/dimadencep/mods/rrls/utils/DummyGuiGraphics.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/utils/DummyGuiGraphics.java

@@ -8,7 +8,7 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.utils;
+package org.redlance.dima_dencep.mods.rrls.utils;
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import java.util.List;

common/src/main/java/com/github/dimadencep/mods/rrls/utils/OverlayHelper.java → common/src/main/java/org/redlance/dima_dencep/mods/rrls/utils/OverlayHelper.java

@@ -8,9 +8,9 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.utils;
+package org.redlance.dima_dencep.mods.rrls.utils;
 
-import com.github.dimadencep.mods.rrls.ConfigExpectPlatform;
+import org.redlance.dima_dencep.mods.rrls.ConfigExpectPlatform;
 import net.minecraft.client.gui.screens.GenericMessageScreen;
 import net.minecraft.client.gui.screens.Overlay;
 import net.minecraft.client.gui.screens.Screen;

common/src/main/resources/architectury.common.json

@@ -1,7 +1,7 @@
 {
   "injected_interfaces": {
     "net/minecraft/class_4071": [
-      "com/github/dimadencep/mods/rrls/duck/OverlayExtender"
+      "org/redlance/dima_dencep/mods/rrls/duck/OverlayExtender"
     ]
   },
   "accessWidener": "rrls.accesswidener"

common/src/main/resources/assets/rrls/lang/es_mx.json

@@ -0,0 +1,31 @@
+{
+  "text.autoconfig.rrls.title": "Remove Reloading Screen",
+  "text.autoconfig.rrls.category.global": "Global",
+  "text.autoconfig.rrls.category.splash": "Superposición de pantalla de inicio",
+  "text.autoconfig.rrls.category.other": "Otro",
+  "text.autoconfig.rrls.category.platform": "Específico de la plataforma",
+  "text.autoconfig.rrls.option.hideType": "Superposiciones que se ocultarán",
+  "text.autoconfig.rrls.option.rgbProgress": "Colorido",
+  "text.autoconfig.rrls.option.rgbProgress.@Tooltip": "§cPUEDE CAUSAR EPILEPSIA",
+  "text.autoconfig.rrls.option.ignoreScreen": "Ignorar pantalla no inicializada al cargar",
+  "text.autoconfig.rrls.option.ignoreScreen.@Tooltip": "PUEDE CAUSAR PROBLEMAS",
+  "text.autoconfig.rrls.option.miniRender": "Mostrar una versión mini (oculta) de la superposición",
+  "text.autoconfig.rrls.option.type": "Lo que se mostrará al recargar",
+  "text.autoconfig.rrls.option.reloadText": "El texto que se mostrará si se selecciona TEXTO arriba",
+  "text.autoconfig.rrls.option.resetResources": "Restablecer recursos cuando la carga falla",
+  "text.autoconfig.rrls.option.reInitScreen": "Reinicializar la pantalla actual después de una recarga",
+  "text.autoconfig.rrls.option.reInitScreen.@Tooltip": "Desactivar esta función puede eliminar el bloqueo después de que se complete la recarga",
+  "text.autoconfig.rrls.option.removeOverlayAtEnd": "Ocultar la superposición al final",
+  "text.autoconfig.rrls.option.removeOverlayAtEnd.@Tooltip": "¿Carga infinita?",
+  "text.autoconfig.rrls.option.earlyPackStatusSend": "Envío temprano del estado del paquete de recursos del servidor",
+  "text.autoconfig.rrls.option.earlyPackStatusSend.@Tooltip[0]": "Algunos servidores esperan específicamente a que el jugador cargue los recursos, debido a esto, el juego puede mostrarse incorrectamente",
+  "text.autoconfig.rrls.option.earlyPackStatusSend.@Tooltip[1]": "Ejemplo: Estabas bajo tierra mientras se recargaban los recursos",
+  "text.autoconfig.rrls.option.animationSpeed": "Velocidad de animación de la pantalla de inicio",
+  "text.autoconfig.rrls.option.animationSpeed.@Tooltip": "En milisegundos",
+  "text.autoconfig.rrls.option.doubleLoad": "Volver a cargar los recursos si ocurre un error",
+  "text.autoconfig.rrls.option.forceClose": "Ocultar la superposición, incluso si no hay nada detrás de ella",
+  "text.autoconfig.rrls.option.forceClose.@Tooltip": "En realidad, ahora sí hay, he estado planeando una solución alternativa durante mucho tiempo, pero ahora hay una en Minecraft :)",
+  "text.autoconfig.rrls.option.blockOverlay": "Bloqueo completo del uso de superposiciones",
+  "text.autoconfig.rrls.option.blockOverlay.@Tooltip": "¡Úsalo bajo tu propio riesgo!",
+  "text.autoconfig.rrls.option.skipForgeOverlay": "Reemplaza la superposición de carga de (Neo)Forge con la de vainilla"
+}

common/src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "RemoveReloadingScreen Resources",
-    "pack_format": 15
+    "pack_format": 32
   }
 }

common/src/main/resources/rrls-common.mixins.json

@@ -1,8 +1,8 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "com.github.dimadencep.mods.rrls.mixins",
-  "compatibilityLevel": "JAVA_17",
+  "package": "org.redlance.dima_dencep.mods.rrls.mixins",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "MinecraftClientMixin",
     "LoadingOverlayMixin",
@@ -17,4 +17,4 @@
   "injectors": {
     "defaultRequire": 1
   }
-}
+}

fabric/build.gradle

@@ -33,14 +33,6 @@ dependencies {
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 }
 
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
-}
-
 shadowJar {
     configurations = [project.configurations.shadowCommon]
     archiveClassifier.set "dev-shadow"

fabric/src/main/java/com/github/dimadencep/mods/rrls/fabric/ConfigExpectPlatformImpl.java → fabric/src/main/java/org/redlance/dima_dencep/mods/rrls/fabric/ConfigExpectPlatformImpl.java

@@ -8,12 +8,12 @@
  *     https://spdx.org/licenses/OSL-3.0.txt
  */
 
-package com.github.dimadencep.mods.rrls.fabric;
+package org.redlance.dima_dencep.mods.rrls.fabric;
 
-import com.github.dimadencep.mods.rrls.Rrls;
-import com.github.dimadencep.mods.rrls.config.DoubleLoad;
-import com.github.dimadencep.mods.rrls.config.HideType;
-import com.github.dimadencep.mods.rrls.config.Type;
+import org.redlance.dima_dencep.mods.rrls.Rrls;
+import org.redlance.dima_dencep.mods.rrls.config.DoubleLoad;
+import org.redlance.dima_dencep.mods.rrls.config.HideType;
+import org.redlance.dima_dencep.mods.rrls.config.Type;
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry;