fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pick 97420a31d The big reformat of 2020

Browse Source
This commit is contained in:
yueh
2020-06-16 21:41:28 +02:00
parent 5304b3febe
commit 5225ea426b
2252 changed files with 95466 additions and 118582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/item/AESharedItemStack.java
+126 -164
View File
@@ -18,7 +18,6 @@
package appeng.util.item;
import java.util.Objects;
import com.google.common.base.Preconditions;
@@ -29,196 +28,159 @@ import net.minecraft.nbt.CompoundNBT;
import appeng.api.config.FuzzyMode;
final class AESharedItemStack implements Comparable<AESharedItemStack> {
private final ItemStack itemStack;
private final int itemId;
private final int itemDamage;
private final int hashCode;
final class AESharedItemStack implements Comparable<AESharedItemStack>
{
private final ItemStack itemStack;
private final int itemId;
private final int itemDamage;
private final int hashCode;
public AESharedItemStack(final ItemStack itemStack) {
this.itemStack = itemStack;
this.itemId = Item.getIdFromItem(itemStack.getItem());
this.itemDamage = itemStack.getDamage();
this.hashCode = this.makeHashCode();
}
public AESharedItemStack( final ItemStack itemStack )
{
this.itemStack = itemStack;
this.itemId = Item.getIdFromItem( itemStack.getItem() );
this.itemDamage = itemStack.getDamage();
this.hashCode = this.makeHashCode();
}
Bounds getBounds(final FuzzyMode fuzzy) {
return new Bounds(this.itemStack, fuzzy);
}
Bounds getBounds( final FuzzyMode fuzzy )
{
return new Bounds( this.itemStack, fuzzy );
}
ItemStack getDefinition() {
return this.itemStack;
}
ItemStack getDefinition()
{
return this.itemStack;
}
int getItemDamage() {
return this.itemDamage;
}
int getItemDamage()
{
return this.itemDamage;
}
int getItemID() {
return this.itemId;
}
int getItemID()
{
return this.itemId;
}
@Override
public int hashCode() {
return this.hashCode;
}
@Override
public int hashCode()
{
return this.hashCode;
}
@Override
public boolean equals(final Object obj) {
if (obj instanceof AESharedItemStack) {
final AESharedItemStack other = (AESharedItemStack) obj;
@Override
public boolean equals( final Object obj )
{
if( obj instanceof AESharedItemStack )
{
final AESharedItemStack other = (AESharedItemStack) obj;
Preconditions.checkState(this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1");
Preconditions.checkArgument(other.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1");
Preconditions.checkState( this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1" );
Preconditions.checkArgument( other.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1" );
if (this.itemStack == other.itemStack) {
return true;
}
return ItemStack.areItemStacksEqual(this.itemStack, other.itemStack);
}
return false;
}
if( this.itemStack == other.itemStack )
{
return true;
}
return ItemStack.areItemStacksEqual( this.itemStack, other.itemStack );
}
return false;
}
@Override
public int compareTo(final AESharedItemStack b) {
Preconditions.checkState(this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1");
Preconditions.checkArgument(b.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1");
@Override
public int compareTo( final AESharedItemStack b )
{
Preconditions.checkState( this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1" );
Preconditions.checkArgument( b.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1" );
if (this.itemStack == b.getDefinition()) {
return 0;
}
if( this.itemStack == b.getDefinition() )
{
return 0;
}
final int id = this.itemId - b.itemId;
if (id != 0) {
return id;
}
final int id = this.itemId - b.itemId;
if( id != 0 )
{
return id;
}
final int damageValue = this.itemDamage - b.itemDamage;
if (damageValue != 0) {
return damageValue;
}
final int damageValue = this.itemDamage - b.itemDamage;
if( damageValue != 0 )
{
return damageValue;
}
return 0;
}
return 0;
}
private int makeHashCode() {
return Objects.hash(this.itemId, this.itemDamage, this.itemStack.hasTag() ? this.itemStack.getTag() : 0);
}
private int makeHashCode()
{
return Objects.hash( this.itemId, this.itemDamage, this.itemStack.hasTag() ? this.itemStack.getTag() : 0 );
}
/**
* Creates the lower and upper bounds for a specific shared itemstack.
*/
public static final class Bounds {
/**
* Bounds enforced by {@link ItemStack#isEmpty()}
*/
private static final int MIN_DAMAGE_VALUE = 0;
private static final int MAX_DAMAGE_VALUE = Short.MAX_VALUE;
/**
* Creates the lower and upper bounds for a specific shared itemstack.
*/
public static final class Bounds
{
/**
* Bounds enforced by {@link ItemStack#isEmpty()}
*/
private static final int MIN_DAMAGE_VALUE = 0;
private static final int MAX_DAMAGE_VALUE = Short.MAX_VALUE;
private final AESharedItemStack lower;
private final AESharedItemStack upper;
private final AESharedItemStack lower;
private final AESharedItemStack upper;
public Bounds(final ItemStack stack, final FuzzyMode fuzzy) {
Preconditions.checkState(!stack.isEmpty(), "ItemStack#isEmpty() has to be false");
Preconditions.checkState(stack.getCount() == 1, "ItemStack#getCount() has to be 1");
public Bounds( final ItemStack stack, final FuzzyMode fuzzy )
{
Preconditions.checkState( !stack.isEmpty(), "ItemStack#isEmpty() has to be false" );
Preconditions.checkState( stack.getCount() == 1, "ItemStack#getCount() has to be 1" );
final CompoundNBT tag = stack.hasTag() ? stack.getTag() : null;
final CompoundNBT tag = stack.hasTag() ? stack.getTag() : null;
this.lower = this.makeLowerBound(stack, tag, fuzzy);
this.upper = this.makeUpperBound(stack, tag, fuzzy);
}
this.lower = this.makeLowerBound( stack, tag, fuzzy );
this.upper = this.makeUpperBound( stack, tag, fuzzy );
}
public AESharedItemStack lower() {
return this.lower;
}
public AESharedItemStack lower()
{
return this.lower;
}
public AESharedItemStack upper() {
return this.upper;
}
public AESharedItemStack upper()
{
return this.upper;
}
private AESharedItemStack makeLowerBound(final ItemStack itemStack, final CompoundNBT tag,
final FuzzyMode fuzzy) {
final ItemStack newDef = itemStack.copy();
private AESharedItemStack makeLowerBound( final ItemStack itemStack, final CompoundNBT tag, final FuzzyMode fuzzy )
{
final ItemStack newDef = itemStack.copy();
if (newDef.getItem().isDamageable()) {
if (fuzzy == FuzzyMode.IGNORE_ALL) {
newDef.setDamage(MIN_DAMAGE_VALUE);
} else if (fuzzy == FuzzyMode.PERCENT_99) {
if (itemStack.getDamage() == MIN_DAMAGE_VALUE) {
newDef.setDamage(MIN_DAMAGE_VALUE);
} else {
newDef.setDamage(MIN_DAMAGE_VALUE + 1);
}
} else {
final int breakpoint = fuzzy.calculateBreakPoint(itemStack.getMaxDamage());
final int damage = breakpoint <= itemStack.getDamage() ? breakpoint : 0;
newDef.setDamage(damage);
}
}
if( newDef.getItem().isDamageable() )
{
if( fuzzy == FuzzyMode.IGNORE_ALL )
{
newDef.setDamage( MIN_DAMAGE_VALUE );
}
else if( fuzzy == FuzzyMode.PERCENT_99 )
{
if( itemStack.getDamage() == MIN_DAMAGE_VALUE )
{
newDef.setDamage( MIN_DAMAGE_VALUE );
}
else
{
newDef.setDamage( MIN_DAMAGE_VALUE + 1 );
}
}
else
{
final int breakpoint = fuzzy.calculateBreakPoint( itemStack.getMaxDamage() );
final int damage = breakpoint <= itemStack.getDamage() ? breakpoint : 0;
newDef.setDamage( damage );
}
}
return new AESharedItemStack(newDef);
}
return new AESharedItemStack( newDef );
}
private AESharedItemStack makeUpperBound(final ItemStack itemStack, final CompoundNBT tag,
final FuzzyMode fuzzy) {
final ItemStack newDef = itemStack.copy();
private AESharedItemStack makeUpperBound( final ItemStack itemStack, final CompoundNBT tag, final FuzzyMode fuzzy )
{
final ItemStack newDef = itemStack.copy();
if (newDef.getItem().isDamageable()) {
if (fuzzy == FuzzyMode.IGNORE_ALL) {
newDef.setDamage(itemStack.getMaxDamage() + 1);
} else if (fuzzy == FuzzyMode.PERCENT_99) {
if (itemStack.getDamage() == MIN_DAMAGE_VALUE) {
newDef.setDamage(MIN_DAMAGE_VALUE);
} else {
newDef.setDamage(itemStack.getMaxDamage() + 1);
}
} else {
final int breakpoint = fuzzy.calculateBreakPoint(itemStack.getMaxDamage());
final int damage = itemStack.getDamage() < breakpoint ? breakpoint - 1
: itemStack.getMaxDamage() + 1;
newDef.setDamage(damage);
}
}
if( newDef.getItem().isDamageable() )
{
if( fuzzy == FuzzyMode.IGNORE_ALL )
{
newDef.setDamage( itemStack.getMaxDamage() + 1 );
}
else if( fuzzy == FuzzyMode.PERCENT_99 )
{
if( itemStack.getDamage() == MIN_DAMAGE_VALUE )
{
newDef.setDamage( MIN_DAMAGE_VALUE );
}
else
{
newDef.setDamage( itemStack.getMaxDamage() + 1 );
}
}
else
{
final int breakpoint = fuzzy.calculateBreakPoint( itemStack.getMaxDamage() );
final int damage = itemStack.getDamage() < breakpoint ? breakpoint - 1 : itemStack.getMaxDamage() + 1;
newDef.setDamage( damage );
}
}
return new AESharedItemStack(newDef);
}
return new AESharedItemStack( newDef );
}
}
}
}