diff --git a/gradle.properties b/gradle.properties index b20611b..d4e93a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,10 +8,10 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.10.8 # Mod Properties - mod_version = 1.1.0 - maven_group = net.autoreconnect - archives_base_name = autoreconnect + mod_version = 1.0 + maven_group = de.mrgeorgen.wolfSignal + archives_base_name = wolfSignal # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.29.2+1.16 \ No newline at end of file + fabric_version=0.29.2+1.16 diff --git a/src/main/java/net/autoreconnect/ClientCommands.java b/src/main/java/de/mrgeorgen/wolfSignal/ClientCommands.java similarity index 95% rename from src/main/java/net/autoreconnect/ClientCommands.java rename to src/main/java/de/mrgeorgen/wolfSignal/ClientCommands.java index c34cab5..f4c1a3b 100644 --- a/src/main/java/net/autoreconnect/ClientCommands.java +++ b/src/main/java/de/mrgeorgen/wolfSignal/ClientCommands.java @@ -1,4 +1,4 @@ -package net.autoreconnect; +package de.mrgeorgen.wolfSignal; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.ArgumentType; @@ -8,7 +8,7 @@ import net.minecraft.client.network.ClientCommandSource; import java.util.*; -import static net.autoreconnect.AutoReconnect.MOD_ID; +import static de.mrgeorgen.wolfSignal.Main.MOD_ID; public final class ClientCommands { @@ -44,4 +44,4 @@ public final class ClientCommands { commands.stream().map(literal(MOD_ID)::then).forEach(dispatcher::register); } -} \ No newline at end of file +} diff --git a/src/main/java/net/autoreconnect/AutoReconnect.java b/src/main/java/de/mrgeorgen/wolfSignal/Main.java similarity index 89% rename from src/main/java/net/autoreconnect/AutoReconnect.java rename to src/main/java/de/mrgeorgen/wolfSignal/Main.java index f3bd1ca..b4b3820 100644 --- a/src/main/java/net/autoreconnect/AutoReconnect.java +++ b/src/main/java/de/mrgeorgen/wolfSignal/Main.java @@ -1,4 +1,4 @@ -package net.autoreconnect; +package de.mrgeorgen.wolfSignal; import com.google.gson.Gson; import com.google.gson.JsonParseException; @@ -19,14 +19,14 @@ import java.util.Optional; import java.util.stream.IntStream; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; -import static net.autoreconnect.ClientCommands.*; -import static net.autoreconnect.Util.*; +import static de.mrgeorgen.wolfSignal.ClientCommands.*; +import static de.mrgeorgen.wolfSignal.Util.*; import static net.minecraft.command.arguments.NbtTagArgumentType.nbtTag; import static net.minecraft.util.Formatting.*; -public class AutoReconnect implements ModInitializer +public class Main implements ModInitializer { - public static final String MOD_ID = "autoreconnect"; + public static final String MOD_ID = "wolfsignal"; public static int[] delayList = { 3, 10, 30, 60 }; public static int ticks = -1; public static int attempt = -1; @@ -36,8 +36,8 @@ public class AutoReconnect implements ModInitializer @Override public void onInitialize() { - ClientCommands.register(literal("reload").executes(AutoReconnect::cmdReload)); - ClientCommands.register(literal("config").then(argument("delayList", nbtTag()).executes(AutoReconnect::cmdConfig))); + ClientCommands.register(literal("reload").executes(Main::cmdReload)); + ClientCommands.register(literal("config").then(argument("delayList", nbtTag()).executes(Main::cmdConfig))); loadConfig(); } @@ -104,7 +104,7 @@ public class AutoReconnect implements ModInitializer // if null or empty or contains negatives or zeros if (delayList == null || delayList.length == 0 || IntStream.of(delayList).anyMatch(i -> i <= 0)) throw new IllegalArgumentException("delayList must be a non-empty list of strictly positive integers"); - AutoReconnect.delayList = delayList; + Main.delayList = delayList; } public static void resetAttempts() @@ -123,4 +123,4 @@ public class AutoReconnect implements ModInitializer { return Optional.of(attempt < 0 ? RED : GREEN).filter(Formatting::isColor).map(Formatting::getColorValue).orElse(0xFFFFFF); } -} \ No newline at end of file +} diff --git a/src/main/java/net/autoreconnect/Util.java b/src/main/java/de/mrgeorgen/wolfSignal/Util.java similarity index 97% rename from src/main/java/net/autoreconnect/Util.java rename to src/main/java/de/mrgeorgen/wolfSignal/Util.java index 76059df..3fa2287 100644 --- a/src/main/java/net/autoreconnect/Util.java +++ b/src/main/java/de/mrgeorgen/wolfSignal/Util.java @@ -1,4 +1,4 @@ -package net.autoreconnect; +package de.mrgeorgen.wolfSignal; import net.minecraft.SharedConstants; import net.minecraft.client.MinecraftClient; @@ -52,4 +52,4 @@ public class Util { return colored(ex.getClass().getSimpleName() + ": " + ex.getLocalizedMessage(), RED); } -} \ No newline at end of file +} diff --git a/src/main/java/net/autoreconnect/mixin/MixinClientPlayNetworkHandler.java b/src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinClientPlayNetworkHandler.java similarity index 94% rename from src/main/java/net/autoreconnect/mixin/MixinClientPlayNetworkHandler.java rename to src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinClientPlayNetworkHandler.java index 52ee1ad..e9c43a5 100644 --- a/src/main/java/net/autoreconnect/mixin/MixinClientPlayNetworkHandler.java +++ b/src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinClientPlayNetworkHandler.java @@ -1,8 +1,8 @@ -package net.autoreconnect.mixin; +package de.mrgeorgen.wolfSignal.mixin; import com.mojang.authlib.GameProfile; import com.mojang.brigadier.CommandDispatcher; -import net.autoreconnect.ClientCommands; +import de.mrgeorgen.wolfSignal.ClientCommands; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.network.ClientCommandSource; @@ -37,4 +37,4 @@ public class MixinClientPlayNetworkHandler // register commands to the new dispatcher ClientCommands.register((CommandDispatcher) (Object) commandDispatcher); } -} \ No newline at end of file +} diff --git a/src/main/java/net/autoreconnect/mixin/MixinClientPlayerEntity.java b/src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinClientPlayerEntity.java similarity index 87% rename from src/main/java/net/autoreconnect/mixin/MixinClientPlayerEntity.java rename to src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinClientPlayerEntity.java index 1432c4c..63b2212 100644 --- a/src/main/java/net/autoreconnect/mixin/MixinClientPlayerEntity.java +++ b/src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinClientPlayerEntity.java @@ -1,6 +1,6 @@ -package net.autoreconnect.mixin; +package de.mrgeorgen.wolfSignal.mixin; -import net.autoreconnect.ClientCommands; +import de.mrgeorgen.wolfSignal.ClientCommands; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientCommandSource; import net.minecraft.client.network.ClientPlayNetworkHandler; @@ -12,8 +12,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static net.autoreconnect.Util.err; -import static net.autoreconnect.Util.send; +import static de.mrgeorgen.wolfSignal.Util.err; +import static de.mrgeorgen.wolfSignal.Util.send; @Mixin(ClientPlayerEntity.class) public abstract class MixinClientPlayerEntity @@ -46,4 +46,4 @@ public abstract class MixinClientPlayerEntity } } } -} \ No newline at end of file +} diff --git a/src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java b/src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinDisconnectedScreen.java similarity index 94% rename from src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java rename to src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinDisconnectedScreen.java index d523122..133ccd9 100644 --- a/src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java +++ b/src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinDisconnectedScreen.java @@ -1,4 +1,4 @@ -package net.autoreconnect.mixin; +package de.mrgeorgen.wolfSignal.mixin; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import static net.autoreconnect.AutoReconnect.*; +import static de.mrgeorgen.wolfSignal.Main.*; @Mixin(DisconnectedScreen.class) public class MixinDisconnectedScreen @@ -39,4 +39,4 @@ public class MixinDisconnectedScreen (window.getScaledHeight() - reasonHeight) / 2F - 9 * 4, // 9 * 2 higher than the title which is 9 * 2 higher than the disconnect reason getColor()); } -} \ No newline at end of file +} diff --git a/src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java b/src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinMinecraftClient.java similarity index 95% rename from src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java rename to src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinMinecraftClient.java index 376b70a..f813836 100644 --- a/src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java +++ b/src/main/java/de/mrgeorgen/wolfSignal/mixin/MixinMinecraftClient.java @@ -1,4 +1,4 @@ -package net.autoreconnect.mixin; +package de.mrgeorgen.wolfSignal.mixin; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.*; @@ -10,8 +10,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static net.autoreconnect.AutoReconnect.*; -import static net.autoreconnect.Util.log; +import static de.mrgeorgen.wolfSignal.Main.*; +import static de.mrgeorgen.wolfSignal.Util.log; @Mixin(MinecraftClient.class) public class MixinMinecraftClient @@ -77,4 +77,4 @@ public class MixinMinecraftClient } } } -} \ No newline at end of file +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 54d14dd..046acbc 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,17 +1,16 @@ { "schemaVersion": 1, - "id": "autoreconnect", - "version": "1.1.0", + "id": "wolfsignal", + "version": "1.0", - "name": "AutoReconnect", - "description": "This mod will automatically try to reconnect you back to a server if you got disconnected.\nBy default, it will make 4 attempts after 3, 10, 30 and 60 seconds.", + "name": "Wolf Signal", + "description": "send redstone signals thrpugh wolfs", "authors": [ - "Bstn1802" + "MrGeorgen" ], "contact": { - "homepage": "https://www.curseforge.com/minecraft/mc-mods/autoreconnect", - "sources": "https://github.com/Bstn1802/AutoReconnect", - "issues": "https://github.com/Bstn1802/AutoReconnect/issues" + "homepage": "https://git.redstoneunion.de/MrGeorgen/wolf-signal", + "sources": "https://git.redstoneunion.de/MrGeorgen/wolf-signal" }, "license": "CC0-1.0", @@ -20,11 +19,11 @@ "environment": "client", "entrypoints": { "main": [ - "net.autoreconnect.AutoReconnect" + "de.mrgeorgen.wolfSignal.Main" ] }, "mixins": [ - "autoreconnect.mixins.json" + "wolfsignal.mixins.json" ], "depends": { diff --git a/src/main/resources/autoreconnect.mixins.json b/src/main/resources/wolfsignal.mixins.json similarity index 86% rename from src/main/resources/autoreconnect.mixins.json rename to src/main/resources/wolfsignal.mixins.json index 15f1cab..7eac7c8 100644 --- a/src/main/resources/autoreconnect.mixins.json +++ b/src/main/resources/wolfsignal.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "net.autoreconnect.mixin", + "package": "de.mrgeorgen.wolfSignal.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ ],