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

Some additional fixes from other branch.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-05-30 22:18:26 +02:00
parent 16d6d55d7f
commit ec3b464655
139 changed files with 1489 additions and 1485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/parts/ItemFacade.java
+7 -7
View File
@@ -151,12 +151,12 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
}
final Block block = Block.getBlockFromItem( itemStack.getItem() );
if( block == Blocks.AIR || itemStack.hasTagCompound() )
if( block == Blocks.AIR || itemStack.hasTag() )
{
return ItemStack.EMPTY;
}
final int metadata = itemStack.getItem().getMetadata( itemStack.getItemDamage() );
final int metadata = itemStack.getItem().getMetadata( itemStack.getDamage() );
// Try to get the block state based on the item stack's meta. If this fails, don't consider it for a facade
// This for example fails for Pistons because they hardcoded an invalid meta value in vanilla
@@ -191,8 +191,8 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
final ItemStack is = new ItemStack( this );
final CompoundNBT data = new CompoundNBT();
data.setString( TAG_ITEM_ID, itemStack.getItem().getRegistryName().toString() );
data.setInteger( TAG_DAMAGE, itemStack.getItemDamage() );
data.putString(TAG_ITEM_ID, itemStack.getItem().getRegistryName().toString());
data.setInteger( TAG_DAMAGE, itemStack.getDamage() );
is.setTagCompound( data );
return is;
}
@@ -225,7 +225,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
int itemDamage;
// Handle legacy facades
if( nbt.hasKey( "x" ) )
if( nbt.contains("x") )
{
int[] data = nbt.getIntArray( "x" );
if( data.length != 2 )
@@ -285,7 +285,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
}
catch( Exception e )
{
AELog.warn( "Block %s has broken getStateFromMeta method for meta %d", block.getRegistryName().toString(), baseItemStack.getItemDamage() );
AELog.warn( "Block %s has broken getStateFromMeta method for meta %d", block.getRegistryName().toString(), baseItemStack.getDamage() );
return Blocks.GLASS.getDefaultState();
}
}
@@ -323,7 +323,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
}
final CompoundNBT facadeTag = new CompoundNBT();
facadeTag.setString( TAG_ITEM_ID, item.getRegistryName().toString() );
facadeTag.putString(TAG_ITEM_ID, item.getRegistryName().toString());
facadeTag.setInteger( TAG_DAMAGE, ids[1] );
facadeStack.setTagCompound( facadeTag );
src/main/java/appeng/items/parts/ItemPart.java
+2 -2
View File
@@ -178,7 +178,7 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup
{
final AEColor[] variants = AEColor.values();
final int itemDamage = is.getItemDamage();
final int itemDamage = is.getDamage();
final PartTypeWithVariant registeredPartType = this.registered.get( itemDamage );
if( registeredPartType != null )
{
@@ -211,7 +211,7 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup
{
Preconditions.checkNotNull( is );
final PartTypeWithVariant pt = this.registered.get( is.getItemDamage() );
final PartTypeWithVariant pt = this.registered.get( is.getDamage() );
if( pt != null )
{
return pt.part;
src/main/java/appeng/items/parts/ItemPartRendering.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class ItemPartRendering extends ItemRenderingCustomizer
private ModelResourceLocation getItemMeshDefinition( ItemStack is )
{
PartType partType = this.item.getTypeByStack( is );
int variant = this.item.variantOf( is.getItemDamage() );
int variant = this.item.variantOf( is.getDamage() );
return partType.getItemModels().get( variant );
}
}