From 854f4d49407e45d67dd5754afd21a7e59970ca5b Mon Sep 17 00:00:00 2001
From: Joseph Burton
Date: Sun, 3 May 2020 21:06:38 +0100
Subject: Multiplayer support (#221)

* First pass on multiplayer

* Apply review suggestions

* Dedicated Enigma server

* Don't jump to references when other users do stuff

* Better UI + translations

* french translation

* Apply review suggestions

* Document the protocol

* Fix most issues with scrolling.

* Apply review suggestions

* Fix zip hash issues + add a bit more logging

* Optimize zip hash

* Fix a couple of login bugs

* Add message log and user list

* Make Message an abstract class

* Make status bar work, add chat box

* Hide message log/users list when not connected

* Fix status bar not resetting entirely

* Run stop server task on server thread to prevent multithreading race conditions

* Add c2s message to packet id list

* Fix message scroll bar not scrolling to the end

* Formatting

* User list size -> ushort

* Combine contains and remove check

* Check removal before sending packet

* Add password to login packet

* Fix the GUI closing the rename text field when someone else renames something

* Update fr_fr.json

* oups

* Make connection/server create dialogs not useless if it fails once

* Refactor UI state updating

* Fix imports

* Fix Collab menu

* Fix NPE when rename not allowed

* Make the log file a configurable option

* Don't use modified UTF

* Update fr_fr.json

* Bump version to 0.15.4

* Apparently I can't spell neither words nor semantic versions

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
Co-authored-by: 2xsaiko <git@dblsaiko.net>---
 .../cuchaz/enigma/gui/DecompiledClassSource.java   | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java')

diff --git a/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java b/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java
index f7097f0..08df3e7 100644
--- a/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java
+++ b/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java
@@ -126,6 +126,32 @@ public class DecompiledClassSource {
 		highlightedTokens.computeIfAbsent(highlightType, t -> new ArrayList<>()).add(token);
 	}
 
+	public int getObfuscatedOffset(int deobfOffset) {
+		return getOffset(remappedIndex, obfuscatedIndex, deobfOffset);
+	}
+
+	public int getDeobfuscatedOffset(int obfOffset) {
+		return getOffset(obfuscatedIndex, remappedIndex, obfOffset);
+	}
+
+	private static int getOffset(SourceIndex fromIndex, SourceIndex toIndex, int fromOffset) {
+		int relativeOffset = 0;
+
+		Iterator<Token> fromTokenItr = fromIndex.referenceTokens().iterator();
+		Iterator<Token> toTokenItr = toIndex.referenceTokens().iterator();
+		while (fromTokenItr.hasNext() && toTokenItr.hasNext()) {
+			Token fromToken = fromTokenItr.next();
+			Token toToken = toTokenItr.next();
+			if (fromToken.end > fromOffset) {
+				break;
+			}
+
+			relativeOffset = toToken.end - fromToken.end;
+		}
+
+		return fromOffset + relativeOffset;
+	}
+
 	@Override
 	public String toString() {
 		return remappedIndex.getSource();
-- 
cgit v1.2.3