sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

use latest Netty and Guava

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
java/src/game/world/BlockPos.java
View file

@ -2,7 +2,8 @@ package game.world;
import java.util.Iterator;
import game.collect.AbstractIterator;
import com.google.common.collect.AbstractIterator;
import game.entity.Entity;
public class BlockPos extends Vec3i

11
java/src/game/world/Chunk.java
View file

@ -4,12 +4,13 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.function.Predicate;
import com.google.common.base.Predicate;
import com.google.common.collect.Maps;
import game.biome.Biome;
import game.block.Block;
import game.block.ITileEntityProvider;
import game.collect.Maps;
import game.entity.Entity;
import game.init.Blocks;
import game.log.Log;
@ -741,7 +742,7 @@ public class Chunk {
if(!this.entities[y].isEmpty()) {
for(Entity entity : this.entities[y]) {
if(entity.getEntityBoundingBox().intersectsWith(bb) && entity != exclude) {
if(pred == null || pred.test(entity)) {
if(pred == null || pred.apply(entity)) {
list.add(entity);
}
@ -752,7 +753,7 @@ public class Chunk {
entity = parts[l];
if(entity != exclude && entity.getEntityBoundingBox().intersectsWith(bb)
&& (pred == null || pred.test(entity))) {
&& (pred == null || pred.apply(entity))) {
list.add(entity);
}
}
@ -771,7 +772,7 @@ public class Chunk {
for(int y = sy; y <= ey; ++y) {
for(T entity : this.entities[y].getByClass(clazz)) {
if(entity.getEntityBoundingBox().intersectsWith(bb) && (pred == null || pred.test(entity))) {
if(entity.getEntityBoundingBox().intersectsWith(bb) && (pred == null || pred.apply(entity))) {
list.add(entity);
}
}

10
java/src/game/world/ClassInheritanceMultiMap.java
View file

@ -8,9 +8,9 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import game.collect.Iterators;
import game.collect.Lists;
import game.collect.Maps;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
public class ClassInheritanceMultiMap<T> extends AbstractSet<T>
{
@ -128,7 +128,7 @@ public class ClassInheritanceMultiMap<T> extends AbstractSet<T>
if (list == null)
{
return Iterators.<S>emptyIterator();
return Collections.<S>emptyIterator();
}
else
{
@ -141,7 +141,7 @@ public class ClassInheritanceMultiMap<T> extends AbstractSet<T>
public Iterator<T> iterator()
{
return this.values.isEmpty() ? Iterators.<T>emptyIterator() : Iterators.unmodifiableIterator(this.values.iterator());
return this.values.isEmpty() ? Collections.<T>emptyIterator() : Iterators.unmodifiableIterator(this.values.iterator());
}
public int size()

3
java/src/game/world/Converter.java
View file

@ -13,6 +13,8 @@ import java.util.Map.Entry;
import java.util.zip.GZIPInputStream;
import java.util.zip.InflaterInputStream;
import com.google.common.collect.Maps;
import game.biome.Biome;
import game.block.Block;
import game.block.BlockCactus;
@ -39,7 +41,6 @@ import game.block.BlockTNT;
import game.block.BlockTallGrass;
import game.block.BlockWall;
import game.block.LeavesType;
import game.collect.Maps;
import game.color.DyeColor;
import game.entity.Entity;
import game.entity.animal.EntityBat;

2
java/src/game/world/EmptyChunk.java
View file

@ -1,7 +1,7 @@
package game.world;
import java.util.List;
import java.util.function.Predicate;
import com.google.common.base.Predicate;
import game.block.Block;
import game.entity.Entity;

7
java/src/game/world/Explosion.java
View file

@ -4,10 +4,11 @@ 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.block.Block;
import game.collect.Lists;
import game.collect.Maps;
import game.collect.Sets;
import game.enchantment.EnchantmentProtection;
import game.entity.DamageSource;
import game.entity.Entity;

11
java/src/game/world/Facing.java
View file

@ -2,10 +2,11 @@ package game.world;
import java.util.Iterator;
import java.util.Map;
import java.util.function.Predicate;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
import com.google.common.collect.Maps;
import game.collect.Iterators;
import game.collect.Maps;
import game.properties.IStringSerializable;
import game.rng.Random;
import game.util.ExtMath;
@ -410,7 +411,7 @@ public enum Facing implements IStringSerializable
return this.name;
}
public boolean test(Facing p_apply_1_)
public boolean apply(Facing p_apply_1_)
{
return p_apply_1_ != null && p_apply_1_.getAxis() == this;
}
@ -480,7 +481,7 @@ public enum Facing implements IStringSerializable
return aenumfacing[rand.zrange(aenumfacing.length)];
}
public boolean test(Facing p_apply_1_)
public boolean apply(Facing p_apply_1_)
{
return p_apply_1_ != null && p_apply_1_.getAxis().getPlane() == this;
}

5
java/src/game/world/Region.java
View file

@ -17,9 +17,10 @@ import java.util.Map;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.InflaterInputStream;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import game.block.Block;
import game.collect.Lists;
import game.collect.Maps;
import game.entity.Entity;
import game.init.BlockRegistry;
import game.init.Config;

3
java/src/game/world/Spawner.java
View file

@ -2,9 +2,10 @@ package game.world;
import java.util.Set;
import com.google.common.collect.Sets;
import game.biome.Biome;
import game.block.Block;
import game.collect.Sets;
import game.entity.npc.EntityNPC;
import game.entity.types.EntityLiving;
import game.entity.types.EntityWaterMob;

17
java/src/game/world/State.java
View file

@ -5,15 +5,16 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.function.Function;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableTable;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table;
import game.block.Block;
import game.collect.ImmutableMap;
import game.collect.ImmutableTable;
import game.collect.Iterables;
import game.collect.Maps;
import game.collect.StandardTable;
import game.collect.Table;
import game.init.BlockRegistry;
import game.properties.IProperty;
@ -122,7 +123,7 @@ public class State {
throw new IllegalStateException();
}
else {
Table<IProperty, Comparable, State> table = new StandardTable<IProperty, Comparable, State>();
Table<IProperty, Comparable, State> table = HashBasedTable.<IProperty, Comparable, State>create();
for(IProperty<? extends Comparable> prop : this.properties.keySet()) {
for(Comparable value : prop.getAllowedValues()) {
if(value != this.properties.get(prop)) {

3
java/src/game/world/Weather.java
View file

@ -2,7 +2,8 @@ package game.world;
import java.util.Map;
import game.collect.Maps;
import com.google.common.collect.Maps;
import game.rng.Random;
import game.rng.RngItem;
import game.rng.WeightedList;

9
java/src/game/world/World.java
View file

@ -4,7 +4,10 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import game.biome.Biome;
import game.block.Block;
@ -14,8 +17,6 @@ import game.block.BlockSlab;
import game.block.BlockSnow;
import game.block.BlockStairs;
import game.block.LeavesType;
import game.collect.Lists;
import game.collect.Sets;
import game.dimension.Dimension;
import game.entity.Entity;
import game.entity.item.EntityExplosion;
@ -556,7 +557,7 @@ public abstract class World implements IWorldAccess {
break;
List<Entity> ents = this.getEntitiesInAABBexcluding(entity, new BoundingBox(target, target.add(1, 1, 1)),
new Predicate<Entity>() {
public boolean test(Entity entity) {
public boolean apply(Entity entity) {
return entity.canBeCollidedWith();
}
});

5
java/src/game/world/WorldClient.java
View file

@ -3,13 +3,14 @@ package game.world;
import java.util.List;
import java.util.Set;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import game.Game;
import game.audio.MovingSoundMinecart;
import game.audio.PositionedSound;
import game.biome.Biome;
import game.block.Block;
import game.collect.Lists;
import game.collect.Sets;
import game.dimension.Dimension;
import game.entity.Entity;
import game.entity.item.EntityCart;

11
java/src/game/world/WorldServer.java
View file

@ -11,7 +11,11 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import game.Server;
import game.biome.Biome;
@ -22,9 +26,6 @@ import game.block.BlockFalling;
import game.block.BlockLiquid;
import game.block.BlockSnow;
import game.clipboard.ClipboardBlock;
import game.collect.Lists;
import game.collect.Maps;
import game.collect.Sets;
import game.dimension.Dimension;
import game.entity.DamageSource;
import game.entity.Entity;
@ -613,7 +614,7 @@ public final class WorldServer extends World {
BoundingBox axisalignedbb = (new BoundingBox(blockpos, new BlockPos(blockpos.getX(), World.HEIGHT, blockpos.getZ()))).expand(3.0D,
3.0D, 3.0D);
List<EntityLiving> list = this.getEntitiesWithinAABB(EntityLiving.class, axisalignedbb, new Predicate<EntityLiving>() {
public boolean test(EntityLiving p_apply_1_) {
public boolean apply(EntityLiving p_apply_1_) {
return p_apply_1_ != null && p_apply_1_.isEntityAlive() && WorldServer.this.canSeeSky(p_apply_1_.getPosition());
}
});