Extract all bit-twiddling to MiscUtils

Author: EvModder

src/main/java/net/evmodder/evmod/apis/MapGroupUtils.java

@@ -38,7 +38,7 @@ public static final UUID getIdForMapState(MapState state, boolean evict){
 
 		uuid = UUID.nameUUIDFromBytes(state.colors);
 		// set 1st bit = state.locked
-		uuid = new UUID((uuid.getMostSignificantBits() & ~1l) | (state.locked ? 1l : 0l), uuid.getLeastSignificantBits());
+		uuid = new UUID(MiscUtils.setLSB(uuid.getMostSignificantBits(), state.locked), uuid.getLeastSignificantBits());
 		(state.locked ? stateToIdCache : unlockedStateToIdCache).put(state.colors, uuid);
 		return uuid;
 	}
@@ -76,8 +76,7 @@ public static final boolean shouldHighlightNotInCurrentGroup(final MapState stat
 		UUID uuid = getIdForMapState(state);
 		if(currentMapGroup.contains(uuid)) return false;
 		if( Configs.Generic.MAPART_GROUP_UNLOCKED_HANDLING.getOptionListValue() == OptionUnlockedMapHandling.UNIQUE) return true;
-		// toggle 1st bit on/off
-		uuid = new UUID(uuid.getMostSignificantBits() ^ 1l, uuid.getLeastSignificantBits());
+		uuid = new UUID(MiscUtils.toggleLSB(uuid.getMostSignificantBits()), uuid.getLeastSignificantBits());
 		return !currentMapGroup.contains(uuid);
 	}
 	public static final boolean isConfirmedNull(int id){return nullMapIds.contains(id);}

src/main/java/net/evmodder/evmod/apis/MapIdsFromImg.java

@@ -135,7 +135,7 @@ public static final byte[] colorsFromImg(final BufferedImage img, final int xo,
 	private static UUID getLockedIdForColors(byte[] colors){
 		UUID uuid = UUID.nameUUIDFromBytes(colors);
 		// set 1st bit = state.locked
-		return new UUID(uuid.getMostSignificantBits() | 1l, uuid.getLeastSignificantBits());
+		return new UUID(MiscUtils.setLSB(uuid.getMostSignificantBits(), true), uuid.getLeastSignificantBits());
 	}
 
 	public static HashSet<UUID> getIdsFromBinaryFile(String filename){

src/main/java/net/evmodder/evmod/apis/MapStateCacher.java

@@ -85,7 +85,7 @@ private static final UUID getIdForPlayer(boolean invOrEc){
 		if(e == null) return null;
 		UUID uuid = e.getUuid();
 		// set 1st bit, 0= is inv, 1= is ec
-		return new UUID((uuid.getMostSignificantBits() & ~1l) | (invOrEc ? 0l : 1l), uuid.getLeastSignificantBits());
+		return new UUID(MiscUtils.setLSB(uuid.getMostSignificantBits(), !invOrEc), uuid.getLeastSignificantBits());
 	}
 
 	private static final HashMap<?, ?> getInMemCachePerServer(String server, String cache){

src/main/java/net/evmodder/evmod/apis/MiscUtils.java

@@ -35,6 +35,10 @@ public static final byte getDimensionId(final World world){
 		else return 3;
 	}
 
+	public static final long toggleLSB(final long input){return input ^ 1l;}
+	public static final long setLSB(final long input, final boolean set){return (input & ~1l) | (set ? 1l : 0l);}
+//	public static final long setMSB(final long input, final boolean set){return (input & ~(1l << 63)) | (set ? 1l << 63 : 0l);}
+
 	private static final String ADDRESS_2B2T = "2b2t.org"; // TODO: make EvMod more server-independent 
 	public static final int HASHCODE_2B2T = ADDRESS_2B2T.hashCode(); // -437714968;
 	private static final String getServerAddress(final ServerInfo serverInfo, final boolean USE_CANONICAL_IP){