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

Fixes #1474: Prevents crafting of disabled recipes and deletes invalid parts

Browse Source
This commit is contained in:
thatsIch
2015-05-24 13:36:43 +02:00
committed by thatsIch
parent 5d34b4e182
commit e5ee4e0e61
20 changed files with 279 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/AEBaseItem.java
+17 -2
View File
@@ -1,6 +1,6 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +22,9 @@ package appeng.items;
import java.util.EnumSet;
import java.util.List;
import com.google.common.base.Optional;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -87,13 +90,20 @@ public abstract class AEBaseItem extends Item implements IAEFeature
this.addCheckedInformation( stack, player, lines, displayMoreInfo );
}
@Override
@SuppressWarnings( "unchecked" )
public final void getSubItems( Item sameItem, CreativeTabs creativeTab, List itemStacks )
{
this.getCheckedSubItems( sameItem, creativeTab, itemStacks );
}
@Override
public boolean isBookEnchantable( ItemStack itemstack1, ItemStack itemstack2 )
{
return false;
}
public void addCheckedInformation( ItemStack stack, EntityPlayer player, List<String> lines, boolean displayMoreInfo )
protected void addCheckedInformation( ItemStack stack, EntityPlayer player, List<String> lines, boolean displayMoreInfo )
{
super.addInformation( stack, player, lines, displayMoreInfo );
}
@@ -120,4 +130,9 @@ public abstract class AEBaseItem extends Item implements IAEFeature
{
}
protected void getCheckedSubItems( Item sameItem, CreativeTabs creativeTab, List<ItemStack> itemStacks )
{
super.getSubItems( sameItem, creativeTab, itemStacks );
}
}
src/main/java/appeng/items/materials/MultiItem.java
+3 -3
View File
@@ -1,6 +1,6 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -275,7 +275,7 @@ public final class MultiItem extends AEBaseItem implements IStorageComponent, IU
}
@Override
public void getSubItems( Item par1, CreativeTabs par2CreativeTabs, List cList )
protected void getCheckedSubItems( Item sameItem, CreativeTabs creativeTab, List<ItemStack> itemStacks )
{
List<MaterialType> types = Arrays.asList( MaterialType.values() );
Collections.sort( types, new Comparator<MaterialType>()
@@ -292,7 +292,7 @@ public final class MultiItem extends AEBaseItem implements IStorageComponent, IU
{
if( mat.damageValue >= 0 && mat.isRegistered() && mat.itemInstance == this )
{
cList.add( new ItemStack( this, 1, mat.damageValue ) );
itemStacks.add( new ItemStack( this, 1, mat.damageValue ) );
}
}
}
src/main/java/appeng/items/misc/ItemCrystalSeed.java
+10 -10
View File
@@ -313,21 +313,21 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
}
@Override
public void getSubItems( Item i, CreativeTabs t, List l )
protected void getCheckedSubItems( Item sameItem, CreativeTabs creativeTab, List<ItemStack> itemStacks )
{
// lvl 0
l.add( newStyle( new ItemStack( this, 1, CERTUS ) ) );
l.add( newStyle( new ItemStack( this, 1, NETHER ) ) );
l.add( newStyle( new ItemStack( this, 1, FLUIX ) ) );
itemStacks.add( newStyle( new ItemStack( this, 1, CERTUS ) ) );
itemStacks.add( newStyle( new ItemStack( this, 1, NETHER ) ) );
itemStacks.add( newStyle( new ItemStack( this, 1, FLUIX ) ) );
// lvl 1
l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + CERTUS ) ) );
l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + NETHER ) ) );
l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + FLUIX ) ) );
itemStacks.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + CERTUS ) ) );
itemStacks.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + NETHER ) ) );
itemStacks.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + FLUIX ) ) );
// lvl 2
l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + CERTUS ) ) );
l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + NETHER ) ) );
l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + FLUIX ) ) );
itemStacks.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + CERTUS ) ) );
itemStacks.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + NETHER ) ) );
itemStacks.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + FLUIX ) ) );
}
}
src/main/java/appeng/items/misc/ItemPaintBall.java
+4 -4
View File
@@ -1,6 +1,6 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -123,13 +123,13 @@ public class ItemPaintBall extends AEBaseItem
}
@Override
public void getSubItems( Item i, CreativeTabs ct, List l )
protected void getCheckedSubItems( Item sameItem, CreativeTabs creativeTab, List<ItemStack> itemStacks )
{
for( AEColor c : AEColor.values() )
{
if( c != AEColor.Transparent )
{
l.add( new ItemStack( this, 1, c.ordinal() ) );
itemStacks.add( new ItemStack( this, 1, c.ordinal() ) );
}
}
@@ -137,7 +137,7 @@ public class ItemPaintBall extends AEBaseItem
{
if( c != AEColor.Transparent )
{
l.add( new ItemStack( this, 1, DAMAGE_THRESHOLD + c.ordinal() ) );
itemStacks.add( new ItemStack( this, 1, DAMAGE_THRESHOLD + c.ordinal() ) );
}
}
}
src/main/java/appeng/items/parts/ItemFacade.java
+5 -5
View File
@@ -1,6 +1,6 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -100,17 +100,17 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
}
@Override
public void getSubItems( Item number, CreativeTabs tab, List list )
protected void getCheckedSubItems( Item sameItem, CreativeTabs creativeTab, List<ItemStack> itemStacks )
{
this.calculateSubTypes();
list.addAll( this.subTypes );
itemStacks.addAll( this.subTypes );
}
private void calculateSubTypes()
{
if( this.subTypes == null )
{
this.subTypes = new ArrayList<ItemStack>();
this.subTypes = new ArrayList<ItemStack>( 1000 );
for( Object blk : Block.blockRegistry )
{
Block b = (Block) blk;
@@ -118,7 +118,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
{
Item item = Item.getItemFromBlock( b );
List<ItemStack> tmpList = new ArrayList<ItemStack>();
List<ItemStack> tmpList = new ArrayList<ItemStack>( 100 );
b.getSubBlocks( item, b.getCreativeTabToDisplayOn(), tmpList );
for( ItemStack l : tmpList )
{
src/main/java/appeng/items/parts/ItemMultiPart.java
+58 -28
View File
@@ -1,6 +1,6 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -21,6 +21,7 @@ package appeng.items.parts;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumSet;
@@ -47,6 +48,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition;
import appeng.api.implementations.items.IItemGroup;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartHelper;
@@ -58,6 +60,7 @@ import appeng.client.texture.MissingIcon;
import appeng.core.AEConfig;
import appeng.core.AppEng;
import appeng.core.features.AEFeature;
import appeng.core.features.ActivityState;
import appeng.core.features.ItemStackSrc;
import appeng.core.localization.GuiText;
import appeng.integration.IntegrationRegistry;
@@ -67,18 +70,17 @@ import appeng.items.AEBaseItem;
public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup
{
private static final int INITIAL_REGISTERED_CAPACITY = PartType.values().length;
private static final Comparator<Entry<Integer, PartTypeWithVariant>> REGISTERED_COMPARATOR = new RegisteredComparator();
public static ItemMultiPart instance;
private final Map<Integer, PartTypeWithVariant> registered;
private final Map<Integer, PartTypeWithVariant> unregistered;
public ItemMultiPart( IPartHelper partHelper )
{
Preconditions.checkNotNull( partHelper );
this.registered = new HashMap<Integer, PartTypeWithVariant>();
this.unregistered = new HashMap<Integer, PartTypeWithVariant>();
this.registered = new HashMap<Integer, PartTypeWithVariant>( INITIAL_REGISTERED_CAPACITY );
this.setFeature( EnumSet.of( AEFeature.Core ) );
partHelper.setItemBusRenderer( this );
@@ -133,7 +135,8 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
}
final int partDamage = mat.baseDamage + varID;
final ItemStackSrc output = new ItemStackSrc( this, partDamage );
final ActivityState state = ActivityState.from( enabled );
final ItemStackSrc output = new ItemStackSrc( this, partDamage, state );
final PartTypeWithVariant pti = new PartTypeWithVariant( mat, varID );
@@ -148,13 +151,13 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
assert mat != null;
assert pti != null;
final Map<Integer, PartTypeWithVariant> reference = ( enabled ) ? this.registered : this.unregistered;
if( reference.containsKey( partDamage ) )
final PartTypeWithVariant registeredPartType = this.registered.get( partDamage );
if( registeredPartType != null )
{
throw new IllegalStateException( "Meta Overlap detected with type " + mat + " and damage " + partDamage + ". Found " + reference.get( partDamage ) + " there already." );
throw new IllegalStateException( "Meta Overlap detected with type " + mat + " and damage " + partDamage + ". Found " + registeredPartType + " there already." );
}
reference.put( partDamage, pti );
this.registered.put( partDamage, pti );
}
public int getDamageByType( PartType t )
@@ -204,13 +207,13 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
}
@Override
public IAESprite getIcon(
ItemStack is )
public IAESprite getIcon( ItemStack is )
{
for( Entry<Integer, PartTypeWithVariant> part : this.registered.entrySet() )
final int dmg = is.getMetadata();
final PartTypeWithVariant registeredType = this.registered.get( dmg );
if( registeredType != null )
{
if ( is.getMetadata() == part.getKey() )
return part.getValue().texture;
return registeredType.texture;
}
return new MissingIcon( this );
@@ -225,7 +228,12 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
{
final AEColor[] variants = AEColor.values();
return super.getItemStackDisplayName( is ) + " - " + variants[this.registered.get( is.getItemDamage() ).variant].toString();
final int itemDamage = is.getItemDamage();
final PartTypeWithVariant registeredPartType = this.registered.get( itemDamage );
if( registeredPartType != null )
{
return super.getItemStackDisplayName( is ) + " - " + variants[registeredPartType.variant].toString();
}
}
if( pt.getExtraName() != null )
@@ -237,14 +245,24 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
}
@Override
public void getSubItems( Item number, CreativeTabs tab, List cList )
public void registerIcons( IIconRegister iconRegister )
{
for( Entry<Integer, PartTypeWithVariant> part : this.registered.entrySet() )
{
String tex = "appliedenergistics2:" + this.getName( new ItemStack( this, 1, part.getKey() ) );
part.getValue().ico = iconRegister.registerIcon( tex );
}
}
@Override
protected void getCheckedSubItems( Item sameItem, CreativeTabs creativeTab, List<ItemStack> itemStacks )
{
List<Entry<Integer, PartTypeWithVariant>> types = new ArrayList<Entry<Integer, PartTypeWithVariant>>( this.registered.entrySet() );
Collections.sort( types, REGISTERED_COMPARATOR );
for( Entry<Integer, PartTypeWithVariant> part : types )
{
cList.add( new ItemStack( this, 1, part.getKey() ) );
itemStacks.add( new ItemStack( this, 1, part.getKey() ) );
}
}
@@ -268,21 +286,20 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
{
return pt.part;
}
final PartTypeWithVariant unregisteredPartType = this.unregistered.get( is.getItemDamage() );
if( unregisteredPartType != null )
{
return unregisteredPartType.part;
}
throw new IllegalStateException( "ItemStack " + is + " has to be either registered or unregistered, but was not found in either." );
return PartType.InvalidType;
}
@Nonnull
@Nullable
@Override
public IPart createPartFromItemStack( ItemStack is )
{
final PartType type = this.getTypeByStack( is );
final Class<? extends IPart> part = type.getPart();
if( part == null )
{
return null;
}
try
{
@@ -313,10 +330,12 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
public int variantOf( int itemDamage )
{
if( this.registered.containsKey( itemDamage ) )
final PartTypeWithVariant registeredPartType = this.registered.get( itemDamage );
if( registeredPartType != null )
{
return this.registered.get( itemDamage ).variant;
return registeredPartType.variant;
}
return 0;
}
@@ -380,8 +399,19 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
this.part = part;
this.variant = variant;
}
@Override
public String toString()
{
return "PartTypeWithVariant{" +
"part=" + this.part +
", variant=" + this.variant +
", ico=" + this.ico +
'}';
}
}
private static final class RegisteredComparator implements Comparator<Entry<Integer, PartTypeWithVariant>>
{
@Override
src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java
+7 -6
View File
@@ -1,6 +1,6 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -76,15 +76,16 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
}
@Override
public void getSubItems( Item id, CreativeTabs tab, List list )
protected void getCheckedSubItems( Item sameItem, CreativeTabs creativeTab, List<ItemStack> itemStacks )
{
super.getSubItems( id, tab, list );
super.getCheckedSubItems( sameItem, creativeTab, itemStacks );
ItemStack charged = new ItemStack( this, 1 );
NBTTagCompound tag = Platform.openNbtData( charged );
final ItemStack charged = new ItemStack( this, 1 );
final NBTTagCompound tag = Platform.openNbtData( charged );
tag.setDouble( "internalCurrentPower", this.getAEMaxPower( charged ) );
tag.setDouble( "internalMaxPower", this.getAEMaxPower( charged ) );
list.add( charged );
itemStacks.add( charged );
}
@Override