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
|
@ -6,8 +6,8 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import game.collect.Lists;
|
||||
import game.collect.Maps;
|
||||
|
||||
import game.block.Block;
|
||||
import game.block.BlockBed;
|
||||
|
|
|
@ -3,7 +3,7 @@ package game.init;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import game.collect.Maps;
|
||||
|
||||
import game.entity.Entity;
|
||||
import game.entity.animal.EntityBat;
|
||||
|
|
|
@ -3,8 +3,8 @@ package game.init;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import game.collect.Lists;
|
||||
import game.collect.Maps;
|
||||
|
||||
import game.block.Block;
|
||||
import game.block.BlockDynamicLiquid;
|
||||
|
|
|
@ -4,8 +4,8 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
import java.util.function.Function;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Sets;
|
||||
import game.collect.Maps;
|
||||
import game.collect.Sets;
|
||||
|
||||
import game.block.Block;
|
||||
import game.block.BlockBed;
|
||||
|
|
|
@ -4,9 +4,9 @@ import java.util.IdentityHashMap;
|
|||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import com.google.common.base.Predicates;
|
||||
import com.google.common.collect.Iterators;
|
||||
import com.google.common.collect.Lists;
|
||||
import game.util.Predicates;
|
||||
import game.collect.Iterators;
|
||||
import game.collect.Lists;
|
||||
|
||||
public class ObjectIntIdentityMap<T> implements IObjectIntIterable<T>
|
||||
{
|
||||
|
|
|
@ -3,8 +3,8 @@ package game.init;
|
|||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.common.collect.BiMap;
|
||||
import com.google.common.collect.HashBiMap;
|
||||
import game.collect.BiMap;
|
||||
import game.collect.HashBiMap;
|
||||
|
||||
public class RegistryNamespaced<K, V> extends RegistrySimple<K, V> implements IObjectIntIterable<V>
|
||||
{
|
||||
|
|
|
@ -5,7 +5,7 @@ import java.util.Iterator;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import game.collect.Maps;
|
||||
|
||||
public class RegistrySimple<K, V> implements IRegistry<K, V>
|
||||
{
|
||||
|
|
|
@ -4,9 +4,9 @@ import java.util.HashMap;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.common.base.Predicate;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import java.util.function.Predicate;
|
||||
import game.collect.Lists;
|
||||
import game.collect.Maps;
|
||||
|
||||
import game.block.Block;
|
||||
import game.block.BlockDoor;
|
||||
|
@ -38,7 +38,7 @@ public abstract class RotationRegistry {
|
|||
if(prop == BlockDoor.FACING) {
|
||||
predicate = new Predicate<Integer>() {
|
||||
@Override
|
||||
public boolean apply(Integer meta) {
|
||||
public boolean test(Integer meta) {
|
||||
return (meta & 8) == 0;
|
||||
}
|
||||
};
|
||||
|
|
|
@ -4,7 +4,7 @@ import java.util.Map;
|
|||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import game.collect.Maps;
|
||||
|
||||
import game.block.Block;
|
||||
import game.block.BlockStoneBrick;
|
||||
|
|
|
@ -4,9 +4,9 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Sets;
|
||||
import game.collect.Lists;
|
||||
import game.collect.Maps;
|
||||
import game.collect.Sets;
|
||||
|
||||
import game.entity.npc.EntityArachnoid;
|
||||
import game.entity.npc.EntityBloodElf;
|
||||
|
|
|
@ -2,7 +2,7 @@ package game.init;
|
|||
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import game.collect.Maps;
|
||||
|
||||
import game.tileentity.TileEntity;
|
||||
import game.tileentity.TileEntityBanner;
|
||||
|
|
|
@ -2,7 +2,7 @@ package game.init;
|
|||
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.common.collect.Sets;
|
||||
import game.collect.Sets;
|
||||
|
||||
import game.item.Item;
|
||||
|
||||
|
|
|
@ -5,9 +5,9 @@ import java.util.Map;
|
|||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Sets;
|
||||
import game.collect.Lists;
|
||||
import game.collect.Maps;
|
||||
import game.collect.Sets;
|
||||
|
||||
import game.biome.Biome;
|
||||
import game.block.BlockColored;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue