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

5
java/src/game/item/Item.java
View file

@ -4,9 +4,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import game.block.Block;
import game.collect.Maps;
import game.collect.Sets;
import game.color.TextColor;
import game.entity.attributes.Attribute;
import game.entity.attributes.AttributeModifier;

7
java/src/game/item/ItemArmor.java
View file

@ -3,10 +3,11 @@ package game.item;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import com.google.common.base.Predicate;
import com.google.common.collect.Sets;
import game.block.BlockDispenser;
import game.collect.Sets;
import game.dispenser.BehaviorDefaultDispenseItem;
import game.dispenser.IBehaviorDispenseItem;
import game.dispenser.IBlockSource;
@ -37,7 +38,7 @@ public class ItemArmor extends Item
int k = blockpos.getZ();
BoundingBox axisalignedbb = new BoundingBox((double)i, (double)j, (double)k, (double)(i + 1), (double)(j + 1), (double)(k + 1));
List<EntityLiving> list = source.getWorld().<EntityLiving>getEntitiesWithinAABB(EntityLiving.class, axisalignedbb, new Predicate<EntityLiving>() {
public boolean test(EntityLiving entity) {
public boolean apply(EntityLiving entity) {
return entity.isEntityAlive() && entity instanceof EntityNPC &&
entity.getItem(ItemArmor.getArmorPosition(stack)) != null; // || entitylivingbase.isPlayer());
}

3
java/src/game/item/ItemBucket.java
View file

@ -7,11 +7,12 @@ import java.util.List;
import java.util.Queue;
import java.util.Set;
import com.google.common.collect.Sets;
import game.block.Block;
import game.block.BlockDynamicLiquid;
import game.block.BlockLiquid;
import game.block.BlockStaticLiquid;
import game.collect.Sets;
import game.entity.npc.EntityNPC;
import game.init.BlockRegistry;
import game.init.Blocks;

3
java/src/game/item/ItemBucketMilk.java
View file

@ -3,7 +3,8 @@ package game.item;
import java.util.Map;
import java.util.Set;
import game.collect.Sets;
import com.google.common.collect.Sets;
import game.entity.attributes.Attribute;
import game.entity.attributes.AttributeModifier;
import game.entity.attributes.Attributes;

3
java/src/game/item/ItemFirework.java
View file

@ -2,7 +2,8 @@ package game.item;
import java.util.List;
import game.collect.Lists;
import com.google.common.collect.Lists;
import game.entity.item.EntityFireworks;
import game.entity.npc.EntityNPC;
import game.nbt.NBTTagCompound;

3
java/src/game/item/ItemFishFood.java
View file

@ -3,7 +3,8 @@ package game.item;
import java.util.List;
import java.util.Map;
import game.collect.Maps;
import com.google.common.collect.Maps;
import game.entity.npc.EntityNPC;
import game.potion.Potion;
import game.potion.PotionEffect;

4
java/src/game/item/ItemMagnet.java
View file

@ -1,7 +1,7 @@
package game.item;
import java.util.List;
import java.util.function.Predicate;
import com.google.common.base.Predicate;
import game.entity.Entity;
import game.entity.animal.EntityChicken;
@ -36,7 +36,7 @@ public class ItemMagnet extends Item {
new BoundingBox(playerIn.posX - 40.0f, playerIn.posY + playerIn.getEyeHeight() - 40.0f, playerIn.posZ - 40.0f,
playerIn.posX + 40.0f, playerIn.posY + playerIn.getEyeHeight() + 40.0f, playerIn.posZ + 40.0f),
new Predicate<Entity>() {
public boolean test(Entity entity) {
public boolean apply(Entity entity) {
return (ItemMagnet.this.chicken || /* ? !((EntityLiving)entity).isAIDisabled() : */ entity.isMagnetic())
&& entity.getDistanceToEntity(playerIn) <= 38.0f;
}

3
java/src/game/item/ItemMetal.java
View file

@ -4,7 +4,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import game.collect.Sets;
import com.google.common.collect.Sets;
import game.color.TextColor;
import game.entity.attributes.Attribute;
import game.entity.attributes.AttributeModifier;

3
java/src/game/item/ItemMetalBlock.java
View file

@ -4,8 +4,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Sets;
import game.block.Block;
import game.collect.Sets;
import game.color.TextColor;
import game.entity.attributes.Attribute;
import game.entity.attributes.AttributeModifier;

6
java/src/game/item/ItemPotion.java
View file

@ -4,10 +4,12 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.util.Set;
import game.collect.Maps;
import game.collect.Sets;
import game.color.TextColor;
import game.entity.attributes.Attribute;
import game.entity.attributes.AttributeModifier;

6
java/src/game/item/ItemStack.java
View file

@ -4,11 +4,13 @@ import java.text.DecimalFormat;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.Set;
import game.block.Block;
import game.collect.Lists;
import game.collect.Maps;
import game.color.TextColor;
import game.enchantment.Enchantment;
import game.enchantment.EnchantmentDurability;

3
java/src/game/item/ItemSword.java
View file

@ -3,8 +3,9 @@ package game.item;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Sets;
import game.block.Block;
import game.collect.Sets;
import game.entity.attributes.Attribute;
import game.entity.attributes.AttributeModifier;
import game.entity.attributes.Attributes;

3
java/src/game/item/ItemTool.java
View file

@ -3,8 +3,9 @@ package game.item;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Sets;
import game.block.Block;
import game.collect.Sets;
import game.entity.attributes.Attribute;
import game.entity.attributes.AttributeModifier;
import game.entity.attributes.Attributes;