use latest Netty and Guava

This commit is contained in:
Sen 2025-03-16 17:40:47 +01:00
parent 7f32e87ef4
commit 3af1b1f5b6
463 changed files with 611 additions and 68249 deletions

View file

@ -2,7 +2,7 @@ package game.properties;
import java.util.Collection;
import game.collect.ImmutableSet;
import com.google.common.collect.ImmutableSet;
public class PropertyBool extends PropertyHelper<Boolean>
{

View file

@ -1,11 +1,12 @@
package game.properties;
import java.util.Collection;
import java.util.function.Predicate;
import game.collect.Filter;
import game.collect.Lists;
import game.util.Predicates;
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 game.world.Facing;
public class PropertyDirection extends PropertyEnum<Facing>
@ -28,7 +29,7 @@ public class PropertyDirection extends PropertyEnum<Facing>
*/
public static PropertyDirection create(String name, Predicate<Facing> filter)
{
return create(name, Filter.<Facing>filter(Lists.newArrayList(Facing.values()), filter));
return create(name, Collections2.<Facing>filter(Lists.newArrayList(Facing.values()), filter));
}
/**

View file

@ -2,13 +2,13 @@ package game.properties;
import java.util.Collection;
import java.util.Map;
import java.util.function.Predicate;
import game.collect.Filter;
import game.collect.ImmutableSet;
import game.collect.Lists;
import game.collect.Maps;
import game.util.Predicates;
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;
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, Filter.<T>filter(Lists.newArrayList(clazz.getEnumConstants()), filter));
return create(name, clazz, Collections2.<T>filter(Lists.newArrayList(clazz.getEnumConstants()), filter));
}
public static <T extends Enum<T> & IStringSerializable> PropertyEnum<T> create(String name, Class<T> clazz, T... values)

View file

@ -3,8 +3,8 @@ package game.properties;
import java.util.Collection;
import java.util.Set;
import game.collect.ImmutableSet;
import game.collect.Sets;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
public class PropertyInteger extends PropertyHelper<Integer>
{