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

Fixes #2415: Renaming remaining items/blocks.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-10-03 23:06:57 +02:00
parent ac0f32b21f
commit 9b51d54403
53 changed files with 696 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiIOPort.java
+1 -1
View File
@@ -101,7 +101,7 @@ public class GuiIOPort extends GuiUpgradeable
@Override
protected String getBackground()
{
return "guis/ioport.png";
return "guis/io_port.png";
}
@Override
src/main/java/appeng/core/Registration.java
+2 -2
View File
@@ -64,7 +64,7 @@ import appeng.core.localization.GuiText;
import appeng.core.localization.PlayerMessages;
import appeng.core.stats.PlayerStatsRegistration;
import appeng.hooks.TickHandler;
import appeng.items.materials.ItemMultiItem;
import appeng.items.materials.ItemMaterial;
import appeng.items.parts.ItemFacade;
import appeng.loot.ChestLoot;
import appeng.me.cache.CraftingGridCache;
@@ -238,7 +238,7 @@ public final class Registration
definitions.getRegistry().getBootstrapComponents().forEach( b -> b.initialize( event.getSide() ) );
// Perform ore camouflage!
ItemMultiItem.instance.makeUnique();
ItemMaterial.instance.makeUnique();
final Runnable recipeLoader = new RecipeLoader( recipeDirectory, customRecipeConfig, this.recipeHandler );
recipeLoader.run();
src/main/java/appeng/core/api/definitions/ApiBlocks.java
+2 -2
View File
@@ -283,7 +283,7 @@ public final class ApiBlocks implements IBlocks
.useCustomItemModel()
.rendering( new SpatialPylonRendering() )
.build();
this.spatialIOPort = registry.block( "spatial_ioport", BlockSpatialIOPort::new ).features( AEFeature.SpatialIO ).build();
this.spatialIOPort = registry.block( "spatial_io_port", BlockSpatialIOPort::new ).features( AEFeature.SpatialIO ).build();
this.controller = registry.block( "controller", BlockController::new )
.features( AEFeature.Channels )
.useCustomItemModel()
@@ -301,7 +301,7 @@ public final class ApiBlocks implements IBlocks
.build();
this.iface = registry.block( "interface", BlockInterface::new ).build();
this.cellWorkbench = registry.block( "cell_workbench", BlockCellWorkbench::new ).features( AEFeature.StorageCells ).build();
this.iOPort = registry.block( "ioport", BlockIOPort::new ).features( AEFeature.StorageCells, AEFeature.IOPort ).build();
this.iOPort = registry.block( "io_port", BlockIOPort::new ).features( AEFeature.StorageCells, AEFeature.IOPort ).build();
this.condenser = registry.block( "condenser", BlockCondenser::new ).build();
this.energyAcceptor = registry.block( "energy_acceptor", BlockEnergyAcceptor::new ).build();
this.vibrationChamber = registry.block( "vibration_chamber", BlockVibrationChamber::new ).features( AEFeature.PowerGen ).build();
src/main/java/appeng/core/api/definitions/ApiItems.java
+6 -6
View File
@@ -49,7 +49,7 @@ import appeng.items.tools.ToolNetworkTool;
import appeng.items.tools.powered.ToolChargedStaff;
import appeng.items.tools.powered.ToolColorApplicator;
import appeng.items.tools.powered.ToolEntropyManipulator;
import appeng.items.tools.powered.ToolMassCannon;
import appeng.items.tools.powered.ToolMatterCannon;
import appeng.items.tools.powered.ToolPortableCell;
import appeng.items.tools.powered.ToolWirelessTerminal;
import appeng.items.tools.quartz.ToolQuartzAxe;
@@ -147,7 +147,7 @@ public final class ApiItems implements IItems
.build();
this.wirelessTerminal = powerTools.item( "wireless_terminal", ToolWirelessTerminal::new ).addFeatures( AEFeature.WirelessAccessTerminal ).build();
this.chargedStaff = powerTools.item( "charged_staff", ToolChargedStaff::new ).addFeatures( AEFeature.ChargedStaff ).build();
this.massCannon = powerTools.item( "mass_cannon", ToolMassCannon::new )
this.massCannon = powerTools.item( "matter_cannon", ToolMatterCannon::new )
.addFeatures( AEFeature.MatterCannon )
.dispenserBehavior( DispenserMatterCannon::new )
.build();
@@ -165,10 +165,10 @@ public final class ApiItems implements IItems
this.viewCell = registry.item( "view_cell", ItemViewCell::new ).build();
FeatureFactory storageCells = registry.features( AEFeature.StorageCells );
this.cell1k = storageCells.item( "basic_storage_cell_1k", () -> new ItemBasicStorageCell( MaterialType.Cell1kPart, 1 ) ).build();
this.cell4k = storageCells.item( "basic_storage_cell_4k", () -> new ItemBasicStorageCell( MaterialType.Cell4kPart, 4 ) ).build();
this.cell16k = storageCells.item( "basic_storage_cell_16k", () -> new ItemBasicStorageCell( MaterialType.Cell16kPart, 16 ) ).build();
this.cell64k = storageCells.item( "basic_storage_cell_64k", () -> new ItemBasicStorageCell( MaterialType.Cell64kPart, 64 ) ).build();
this.cell1k = storageCells.item( "storage_cell_1k", () -> new ItemBasicStorageCell( MaterialType.Cell1kPart, 1 ) ).build();
this.cell4k = storageCells.item( "storage_cell_4k", () -> new ItemBasicStorageCell( MaterialType.Cell4kPart, 4 ) ).build();
this.cell16k = storageCells.item( "storage_cell_16k", () -> new ItemBasicStorageCell( MaterialType.Cell16kPart, 16 ) ).build();
this.cell64k = storageCells.item( "storage_cell_64k", () -> new ItemBasicStorageCell( MaterialType.Cell64kPart, 64 ) ).build();
FeatureFactory spatialCells = registry.features( AEFeature.SpatialIO );
this.spatialCell2 = spatialCells.item( "spatial_storage_cell_2_cubed", () -> new ItemSpatialStorageCell( 2 ) ).build();
src/main/java/appeng/core/api/definitions/ApiMaterials.java
+3 -3
View File
@@ -31,7 +31,7 @@ import appeng.bootstrap.FeatureFactory;
import appeng.bootstrap.IItemRendering;
import appeng.bootstrap.ItemRenderingCustomizer;
import appeng.core.features.DamagedItemDefinition;
import appeng.items.materials.ItemMultiItem;
import appeng.items.materials.ItemMaterial;
import appeng.items.materials.MaterialType;
@@ -114,8 +114,8 @@ public final class ApiMaterials implements IMaterials
public ApiMaterials( FeatureFactory registry )
{
final ItemMultiItem materials = new ItemMultiItem();
registry.item( "multi_material", () -> materials )
final ItemMaterial materials = new ItemMaterial();
registry.item( "material", () -> materials )
.rendering( new ItemRenderingCustomizer()
{
@Override
src/main/java/appeng/core/api/definitions/ApiParts.java
+36 -36
View File
@@ -29,8 +29,8 @@ import appeng.core.features.ColoredItemDefinition;
import appeng.core.features.DamagedItemDefinition;
import appeng.core.features.ItemStackSrc;
import appeng.core.features.registries.PartModels;
import appeng.items.parts.ItemMultiPart;
import appeng.items.parts.ItemMultipartRendering;
import appeng.items.parts.ItemPart;
import appeng.items.parts.ItemPartRendering;
import appeng.items.parts.PartType;
@@ -80,9 +80,9 @@ public final class ApiParts implements IParts
public ApiParts( FeatureFactory registry, PartModels partModels )
{
final ItemMultiPart itemMultiPart = new ItemMultiPart();
registry.item( "multipart", () -> itemMultiPart )
.rendering( new ItemMultipartRendering( partModels, itemMultiPart ) )
final ItemPart itemPart = new ItemPart();
registry.item( "part", () -> itemPart )
.rendering( new ItemPartRendering( partModels, itemPart ) )
.build();
// Register all part models
@@ -91,49 +91,49 @@ public final class ApiParts implements IParts
partModels.registerModels( partType.getModels() );
}
this.cableSmart = constructColoredDefinition( itemMultiPart, PartType.CableSmart );
this.cableCovered = constructColoredDefinition( itemMultiPart, PartType.CableCovered );
this.cableGlass = constructColoredDefinition( itemMultiPart, PartType.CableGlass );
this.cableDense = constructColoredDefinition( itemMultiPart, PartType.CableDense );
this.cableSmart = constructColoredDefinition( itemPart, PartType.CableSmart );
this.cableCovered = constructColoredDefinition( itemPart, PartType.CableCovered );
this.cableGlass = constructColoredDefinition( itemPart, PartType.CableGlass );
this.cableDense = constructColoredDefinition( itemPart, PartType.CableDense );
// this.lumenCableSmart = Optional.absent(); // has yet to be implemented, no PartType defined for it yet
// this.lumenCableCovered = Optional.absent(); // has yet to be implemented, no PartType defined for it yet
// this.lumenCableGlass = Optional.absent(); // has yet to be implemented, no PartType defined for it yet
// this.lumenCableDense = Optional.absent(); // has yet to be implemented, no PartType defined for it yet
this.quartzFiber = new DamagedItemDefinition( "part.quartz_fiber", itemMultiPart.createPart( PartType.QuartzFiber ) );
this.toggleBus = new DamagedItemDefinition( "part.toggle_bus", itemMultiPart.createPart( PartType.ToggleBus ) );
this.invertedToggleBus = new DamagedItemDefinition( "part.toggle_bus.inverted", itemMultiPart.createPart( PartType.InvertedToggleBus ) );
this.storageBus = new DamagedItemDefinition( "part.bus.storage", itemMultiPart.createPart( PartType.StorageBus ) );
this.importBus = new DamagedItemDefinition( "part.bus.import", itemMultiPart.createPart( PartType.ImportBus ) );
this.exportBus = new DamagedItemDefinition( "part.bus.export", itemMultiPart.createPart( PartType.ExportBus ) );
this.iface = new DamagedItemDefinition( "part.interface", itemMultiPart.createPart( PartType.Interface ) );
this.levelEmitter = new DamagedItemDefinition( "part.level_emitter", itemMultiPart.createPart( PartType.LevelEmitter ) );
this.annihilationPlane = new DamagedItemDefinition( "part.plane.annihilation", itemMultiPart.createPart( PartType.AnnihilationPlane ) );
this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemMultiPart.createPart( PartType.IdentityAnnihilationPlane ) );
this.formationPlane = new DamagedItemDefinition( "part.plane.formation", itemMultiPart.createPart( PartType.FormationPlane ) );
this.p2PTunnelME = new DamagedItemDefinition( "part.tunnel.me", itemMultiPart.createPart( PartType.P2PTunnelME ) );
this.p2PTunnelRedstone = new DamagedItemDefinition( "part.tunnel.redstone", itemMultiPart.createPart( PartType.P2PTunnelRedstone ) );
this.p2PTunnelItems = new DamagedItemDefinition( "part.tunnel.item", itemMultiPart.createPart( PartType.P2PTunnelItems ) );
this.p2PTunnelLiquids = new DamagedItemDefinition( "part.tunnel.fluid", itemMultiPart.createPart( PartType.P2PTunnelLiquids ) );
this.quartzFiber = new DamagedItemDefinition( "part.quartz_fiber", itemPart.createPart( PartType.QuartzFiber ) );
this.toggleBus = new DamagedItemDefinition( "part.toggle_bus", itemPart.createPart( PartType.ToggleBus ) );
this.invertedToggleBus = new DamagedItemDefinition( "part.toggle_bus.inverted", itemPart.createPart( PartType.InvertedToggleBus ) );
this.storageBus = new DamagedItemDefinition( "part.bus.storage", itemPart.createPart( PartType.StorageBus ) );
this.importBus = new DamagedItemDefinition( "part.bus.import", itemPart.createPart( PartType.ImportBus ) );
this.exportBus = new DamagedItemDefinition( "part.bus.export", itemPart.createPart( PartType.ExportBus ) );
this.iface = new DamagedItemDefinition( "part.interface", itemPart.createPart( PartType.Interface ) );
this.levelEmitter = new DamagedItemDefinition( "part.level_emitter", itemPart.createPart( PartType.LevelEmitter ) );
this.annihilationPlane = new DamagedItemDefinition( "part.plane.annihilation", itemPart.createPart( PartType.AnnihilationPlane ) );
this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemPart.createPart( PartType.IdentityAnnihilationPlane ) );
this.formationPlane = new DamagedItemDefinition( "part.plane.formation", itemPart.createPart( PartType.FormationPlane ) );
this.p2PTunnelME = new DamagedItemDefinition( "part.tunnel.me", itemPart.createPart( PartType.P2PTunnelME ) );
this.p2PTunnelRedstone = new DamagedItemDefinition( "part.tunnel.redstone", itemPart.createPart( PartType.P2PTunnelRedstone ) );
this.p2PTunnelItems = new DamagedItemDefinition( "part.tunnel.item", itemPart.createPart( PartType.P2PTunnelItems ) );
this.p2PTunnelLiquids = new DamagedItemDefinition( "part.tunnel.fluid", itemPart.createPart( PartType.P2PTunnelLiquids ) );
// this.p2PTunnelEU = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelEU ) );
// this.p2PTunnelRF = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelRF ) );
this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemMultiPart.createPart( PartType.P2PTunnelLight ) );
this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemPart.createPart( PartType.P2PTunnelLight ) );
// this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart(
// PartType.P2PTunnelOpenComputers ) );
// this.p2PTunnelPneumaticCraft = new DamagedItemDefinition( itemMultiPart.createPart(
// PartType.P2PTunnelPressure ) );
this.cableAnchor = new DamagedItemDefinition( "part.cable_anchor", itemMultiPart.createPart( PartType.CableAnchor ) );
this.monitor = new DamagedItemDefinition( "part.monitor", itemMultiPart.createPart( PartType.Monitor ) );
this.semiDarkMonitor = new DamagedItemDefinition( "part.monitor.semi_dark", itemMultiPart.createPart( PartType.SemiDarkMonitor ) );
this.darkMonitor = new DamagedItemDefinition( "part.monitor.dark", itemMultiPart.createPart( PartType.DarkMonitor ) );
this.interfaceTerminal = new DamagedItemDefinition( "part.terminal.interface", itemMultiPart.createPart( PartType.InterfaceTerminal ) );
this.patternTerminal = new DamagedItemDefinition( "part.terminal.pattern", itemMultiPart.createPart( PartType.PatternTerminal ) );
this.craftingTerminal = new DamagedItemDefinition( "part.terminal.crafting", itemMultiPart.createPart( PartType.CraftingTerminal ) );
this.terminal = new DamagedItemDefinition( "part.terminal", itemMultiPart.createPart( PartType.Terminal ) );
this.storageMonitor = new DamagedItemDefinition( "part.monitor.storage", itemMultiPart.createPart( PartType.StorageMonitor ) );
this.conversionMonitor = new DamagedItemDefinition( "part.monitor.conversion", itemMultiPart.createPart( PartType.ConversionMonitor ) );
this.cableAnchor = new DamagedItemDefinition( "part.cable_anchor", itemPart.createPart( PartType.CableAnchor ) );
this.monitor = new DamagedItemDefinition( "part.monitor", itemPart.createPart( PartType.Monitor ) );
this.semiDarkMonitor = new DamagedItemDefinition( "part.monitor.semi_dark", itemPart.createPart( PartType.SemiDarkMonitor ) );
this.darkMonitor = new DamagedItemDefinition( "part.monitor.dark", itemPart.createPart( PartType.DarkMonitor ) );
this.interfaceTerminal = new DamagedItemDefinition( "part.terminal.interface", itemPart.createPart( PartType.InterfaceTerminal ) );
this.patternTerminal = new DamagedItemDefinition( "part.terminal.pattern", itemPart.createPart( PartType.PatternTerminal ) );
this.craftingTerminal = new DamagedItemDefinition( "part.terminal.crafting", itemPart.createPart( PartType.CraftingTerminal ) );
this.terminal = new DamagedItemDefinition( "part.terminal", itemPart.createPart( PartType.Terminal ) );
this.storageMonitor = new DamagedItemDefinition( "part.monitor.storage", itemPart.createPart( PartType.StorageMonitor ) );
this.conversionMonitor = new DamagedItemDefinition( "part.monitor.conversion", itemPart.createPart( PartType.ConversionMonitor ) );
}
private static AEColoredItemDefinition constructColoredDefinition( final ItemMultiPart target, final PartType type )
private static AEColoredItemDefinition constructColoredDefinition( final ItemPart target, final PartType type )
{
final ColoredItemDefinition definition = new ColoredItemDefinition();
src/main/java/appeng/hooks/DispenserMatterCannon.java
+3 -3
View File
@@ -30,7 +30,7 @@ import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import appeng.api.util.AEPartLocation;
import appeng.items.tools.powered.ToolMassCannon;
import appeng.items.tools.powered.ToolMatterCannon;
import appeng.util.Platform;
@@ -41,7 +41,7 @@ public final class DispenserMatterCannon extends BehaviorDefaultDispenseItem
protected ItemStack dispenseStack( final IBlockSource dispenser, ItemStack dispensedItem )
{
final Item i = dispensedItem.getItem();
if( i instanceof ToolMassCannon )
if( i instanceof ToolMatterCannon )
{
final EnumFacing enumfacing = dispenser.getBlockState().getValue( BlockDispenser.FACING );
AEPartLocation dir = AEPartLocation.INTERNAL;
@@ -53,7 +53,7 @@ public final class DispenserMatterCannon extends BehaviorDefaultDispenseItem
}
}
final ToolMassCannon tm = (ToolMassCannon) i;
final ToolMatterCannon tm = (ToolMatterCannon) i;
final World w = dispenser.getWorld();
if( w instanceof WorldServer )
src/main/java/appeng/items/materials/ItemMultiItem.java → src/main/java/appeng/items/materials/ItemMaterial.java
+4 -4
View File
@@ -67,15 +67,15 @@ import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
public final class ItemMultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule
public final class ItemMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule
{
public static ItemMultiItem instance;
public static ItemMaterial instance;
private static final int KILO_SCALAR = 1024;
private final Map<Integer, MaterialType> dmgToMaterial = new HashMap<>();
public ItemMultiItem()
public ItemMaterial()
{
this.setHasSubtypes( true );
instance = this;
@@ -253,7 +253,7 @@ public final class ItemMultiItem extends AEBaseItem implements IStorageComponent
@Override
public String getUnlocalizedName( final ItemStack is )
{
return "item.appliedenergistics2.multi_material." + this.nameOf( is );
return "item.appliedenergistics2.material." + this.nameOf( is );
}
@Override
src/main/java/appeng/items/parts/ItemMultiPart.java → src/main/java/appeng/items/parts/ItemPart.java
+3 -3
View File
@@ -59,15 +59,15 @@ import appeng.integration.IntegrationType;
import appeng.items.AEBaseItem;
public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup
public final class ItemPart 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;
public static ItemPart instance;
private final Map<Integer, PartTypeWithVariant> registered;
public ItemMultiPart()
public ItemPart()
{
this.registered = new HashMap<>( INITIAL_REGISTERED_CAPACITY );
src/main/java/appeng/items/parts/ItemMultipartRendering.java → src/main/java/appeng/items/parts/ItemPartRendering.java
+3 -3
View File
@@ -40,14 +40,14 @@ import appeng.parts.automation.PlaneConnections;
import appeng.parts.automation.PlaneModel;
public class ItemMultipartRendering extends ItemRenderingCustomizer
public class ItemPartRendering extends ItemRenderingCustomizer
{
private final PartModels partModels;
private final ItemMultiPart item;
private final ItemPart item;
public ItemMultipartRendering( PartModels partModels, ItemMultiPart item )
public ItemPartRendering( PartModels partModels, ItemPart item )
{
this.partModels = partModels;
this.item = item;
src/main/java/appeng/items/tools/powered/ToolMassCannon.java → src/main/java/appeng/items/tools/powered/ToolMatterCannon.java
+3 -3
View File
@@ -79,10 +79,10 @@ import appeng.util.LookDirection;
import appeng.util.Platform;
public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell
{
public ToolMassCannon()
public ToolMatterCannon()
{
super( AEConfig.instance.matterCannonBattery );
}
@@ -371,7 +371,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
if( pos != null )
{
final DamageSource dmgSrc = DamageSource.causePlayerDamage( p );
dmgSrc.damageType = "masscannon";
dmgSrc.damageType = "matter_cannon";
if( pos.typeOfHit == RayTraceResult.Type.ENTITY )
{
src/main/java/appeng/parts/AEBasePart.java
+2 -2
View File
@@ -67,7 +67,7 @@ import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.helpers.ICustomNameObject;
import appeng.helpers.IPriorityHost;
import appeng.items.parts.ItemMultiPart;
import appeng.items.parts.ItemPart;
import appeng.items.parts.PartType;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
@@ -102,7 +102,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
public PartType getType()
{
return ItemMultiPart.instance.getTypeByStack( is );
return ItemPart.instance.getTypeByStack( is );
}
@Override
src/main/java/appeng/parts/networking/PartCable.java
+2 -2
View File
@@ -47,7 +47,7 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IReadOnlyCollection;
import appeng.items.parts.ItemMultiPart;
import appeng.items.parts.ItemPart;
import appeng.me.GridAccessException;
import appeng.parts.AEBasePart;
import appeng.util.Platform;
@@ -68,7 +68,7 @@ public class PartCable extends AEBasePart implements IPartCable
super( is );
this.getProxy().setFlags( GridFlags.PREFERRED );
this.getProxy().setIdlePowerUsage( 0.0 );
this.getProxy().setColor( AEColor.values()[( (ItemMultiPart) is.getItem() ).variantOf( is.getItemDamage() )] );
this.getProxy().setColor( AEColor.values()[( (ItemPart) is.getItem() ).variantOf( is.getItemDamage() )] );
}
@Override
src/main/java/appeng/recipes/AEItemResolver.java
+6 -6
View File
@@ -31,10 +31,10 @@ import appeng.api.recipes.ResolverResultSet;
import appeng.api.util.AEColor;
import appeng.api.util.AEColoredItemDefinition;
import appeng.core.AppEng;
import appeng.items.materials.ItemMultiItem;
import appeng.items.materials.ItemMaterial;
import appeng.items.materials.MaterialType;
import appeng.items.misc.ItemCrystalSeed;
import appeng.items.parts.ItemMultiPart;
import appeng.items.parts.ItemPart;
import appeng.items.parts.PartType;
@@ -124,7 +124,7 @@ public class AEItemResolver implements ISubItemResolver
final String materialName = itemName.substring( itemName.indexOf( '.' ) + 1 );
final MaterialType mt = MaterialType.valueOf( materialName );
// itemName = itemName.substring( 0, itemName.indexOf( "." ) );
if( mt.getItemInstance() == ItemMultiItem.instance && mt.getDamageValue() >= 0 && mt.isRegistered() )
if( mt.getItemInstance() == ItemMaterial.instance && mt.getDamageValue() >= 0 && mt.isRegistered() )
{
return new ResolverResult( "ItemMultiMaterial", mt.getDamageValue() );
}
@@ -135,10 +135,10 @@ public class AEItemResolver implements ISubItemResolver
final String partName = itemName.substring( itemName.indexOf( '.' ) + 1 );
final PartType pt = PartType.valueOf( partName );
// itemName = itemName.substring( 0, itemName.indexOf( "." ) );
final int dVal = ItemMultiPart.instance.getDamageByType( pt );
final int dVal = ItemPart.instance.getDamageByType( pt );
if( dVal >= 0 )
{
return new ResolverResult( "ItemMultiPart", dVal );
return new ResolverResult( "ItemPart", dVal );
}
}
}
@@ -182,6 +182,6 @@ public class AEItemResolver implements ISubItemResolver
}
final ItemStack is = partType.stack( col, 1 );
return new ResolverResult( "ItemMultiPart", is.getItemDamage() );
return new ResolverResult( "ItemPart", is.getItemDamage() );
}
}
src/main/java/appeng/recipes/RecipeHandler.java
+7 -7
View File
@@ -59,9 +59,9 @@ import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.AppEng;
import appeng.core.features.AEFeature;
import appeng.items.materials.ItemMultiItem;
import appeng.items.materials.ItemMaterial;
import appeng.items.misc.ItemCrystalSeed;
import appeng.items.parts.ItemMultiPart;
import appeng.items.parts.ItemPart;
import appeng.recipes.handlers.IWebsiteSerializer;
import appeng.recipes.handlers.OreRegistration;
@@ -204,15 +204,15 @@ public class RecipeHandler implements IRecipeHandler
default:
}
}
else if( is.getItem() instanceof ItemMultiItem )
else if( is.getItem() instanceof ItemMaterial )
{
realName = realName.replace( "ItemMultiMaterial", "ItemMaterial" );
realName += '.' + ( (ItemMultiItem) is.getItem() ).getTypeByStack( is ).name();
realName += '.' + ( (ItemMaterial) is.getItem() ).getTypeByStack( is ).name();
}
else if( is.getItem() instanceof ItemMultiPart )
else if( is.getItem() instanceof ItemPart )
{
realName = realName.replace( "ItemMultiPart", "ItemPart" );
realName += '.' + ( (ItemMultiPart) is.getItem() ).getTypeByStack( is ).name();
realName = realName.replace( "ItemPart", "ItemPart" );
realName += '.' + ( (ItemPart) is.getItem() ).getTypeByStack( is ).name();
}
else if( is.getItemDamage() > 0 )
{