Motschen/MidnightControls
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightControls.git synced 2025-12-13 07:15:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change package.

Browse Source
This commit is contained in:
LambdAurora
2021-03-16 00:40:56 +01:00
parent ac8fab83a2
commit b8ec934c10
70 changed files with 204 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -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

2
src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java → src/main/java/dev/lambdaurora/lambdacontrols/ControlsMode.java
View File

@@ -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;

4
src/main/java/me/lambdaurora/lambdacontrols/LambdaControls.java → src/main/java/dev/lambdaurora/lambdacontrols/LambdaControls.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConstants.java → src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsConstants.java
View File

@@ -7,7 +7,7 @@
* see the LICENSE file.
*/
package me.lambdaurora.lambdacontrols;
package dev.lambdaurora.lambdacontrols;
import org.aperlambda.lambdacommon.Identifier;

2
src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsFeature.java → src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsFeature.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/ButtonState.java → src/main/java/dev/lambdaurora/lambdacontrols/client/ButtonState.java
View File

@@ -7,7 +7,7 @@
* see the LICENSE file.
*/
package me.lambdaurora.lambdacontrols.client;
package dev.lambdaurora.lambdacontrols.client;
/**
* Represents a button state.

2
src/main/java/me/lambdaurora/lambdacontrols/client/ControllerType.java → src/main/java/dev/lambdaurora/lambdacontrols/client/ControllerType.java
View File

@@ -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;

3
src/main/java/me/lambdaurora/lambdacontrols/client/HudSide.java → src/main/java/dev/lambdaurora/lambdacontrols/client/HudSide.java
View File

@@ -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;

32
src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsClient.java → src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsClient.java
View File

@@ -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()

12
src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java → src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java
View File

@@ -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;

4
src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java → src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java
View File

@@ -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.

29
src/main/java/me/lambdaurora/lambdacontrols/client/LambdaInput.java → src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaInput.java
View File

@@ -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.*;
/**

4
src/main/java/me/lambdaurora/lambdacontrols/client/LambdaReacharound.java → src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaReacharound.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java
View File

@@ -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;

4
src/main/java/me/lambdaurora/lambdacontrols/client/compat/CompatHandler.java → src/main/java/dev/lambdaurora/lambdacontrols/client/compat/CompatHandler.java
View File

@@ -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;

4
src/main/java/me/lambdaurora/lambdacontrols/client/compat/HQMCompat.java → src/main/java/dev/lambdaurora/lambdacontrols/client/compat/HQMCompat.java
View File

@@ -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;

7
src/main/java/me/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java → src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java
View File

@@ -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;

6
src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java → src/main/java/dev/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java
View File

@@ -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;

20
src/main/java/me/lambdaurora/lambdacontrols/client/compat/ReiCompat.java → src/main/java/dev/lambdaurora/lambdacontrols/client/compat/ReiCompat.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/EntryListWidgetAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryListWidgetAccessor.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/EntryWidgetAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryWidgetAccessor.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java
View File

@@ -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;

15
src/main/java/me/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java → src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java
View File

@@ -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

2
src/main/java/me/lambdaurora/lambdacontrols/client/controller/ButtonCategory.java → src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonCategory.java
View File

@@ -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;

6
src/main/java/me/lambdaurora/lambdacontrols/client/controller/Controller.java → src/main/java/dev/lambdaurora/lambdacontrols/client/controller/Controller.java
View File

@@ -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;

16
src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputHandlers.java → src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputHandlers.java
View File

@@ -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;

12
src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputManager.java → src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputManager.java
View File

@@ -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;

4
src/main/java/me/lambdaurora/lambdacontrols/client/controller/MovementHandler.java → src/main/java/dev/lambdaurora/lambdacontrols/client/controller/MovementHandler.java
View File

@@ -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;

6
src/main/java/me/lambdaurora/lambdacontrols/client/controller/PressAction.java → src/main/java/dev/lambdaurora/lambdacontrols/client/controller/PressAction.java
View File

@@ -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;

14
src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java → src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java
View File

@@ -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;

12
src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java → src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java
View File

@@ -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;

12
src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java → src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java
View File

@@ -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.*;

13
src/main/java/me/lambdaurora/lambdacontrols/client/gui/MappingsStringInputWidget.java → src/main/java/dev/lambdaurora/lambdacontrols/client/gui/MappingsStringInputWidget.java
View File

@@ -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;

4
src/main/java/me/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java → src/main/java/dev/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java
View File

@@ -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;

6
src/main/java/me/lambdaurora/lambdacontrols/client/gui/RingScreen.java → src/main/java/dev/lambdaurora/lambdacontrols/client/gui/RingScreen.java
View File

@@ -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;

21
src/main/java/me/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java → src/main/java/dev/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java
View File

@@ -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

6
src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControllerButtonWidget.java → src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerButtonWidget.java
View File

@@ -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;

8
src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControllerControlsWidget.java → src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerControlsWidget.java
View File

@@ -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;

10
src/main/java/me/lambdaurora/lambdacontrols/client/gui/widget/ControlsListWidget.java → src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControlsListWidget.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java
View File

@@ -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;

6
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayNetworkHandlerMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ClientPlayNetworkHandlerMixin.java
View File

@@ -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;

6
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java
View File

@@ -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;

5
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java
View File

@@ -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;

6
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/GameRendererMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameRendererMixin.java
View File

@@ -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;

12
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java
View File

@@ -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;

4
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java
View File

@@ -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;

9
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java
View File

@@ -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;

10
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java
View File

@@ -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;

9
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java
View File

@@ -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;

6
src/main/java/me/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java → src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java
View File

@@ -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.

2
src/main/java/me/lambdaurora/lambdacontrols/client/ring/DummyRingAction.java → src/main/java/dev/lambdaurora/lambdacontrols/client/ring/DummyRingAction.java
View File

@@ -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;

4
src/main/java/me/lambdaurora/lambdacontrols/client/ring/KeyBindingRingAction.java → src/main/java/dev/lambdaurora/lambdacontrols/client/ring/KeyBindingRingAction.java
View File

@@ -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;

6
src/main/java/me/lambdaurora/lambdacontrols/client/ring/LambdaRing.java → src/main/java/dev/lambdaurora/lambdacontrols/client/ring/LambdaRing.java
View File

@@ -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.

2
src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingAction.java → src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingAction.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingButtonMode.java → src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingButtonMode.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingPage.java → src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingPage.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java
View File

@@ -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;

2
src/main/java/me/lambdaurora/lambdacontrols/client/util/KeyBindingAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/util/KeyBindingAccessor.java
View File

@@ -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.

2
src/main/java/me/lambdaurora/lambdacontrols/client/util/MouseAccessor.java → src/main/java/dev/lambdaurora/lambdacontrols/client/util/MouseAccessor.java
View File

@@ -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.

4
src/main/java/me/lambdaurora/lambdacontrols/event/PlayerChangeControlsModeCallback.java → src/main/java/dev/lambdaurora/lambdacontrols/event/PlayerChangeControlsModeCallback.java
View File

@@ -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;

6
src/main/resources/fabric.mod.json
View File

@@ -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": [

2
src/main/resources/lambdacontrols.mixins.json
View File

@@ -1,6 +1,6 @@
{
"required": true,
"package": "me.lambdaurora.lambdacontrols.client.mixin",
"package": "dev.lambdaurora.lambdacontrols.client.mixin",
"compatibilityLevel": "JAVA_8",
"client": [
"AbstractButtonWidgetAccessor",

4
src/main/resources/lambdacontrols_compat.mixins.json
View File

@@ -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",