diff --git a/gradle.properties b/gradle.properties index c899e82..ae19c0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.11.3 # Mod Properties mod_version = 1.6.0 -maven_group = me.lambdaurora.lambdacontrols +maven_group = dev.lambdaurora.lambdacontrols archives_base_name = lambdacontrols # Dependencies diff --git a/src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java b/src/main/java/dev/lambdaurora/lambdacontrols/ControlsMode.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java rename to src/main/java/dev/lambdaurora/lambdacontrols/ControlsMode.java index f81b89a..1ab42fc 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/ControlsMode.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols; +package dev.lambdaurora.lambdacontrols; import org.aperlambda.lambdacommon.utils.Nameable; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/LambdaControls.java b/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControls.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/LambdaControls.java rename to src/main/java/dev/lambdaurora/lambdacontrols/LambdaControls.java index f20c45f..cca2617 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/LambdaControls.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControls.java @@ -7,10 +7,10 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols; +package dev.lambdaurora.lambdacontrols; +import dev.lambdaurora.lambdacontrols.event.PlayerChangeControlsModeCallback; import io.netty.buffer.Unpooled; -import me.lambdaurora.lambdacontrols.event.PlayerChangeControlsModeCallback; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; import net.fabricmc.loader.api.FabricLoader; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConstants.java b/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsConstants.java similarity index 95% rename from src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConstants.java rename to src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsConstants.java index 78eed35..e0807a9 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConstants.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsConstants.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols; +package dev.lambdaurora.lambdacontrols; import org.aperlambda.lambdacommon.Identifier; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsFeature.java b/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsFeature.java similarity index 99% rename from src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsFeature.java rename to src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsFeature.java index 7a04fb2..cb51cde 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsFeature.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsFeature.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols; +package dev.lambdaurora.lambdacontrols; import org.aperlambda.lambdacommon.utils.Nameable; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/ButtonState.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/ButtonState.java similarity index 95% rename from src/main/java/me/lambdaurora/lambdacontrols/client/ButtonState.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/ButtonState.java index 3f3daeb..8fbf804 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/ButtonState.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ButtonState.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client; +package dev.lambdaurora.lambdacontrols.client; /** * Represents a button state. diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/ControllerType.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/ControllerType.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/client/ControllerType.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/ControllerType.java index 3de6295..9087a7a 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/ControllerType.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ControllerType.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client; +package dev.lambdaurora.lambdacontrols.client; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/HudSide.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/HudSide.java similarity index 95% rename from src/main/java/me/lambdaurora/lambdacontrols/client/HudSide.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/HudSide.java index e179e44..376072d 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/HudSide.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/HudSide.java @@ -7,9 +7,8 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client; +package dev.lambdaurora.lambdacontrols.client; -import net.minecraft.client.resource.language.I18n; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import org.aperlambda.lambdacommon.utils.Nameable; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsClient.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsClient.java similarity index 88% rename from src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsClient.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsClient.java index 3f5a360..b16eaea 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsClient.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsClient.java @@ -7,20 +7,20 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client; +package dev.lambdaurora.lambdacontrols.client; -import me.lambdaurora.lambdacontrols.ControlsMode; -import me.lambdaurora.lambdacontrols.LambdaControls; -import me.lambdaurora.lambdacontrols.LambdaControlsConstants; -import me.lambdaurora.lambdacontrols.LambdaControlsFeature; -import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat; -import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; -import me.lambdaurora.lambdacontrols.client.controller.Controller; -import me.lambdaurora.lambdacontrols.client.controller.InputManager; -import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsHud; -import me.lambdaurora.lambdacontrols.client.gui.TouchscreenOverlay; -import me.lambdaurora.lambdacontrols.client.ring.KeyBindingRingAction; -import me.lambdaurora.lambdacontrols.client.ring.LambdaRing; +import dev.lambdaurora.lambdacontrols.ControlsMode; +import dev.lambdaurora.lambdacontrols.LambdaControlsConstants; +import dev.lambdaurora.lambdacontrols.LambdaControlsFeature; +import dev.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat; +import dev.lambdaurora.lambdacontrols.client.gui.LambdaControlsHud; +import dev.lambdaurora.lambdacontrols.client.gui.TouchscreenOverlay; +import dev.lambdaurora.lambdacontrols.client.ring.KeyBindingRingAction; +import dev.lambdaurora.lambdacontrols.client.ring.LambdaRing; +import dev.lambdaurora.lambdacontrols.LambdaControls; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding; +import dev.lambdaurora.lambdacontrols.client.controller.Controller; +import dev.lambdaurora.lambdacontrols.client.controller.InputManager; import me.lambdaurora.spruceui.event.OpenScreenCallback; import me.lambdaurora.spruceui.hud.HudManager; import net.fabricmc.api.ClientModInitializer; @@ -65,10 +65,10 @@ public class LambdaControlsClient extends LambdaControls implements ClientModIni public final static File MAPPINGS_FILE = new File("config/gamecontrollerdb.txt"); public final LambdaControlsConfig config = new LambdaControlsConfig(this); public final LambdaInput input = new LambdaInput(this); - public final LambdaRing ring = new LambdaRing(this); + public final LambdaRing ring = new LambdaRing(this); public final LambdaReacharound reacharound = new LambdaReacharound(); - private LambdaControlsHud hud; - private ControlsMode previousControlsMode; + private LambdaControlsHud hud; + private ControlsMode previousControlsMode; @Override public void onInitializeClient() diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java similarity index 98% rename from src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java index b988a06..26faef5 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java @@ -7,14 +7,14 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client; +package dev.lambdaurora.lambdacontrols.client; import com.electronwill.nightconfig.core.file.FileConfig; -import me.lambdaurora.lambdacontrols.ControlsMode; -import me.lambdaurora.lambdacontrols.LambdaControlsFeature; -import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; -import me.lambdaurora.lambdacontrols.client.controller.Controller; -import me.lambdaurora.lambdacontrols.client.controller.InputManager; +import dev.lambdaurora.lambdacontrols.ControlsMode; +import dev.lambdaurora.lambdacontrols.LambdaControlsFeature; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding; +import dev.lambdaurora.lambdacontrols.client.controller.Controller; +import dev.lambdaurora.lambdacontrols.client.controller.InputManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java similarity index 84% rename from src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java index dca0736..d98e394 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java @@ -7,11 +7,11 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client; +package dev.lambdaurora.lambdacontrols.client; +import dev.lambdaurora.lambdacontrols.client.gui.LambdaControlsSettingsScreen; import io.github.prospector.modmenu.api.ConfigScreenFactory; import io.github.prospector.modmenu.api.ModMenuApi; -import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsSettingsScreen; /** * Represents the API implementation of ModMenu for LambdaControls. diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaInput.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaInput.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/client/LambdaInput.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaInput.java index ee843ec..6f46407 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaInput.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaInput.java @@ -7,26 +7,25 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client; +package dev.lambdaurora.lambdacontrols.client; import com.google.common.collect.ImmutableSet; -import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat; -import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; -import me.lambdaurora.lambdacontrols.client.controller.Controller; -import me.lambdaurora.lambdacontrols.client.controller.InputManager; -import me.lambdaurora.lambdacontrols.client.gui.TouchscreenOverlay; -import me.lambdaurora.lambdacontrols.client.gui.widget.ControllerControlsWidget; -import me.lambdaurora.lambdacontrols.client.mixin.AdvancementsScreenAccessor; -import me.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor; -import me.lambdaurora.lambdacontrols.client.mixin.EntryListWidgetAccessor; -import me.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor; -import me.lambdaurora.lambdacontrols.client.util.MouseAccessor; +import dev.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat; +import dev.lambdaurora.lambdacontrols.client.mixin.AdvancementsScreenAccessor; +import dev.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor; +import dev.lambdaurora.lambdacontrols.client.mixin.EntryListWidgetAccessor; +import dev.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor; +import dev.lambdaurora.lambdacontrols.client.util.MouseAccessor; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding; +import dev.lambdaurora.lambdacontrols.client.controller.Controller; +import dev.lambdaurora.lambdacontrols.client.controller.InputManager; +import dev.lambdaurora.lambdacontrols.client.gui.TouchscreenOverlay; +import dev.lambdaurora.lambdacontrols.client.gui.widget.ControllerControlsWidget; import me.lambdaurora.spruceui.navigation.NavigationDirection; import me.lambdaurora.spruceui.screen.SpruceScreen; import me.lambdaurora.spruceui.widget.AbstractSprucePressableButtonWidget; import me.lambdaurora.spruceui.widget.SpruceElement; import me.lambdaurora.spruceui.widget.SpruceLabelWidget; -import me.lambdaurora.spruceui.widget.SpruceWidget; import me.lambdaurora.spruceui.widget.container.SpruceParentWidget; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Element; @@ -62,8 +61,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import static me.lambdaurora.lambdacontrols.client.controller.ButtonBinding.axisAsButton; -import static me.lambdaurora.lambdacontrols.client.controller.InputManager.INPUT_MANAGER; +import static dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding.axisAsButton; +import static dev.lambdaurora.lambdacontrols.client.controller.InputManager.INPUT_MANAGER; import static org.lwjgl.glfw.GLFW.*; /** diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaReacharound.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaReacharound.java similarity index 98% rename from src/main/java/me/lambdaurora/lambdacontrols/client/LambdaReacharound.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaReacharound.java index 8b22994..6c83c05 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaReacharound.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaReacharound.java @@ -7,9 +7,9 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client; +package dev.lambdaurora.lambdacontrols.client; -import me.lambdaurora.lambdacontrols.LambdaControlsFeature; +import dev.lambdaurora.lambdacontrols.LambdaControlsFeature; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.FluidBlock; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java index 6e65284..96265d4 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client; +package dev.lambdaurora.lambdacontrols.client; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/CompatHandler.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/CompatHandler.java similarity index 96% rename from src/main/java/me/lambdaurora/lambdacontrols/client/compat/CompatHandler.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/compat/CompatHandler.java index d573be1..ec66bc4 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/CompatHandler.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/CompatHandler.java @@ -7,9 +7,9 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.compat; +package dev.lambdaurora.lambdacontrols.client.compat; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.HandledScreen; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/HQMCompat.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/HQMCompat.java similarity index 89% rename from src/main/java/me/lambdaurora/lambdacontrols/client/compat/HQMCompat.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/compat/HQMCompat.java index 9f383f9..70bbbf9 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/HQMCompat.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/HQMCompat.java @@ -7,9 +7,9 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.compat; +package dev.lambdaurora.lambdacontrols.client.compat; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; import net.minecraft.client.gui.screen.Screen; import org.aperlambda.lambdacommon.utils.LambdaReflection; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java similarity index 95% rename from src/main/java/me/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java index 566b568..fd14146 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java @@ -7,14 +7,13 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.compat; +package dev.lambdaurora.lambdacontrols.client.compat; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.controller.InputManager; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.controller.InputManager; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.screen.slot.Slot; import net.minecraft.util.hit.BlockHitResult; import org.aperlambda.lambdacommon.utils.LambdaReflection; import org.aperlambda.lambdacommon.utils.Pair; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java index bb10a4e..39de1ba 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.compat; +package dev.lambdaurora.lambdacontrols.client.compat; import org.jetbrains.annotations.NotNull; import org.objectweb.asm.tree.ClassNode; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java similarity index 91% rename from src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java index 1a9c4dd..0e4208e 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java @@ -7,11 +7,11 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.compat; +package dev.lambdaurora.lambdacontrols.client.compat; import io.github.joaoh1.okzoomer.client.keybinds.ZoomKeybinds; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding; import org.jetbrains.annotations.NotNull; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/ReiCompat.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/ReiCompat.java similarity index 95% rename from src/main/java/me/lambdaurora/lambdacontrols/client/compat/ReiCompat.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/compat/ReiCompat.java index 13fdba6..aef7b80 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/ReiCompat.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/ReiCompat.java @@ -7,17 +7,17 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.compat; +package dev.lambdaurora.lambdacontrols.client.compat; -import me.lambdaurora.lambdacontrols.client.ButtonState; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.compat.mixin.EntryListWidgetAccessor; -import me.lambdaurora.lambdacontrols.client.compat.mixin.EntryWidgetAccessor; -import me.lambdaurora.lambdacontrols.client.compat.mixin.RecipeViewingScreenAccessor; -import me.lambdaurora.lambdacontrols.client.compat.mixin.VillagerRecipeViewingScreenAccessor; -import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; -import me.lambdaurora.lambdacontrols.client.controller.InputHandlers; -import me.lambdaurora.lambdacontrols.client.controller.PressAction; +import dev.lambdaurora.lambdacontrols.client.ButtonState; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.compat.mixin.EntryListWidgetAccessor; +import dev.lambdaurora.lambdacontrols.client.compat.mixin.EntryWidgetAccessor; +import dev.lambdaurora.lambdacontrols.client.compat.mixin.RecipeViewingScreenAccessor; +import dev.lambdaurora.lambdacontrols.client.compat.mixin.VillagerRecipeViewingScreenAccessor; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding; +import dev.lambdaurora.lambdacontrols.client.controller.InputHandlers; +import dev.lambdaurora.lambdacontrols.client.controller.PressAction; import me.shedaniel.rei.api.*; import me.shedaniel.rei.gui.ContainerScreenOverlay; import me.shedaniel.rei.gui.PreRecipeViewingScreen; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/EntryListWidgetAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryListWidgetAccessor.java similarity index 92% rename from src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/EntryListWidgetAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryListWidgetAccessor.java index d6a68c7..155d970 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/EntryListWidgetAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryListWidgetAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.compat.mixin; +package dev.lambdaurora.lambdacontrols.client.compat.mixin; import me.shedaniel.rei.gui.widget.EntryListEntryWidget; import me.shedaniel.rei.gui.widget.EntryListWidget; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/EntryWidgetAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryWidgetAccessor.java similarity index 91% rename from src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/EntryWidgetAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryWidgetAccessor.java index d9e168b..8cc7086 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/EntryWidgetAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryWidgetAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.compat.mixin; +package dev.lambdaurora.lambdacontrols.client.compat.mixin; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.gui.widget.EntryWidget; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java similarity index 93% rename from src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java index 7f7a802..a728065 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.compat.mixin; +package dev.lambdaurora.lambdacontrols.client.compat.mixin; import me.shedaniel.rei.api.widgets.Button; import me.shedaniel.rei.gui.RecipeViewingScreen; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java similarity index 96% rename from src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java index 43fb9d3..3cd9840 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.compat.mixin; +package dev.lambdaurora.lambdacontrols.client.compat.mixin; import me.shedaniel.clothconfig2.api.ScrollingContainer; import me.shedaniel.rei.api.RecipeCategory; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java similarity index 96% rename from src/main/java/me/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java index 9a87c31..919791d 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java @@ -7,9 +7,9 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.controller; +package dev.lambdaurora.lambdacontrols.client.controller; -import me.lambdaurora.lambdacontrols.client.ButtonState; +import dev.lambdaurora.lambdacontrols.client.ButtonState; import net.minecraft.client.MinecraftClient; import net.minecraft.client.options.GameOptions; import net.minecraft.client.options.KeyBinding; @@ -25,7 +25,6 @@ import org.jetbrains.annotations.Nullable; import java.util.*; import java.util.stream.Collectors; -import static me.lambdaurora.lambdacontrols.client.controller.InputManager.registerDefaultCategory; import static org.lwjgl.glfw.GLFW.*; /** @@ -386,7 +385,7 @@ public class ButtonBinding implements Nameable { } static { - MOVEMENT_CATEGORY = registerDefaultCategory("key.categories.movement", category -> category.registerAllBindings( + MOVEMENT_CATEGORY = InputManager.registerDefaultCategory("key.categories.movement", category -> category.registerAllBindings( ButtonBinding.FORWARD, ButtonBinding.BACK, ButtonBinding.LEFT, @@ -394,21 +393,21 @@ public class ButtonBinding implements Nameable { ButtonBinding.JUMP, ButtonBinding.SNEAK, ButtonBinding.SPRINT)); - GAMEPLAY_CATEGORY = registerDefaultCategory("key.categories.gameplay", category -> category.registerAllBindings( + GAMEPLAY_CATEGORY = InputManager.registerDefaultCategory("key.categories.gameplay", category -> category.registerAllBindings( ButtonBinding.ATTACK, ButtonBinding.PICK_BLOCK, ButtonBinding.USE )); - INVENTORY_CATEGORY = registerDefaultCategory("key.categories.inventory", category -> category.registerAllBindings( + INVENTORY_CATEGORY = InputManager.registerDefaultCategory("key.categories.inventory", category -> category.registerAllBindings( ButtonBinding.DROP_ITEM, ButtonBinding.HOTBAR_LEFT, ButtonBinding.HOTBAR_RIGHT, ButtonBinding.INVENTORY, ButtonBinding.SWAP_HANDS )); - MULTIPLAYER_CATEGORY = registerDefaultCategory("key.categories.multiplayer", + MULTIPLAYER_CATEGORY = InputManager.registerDefaultCategory("key.categories.multiplayer", category -> category.registerAllBindings(ButtonBinding.CHAT, ButtonBinding.PLAYER_LIST)); - MISC_CATEGORY = registerDefaultCategory("key.categories.misc", category -> category.registerAllBindings( + MISC_CATEGORY = InputManager.registerDefaultCategory("key.categories.misc", category -> category.registerAllBindings( ButtonBinding.SCREENSHOT, //SMOOTH_CAMERA, ButtonBinding.TOGGLE_PERSPECTIVE diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/ButtonCategory.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonCategory.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/client/controller/ButtonCategory.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonCategory.java index f9322d7..4645d4c 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/ButtonCategory.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonCategory.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.controller; +package dev.lambdaurora.lambdacontrols.client.controller; import net.minecraft.client.resource.language.I18n; import org.aperlambda.lambdacommon.Identifier; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/Controller.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/Controller.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/client/controller/Controller.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/controller/Controller.java index f8cd6ce..0ee15de 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/Controller.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/Controller.java @@ -7,10 +7,10 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.controller; +package dev.lambdaurora.lambdacontrols.client.controller; -import me.lambdaurora.lambdacontrols.LambdaControls; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.LambdaControls; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; import net.minecraft.client.MinecraftClient; import net.minecraft.client.toast.SystemToast; import net.minecraft.text.LiteralText; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputHandlers.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputHandlers.java similarity index 95% rename from src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputHandlers.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputHandlers.java index 9e0b45a..4d86490 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputHandlers.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputHandlers.java @@ -7,15 +7,14 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.controller; +package dev.lambdaurora.lambdacontrols.client.controller; -import me.lambdaurora.lambdacontrols.client.ButtonState; -import me.lambdaurora.lambdacontrols.client.LambdaInput; -import me.lambdaurora.lambdacontrols.client.mixin.AdvancementsScreenAccessor; -import me.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor; -import me.lambdaurora.lambdacontrols.client.mixin.RecipeBookWidgetAccessor; -import me.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor; -import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor; +import dev.lambdaurora.lambdacontrols.client.ButtonState; +import dev.lambdaurora.lambdacontrols.client.LambdaInput; +import dev.lambdaurora.lambdacontrols.client.mixin.AdvancementsScreenAccessor; +import dev.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor; +import dev.lambdaurora.lambdacontrols.client.mixin.RecipeBookWidgetAccessor; +import dev.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.advancement.AdvancementTab; import net.minecraft.client.gui.screen.advancement.AdvancementsScreen; @@ -23,7 +22,6 @@ import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.gui.screen.ingame.InventoryScreen; import net.minecraft.client.gui.screen.recipebook.RecipeGroupButtonWidget; -import net.minecraft.client.options.Option; import net.minecraft.client.util.ScreenshotUtils; import net.minecraft.item.ItemGroup; import net.minecraft.screen.slot.Slot; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputManager.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputManager.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputManager.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputManager.java index e255b87..43d0aa6 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputManager.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputManager.java @@ -7,13 +7,13 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.controller; +package dev.lambdaurora.lambdacontrols.client.controller; -import me.lambdaurora.lambdacontrols.ControlsMode; -import me.lambdaurora.lambdacontrols.client.ButtonState; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.LambdaControlsConfig; -import me.lambdaurora.lambdacontrols.client.util.MouseAccessor; +import dev.lambdaurora.lambdacontrols.ControlsMode; +import dev.lambdaurora.lambdacontrols.client.ButtonState; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsConfig; +import dev.lambdaurora.lambdacontrols.client.util.MouseAccessor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.options.KeyBinding; import net.minecraft.client.util.InputUtil; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/MovementHandler.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/MovementHandler.java similarity index 96% rename from src/main/java/me/lambdaurora/lambdacontrols/client/controller/MovementHandler.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/controller/MovementHandler.java index b2e1f30..db836c5 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/MovementHandler.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/MovementHandler.java @@ -7,9 +7,9 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.controller; +package dev.lambdaurora.lambdacontrols.client.controller; -import me.lambdaurora.lambdacontrols.client.ButtonState; +import dev.lambdaurora.lambdacontrols.client.ButtonState; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/PressAction.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/PressAction.java similarity index 87% rename from src/main/java/me/lambdaurora/lambdacontrols/client/controller/PressAction.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/controller/PressAction.java index 295d67d..815b079 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/controller/PressAction.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/PressAction.java @@ -7,10 +7,10 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.controller; +package dev.lambdaurora.lambdacontrols.client.controller; -import me.lambdaurora.lambdacontrols.client.ButtonState; -import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor; +import dev.lambdaurora.lambdacontrols.client.ButtonState; +import dev.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.options.StickyKeyBinding; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java similarity index 96% rename from src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java index 9caac07..436dcdd 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java @@ -7,14 +7,14 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.gui; +package dev.lambdaurora.lambdacontrols.client.gui; -import me.lambdaurora.lambdacontrols.ControlsMode; -import me.lambdaurora.lambdacontrols.LambdaControlsConstants; -import me.lambdaurora.lambdacontrols.client.HudSide; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat; -import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; +import dev.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat; +import dev.lambdaurora.lambdacontrols.ControlsMode; +import dev.lambdaurora.lambdacontrols.LambdaControlsConstants; +import dev.lambdaurora.lambdacontrols.client.HudSide; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding; import me.lambdaurora.spruceui.hud.Hud; import net.minecraft.client.MinecraftClient; import net.minecraft.client.resource.language.I18n; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java similarity index 96% rename from src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java index 3b3056c..d81ba3d 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java @@ -7,14 +7,14 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.gui; +package dev.lambdaurora.lambdacontrols.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.LambdaInput; -import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat; -import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; -import me.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor; +import dev.lambdaurora.lambdacontrols.client.LambdaInput; +import dev.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat; +import dev.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawableHelper; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java similarity index 98% rename from src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java index fe5db7f..0a4a292 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java @@ -7,13 +7,13 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.gui; +package dev.lambdaurora.lambdacontrols.client.gui; -import me.lambdaurora.lambdacontrols.ControlsMode; -import me.lambdaurora.lambdacontrols.LambdaControls; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.controller.Controller; -import me.lambdaurora.lambdacontrols.client.gui.widget.ControllerControlsWidget; +import dev.lambdaurora.lambdacontrols.ControlsMode; +import dev.lambdaurora.lambdacontrols.LambdaControls; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.controller.Controller; +import dev.lambdaurora.lambdacontrols.client.gui.widget.ControllerControlsWidget; import me.lambdaurora.spruceui.Position; import me.lambdaurora.spruceui.SpruceTexts; import me.lambdaurora.spruceui.option.*; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/MappingsStringInputWidget.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/MappingsStringInputWidget.java similarity index 86% rename from src/main/java/me/lambdaurora/lambdacontrols/client/gui/MappingsStringInputWidget.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/gui/MappingsStringInputWidget.java index 46ed9a7..e666e94 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/MappingsStringInputWidget.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/MappingsStringInputWidget.java @@ -7,24 +7,17 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.gui; +package dev.lambdaurora.lambdacontrols.client.gui; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.controller.Controller; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.controller.Controller; import me.lambdaurora.spruceui.Position; -import me.lambdaurora.spruceui.SpruceTexts; import me.lambdaurora.spruceui.option.SpruceOption; -import me.lambdaurora.spruceui.screen.SpruceScreen; -import me.lambdaurora.spruceui.widget.SpruceButtonWidget; import me.lambdaurora.spruceui.widget.container.SpruceContainerWidget; import me.lambdaurora.spruceui.widget.text.SpruceTextAreaWidget; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.toast.SystemToast; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralText; import net.minecraft.text.TranslatableText; -import org.jetbrains.annotations.Nullable; import java.io.FileWriter; import java.io.IOException; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java similarity index 93% rename from src/main/java/me/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java index 7380ce0..bdb851a 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java @@ -7,9 +7,9 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.gui; +package dev.lambdaurora.lambdacontrols.client.gui; -import me.lambdaurora.lambdacontrols.client.controller.Controller; +import dev.lambdaurora.lambdacontrols.client.controller.Controller; import me.lambdaurora.spruceui.option.SpruceSimpleActionOption; import me.lambdaurora.spruceui.widget.SpruceButtonWidget; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/RingScreen.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/RingScreen.java similarity index 88% rename from src/main/java/me/lambdaurora/lambdacontrols/client/gui/RingScreen.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/gui/RingScreen.java index f1d7cce..441c686 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/RingScreen.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/RingScreen.java @@ -7,10 +7,10 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.gui; +package dev.lambdaurora.lambdacontrols.client.gui; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.ring.RingPage; +import dev.lambdaurora.lambdacontrols.client.ring.RingPage; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.TranslatableText; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java similarity index 93% rename from src/main/java/me/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java index 3f288ee..984ab4d 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java @@ -7,29 +7,12 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.gui; +package dev.lambdaurora.lambdacontrols.client.gui; -import me.lambdaurora.lambdacontrols.client.HudSide; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor; -import net.minecraft.client.gui.screen.ChatScreen; -import net.minecraft.client.gui.screen.GameMenuScreen; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ingame.InventoryScreen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.widget.TexturedButtonWidget; -import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; import net.minecraft.text.LiteralText; -import net.minecraft.text.Text; -import net.minecraft.util.Arm; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; import org.jetbrains.annotations.NotNull; -import org.lwjgl.glfw.GLFW; - -import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X; -import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y; /** * Represents the touchscreen overlay diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControllerButtonWidget.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerButtonWidget.java similarity index 90% rename from src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControllerButtonWidget.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerButtonWidget.java index f5a6f2a..8e49a1a 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControllerButtonWidget.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerButtonWidget.java @@ -7,10 +7,10 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.gui.widget; +package dev.lambdaurora.lambdacontrols.client.gui.widget; -import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; -import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsRenderer; +import dev.lambdaurora.lambdacontrols.client.gui.LambdaControlsRenderer; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding; import me.lambdaurora.spruceui.Position; import me.lambdaurora.spruceui.SpruceTexts; import me.lambdaurora.spruceui.widget.AbstractSpruceIconButtonWidget; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControllerControlsWidget.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerControlsWidget.java similarity index 90% rename from src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControllerControlsWidget.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerControlsWidget.java index 4117469..d472409 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControllerControlsWidget.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerControlsWidget.java @@ -7,11 +7,11 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.gui.widget; +package dev.lambdaurora.lambdacontrols.client.gui.widget; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; -import me.lambdaurora.lambdacontrols.client.controller.InputManager; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding; +import dev.lambdaurora.lambdacontrols.client.controller.InputManager; import me.lambdaurora.spruceui.Position; import me.lambdaurora.spruceui.SpruceTexts; import me.lambdaurora.spruceui.widget.SpruceButtonWidget; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControlsListWidget.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControlsListWidget.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControlsListWidget.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControlsListWidget.java index 617c340..8f840c6 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControlsListWidget.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControlsListWidget.java @@ -7,12 +7,12 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.gui.widget; +package dev.lambdaurora.lambdacontrols.client.gui.widget; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; -import me.lambdaurora.lambdacontrols.client.controller.ButtonCategory; -import me.lambdaurora.lambdacontrols.client.controller.InputManager; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding; +import dev.lambdaurora.lambdacontrols.client.controller.ButtonCategory; +import dev.lambdaurora.lambdacontrols.client.controller.InputManager; import me.lambdaurora.spruceui.Position; import me.lambdaurora.spruceui.SpruceTexts; import me.lambdaurora.spruceui.navigation.NavigationDirection; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java similarity index 90% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java index 912784a..5242e88 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; import net.minecraft.client.gui.widget.AbstractButtonWidget; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java similarity index 94% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java index 28ffc61..cad79c8 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; import net.minecraft.advancement.Advancement; import net.minecraft.client.gui.screen.advancement.AdvancementTab; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ClientPlayNetworkHandlerMixin.java similarity index 87% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayNetworkHandlerMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ClientPlayNetworkHandlerMixin.java index e6031d2..43cf387 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ClientPlayNetworkHandlerMixin.java @@ -7,10 +7,10 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; -import me.lambdaurora.lambdacontrols.LambdaControls; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.LambdaControls; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; import net.fabricmc.fabric.api.network.ClientSidePacketRegistry; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java similarity index 94% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java index 29abd71..4ecf0cc 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java @@ -7,11 +7,11 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; import com.mojang.authlib.GameProfile; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.controller.MovementHandler; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.controller.MovementHandler; import net.minecraft.client.MinecraftClient; import net.minecraft.client.input.Input; import net.minecraft.client.network.AbstractClientPlayerEntity; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java similarity index 89% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java index cefeded..bffe096 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java @@ -7,10 +7,9 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; -import me.lambdaurora.lambdacontrols.client.gui.widget.ControllerControlsWidget; -import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsSettingsScreen; +import dev.lambdaurora.lambdacontrols.client.gui.LambdaControlsSettingsScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.options.ControlsOptionsScreen; import net.minecraft.client.gui.screen.options.GameOptionsScreen; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java similarity index 96% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java index 3b643b2..6302471 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; import net.minecraft.item.ItemGroup; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java similarity index 90% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java index 755f51b..535b32e 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; import net.minecraft.client.gui.widget.EntryListWidget; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java similarity index 94% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java index 3ac9e93..a741df5 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; import net.minecraft.client.options.GameOptions; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/GameRendererMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameRendererMixin.java similarity index 87% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/GameRendererMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameRendererMixin.java index 27f1f05..e614e1b 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/GameRendererMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameRendererMixin.java @@ -7,10 +7,10 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; -import me.lambdaurora.lambdacontrols.ControlsMode; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.ControlsMode; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.GameRenderer; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java similarity index 87% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java index 8187aa4..2f7c0b1 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java @@ -7,13 +7,13 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; -import me.lambdaurora.lambdacontrols.ControlsMode; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat; -import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsRenderer; -import me.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor; +import dev.lambdaurora.lambdacontrols.ControlsMode; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat; +import dev.lambdaurora.lambdacontrols.client.gui.LambdaControlsRenderer; +import dev.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.util.math.MatrixStack; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java similarity index 88% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java index fa92c4d..04402c0 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java @@ -7,9 +7,9 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; -import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor; +import dev.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor; import net.minecraft.client.options.KeyBinding; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java similarity index 95% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java index daf8766..70a2c34 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java @@ -7,12 +7,11 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; -import me.lambdaurora.lambdacontrols.LambdaControlsFeature; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.LambdaReacharound; -import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsRenderer; +import dev.lambdaurora.lambdacontrols.LambdaControlsFeature; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.gui.LambdaControlsRenderer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java similarity index 88% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java index b76517b..590ba1a 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java @@ -7,12 +7,12 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; -import me.lambdaurora.lambdacontrols.ControlsMode; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.LambdaControlsConfig; -import me.lambdaurora.lambdacontrols.client.util.MouseAccessor; +import dev.lambdaurora.lambdacontrols.ControlsMode; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsConfig; +import dev.lambdaurora.lambdacontrols.client.util.MouseAccessor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.Mouse; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java similarity index 82% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java index dc97a70..ff6939b 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java @@ -7,12 +7,11 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; -import me.lambdaurora.lambdacontrols.ControlsMode; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsSettingsScreen; -import me.lambdaurora.lambdacontrols.client.gui.widget.ControllerControlsWidget; +import dev.lambdaurora.lambdacontrols.ControlsMode; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.gui.LambdaControlsSettingsScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.options.OptionsScreen; import net.minecraft.client.gui.widget.AbstractButtonWidget; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java similarity index 94% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java index 20d435e..6ed8def 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget; import net.minecraft.client.gui.screen.recipebook.RecipeGroupButtonWidget; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java similarity index 94% rename from src/main/java/me/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java index 81a5080..c944e42 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java @@ -7,10 +7,9 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.mixin; +package dev.lambdaurora.lambdacontrols.client.mixin; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; -import me.lambdaurora.lambdacontrols.client.LambdaReacharound; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; @@ -35,7 +34,6 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; /** * Represents a mixin to WorldRenderer. diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/DummyRingAction.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/DummyRingAction.java similarity index 94% rename from src/main/java/me/lambdaurora/lambdacontrols/client/ring/DummyRingAction.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/ring/DummyRingAction.java index 2a98e12..7c7dbb5 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/DummyRingAction.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/DummyRingAction.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.ring; +package dev.lambdaurora.lambdacontrols.client.ring; import com.electronwill.nightconfig.core.Config; import net.minecraft.client.font.TextRenderer; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/KeyBindingRingAction.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/KeyBindingRingAction.java similarity index 94% rename from src/main/java/me/lambdaurora/lambdacontrols/client/ring/KeyBindingRingAction.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/ring/KeyBindingRingAction.java index d32da00..7c53ba8 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/KeyBindingRingAction.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/KeyBindingRingAction.java @@ -7,10 +7,10 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.ring; +package dev.lambdaurora.lambdacontrols.client.ring; import com.electronwill.nightconfig.core.Config; -import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor; +import dev.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.options.KeyBinding; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/LambdaRing.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/LambdaRing.java similarity index 92% rename from src/main/java/me/lambdaurora/lambdacontrols/client/ring/LambdaRing.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/ring/LambdaRing.java index 7cd656b..6ae47c8 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/LambdaRing.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/LambdaRing.java @@ -7,19 +7,17 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.ring; +package dev.lambdaurora.lambdacontrols.client.ring; import com.electronwill.nightconfig.core.Config; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; +import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.function.Function; -import java.util.stream.IntStream; /** * Represents a key binding ring. diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingAction.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingAction.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingAction.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingAction.java index 0df9116..44e54ea 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingAction.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingAction.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.ring; +package dev.lambdaurora.lambdacontrols.client.ring; import com.electronwill.nightconfig.core.Config; import net.minecraft.client.font.TextRenderer; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingButtonMode.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingButtonMode.java similarity index 97% rename from src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingButtonMode.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingButtonMode.java index 44759a7..e9dd124 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingButtonMode.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingButtonMode.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.ring; +package dev.lambdaurora.lambdacontrols.client.ring; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingPage.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingPage.java similarity index 98% rename from src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingPage.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingPage.java index 28f4207..977c3ed 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingPage.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingPage.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.ring; +package dev.lambdaurora.lambdacontrols.client.ring; import com.electronwill.nightconfig.core.Config; import net.minecraft.client.font.TextRenderer; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java similarity index 96% rename from src/main/java/me/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java index 443a743..0c71d31 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.util; +package dev.lambdaurora.lambdacontrols.client.util; import net.minecraft.screen.slot.Slot; import net.minecraft.screen.slot.SlotActionType; diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/util/KeyBindingAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/util/KeyBindingAccessor.java similarity index 91% rename from src/main/java/me/lambdaurora/lambdacontrols/client/util/KeyBindingAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/util/KeyBindingAccessor.java index 4ceb58f..d0ef053 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/util/KeyBindingAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/util/KeyBindingAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.util; +package dev.lambdaurora.lambdacontrols.client.util; /** * Represents a Minecraft keybinding with extra access. diff --git a/src/main/java/me/lambdaurora/lambdacontrols/client/util/MouseAccessor.java b/src/main/java/dev/lambdaurora/lambdacontrols/client/util/MouseAccessor.java similarity index 86% rename from src/main/java/me/lambdaurora/lambdacontrols/client/util/MouseAccessor.java rename to src/main/java/dev/lambdaurora/lambdacontrols/client/util/MouseAccessor.java index 38414f8..85a9294 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/client/util/MouseAccessor.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/util/MouseAccessor.java @@ -7,7 +7,7 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.client.util; +package dev.lambdaurora.lambdacontrols.client.util; /** * Represents mouse's extra access. diff --git a/src/main/java/me/lambdaurora/lambdacontrols/event/PlayerChangeControlsModeCallback.java b/src/main/java/dev/lambdaurora/lambdacontrols/event/PlayerChangeControlsModeCallback.java similarity index 91% rename from src/main/java/me/lambdaurora/lambdacontrols/event/PlayerChangeControlsModeCallback.java rename to src/main/java/dev/lambdaurora/lambdacontrols/event/PlayerChangeControlsModeCallback.java index 02cb75e..515da58 100644 --- a/src/main/java/me/lambdaurora/lambdacontrols/event/PlayerChangeControlsModeCallback.java +++ b/src/main/java/dev/lambdaurora/lambdacontrols/event/PlayerChangeControlsModeCallback.java @@ -7,9 +7,9 @@ * see the LICENSE file. */ -package me.lambdaurora.lambdacontrols.event; +package dev.lambdaurora.lambdacontrols.event; -import me.lambdaurora.lambdacontrols.ControlsMode; +import dev.lambdaurora.lambdacontrols.ControlsMode; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6b21118..64a8ce7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -17,13 +17,13 @@ "environment": "client", "entrypoints": { "main": [ - "me.lambdaurora.lambdacontrols.LambdaControls" + "dev.lambdaurora.lambdacontrols.LambdaControls" ], "client": [ - "me.lambdaurora.lambdacontrols.client.LambdaControlsClient" + "dev.lambdaurora.lambdacontrols.client.LambdaControlsClient" ], "modmenu": [ - "me.lambdaurora.lambdacontrols.client.LambdaControlsModMenu" + "dev.lambdaurora.lambdacontrols.client.LambdaControlsModMenu" ] }, "mixins": [ diff --git a/src/main/resources/lambdacontrols.mixins.json b/src/main/resources/lambdacontrols.mixins.json index 8f76f65..b2be604 100644 --- a/src/main/resources/lambdacontrols.mixins.json +++ b/src/main/resources/lambdacontrols.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "me.lambdaurora.lambdacontrols.client.mixin", + "package": "dev.lambdaurora.lambdacontrols.client.mixin", "compatibilityLevel": "JAVA_8", "client": [ "AbstractButtonWidgetAccessor", diff --git a/src/main/resources/lambdacontrols_compat.mixins.json b/src/main/resources/lambdacontrols_compat.mixins.json index 4a79fc3..dde095a 100644 --- a/src/main/resources/lambdacontrols_compat.mixins.json +++ b/src/main/resources/lambdacontrols_compat.mixins.json @@ -1,7 +1,7 @@ { "required": true, - "package": "me.lambdaurora.lambdacontrols.client.compat.mixin", - "plugin": "me.lambdaurora.lambdacontrols.client.compat.LambdaControlsMixinPlugin", + "package": "dev.lambdaurora.lambdacontrols.client.compat.mixin", + "plugin": "dev.lambdaurora.lambdacontrols.client.compat.LambdaControlsMixinPlugin", "compatibilityLevel": "JAVA_8", "client": [ "EntryListWidgetAccessor",