moved protobufs into distinct package for Source 1

Author: spheenik

README.md

@@ -9,9 +9,10 @@ This is the README for version 1 of the library, so you might wanna check out
 
 ### Upgrading from an earlier 1.x
 The protobuf-classes used by clarity have been factored out into a separate project, to make reuse among
-v1 and v2 possible. While doing that I also moved them to another package, so when you want to move to 1.2
-you might have to adjust a lot of imports. A global search and replace from `com.dota2.proto.` to 
-`skadistats.clarity.wire.proto.` on your whole project should do the trick.
+v1 and v2 possible. While doing that I also moved them to another package, so if you want to move to 1.3
+you have to adjust a lot of imports. A global search and replace from `com.dota2.proto.` (up to 1.1) or 
+`skadistats.clarity.wire.proto.` (1.2) to `skadistats.clarity.wire.s1.proto.` on your whole project 
+should do the trick.
 
 # Replay Data
 
@@ -74,7 +75,7 @@ To use the stable version, add the following dependency in your pom.xml, and you
 <dependency>
 	<groupId>com.skadistats</groupId>
 	<artifactId>clarity</artifactId>
-	<version>1.2</version>
+	<version>1.3</version>
 </dependency>
 ```
 

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.skadistats</groupId>
 	<artifactId>clarity</artifactId>
-	<version>1.2</version>
+	<version>1.3</version>
 	<packaging>jar</packaging>
 	<name>clarity</name>
 	<description>Clarity is a fast, almost complete replay parser for Dota 2.</description>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.skadistats</groupId>
             <artifactId>clarity-protobuf</artifactId>
-            <version>LATEST</version>
+            <version>[2,)</version>
         </dependency>
         <dependency>
 			<groupId>org.xerial.snappy</groupId>

src/main/java/skadistats/clarity/Clarity.java

@@ -1,7 +1,7 @@
 package skadistats.clarity;
 
 import skadistats.clarity.parser.*;
-import skadistats.clarity.wire.proto.Demo.CDemoFileInfo;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoFileInfo;
 
 import java.io.FileInputStream;
 import java.io.IOException;

src/main/java/skadistats/clarity/match/Match.java

@@ -7,7 +7,7 @@
 import skadistats.clarity.model.Entity;
 import skadistats.clarity.model.GameRulesStateType;
 import skadistats.clarity.parser.Peek;
-import skadistats.clarity.wire.proto.Demo.CDemoFileInfo;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoFileInfo;
 
 import java.util.Iterator;
 

src/main/java/skadistats/clarity/match/ModifierCollection.java

@@ -2,7 +2,7 @@
 
 import com.rits.cloning.Cloner;
 import skadistats.clarity.model.ModifierTableEntry;
-import skadistats.clarity.wire.proto.DotaModifiers.CDOTAModifierBuffTableEntry;
+import skadistats.clarity.wire.s1.proto.DotaModifiers.CDOTAModifierBuffTableEntry;
 
 import java.util.HashMap;
 import java.util.LinkedList;

src/main/java/skadistats/clarity/model/ModifierTableEntry.java

@@ -1,6 +1,6 @@
 package skadistats.clarity.model;
 
-import skadistats.clarity.wire.proto.DotaModifiers.CDOTAModifierBuffTableEntry;
+import skadistats.clarity.wire.s1.proto.DotaModifiers.CDOTAModifierBuffTableEntry;
 
 import javax.vecmath.Vector2f;
 import javax.vecmath.Vector3f;

src/main/java/skadistats/clarity/parser/DemoIndex.java

@@ -6,10 +6,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import skadistats.clarity.model.PacketType;
-import skadistats.clarity.wire.proto.Demo.CDemoStop;
-import skadistats.clarity.wire.proto.Demo.CDemoStringTables;
-import skadistats.clarity.wire.proto.Demo.CDemoSyncTick;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_PacketEntities;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoStop;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoStringTables;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoSyncTick;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_PacketEntities;
 
 import java.io.IOException;
 import java.util.ArrayList;

src/main/java/skadistats/clarity/parser/DemoInputStream.java

@@ -7,10 +7,10 @@
 import org.slf4j.LoggerFactory;
 import org.xerial.snappy.Snappy;
 import skadistats.clarity.parser.Peek.BorderType;
-import skadistats.clarity.wire.PacketTypes;
-import skadistats.clarity.wire.proto.Demo.*;
-import skadistats.clarity.wire.proto.Networkbasetypes.CNETMsg_Tick;
-import skadistats.clarity.wire.proto.Networkbasetypes.CSVCMsg_UserMessage;
+import skadistats.clarity.wire.s1.PacketTypes;
+import skadistats.clarity.wire.s1.proto.Demo.*;
+import skadistats.clarity.wire.s1.proto.Networkbasetypes.CNETMsg_Tick;
+import skadistats.clarity.wire.s1.proto.Networkbasetypes.CSVCMsg_UserMessage;
 
 import java.io.Closeable;
 import java.io.IOException;

src/main/java/skadistats/clarity/parser/Profile.java

@@ -1,9 +1,9 @@
 package skadistats.clarity.parser;
 
-import skadistats.clarity.wire.proto.Demo;
-import skadistats.clarity.wire.proto.DotaUsermessages;
-import skadistats.clarity.wire.proto.Netmessages;
-import skadistats.clarity.wire.proto.Networkbasetypes;
+import skadistats.clarity.wire.s1.proto.Demo;
+import skadistats.clarity.wire.s1.proto.DotaUsermessages;
+import skadistats.clarity.wire.s1.proto.Netmessages;
+import skadistats.clarity.wire.s1.proto.Networkbasetypes;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/skadistats/clarity/parser/handler/DemClassInfoHandler.java

@@ -6,8 +6,8 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Demo.CDemoClassInfo;
-import skadistats.clarity.wire.proto.Demo.CDemoClassInfo.class_t;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoClassInfo;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoClassInfo.class_t;
 
 @RegisterHandler(CDemoClassInfo.class)
 public class DemClassInfoHandler implements Handler<CDemoClassInfo> {

src/main/java/skadistats/clarity/parser/handler/DemFileHeaderHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Demo.CDemoFileHeader;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoFileHeader;
 
 @RegisterHandler(CDemoFileHeader.class)
 public class DemFileHeaderHandler implements Handler<CDemoFileHeader> {

src/main/java/skadistats/clarity/parser/handler/DemFileInfoHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Demo.CDemoFileInfo;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoFileInfo;
 
 @RegisterHandler(CDemoFileInfo.class)
 public class DemFileInfoHandler implements Handler<CDemoFileInfo> {

src/main/java/skadistats/clarity/parser/handler/DemSaveGameHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Demo.CDemoSaveGame;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoSaveGame;
 
 @RegisterHandler(CDemoSaveGame.class)
 public class DemSaveGameHandler implements Handler<CDemoSaveGame> {

src/main/java/skadistats/clarity/parser/handler/DemStopHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Demo.CDemoStop;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoStop;
 
 @RegisterHandler(CDemoStop.class)
 public class DemStopHandler implements Handler<CDemoStop> {

src/main/java/skadistats/clarity/parser/handler/DemStringTablesHandler.java

@@ -6,9 +6,9 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Demo.CDemoStringTables;
-import skadistats.clarity.wire.proto.Demo.CDemoStringTables.items_t;
-import skadistats.clarity.wire.proto.Demo.CDemoStringTables.table_t;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoStringTables;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoStringTables.items_t;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoStringTables.table_t;
 
 import java.util.List;
 

src/main/java/skadistats/clarity/parser/handler/DemSyncTickHandler.java

@@ -9,7 +9,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Demo.CDemoSyncTick;
+import skadistats.clarity.wire.s1.proto.Demo.CDemoSyncTick;
 
 import java.util.Iterator;
 import java.util.List;

src/main/java/skadistats/clarity/parser/handler/NetSetConVarHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Networkbasetypes.CNETMsg_SetConVar;
+import skadistats.clarity.wire.s1.proto.Networkbasetypes.CNETMsg_SetConVar;
 
 @RegisterHandler(CNETMsg_SetConVar.class)
 public class NetSetConVarHandler implements Handler<CNETMsg_SetConVar> {

src/main/java/skadistats/clarity/parser/handler/NetSignonStateHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Networkbasetypes.CNETMsg_SignonState;
+import skadistats.clarity.wire.s1.proto.Networkbasetypes.CNETMsg_SignonState;
 
 @RegisterHandler(CNETMsg_SignonState.class)
 public class NetSignonStateHandler implements Handler<CNETMsg_SignonState> {

src/main/java/skadistats/clarity/parser/handler/NetTickHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Networkbasetypes.CNETMsg_Tick;
+import skadistats.clarity.wire.s1.proto.Networkbasetypes.CNETMsg_Tick;
 
 @RegisterHandler(CNETMsg_Tick.class)
 public class NetTickHandler implements Handler<CNETMsg_Tick> {

src/main/java/skadistats/clarity/parser/handler/StringTableApplier.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.match.Match;
 import skadistats.clarity.model.ModifierTableEntry;
 import skadistats.clarity.parser.HandlerHelper;
-import skadistats.clarity.wire.proto.DotaModifiers.CDOTAModifierBuffTableEntry;
+import skadistats.clarity.wire.s1.proto.DotaModifiers.CDOTAModifierBuffTableEntry;
 
 public enum StringTableApplier {
 

src/main/java/skadistats/clarity/parser/handler/SvcClassInfoHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_ClassInfo;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_ClassInfo;
 
 @RegisterHandler(CSVCMsg_ClassInfo.class)
 public class SvcClassInfoHandler implements Handler<CSVCMsg_ClassInfo> {

src/main/java/skadistats/clarity/parser/handler/SvcCreateStringTableHandler.java

@@ -9,7 +9,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_CreateStringTable;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_CreateStringTable;
 
 import java.util.List;
 

src/main/java/skadistats/clarity/parser/handler/SvcGameEventHandler.java

@@ -8,8 +8,8 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Networkbasetypes.CSVCMsg_GameEvent;
-import skadistats.clarity.wire.proto.Networkbasetypes.CSVCMsg_GameEvent.key_t;
+import skadistats.clarity.wire.s1.proto.Networkbasetypes.CSVCMsg_GameEvent;
+import skadistats.clarity.wire.s1.proto.Networkbasetypes.CSVCMsg_GameEvent.key_t;
 
 @RegisterHandler(CSVCMsg_GameEvent.class)
 public class SvcGameEventHandler implements Handler<CSVCMsg_GameEvent> {

src/main/java/skadistats/clarity/parser/handler/SvcGameEventListHandler.java

@@ -7,9 +7,9 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_GameEventList;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_GameEventList.descriptor_t;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_GameEventList.key_t;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_GameEventList;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_GameEventList.descriptor_t;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_GameEventList.key_t;
 
 @RegisterHandler(CSVCMsg_GameEventList.class)
 public class SvcGameEventListHandler implements Handler<CSVCMsg_GameEventList> {

src/main/java/skadistats/clarity/parser/handler/SvcPacketEntitiesHandler.java

@@ -7,7 +7,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_PacketEntities;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_PacketEntities;
 
 @RegisterHandler(CSVCMsg_PacketEntities.class)
 public class SvcPacketEntitiesHandler implements Handler<CSVCMsg_PacketEntities> {

src/main/java/skadistats/clarity/parser/handler/SvcSendTableHandler.java

@@ -10,8 +10,8 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_SendTable;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_SendTable.sendprop_t;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_SendTable;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_SendTable.sendprop_t;
 
 import java.util.LinkedList;
 

src/main/java/skadistats/clarity/parser/handler/SvcServerInfoHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_ServerInfo;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_ServerInfo;
 
 @RegisterHandler(CSVCMsg_ServerInfo.class)
 public class SvcServerInfoHandler implements Handler<CSVCMsg_ServerInfo> {

src/main/java/skadistats/clarity/parser/handler/SvcSetViewHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_SetView;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_SetView;
 
 @RegisterHandler(CSVCMsg_SetView.class)
 public class SvcSetViewHandler implements Handler<CSVCMsg_SetView> {

src/main/java/skadistats/clarity/parser/handler/SvcSoundsHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_Sounds;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_Sounds;
 
 @RegisterHandler(CSVCMsg_Sounds.class)
 public class SvcSoundsHandler implements Handler<CSVCMsg_Sounds> {

src/main/java/skadistats/clarity/parser/handler/SvcTempEntitiesHandler.java

@@ -7,7 +7,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_TempEntities;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_TempEntities;
 
 @RegisterHandler(CSVCMsg_TempEntities.class)
 public class SvcTempEntitiesHandler implements Handler<CSVCMsg_TempEntities> {

src/main/java/skadistats/clarity/parser/handler/SvcUpdateStringTableHandler.java

@@ -9,7 +9,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_UpdateStringTable;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_UpdateStringTable;
 
 import java.util.List;
 

src/main/java/skadistats/clarity/parser/handler/SvcVoiceDataHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_VoiceData;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_VoiceData;
 
 @RegisterHandler(CSVCMsg_VoiceData.class)
 public class SvcVoiceDataHandler implements Handler<CSVCMsg_VoiceData> {

src/main/java/skadistats/clarity/parser/handler/SvcVoiceInitHandler.java

@@ -6,7 +6,7 @@
 import skadistats.clarity.parser.Handler;
 import skadistats.clarity.parser.HandlerHelper;
 import skadistats.clarity.parser.RegisterHandler;
-import skadistats.clarity.wire.proto.Netmessages.CSVCMsg_VoiceInit;
+import skadistats.clarity.wire.s1.proto.Netmessages.CSVCMsg_VoiceInit;
 
 @RegisterHandler(CSVCMsg_VoiceInit.class)
 public class SvcVoiceInitHandler implements Handler<CSVCMsg_VoiceInit> {