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

Merge remote-tracking branch 'origin/cleanups' into fabric-1.16

Browse Source 
# Conflicts:
#	api/src/main/java/appeng/api/implementations/items/IItemGroup.java
#	core/src/main/java/appeng/items/materials/MaterialItem.java
#	src/main/java/appeng/core/Registration.java
#	src/main/java/appeng/core/api/definitions/ApiParts.java
#	src/main/java/appeng/items/parts/ColoredPartItem.java
#	src/main/java/appeng/items/parts/PartItem.java
#	src/main/java/appeng/items/parts/PartModelsHelper.java
#	src/main/java/appeng/items/parts/PartType.java
#	src/main/java/appeng/items/tools/powered/PortableCellItem.java
This commit is contained in:
Sebastian Hartte
2020-07-01 01:41:54 +02:00
parent 996d387525 c67dba2f13
commit 8e031ca8d6
17 changed files with 324 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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.Settings 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;