1.15 port

src/api/java/appeng/api/config/SecurityPermissions.java

@@ -57,15 +57,15 @@ public enum SecurityPermissions
 	 */
 	SECURITY;
 
-	private final String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase();
+	private final String translationKey = "gui.appliedenergistics2.security." + this.name().toLowerCase();
 
-	public String getUnlocalizedName()
+	public String getTranslatedName()
 	{
-		return this.unlocalizedName + ".name";
+		return this.translationKey + ".name";
 	}
 
-	public String getUnlocalizedTip()
+	public String getTranslatedTip()
 	{
-		return this.unlocalizedName + ".tip";
+		return this.translationKey + ".tip";
 	}
 }

src/api/java/appeng/api/definitions/IBlockDefinition.java

@@ -37,7 +37,7 @@ public interface IBlockDefinition extends IItemDefinition
 	/**
 	 * @return the {@link ItemBlock} implementation if applicable
 	 */
-	Optional<BlockItem> maybeItemBlock();
+	Optional<BlockItem> maybeBlockItem();
 
 	/**
 	 * Compare Block with world.

src/api/java/appeng/api/parts/IFacadePart.java

@@ -60,8 +60,6 @@ public interface IFacadePart
 
 	Item getItem();
 
-	int getItemDamage();
-
 	boolean notAEFacade();
 
 	boolean isTransparent();

src/api/java/appeng/api/parts/IPartHelper.java

@@ -35,33 +35,6 @@ import net.minecraft.world.World;
 
 public interface IPartHelper
 {
-	/**
-	 * Register a new layer with the part layer system, this allows you to write an in between between tile entities and
-	 * parts.
-	 *
-	 * AE By Default includes,
-	 *
-	 * 1. ISidedInventory ( and by extension IInventory. )
-	 *
-	 * 2. IFluidHandler Forge Fluids
-	 *
-	 * 3. IPowerEmitter BC Power output.
-	 *
-	 * 4. IPowerReceptor BC Power input.
-	 *
-	 * 5. IEnergySink IC2 Power input.
-	 *
-	 * 6. IEnergySource IC2 Power output.
-	 *
-	 * 7. IPipeConnection BC Pipe Connections
-	 *
-	 * As long as a valid layer is registered for a interface you can simply implement that interface on a part get
-	 * implement it.
-	 *
-	 * @return true on success, false on failure, usually a error will be logged as well.
-	 */
-	boolean registerNewLayer( String string, String layerInterface );
-
 	/**
 	 * use in use item, to try and place a IBusItem
 	 *

src/api/java/appeng/api/storage/data/IAEItemStack.java

@@ -83,11 +83,6 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 	 */
 	int getItemDamage();
 
-	/**
-	 * Compare the Ore Dictionary ID for this to another item.
-	 */
-	boolean sameOre( IAEItemStack is );
-
 	/**
 	 * compare the item/damage/nbt of the stack.
 	 *
@@ -108,7 +103,7 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 
 	/**
 	 * DO NOT MODIFY THIS STACK! NEVER. If you think about it .. DON'T
-	 * 
+	 *
 	 * @return definition stack
 	 */
 	ItemStack getDefinition();

src/api/java/appeng/api/storage/data/IAEStack.java

@@ -26,10 +26,9 @@ package appeng.api.storage.data;
 
 import java.io.IOException;
 
-import io.netty.buffer.ByteBuf;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.network.PacketBuffer;
 
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.IStorageChannel;
@@ -165,7 +164,7 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @throws IOException
 	 */
-	void writeToPacket( ByteBuf data ) throws IOException;
+	void writeToPacket( PacketBuffer data ) throws IOException;
 
 	/**
 	 * Clone the Item / Fluid Stack