use imports for MurmurHash3
parent
02d2af3d67
commit
fb4e8fd1be
|
@ -31,7 +31,7 @@ public class MagicCardList extends ArrayList<MagicCard> implements MagicCopyable
|
|||
keys[idx] = card.getStateId();
|
||||
idx++;
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
|
||||
public long getUnorderedStateId() {
|
||||
|
@ -42,7 +42,7 @@ public class MagicCardList extends ArrayList<MagicCard> implements MagicCopyable
|
|||
idx++;
|
||||
}
|
||||
Arrays.sort(keys);
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
|
||||
public void addToBottom(final MagicCard card) {
|
||||
|
|
|
@ -286,7 +286,7 @@ public class MagicGame {
|
|||
statics.getStateId(),
|
||||
exiledUntilEndOfTurn.getUnorderedStateId(),
|
||||
};
|
||||
stateId = magic.model.MurmurHash3.hash(keys);
|
||||
stateId = MurmurHash3.hash(keys);
|
||||
return stateId;
|
||||
}
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ public class MagicPayedCost implements MagicCopyable {
|
|||
}
|
||||
|
||||
public long getStateId() {
|
||||
return magic.model.MurmurHash3.hash(new long[] {
|
||||
return MurmurHash3.hash(new long[] {
|
||||
MagicObjectImpl.getStateId(target),
|
||||
x,
|
||||
kicker
|
||||
|
|
|
@ -35,6 +35,6 @@ public class MagicPermanentList extends ArrayList<MagicPermanent> implements Mag
|
|||
keys[idx] = permanent.getStateId();
|
||||
idx++;
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,6 +29,6 @@ public class MagicPermanentSet extends TreeSet<MagicPermanent> {
|
|||
keys[idx] = permanent.getStateId();
|
||||
idx++;
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -167,7 +167,7 @@ public class MagicPlayer extends MagicObjectImpl implements MagicSource, MagicTa
|
|||
activationPriority.getActivationId(),
|
||||
cachedAbilityFlags.hashCode()
|
||||
};
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
|
||||
String getIdString() {
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
package magic.model.choice;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import magic.model.MagicCard;
|
||||
import magic.model.MagicCopyMap;
|
||||
import magic.model.MagicCopyable;
|
||||
import magic.model.MagicGame;
|
||||
import magic.model.MagicMappable;
|
||||
import magic.model.MagicCopyable;
|
||||
import magic.model.MagicCopyMap;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.ArrayList;
|
||||
import magic.model.MurmurHash3;
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
public class MagicCardChoiceResult extends ArrayList<MagicCard> implements MagicMappable<MagicCardChoiceResult>, MagicCopyable {
|
||||
|
@ -63,6 +64,6 @@ public class MagicCardChoiceResult extends ArrayList<MagicCard> implements Magic
|
|||
keys[idx] = card.getStateId();
|
||||
idx++;
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
package magic.model.choice;
|
||||
|
||||
import magic.model.MagicGame;
|
||||
import magic.model.MagicMappable;
|
||||
import magic.model.MagicPermanent;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
|
||||
import magic.model.MagicGame;
|
||||
import magic.model.MagicMappable;
|
||||
import magic.model.MagicPermanent;
|
||||
import magic.model.MurmurHash3;
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
public class MagicDeclareAttackersResult extends ArrayList<MagicPermanent> implements MagicMappable<MagicDeclareAttackersResult> {
|
||||
|
||||
|
@ -47,6 +48,6 @@ public class MagicDeclareAttackersResult extends ArrayList<MagicPermanent> imple
|
|||
keys[idx] = permanent.getStateId();
|
||||
idx++;
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
package magic.model.choice;
|
||||
|
||||
import magic.model.MagicGame;
|
||||
import magic.model.MagicMappable;
|
||||
import magic.model.score.MagicScoreResult;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedList;
|
||||
|
||||
import magic.model.MagicGame;
|
||||
import magic.model.MagicMappable;
|
||||
import magic.model.MurmurHash3;
|
||||
import magic.model.score.MagicScoreResult;
|
||||
|
||||
/** First creature in array is the attacker, the other creatures are blockers. */
|
||||
@SuppressWarnings("serial")
|
||||
public class MagicDeclareBlockersResult extends LinkedList<MagicCombatCreature[]> implements MagicMappable<MagicDeclareBlockersResult>, MagicScoreResult {
|
||||
|
@ -81,6 +82,6 @@ public class MagicDeclareBlockersResult extends LinkedList<MagicCombatCreature[]
|
|||
idx++;
|
||||
}
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
package magic.model.choice;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import magic.model.MagicGame;
|
||||
import magic.model.MagicMappable;
|
||||
import magic.model.MagicPermanent;
|
||||
import magic.model.MagicPermanentState;
|
||||
import magic.model.MurmurHash3;
|
||||
import magic.model.action.ChangeStateAction;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public class MagicExcludeResult implements MagicMappable<MagicExcludeResult> {
|
||||
|
||||
private static final List<MagicPermanent> NO_EXCLUDE_PERMANENTS=Collections.emptyList();
|
||||
|
@ -73,6 +74,6 @@ public class MagicExcludeResult implements MagicMappable<MagicExcludeResult> {
|
|||
}
|
||||
keys[idx] = excludeFlags;
|
||||
idx++;
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@ package magic.model.choice;
|
|||
import magic.model.MagicGame;
|
||||
import magic.model.MagicMappable;
|
||||
import magic.model.MagicSource;
|
||||
import magic.model.MurmurHash3;
|
||||
import magic.model.event.MagicSourceActivation;
|
||||
|
||||
public class MagicPlayChoiceResult implements MagicMappable<MagicPlayChoiceResult> {
|
||||
|
@ -49,7 +50,7 @@ public class MagicPlayChoiceResult implements MagicMappable<MagicPlayChoiceResul
|
|||
|
||||
@Override
|
||||
public long getId() {
|
||||
return magic.model.MurmurHash3.hash(new long[] {
|
||||
return MurmurHash3.hash(new long[] {
|
||||
sourceActivation.source.getStateId(),
|
||||
sourceActivation.activation.hashCode(),
|
||||
});
|
||||
|
|
|
@ -1,13 +1,21 @@
|
|||
package magic.model.choice;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import magic.data.GeneralConfig;
|
||||
import magic.exception.UndoClickedException;
|
||||
import magic.model.IUIGameController;
|
||||
import magic.model.MagicCard;
|
||||
import magic.model.MagicCardList;
|
||||
import magic.model.MagicGame;
|
||||
import magic.model.MagicPermanent;
|
||||
import magic.model.MagicPlayer;
|
||||
import magic.model.MagicSource;
|
||||
import magic.model.MurmurHash3;
|
||||
import magic.model.event.MagicEvent;
|
||||
import magic.model.target.MagicOtherPermanentTargetFilter;
|
||||
import magic.model.target.MagicTarget;
|
||||
import magic.model.target.MagicTargetFilter;
|
||||
import magic.model.target.MagicTargetFilterFactory;
|
||||
|
@ -15,13 +23,6 @@ import magic.model.target.MagicTargetHint;
|
|||
import magic.model.target.MagicTargetNone;
|
||||
import magic.model.target.MagicTargetPicker;
|
||||
import magic.model.target.MagicTargetType;
|
||||
import magic.model.target.MagicOtherPermanentTargetFilter;
|
||||
import magic.exception.UndoClickedException;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import magic.model.IUIGameController;
|
||||
|
||||
public class MagicTargetChoice extends MagicChoice {
|
||||
public static final MagicTargetChoice NONE =
|
||||
|
@ -443,7 +444,7 @@ public class MagicTargetChoice extends MagicChoice {
|
|||
|
||||
@Override
|
||||
public long getStateId() {
|
||||
return magic.model.MurmurHash3.hash(new long[] {
|
||||
return MurmurHash3.hash(new long[] {
|
||||
targetDescription.hashCode(),
|
||||
targetFilter.hashCode(),
|
||||
(targeted ? 1L : -1L),
|
||||
|
|
|
@ -1,24 +1,10 @@
|
|||
package magic.model.event;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import magic.ai.ArtificialScoringSystem;
|
||||
import magic.model.MagicCard;
|
||||
import magic.model.MagicCardList;
|
||||
import magic.model.MagicColor;
|
||||
import magic.model.MagicCopyMap;
|
||||
import magic.model.MagicCopyable;
|
||||
import magic.model.MagicGame;
|
||||
import magic.model.MagicMessage;
|
||||
import magic.model.MagicObject;
|
||||
import magic.model.MagicObjectImpl;
|
||||
import magic.model.MagicPayedCost;
|
||||
import magic.model.MagicPermanent;
|
||||
import magic.model.MagicPermanentList;
|
||||
import magic.model.MagicPlayer;
|
||||
import magic.model.MagicSource;
|
||||
import magic.model.MagicSubType;
|
||||
import magic.model.*;
|
||||
import magic.model.action.MagicCardAction;
|
||||
import magic.model.action.MagicCardOnStackAction;
|
||||
import magic.model.action.MagicItemOnStackAction;
|
||||
|
@ -39,7 +25,6 @@ import magic.model.target.MagicDefaultTargetPicker;
|
|||
import magic.model.target.MagicTarget;
|
||||
import magic.model.target.MagicTargetNone;
|
||||
import magic.model.target.MagicTargetPicker;
|
||||
import magic.exception.GameException;
|
||||
|
||||
public class MagicEvent implements MagicCopyable {
|
||||
|
||||
|
@ -772,7 +757,7 @@ public class MagicEvent implements MagicCopyable {
|
|||
}
|
||||
|
||||
public long getStateId() {
|
||||
return magic.model.MurmurHash3.hash(new long[] {
|
||||
return MurmurHash3.hash(new long[] {
|
||||
//don't call getStateId if source is MagicItemOnStack to avoid infinite loop
|
||||
(source instanceof MagicItemOnStack) ? -1L : source.getStateId(),
|
||||
player.getId(),
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
package magic.model.event;
|
||||
|
||||
import magic.model.MagicCopyMap;
|
||||
|
||||
import java.util.LinkedList;
|
||||
|
||||
import magic.model.MagicCopyMap;
|
||||
import magic.model.MurmurHash3;
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
public class MagicEventQueue extends LinkedList<MagicEvent> {
|
||||
|
||||
|
@ -22,6 +23,6 @@ public class MagicEventQueue extends LinkedList<MagicEvent> {
|
|||
keys[idx] = event.getStateId();
|
||||
idx++;
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
package magic.model.mstatic;
|
||||
|
||||
import magic.model.MagicCopyMap;
|
||||
import magic.model.MagicPermanent;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.EnumMap;
|
||||
|
@ -11,6 +8,10 @@ import java.util.Map;
|
|||
import java.util.SortedSet;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import magic.model.MagicCopyMap;
|
||||
import magic.model.MagicPermanent;
|
||||
import magic.model.MurmurHash3;
|
||||
|
||||
public class MagicPermanentStaticMap {
|
||||
|
||||
private final Map<MagicLayer,SortedSet<MagicPermanentStatic>> effects =
|
||||
|
@ -118,6 +119,6 @@ public class MagicPermanentStaticMap {
|
|||
keys[idx] = mpstatic.getStatic().hashCode(); idx++;
|
||||
}
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,11 @@
|
|||
package magic.model.stack;
|
||||
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import magic.model.MagicAbility;
|
||||
import magic.model.MagicCard;
|
||||
import magic.model.MagicCardDefinition;
|
||||
|
@ -11,16 +16,12 @@ import magic.model.MagicObject;
|
|||
import magic.model.MagicPayedCost;
|
||||
import magic.model.MagicPlayer;
|
||||
import magic.model.MagicSource;
|
||||
import magic.model.MurmurHash3;
|
||||
import magic.model.action.MagicPermanentAction;
|
||||
import magic.model.action.MoveCardAction;
|
||||
import magic.model.event.MagicCardEvent;
|
||||
import magic.model.event.MagicEvent;
|
||||
import magic.model.event.MagicSourceActivation;
|
||||
import magic.model.action.MagicPermanentAction;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
|
||||
public class MagicCardOnStack extends MagicItemOnStack implements MagicSource {
|
||||
|
||||
|
@ -88,7 +89,7 @@ public class MagicCardOnStack extends MagicItemOnStack implements MagicSource {
|
|||
|
||||
@Override
|
||||
public long getStateId() {
|
||||
return magic.model.MurmurHash3.hash(new long[] {
|
||||
return MurmurHash3.hash(new long[] {
|
||||
super.getStateId(),
|
||||
moveLocation.ordinal(),
|
||||
fromLocation.ordinal(),
|
||||
|
|
|
@ -4,6 +4,7 @@ import magic.model.MagicAbility;
|
|||
import magic.model.MagicCardDefinition;
|
||||
import magic.model.MagicColor;
|
||||
import magic.model.MagicCopyMap;
|
||||
import magic.model.MagicCounterType;
|
||||
import magic.model.MagicGame;
|
||||
import magic.model.MagicMappable;
|
||||
import magic.model.MagicObject;
|
||||
|
@ -12,10 +13,9 @@ import magic.model.MagicPlayer;
|
|||
import magic.model.MagicSource;
|
||||
import magic.model.MagicSubType;
|
||||
import magic.model.MagicType;
|
||||
import magic.model.MagicCounterType;
|
||||
import magic.model.MurmurHash3;
|
||||
import magic.model.event.MagicActivation;
|
||||
import magic.model.event.MagicEvent;
|
||||
import magic.model.choice.MagicTargetChoice;
|
||||
import magic.model.target.MagicTarget;
|
||||
import magic.model.target.MagicTargetFilter;
|
||||
import magic.model.target.MagicTargetNone;
|
||||
|
@ -214,12 +214,12 @@ public abstract class MagicItemOnStack extends MagicObjectImpl implements MagicT
|
|||
for (int i = 0; i < arr.length; i++) {
|
||||
keys[i] = MagicObjectImpl.getStateId(arr[i]);
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getStateId() {
|
||||
return magic.model.MurmurHash3.hash(new long[] {
|
||||
return MurmurHash3.hash(new long[] {
|
||||
source != null ? source.getStateId() : -1L,
|
||||
controller != null ? controller.getId() : -1L,
|
||||
activation != null ? activation.hashCode() : -1L,
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
package magic.model.stack;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedList;
|
||||
|
||||
import magic.model.MagicCopyMap;
|
||||
import magic.model.MagicPlayer;
|
||||
import magic.model.MagicSource;
|
||||
import magic.model.MurmurHash3;
|
||||
import magic.model.event.MagicActivation;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedList;
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
public class MagicStack extends LinkedList<MagicItemOnStack> {
|
||||
|
||||
|
@ -127,6 +128,6 @@ public class MagicStack extends LinkedList<MagicItemOnStack> {
|
|||
keys[idx] = item.getStateId();
|
||||
idx++;
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
package magic.model.trigger;
|
||||
|
||||
import magic.model.MagicCopyMap;
|
||||
import magic.model.MagicPermanent;
|
||||
import magic.exception.GameException;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.EnumMap;
|
||||
|
@ -11,6 +7,11 @@ import java.util.Iterator;
|
|||
import java.util.Map;
|
||||
import java.util.PriorityQueue;
|
||||
|
||||
import magic.exception.GameException;
|
||||
import magic.model.MagicCopyMap;
|
||||
import magic.model.MagicPermanent;
|
||||
import magic.model.MurmurHash3;
|
||||
|
||||
public class MagicPermanentTriggerMap {
|
||||
|
||||
private final Map<MagicTriggerType,PriorityQueue<MagicPermanentTrigger>> effects =
|
||||
|
@ -97,6 +98,6 @@ public class MagicPermanentTriggerMap {
|
|||
keys[idx] = mptrigger.getTrigger().hashCode(); idx++;
|
||||
}
|
||||
}
|
||||
return magic.model.MurmurHash3.hash(keys);
|
||||
return MurmurHash3.hash(keys);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue