Skip to content

Commit 6839746

Browse files
ScribbleTASScribbleTAS
committed
Renamed common to mctcommon
1 parent 9c4e1db commit 6839746

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+270
-234
lines changed

‎build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ configurations {
4444
dependencies {
4545
// tasmod dependencies
4646
embed group: 'com.dselent', name: 'bigarraylist', version: '1.0'
47+
4748
compileOnly group: 'com.minecrafttas', name: 'killtherng', version: '2.0'
4849
downloadMod group: 'com.minecrafttas', name: 'killtherng-full', version: '2.0' // for downloadKTRNG task
4950

‎gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
44
# Fabric properties
55
minecraft_version=1.12.2
66
loader_version=0.14.23
7-
loom_version=1.3-SNAPSHOT
7+
loom_version=1.4-SNAPSHOT
88

99
# Mod properties
1010
mod_name=Tool-Assisted Speedrun Mod
@@ -16,4 +16,4 @@ [email protected]
1616
# TASmod properties
1717
group=com.minecrafttas
1818
artifact=TASmod-1.12.2
19-
version=Beta1-WorkInProgress
19+
version=Beta1-SNAPHOT

‎src/main/java/com/minecrafttas/common/CommandRegistry.java ‎src/main/java/com/minecrafttas/mctcommon/CommandRegistry.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.minecrafttas.common;
1+
package com.minecrafttas.mctcommon;
22

33
import net.minecraft.command.CommandHandler;
44
import net.minecraft.command.ICommand;

‎src/main/java/com/minecrafttas/common/Configuration.java ‎src/main/java/com/minecrafttas/mctcommon/Configuration.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.minecrafttas.common;
1+
package com.minecrafttas.mctcommon;
22

33
import java.io.File;
44
import java.io.FileInputStream;
@@ -10,6 +10,8 @@
1010
import java.util.Map;
1111
import java.util.Properties;
1212

13+
import org.apache.commons.io.FileUtils;
14+
1315
/**
1416
* A <i>very</i> simple configuration class
1517
* @author Scribble
@@ -45,13 +47,13 @@ public Properties load() {
4547
newProp.loadFromXML(fis);
4648
fis.close();
4749
} catch (InvalidPropertiesFormatException e) {
48-
Common.LOGGER.error("The config file could not be read", e);
50+
MCTCommon.LOGGER.error("The config file could not be read", e);
4951
return null;
5052
} catch (FileNotFoundException e) {
51-
Common.LOGGER.warn("No config file found: {}", file);
53+
MCTCommon.LOGGER.warn("No config file found: {}", file);
5254
return null;
5355
} catch (IOException e) {
54-
Common.LOGGER.error("An error occured while reading the config", e);
56+
MCTCommon.LOGGER.error("An error occured while reading the config", e);
5557
return null;
5658
}
5759
return newProp;

‎src/main/java/com/minecrafttas/common/KeybindManager.java ‎src/main/java/com/minecrafttas/mctcommon/KeybindManager.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package com.minecrafttas.common;
1+
package com.minecrafttas.mctcommon;
22

33
import java.util.ArrayList;
44
import java.util.List;
55

66
import org.apache.commons.lang3.ArrayUtils;
77

8-
import com.minecrafttas.common.events.EventClient.EventClientGameLoop;
8+
import com.minecrafttas.mctcommon.events.EventClient.EventClientGameLoop;
9+
import com.minecrafttas.mctcommon.mixin.AccessorKeyBinding;
910

1011
import net.minecraft.client.Minecraft;
1112
import net.minecraft.client.settings.GameSettings;
@@ -71,8 +72,8 @@ public KeyBinding registerKeybind(Keybind keybind) {
7172

7273
// add category
7374
GameSettings options = Minecraft.getMinecraft().gameSettings;
74-
if (!KeyBinding.CATEGORY_ORDER.containsKey(keybind.category))
75-
KeyBinding.CATEGORY_ORDER.put(keybind.category, KeyBinding.CATEGORY_ORDER.size() + 1);
75+
if (!AccessorKeyBinding.getCategoryOrder().containsKey(keybind.category))
76+
AccessorKeyBinding.getCategoryOrder().put(keybind.category, AccessorKeyBinding.getCategoryOrder().size() + 1);
7677

7778
// add keybinding
7879
options.keyBindings = ArrayUtils.add(options.keyBindings, keyBinding);

‎src/main/java/com/minecrafttas/common/Common.java ‎src/main/java/com/minecrafttas/mctcommon/MCTCommon.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.minecrafttas.common;
1+
package com.minecrafttas.mctcommon;
22

33
import org.apache.logging.log4j.LogManager;
44
import org.apache.logging.log4j.Logger;
55
import org.apache.logging.log4j.Marker;
66
import org.apache.logging.log4j.MarkerManager;
77

8-
public class Common {
9-
public static final Logger LOGGER = LogManager.getLogger("Common");
8+
public class MCTCommon {
9+
public static final Logger LOGGER = LogManager.getLogger("MCTCommon");
1010

1111
public static final Marker Event = MarkerManager.getMarker("Event");
1212

@@ -15,4 +15,5 @@ public class Common {
1515
public static final Marker Client = MarkerManager.getMarker("Client");
1616

1717
public static final Marker Timeout = MarkerManager.getMarker("Timeout");
18+
1819
}

‎src/main/java/com/minecrafttas/common/events/CompactPacketHandler.java ‎src/main/java/com/minecrafttas/mctcommon/events/CompactPacketHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.minecrafttas.common.events;
1+
package com.minecrafttas.mctcommon.events;
22

33
import java.nio.ByteBuffer;
44

5-
import com.minecrafttas.common.server.exception.PacketNotImplementedException;
5+
import com.minecrafttas.mctcommon.server.exception.PacketNotImplementedException;
66

77
@FunctionalInterface
88
public interface CompactPacketHandler {

‎src/main/java/com/minecrafttas/common/events/EventClient.java ‎src/main/java/com/minecrafttas/mctcommon/events/EventClient.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.minecrafttas.common.events;
1+
package com.minecrafttas.mctcommon.events;
22

3-
import com.minecrafttas.common.Common;
4-
import com.minecrafttas.common.events.EventListenerRegistry.EventBase;
5-
import com.minecrafttas.common.server.Client;
3+
import com.minecrafttas.mctcommon.MCTCommon;
4+
import com.minecrafttas.mctcommon.events.EventListenerRegistry.EventBase;
5+
import com.minecrafttas.mctcommon.server.Client;
66
import com.mojang.authlib.GameProfile;
77

88
import net.minecraft.client.Minecraft;
@@ -26,7 +26,7 @@ public static interface EventOpenGui extends EventBase {
2626
public GuiScreen onOpenGui(GuiScreen gui);
2727

2828
public static GuiScreen fireOpenGuiEvent(GuiScreen gui) {
29-
Common.LOGGER.trace(Common.Event, "Firing OpenGuiEvent");
29+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing OpenGuiEvent");
3030
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
3131
if(eventListener instanceof EventOpenGui) {
3232
EventOpenGui event = (EventOpenGui) eventListener;
@@ -53,7 +53,7 @@ public static interface EventLaunchIntegratedServer extends EventBase {
5353
public void onLaunchIntegratedServer();
5454

5555
public static void fireOnLaunchIntegratedServer() {
56-
Common.LOGGER.trace(Common.Event, "Firing LaunchIntegratedServer");
56+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing LaunchIntegratedServer");
5757
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
5858
if(eventListener instanceof EventLaunchIntegratedServer) {
5959
EventLaunchIntegratedServer event = (EventLaunchIntegratedServer) eventListener;
@@ -76,7 +76,7 @@ public static interface EventDoneLoadingWorld extends EventBase {
7676
public void onDoneLoadingWorld();
7777

7878
public static void fireOnDoneLoadingWorld() {
79-
Common.LOGGER.trace(Common.Event, "Firing DoneLoadingWorld");
79+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing DoneLoadingWorld");
8080
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
8181
if(eventListener instanceof EventDoneLoadingWorld) {
8282
EventDoneLoadingWorld event = (EventDoneLoadingWorld) eventListener;
@@ -123,7 +123,7 @@ public static interface EventClientInit extends EventBase {
123123
public void onClientInit(Minecraft mc);
124124

125125
public static void fireOnClientInit(Minecraft mc) {
126-
Common.LOGGER.trace(Common.Event, "Firing ClientInit");
126+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing ClientInit");
127127
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
128128
if(eventListener instanceof EventClientInit) {
129129
EventClientInit event = (EventClientInit) eventListener;
@@ -223,7 +223,7 @@ public static interface EventPlayerLeaveClientSide extends EventBase {
223223
public void onPlayerLeaveClientSide(EntityPlayerSP player);
224224

225225
public static void firePlayerLeaveClientSide(EntityPlayerSP player) {
226-
Common.LOGGER.trace(Common.Event, "Firing PlayerLeaveClientSideEvent");
226+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing PlayerLeaveClientSideEvent");
227227
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
228228
if(eventListener instanceof EventPlayerLeaveClientSide) {
229229
EventPlayerLeaveClientSide event = (EventPlayerLeaveClientSide) eventListener;
@@ -247,7 +247,7 @@ public static interface EventPlayerJoinedClientSide extends EventBase {
247247
public void onPlayerJoinedClientSide(EntityPlayerSP player);
248248

249249
public static void firePlayerJoinedClientSide(EntityPlayerSP player) {
250-
Common.LOGGER.trace(Common.Event, "Firing PlayerJoinedClientSide");
250+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing PlayerJoinedClientSide");
251251
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
252252
if(eventListener instanceof EventPlayerJoinedClientSide) {
253253
EventPlayerJoinedClientSide event = (EventPlayerJoinedClientSide) eventListener;
@@ -273,7 +273,7 @@ public static interface EventOtherPlayerJoinedClientSide extends EventBase {
273273

274274

275275
public static void fireOtherPlayerJoinedClientSide(GameProfile profile) {
276-
Common.LOGGER.trace(Common.Event, "Firing OtherPlayerJoinedClientSide");
276+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing OtherPlayerJoinedClientSide");
277277
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
278278
if(eventListener instanceof EventOtherPlayerJoinedClientSide) {
279279
EventOtherPlayerJoinedClientSide event = (EventOtherPlayerJoinedClientSide) eventListener;
@@ -296,7 +296,7 @@ public static interface EventDisconnectClient extends EventBase {
296296
public void onDisconnectClient(Client client);
297297

298298
public static void fireDisconnectClient(Client client) {
299-
Common.LOGGER.trace(Common.Event, "Firing EventDisconnectClient");
299+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing EventDisconnectClient");
300300
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
301301
if(eventListener instanceof EventDisconnectClient) {
302302
EventDisconnectClient event = (EventDisconnectClient) eventListener;

‎src/main/java/com/minecrafttas/common/events/EventListenerRegistry.java ‎src/main/java/com/minecrafttas/mctcommon/events/EventListenerRegistry.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.minecrafttas.common.events;
1+
package com.minecrafttas.mctcommon.events;
22

33
import java.util.ArrayList;
44

‎src/main/java/com/minecrafttas/common/events/EventServer.java ‎src/main/java/com/minecrafttas/mctcommon/events/EventServer.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.minecrafttas.common.events;
1+
package com.minecrafttas.mctcommon.events;
22

3-
import com.minecrafttas.common.Common;
4-
import com.minecrafttas.common.events.EventListenerRegistry.EventBase;
5-
import com.minecrafttas.common.server.Client;
3+
import com.minecrafttas.mctcommon.MCTCommon;
4+
import com.minecrafttas.mctcommon.events.EventListenerRegistry.EventBase;
5+
import com.minecrafttas.mctcommon.server.Client;
66

77
import net.minecraft.entity.player.EntityPlayerMP;
88
import net.minecraft.server.MinecraftServer;
@@ -23,7 +23,7 @@ public static interface EventServerInit extends EventBase {
2323
public void onServerInit(MinecraftServer server);
2424

2525
public static void fireServerStartEvent(MinecraftServer server) {
26-
Common.LOGGER.trace(Common.Event, "Firing ServerStartEvent");
26+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing ServerStartEvent");
2727
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
2828
if (eventListener instanceof EventServerInit) {
2929
EventServerInit event = (EventServerInit) eventListener;
@@ -73,7 +73,7 @@ public static interface EventServerStop extends EventBase {
7373
public void onServerStop(MinecraftServer server);
7474

7575
public static void fireOnServerStop(MinecraftServer server) {
76-
Common.LOGGER.trace(Common.Event, "Firing ServerStopEvent");
76+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing ServerStopEvent");
7777
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
7878
if (eventListener instanceof EventServerStop) {
7979
EventServerStop event = (EventServerStop) eventListener;
@@ -111,7 +111,7 @@ public static interface EventPlayerJoinedServerSide extends EventBase {
111111
public void onPlayerJoinedServerSide(EntityPlayerMP player);
112112

113113
public static void firePlayerJoinedServerSide(EntityPlayerMP player) {
114-
Common.LOGGER.trace(Common.Event, "Firing PlayerJoinedServerSide");
114+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing PlayerJoinedServerSide");
115115
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
116116
if (eventListener instanceof EventPlayerJoinedServerSide) {
117117
EventPlayerJoinedServerSide event = (EventPlayerJoinedServerSide) eventListener;
@@ -135,7 +135,7 @@ public static interface EventPlayerLeaveServerSide extends EventBase {
135135
public void onPlayerLeaveServerSide(EntityPlayerMP player);
136136

137137
public static void firePlayerLeaveServerSide(EntityPlayerMP player) {
138-
Common.LOGGER.trace(Common.Event, "Firing PlayerLeaveServerSideEvent");
138+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing PlayerLeaveServerSideEvent");
139139
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
140140
if (eventListener instanceof EventPlayerLeaveServerSide) {
141141
EventPlayerLeaveServerSide event = (EventPlayerLeaveServerSide) eventListener;
@@ -157,7 +157,7 @@ public static interface EventClientCompleteAuthentication extends EventBase {
157157
public void onClientCompleteAuthentication(String username);
158158

159159
public static void fireClientCompleteAuthentication(String username) {
160-
Common.LOGGER.trace(Common.Event, "Firing ClientCompleteAuthenticationEvent");
160+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing ClientCompleteAuthenticationEvent");
161161
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
162162
if (eventListener instanceof EventClientCompleteAuthentication) {
163163
EventClientCompleteAuthentication event = (EventClientCompleteAuthentication) eventListener;
@@ -179,7 +179,7 @@ public static interface EventDisconnectServer extends EventBase {
179179
public void onDisconnectServer(Client client);
180180

181181
public static void fireDisconnectServer(Client client) {
182-
Common.LOGGER.trace(Common.Event, "Firing CustomServerClientDisconnect");
182+
MCTCommon.LOGGER.trace(MCTCommon.Event, "Firing CustomServerClientDisconnect");
183183
for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
184184
if(eventListener instanceof EventDisconnectServer) {
185185
EventDisconnectServer event = (EventDisconnectServer) eventListener;

‎src/main/java/com/minecrafttas/mctcommon/mixin/AccessorKeyBinding.java

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.minecrafttas.mctcommon.mixin;
2+
3+
import java.util.Map;
4+
5+
import org.apache.commons.lang3.NotImplementedException;
6+
import org.spongepowered.asm.mixin.Mixin;
7+
import org.spongepowered.asm.mixin.gen.Accessor;
8+
9+
import net.minecraft.client.settings.KeyBinding;
10+
11+
@Mixin(KeyBinding.class)
12+
public interface AccessorKeyBinding{
13+
14+
@Accessor("CATEGORY_ORDER")
15+
public static Map<String, Integer> getCategoryOrder() {
16+
throw new NotImplementedException("WEE WOO");
17+
}
18+
}

‎src/main/java/com/minecrafttas/common/mixin/MixinEntityRenderer.java ‎src/main/java/com/minecrafttas/mctcommon/mixin/MixinEntityRenderer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.minecrafttas.common.mixin;
1+
package com.minecrafttas.mctcommon.mixin;
22

33
import org.spongepowered.asm.mixin.Mixin;
44
import org.spongepowered.asm.mixin.injection.At;
55
import org.spongepowered.asm.mixin.injection.ModifyArg;
66

7-
import com.minecrafttas.common.events.EventClient.EventCamera;
8-
import com.minecrafttas.common.events.EventClient.EventCamera.CameraData;
7+
import com.minecrafttas.mctcommon.events.EventClient.EventCamera;
8+
import com.minecrafttas.mctcommon.events.EventClient.EventCamera.CameraData;
99

1010
import net.minecraft.client.renderer.EntityRenderer;
1111
import net.minecraft.client.renderer.GlStateManager;

‎src/main/java/com/minecrafttas/common/mixin/MixinMinecraft.java ‎src/main/java/com/minecrafttas/mctcommon/mixin/MixinMinecraft.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.minecrafttas.common.mixin;
1+
package com.minecrafttas.mctcommon.mixin;
22

33
import org.objectweb.asm.Opcodes;
44
import org.spongepowered.asm.mixin.Mixin;
@@ -8,12 +8,12 @@
88
import org.spongepowered.asm.mixin.injection.Redirect;
99
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1010

11-
import com.minecrafttas.common.events.EventClient.EventClientGameLoop;
12-
import com.minecrafttas.common.events.EventClient.EventClientInit;
13-
import com.minecrafttas.common.events.EventClient.EventClientTick;
14-
import com.minecrafttas.common.events.EventClient.EventDoneLoadingWorld;
15-
import com.minecrafttas.common.events.EventClient.EventLaunchIntegratedServer;
16-
import com.minecrafttas.common.events.EventClient.EventOpenGui;
11+
import com.minecrafttas.mctcommon.events.EventClient.EventClientGameLoop;
12+
import com.minecrafttas.mctcommon.events.EventClient.EventClientInit;
13+
import com.minecrafttas.mctcommon.events.EventClient.EventClientTick;
14+
import com.minecrafttas.mctcommon.events.EventClient.EventDoneLoadingWorld;
15+
import com.minecrafttas.mctcommon.events.EventClient.EventLaunchIntegratedServer;
16+
import com.minecrafttas.mctcommon.events.EventClient.EventOpenGui;
1717

1818
import net.minecraft.client.Minecraft;
1919
import net.minecraft.client.gui.GuiScreen;

‎src/main/java/com/minecrafttas/common/mixin/MixinMinecraftServer.java ‎src/main/java/com/minecrafttas/mctcommon/mixin/MixinMinecraftServer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package com.minecrafttas.common.mixin;
1+
package com.minecrafttas.mctcommon.mixin;
22

33
import org.spongepowered.asm.mixin.Mixin;
44
import org.spongepowered.asm.mixin.injection.At;
55
import org.spongepowered.asm.mixin.injection.At.Shift;
66
import org.spongepowered.asm.mixin.injection.Inject;
77
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
88

9-
import com.minecrafttas.common.events.EventServer.EventServerGameLoop;
10-
import com.minecrafttas.common.events.EventServer.EventServerInit;
11-
import com.minecrafttas.common.events.EventServer.EventServerStop;
12-
import com.minecrafttas.common.events.EventServer.EventServerTick;
9+
import com.minecrafttas.mctcommon.events.EventServer.EventServerGameLoop;
10+
import com.minecrafttas.mctcommon.events.EventServer.EventServerInit;
11+
import com.minecrafttas.mctcommon.events.EventServer.EventServerStop;
12+
import com.minecrafttas.mctcommon.events.EventServer.EventServerTick;
1313

1414
import net.minecraft.server.MinecraftServer;
1515

‎src/main/java/com/minecrafttas/common/mixin/MixinNetHandlerPlayClient.java ‎src/main/java/com/minecrafttas/mctcommon/mixin/MixinNetHandlerPlayClient.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.minecrafttas.common.mixin;
1+
package com.minecrafttas.mctcommon.mixin;
22

33
import java.net.ConnectException;
44

@@ -8,8 +8,8 @@
88
import org.spongepowered.asm.mixin.injection.Inject;
99
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1010

11-
import com.minecrafttas.common.events.EventClient.EventOtherPlayerJoinedClientSide;
12-
import com.minecrafttas.common.events.EventClient.EventPlayerJoinedClientSide;
11+
import com.minecrafttas.mctcommon.events.EventClient.EventOtherPlayerJoinedClientSide;
12+
import com.minecrafttas.mctcommon.events.EventClient.EventPlayerJoinedClientSide;
1313

1414
import net.minecraft.client.Minecraft;
1515
import net.minecraft.client.network.NetHandlerPlayClient;

‎src/main/java/com/minecrafttas/common/mixin/MixinPlayerList.java ‎src/main/java/com/minecrafttas/mctcommon/mixin/MixinPlayerList.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.minecrafttas.common.mixin;
1+
package com.minecrafttas.mctcommon.mixin;
22

33
import org.spongepowered.asm.mixin.Mixin;
44
import org.spongepowered.asm.mixin.injection.At;
55
import org.spongepowered.asm.mixin.injection.Inject;
66
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
77

8-
import com.minecrafttas.common.events.EventServer.EventPlayerJoinedServerSide;
9-
import com.minecrafttas.common.events.EventServer.EventPlayerLeaveServerSide;
8+
import com.minecrafttas.mctcommon.events.EventServer.EventPlayerJoinedServerSide;
9+
import com.minecrafttas.mctcommon.events.EventServer.EventPlayerLeaveServerSide;
1010

1111
import net.minecraft.entity.player.EntityPlayerMP;
1212
import net.minecraft.network.NetworkManager;

0 commit comments

Comments
 (0)