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

Removed reliance on PartType from code outside of Bootstrapping,

Browse Source 
and restored ability to group different supported items on
Upgrade Card tooltips.
This commit is contained in:
Sebastian Hartte
2020-07-01 00:33:15 +02:00
parent 400fcdb633
commit c67dba2f13
18 changed files with 368 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
+1 -7
View File
@@ -52,7 +52,6 @@ import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.FuzzyMode;
import appeng.api.implementations.items.IItemGroup;
import appeng.api.implementations.items.IStorageCell;
import appeng.api.implementations.tiles.IColorableTile;
import appeng.api.storage.IMEInventory;
@@ -80,7 +79,7 @@ import appeng.util.Platform;
import appeng.util.item.AEItemStack;
public class ColorApplicatorItem extends AEBasePoweredItem
implements IStorageCell<IAEItemStack>, IItemGroup, IBlockTool, IMouseWheelItem {
implements IStorageCell<IAEItemStack>, IBlockTool, IMouseWheelItem {
private static final Map<ResourceLocation, AEColor> TAG_TO_COLOR = ImmutableMap.<ResourceLocation, AEColor>builder()
.put(new ResourceLocation("forge:dyes/black"), AEColor.BLACK)
@@ -409,11 +408,6 @@ public class ColorApplicatorItem extends AEBasePoweredItem
return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
}
@Override
public String getUnlocalizedGroupName(final Set<ItemStack> others, final ItemStack is) {
return GuiText.StorageCells.getTranslationKey();
}
@Override
public boolean isEditable(final ItemStack is) {
return true;
src/main/java/appeng/items/tools/powered/PortableCellItem.java
+1 -7
View File
@@ -39,7 +39,6 @@ import appeng.api.AEApi;
import appeng.api.config.FuzzyMode;
import appeng.api.implementations.guiobjects.IGuiItem;
import appeng.api.implementations.guiobjects.IGuiItemObject;
import appeng.api.implementations.items.IItemGroup;
import appeng.api.implementations.items.IStorageCell;
import appeng.api.storage.IStorageChannel;
import appeng.api.storage.cells.ICellInventoryHandler;
@@ -55,7 +54,7 @@ import appeng.items.contents.CellUpgrades;
import appeng.items.contents.PortableCellViewer;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
public class PortableCellItem extends AEBasePoweredItem implements IStorageCell<IAEItemStack>, IGuiItem, IItemGroup {
public class PortableCellItem extends AEBasePoweredItem implements IStorageCell<IAEItemStack>, IGuiItem {
public PortableCellItem(Item.Properties props) {
super(AEConfig.instance().getPortableCellBattery(), props);
}
@@ -118,11 +117,6 @@ public class PortableCellItem extends AEBasePoweredItem implements IStorageCell<
return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
}
@Override
public String getUnlocalizedGroupName(final Set<ItemStack> others, final ItemStack is) {
return GuiText.StorageCells.getTranslationKey();
}
@Override
public boolean isEditable(final ItemStack is) {
return true;