aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/torui/coflsky/CoflSkyCommand.java6
-rw-r--r--src/main/java/de/torui/coflsky/EventRegistry.java6
-rw-r--r--src/main/java/de/torui/coflsky/WSCommandHandler.java8
-rw-r--r--src/main/java/de/torui/coflsky/commands/Command.java (renamed from src/main/java/de/torui/coflsky/core/Command.java)2
-rw-r--r--src/main/java/de/torui/coflsky/commands/CommandType.java (renamed from src/main/java/de/torui/coflsky/core/CommandType.java)2
-rw-r--r--src/main/java/de/torui/coflsky/commands/JsonStringCommand.java (renamed from src/main/java/de/torui/coflsky/core/JsonStringCommand.java)2
-rw-r--r--src/main/java/de/torui/coflsky/commands/models/AuctionData.java (renamed from src/main/java/de/torui/coflsky/core/commandEntities/AuctionData.java)2
-rw-r--r--src/main/java/de/torui/coflsky/commands/models/ChatMessageData.java (renamed from src/main/java/de/torui/coflsky/core/commandEntities/ChatMessageData.java)2
-rw-r--r--src/main/java/de/torui/coflsky/commands/models/SoundData.java (renamed from src/main/java/de/torui/coflsky/core/commandEntities/SoundData.java)2
-rw-r--r--src/main/java/de/torui/coflsky/network/WSClient.java4
-rw-r--r--src/main/java/de/torui/coflsky/network/WSClientWrapper.java4
11 files changed, 20 insertions, 20 deletions
diff --git a/src/main/java/de/torui/coflsky/CoflSkyCommand.java b/src/main/java/de/torui/coflsky/CoflSkyCommand.java
index 8f4e9e7..b48a3cd 100644
--- a/src/main/java/de/torui/coflsky/CoflSkyCommand.java
+++ b/src/main/java/de/torui/coflsky/CoflSkyCommand.java
@@ -4,9 +4,9 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import de.torui.coflsky.core.Command;
-import de.torui.coflsky.core.CommandType;
-import de.torui.coflsky.core.JsonStringCommand;
+import de.torui.coflsky.commands.Command;
+import de.torui.coflsky.commands.CommandType;
+import de.torui.coflsky.commands.JsonStringCommand;
import de.torui.coflsky.minecraft_integration.CoflSessionManager;
import de.torui.coflsky.minecraft_integration.CoflSessionManager.CoflSession;
import de.torui.coflsky.network.QueryServerCommands;
diff --git a/src/main/java/de/torui/coflsky/EventRegistry.java b/src/main/java/de/torui/coflsky/EventRegistry.java
index bb2f24f..f155cfb 100644
--- a/src/main/java/de/torui/coflsky/EventRegistry.java
+++ b/src/main/java/de/torui/coflsky/EventRegistry.java
@@ -1,10 +1,10 @@
package de.torui.coflsky;
-import de.torui.coflsky.core.Command;
-import de.torui.coflsky.core.CommandType;
-import de.torui.coflsky.core.JsonStringCommand;
import java.util.UUID;
+import de.torui.coflsky.commands.Command;
+import de.torui.coflsky.commands.CommandType;
+import de.torui.coflsky.commands.JsonStringCommand;
import de.torui.coflsky.network.WSClient;
import net.minecraft.client.Minecraft;
import net.minecraft.server.MinecraftServer;
diff --git a/src/main/java/de/torui/coflsky/WSCommandHandler.java b/src/main/java/de/torui/coflsky/WSCommandHandler.java
index 287ed09..a06640c 100644
--- a/src/main/java/de/torui/coflsky/WSCommandHandler.java
+++ b/src/main/java/de/torui/coflsky/WSCommandHandler.java
@@ -2,10 +2,10 @@ package de.torui.coflsky;
import com.google.gson.reflect.TypeToken;
-import de.torui.coflsky.core.Command;
-import de.torui.coflsky.core.JsonStringCommand;
-import de.torui.coflsky.core.commandEntities.SoundData;
-import de.torui.coflsky.core.commandEntities.ChatMessageData;
+import de.torui.coflsky.commands.Command;
+import de.torui.coflsky.commands.JsonStringCommand;
+import de.torui.coflsky.commands.models.ChatMessageData;
+import de.torui.coflsky.commands.models.SoundData;
import de.torui.coflsky.network.WSClient;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.PositionedSoundRecord;
diff --git a/src/main/java/de/torui/coflsky/core/Command.java b/src/main/java/de/torui/coflsky/commands/Command.java
index e18c59a..20ab8f1 100644
--- a/src/main/java/de/torui/coflsky/core/Command.java
+++ b/src/main/java/de/torui/coflsky/commands/Command.java
@@ -1,4 +1,4 @@
-package de.torui.coflsky.core;
+package de.torui.coflsky.commands;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/de/torui/coflsky/core/CommandType.java b/src/main/java/de/torui/coflsky/commands/CommandType.java
index 74e8a41..3fac287 100644
--- a/src/main/java/de/torui/coflsky/core/CommandType.java
+++ b/src/main/java/de/torui/coflsky/commands/CommandType.java
@@ -1,4 +1,4 @@
-package de.torui.coflsky.core;
+package de.torui.coflsky.commands;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/de/torui/coflsky/core/JsonStringCommand.java b/src/main/java/de/torui/coflsky/commands/JsonStringCommand.java
index 9ce0cb1..6bc22d8 100644
--- a/src/main/java/de/torui/coflsky/core/JsonStringCommand.java
+++ b/src/main/java/de/torui/coflsky/commands/JsonStringCommand.java
@@ -1,4 +1,4 @@
-package de.torui.coflsky.core;
+package de.torui.coflsky.commands;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
diff --git a/src/main/java/de/torui/coflsky/core/commandEntities/AuctionData.java b/src/main/java/de/torui/coflsky/commands/models/AuctionData.java
index 0e677b2..ff1f705 100644
--- a/src/main/java/de/torui/coflsky/core/commandEntities/AuctionData.java
+++ b/src/main/java/de/torui/coflsky/commands/models/AuctionData.java
@@ -1,4 +1,4 @@
-package de.torui.coflsky.core.commandEntities;
+package de.torui.coflsky.commands.models;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/de/torui/coflsky/core/commandEntities/ChatMessageData.java b/src/main/java/de/torui/coflsky/commands/models/ChatMessageData.java
index cfc1381..65459c5 100644
--- a/src/main/java/de/torui/coflsky/core/commandEntities/ChatMessageData.java
+++ b/src/main/java/de/torui/coflsky/commands/models/ChatMessageData.java
@@ -1,4 +1,4 @@
-package de.torui.coflsky.core.commandEntities;
+package de.torui.coflsky.commands.models;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/de/torui/coflsky/core/commandEntities/SoundData.java b/src/main/java/de/torui/coflsky/commands/models/SoundData.java
index 64687ab..5df18d3 100644
--- a/src/main/java/de/torui/coflsky/core/commandEntities/SoundData.java
+++ b/src/main/java/de/torui/coflsky/commands/models/SoundData.java
@@ -1,4 +1,4 @@
-package de.torui.coflsky.core.commandEntities;
+package de.torui.coflsky.commands.models;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/de/torui/coflsky/network/WSClient.java b/src/main/java/de/torui/coflsky/network/WSClient.java
index b3f28ca..cd23b30 100644
--- a/src/main/java/de/torui/coflsky/network/WSClient.java
+++ b/src/main/java/de/torui/coflsky/network/WSClient.java
@@ -16,8 +16,8 @@ import com.neovisionaries.ws.client.WebSocketState;
import net.minecraft.client.Minecraft;
import de.torui.coflsky.CoflSky;
import de.torui.coflsky.WSCommandHandler;
-import de.torui.coflsky.core.Command;
-import de.torui.coflsky.core.JsonStringCommand;
+import de.torui.coflsky.commands.Command;
+import de.torui.coflsky.commands.JsonStringCommand;
public class WSClient extends WebSocketAdapter {
diff --git a/src/main/java/de/torui/coflsky/network/WSClientWrapper.java b/src/main/java/de/torui/coflsky/network/WSClientWrapper.java
index dd9d13b..6542542 100644
--- a/src/main/java/de/torui/coflsky/network/WSClientWrapper.java
+++ b/src/main/java/de/torui/coflsky/network/WSClientWrapper.java
@@ -9,8 +9,8 @@ import java.util.UUID;
import com.neovisionaries.ws.client.WebSocketException;
import de.torui.coflsky.CoflSky;
-import de.torui.coflsky.core.Command;
-import de.torui.coflsky.core.JsonStringCommand;
+import de.torui.coflsky.commands.Command;
+import de.torui.coflsky.commands.JsonStringCommand;
import de.torui.coflsky.minecraft_integration.PlayerDataProvider;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ChatComponentText;