remove Windows support, revert new guava to small version
This commit is contained in:
parent
fd84384f10
commit
920405d8c5
264 changed files with 22715 additions and 377 deletions
|
@ -2,7 +2,7 @@ package game.properties;
|
|||
|
||||
import java.util.Collection;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import game.collect.ImmutableSet;
|
||||
|
||||
public class PropertyBool extends PropertyHelper<Boolean>
|
||||
{
|
||||
|
|
|
@ -2,10 +2,10 @@ package game.properties;
|
|||
|
||||
import java.util.Collection;
|
||||
|
||||
import com.google.common.base.Predicate;
|
||||
import com.google.common.base.Predicates;
|
||||
import com.google.common.collect.Collections2;
|
||||
import com.google.common.collect.Lists;
|
||||
import java.util.function.Predicate;
|
||||
import game.util.Predicates;
|
||||
import game.collect.Filter;
|
||||
import game.collect.Lists;
|
||||
|
||||
import game.world.Facing;
|
||||
|
||||
|
@ -29,7 +29,7 @@ public class PropertyDirection extends PropertyEnum<Facing>
|
|||
*/
|
||||
public static PropertyDirection create(String name, Predicate<Facing> filter)
|
||||
{
|
||||
return create(name, Collections2.<Facing>filter(Lists.newArrayList(Facing.values()), filter));
|
||||
return create(name, Filter.<Facing>filter(Lists.newArrayList(Facing.values()), filter));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -3,12 +3,12 @@ package game.properties;
|
|||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.common.base.Predicate;
|
||||
import com.google.common.base.Predicates;
|
||||
import com.google.common.collect.Collections2;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import java.util.function.Predicate;
|
||||
import game.util.Predicates;
|
||||
import game.collect.Filter;
|
||||
import game.collect.ImmutableSet;
|
||||
import game.collect.Lists;
|
||||
import game.collect.Maps;
|
||||
|
||||
public class PropertyEnum<T extends Enum<T> & IStringSerializable> extends PropertyHelper<T>
|
||||
{
|
||||
|
@ -53,7 +53,7 @@ public class PropertyEnum<T extends Enum<T> & IStringSerializable> extends Prope
|
|||
|
||||
public static <T extends Enum<T> & IStringSerializable> PropertyEnum<T> create(String name, Class<T> clazz, Predicate<T> filter)
|
||||
{
|
||||
return create(name, clazz, Collections2.<T>filter(Lists.newArrayList(clazz.getEnumConstants()), filter));
|
||||
return create(name, clazz, Filter.<T>filter(Lists.newArrayList(clazz.getEnumConstants()), filter));
|
||||
}
|
||||
|
||||
public static <T extends Enum<T> & IStringSerializable> PropertyEnum<T> create(String name, Class<T> clazz, T... values)
|
||||
|
|
|
@ -3,8 +3,8 @@ package game.properties;
|
|||
import java.util.Collection;
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Sets;
|
||||
import game.collect.ImmutableSet;
|
||||
import game.collect.Sets;
|
||||
|
||||
public class PropertyInteger extends PropertyHelper<Integer>
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue