diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java index b82b4be..497c548 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java @@ -1,20 +1,14 @@ package mcp.mobius.opis.commands.server; -import mcp.mobius.opis.modOpis; import mcp.mobius.opis.commands.IOpisCommand; -import mcp.mobius.opis.data.managers.EntityManager; import mcp.mobius.opis.data.managers.MetaManager; -import mcp.mobius.opis.data.managers.TileEntityManager; -import mcp.mobius.opis.events.OpisServerTickHandler; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataCommand; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.dedicated.DedicatedServer; import net.minecraft.util.ChatComponentText; @@ -66,7 +60,7 @@ public class CommandReset extends CommandBase implements IOpisCommand { @Override public String getDescription() { - return "Cleans up all profiling data and remove client block overlay."; + return "Cleans up all profiling data."; } } diff --git a/src/main/java/mcp/mobius/opis/modOpis.java b/src/main/java/mcp/mobius/opis/modOpis.java index b5d9659..18e2e57 100644 --- a/src/main/java/mcp/mobius/opis/modOpis.java +++ b/src/main/java/mcp/mobius/opis/modOpis.java @@ -61,7 +61,6 @@ public class modOpis { public Configuration config = null; public static String commentTables = "Minimum access level to be able to view tables in /opis command. Valid values : NONE, PRIVILEGED, ADMIN"; - public static String commentOverlays = "Minimum access level to be able to show overlays in MapWriter. Valid values : NONE, PRIVILEGED, ADMIN"; public static String commentOpis = "Minimum access level to be open Opis interface. Valid values : NONE, PRIVILEGED, ADMIN"; public static String commentPrivileged = "List of players with PRIVILEGED access level."; @@ -80,11 +79,9 @@ public class modOpis { String[] users = config.get("ACCESS_RIGHTS", "privileged", new String[]{}, commentPrivileged).getStringList(); AccessLevel minTables = AccessLevel.PRIVILEGED; - AccessLevel minOverlays = AccessLevel.PRIVILEGED; AccessLevel openOpis = AccessLevel.PRIVILEGED; try{ openOpis = AccessLevel.valueOf(config.get("ACCESS_RIGHTS", "opis", "NONE", commentTables).getString()); } catch (IllegalArgumentException e){} try{ minTables = AccessLevel.valueOf(config.get("ACCESS_RIGHTS", "tables", "NONE", commentTables).getString()); } catch (IllegalArgumentException e){} - try{ minOverlays = AccessLevel.valueOf(config.get("ACCESS_RIGHTS", "overlays", "NONE", commentOverlays).getString()); } catch (IllegalArgumentException e){} Message.setTablesMinimumLevel(minTables); Message.setOpisMinimumLevel(openOpis); @@ -99,16 +96,13 @@ public class modOpis { FMLCommonHandler.instance().bus().register(OpisClientTickHandler.INSTANCE); FMLCommonHandler.instance().bus().register(OpisServerTickHandler.INSTANCE); FMLCommonHandler.instance().bus().register(PlayerTracker.INSTANCE); - //Packet.addIdClassMapping(251, true, true, Packet251Extended.class); - + PacketManager.init(); } @EventHandler public void load(FMLInitializationEvent event) { - //TickRegistry.registerTickHandler(OpisServerTickHandler.INSTANCE, Side.SERVER); - //TickRegistry.registerTickHandler(OpisClientTickHandler.INSTANCE, Side.CLIENT); - + if (lagGenID != -1){ Block blockDemo = new BlockLag(Material.wood); GameRegistry.registerBlock(blockDemo, "opis.laggen"); @@ -122,8 +116,6 @@ public class modOpis { ProfilerSection.RENDER_TILEENTITY .setProfiler(new ProfilerRenderTileEntity()); ProfilerSection.RENDER_ENTITY .setProfiler(new ProfilerRenderEntity()); ProfilerSection.RENDER_BLOCK .setProfiler(new ProfilerRenderBlock()); - //ProfilerSection.HANDLER_TICKSTART .setProfiler(new ProfilerHandler()); - //ProfilerSection.HANDLER_TICKSTOP .setProfiler(new ProfilerHandler()); ProfilerSection.EVENT_INVOKE .setProfiler(new ProfilerEvent()); } diff --git a/src/main/resources/assets/mapwriter/lang/en_US.lang b/src/main/resources/assets/mapwriter/lang/en_US.lang deleted file mode 100644 index 3ad0e73..0000000 --- a/src/main/resources/assets/mapwriter/lang/en_US.lang +++ /dev/null @@ -1,8 +0,0 @@ -key.mw_open_gui=Open map GUI -key.mw_new_marker=New Waypoint -key.mw_next_map_mode=Next map mode -key.mw_next_marker_group=Next waypoint group -key.mw_teleport=Teleport to waypoint -key.mw_zoom_in=Minimap zoom in -key.mw_zoom_out=Minimap zoom out -key.mw_underground_mode=Underground map mode diff --git a/src/main/resources/assets/mapwriter/textures/map/arrow_north.png b/src/main/resources/assets/mapwriter/textures/map/arrow_north.png deleted file mode 100644 index 16a4cb5..0000000 Binary files a/src/main/resources/assets/mapwriter/textures/map/arrow_north.png and /dev/null differ diff --git a/src/main/resources/assets/mapwriter/textures/map/arrow_player.png b/src/main/resources/assets/mapwriter/textures/map/arrow_player.png deleted file mode 100644 index 4767437..0000000 Binary files a/src/main/resources/assets/mapwriter/textures/map/arrow_player.png and /dev/null differ diff --git a/src/main/resources/assets/mapwriter/textures/map/background.png b/src/main/resources/assets/mapwriter/textures/map/background.png deleted file mode 100644 index e67bcd3..0000000 Binary files a/src/main/resources/assets/mapwriter/textures/map/background.png and /dev/null differ diff --git a/src/main/resources/assets/mapwriter/textures/map/border_round.png b/src/main/resources/assets/mapwriter/textures/map/border_round.png deleted file mode 100644 index d4b4b07..0000000 Binary files a/src/main/resources/assets/mapwriter/textures/map/border_round.png and /dev/null differ diff --git a/src/main/resources/assets/mapwriter/textures/map/border_square.png b/src/main/resources/assets/mapwriter/textures/map/border_square.png deleted file mode 100644 index 092e583..0000000 Binary files a/src/main/resources/assets/mapwriter/textures/map/border_square.png and /dev/null differ