Merge branch 'rv3-1.7.10' of https://git.tilera.org/tilera/Applied-Energistics-2-tilera-Edition into rv3-1.7.10
This commit is contained in:
commit
8c0236bb29
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -15,6 +15,7 @@
|
||||||
!LICENSE
|
!LICENSE
|
||||||
!CONTRIBUTING.md
|
!CONTRIBUTING.md
|
||||||
!CHANGELOG.md
|
!CHANGELOG.md
|
||||||
|
!austri3Fix.md
|
||||||
|
|
||||||
# include sourcecode
|
# include sourcecode
|
||||||
!src/
|
!src/
|
||||||
|
@ -30,4 +31,4 @@
|
||||||
!codeformat/
|
!codeformat/
|
||||||
|
|
||||||
# exclude vim files
|
# exclude vim files
|
||||||
*.swp
|
*.swp
|
||||||
|
|
2
austri3Fix.md
Normal file
2
austri3Fix.md
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
- we demultiblocked the transition plane
|
||||||
|
- transition plane doesn't collect items
|
56
build.gradle
56
build.gradle
|
@ -1,21 +1,3 @@
|
||||||
/*
|
|
||||||
* This file is part of Applied Energistics 2.
|
|
||||||
* Copyright (c) 2013 - 2014, 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
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Applied Energistics 2 is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
apply plugin: 'forge'
|
apply plugin: 'forge'
|
||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
|
@ -43,7 +25,9 @@ buildscript {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {
|
||||||
|
changing = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,24 +84,28 @@ sourceSets {
|
||||||
|
|
||||||
resources {
|
resources {
|
||||||
srcDir "src/main/resources/"
|
srcDir "src/main/resources/"
|
||||||
include "assets/appliedenergistics2/recipes/**/*.recipe",
|
include(
|
||||||
"assets/appliedenergistics2/recipes/README.html",
|
"assets/appliedenergistics2/recipes/**/*.recipe",
|
||||||
"assets/appliedenergistics2/lang/*.lang",
|
"assets/appliedenergistics2/recipes/README.html",
|
||||||
"assets/appliedenergistics2/textures/blocks/*",
|
"assets/appliedenergistics2/lang/*.lang",
|
||||||
"assets/appliedenergistics2/textures/guis/*",
|
"assets/appliedenergistics2/textures/blocks/*",
|
||||||
"assets/appliedenergistics2/textures/models/*",
|
"assets/appliedenergistics2/textures/guis/*",
|
||||||
"assets/appliedenergistics2/textures/items/*",
|
"assets/appliedenergistics2/textures/models/*",
|
||||||
"assets/appliedenergistics2/meta/*",
|
"assets/appliedenergistics2/textures/items/*",
|
||||||
"mcmod.info",
|
"assets/appliedenergistics2/meta/*",
|
||||||
"pack.mcmeta"
|
"mcmod.info",
|
||||||
|
"pack.mcmeta"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
// replace stuff in mcmod.info, nothing else
|
inputs.property "version", project.version
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
inputs.property "mcversion", project.minecraft.version
|
||||||
include 'mcmod.info'
|
|
||||||
expand 'version': project.version, 'mcversion': minecraft_version
|
filesMatching('mcmod.info') {
|
||||||
|
expand 'version':project.version, 'mcversion':project.minecraft.version
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,24 +1,3 @@
|
||||||
|
|
||||||
/*
|
|
||||||
* This file is part of Applied Energistics 2.
|
|
||||||
* Copyright (c) 2013 - 2014, 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
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Applied Energistics 2 is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
// ChickenBones' maven repo is unavailable now...
|
// ChickenBones' maven repo is unavailable now...
|
||||||
|
@ -30,36 +9,54 @@ repositories {
|
||||||
maven {
|
maven {
|
||||||
name "Mobius"
|
name "Mobius"
|
||||||
url "http://mobiusstrip.eu/maven"
|
url "http://mobiusstrip.eu/maven"
|
||||||
|
metadataSources {
|
||||||
|
artifact()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
name = "Player"
|
name = "Player"
|
||||||
url = "http://maven.ic2.player.to/"
|
url = "http://maven.ic2.player.to/"
|
||||||
|
metadataSources {
|
||||||
|
artifact()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
name = "Tterrag"
|
name = "Tterrag"
|
||||||
url = "http://maven.tterrag.com/"
|
url = "http://maven.tterrag.com/"
|
||||||
|
metadataSources {
|
||||||
|
artifact()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
name "OpenComputers Repo"
|
name "OpenComputers Repo"
|
||||||
url = "http://maven.cil.li/"
|
url = "http://maven.cil.li/"
|
||||||
|
metadataSources {
|
||||||
|
artifact()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
name = "MM repo"
|
name = "MM repo"
|
||||||
url = "http://maven.k-4u.nl/"
|
url = "http://maven.k-4u.nl/"
|
||||||
|
metadataSources {
|
||||||
|
artifact()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
name = "tilera"
|
name = "tilera"
|
||||||
url = "https://data.tilera.xyz/maven/"
|
url = "https://maven.tilera.xyz/"
|
||||||
}
|
}
|
||||||
|
|
||||||
ivy {
|
ivy {
|
||||||
name "BuildCraft"
|
name "BuildCraft"
|
||||||
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
|
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
|
||||||
|
metadataSources {
|
||||||
|
artifact()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ivy {
|
ivy {
|
||||||
|
@ -67,6 +64,9 @@ repositories {
|
||||||
layout "pattern", {
|
layout "pattern", {
|
||||||
artifact "[revision]/artifact/build/libs/[artifact]-0.9.3.[revision](-[classifier]).[ext]"
|
artifact "[revision]/artifact/build/libs/[artifact]-0.9.3.[revision](-[classifier]).[ext]"
|
||||||
}
|
}
|
||||||
|
metadataSources {
|
||||||
|
artifact()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// CurseForge DNS for TE is not available or I am just being unlucky, code part can stay since this is applicable to any other curseforge mod though
|
// CurseForge DNS for TE is not available or I am just being unlucky, code part can stay since this is applicable to any other curseforge mod though
|
||||||
|
@ -106,7 +106,7 @@ dependencies {
|
||||||
// mods "net.mcft.copy.betterstorage:BetterStorage:${minecraft_version}-${betterstorage_version}:deobf"
|
// mods "net.mcft.copy.betterstorage:BetterStorage:${minecraft_version}-${betterstorage_version}:deobf"
|
||||||
mods "inventorytweaks:InventoryTweaks:${invtweaks_version}:deobf"
|
mods "inventorytweaks:InventoryTweaks:${invtweaks_version}:deobf"
|
||||||
mods "li.cil.oc:OpenComputers:MC${minecraft_version}-${opencomputers_version}:dev"
|
mods "li.cil.oc:OpenComputers:MC${minecraft_version}-${opencomputers_version}:dev"
|
||||||
compile "logisticspipes:logisticspipes:${logisticspipes_build}:dev"
|
implementation "logisticspipes:logisticspipes:${logisticspipes_build}:dev"
|
||||||
|
|
||||||
// mods name: 'CoFHLib', version: "[${minecraft_version}]${cofhlib_version}-dev", ext: 'jar'
|
// mods name: 'CoFHLib', version: "[${minecraft_version}]${cofhlib_version}-dev", ext: 'jar'
|
||||||
// mods name: 'CoFHCore', version: "[${minecraft_version}]${cofhcore_version}-dev", ext: 'jar'
|
// mods name: 'CoFHCore', version: "[${minecraft_version}]${cofhcore_version}-dev", ext: 'jar'
|
||||||
|
@ -122,27 +122,27 @@ dependencies {
|
||||||
compileOnly files("lib/CodeChickenCore-${minecraft_version}-${code_chicken_core_version}-dev.jar")
|
compileOnly files("lib/CodeChickenCore-${minecraft_version}-${code_chicken_core_version}-dev.jar")
|
||||||
compileOnly files("lib/NotEnoughItems-${minecraft_version}-${nei_version}-dev.jar")
|
compileOnly files("lib/NotEnoughItems-${minecraft_version}-${nei_version}-dev.jar")
|
||||||
|
|
||||||
compile files("lib/buildcraft-${bc_version}-dev.jar")
|
implementation files("lib/buildcraft-${bc_version}-dev.jar")
|
||||||
compile files("lib/PneumaticCraft-${minecraft_version}-${pneumaticcraft_version}-api.jar")
|
implementation files("lib/PneumaticCraft-${minecraft_version}-${pneumaticcraft_version}-api.jar")
|
||||||
|
|
||||||
// provided APIs
|
// provided APIs
|
||||||
compile files("lib/OpenComputers-MC${minecraft_version}-${opencomputers_version}-api.jar")
|
implementation files("lib/OpenComputers-MC${minecraft_version}-${opencomputers_version}-api.jar")
|
||||||
compile files("lib/industrialcraft-2-${ic2_version}-experimental-api.jar")
|
implementation files("lib/industrialcraft-2-${ic2_version}-experimental-api.jar")
|
||||||
compile files("lib/BetterStorage-${minecraft_version}-${betterstorage_version}-api.jar")
|
implementation files("lib/BetterStorage-${minecraft_version}-${betterstorage_version}-api.jar")
|
||||||
|
|
||||||
// self compiled APIs
|
// self compiled APIs
|
||||||
compile "appeng:Waila:${waila_version}_${minecraft_version}:api"
|
implementation "appeng:Waila:${waila_version}_${minecraft_version}:api"
|
||||||
compile "appeng:RotaryCraft:${rotarycraft_version}:api"
|
implementation "appeng:RotaryCraft:${rotarycraft_version}:api"
|
||||||
compile "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
|
implementation "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
|
||||||
compile "appeng:InventoryTweaks:${invtweaks_version}:api"
|
implementation "appeng:InventoryTweaks:${invtweaks_version}:api"
|
||||||
|
|
||||||
// self compiled stubs
|
// self compiled stubs
|
||||||
compile(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")
|
implementation(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")
|
||||||
compile(group: 'api', name: 'craftguide', version: "${api_craftguide_version}")
|
implementation(group: 'api', name: 'craftguide', version: "${api_craftguide_version}")
|
||||||
compile(group: 'api', name: 'immibis', version: "${api_immibis_version}")
|
implementation(group: 'api', name: 'immibis', version: "${api_immibis_version}")
|
||||||
compile(group: 'api', name: 'mfr', version: "${api_mfr_version}")
|
implementation(group: 'api', name: 'mfr', version: "${api_mfr_version}")
|
||||||
compile(group: 'api', name: 'railcraft', version: "${api_railcraft_version}")
|
implementation(group: 'api', name: 'railcraft', version: "${api_railcraft_version}")
|
||||||
compile(group: 'api', name: 'rf', version: "${api_rf_version}")
|
implementation(group: 'api', name: 'rf', version: "${api_rf_version}")
|
||||||
|
|
||||||
testCompile "junit:junit:4.12"
|
testImplementation "junit:junit:4.12"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
task wrapper(type: Wrapper) {
|
|
||||||
gradleVersion = "2.4"
|
|
||||||
}
|
|
||||||
|
|
||||||
// WAILA
|
// WAILA
|
||||||
task installWaila(type: Copy, dependsOn: "deinstallWaila") {
|
task installWaila(type: Copy, dependsOn: "deinstallWaila") {
|
||||||
from { configurations.mods }
|
from { configurations.mods }
|
||||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
|
||||||
|
|
|
@ -23,56 +23,52 @@
|
||||||
|
|
||||||
package appeng.api;
|
package appeng.api;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.exceptions.CoreInaccessibleException;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
|
|
||||||
|
import appeng.api.exceptions.CoreInaccessibleException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Entry point for api.
|
* Entry point for api.
|
||||||
* <p>
|
* <p>
|
||||||
* Available IMCs:
|
* Available IMCs:
|
||||||
*/
|
*/
|
||||||
public enum AEApi
|
public enum AEApi {
|
||||||
{
|
;
|
||||||
;
|
|
||||||
|
|
||||||
private static final String CORE_API_FQN = "appeng.core.Api";
|
private static final String CORE_API_FQN = "appeng.core.Api";
|
||||||
private static final String CORE_API_FIELD = "INSTANCE";
|
private static final String CORE_API_FIELD = "INSTANCE";
|
||||||
private static final IAppEngApi HELD_API;
|
private static final IAppEngApi HELD_API;
|
||||||
|
|
||||||
static
|
static {
|
||||||
{
|
try {
|
||||||
try
|
final Class<?> apiClass = Class.forName(CORE_API_FQN);
|
||||||
{
|
final Field apiField = apiClass.getField(CORE_API_FIELD);
|
||||||
final Class<?> apiClass = Class.forName( CORE_API_FQN );
|
|
||||||
final Field apiField = apiClass.getField( CORE_API_FIELD );
|
|
||||||
|
|
||||||
HELD_API = (IAppEngApi) apiField.get( apiClass );
|
HELD_API = (IAppEngApi) apiField.get(apiClass);
|
||||||
}
|
} catch (final ClassNotFoundException e) {
|
||||||
catch( final ClassNotFoundException e )
|
throw new CoreInaccessibleException(
|
||||||
{
|
"AE2 API tried to access the " + CORE_API_FQN
|
||||||
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FQN + " class, without it being declared." );
|
+ " class, without it being declared."
|
||||||
}
|
);
|
||||||
catch( final NoSuchFieldException e )
|
} catch (final NoSuchFieldException e) {
|
||||||
{
|
throw new CoreInaccessibleException(
|
||||||
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without it being declared." );
|
"AE2 API tried to access the " + CORE_API_FIELD + " field in "
|
||||||
}
|
+ CORE_API_FQN + " without it being declared."
|
||||||
catch( final IllegalAccessException e )
|
);
|
||||||
{
|
} catch (final IllegalAccessException e) {
|
||||||
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without enough access permissions." );
|
throw new CoreInaccessibleException(
|
||||||
}
|
"AE2 API tried to access the " + CORE_API_FIELD + " field in "
|
||||||
}
|
+ CORE_API_FQN + " without enough access permissions."
|
||||||
|
);
|
||||||
/**
|
}
|
||||||
* API Entry Point.
|
}
|
||||||
*
|
|
||||||
* @return the {@link IAppEngApi}
|
|
||||||
*/
|
|
||||||
public static IAppEngApi instance()
|
|
||||||
{
|
|
||||||
return HELD_API;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* API Entry Point.
|
||||||
|
*
|
||||||
|
* @return the {@link IAppEngApi}
|
||||||
|
*/
|
||||||
|
public static IAppEngApi instance() {
|
||||||
|
return HELD_API;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
package appeng.api;
|
package appeng.api;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.definitions.*;
|
import appeng.api.definitions.*;
|
||||||
import appeng.api.exceptions.FailedConnection;
|
import appeng.api.exceptions.FailedConnection;
|
||||||
import appeng.api.features.IRegistryContainer;
|
import appeng.api.features.IRegistryContainer;
|
||||||
|
@ -33,72 +32,70 @@ import appeng.api.networking.IGridNode;
|
||||||
import appeng.api.parts.IPartHelper;
|
import appeng.api.parts.IPartHelper;
|
||||||
import appeng.api.storage.IStorageHelper;
|
import appeng.api.storage.IStorageHelper;
|
||||||
|
|
||||||
|
public interface IAppEngApi {
|
||||||
|
/**
|
||||||
|
* @return Registry Container for the numerous registries in AE2.
|
||||||
|
*/
|
||||||
|
IRegistryContainer registries();
|
||||||
|
|
||||||
public interface IAppEngApi
|
/**
|
||||||
{
|
* @return helper for working with storage data types.
|
||||||
|
*/
|
||||||
|
IStorageHelper storage();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Registry Container for the numerous registries in AE2.
|
* @return helper for working with grids, and buses.
|
||||||
*/
|
*/
|
||||||
IRegistryContainer registries();
|
IPartHelper partHelper();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return helper for working with storage data types.
|
* @return an accessible list of all of AE's Items
|
||||||
*/
|
* @deprecated use {@link appeng.api.definitions.IDefinitions#items()}
|
||||||
IStorageHelper storage();
|
*/
|
||||||
|
@Deprecated
|
||||||
|
Items items();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return helper for working with grids, and buses.
|
* @return an accessible list of all of AE's materials; materials are items
|
||||||
*/
|
* @deprecated use {@link appeng.api.definitions.IDefinitions#materials()}
|
||||||
IPartHelper partHelper();
|
*/
|
||||||
|
@Deprecated
|
||||||
|
Materials materials();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return an accessible list of all of AE's Items
|
* @return an accessible list of all of AE's blocks
|
||||||
* @deprecated use {@link appeng.api.definitions.IDefinitions#items()}
|
* @deprecated use {@link appeng.api.definitions.IDefinitions#blocks()}
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
Items items();
|
Blocks blocks();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return an accessible list of all of AE's materials; materials are items
|
* @return an accessible list of all of AE's parts, parts are items
|
||||||
* @deprecated use {@link appeng.api.definitions.IDefinitions#materials()}
|
* @deprecated use {@link appeng.api.definitions.IDefinitions#parts()}
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
Materials materials();
|
Parts parts();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return an accessible list of all of AE's blocks
|
* @return an accessible list of all AE definitions
|
||||||
* @deprecated use {@link appeng.api.definitions.IDefinitions#blocks()}
|
*/
|
||||||
*/
|
IDefinitions definitions();
|
||||||
@Deprecated
|
|
||||||
Blocks blocks();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return an accessible list of all of AE's parts, parts are items
|
* create a grid node for your {@link appeng.api.networking.IGridHost}
|
||||||
* @deprecated use {@link appeng.api.definitions.IDefinitions#parts()}
|
*
|
||||||
*/
|
* @param block grid block
|
||||||
@Deprecated
|
* @return grid node of block
|
||||||
Parts parts();
|
*/
|
||||||
|
IGridNode createGridNode(IGridBlock block);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return an accessible list of all AE definitions
|
* create a connection between two {@link appeng.api.networking.IGridNode}
|
||||||
*/
|
*
|
||||||
IDefinitions definitions();
|
* @param a to be connected gridnode
|
||||||
|
* @param b to be connected gridnode
|
||||||
/**
|
* @throws appeng.api.exceptions.FailedConnection
|
||||||
* create a grid node for your {@link appeng.api.networking.IGridHost}
|
*/
|
||||||
*
|
IGridConnection createGridConnection(IGridNode a, IGridNode b)
|
||||||
* @param block grid block
|
throws FailedConnection;
|
||||||
* @return grid node of block
|
|
||||||
*/
|
|
||||||
IGridNode createGridNode( IGridBlock block );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* create a connection between two {@link appeng.api.networking.IGridNode}
|
|
||||||
*
|
|
||||||
* @param a to be connected gridnode
|
|
||||||
* @param b to be connected gridnode
|
|
||||||
* @throws appeng.api.exceptions.FailedConnection
|
|
||||||
*/
|
|
||||||
IGridConnection createGridConnection( IGridNode a, IGridNode b ) throws FailedConnection;
|
|
||||||
}
|
}
|
|
@ -23,51 +23,45 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum AccessRestriction {
|
||||||
|
NO_ACCESS(0),
|
||||||
|
READ(1),
|
||||||
|
WRITE(2),
|
||||||
|
READ_WRITE(3);
|
||||||
|
|
||||||
public enum AccessRestriction
|
private final int permissionBit;
|
||||||
{
|
|
||||||
NO_ACCESS( 0 ), READ( 1 ), WRITE( 2 ), READ_WRITE( 3 );
|
|
||||||
|
|
||||||
private final int permissionBit;
|
AccessRestriction(final int v) {
|
||||||
|
this.permissionBit = v;
|
||||||
|
}
|
||||||
|
|
||||||
AccessRestriction( final int v )
|
public boolean hasPermission(final AccessRestriction ar) {
|
||||||
{
|
return (this.permissionBit & ar.permissionBit) == ar.permissionBit;
|
||||||
this.permissionBit = v;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public boolean hasPermission( final AccessRestriction ar )
|
public AccessRestriction restrictPermissions(final AccessRestriction ar) {
|
||||||
{
|
return this.getPermByBit(this.permissionBit & ar.permissionBit);
|
||||||
return ( this.permissionBit & ar.permissionBit ) == ar.permissionBit;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public AccessRestriction restrictPermissions( final AccessRestriction ar )
|
private AccessRestriction getPermByBit(final int bit) {
|
||||||
{
|
switch (bit) {
|
||||||
return this.getPermByBit( this.permissionBit & ar.permissionBit );
|
default:
|
||||||
}
|
case 0:
|
||||||
|
return NO_ACCESS;
|
||||||
|
case 1:
|
||||||
|
return READ;
|
||||||
|
case 2:
|
||||||
|
return WRITE;
|
||||||
|
case 3:
|
||||||
|
return READ_WRITE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private AccessRestriction getPermByBit( final int bit )
|
public AccessRestriction addPermissions(final AccessRestriction ar) {
|
||||||
{
|
return this.getPermByBit(this.permissionBit | ar.permissionBit);
|
||||||
switch( bit )
|
}
|
||||||
{
|
|
||||||
default:
|
|
||||||
case 0:
|
|
||||||
return NO_ACCESS;
|
|
||||||
case 1:
|
|
||||||
return READ;
|
|
||||||
case 2:
|
|
||||||
return WRITE;
|
|
||||||
case 3:
|
|
||||||
return READ_WRITE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public AccessRestriction addPermissions( final AccessRestriction ar )
|
public AccessRestriction removePermissions(final AccessRestriction ar) {
|
||||||
{
|
return this.getPermByBit(this.permissionBit & (~ar.permissionBit));
|
||||||
return this.getPermByBit( this.permissionBit | ar.permissionBit );
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public AccessRestriction removePermissions( final AccessRestriction ar )
|
|
||||||
{
|
|
||||||
return this.getPermByBit( this.permissionBit & ( ~ar.permissionBit ) );
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum ActionItems { WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION }
|
||||||
public enum ActionItems
|
|
||||||
{
|
|
||||||
WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION
|
|
||||||
}
|
|
|
@ -23,16 +23,14 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum Actionable {
|
||||||
|
/**
|
||||||
|
* Perform the intended action.
|
||||||
|
*/
|
||||||
|
MODULATE,
|
||||||
|
|
||||||
public enum Actionable
|
/**
|
||||||
{
|
* Pretend to perform the action.
|
||||||
/**
|
*/
|
||||||
* Perform the intended action.
|
SIMULATE
|
||||||
*/
|
|
||||||
MODULATE,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Pretend to perform the action.
|
|
||||||
*/
|
|
||||||
SIMULATE
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,16 +23,12 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum CondenserOutput {
|
||||||
|
TRASH, // 0
|
||||||
|
|
||||||
public enum CondenserOutput
|
MATTER_BALLS, // 256
|
||||||
{
|
|
||||||
|
|
||||||
TRASH, // 0
|
SINGULARITY; // 250,000
|
||||||
|
|
||||||
MATTER_BALLS, // 256
|
|
||||||
|
|
||||||
SINGULARITY; // 250,000
|
|
||||||
|
|
||||||
public int requiredPower = 0;
|
|
||||||
|
|
||||||
|
public int requiredPower = 0;
|
||||||
}
|
}
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum CopyMode { CLEAR_ON_REMOVE, KEEP_ON_REMOVE }
|
||||||
public enum CopyMode
|
|
||||||
{
|
|
||||||
CLEAR_ON_REMOVE, KEEP_ON_REMOVE
|
|
||||||
}
|
|
||||||
|
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum FullnessMode { EMPTY, HALF, FULL }
|
||||||
public enum FullnessMode
|
|
||||||
{
|
|
||||||
EMPTY, HALF, FULL
|
|
||||||
}
|
|
|
@ -23,24 +23,23 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum FuzzyMode {
|
||||||
|
// Note that percentage damaged, is the inverse of percentage durability.
|
||||||
|
IGNORE_ALL(-1),
|
||||||
|
PERCENT_99(0),
|
||||||
|
PERCENT_75(25),
|
||||||
|
PERCENT_50(50),
|
||||||
|
PERCENT_25(75);
|
||||||
|
|
||||||
public enum FuzzyMode
|
public final float breakPoint;
|
||||||
{
|
public final float percentage;
|
||||||
// Note that percentage damaged, is the inverse of percentage durability.
|
|
||||||
IGNORE_ALL( -1 ), PERCENT_99( 0 ), PERCENT_75( 25 ), PERCENT_50( 50 ), PERCENT_25( 75 );
|
|
||||||
|
|
||||||
public final float breakPoint;
|
FuzzyMode(final float p) {
|
||||||
public final float percentage;
|
this.percentage = p;
|
||||||
|
this.breakPoint = p / 100.0f;
|
||||||
FuzzyMode( final float p )
|
}
|
||||||
{
|
|
||||||
this.percentage = p;
|
|
||||||
this.breakPoint = p / 100.0f;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int calculateBreakPoint( final int maxDamage )
|
|
||||||
{
|
|
||||||
return (int) ( ( this.percentage * maxDamage ) / 100.0f );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public int calculateBreakPoint(final int maxDamage) {
|
||||||
|
return (int) ((this.percentage * maxDamage) / 100.0f);
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum IncludeExclude { WHITELIST, BLACKLIST }
|
||||||
public enum IncludeExclude
|
|
||||||
{
|
|
||||||
WHITELIST, BLACKLIST
|
|
||||||
}
|
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum ItemSubstitution { ENABLED, DISABLED }
|
||||||
public enum ItemSubstitution
|
|
||||||
{
|
|
||||||
ENABLED, DISABLED
|
|
||||||
}
|
|
||||||
|
|
|
@ -23,12 +23,10 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum LevelEmitterMode {
|
||||||
|
|
||||||
public enum LevelEmitterMode
|
STORED_AMOUNT,
|
||||||
{
|
|
||||||
|
|
||||||
STORED_AMOUNT,
|
STORABLE_AMOUNT
|
||||||
|
|
||||||
STORABLE_AMOUNT
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -23,12 +23,10 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum LevelType {
|
||||||
|
|
||||||
public enum LevelType
|
ITEM_LEVEL,
|
||||||
{
|
|
||||||
|
|
||||||
ITEM_LEVEL,
|
ENERGY_LEVEL
|
||||||
|
|
||||||
ENERGY_LEVEL
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -23,8 +23,6 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum ModSettings {
|
||||||
public enum ModSettings
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,14 +23,12 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum NetworkEmitterMode {
|
||||||
|
|
||||||
public enum NetworkEmitterMode
|
POWER_LEVEL,
|
||||||
{
|
|
||||||
|
|
||||||
POWER_LEVEL,
|
BOOTING,
|
||||||
|
|
||||||
BOOTING,
|
CHANNEL_ERROR
|
||||||
|
|
||||||
CHANNEL_ERROR
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum OperationMode { FILL, EMPTY }
|
||||||
public enum OperationMode
|
|
||||||
{
|
|
||||||
FILL, EMPTY
|
|
||||||
}
|
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum OutputMode { EXPORT_ONLY, EXPORT_OR_CRAFT, CRAFT_ONLY }
|
||||||
public enum OutputMode
|
|
||||||
{
|
|
||||||
EXPORT_ONLY, EXPORT_OR_CRAFT, CRAFT_ONLY
|
|
||||||
}
|
|
||||||
|
|
|
@ -23,23 +23,20 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum PowerMultiplier {
|
||||||
|
ONE,
|
||||||
|
CONFIG;
|
||||||
|
|
||||||
public enum PowerMultiplier
|
/**
|
||||||
{
|
* please do not edit this value, it is set when AE loads its config files.
|
||||||
ONE, CONFIG;
|
*/
|
||||||
|
public double multiplier = 1.0;
|
||||||
|
|
||||||
/**
|
public double multiply(final double in) {
|
||||||
* please do not edit this value, it is set when AE loads its config files.
|
return in * this.multiplier;
|
||||||
*/
|
}
|
||||||
public double multiplier = 1.0;
|
|
||||||
|
|
||||||
public double multiply( final double in )
|
public double divide(final double in) {
|
||||||
{
|
return in / this.multiplier;
|
||||||
return in * this.multiplier;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public double divide( final double in )
|
|
||||||
{
|
|
||||||
return in / this.multiplier;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,43 +23,40 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum PowerUnits {
|
||||||
|
AE("gui.appliedenergistics2.units.appliedenergstics"), // Native Units - AE Energy
|
||||||
|
EU("gui.appliedenergistics2.units.ic2"), // IndustrialCraft 2 - Energy Units
|
||||||
|
WA("gui.appliedenergistics2.units.rotarycraft"), // RotaryCraft - Watts
|
||||||
|
RF("gui.appliedenergistics2.units.thermalexpansion"
|
||||||
|
), // ThermalExpansion - Redstone Flux
|
||||||
|
MK("gui.appliedenergistics2.units.mekanism"); // Mekanism - Joules
|
||||||
|
|
||||||
public enum PowerUnits
|
/**
|
||||||
{
|
* unlocalized name for the power unit.
|
||||||
AE( "gui.appliedenergistics2.units.appliedenergstics" ), // Native Units - AE Energy
|
*/
|
||||||
EU( "gui.appliedenergistics2.units.ic2" ), // IndustrialCraft 2 - Energy Units
|
public final String unlocalizedName;
|
||||||
WA( "gui.appliedenergistics2.units.rotarycraft" ), // RotaryCraft - Watts
|
/**
|
||||||
RF( "gui.appliedenergistics2.units.thermalexpansion" ), // ThermalExpansion - Redstone Flux
|
* please do not edit this value, it is set when AE loads its config files.
|
||||||
MK( "gui.appliedenergistics2.units.mekanism" ); // Mekanism - Joules
|
*/
|
||||||
|
public double conversionRatio = 1.0;
|
||||||
|
|
||||||
/**
|
PowerUnits(final String un) {
|
||||||
* unlocalized name for the power unit.
|
this.unlocalizedName = un;
|
||||||
*/
|
}
|
||||||
public final String unlocalizedName;
|
|
||||||
/**
|
|
||||||
* please do not edit this value, it is set when AE loads its config files.
|
|
||||||
*/
|
|
||||||
public double conversionRatio = 1.0;
|
|
||||||
|
|
||||||
PowerUnits( final String un )
|
|
||||||
{
|
|
||||||
this.unlocalizedName = un;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* do power conversion using AE's conversion rates.
|
|
||||||
* <p>
|
|
||||||
* Example: PowerUnits.EU.convertTo( PowerUnits.AE, 32 );
|
|
||||||
* <p>
|
|
||||||
* will normally returns 64, as it will convert the EU, to AE with AE's power settings.
|
|
||||||
*
|
|
||||||
* @param target target power unit
|
|
||||||
* @param value value
|
|
||||||
* @return value converted to target units, from this units.
|
|
||||||
*/
|
|
||||||
public double convertTo( final PowerUnits target, final double value )
|
|
||||||
{
|
|
||||||
return ( value * this.conversionRatio ) / target.conversionRatio;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* do power conversion using AE's conversion rates.
|
||||||
|
* <p>
|
||||||
|
* Example: PowerUnits.EU.convertTo( PowerUnits.AE, 32 );
|
||||||
|
* <p>
|
||||||
|
* will normally returns 64, as it will convert the EU, to AE with AE's power
|
||||||
|
* settings.
|
||||||
|
*
|
||||||
|
* @param target target power unit
|
||||||
|
* @param value value
|
||||||
|
* @return value converted to target units, from this units.
|
||||||
|
*/
|
||||||
|
public double convertTo(final PowerUnits target, final double value) {
|
||||||
|
return (value * this.conversionRatio) / target.conversionRatio;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum RedstoneMode { IGNORE, LOW_SIGNAL, HIGH_SIGNAL, SIGNAL_PULSE }
|
||||||
public enum RedstoneMode
|
|
||||||
{
|
|
||||||
IGNORE, LOW_SIGNAL, HIGH_SIGNAL, SIGNAL_PULSE
|
|
||||||
}
|
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum RelativeDirection { LEFT, RIGHT, UP, DOW }
|
||||||
public enum RelativeDirection
|
|
||||||
{
|
|
||||||
LEFT, RIGHT, UP, DOW
|
|
||||||
}
|
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum SchedulingMode { DEFAULT, ROUNDROBIN, RANDOM }
|
||||||
public enum SchedulingMode
|
|
||||||
{
|
|
||||||
DEFAULT, ROUNDROBIN, RANDOM
|
|
||||||
}
|
|
||||||
|
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum SearchBoxMode { AUTOSEARCH, MANUAL_SEARCH, NEI_AUTOSEARCH, NEI_MANUAL_SEARCH }
|
||||||
public enum SearchBoxMode
|
|
||||||
{
|
|
||||||
AUTOSEARCH, MANUAL_SEARCH, NEI_AUTOSEARCH, NEI_MANUAL_SEARCH
|
|
||||||
}
|
|
||||||
|
|
|
@ -23,49 +23,47 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represent the security systems basic permissions, these are not for anti-griefing, they are part of the mod as a
|
* Represent the security systems basic permissions, these are not for anti-griefing, they
|
||||||
* gameplay feature.
|
* are part of the mod as a gameplay feature.
|
||||||
*/
|
*/
|
||||||
public enum SecurityPermissions
|
public enum SecurityPermissions {
|
||||||
{
|
/**
|
||||||
/**
|
* required to insert items into the network via terminal ( also used for machines
|
||||||
* required to insert items into the network via terminal ( also used for machines based on the owner of the
|
* based on the owner of the network, which is determined by its Security Block. )
|
||||||
* network, which is determined by its Security Block. )
|
*/
|
||||||
*/
|
INJECT,
|
||||||
INJECT,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* required to extract items from the network via terminal ( also used for machines based on the owner of the
|
* required to extract items from the network via terminal ( also used for machines
|
||||||
* network, which is determined by its Security Block. )
|
* based on the owner of the network, which is determined by its Security Block. )
|
||||||
*/
|
*/
|
||||||
EXTRACT,
|
EXTRACT,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* required to request crafting from the network via terminal.
|
* required to request crafting from the network via terminal.
|
||||||
*/
|
*/
|
||||||
CRAFT,
|
CRAFT,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* required to modify automation, and make modifications to the networks physical layout.
|
* required to modify automation, and make modifications to the networks physical
|
||||||
*/
|
* layout.
|
||||||
BUILD,
|
*/
|
||||||
|
BUILD,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* required to modify the security blocks settings.
|
* required to modify the security blocks settings.
|
||||||
*/
|
*/
|
||||||
SECURITY;
|
SECURITY;
|
||||||
|
|
||||||
private final String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase();
|
private final String unlocalizedName
|
||||||
|
= "gui.appliedenergistics2.security." + this.name().toLowerCase();
|
||||||
|
|
||||||
public String getUnlocalizedName()
|
public String getUnlocalizedName() {
|
||||||
{
|
return this.unlocalizedName + ".name";
|
||||||
return this.unlocalizedName + ".name";
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public String getUnlocalizedTip()
|
public String getUnlocalizedTip() {
|
||||||
{
|
return this.unlocalizedName + ".tip";
|
||||||
return this.unlocalizedName + ".tip";
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,56 +23,63 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
|
public enum Settings {
|
||||||
|
LEVEL_EMITTER_MODE(EnumSet.allOf(LevelEmitterMode.class)),
|
||||||
|
|
||||||
public enum Settings
|
REDSTONE_EMITTER(EnumSet.of(RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL)),
|
||||||
{
|
REDSTONE_CONTROLLED(EnumSet.allOf(RedstoneMode.class)),
|
||||||
LEVEL_EMITTER_MODE( EnumSet.allOf( LevelEmitterMode.class ) ),
|
|
||||||
|
|
||||||
REDSTONE_EMITTER( EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL ) ), REDSTONE_CONTROLLED( EnumSet.allOf( RedstoneMode.class ) ),
|
CONDENSER_OUTPUT(EnumSet.allOf(CondenserOutput.class)),
|
||||||
|
|
||||||
CONDENSER_OUTPUT( EnumSet.allOf( CondenserOutput.class ) ),
|
POWER_UNITS(EnumSet.allOf(PowerUnits.class)),
|
||||||
|
ACCESS(EnumSet.of(
|
||||||
|
AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE
|
||||||
|
)),
|
||||||
|
|
||||||
POWER_UNITS( EnumSet.allOf( PowerUnits.class ) ), ACCESS( EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE ) ),
|
SORT_DIRECTION(EnumSet.allOf(SortDir.class)),
|
||||||
|
SORT_BY(EnumSet.allOf(SortOrder.class)),
|
||||||
|
|
||||||
SORT_DIRECTION( EnumSet.allOf( SortDir.class ) ), SORT_BY( EnumSet.allOf( SortOrder.class ) ),
|
SEARCH_TOOLTIPS(EnumSet.of(YesNo.YES, YesNo.NO)),
|
||||||
|
VIEW_MODE(EnumSet.allOf(ViewItems.class)),
|
||||||
|
SEARCH_MODE(EnumSet.allOf(SearchBoxMode.class)),
|
||||||
|
|
||||||
SEARCH_TOOLTIPS( EnumSet.of( YesNo.YES, YesNo.NO ) ), VIEW_MODE( EnumSet.allOf( ViewItems.class ) ), SEARCH_MODE( EnumSet.allOf( SearchBoxMode.class ) ),
|
ACTIONS(EnumSet.allOf(ActionItems.class)),
|
||||||
|
IO_DIRECTION(EnumSet.of(RelativeDirection.LEFT, RelativeDirection.RIGHT)),
|
||||||
|
|
||||||
ACTIONS( EnumSet.allOf( ActionItems.class ) ), IO_DIRECTION( EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT ) ),
|
BLOCK(EnumSet.of(YesNo.YES, YesNo.NO)),
|
||||||
|
OPERATION_MODE(EnumSet.allOf(OperationMode.class)),
|
||||||
|
|
||||||
BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ), OPERATION_MODE( EnumSet.allOf( OperationMode.class ) ),
|
FULLNESS_MODE(EnumSet.allOf(FullnessMode.class)),
|
||||||
|
CRAFT_ONLY(EnumSet.of(YesNo.YES, YesNo.NO)),
|
||||||
|
|
||||||
FULLNESS_MODE( EnumSet.allOf( FullnessMode.class ) ), CRAFT_ONLY( EnumSet.of( YesNo.YES, YesNo.NO ) ),
|
FUZZY_MODE(EnumSet.allOf(FuzzyMode.class)),
|
||||||
|
LEVEL_TYPE(EnumSet.allOf(LevelType.class)),
|
||||||
|
|
||||||
FUZZY_MODE( EnumSet.allOf( FuzzyMode.class ) ), LEVEL_TYPE( EnumSet.allOf( LevelType.class ) ),
|
TERMINAL_STYLE(EnumSet.of(TerminalStyle.TALL, TerminalStyle.SMALL)),
|
||||||
|
COPY_MODE(EnumSet.allOf(CopyMode.class)),
|
||||||
|
|
||||||
TERMINAL_STYLE( EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL ) ), COPY_MODE( EnumSet.allOf( CopyMode.class ) ),
|
INTERFACE_TERMINAL(EnumSet.of(YesNo.YES, YesNo.NO)),
|
||||||
|
CRAFT_VIA_REDSTONE(EnumSet.of(YesNo.YES, YesNo.NO)),
|
||||||
|
|
||||||
INTERFACE_TERMINAL( EnumSet.of( YesNo.YES, YesNo.NO ) ), CRAFT_VIA_REDSTONE( EnumSet.of( YesNo.YES, YesNo.NO ) ),
|
STORAGE_FILTER(EnumSet.allOf(StorageFilter.class)),
|
||||||
|
PLACE_BLOCK(EnumSet.of(YesNo.YES, YesNo.NO)),
|
||||||
|
|
||||||
STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ), PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ),
|
SCHEDULING_MODE(EnumSet.allOf(SchedulingMode.class));
|
||||||
|
|
||||||
SCHEDULING_MODE( EnumSet.allOf( SchedulingMode.class ) );
|
private final EnumSet<? extends Enum<?>> values;
|
||||||
|
|
||||||
private final EnumSet<? extends Enum<?>> values;
|
Settings(@Nonnull final EnumSet<? extends Enum<?>> possibleOptions) {
|
||||||
|
if (possibleOptions.isEmpty()) {
|
||||||
|
throw new IllegalArgumentException("Tried to instantiate an empty setting.");
|
||||||
|
}
|
||||||
|
|
||||||
Settings( @Nonnull final EnumSet<? extends Enum<?>> possibleOptions )
|
this.values = possibleOptions;
|
||||||
{
|
}
|
||||||
if( possibleOptions.isEmpty() )
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException( "Tried to instantiate an empty setting." );
|
|
||||||
}
|
|
||||||
|
|
||||||
this.values = possibleOptions;
|
|
||||||
}
|
|
||||||
|
|
||||||
public EnumSet<? extends Enum<?>> getPossibleValues()
|
|
||||||
{
|
|
||||||
return this.values;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public EnumSet<? extends Enum<?>> getPossibleValues() {
|
||||||
|
return this.values;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum SortDir { ASCENDING, DESCENDING }
|
||||||
public enum SortDir
|
|
||||||
{
|
|
||||||
ASCENDING, DESCENDING
|
|
||||||
}
|
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum SortOrder { NAME, AMOUNT, MOD, INVTWEAKS }
|
||||||
public enum SortOrder
|
|
||||||
{
|
|
||||||
NAME, AMOUNT, MOD, INVTWEAKS
|
|
||||||
}
|
|
|
@ -23,12 +23,10 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum StorageFilter {
|
||||||
|
|
||||||
public enum StorageFilter
|
NONE,
|
||||||
{
|
|
||||||
|
|
||||||
NONE,
|
EXTRACTABLE_ONLY
|
||||||
|
|
||||||
EXTRACTABLE_ONLY
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,14 +23,12 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum TerminalStyle {
|
||||||
|
|
||||||
public enum TerminalStyle
|
TALL,
|
||||||
{
|
|
||||||
|
|
||||||
TALL,
|
FULL,
|
||||||
|
|
||||||
FULL,
|
SMALL
|
||||||
|
|
||||||
SMALL
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -23,17 +23,15 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum TunnelType {
|
||||||
public enum TunnelType
|
ME, // Network Tunnel
|
||||||
{
|
IC2_POWER, // EU Tunnel
|
||||||
ME, // Network Tunnel
|
RF_POWER, // RF Tunnel
|
||||||
IC2_POWER, // EU Tunnel
|
REDSTONE, // Redstone Tunnel
|
||||||
RF_POWER, // RF Tunnel
|
FLUID, // Fluid Tunnel
|
||||||
REDSTONE, // Redstone Tunnel
|
ITEM, // Item Tunnel
|
||||||
FLUID, // Fluid Tunnel
|
LIGHT, // Light Tunnel
|
||||||
ITEM, // Item Tunnel
|
BUNDLED_REDSTONE, // Bundled Redstone Tunnel
|
||||||
LIGHT, // Light Tunnel
|
COMPUTER_MESSAGE, // Computer Message Tunnel
|
||||||
BUNDLED_REDSTONE, // Bundled Redstone Tunnel
|
PRESSURE // PneumaticCraft Tunnel
|
||||||
COMPUTER_MESSAGE, // Computer Message Tunnel
|
|
||||||
PRESSURE // PneumaticCraft Tunnel
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,105 +23,97 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import appeng.api.definitions.IItemDefinition;
|
import appeng.api.definitions.IItemDefinition;
|
||||||
import appeng.api.util.AEItemDefinition;
|
import appeng.api.util.AEItemDefinition;
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import java.util.HashMap;
|
public enum Upgrades {
|
||||||
import java.util.Map;
|
/**
|
||||||
|
* Gold Tier Upgrades.
|
||||||
|
*/
|
||||||
|
CAPACITY(0),
|
||||||
|
REDSTONE(0),
|
||||||
|
CRAFTING(0),
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Diamond Tier Upgrades.
|
||||||
|
*/
|
||||||
|
FUZZY(1),
|
||||||
|
SPEED(1),
|
||||||
|
INVERTER(1);
|
||||||
|
|
||||||
public enum Upgrades
|
/**
|
||||||
{
|
* @deprecated use {@link Upgrades#getTier()}
|
||||||
/**
|
*/
|
||||||
* Gold Tier Upgrades.
|
@Deprecated
|
||||||
*/
|
public final int tier;
|
||||||
CAPACITY( 0 ), REDSTONE( 0 ), CRAFTING( 0 ),
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Diamond Tier Upgrades.
|
* @deprecated use {@link Upgrades#getSupported()}
|
||||||
*/
|
*/
|
||||||
FUZZY( 1 ), SPEED( 1 ), INVERTER( 1 );
|
@Deprecated
|
||||||
|
private final Map<ItemStack, Integer> supportedMax
|
||||||
|
= new HashMap<ItemStack, Integer>();
|
||||||
|
|
||||||
/**
|
Upgrades(final int tier) {
|
||||||
* @deprecated use {@link Upgrades#getTier()}
|
this.tier = tier;
|
||||||
*/
|
}
|
||||||
@Deprecated
|
|
||||||
public final int tier;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated use {@link Upgrades#getSupported()}
|
* @return list of Items/Blocks that support this upgrade, and how many it supports.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
public Map<ItemStack, Integer> getSupported() {
|
||||||
private final Map<ItemStack, Integer> supportedMax = new HashMap<ItemStack, Integer>();
|
return this.supportedMax;
|
||||||
|
}
|
||||||
|
|
||||||
Upgrades( final int tier )
|
/**
|
||||||
{
|
* Registers a specific amount of this upgrade into a specific machine
|
||||||
this.tier = tier;
|
*
|
||||||
}
|
* @param item machine in which this upgrade can be installed
|
||||||
|
* @param maxSupported amount how many upgrades can be installed
|
||||||
|
*/
|
||||||
|
public void registerItem(final IItemDefinition item, final int maxSupported) {
|
||||||
|
final Optional<ItemStack> maybeStack = item.maybeStack(1);
|
||||||
|
for (final ItemStack stack : maybeStack.asSet()) {
|
||||||
|
this.registerItem(stack, maxSupported);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return list of Items/Blocks that support this upgrade, and how many it supports.
|
* Registers a specific amount of this upgrade into a specific machine
|
||||||
*/
|
*
|
||||||
public Map<ItemStack, Integer> getSupported()
|
* @param stack machine in which this upgrade can be installed
|
||||||
{
|
* @param maxSupported amount how many upgrades can be installed
|
||||||
return this.supportedMax;
|
*/
|
||||||
}
|
public void registerItem(final ItemStack stack, final int maxSupported) {
|
||||||
|
if (stack != null) {
|
||||||
|
this.supportedMax.put(stack, maxSupported);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers a specific amount of this upgrade into a specific machine
|
* Registers a specific amount of this upgrade into a specific machine
|
||||||
*
|
*
|
||||||
* @param item machine in which this upgrade can be installed
|
* @param item machine in which this upgrade can be installed
|
||||||
* @param maxSupported amount how many upgrades can be installed
|
* @param maxSupported amount how many upgrades can be installed
|
||||||
*/
|
* @deprecated use {@link Upgrades#registerItem(IItemDefinition, int)}
|
||||||
public void registerItem( final IItemDefinition item, final int maxSupported )
|
*/
|
||||||
{
|
@Deprecated
|
||||||
final Optional<ItemStack> maybeStack = item.maybeStack( 1 );
|
public void registerItem(final AEItemDefinition item, final int maxSupported) {
|
||||||
for( final ItemStack stack : maybeStack.asSet() )
|
if (item != null) {
|
||||||
{
|
final ItemStack stack = item.stack(1);
|
||||||
this.registerItem( stack, maxSupported );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
if (stack != null) {
|
||||||
* Registers a specific amount of this upgrade into a specific machine
|
this.registerItem(stack, maxSupported);
|
||||||
*
|
}
|
||||||
* @param stack machine in which this upgrade can be installed
|
}
|
||||||
* @param maxSupported amount how many upgrades can be installed
|
}
|
||||||
*/
|
|
||||||
public void registerItem( final ItemStack stack, final int maxSupported )
|
|
||||||
{
|
|
||||||
if( stack != null )
|
|
||||||
{
|
|
||||||
this.supportedMax.put( stack, maxSupported );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
public int getTier() {
|
||||||
* Registers a specific amount of this upgrade into a specific machine
|
return this.tier;
|
||||||
*
|
}
|
||||||
* @param item machine in which this upgrade can be installed
|
|
||||||
* @param maxSupported amount how many upgrades can be installed
|
|
||||||
* @deprecated use {@link Upgrades#registerItem(IItemDefinition, int)}
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public void registerItem( final AEItemDefinition item, final int maxSupported )
|
|
||||||
{
|
|
||||||
if( item != null )
|
|
||||||
{
|
|
||||||
final ItemStack stack = item.stack( 1 );
|
|
||||||
|
|
||||||
if( stack != null )
|
|
||||||
{
|
|
||||||
this.registerItem( stack, maxSupported );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getTier()
|
|
||||||
{
|
|
||||||
return this.tier;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum ViewItems { ALL, STORED, CRAFTABLE }
|
||||||
public enum ViewItems
|
|
||||||
{
|
|
||||||
ALL, STORED, CRAFTABLE
|
|
||||||
}
|
|
|
@ -23,8 +23,4 @@
|
||||||
|
|
||||||
package appeng.api.config;
|
package appeng.api.config;
|
||||||
|
|
||||||
|
public enum YesNo { YES, NO, UNDECIDED }
|
||||||
public enum YesNo
|
|
||||||
{
|
|
||||||
YES, NO, UNDECIDED
|
|
||||||
}
|
|
||||||
|
|
|
@ -23,109 +23,106 @@
|
||||||
|
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.util.AEItemDefinition;
|
import appeng.api.util.AEItemDefinition;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated use {@link IBlocks} now
|
* @deprecated use {@link IBlocks} now
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public class Blocks
|
public class Blocks {
|
||||||
{
|
public AEItemDefinition blockQuartzOre;
|
||||||
public AEItemDefinition blockQuartzOre;
|
|
||||||
|
|
||||||
public AEItemDefinition blockQuartzOreCharged;
|
public AEItemDefinition blockQuartzOreCharged;
|
||||||
|
|
||||||
public AEItemDefinition blockMatrixFrame;
|
public AEItemDefinition blockMatrixFrame;
|
||||||
|
|
||||||
public AEItemDefinition blockQuartz;
|
public AEItemDefinition blockQuartz;
|
||||||
|
|
||||||
public AEItemDefinition blockQuartzPillar;
|
public AEItemDefinition blockQuartzPillar;
|
||||||
|
|
||||||
public AEItemDefinition blockQuartzChiseled;
|
public AEItemDefinition blockQuartzChiseled;
|
||||||
|
|
||||||
public AEItemDefinition blockQuartzGlass;
|
public AEItemDefinition blockQuartzGlass;
|
||||||
|
|
||||||
public AEItemDefinition blockQuartzVibrantGlass;
|
public AEItemDefinition blockQuartzVibrantGlass;
|
||||||
|
|
||||||
public AEItemDefinition blockQuartzTorch;
|
public AEItemDefinition blockQuartzTorch;
|
||||||
|
|
||||||
public AEItemDefinition blockFluix;
|
public AEItemDefinition blockFluix;
|
||||||
|
|
||||||
public AEItemDefinition blockSkyStone;
|
public AEItemDefinition blockSkyStone;
|
||||||
|
|
||||||
public AEItemDefinition blockSkyChest;
|
public AEItemDefinition blockSkyChest;
|
||||||
|
|
||||||
public AEItemDefinition blockSkyCompass;
|
public AEItemDefinition blockSkyCompass;
|
||||||
|
|
||||||
public AEItemDefinition blockGrindStone;
|
public AEItemDefinition blockGrindStone;
|
||||||
|
|
||||||
public AEItemDefinition blockCrankHandle;
|
public AEItemDefinition blockCrankHandle;
|
||||||
|
|
||||||
public AEItemDefinition blockInscriber;
|
public AEItemDefinition blockInscriber;
|
||||||
|
|
||||||
public AEItemDefinition blockWireless;
|
public AEItemDefinition blockWireless;
|
||||||
|
|
||||||
public AEItemDefinition blockCharger;
|
public AEItemDefinition blockCharger;
|
||||||
|
|
||||||
public AEItemDefinition blockTinyTNT;
|
public AEItemDefinition blockTinyTNT;
|
||||||
|
|
||||||
public AEItemDefinition blockSecurity;
|
public AEItemDefinition blockSecurity;
|
||||||
|
|
||||||
public AEItemDefinition blockQuantumRing;
|
public AEItemDefinition blockQuantumRing;
|
||||||
|
|
||||||
public AEItemDefinition blockQuantumLink;
|
public AEItemDefinition blockQuantumLink;
|
||||||
|
|
||||||
public AEItemDefinition blockSpatialPylon;
|
public AEItemDefinition blockSpatialPylon;
|
||||||
|
|
||||||
public AEItemDefinition blockSpatialIOPort;
|
public AEItemDefinition blockSpatialIOPort;
|
||||||
|
|
||||||
public AEItemDefinition blockMultiPart;
|
public AEItemDefinition blockMultiPart;
|
||||||
|
|
||||||
public AEItemDefinition blockController;
|
public AEItemDefinition blockController;
|
||||||
|
|
||||||
public AEItemDefinition blockDrive;
|
public AEItemDefinition blockDrive;
|
||||||
|
|
||||||
public AEItemDefinition blockChest;
|
public AEItemDefinition blockChest;
|
||||||
|
|
||||||
public AEItemDefinition blockInterface;
|
public AEItemDefinition blockInterface;
|
||||||
|
|
||||||
public AEItemDefinition blockCellWorkbench;
|
public AEItemDefinition blockCellWorkbench;
|
||||||
|
|
||||||
public AEItemDefinition blockIOPort;
|
public AEItemDefinition blockIOPort;
|
||||||
|
|
||||||
public AEItemDefinition blockCondenser;
|
public AEItemDefinition blockCondenser;
|
||||||
|
|
||||||
public AEItemDefinition blockEnergyAcceptor;
|
public AEItemDefinition blockEnergyAcceptor;
|
||||||
|
|
||||||
public AEItemDefinition blockVibrationChamber;
|
public AEItemDefinition blockVibrationChamber;
|
||||||
|
|
||||||
public AEItemDefinition blockQuartzGrowthAccelerator;
|
public AEItemDefinition blockQuartzGrowthAccelerator;
|
||||||
|
|
||||||
public AEItemDefinition blockEnergyCell;
|
public AEItemDefinition blockEnergyCell;
|
||||||
|
|
||||||
public AEItemDefinition blockEnergyCellDense;
|
public AEItemDefinition blockEnergyCellDense;
|
||||||
|
|
||||||
public AEItemDefinition blockEnergyCellCreative;
|
public AEItemDefinition blockEnergyCellCreative;
|
||||||
|
|
||||||
public AEItemDefinition blockCraftingUnit;
|
public AEItemDefinition blockCraftingUnit;
|
||||||
|
|
||||||
public AEItemDefinition blockCraftingAccelerator;
|
public AEItemDefinition blockCraftingAccelerator;
|
||||||
|
|
||||||
public AEItemDefinition blockCraftingStorage1k;
|
public AEItemDefinition blockCraftingStorage1k;
|
||||||
|
|
||||||
public AEItemDefinition blockCraftingStorage4k;
|
public AEItemDefinition blockCraftingStorage4k;
|
||||||
|
|
||||||
public AEItemDefinition blockCraftingStorage16k;
|
public AEItemDefinition blockCraftingStorage16k;
|
||||||
|
|
||||||
public AEItemDefinition blockCraftingStorage64k;
|
public AEItemDefinition blockCraftingStorage64k;
|
||||||
|
|
||||||
public AEItemDefinition blockCraftingMonitor;
|
public AEItemDefinition blockCraftingMonitor;
|
||||||
|
|
||||||
public AEItemDefinition blockMolecularAssembler;
|
public AEItemDefinition blockMolecularAssembler;
|
||||||
|
|
||||||
public AEItemDefinition blockLightDetector;
|
public AEItemDefinition blockLightDetector;
|
||||||
|
|
||||||
public AEItemDefinition blockPaint;
|
public AEItemDefinition blockPaint;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,32 +1,29 @@
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
|
|
||||||
|
public interface IBlockDefinition extends IItemDefinition {
|
||||||
|
/**
|
||||||
|
* @return the {@link Block} implementation if applicable
|
||||||
|
*/
|
||||||
|
Optional<Block> maybeBlock();
|
||||||
|
|
||||||
public interface IBlockDefinition extends IItemDefinition
|
/**
|
||||||
{
|
* @return the {@link ItemBlock} implementation if applicable
|
||||||
/**
|
*/
|
||||||
* @return the {@link Block} implementation if applicable
|
Optional<ItemBlock> maybeItemBlock();
|
||||||
*/
|
|
||||||
Optional<Block> maybeBlock();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the {@link ItemBlock} implementation if applicable
|
* Compare Block with world.
|
||||||
*/
|
*
|
||||||
Optional<ItemBlock> maybeItemBlock();
|
* @param world world of block
|
||||||
|
* @param x x pos of block
|
||||||
/**
|
* @param y y pos of block
|
||||||
* Compare Block with world.
|
* @param z z pos of block
|
||||||
*
|
* @return if the block is placed in the world at the specific location.
|
||||||
* @param world world of block
|
*/
|
||||||
* @param x x pos of block
|
boolean isSameAs(IBlockAccess world, int x, int y, int z);
|
||||||
* @param y y pos of block
|
|
||||||
* @param z z pos of block
|
|
||||||
* @return if the block is placed in the world at the specific location.
|
|
||||||
*/
|
|
||||||
boolean isSameAs( IBlockAccess world, int x, int y, int z );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,159 +23,157 @@
|
||||||
|
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A list of all blocks in AE
|
* A list of all blocks in AE
|
||||||
*/
|
*/
|
||||||
public interface IBlocks
|
public interface IBlocks {
|
||||||
{
|
/*
|
||||||
/*
|
* world gen
|
||||||
* world gen
|
*/
|
||||||
*/
|
IBlockDefinition quartzOre();
|
||||||
IBlockDefinition quartzOre();
|
|
||||||
|
|
||||||
IBlockDefinition quartzOreCharged();
|
IBlockDefinition quartzOreCharged();
|
||||||
|
|
||||||
IBlockDefinition matrixFrame();
|
IBlockDefinition matrixFrame();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* decorative
|
* decorative
|
||||||
*/
|
*/
|
||||||
IBlockDefinition quartz();
|
IBlockDefinition quartz();
|
||||||
|
|
||||||
IBlockDefinition quartzPillar();
|
IBlockDefinition quartzPillar();
|
||||||
|
|
||||||
IBlockDefinition quartzChiseled();
|
IBlockDefinition quartzChiseled();
|
||||||
|
|
||||||
IBlockDefinition quartzGlass();
|
IBlockDefinition quartzGlass();
|
||||||
|
|
||||||
IBlockDefinition quartzVibrantGlass();
|
IBlockDefinition quartzVibrantGlass();
|
||||||
|
|
||||||
IBlockDefinition quartzTorch();
|
IBlockDefinition quartzTorch();
|
||||||
|
|
||||||
IBlockDefinition fluix();
|
IBlockDefinition fluix();
|
||||||
|
|
||||||
IBlockDefinition skyStone();
|
IBlockDefinition skyStone();
|
||||||
|
|
||||||
IBlockDefinition skyChest();
|
IBlockDefinition skyChest();
|
||||||
|
|
||||||
IBlockDefinition skyCompass();
|
IBlockDefinition skyCompass();
|
||||||
|
|
||||||
IBlockDefinition skyStoneStair();
|
IBlockDefinition skyStoneStair();
|
||||||
|
|
||||||
IBlockDefinition skyStoneBlockStair();
|
IBlockDefinition skyStoneBlockStair();
|
||||||
|
|
||||||
IBlockDefinition skyStoneBrickStair();
|
IBlockDefinition skyStoneBrickStair();
|
||||||
|
|
||||||
IBlockDefinition skyStoneSmallBrickStair();
|
IBlockDefinition skyStoneSmallBrickStair();
|
||||||
|
|
||||||
IBlockDefinition fluixStair();
|
IBlockDefinition fluixStair();
|
||||||
|
|
||||||
IBlockDefinition quartzStair();
|
IBlockDefinition quartzStair();
|
||||||
|
|
||||||
IBlockDefinition chiseledQuartzStair();
|
IBlockDefinition chiseledQuartzStair();
|
||||||
|
|
||||||
IBlockDefinition quartzPillarStair();
|
IBlockDefinition quartzPillarStair();
|
||||||
|
|
||||||
IBlockDefinition skyStoneSlab();
|
IBlockDefinition skyStoneSlab();
|
||||||
|
|
||||||
IBlockDefinition skyStoneBlockSlab();
|
IBlockDefinition skyStoneBlockSlab();
|
||||||
|
|
||||||
IBlockDefinition skyStoneBrickSlab();
|
IBlockDefinition skyStoneBrickSlab();
|
||||||
|
|
||||||
IBlockDefinition skyStoneSmallBrickSlab();
|
IBlockDefinition skyStoneSmallBrickSlab();
|
||||||
|
|
||||||
IBlockDefinition fluixSlab();
|
IBlockDefinition fluixSlab();
|
||||||
|
|
||||||
IBlockDefinition quartzSlab();
|
IBlockDefinition quartzSlab();
|
||||||
|
|
||||||
IBlockDefinition chiseledQuartzSlab();
|
IBlockDefinition chiseledQuartzSlab();
|
||||||
|
|
||||||
IBlockDefinition quartzPillarSlab();
|
IBlockDefinition quartzPillarSlab();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* misc
|
* misc
|
||||||
*/
|
*/
|
||||||
ITileDefinition grindStone();
|
ITileDefinition grindStone();
|
||||||
|
|
||||||
ITileDefinition crankHandle();
|
ITileDefinition crankHandle();
|
||||||
|
|
||||||
ITileDefinition inscriber();
|
ITileDefinition inscriber();
|
||||||
|
|
||||||
ITileDefinition wireless();
|
ITileDefinition wireless();
|
||||||
|
|
||||||
ITileDefinition charger();
|
ITileDefinition charger();
|
||||||
|
|
||||||
IBlockDefinition tinyTNT();
|
IBlockDefinition tinyTNT();
|
||||||
|
|
||||||
ITileDefinition security();
|
ITileDefinition security();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* quantum Network Bridge
|
* quantum Network Bridge
|
||||||
*/
|
*/
|
||||||
ITileDefinition quantumRing();
|
ITileDefinition quantumRing();
|
||||||
|
|
||||||
ITileDefinition quantumLink();
|
ITileDefinition quantumLink();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* spatial iO
|
* spatial iO
|
||||||
*/
|
*/
|
||||||
ITileDefinition spatialPylon();
|
ITileDefinition spatialPylon();
|
||||||
|
|
||||||
ITileDefinition spatialIOPort();
|
ITileDefinition spatialIOPort();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Bus / cables
|
* Bus / cables
|
||||||
*/
|
*/
|
||||||
ITileDefinition multiPart();
|
ITileDefinition multiPart();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* machines
|
* machines
|
||||||
*/
|
*/
|
||||||
ITileDefinition controller();
|
ITileDefinition controller();
|
||||||
|
|
||||||
ITileDefinition drive();
|
ITileDefinition drive();
|
||||||
|
|
||||||
ITileDefinition chest();
|
ITileDefinition chest();
|
||||||
|
|
||||||
ITileDefinition iface();
|
ITileDefinition iface();
|
||||||
|
|
||||||
ITileDefinition cellWorkbench();
|
ITileDefinition cellWorkbench();
|
||||||
|
|
||||||
ITileDefinition iOPort();
|
ITileDefinition iOPort();
|
||||||
|
|
||||||
ITileDefinition condenser();
|
ITileDefinition condenser();
|
||||||
|
|
||||||
ITileDefinition energyAcceptor();
|
ITileDefinition energyAcceptor();
|
||||||
|
|
||||||
ITileDefinition vibrationChamber();
|
ITileDefinition vibrationChamber();
|
||||||
|
|
||||||
ITileDefinition quartzGrowthAccelerator();
|
ITileDefinition quartzGrowthAccelerator();
|
||||||
|
|
||||||
ITileDefinition energyCell();
|
ITileDefinition energyCell();
|
||||||
|
|
||||||
ITileDefinition energyCellDense();
|
ITileDefinition energyCellDense();
|
||||||
|
|
||||||
ITileDefinition energyCellCreative();
|
ITileDefinition energyCellCreative();
|
||||||
|
|
||||||
// rv1
|
// rv1
|
||||||
ITileDefinition craftingUnit();
|
ITileDefinition craftingUnit();
|
||||||
|
|
||||||
ITileDefinition craftingAccelerator();
|
ITileDefinition craftingAccelerator();
|
||||||
|
|
||||||
ITileDefinition craftingStorage1k();
|
ITileDefinition craftingStorage1k();
|
||||||
|
|
||||||
ITileDefinition craftingStorage4k();
|
ITileDefinition craftingStorage4k();
|
||||||
|
|
||||||
ITileDefinition craftingStorage16k();
|
ITileDefinition craftingStorage16k();
|
||||||
|
|
||||||
ITileDefinition craftingStorage64k();
|
ITileDefinition craftingStorage64k();
|
||||||
|
|
||||||
ITileDefinition craftingMonitor();
|
ITileDefinition craftingMonitor();
|
||||||
|
|
||||||
ITileDefinition molecularAssembler();
|
ITileDefinition molecularAssembler();
|
||||||
|
|
||||||
ITileDefinition lightDetector();
|
ITileDefinition lightDetector();
|
||||||
|
|
||||||
ITileDefinition paint();
|
ITileDefinition paint();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Interface to compare a definition with an itemstack or a block
|
* Interface to compare a definition with an itemstack or a block
|
||||||
*
|
*
|
||||||
|
@ -12,26 +10,26 @@ import net.minecraft.world.IBlockAccess;
|
||||||
* @version rv2
|
* @version rv2
|
||||||
* @since rv2
|
* @since rv2
|
||||||
*/
|
*/
|
||||||
public interface IComparableDefinition
|
public interface IComparableDefinition {
|
||||||
{
|
/**
|
||||||
/**
|
* Compare {@link ItemStack} with this
|
||||||
* Compare {@link ItemStack} with this
|
*
|
||||||
*
|
* @param comparableStack compared item
|
||||||
* @param comparableStack compared item
|
* @return true if the item stack is a matching item.
|
||||||
* @return true if the item stack is a matching item.
|
*/
|
||||||
*/
|
boolean isSameAs(ItemStack comparableStack);
|
||||||
boolean isSameAs( ItemStack comparableStack );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compare Block with world.
|
* Compare Block with world.
|
||||||
*
|
*
|
||||||
* @param world world of block
|
* @param world world of block
|
||||||
* @param x x pos of block
|
* @param x x pos of block
|
||||||
* @param y y pos of block
|
* @param y y pos of block
|
||||||
* @param z z pos of block
|
* @param z z pos of block
|
||||||
* @return if the block is placed in the world at the specific location.
|
* @return if the block is placed in the world at the specific location.
|
||||||
* @deprecated moved to {@link IBlockDefinition}. Is removed in the next major release rv3
|
* @deprecated moved to {@link IBlockDefinition}. Is removed in the next major release
|
||||||
*/
|
* rv3
|
||||||
@Deprecated
|
*/
|
||||||
boolean isSameAs( IBlockAccess world, int x, int y, int z );
|
@Deprecated
|
||||||
|
boolean isSameAs(IBlockAccess world, int x, int y, int z);
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,29 +23,27 @@
|
||||||
|
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* All definitions in AE
|
* All definitions in AE
|
||||||
*/
|
*/
|
||||||
public interface IDefinitions
|
public interface IDefinitions {
|
||||||
{
|
/**
|
||||||
/**
|
* @return an accessible list of all of AE's blocks
|
||||||
* @return an accessible list of all of AE's blocks
|
*/
|
||||||
*/
|
IBlocks blocks();
|
||||||
IBlocks blocks();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return an accessible list of all of AE's Items
|
* @return an accessible list of all of AE's Items
|
||||||
*/
|
*/
|
||||||
IItems items();
|
IItems items();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return an accessible list of all of AE's materials; materials are items
|
* @return an accessible list of all of AE's materials; materials are items
|
||||||
*/
|
*/
|
||||||
IMaterials materials();
|
IMaterials materials();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return an accessible list of all of AE's parts, parts are items
|
* @return an accessible list of all of AE's parts, parts are items
|
||||||
*/
|
*/
|
||||||
IParts parts();
|
IParts parts();
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,26 +23,23 @@
|
||||||
|
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
public interface IItemDefinition extends IComparableDefinition {
|
||||||
|
/**
|
||||||
|
* @return the {@link Item} Implementation if applicable
|
||||||
|
*/
|
||||||
|
Optional<Item> maybeItem();
|
||||||
|
|
||||||
public interface IItemDefinition extends IComparableDefinition
|
/**
|
||||||
{
|
* @return an {@link ItemStack} with specified quantity of this item.
|
||||||
/**
|
*/
|
||||||
* @return the {@link Item} Implementation if applicable
|
Optional<ItemStack> maybeStack(int stackSize);
|
||||||
*/
|
|
||||||
Optional<Item> maybeItem();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return an {@link ItemStack} with specified quantity of this item.
|
* @return <tt>true</tt> if definition is enabled
|
||||||
*/
|
*/
|
||||||
Optional<ItemStack> maybeStack( int stackSize );
|
boolean isEnabled();
|
||||||
|
|
||||||
/**
|
|
||||||
* @return <tt>true</tt> if definition is enabled
|
|
||||||
*/
|
|
||||||
boolean isEnabled();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,87 +23,84 @@
|
||||||
|
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.util.AEColoredItemDefinition;
|
import appeng.api.util.AEColoredItemDefinition;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A list of all items in AE
|
* A list of all items in AE
|
||||||
*/
|
*/
|
||||||
public interface IItems
|
public interface IItems {
|
||||||
{
|
IItemDefinition certusQuartzAxe();
|
||||||
IItemDefinition certusQuartzAxe();
|
|
||||||
|
|
||||||
IItemDefinition certusQuartzHoe();
|
IItemDefinition certusQuartzHoe();
|
||||||
|
|
||||||
IItemDefinition certusQuartzShovel();
|
IItemDefinition certusQuartzShovel();
|
||||||
|
|
||||||
IItemDefinition certusQuartzPick();
|
IItemDefinition certusQuartzPick();
|
||||||
|
|
||||||
IItemDefinition certusQuartzSword();
|
IItemDefinition certusQuartzSword();
|
||||||
|
|
||||||
IItemDefinition certusQuartzWrench();
|
IItemDefinition certusQuartzWrench();
|
||||||
|
|
||||||
IItemDefinition certusQuartzKnife();
|
IItemDefinition certusQuartzKnife();
|
||||||
|
|
||||||
IItemDefinition netherQuartzAxe();
|
IItemDefinition netherQuartzAxe();
|
||||||
|
|
||||||
IItemDefinition netherQuartzHoe();
|
IItemDefinition netherQuartzHoe();
|
||||||
|
|
||||||
IItemDefinition netherQuartzShovel();
|
IItemDefinition netherQuartzShovel();
|
||||||
|
|
||||||
IItemDefinition netherQuartzPick();
|
IItemDefinition netherQuartzPick();
|
||||||
|
|
||||||
IItemDefinition netherQuartzSword();
|
IItemDefinition netherQuartzSword();
|
||||||
|
|
||||||
IItemDefinition netherQuartzWrench();
|
IItemDefinition netherQuartzWrench();
|
||||||
|
|
||||||
IItemDefinition netherQuartzKnife();
|
IItemDefinition netherQuartzKnife();
|
||||||
|
|
||||||
IItemDefinition entropyManipulator();
|
IItemDefinition entropyManipulator();
|
||||||
|
|
||||||
IItemDefinition wirelessTerminal();
|
IItemDefinition wirelessTerminal();
|
||||||
|
|
||||||
IItemDefinition biometricCard();
|
IItemDefinition biometricCard();
|
||||||
|
|
||||||
IItemDefinition chargedStaff();
|
IItemDefinition chargedStaff();
|
||||||
|
|
||||||
IItemDefinition massCannon();
|
IItemDefinition massCannon();
|
||||||
|
|
||||||
IItemDefinition memoryCard();
|
IItemDefinition memoryCard();
|
||||||
|
|
||||||
IItemDefinition networkTool();
|
IItemDefinition networkTool();
|
||||||
|
|
||||||
IItemDefinition portableCell();
|
IItemDefinition portableCell();
|
||||||
|
|
||||||
IItemDefinition cellCreative();
|
IItemDefinition cellCreative();
|
||||||
|
|
||||||
IItemDefinition viewCell();
|
IItemDefinition viewCell();
|
||||||
|
|
||||||
IItemDefinition cell1k();
|
IItemDefinition cell1k();
|
||||||
|
|
||||||
IItemDefinition cell4k();
|
IItemDefinition cell4k();
|
||||||
|
|
||||||
IItemDefinition cell16k();
|
IItemDefinition cell16k();
|
||||||
|
|
||||||
IItemDefinition cell64k();
|
IItemDefinition cell64k();
|
||||||
|
|
||||||
IItemDefinition spatialCell2();
|
IItemDefinition spatialCell2();
|
||||||
|
|
||||||
IItemDefinition spatialCell16();
|
IItemDefinition spatialCell16();
|
||||||
|
|
||||||
IItemDefinition spatialCell128();
|
IItemDefinition spatialCell128();
|
||||||
|
|
||||||
IItemDefinition facade();
|
IItemDefinition facade();
|
||||||
|
|
||||||
IItemDefinition crystalSeed();
|
IItemDefinition crystalSeed();
|
||||||
|
|
||||||
// rv1
|
// rv1
|
||||||
IItemDefinition encodedPattern();
|
IItemDefinition encodedPattern();
|
||||||
|
|
||||||
IItemDefinition colorApplicator();
|
IItemDefinition colorApplicator();
|
||||||
|
|
||||||
AEColoredItemDefinition coloredPaintBall();
|
AEColoredItemDefinition coloredPaintBall();
|
||||||
|
|
||||||
AEColoredItemDefinition coloredLumenPaintBall();
|
AEColoredItemDefinition coloredLumenPaintBall();
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,117 +23,115 @@
|
||||||
|
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A list of all materials in AE
|
* A list of all materials in AE
|
||||||
*/
|
*/
|
||||||
public interface IMaterials
|
public interface IMaterials {
|
||||||
{
|
IItemDefinition cell2SpatialPart();
|
||||||
IItemDefinition cell2SpatialPart();
|
|
||||||
|
|
||||||
IItemDefinition cell16SpatialPart();
|
IItemDefinition cell16SpatialPart();
|
||||||
|
|
||||||
IItemDefinition cell128SpatialPart();
|
IItemDefinition cell128SpatialPart();
|
||||||
|
|
||||||
IItemDefinition silicon();
|
IItemDefinition silicon();
|
||||||
|
|
||||||
IItemDefinition skyDust();
|
IItemDefinition skyDust();
|
||||||
|
|
||||||
IItemDefinition calcProcessorPress();
|
IItemDefinition calcProcessorPress();
|
||||||
|
|
||||||
IItemDefinition engProcessorPress();
|
IItemDefinition engProcessorPress();
|
||||||
|
|
||||||
IItemDefinition logicProcessorPress();
|
IItemDefinition logicProcessorPress();
|
||||||
|
|
||||||
IItemDefinition calcProcessorPrint();
|
IItemDefinition calcProcessorPrint();
|
||||||
|
|
||||||
IItemDefinition engProcessorPrint();
|
IItemDefinition engProcessorPrint();
|
||||||
|
|
||||||
IItemDefinition logicProcessorPrint();
|
IItemDefinition logicProcessorPrint();
|
||||||
|
|
||||||
IItemDefinition siliconPress();
|
IItemDefinition siliconPress();
|
||||||
|
|
||||||
IItemDefinition siliconPrint();
|
IItemDefinition siliconPrint();
|
||||||
|
|
||||||
IItemDefinition namePress();
|
IItemDefinition namePress();
|
||||||
|
|
||||||
IItemDefinition logicProcessor();
|
IItemDefinition logicProcessor();
|
||||||
|
|
||||||
IItemDefinition calcProcessor();
|
IItemDefinition calcProcessor();
|
||||||
|
|
||||||
IItemDefinition engProcessor();
|
IItemDefinition engProcessor();
|
||||||
|
|
||||||
IItemDefinition basicCard();
|
IItemDefinition basicCard();
|
||||||
|
|
||||||
IItemDefinition advCard();
|
IItemDefinition advCard();
|
||||||
|
|
||||||
IItemDefinition purifiedCertusQuartzCrystal();
|
IItemDefinition purifiedCertusQuartzCrystal();
|
||||||
|
|
||||||
IItemDefinition purifiedNetherQuartzCrystal();
|
IItemDefinition purifiedNetherQuartzCrystal();
|
||||||
|
|
||||||
IItemDefinition purifiedFluixCrystal();
|
IItemDefinition purifiedFluixCrystal();
|
||||||
|
|
||||||
IItemDefinition cell1kPart();
|
IItemDefinition cell1kPart();
|
||||||
|
|
||||||
IItemDefinition cell4kPart();
|
IItemDefinition cell4kPart();
|
||||||
|
|
||||||
IItemDefinition cell16kPart();
|
IItemDefinition cell16kPart();
|
||||||
|
|
||||||
IItemDefinition cell64kPart();
|
IItemDefinition cell64kPart();
|
||||||
|
|
||||||
IItemDefinition emptyStorageCell();
|
IItemDefinition emptyStorageCell();
|
||||||
|
|
||||||
IItemDefinition cardRedstone();
|
IItemDefinition cardRedstone();
|
||||||
|
|
||||||
IItemDefinition cardSpeed();
|
IItemDefinition cardSpeed();
|
||||||
|
|
||||||
IItemDefinition cardCapacity();
|
IItemDefinition cardCapacity();
|
||||||
|
|
||||||
IItemDefinition cardFuzzy();
|
IItemDefinition cardFuzzy();
|
||||||
|
|
||||||
IItemDefinition cardInverter();
|
IItemDefinition cardInverter();
|
||||||
|
|
||||||
IItemDefinition cardCrafting();
|
IItemDefinition cardCrafting();
|
||||||
|
|
||||||
IItemDefinition enderDust();
|
IItemDefinition enderDust();
|
||||||
|
|
||||||
IItemDefinition flour();
|
IItemDefinition flour();
|
||||||
|
|
||||||
IItemDefinition goldDust();
|
IItemDefinition goldDust();
|
||||||
|
|
||||||
IItemDefinition ironDust();
|
IItemDefinition ironDust();
|
||||||
|
|
||||||
IItemDefinition fluixDust();
|
IItemDefinition fluixDust();
|
||||||
|
|
||||||
IItemDefinition certusQuartzDust();
|
IItemDefinition certusQuartzDust();
|
||||||
|
|
||||||
IItemDefinition netherQuartzDust();
|
IItemDefinition netherQuartzDust();
|
||||||
|
|
||||||
IItemDefinition matterBall();
|
IItemDefinition matterBall();
|
||||||
|
|
||||||
IItemDefinition ironNugget();
|
IItemDefinition ironNugget();
|
||||||
|
|
||||||
IItemDefinition certusQuartzCrystal();
|
IItemDefinition certusQuartzCrystal();
|
||||||
|
|
||||||
IItemDefinition certusQuartzCrystalCharged();
|
IItemDefinition certusQuartzCrystalCharged();
|
||||||
|
|
||||||
IItemDefinition fluixCrystal();
|
IItemDefinition fluixCrystal();
|
||||||
|
|
||||||
IItemDefinition fluixPearl();
|
IItemDefinition fluixPearl();
|
||||||
|
|
||||||
IItemDefinition woodenGear();
|
IItemDefinition woodenGear();
|
||||||
|
|
||||||
IItemDefinition wireless();
|
IItemDefinition wireless();
|
||||||
|
|
||||||
IItemDefinition wirelessBooster();
|
IItemDefinition wirelessBooster();
|
||||||
|
|
||||||
IItemDefinition annihilationCore();
|
IItemDefinition annihilationCore();
|
||||||
|
|
||||||
IItemDefinition formationCore();
|
IItemDefinition formationCore();
|
||||||
|
|
||||||
IItemDefinition singularity();
|
IItemDefinition singularity();
|
||||||
|
|
||||||
IItemDefinition qESingularity();
|
IItemDefinition qESingularity();
|
||||||
|
|
||||||
IItemDefinition blankPattern();
|
IItemDefinition blankPattern();
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,88 +23,85 @@
|
||||||
|
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.util.AEColoredItemDefinition;
|
import appeng.api.util.AEColoredItemDefinition;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A list of all parts in AE
|
* A list of all parts in AE
|
||||||
*/
|
*/
|
||||||
public interface IParts
|
public interface IParts {
|
||||||
{
|
AEColoredItemDefinition cableSmart();
|
||||||
AEColoredItemDefinition cableSmart();
|
|
||||||
|
|
||||||
AEColoredItemDefinition cableCovered();
|
AEColoredItemDefinition cableCovered();
|
||||||
|
|
||||||
AEColoredItemDefinition cableGlass();
|
AEColoredItemDefinition cableGlass();
|
||||||
|
|
||||||
AEColoredItemDefinition cableDense();
|
AEColoredItemDefinition cableDense();
|
||||||
|
|
||||||
AEColoredItemDefinition lumenCableSmart();
|
AEColoredItemDefinition lumenCableSmart();
|
||||||
|
|
||||||
AEColoredItemDefinition lumenCableCovered();
|
AEColoredItemDefinition lumenCableCovered();
|
||||||
|
|
||||||
AEColoredItemDefinition lumenCableGlass();
|
AEColoredItemDefinition lumenCableGlass();
|
||||||
|
|
||||||
AEColoredItemDefinition lumenCableDense();
|
AEColoredItemDefinition lumenCableDense();
|
||||||
|
|
||||||
IItemDefinition quartzFiber();
|
IItemDefinition quartzFiber();
|
||||||
|
|
||||||
IItemDefinition toggleBus();
|
IItemDefinition toggleBus();
|
||||||
|
|
||||||
IItemDefinition invertedToggleBus();
|
IItemDefinition invertedToggleBus();
|
||||||
|
|
||||||
IItemDefinition storageBus();
|
IItemDefinition storageBus();
|
||||||
|
|
||||||
IItemDefinition importBus();
|
IItemDefinition importBus();
|
||||||
|
|
||||||
IItemDefinition exportBus();
|
IItemDefinition exportBus();
|
||||||
|
|
||||||
IItemDefinition iface();
|
IItemDefinition iface();
|
||||||
|
|
||||||
IItemDefinition levelEmitter();
|
IItemDefinition levelEmitter();
|
||||||
|
|
||||||
IItemDefinition annihilationPlane();
|
IItemDefinition annihilationPlane();
|
||||||
|
|
||||||
IItemDefinition identityAnnihilationPlane();
|
IItemDefinition identityAnnihilationPlane();
|
||||||
|
|
||||||
IItemDefinition formationPlane();
|
IItemDefinition formationPlane();
|
||||||
|
|
||||||
IItemDefinition p2PTunnelME();
|
IItemDefinition p2PTunnelME();
|
||||||
|
|
||||||
IItemDefinition p2PTunnelRedstone();
|
IItemDefinition p2PTunnelRedstone();
|
||||||
|
|
||||||
IItemDefinition p2PTunnelItems();
|
IItemDefinition p2PTunnelItems();
|
||||||
|
|
||||||
IItemDefinition p2PTunnelLiquids();
|
IItemDefinition p2PTunnelLiquids();
|
||||||
|
|
||||||
IItemDefinition p2PTunnelEU();
|
IItemDefinition p2PTunnelEU();
|
||||||
|
|
||||||
IItemDefinition p2PTunnelRF();
|
IItemDefinition p2PTunnelRF();
|
||||||
|
|
||||||
IItemDefinition p2PTunnelLight();
|
IItemDefinition p2PTunnelLight();
|
||||||
|
|
||||||
IItemDefinition p2PTunnelOpenComputers();
|
IItemDefinition p2PTunnelOpenComputers();
|
||||||
|
|
||||||
IItemDefinition p2PTunnelPneumaticCraft();
|
IItemDefinition p2PTunnelPneumaticCraft();
|
||||||
|
|
||||||
IItemDefinition cableAnchor();
|
IItemDefinition cableAnchor();
|
||||||
|
|
||||||
IItemDefinition monitor();
|
IItemDefinition monitor();
|
||||||
|
|
||||||
IItemDefinition semiDarkMonitor();
|
IItemDefinition semiDarkMonitor();
|
||||||
|
|
||||||
IItemDefinition darkMonitor();
|
IItemDefinition darkMonitor();
|
||||||
|
|
||||||
IItemDefinition interfaceTerminal();
|
IItemDefinition interfaceTerminal();
|
||||||
|
|
||||||
IItemDefinition patternTerminal();
|
IItemDefinition patternTerminal();
|
||||||
|
|
||||||
IItemDefinition craftingTerminal();
|
IItemDefinition craftingTerminal();
|
||||||
|
|
||||||
IItemDefinition terminal();
|
IItemDefinition terminal();
|
||||||
|
|
||||||
IItemDefinition storageMonitor();
|
IItemDefinition storageMonitor();
|
||||||
|
|
||||||
IItemDefinition conversionMonitor();
|
IItemDefinition conversionMonitor();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,11 @@
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
|
||||||
|
public interface ITileDefinition extends IBlockDefinition {
|
||||||
public interface ITileDefinition extends IBlockDefinition
|
/**
|
||||||
{
|
* @return the {@link TileEntity} Class if applicable.
|
||||||
/**
|
*/
|
||||||
* @return the {@link TileEntity} Class if applicable.
|
Optional<? extends Class<? extends TileEntity>> maybeEntity();
|
||||||
*/
|
|
||||||
Optional<? extends Class<? extends TileEntity>> maybeEntity();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,88 +23,85 @@
|
||||||
|
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.util.AEColoredItemDefinition;
|
import appeng.api.util.AEColoredItemDefinition;
|
||||||
import appeng.api.util.AEItemDefinition;
|
import appeng.api.util.AEItemDefinition;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated use {@link IItems}
|
* @deprecated use {@link IItems}
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public class Items
|
public class Items {
|
||||||
{
|
public AEItemDefinition itemCertusQuartzAxe;
|
||||||
public AEItemDefinition itemCertusQuartzAxe;
|
|
||||||
|
|
||||||
public AEItemDefinition itemCertusQuartzHoe;
|
public AEItemDefinition itemCertusQuartzHoe;
|
||||||
|
|
||||||
public AEItemDefinition itemCertusQuartzShovel;
|
public AEItemDefinition itemCertusQuartzShovel;
|
||||||
|
|
||||||
public AEItemDefinition itemCertusQuartzPick;
|
public AEItemDefinition itemCertusQuartzPick;
|
||||||
|
|
||||||
public AEItemDefinition itemCertusQuartzSword;
|
public AEItemDefinition itemCertusQuartzSword;
|
||||||
|
|
||||||
public AEItemDefinition itemCertusQuartzWrench;
|
public AEItemDefinition itemCertusQuartzWrench;
|
||||||
|
|
||||||
public AEItemDefinition itemCertusQuartzKnife;
|
public AEItemDefinition itemCertusQuartzKnife;
|
||||||
|
|
||||||
public AEItemDefinition itemNetherQuartzAxe;
|
public AEItemDefinition itemNetherQuartzAxe;
|
||||||
|
|
||||||
public AEItemDefinition itemNetherQuartzHoe;
|
public AEItemDefinition itemNetherQuartzHoe;
|
||||||
|
|
||||||
public AEItemDefinition itemNetherQuartzShovel;
|
public AEItemDefinition itemNetherQuartzShovel;
|
||||||
|
|
||||||
public AEItemDefinition itemNetherQuartzPick;
|
public AEItemDefinition itemNetherQuartzPick;
|
||||||
|
|
||||||
public AEItemDefinition itemNetherQuartzSword;
|
public AEItemDefinition itemNetherQuartzSword;
|
||||||
|
|
||||||
public AEItemDefinition itemNetherQuartzWrench;
|
public AEItemDefinition itemNetherQuartzWrench;
|
||||||
|
|
||||||
public AEItemDefinition itemNetherQuartzKnife;
|
public AEItemDefinition itemNetherQuartzKnife;
|
||||||
|
|
||||||
public AEItemDefinition itemEntropyManipulator;
|
public AEItemDefinition itemEntropyManipulator;
|
||||||
|
|
||||||
public AEItemDefinition itemWirelessTerminal;
|
public AEItemDefinition itemWirelessTerminal;
|
||||||
|
|
||||||
public AEItemDefinition itemBiometricCard;
|
public AEItemDefinition itemBiometricCard;
|
||||||
|
|
||||||
public AEItemDefinition itemChargedStaff;
|
public AEItemDefinition itemChargedStaff;
|
||||||
|
|
||||||
public AEItemDefinition itemMassCannon;
|
public AEItemDefinition itemMassCannon;
|
||||||
|
|
||||||
public AEItemDefinition itemMemoryCard;
|
public AEItemDefinition itemMemoryCard;
|
||||||
|
|
||||||
public AEItemDefinition itemNetworkTool;
|
public AEItemDefinition itemNetworkTool;
|
||||||
|
|
||||||
public AEItemDefinition itemPortableCell;
|
public AEItemDefinition itemPortableCell;
|
||||||
|
|
||||||
public AEItemDefinition itemCellCreative;
|
public AEItemDefinition itemCellCreative;
|
||||||
|
|
||||||
public AEItemDefinition itemViewCell;
|
public AEItemDefinition itemViewCell;
|
||||||
|
|
||||||
public AEItemDefinition itemCell1k;
|
public AEItemDefinition itemCell1k;
|
||||||
|
|
||||||
public AEItemDefinition itemCell4k;
|
public AEItemDefinition itemCell4k;
|
||||||
|
|
||||||
public AEItemDefinition itemCell16k;
|
public AEItemDefinition itemCell16k;
|
||||||
|
|
||||||
public AEItemDefinition itemCell64k;
|
public AEItemDefinition itemCell64k;
|
||||||
|
|
||||||
public AEItemDefinition itemSpatialCell2;
|
public AEItemDefinition itemSpatialCell2;
|
||||||
|
|
||||||
public AEItemDefinition itemSpatialCell16;
|
public AEItemDefinition itemSpatialCell16;
|
||||||
|
|
||||||
public AEItemDefinition itemSpatialCell128;
|
public AEItemDefinition itemSpatialCell128;
|
||||||
|
|
||||||
public AEItemDefinition itemFacade;
|
public AEItemDefinition itemFacade;
|
||||||
|
|
||||||
public AEItemDefinition itemCrystalSeed;
|
public AEItemDefinition itemCrystalSeed;
|
||||||
|
|
||||||
public AEItemDefinition itemEncodedPattern;
|
public AEItemDefinition itemEncodedPattern;
|
||||||
|
|
||||||
public AEItemDefinition itemColorApplicator;
|
public AEItemDefinition itemColorApplicator;
|
||||||
|
|
||||||
public AEColoredItemDefinition itemPaintBall;
|
public AEColoredItemDefinition itemPaintBall;
|
||||||
|
|
||||||
public AEColoredItemDefinition itemLumenPaintBall;
|
public AEColoredItemDefinition itemLumenPaintBall;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,121 +23,118 @@
|
||||||
|
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.util.AEItemDefinition;
|
import appeng.api.util.AEItemDefinition;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated use {@link IMaterials}
|
* @deprecated use {@link IMaterials}
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public class Materials
|
public class Materials {
|
||||||
{
|
public AEItemDefinition materialCell2SpatialPart;
|
||||||
public AEItemDefinition materialCell2SpatialPart;
|
|
||||||
|
|
||||||
public AEItemDefinition materialCell16SpatialPart;
|
public AEItemDefinition materialCell16SpatialPart;
|
||||||
|
|
||||||
public AEItemDefinition materialCell128SpatialPart;
|
public AEItemDefinition materialCell128SpatialPart;
|
||||||
|
|
||||||
public AEItemDefinition materialSilicon;
|
public AEItemDefinition materialSilicon;
|
||||||
|
|
||||||
public AEItemDefinition materialSkyDust;
|
public AEItemDefinition materialSkyDust;
|
||||||
|
|
||||||
public AEItemDefinition materialCalcProcessorPress;
|
public AEItemDefinition materialCalcProcessorPress;
|
||||||
|
|
||||||
public AEItemDefinition materialEngProcessorPress;
|
public AEItemDefinition materialEngProcessorPress;
|
||||||
|
|
||||||
public AEItemDefinition materialLogicProcessorPress;
|
public AEItemDefinition materialLogicProcessorPress;
|
||||||
|
|
||||||
public AEItemDefinition materialCalcProcessorPrint;
|
public AEItemDefinition materialCalcProcessorPrint;
|
||||||
|
|
||||||
public AEItemDefinition materialEngProcessorPrint;
|
public AEItemDefinition materialEngProcessorPrint;
|
||||||
|
|
||||||
public AEItemDefinition materialLogicProcessorPrint;
|
public AEItemDefinition materialLogicProcessorPrint;
|
||||||
|
|
||||||
public AEItemDefinition materialSiliconPress;
|
public AEItemDefinition materialSiliconPress;
|
||||||
|
|
||||||
public AEItemDefinition materialSiliconPrint;
|
public AEItemDefinition materialSiliconPrint;
|
||||||
|
|
||||||
public AEItemDefinition materialNamePress;
|
public AEItemDefinition materialNamePress;
|
||||||
|
|
||||||
public AEItemDefinition materialLogicProcessor;
|
public AEItemDefinition materialLogicProcessor;
|
||||||
|
|
||||||
public AEItemDefinition materialCalcProcessor;
|
public AEItemDefinition materialCalcProcessor;
|
||||||
|
|
||||||
public AEItemDefinition materialEngProcessor;
|
public AEItemDefinition materialEngProcessor;
|
||||||
|
|
||||||
public AEItemDefinition materialBasicCard;
|
public AEItemDefinition materialBasicCard;
|
||||||
|
|
||||||
public AEItemDefinition materialAdvCard;
|
public AEItemDefinition materialAdvCard;
|
||||||
|
|
||||||
public AEItemDefinition materialPurifiedCertusQuartzCrystal;
|
public AEItemDefinition materialPurifiedCertusQuartzCrystal;
|
||||||
|
|
||||||
public AEItemDefinition materialPurifiedNetherQuartzCrystal;
|
public AEItemDefinition materialPurifiedNetherQuartzCrystal;
|
||||||
|
|
||||||
public AEItemDefinition materialPurifiedFluixCrystal;
|
public AEItemDefinition materialPurifiedFluixCrystal;
|
||||||
|
|
||||||
public AEItemDefinition materialCell1kPart;
|
public AEItemDefinition materialCell1kPart;
|
||||||
|
|
||||||
public AEItemDefinition materialCell4kPart;
|
public AEItemDefinition materialCell4kPart;
|
||||||
|
|
||||||
public AEItemDefinition materialCell16kPart;
|
public AEItemDefinition materialCell16kPart;
|
||||||
|
|
||||||
public AEItemDefinition materialCell64kPart;
|
public AEItemDefinition materialCell64kPart;
|
||||||
|
|
||||||
public AEItemDefinition materialEmptyStorageCell;
|
public AEItemDefinition materialEmptyStorageCell;
|
||||||
|
|
||||||
public AEItemDefinition materialCardRedstone;
|
public AEItemDefinition materialCardRedstone;
|
||||||
|
|
||||||
public AEItemDefinition materialCardSpeed;
|
public AEItemDefinition materialCardSpeed;
|
||||||
|
|
||||||
public AEItemDefinition materialCardCapacity;
|
public AEItemDefinition materialCardCapacity;
|
||||||
|
|
||||||
public AEItemDefinition materialCardFuzzy;
|
public AEItemDefinition materialCardFuzzy;
|
||||||
|
|
||||||
public AEItemDefinition materialCardInverter;
|
public AEItemDefinition materialCardInverter;
|
||||||
|
|
||||||
public AEItemDefinition materialCardCrafting;
|
public AEItemDefinition materialCardCrafting;
|
||||||
|
|
||||||
public AEItemDefinition materialEnderDust;
|
public AEItemDefinition materialEnderDust;
|
||||||
|
|
||||||
public AEItemDefinition materialFlour;
|
public AEItemDefinition materialFlour;
|
||||||
|
|
||||||
public AEItemDefinition materialGoldDust;
|
public AEItemDefinition materialGoldDust;
|
||||||
|
|
||||||
public AEItemDefinition materialIronDust;
|
public AEItemDefinition materialIronDust;
|
||||||
|
|
||||||
public AEItemDefinition materialFluixDust;
|
public AEItemDefinition materialFluixDust;
|
||||||
|
|
||||||
public AEItemDefinition materialCertusQuartzDust;
|
public AEItemDefinition materialCertusQuartzDust;
|
||||||
|
|
||||||
public AEItemDefinition materialNetherQuartzDust;
|
public AEItemDefinition materialNetherQuartzDust;
|
||||||
|
|
||||||
public AEItemDefinition materialMatterBall;
|
public AEItemDefinition materialMatterBall;
|
||||||
|
|
||||||
public AEItemDefinition materialIronNugget;
|
public AEItemDefinition materialIronNugget;
|
||||||
|
|
||||||
public AEItemDefinition materialCertusQuartzCrystal;
|
public AEItemDefinition materialCertusQuartzCrystal;
|
||||||
|
|
||||||
public AEItemDefinition materialCertusQuartzCrystalCharged;
|
public AEItemDefinition materialCertusQuartzCrystalCharged;
|
||||||
|
|
||||||
public AEItemDefinition materialFluixCrystal;
|
public AEItemDefinition materialFluixCrystal;
|
||||||
|
|
||||||
public AEItemDefinition materialFluixPearl;
|
public AEItemDefinition materialFluixPearl;
|
||||||
|
|
||||||
public AEItemDefinition materialWoodenGear;
|
public AEItemDefinition materialWoodenGear;
|
||||||
|
|
||||||
public AEItemDefinition materialWireless;
|
public AEItemDefinition materialWireless;
|
||||||
|
|
||||||
public AEItemDefinition materialWirelessBooster;
|
public AEItemDefinition materialWirelessBooster;
|
||||||
|
|
||||||
public AEItemDefinition materialAnnihilationCore;
|
public AEItemDefinition materialAnnihilationCore;
|
||||||
|
|
||||||
public AEItemDefinition materialFormationCore;
|
public AEItemDefinition materialFormationCore;
|
||||||
|
|
||||||
public AEItemDefinition materialSingularity;
|
public AEItemDefinition materialSingularity;
|
||||||
|
|
||||||
public AEItemDefinition materialQESingularity;
|
public AEItemDefinition materialQESingularity;
|
||||||
|
|
||||||
public AEItemDefinition materialBlankPattern;
|
public AEItemDefinition materialBlankPattern;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,84 +23,81 @@
|
||||||
|
|
||||||
package appeng.api.definitions;
|
package appeng.api.definitions;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.util.AEColoredItemDefinition;
|
import appeng.api.util.AEColoredItemDefinition;
|
||||||
import appeng.api.util.AEItemDefinition;
|
import appeng.api.util.AEItemDefinition;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated use {@link IParts}
|
* @deprecated use {@link IParts}
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public class Parts
|
public class Parts {
|
||||||
{
|
public AEColoredItemDefinition partCableSmart;
|
||||||
public AEColoredItemDefinition partCableSmart;
|
|
||||||
|
|
||||||
public AEColoredItemDefinition partCableCovered;
|
public AEColoredItemDefinition partCableCovered;
|
||||||
|
|
||||||
public AEColoredItemDefinition partCableGlass;
|
public AEColoredItemDefinition partCableGlass;
|
||||||
|
|
||||||
public AEColoredItemDefinition partCableDense;
|
public AEColoredItemDefinition partCableDense;
|
||||||
|
|
||||||
public AEColoredItemDefinition partLumenCableSmart;
|
public AEColoredItemDefinition partLumenCableSmart;
|
||||||
|
|
||||||
public AEColoredItemDefinition partLumenCableCovered;
|
public AEColoredItemDefinition partLumenCableCovered;
|
||||||
|
|
||||||
public AEColoredItemDefinition partLumenCableGlass;
|
public AEColoredItemDefinition partLumenCableGlass;
|
||||||
|
|
||||||
public AEColoredItemDefinition partLumenCableDense;
|
public AEColoredItemDefinition partLumenCableDense;
|
||||||
|
|
||||||
public AEItemDefinition partQuartzFiber;
|
public AEItemDefinition partQuartzFiber;
|
||||||
|
|
||||||
public AEItemDefinition partToggleBus;
|
public AEItemDefinition partToggleBus;
|
||||||
|
|
||||||
public AEItemDefinition partInvertedToggleBus;
|
public AEItemDefinition partInvertedToggleBus;
|
||||||
|
|
||||||
public AEItemDefinition partStorageBus;
|
public AEItemDefinition partStorageBus;
|
||||||
|
|
||||||
public AEItemDefinition partImportBus;
|
public AEItemDefinition partImportBus;
|
||||||
|
|
||||||
public AEItemDefinition partExportBus;
|
public AEItemDefinition partExportBus;
|
||||||
|
|
||||||
public AEItemDefinition partInterface;
|
public AEItemDefinition partInterface;
|
||||||
|
|
||||||
public AEItemDefinition partLevelEmitter;
|
public AEItemDefinition partLevelEmitter;
|
||||||
|
|
||||||
public AEItemDefinition partAnnihilationPlane;
|
public AEItemDefinition partAnnihilationPlane;
|
||||||
|
|
||||||
public AEItemDefinition partFormationPlane;
|
public AEItemDefinition partFormationPlane;
|
||||||
|
|
||||||
public AEItemDefinition partP2PTunnelME;
|
public AEItemDefinition partP2PTunnelME;
|
||||||
|
|
||||||
public AEItemDefinition partP2PTunnelRedstone;
|
public AEItemDefinition partP2PTunnelRedstone;
|
||||||
|
|
||||||
public AEItemDefinition partP2PTunnelItems;
|
public AEItemDefinition partP2PTunnelItems;
|
||||||
|
|
||||||
public AEItemDefinition partP2PTunnelLiquids;
|
public AEItemDefinition partP2PTunnelLiquids;
|
||||||
|
|
||||||
public AEItemDefinition partP2PTunnelEU;
|
public AEItemDefinition partP2PTunnelEU;
|
||||||
|
|
||||||
public AEItemDefinition partP2PTunnelRF;
|
public AEItemDefinition partP2PTunnelRF;
|
||||||
|
|
||||||
public AEItemDefinition partP2PTunnelLight;
|
public AEItemDefinition partP2PTunnelLight;
|
||||||
|
|
||||||
public AEItemDefinition partCableAnchor;
|
public AEItemDefinition partCableAnchor;
|
||||||
|
|
||||||
public AEItemDefinition partMonitor;
|
public AEItemDefinition partMonitor;
|
||||||
|
|
||||||
public AEItemDefinition partSemiDarkMonitor;
|
public AEItemDefinition partSemiDarkMonitor;
|
||||||
|
|
||||||
public AEItemDefinition partDarkMonitor;
|
public AEItemDefinition partDarkMonitor;
|
||||||
|
|
||||||
public AEItemDefinition partInterfaceTerminal;
|
public AEItemDefinition partInterfaceTerminal;
|
||||||
|
|
||||||
public AEItemDefinition partPatternTerminal;
|
public AEItemDefinition partPatternTerminal;
|
||||||
|
|
||||||
public AEItemDefinition partCraftingTerminal;
|
public AEItemDefinition partCraftingTerminal;
|
||||||
|
|
||||||
public AEItemDefinition partTerminal;
|
public AEItemDefinition partTerminal;
|
||||||
|
|
||||||
public AEItemDefinition partStorageMonitor;
|
public AEItemDefinition partStorageMonitor;
|
||||||
|
|
||||||
public AEItemDefinition partConversionMonitor;
|
public AEItemDefinition partConversionMonitor;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,31 +23,25 @@
|
||||||
|
|
||||||
package appeng.api.events;
|
package appeng.api.events;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.features.ILocatable;
|
import appeng.api.features.ILocatable;
|
||||||
import cpw.mods.fml.common.eventhandler.Event;
|
import cpw.mods.fml.common.eventhandler.Event;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Input Event:
|
* Input Event:
|
||||||
* <p>
|
* <p>
|
||||||
* Used to Notify the Location Registry of objects, and their availability.
|
* Used to Notify the Location Registry of objects, and their availability.
|
||||||
*/
|
*/
|
||||||
public class LocatableEventAnnounce extends Event
|
public class LocatableEventAnnounce extends Event {
|
||||||
{
|
public final ILocatable target;
|
||||||
|
public final LocatableEvent change;
|
||||||
|
|
||||||
public final ILocatable target;
|
public LocatableEventAnnounce(final ILocatable o, final LocatableEvent ev) {
|
||||||
public final LocatableEvent change;
|
this.target = o;
|
||||||
|
this.change = ev;
|
||||||
|
}
|
||||||
|
|
||||||
public LocatableEventAnnounce( final ILocatable o, final LocatableEvent ev )
|
public enum LocatableEvent {
|
||||||
{
|
Register, // Adds the locatable to the registry
|
||||||
this.target = o;
|
Unregister // Removes the locatable from the registry
|
||||||
this.change = ev;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public enum LocatableEvent
|
|
||||||
{
|
|
||||||
Register, // Adds the locatable to the registry
|
|
||||||
Unregister // Removes the locatable from the registry
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,14 +23,10 @@
|
||||||
|
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
public class AppEngException extends Exception {
|
||||||
|
private static final long serialVersionUID = -9051434206368465494L;
|
||||||
|
|
||||||
public class AppEngException extends Exception
|
public AppEngException(final String t) {
|
||||||
{
|
super(t);
|
||||||
|
}
|
||||||
private static final long serialVersionUID = -9051434206368465494L;
|
|
||||||
|
|
||||||
public AppEngException( final String t )
|
|
||||||
{
|
|
||||||
super( t );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
public class CoreInaccessibleException extends RuntimeException {
|
||||||
public class CoreInaccessibleException extends RuntimeException
|
public CoreInaccessibleException(final String message) {
|
||||||
{
|
super(message);
|
||||||
public CoreInaccessibleException( final String message )
|
}
|
||||||
{
|
|
||||||
super( message );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,34 +23,27 @@
|
||||||
|
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.networking.IGridNode;
|
import appeng.api.networking.IGridNode;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception occurred because of an already existing connection between the two {@link IGridNode}s
|
* Exception occurred because of an already existing connection between the two {@link
|
||||||
* <p>
|
* IGridNode}s <p> Intended to signal an internal exception and not intended to be thrown
|
||||||
* Intended to signal an internal exception and not intended to be thrown by
|
* by any 3rd party module.
|
||||||
* any 3rd party module.
|
|
||||||
*
|
*
|
||||||
* @author yueh
|
* @author yueh
|
||||||
* @version rv3
|
* @version rv3
|
||||||
* @since rv3
|
* @since rv3
|
||||||
*/
|
*/
|
||||||
public class ExistingConnectionException extends FailedConnection
|
public class ExistingConnectionException extends FailedConnection {
|
||||||
{
|
private static final long serialVersionUID = 2975450379720353182L;
|
||||||
|
private static final String DEFAULT_MESSAGE
|
||||||
|
= "Connection between both nodes already exists.";
|
||||||
|
|
||||||
private static final long serialVersionUID = 2975450379720353182L;
|
public ExistingConnectionException() {
|
||||||
private static final String DEFAULT_MESSAGE = "Connection between both nodes already exists.";
|
super(DEFAULT_MESSAGE);
|
||||||
|
}
|
||||||
public ExistingConnectionException()
|
|
||||||
{
|
|
||||||
super( DEFAULT_MESSAGE );
|
|
||||||
}
|
|
||||||
|
|
||||||
public ExistingConnectionException( String message )
|
|
||||||
{
|
|
||||||
super( message );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public ExistingConnectionException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,10 +23,8 @@
|
||||||
|
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.networking.IGridNode;
|
import appeng.api.networking.IGridNode;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception indicating a failed connection between two {@link IGridNode}s.
|
* Exception indicating a failed connection between two {@link IGridNode}s.
|
||||||
* <p>
|
* <p>
|
||||||
|
@ -40,17 +38,12 @@ import appeng.api.networking.IGridNode;
|
||||||
* @version rv3
|
* @version rv3
|
||||||
* @since rv0
|
* @since rv0
|
||||||
*/
|
*/
|
||||||
public class FailedConnection extends Exception
|
public class FailedConnection extends Exception {
|
||||||
{
|
private static final long serialVersionUID = -2544208090248293753L;
|
||||||
|
|
||||||
private static final long serialVersionUID = -2544208090248293753L;
|
public FailedConnection() {}
|
||||||
|
|
||||||
public FailedConnection()
|
public FailedConnection(String message) {
|
||||||
{
|
super(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public FailedConnection( String message )
|
|
||||||
{
|
|
||||||
super( message );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
public class MissingDefinition extends RuntimeException {
|
||||||
public class MissingDefinition extends RuntimeException
|
public MissingDefinition(final String message) {
|
||||||
{
|
super(message);
|
||||||
public MissingDefinition( final String message )
|
}
|
||||||
{
|
|
||||||
super( message );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,14 +23,10 @@
|
||||||
|
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
public class MissingIngredientError extends Exception {
|
||||||
|
private static final long serialVersionUID = -998858343831371697L;
|
||||||
|
|
||||||
public class MissingIngredientError extends Exception
|
public MissingIngredientError(final String n) {
|
||||||
{
|
super(n);
|
||||||
|
}
|
||||||
private static final long serialVersionUID = -998858343831371697L;
|
|
||||||
|
|
||||||
public MissingIngredientError( final String n )
|
|
||||||
{
|
|
||||||
super( n );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,14 +23,10 @@
|
||||||
|
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
public class ModNotInstalled extends Exception {
|
||||||
|
private static final long serialVersionUID = -9052435206368425494L;
|
||||||
|
|
||||||
public class ModNotInstalled extends Exception
|
public ModNotInstalled(final String t) {
|
||||||
{
|
super(t);
|
||||||
|
}
|
||||||
private static final long serialVersionUID = -9052435206368425494L;
|
|
||||||
|
|
||||||
public ModNotInstalled( final String t )
|
|
||||||
{
|
|
||||||
super( t );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception due to trying to connect one or more null values.
|
* Exception due to trying to connect one or more null values.
|
||||||
* <p>
|
* <p>
|
||||||
|
@ -34,20 +33,16 @@ package appeng.api.exceptions;
|
||||||
* @version rv3
|
* @version rv3
|
||||||
* @since rv3
|
* @since rv3
|
||||||
*/
|
*/
|
||||||
public class NullNodeConnectionException extends FailedConnection
|
public class NullNodeConnectionException extends FailedConnection {
|
||||||
{
|
private static final long serialVersionUID = -2143719383495321764L;
|
||||||
|
private static final String DEFAULT_MESSAGE
|
||||||
|
= "Connection forged between null entities.";
|
||||||
|
|
||||||
private static final long serialVersionUID = -2143719383495321764L;
|
public NullNodeConnectionException() {
|
||||||
private static final String DEFAULT_MESSAGE = "Connection forged between null entities.";
|
super(DEFAULT_MESSAGE);
|
||||||
|
}
|
||||||
public NullNodeConnectionException()
|
|
||||||
{
|
|
||||||
super( DEFAULT_MESSAGE );
|
|
||||||
}
|
|
||||||
|
|
||||||
public NullNodeConnectionException( String message )
|
|
||||||
{
|
|
||||||
super( message );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public NullNodeConnectionException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,14 +23,10 @@
|
||||||
|
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
public class RecipeError extends Exception {
|
||||||
|
private static final long serialVersionUID = -6602870588617670262L;
|
||||||
|
|
||||||
public class RecipeError extends Exception
|
public RecipeError(final String n) {
|
||||||
{
|
super(n);
|
||||||
|
}
|
||||||
private static final long serialVersionUID = -6602870588617670262L;
|
|
||||||
|
|
||||||
public RecipeError( final String n )
|
|
||||||
{
|
|
||||||
super( n );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,14 +23,10 @@
|
||||||
|
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
public class RegistrationError extends Exception {
|
||||||
|
private static final long serialVersionUID = -6602870588617670263L;
|
||||||
|
|
||||||
public class RegistrationError extends Exception
|
public RegistrationError(final String n) {
|
||||||
{
|
super(n);
|
||||||
|
}
|
||||||
private static final long serialVersionUID = -6602870588617670263L;
|
|
||||||
|
|
||||||
public RegistrationError( final String n )
|
|
||||||
{
|
|
||||||
super( n );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
package appeng.api.exceptions;
|
package appeng.api.exceptions;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception due to trying to connect different security realms.
|
* Exception due to trying to connect different security realms.
|
||||||
* <p>
|
* <p>
|
||||||
|
@ -34,19 +33,16 @@ package appeng.api.exceptions;
|
||||||
* @version rv3
|
* @version rv3
|
||||||
* @since rv3
|
* @since rv3
|
||||||
*/
|
*/
|
||||||
public class SecurityConnectionException extends FailedConnection
|
public class SecurityConnectionException extends FailedConnection {
|
||||||
{
|
private static final long serialVersionUID = 5048714900434215426L;
|
||||||
private static final long serialVersionUID = 5048714900434215426L;
|
private static final String DEFAULT_MESSAGE
|
||||||
private static final String DEFAULT_MESSAGE = "Connection failed due to different security realms.";
|
= "Connection failed due to different security realms.";
|
||||||
|
|
||||||
public SecurityConnectionException()
|
public SecurityConnectionException() {
|
||||||
{
|
super(DEFAULT_MESSAGE);
|
||||||
super( DEFAULT_MESSAGE );
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public SecurityConnectionException( String message )
|
|
||||||
{
|
|
||||||
super( message );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public SecurityConnectionException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,99 +23,95 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registration Records for {@link IGrinderRegistry}
|
* Registration Records for {@link IGrinderRegistry}
|
||||||
*/
|
*/
|
||||||
public interface IGrinderEntry
|
public interface IGrinderEntry {
|
||||||
{
|
/**
|
||||||
|
* the current input
|
||||||
|
*
|
||||||
|
* @return input that the grinder will accept.
|
||||||
|
*/
|
||||||
|
ItemStack getInput();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* the current input
|
* lets you change the grinder recipe by changing its input.
|
||||||
*
|
*
|
||||||
* @return input that the grinder will accept.
|
* @param input input item
|
||||||
*/
|
*/
|
||||||
ItemStack getInput();
|
void setInput(ItemStack input);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* lets you change the grinder recipe by changing its input.
|
* gets the current output
|
||||||
*
|
*
|
||||||
* @param input input item
|
* @return output that the grinder will produce
|
||||||
*/
|
*/
|
||||||
void setInput( ItemStack input );
|
ItemStack getOutput();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gets the current output
|
* allows you to change the output.
|
||||||
*
|
*
|
||||||
* @return output that the grinder will produce
|
* @param output output item
|
||||||
*/
|
*/
|
||||||
ItemStack getOutput();
|
void setOutput(ItemStack output);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* allows you to change the output.
|
* gets the current output
|
||||||
*
|
*
|
||||||
* @param output output item
|
* @return output that the grinder will produce
|
||||||
*/
|
*/
|
||||||
void setOutput( ItemStack output );
|
ItemStack getOptionalOutput();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gets the current output
|
* gets the current output
|
||||||
*
|
*
|
||||||
* @return output that the grinder will produce
|
* @return output that the grinder will produce
|
||||||
*/
|
*/
|
||||||
ItemStack getOptionalOutput();
|
ItemStack getSecondOptionalOutput();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gets the current output
|
* stack, and 0.0-1.0 chance that it will be generated.
|
||||||
*
|
*
|
||||||
* @return output that the grinder will produce
|
* @param output output item
|
||||||
*/
|
* @param chance generation chance
|
||||||
ItemStack getSecondOptionalOutput();
|
*/
|
||||||
|
void setOptionalOutput(ItemStack output, float chance);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* stack, and 0.0-1.0 chance that it will be generated.
|
* 0.0 - 1.0 the chance that the optional output will be generated.
|
||||||
*
|
*
|
||||||
* @param output output item
|
* @return chance of optional output
|
||||||
* @param chance generation chance
|
*/
|
||||||
*/
|
float getOptionalChance();
|
||||||
void setOptionalOutput( ItemStack output, float chance );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 0.0 - 1.0 the chance that the optional output will be generated.
|
* stack, and 0.0-1.0 chance that it will be generated.
|
||||||
*
|
*
|
||||||
* @return chance of optional output
|
* @param output second optional output item
|
||||||
*/
|
* @param chance second optional output chance
|
||||||
float getOptionalChance();
|
*/
|
||||||
|
void setSecondOptionalOutput(ItemStack output, float chance);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* stack, and 0.0-1.0 chance that it will be generated.
|
* 0.0 - 1.0 the chance that the optional output will be generated.
|
||||||
*
|
*
|
||||||
* @param output second optional output item
|
* @return second optional output chance
|
||||||
* @param chance second optional output chance
|
*/
|
||||||
*/
|
float getSecondOptionalChance();
|
||||||
void setSecondOptionalOutput( ItemStack output, float chance );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 0.0 - 1.0 the chance that the optional output will be generated.
|
* Energy cost, in turns.
|
||||||
*
|
*
|
||||||
* @return second optional output chance
|
* @return number of turns it takes to produce the output from the input.
|
||||||
*/
|
*/
|
||||||
float getSecondOptionalChance();
|
int getEnergyCost();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Energy cost, in turns.
|
* Allows you to adjust the number of turns
|
||||||
*
|
*
|
||||||
* @return number of turns it takes to produce the output from the input.
|
* @param c number of turns to produce output.
|
||||||
*/
|
*/
|
||||||
int getEnergyCost();
|
void setEnergyCost(int c);
|
||||||
|
|
||||||
/**
|
|
||||||
* Allows you to adjust the number of turns
|
|
||||||
*
|
|
||||||
* @param c number of turns to produce output.
|
|
||||||
*/
|
|
||||||
void setEnergyCost( int c );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,63 +23,69 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lets you manipulate Grinder Recipes, by adding or editing existing ones.
|
* Lets you manipulate Grinder Recipes, by adding or editing existing ones.
|
||||||
*/
|
*/
|
||||||
public interface IGrinderRegistry
|
public interface IGrinderRegistry {
|
||||||
{
|
/**
|
||||||
|
* Current list of registered recipes, you can modify this if you want too.
|
||||||
|
*
|
||||||
|
* @return currentlyRegisteredRecipes
|
||||||
|
*/
|
||||||
|
List<IGrinderEntry> getRecipes();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Current list of registered recipes, you can modify this if you want too.
|
* add a new recipe the easy way, in → out, how many turns., duplicates will not
|
||||||
*
|
* be added.
|
||||||
* @return currentlyRegisteredRecipes
|
*
|
||||||
*/
|
* @param in input
|
||||||
List<IGrinderEntry> getRecipes();
|
* @param out output
|
||||||
|
* @param turns amount of turns to turn the input into the output
|
||||||
|
*/
|
||||||
|
void addRecipe(ItemStack in, ItemStack out, int turns);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* add a new recipe the easy way, in → out, how many turns., duplicates will not be added.
|
* add a new recipe with optional outputs, duplicates will not be added.
|
||||||
*
|
*
|
||||||
* @param in input
|
* @param in input
|
||||||
* @param out output
|
* @param out output
|
||||||
* @param turns amount of turns to turn the input into the output
|
* @param optional optional output
|
||||||
*/
|
* @param chance chance to get the optional output within 0.0 - 1.0
|
||||||
void addRecipe( ItemStack in, ItemStack out, int turns );
|
* @param turns amount of turns to turn the input into the outputs
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
addRecipe(ItemStack in, ItemStack out, ItemStack optional, float chance, int turns);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* add a new recipe with optional outputs, duplicates will not be added.
|
* add a new recipe with optional outputs, duplicates will not be added.
|
||||||
*
|
*
|
||||||
* @param in input
|
* @param in input
|
||||||
* @param out output
|
* @param out output
|
||||||
* @param optional optional output
|
* @param optional optional output
|
||||||
* @param chance chance to get the optional output within 0.0 - 1.0
|
* @param chance chance to get the optional output within 0.0 - 1.0
|
||||||
* @param turns amount of turns to turn the input into the outputs
|
* @param optional2 second optional output
|
||||||
*/
|
* @param chance2 chance to get the second optional output within 0.0 - 1.0
|
||||||
void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, int turns );
|
* @param turns amount of turns to turn the input into the outputs
|
||||||
|
*/
|
||||||
|
void addRecipe(
|
||||||
|
ItemStack in,
|
||||||
|
ItemStack out,
|
||||||
|
ItemStack optional,
|
||||||
|
float chance,
|
||||||
|
ItemStack optional2,
|
||||||
|
float chance2,
|
||||||
|
int turns
|
||||||
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* add a new recipe with optional outputs, duplicates will not be added.
|
* Searches for a recipe for a given input, and returns it.
|
||||||
*
|
*
|
||||||
* @param in input
|
* @param input input
|
||||||
* @param out output
|
* @return identified recipe or null
|
||||||
* @param optional optional output
|
*/
|
||||||
* @param chance chance to get the optional output within 0.0 - 1.0
|
IGrinderEntry getRecipeForInput(ItemStack input);
|
||||||
* @param optional2 second optional output
|
|
||||||
* @param chance2 chance to get the second optional output within 0.0 - 1.0
|
|
||||||
* @param turns amount of turns to turn the input into the outputs
|
|
||||||
*/
|
|
||||||
void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int turns );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Searches for a recipe for a given input, and returns it.
|
|
||||||
*
|
|
||||||
* @param input input
|
|
||||||
* @return identified recipe or null
|
|
||||||
*/
|
|
||||||
IGrinderEntry getRecipeForInput( ItemStack input );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registration Records for {@link IInscriberRegistry}
|
* Registration Records for {@link IInscriberRegistry}
|
||||||
* <p>
|
* <p>
|
||||||
|
@ -20,45 +18,44 @@ import java.util.List;
|
||||||
* @version rv2
|
* @version rv2
|
||||||
* @since rv2
|
* @since rv2
|
||||||
*/
|
*/
|
||||||
public interface IInscriberRecipe
|
public interface IInscriberRecipe {
|
||||||
{
|
/**
|
||||||
/**
|
* the current inputs
|
||||||
* the current inputs
|
*
|
||||||
*
|
* @return inputs the inscriber will accept
|
||||||
* @return inputs the inscriber will accept
|
*/
|
||||||
*/
|
@Nonnull
|
||||||
@Nonnull
|
List<ItemStack> getInputs();
|
||||||
List<ItemStack> getInputs();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gets the current output
|
* gets the current output
|
||||||
*
|
*
|
||||||
* @return output that the recipe will produce
|
* @return output that the recipe will produce
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
ItemStack getOutput();
|
ItemStack getOutput();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gets the top optional
|
* gets the top optional
|
||||||
*
|
*
|
||||||
* @return item which is used top
|
* @return item which is used top
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
Optional<ItemStack> getTopOptional();
|
Optional<ItemStack> getTopOptional();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gets the bottom optional
|
* gets the bottom optional
|
||||||
*
|
*
|
||||||
* @return item which is used bottom
|
* @return item which is used bottom
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
Optional<ItemStack> getBottomOptional();
|
Optional<ItemStack> getBottomOptional();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* type of inscriber process
|
* type of inscriber process
|
||||||
*
|
*
|
||||||
* @return type of process the inscriber is doing
|
* @return type of process the inscriber is doing
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
InscriberProcessType getProcessType();
|
InscriberProcessType getProcessType();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Builder for an inscriber recipe
|
* Builder for an inscriber recipe
|
||||||
*
|
*
|
||||||
|
@ -14,69 +12,68 @@ import java.util.Collection;
|
||||||
* @version rv2
|
* @version rv2
|
||||||
* @since rv2
|
* @since rv2
|
||||||
*/
|
*/
|
||||||
public interface IInscriberRecipeBuilder
|
public interface IInscriberRecipeBuilder {
|
||||||
{
|
/**
|
||||||
/**
|
* Creates an inscriber recipe with inputs.
|
||||||
* Creates an inscriber recipe with inputs.
|
* Needs to be invoked.
|
||||||
* Needs to be invoked.
|
*
|
||||||
*
|
* @param inputs new inputs for the recipe
|
||||||
* @param inputs new inputs for the recipe
|
* @return currently used builder
|
||||||
* @return currently used builder
|
*/
|
||||||
*/
|
@Nonnull
|
||||||
@Nonnull
|
IInscriberRecipeBuilder withInputs(@Nonnull Collection<ItemStack> inputs);
|
||||||
IInscriberRecipeBuilder withInputs( @Nonnull Collection<ItemStack> inputs );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an inscriber recipe with output.
|
* Creates an inscriber recipe with output.
|
||||||
* Needs to be invoked.
|
* Needs to be invoked.
|
||||||
*
|
*
|
||||||
* @param output new output for the recipe
|
* @param output new output for the recipe
|
||||||
* @return currently used builder
|
* @return currently used builder
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
IInscriberRecipeBuilder withOutput( @Nonnull ItemStack output );
|
IInscriberRecipeBuilder withOutput(@Nonnull ItemStack output);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an inscriber recipe with top.
|
* Creates an inscriber recipe with top.
|
||||||
* Either this or bot needs to be invoked.
|
* Either this or bot needs to be invoked.
|
||||||
*
|
*
|
||||||
* @param topOptional new top for the recipe
|
* @param topOptional new top for the recipe
|
||||||
* @return currently used builder
|
* @return currently used builder
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
IInscriberRecipeBuilder withTopOptional( @Nonnull ItemStack topOptional );
|
IInscriberRecipeBuilder withTopOptional(@Nonnull ItemStack topOptional);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an inscriber recipe with bot.
|
* Creates an inscriber recipe with bot.
|
||||||
* Either this or top needs to be invoked.
|
* Either this or top needs to be invoked.
|
||||||
*
|
*
|
||||||
* @param bottomOptional new bot for the recipe
|
* @param bottomOptional new bot for the recipe
|
||||||
* @return currently used builder
|
* @return currently used builder
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
IInscriberRecipeBuilder withBottomOptional( @Nonnull ItemStack bottomOptional );
|
IInscriberRecipeBuilder withBottomOptional(@Nonnull ItemStack bottomOptional);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an inscriber recipe with type.
|
* Creates an inscriber recipe with type.
|
||||||
* Needs to be invoked.
|
* Needs to be invoked.
|
||||||
*
|
*
|
||||||
* @param type new type for the recipe
|
* @param type new type for the recipe
|
||||||
* @return currently used builder
|
* @return currently used builder
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
IInscriberRecipeBuilder withProcessType( @Nonnull InscriberProcessType type );
|
IInscriberRecipeBuilder withProcessType(@Nonnull InscriberProcessType type);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Finalizes the process of making the recipe.
|
* Finalizes the process of making the recipe.
|
||||||
* Needs to be invoked to fetch inscriber recipe.
|
* Needs to be invoked to fetch inscriber recipe.
|
||||||
*
|
*
|
||||||
* @return legal inscriber recipe
|
* @return legal inscriber recipe
|
||||||
* @throws IllegalStateException when input is not defined
|
* @throws IllegalStateException when input is not defined
|
||||||
* @throws IllegalStateException when input has no size
|
* @throws IllegalStateException when input has no size
|
||||||
* @throws IllegalStateException when output is not defined
|
* @throws IllegalStateException when output is not defined
|
||||||
* @throws IllegalStateException when both optionals are not defined
|
* @throws IllegalStateException when both optionals are not defined
|
||||||
* @throws IllegalStateException when process type is not defined
|
* @throws IllegalStateException when process type is not defined
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
IInscriberRecipe build();
|
IInscriberRecipe build();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lets you manipulate Inscriber Recipes, by adding or editing existing ones.
|
* Lets you manipulate Inscriber Recipes, by adding or editing existing ones.
|
||||||
|
@ -15,58 +13,56 @@ import java.util.Set;
|
||||||
* @version rv3
|
* @version rv3
|
||||||
* @since rv2
|
* @since rv2
|
||||||
*/
|
*/
|
||||||
public interface IInscriberRegistry
|
public interface IInscriberRegistry {
|
||||||
{
|
/**
|
||||||
/**
|
* An immutable copy of currently registered recipes.
|
||||||
* An immutable copy of currently registered recipes.
|
* <p>
|
||||||
* <p>
|
* Use the provided methods to actually modify the inscriber recipes.
|
||||||
* Use the provided methods to actually modify the inscriber recipes.
|
*
|
||||||
*
|
* @return currentlyRegisteredRecipes
|
||||||
* @return currentlyRegisteredRecipes
|
* @see IInscriberRegistry#addRecipe(IInscriberRecipe)
|
||||||
* @see IInscriberRegistry#addRecipe(IInscriberRecipe)
|
* @see IInscriberRegistry#removeRecipe(IInscriberRecipe)
|
||||||
* @see IInscriberRegistry#removeRecipe(IInscriberRecipe)
|
*/
|
||||||
*/
|
@Nonnull
|
||||||
@Nonnull
|
Collection<IInscriberRecipe> getRecipes();
|
||||||
Collection<IInscriberRecipe> getRecipes();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Optional items which are used in the top or bottom slot.
|
* Optional items which are used in the top or bottom slot.
|
||||||
*
|
*
|
||||||
* @return set of all optional items
|
* @return set of all optional items
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
Set<ItemStack> getOptionals();
|
Set<ItemStack> getOptionals();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all registered items which are valid inputs.
|
* Get all registered items which are valid inputs.
|
||||||
*
|
*
|
||||||
* @return set of all input items
|
* @return set of all input items
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
Set<ItemStack> getInputs();
|
Set<ItemStack> getInputs();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extensible way to create an inscriber recipe.
|
* Extensible way to create an inscriber recipe.
|
||||||
*
|
*
|
||||||
* @return builder for inscriber recipes
|
* @return builder for inscriber recipes
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
IInscriberRecipeBuilder builder();
|
IInscriberRecipeBuilder builder();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* add a new recipe the easy way, duplicates will not be added.
|
* add a new recipe the easy way, duplicates will not be added.
|
||||||
* Added recipes will be automatically added to the optionals and inputs.
|
* Added recipes will be automatically added to the optionals and inputs.
|
||||||
*
|
*
|
||||||
* @param recipe new recipe
|
* @param recipe new recipe
|
||||||
* @throws IllegalArgumentException if null is added
|
* @throws IllegalArgumentException if null is added
|
||||||
*/
|
*/
|
||||||
void addRecipe( IInscriberRecipe recipe );
|
void addRecipe(IInscriberRecipe recipe);
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes all equal recipes from the registry.
|
|
||||||
*
|
|
||||||
* @param toBeRemovedRecipe to be removed recipe, can be null, makes just no sense.
|
|
||||||
*/
|
|
||||||
void removeRecipe( IInscriberRecipe toBeRemovedRecipe );
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes all equal recipes from the registry.
|
||||||
|
*
|
||||||
|
* @param toBeRemovedRecipe to be removed recipe, can be null, makes just no sense.
|
||||||
|
*/
|
||||||
|
void removeRecipe(IInscriberRecipe toBeRemovedRecipe);
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,10 +23,8 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
public interface IItemComparison {
|
||||||
|
boolean sameAsPrecise(IItemComparison comp);
|
||||||
|
|
||||||
public interface IItemComparison
|
boolean sameAsFuzzy(IItemComparison comp);
|
||||||
{
|
|
||||||
boolean sameAsPrecise( IItemComparison comp );
|
|
||||||
|
|
||||||
boolean sameAsFuzzy( IItemComparison comp );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,32 +23,28 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provider for special comparisons. when an item is encountered AE Will request
|
* Provider for special comparisons. when an item is encountered AE Will request
|
||||||
* if the comparison function handles the item, by trying to request a
|
* if the comparison function handles the item, by trying to request a
|
||||||
* IItemComparison class.
|
* IItemComparison class.
|
||||||
*/
|
*/
|
||||||
public interface IItemComparisonProvider
|
public interface IItemComparisonProvider {
|
||||||
{
|
/**
|
||||||
|
* should return a new IItemComparison, or return null if it doesn't handle
|
||||||
|
* the supplied item.
|
||||||
|
*
|
||||||
|
* @param is item
|
||||||
|
* @return IItemComparison, or null
|
||||||
|
*/
|
||||||
|
IItemComparison getComparison(ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* should return a new IItemComparison, or return null if it doesn't handle
|
* Simple test for support ( AE generally skips this and calls the above function. )
|
||||||
* the supplied item.
|
*
|
||||||
*
|
* @param stack item
|
||||||
* @param is item
|
* @return true, if getComparison will return a valid IItemComparison Object
|
||||||
* @return IItemComparison, or null
|
*/
|
||||||
*/
|
boolean canHandle(ItemStack stack);
|
||||||
IItemComparison getComparison( ItemStack is );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Simple test for support ( AE generally skips this and calls the above function. )
|
|
||||||
*
|
|
||||||
* @param stack item
|
|
||||||
* @return true, if getComparison will return a valid IItemComparison Object
|
|
||||||
*/
|
|
||||||
boolean canHandle( ItemStack stack );
|
|
||||||
}
|
}
|
|
@ -23,19 +23,15 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.events.LocatableEventAnnounce;
|
import appeng.api.events.LocatableEventAnnounce;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A registration record for the {@link ILocatableRegistry} use the {@link LocatableEventAnnounce} event on the Forge
|
* A registration record for the {@link ILocatableRegistry} use the {@link
|
||||||
* Event bus to update the registry.
|
* LocatableEventAnnounce} event on the Forge Event bus to update the registry.
|
||||||
*/
|
*/
|
||||||
public interface ILocatable
|
public interface ILocatable {
|
||||||
{
|
/**
|
||||||
|
* @return the serial for a locatable object
|
||||||
/**
|
*/
|
||||||
* @return the serial for a locatable object
|
long getLocatableSerial();
|
||||||
*/
|
|
||||||
long getLocatableSerial();
|
|
||||||
}
|
}
|
|
@ -23,28 +23,26 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Registry for locatable items, works based on serial numbers.
|
* A Registry for locatable items, works based on serial numbers.
|
||||||
*/
|
*/
|
||||||
public interface ILocatableRegistry
|
public interface ILocatableRegistry {
|
||||||
{
|
/**
|
||||||
/**
|
* Attempts to find the object with the serial specified, if it can it
|
||||||
* Attempts to find the object with the serial specified, if it can it
|
* returns the object.
|
||||||
* returns the object.
|
*
|
||||||
*
|
* @param serial serial
|
||||||
* @param serial serial
|
* @return requestedObject, or null
|
||||||
* @return requestedObject, or null
|
* @deprecated use {@link ILocatableRegistry#getLocatableBy(long)}
|
||||||
* @deprecated use {@link ILocatableRegistry#getLocatableBy(long)}
|
*/
|
||||||
*/
|
@Deprecated
|
||||||
@Deprecated
|
Object findLocatableBySerial(long serial);
|
||||||
Object findLocatableBySerial( long serial );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the {@link ILocatable} with the registered serial, if available
|
* Gets the {@link ILocatable} with the registered serial, if available
|
||||||
*
|
*
|
||||||
* @param serial serial
|
* @param serial serial
|
||||||
* @return requestedObject, or null, if the object does not exist anymore
|
* @return requestedObject, or null, if the object does not exist anymore
|
||||||
*/
|
*/
|
||||||
ILocatable getLocatableBy( long serial );
|
ILocatable getLocatableBy(long serial);
|
||||||
}
|
}
|
|
@ -23,26 +23,23 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
public interface IMatterCannonAmmoRegistry {
|
||||||
|
/**
|
||||||
|
* register a new ammo, generally speaking this is based off of atomic weight to make
|
||||||
|
* it easier to guess at
|
||||||
|
*
|
||||||
|
* @param ammo new ammo
|
||||||
|
* @param weight atomic weight
|
||||||
|
*/
|
||||||
|
void registerAmmo(ItemStack ammo, double weight);
|
||||||
|
|
||||||
public interface IMatterCannonAmmoRegistry
|
/**
|
||||||
{
|
* get the penetration value for a particular ammo, 0 indicates a non-ammo.
|
||||||
|
*
|
||||||
/**
|
* @param is ammo
|
||||||
* register a new ammo, generally speaking this is based off of atomic weight to make it easier to guess at
|
* @return 0 or a valid penetration value.
|
||||||
*
|
*/
|
||||||
* @param ammo new ammo
|
float getPenetration(ItemStack is);
|
||||||
* @param weight atomic weight
|
|
||||||
*/
|
|
||||||
void registerAmmo( ItemStack ammo, double weight );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* get the penetration value for a particular ammo, 0 indicates a non-ammo.
|
|
||||||
*
|
|
||||||
* @param is ammo
|
|
||||||
* @return 0 or a valid penetration value.
|
|
||||||
*/
|
|
||||||
float getPenetration( ItemStack is );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,27 +23,23 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
public interface INetworkEncodable {
|
||||||
|
/**
|
||||||
|
* Used to get the current key from the item.
|
||||||
|
*
|
||||||
|
* @param item item
|
||||||
|
* @return string key of item
|
||||||
|
*/
|
||||||
|
String getEncryptionKey(ItemStack item);
|
||||||
|
|
||||||
public interface INetworkEncodable
|
/**
|
||||||
{
|
* Encode the wireless frequency via the Controller.
|
||||||
|
*
|
||||||
/**
|
* @param item the wireless terminal.
|
||||||
* Used to get the current key from the item.
|
* @param encKey the wireless encryption key.
|
||||||
*
|
* @param name null for now.
|
||||||
* @param item item
|
*/
|
||||||
* @return string key of item
|
void setEncryptionKey(ItemStack item, String encKey, String name);
|
||||||
*/
|
|
||||||
String getEncryptionKey( ItemStack item );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encode the wireless frequency via the Controller.
|
|
||||||
*
|
|
||||||
* @param item the wireless terminal.
|
|
||||||
* @param encKey the wireless encryption key.
|
|
||||||
* @param name null for now.
|
|
||||||
*/
|
|
||||||
void setEncryptionKey( ItemStack item, String encKey, String name );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,34 +23,30 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import appeng.api.config.TunnelType;
|
import appeng.api.config.TunnelType;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Registry for how p2p Tunnels are attuned
|
* A Registry for how p2p Tunnels are attuned
|
||||||
*/
|
*/
|
||||||
public interface IP2PTunnelRegistry
|
public interface IP2PTunnelRegistry {
|
||||||
{
|
/**
|
||||||
|
* Allows third parties to register items from their mod as potential
|
||||||
|
* attunements for AE's P2P Tunnels
|
||||||
|
*
|
||||||
|
* @param trigger - the item which triggers attunement. Nullable, but then ignored
|
||||||
|
* @param type - the type of tunnel. Nullable, but then ignored
|
||||||
|
*/
|
||||||
|
void addNewAttunement(@Nullable ItemStack trigger, @Nullable TunnelType type);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allows third parties to register items from their mod as potential
|
* returns null if no attunement can be found.
|
||||||
* attunements for AE's P2P Tunnels
|
*
|
||||||
*
|
* @param trigger attunement trigger
|
||||||
* @param trigger - the item which triggers attunement. Nullable, but then ignored
|
* @return null if no attunement can be found or attunement
|
||||||
* @param type - the type of tunnel. Nullable, but then ignored
|
*/
|
||||||
*/
|
@Nullable
|
||||||
void addNewAttunement( @Nullable ItemStack trigger, @Nullable TunnelType type );
|
TunnelType getTunnelTypeByItem(ItemStack trigger);
|
||||||
|
|
||||||
/**
|
|
||||||
* returns null if no attunement can be found.
|
|
||||||
*
|
|
||||||
* @param trigger attunement trigger
|
|
||||||
* @return null if no attunement can be found or attunement
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
TunnelType getTunnelTypeByItem( ItemStack trigger );
|
|
||||||
}
|
}
|
|
@ -23,36 +23,33 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
import com.mojang.authlib.GameProfile;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maintains a save specific list of userids and username combinations this greatly simplifies storage internally and
|
* Maintains a save specific list of userids and username combinations this greatly
|
||||||
* gives a common place to look up and get IDs for the security framework.
|
* simplifies storage internally and gives a common place to look up and get IDs for the
|
||||||
|
* security framework.
|
||||||
*/
|
*/
|
||||||
public interface IPlayerRegistry
|
public interface IPlayerRegistry {
|
||||||
{
|
/**
|
||||||
|
* @param gameProfile user game profile
|
||||||
|
* @return user id of a username.
|
||||||
|
*/
|
||||||
|
int getID(GameProfile gameProfile);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param gameProfile user game profile
|
* @param player player
|
||||||
* @return user id of a username.
|
* @return user id of a player entity.
|
||||||
*/
|
*/
|
||||||
int getID( GameProfile gameProfile );
|
int getID(EntityPlayer player);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param player player
|
* @param playerID to be found player id
|
||||||
* @return user id of a player entity.
|
* @return PlayerEntity, or null if the player could not be found.
|
||||||
*/
|
*/
|
||||||
int getID( EntityPlayer player );
|
@Nullable
|
||||||
|
EntityPlayer findPlayer(int playerID);
|
||||||
/**
|
|
||||||
* @param playerID to be found player id
|
|
||||||
* @return PlayerEntity, or null if the player could not be found.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
EntityPlayer findPlayer( int playerID );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,61 +23,57 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import appeng.api.recipes.ICraftHandler;
|
import appeng.api.recipes.ICraftHandler;
|
||||||
import appeng.api.recipes.IRecipeHandler;
|
import appeng.api.recipes.IRecipeHandler;
|
||||||
import appeng.api.recipes.ISubItemResolver;
|
import appeng.api.recipes.ISubItemResolver;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author AlgorithmX2
|
* @author AlgorithmX2
|
||||||
* @author thatsIch
|
* @author thatsIch
|
||||||
* @version rv3 - 10.08.2015
|
* @version rv3 - 10.08.2015
|
||||||
* @since rv0
|
* @since rv0
|
||||||
*/
|
*/
|
||||||
public interface IRecipeHandlerRegistry
|
public interface IRecipeHandlerRegistry {
|
||||||
{
|
/**
|
||||||
|
* Add a new Recipe Handler to the parser.
|
||||||
|
* <p>
|
||||||
|
* MUST BE CALLED IN PRE-INIT
|
||||||
|
*
|
||||||
|
* @param name name of crafthandler
|
||||||
|
* @param handler class of crafthandler
|
||||||
|
*/
|
||||||
|
void addNewCraftHandler(String name, Class<? extends ICraftHandler> handler);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a new Recipe Handler to the parser.
|
* Add a new resolver to the parser.
|
||||||
* <p>
|
* <p>
|
||||||
* MUST BE CALLED IN PRE-INIT
|
* MUST BE CALLED IN PRE-INIT
|
||||||
*
|
*
|
||||||
* @param name name of crafthandler
|
* @param sir sub item resolver
|
||||||
* @param handler class of crafthandler
|
*/
|
||||||
*/
|
void addNewSubItemResolver(ISubItemResolver sir);
|
||||||
void addNewCraftHandler( String name, Class<? extends ICraftHandler> handler );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a new resolver to the parser.
|
* @param name name of crafting handler
|
||||||
* <p>
|
* @return A recipe handler by name, returns null on failure.
|
||||||
* MUST BE CALLED IN PRE-INIT
|
*/
|
||||||
*
|
@Nullable
|
||||||
* @param sir sub item resolver
|
ICraftHandler getCraftHandlerFor(String name);
|
||||||
*/
|
|
||||||
void addNewSubItemResolver( ISubItemResolver sir );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param name name of crafting handler
|
* @return a new recipe handler, which can be used to parse, and read recipe files.
|
||||||
* @return A recipe handler by name, returns null on failure.
|
*/
|
||||||
*/
|
IRecipeHandler createNewRecipehandler();
|
||||||
@Nullable
|
|
||||||
ICraftHandler getCraftHandlerFor( String name );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return a new recipe handler, which can be used to parse, and read recipe files.
|
* resolve sub items by name.
|
||||||
*/
|
*
|
||||||
IRecipeHandler createNewRecipehandler();
|
* @param nameSpace namespace of item
|
||||||
|
* @param itemName full name of item
|
||||||
/**
|
* @return ResolverResult or ResolverResultSet or null if could not resolve
|
||||||
* resolve sub items by name.
|
*/
|
||||||
*
|
@Nullable
|
||||||
* @param nameSpace namespace of item
|
Object resolveItem(String nameSpace, String itemName);
|
||||||
* @param itemName full name of item
|
|
||||||
* @return ResolverResult or ResolverResultSet or null if could not resolve
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
Object resolveItem( String nameSpace, String itemName );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,90 +23,87 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.movable.IMovableRegistry;
|
import appeng.api.movable.IMovableRegistry;
|
||||||
import appeng.api.networking.IGridCacheRegistry;
|
import appeng.api.networking.IGridCacheRegistry;
|
||||||
import appeng.api.storage.ICellRegistry;
|
import appeng.api.storage.ICellRegistry;
|
||||||
import appeng.api.storage.IExternalStorageRegistry;
|
import appeng.api.storage.IExternalStorageRegistry;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author AlgorithmX2
|
* @author AlgorithmX2
|
||||||
* @author thatsIch
|
* @author thatsIch
|
||||||
* @version rv2
|
* @version rv2
|
||||||
* @since rv0
|
* @since rv0
|
||||||
*/
|
*/
|
||||||
public interface IRegistryContainer
|
public interface IRegistryContainer {
|
||||||
{
|
/**
|
||||||
|
* Use the movable registry to white list your tiles.
|
||||||
|
*/
|
||||||
|
IMovableRegistry movable();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the movable registry to white list your tiles.
|
* Add new Grid Caches for use during run time, only use during loading phase.
|
||||||
*/
|
*/
|
||||||
IMovableRegistry movable();
|
IGridCacheRegistry gridCache();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add new Grid Caches for use during run time, only use during loading phase.
|
* Add additional storage bus handlers to improve interplay with mod blocks that
|
||||||
*/
|
* contains special inventories that function unlike vanilla chests. AE uses this
|
||||||
IGridCacheRegistry gridCache();
|
* internally for barrels, DSU's, quantum chests, AE Networks and more.
|
||||||
|
*/
|
||||||
|
IExternalStorageRegistry externalStorage();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add additional storage bus handlers to improve interplay with mod blocks that contains special inventories that
|
* Add additional special comparison functionality, AE Uses this internally for Bees.
|
||||||
* function unlike vanilla chests. AE uses this internally for barrels, DSU's, quantum chests, AE Networks and more.
|
*/
|
||||||
*/
|
ISpecialComparisonRegistry specialComparison();
|
||||||
IExternalStorageRegistry externalStorage();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add additional special comparison functionality, AE Uses this internally for Bees.
|
* Lets you register your items as wireless terminals
|
||||||
*/
|
*/
|
||||||
ISpecialComparisonRegistry specialComparison();
|
IWirelessTermRegistry wireless();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lets you register your items as wireless terminals
|
* Allows you to register new cell types, these will function in drives
|
||||||
*/
|
*/
|
||||||
IWirelessTermRegistry wireless();
|
ICellRegistry cell();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allows you to register new cell types, these will function in drives
|
* Manage grinder recipes via API
|
||||||
*/
|
*/
|
||||||
ICellRegistry cell();
|
IGrinderRegistry grinder();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Manage grinder recipes via API
|
* Manage inscriber recipes via API
|
||||||
*/
|
*/
|
||||||
IGrinderRegistry grinder();
|
IInscriberRegistry inscriber();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Manage inscriber recipes via API
|
* get access to the locatable registry
|
||||||
*/
|
*/
|
||||||
IInscriberRegistry inscriber();
|
ILocatableRegistry locatable();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get access to the locatable registry
|
* get access to the p2p tunnel registry.
|
||||||
*/
|
*/
|
||||||
ILocatableRegistry locatable();
|
IP2PTunnelRegistry p2pTunnel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get access to the p2p tunnel registry.
|
* get access to the ammo registry.
|
||||||
*/
|
*/
|
||||||
IP2PTunnelRegistry p2pTunnel();
|
IMatterCannonAmmoRegistry matterCannon();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get access to the ammo registry.
|
* get access to the player registry
|
||||||
*/
|
*/
|
||||||
IMatterCannonAmmoRegistry matterCannon();
|
IPlayerRegistry players();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get access to the player registry
|
* get access to the ae2 recipe api
|
||||||
*/
|
*/
|
||||||
IPlayerRegistry players();
|
IRecipeHandlerRegistry recipes();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get access to the ae2 recipe api
|
* get access to the world-gen api.
|
||||||
*/
|
*/
|
||||||
IRecipeHandlerRegistry recipes();
|
IWorldGen worldgen();
|
||||||
|
|
||||||
/**
|
|
||||||
* get access to the world-gen api.
|
|
||||||
*/
|
|
||||||
IWorldGen worldgen();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,28 +23,24 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Registry of any special comparison handlers for AE To use.
|
* A Registry of any special comparison handlers for AE To use.
|
||||||
*/
|
*/
|
||||||
public interface ISpecialComparisonRegistry
|
public interface ISpecialComparisonRegistry {
|
||||||
{
|
/**
|
||||||
|
* return TheHandler or null.
|
||||||
|
*
|
||||||
|
* @param stack item
|
||||||
|
* @return a handler it found for a specific item
|
||||||
|
*/
|
||||||
|
IItemComparison getSpecialComparison(ItemStack stack);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* return TheHandler or null.
|
* Register a new special comparison function with AE.
|
||||||
*
|
*
|
||||||
* @param stack item
|
* @param prov comparison provider
|
||||||
* @return a handler it found for a specific item
|
*/
|
||||||
*/
|
void addComparisonProvider(IItemComparisonProvider prov);
|
||||||
IItemComparison getSpecialComparison( ItemStack stack );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register a new special comparison function with AE.
|
|
||||||
*
|
|
||||||
* @param prov comparison provider
|
|
||||||
*/
|
|
||||||
void addComparisonProvider( IItemComparisonProvider prov );
|
|
||||||
}
|
}
|
|
@ -23,47 +23,44 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.util.IConfigManager;
|
import appeng.api.util.IConfigManager;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A handler for a wireless terminal.
|
* A handler for a wireless terminal.
|
||||||
*/
|
*/
|
||||||
public interface IWirelessTermHandler extends INetworkEncodable
|
public interface IWirelessTermHandler extends INetworkEncodable {
|
||||||
{
|
/**
|
||||||
|
* @param is wireless terminal
|
||||||
|
* @return true, if usePower, hasPower, etc... can be called for the provided item
|
||||||
|
*/
|
||||||
|
boolean canHandle(ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param is wireless terminal
|
* use an amount of power, in AE units
|
||||||
* @return true, if usePower, hasPower, etc... can be called for the provided item
|
*
|
||||||
*/
|
* @param amount is in AE units ( 5 per MJ ), if you return false, the item should be
|
||||||
boolean canHandle( ItemStack is );
|
* dead and return false for
|
||||||
|
* hasPower
|
||||||
|
* @param is wireless terminal
|
||||||
|
* @return true if wireless terminal uses power
|
||||||
|
*/
|
||||||
|
boolean usePower(EntityPlayer player, double amount, ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* use an amount of power, in AE units
|
* gets the power status of the item.
|
||||||
*
|
*
|
||||||
* @param amount is in AE units ( 5 per MJ ), if you return false, the item should be dead and return false for
|
* @param is wireless terminal
|
||||||
* hasPower
|
* @return returns true if there is any power left.
|
||||||
* @param is wireless terminal
|
*/
|
||||||
* @return true if wireless terminal uses power
|
boolean hasPower(EntityPlayer player, double amount, ItemStack is);
|
||||||
*/
|
|
||||||
boolean usePower( EntityPlayer player, double amount, ItemStack is );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gets the power status of the item.
|
* Return the config manager for the wireless terminal.
|
||||||
*
|
*
|
||||||
* @param is wireless terminal
|
* @param is wireless terminal
|
||||||
* @return returns true if there is any power left.
|
* @return config manager of wireless terminal
|
||||||
*/
|
*/
|
||||||
boolean hasPower( EntityPlayer player, double amount, ItemStack is );
|
IConfigManager getConfigManager(ItemStack is);
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the config manager for the wireless terminal.
|
|
||||||
*
|
|
||||||
* @param is wireless terminal
|
|
||||||
* @return config manager of wireless terminal
|
|
||||||
*/
|
|
||||||
IConfigManager getConfigManager( ItemStack is );
|
|
||||||
}
|
}
|
|
@ -23,41 +23,37 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registration record for a Custom Cell handler.
|
* Registration record for a Custom Cell handler.
|
||||||
*/
|
*/
|
||||||
public interface IWirelessTermRegistry
|
public interface IWirelessTermRegistry {
|
||||||
{
|
/**
|
||||||
|
* add this handler to the list of other wireless handler.
|
||||||
|
*
|
||||||
|
* @param handler wireless handler
|
||||||
|
*/
|
||||||
|
void registerWirelessHandler(IWirelessTermHandler handler);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* add this handler to the list of other wireless handler.
|
* @param is item which might have a handler
|
||||||
*
|
* @return true if there is a handler for this item
|
||||||
* @param handler wireless handler
|
*/
|
||||||
*/
|
boolean isWirelessTerminal(ItemStack is);
|
||||||
void registerWirelessHandler( IWirelessTermHandler handler );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param is item which might have a handler
|
* @param is item with handler
|
||||||
* @return true if there is a handler for this item
|
* @return a register handler for the item in question, or null if there
|
||||||
*/
|
* isn't one
|
||||||
boolean isWirelessTerminal( ItemStack is );
|
*/
|
||||||
|
IWirelessTermHandler getWirelessTerminalHandler(ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param is item with handler
|
* opens the wireless terminal gui, the wireless terminal item, must be in
|
||||||
* @return a register handler for the item in question, or null if there
|
* the active slot on the tool bar.
|
||||||
* isn't one
|
*/
|
||||||
*/
|
void openWirelessTerminalGui(ItemStack item, World w, EntityPlayer player);
|
||||||
IWirelessTermHandler getWirelessTerminalHandler( ItemStack is );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* opens the wireless terminal gui, the wireless terminal item, must be in
|
|
||||||
* the active slot on the tool bar.
|
|
||||||
*/
|
|
||||||
void openWirelessTerminalGui( ItemStack item, World w, EntityPlayer player );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,24 +23,19 @@
|
||||||
|
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraft.world.WorldProvider;
|
import net.minecraft.world.WorldProvider;
|
||||||
|
|
||||||
|
public interface IWorldGen {
|
||||||
|
void disableWorldGenForProviderID(
|
||||||
|
WorldGenType type, Class<? extends WorldProvider> provider
|
||||||
|
);
|
||||||
|
|
||||||
public interface IWorldGen
|
void enableWorldGenForDimension(WorldGenType type, int dimID);
|
||||||
{
|
|
||||||
|
|
||||||
void disableWorldGenForProviderID( WorldGenType type, Class<? extends WorldProvider> provider );
|
void disableWorldGenForDimension(WorldGenType type, int dimID);
|
||||||
|
|
||||||
void enableWorldGenForDimension( WorldGenType type, int dimID );
|
boolean isWorldGenEnabled(WorldGenType type, World w);
|
||||||
|
|
||||||
void disableWorldGenForDimension( WorldGenType type, int dimID );
|
enum WorldGenType { CertusQuartz, ChargedCertusQuartz, Meteorites }
|
||||||
|
|
||||||
boolean isWorldGenEnabled( WorldGenType type, World w );
|
|
||||||
|
|
||||||
enum WorldGenType
|
|
||||||
{
|
|
||||||
CertusQuartz, ChargedCertusQuartz, Meteorites
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
package appeng.api.features;
|
package appeng.api.features;
|
||||||
|
|
||||||
|
public enum InscriberProcessType {
|
||||||
|
/**
|
||||||
|
* uses the optionals as catalyst
|
||||||
|
*/
|
||||||
|
Inscribe,
|
||||||
|
|
||||||
public enum InscriberProcessType
|
/**
|
||||||
{
|
* spends the optionals
|
||||||
/**
|
*/
|
||||||
* uses the optionals as catalyst
|
Press
|
||||||
*/
|
|
||||||
Inscribe,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* spends the optionals
|
|
||||||
*/
|
|
||||||
Press
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,25 +23,21 @@
|
||||||
|
|
||||||
package appeng.api.implementations;
|
package appeng.api.implementations;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.networking.crafting.ICraftingPatternDetails;
|
import appeng.api.networking.crafting.ICraftingPatternDetails;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implemented on {@link Item}
|
* Implemented on {@link Item}
|
||||||
*/
|
*/
|
||||||
public interface ICraftingPatternItem
|
public interface ICraftingPatternItem {
|
||||||
{
|
/**
|
||||||
|
* Access Details about a pattern
|
||||||
/**
|
*
|
||||||
* Access Details about a pattern
|
* @param is pattern
|
||||||
*
|
* @param w crafting world
|
||||||
* @param is pattern
|
* @return details of pattern
|
||||||
* @param w crafting world
|
*/
|
||||||
* @return details of pattern
|
ICraftingPatternDetails getPatternForItem(ItemStack is, World w);
|
||||||
*/
|
|
||||||
ICraftingPatternDetails getPatternForItem( ItemStack is, World w );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,20 +23,17 @@
|
||||||
|
|
||||||
package appeng.api.implementations;
|
package appeng.api.implementations;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is intended for use on the client side to provide details to WAILA.
|
* This is intended for use on the client side to provide details to WAILA.
|
||||||
*/
|
*/
|
||||||
public interface IPowerChannelState
|
public interface IPowerChannelState {
|
||||||
{
|
/**
|
||||||
|
* @return true if the part/tile is powered.
|
||||||
|
*/
|
||||||
|
boolean isPowered();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return true if the part/tile is powered.
|
* @return true if the part/tile isActive
|
||||||
*/
|
*/
|
||||||
boolean isPowered();
|
boolean isActive();
|
||||||
|
|
||||||
/**
|
|
||||||
* @return true if the part/tile isActive
|
|
||||||
*/
|
|
||||||
boolean isActive();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,25 +23,21 @@
|
||||||
|
|
||||||
package appeng.api.implementations;
|
package appeng.api.implementations;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.config.Upgrades;
|
import appeng.api.config.Upgrades;
|
||||||
import appeng.api.implementations.tiles.ISegmentedInventory;
|
import appeng.api.implementations.tiles.ISegmentedInventory;
|
||||||
import appeng.api.util.IConfigurableObject;
|
import appeng.api.util.IConfigurableObject;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
|
||||||
|
public interface IUpgradeableHost extends IConfigurableObject, ISegmentedInventory {
|
||||||
|
/**
|
||||||
|
* determine how many of an upgrade are installed.
|
||||||
|
*/
|
||||||
|
int getInstalledUpgrades(Upgrades u);
|
||||||
|
|
||||||
public interface IUpgradeableHost extends IConfigurableObject, ISegmentedInventory
|
/**
|
||||||
{
|
* the tile...
|
||||||
|
*
|
||||||
/**
|
* @return tile entity
|
||||||
* determine how many of an upgrade are installed.
|
*/
|
||||||
*/
|
TileEntity getTile();
|
||||||
int getInstalledUpgrades( Upgrades u );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* the tile...
|
|
||||||
*
|
|
||||||
* @return tile entity
|
|
||||||
*/
|
|
||||||
TileEntity getTile();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,19 +23,16 @@
|
||||||
|
|
||||||
package appeng.api.implementations;
|
package appeng.api.implementations;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines the result of performing a transition from the world into a storage
|
* Defines the result of performing a transition from the world into a storage
|
||||||
* cell, if its possible, and what the energy usage is.
|
* cell, if its possible, and what the energy usage is.
|
||||||
*/
|
*/
|
||||||
public class TransitionResult
|
public class TransitionResult {
|
||||||
{
|
public final boolean success;
|
||||||
public final boolean success;
|
public final double energyUsage;
|
||||||
public final double energyUsage;
|
|
||||||
|
|
||||||
public TransitionResult( final boolean _success, final double power )
|
public TransitionResult(final boolean _success, final double power) {
|
||||||
{
|
this.success = _success;
|
||||||
this.success = _success;
|
this.energyUsage = power;
|
||||||
this.energyUsage = power;
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,17 +23,13 @@
|
||||||
|
|
||||||
package appeng.api.implementations.guiobjects;
|
package appeng.api.implementations.guiobjects;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implemented on Item objects, to return objects used to manage, and interact
|
* Implemented on Item objects, to return objects used to manage, and interact
|
||||||
* with the contents.
|
* with the contents.
|
||||||
*/
|
*/
|
||||||
public interface IGuiItem
|
public interface IGuiItem {
|
||||||
{
|
IGuiItemObject getGuiObject(ItemStack is, World world, int x, int y, int z);
|
||||||
|
|
||||||
IGuiItemObject getGuiObject( ItemStack is, World world, int x, int y, int z );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,12 +23,8 @@
|
||||||
|
|
||||||
package appeng.api.implementations.guiobjects;
|
package appeng.api.implementations.guiobjects;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
public interface IGuiItemObject {
|
||||||
public interface IGuiItemObject
|
ItemStack getItemStack();
|
||||||
{
|
|
||||||
|
|
||||||
ItemStack getItemStack();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,16 +23,12 @@
|
||||||
|
|
||||||
package appeng.api.implementations.guiobjects;
|
package appeng.api.implementations.guiobjects;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.networking.IGridHost;
|
import appeng.api.networking.IGridHost;
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Obtained via {@link IGuiItem} getGuiObject
|
* Obtained via {@link IGuiItem} getGuiObject
|
||||||
*/
|
*/
|
||||||
public interface INetworkTool extends IInventory, IGuiItemObject
|
public interface INetworkTool extends IInventory, IGuiItemObject {
|
||||||
{
|
IGridHost getGridHost(); // null for most purposes.
|
||||||
|
|
||||||
IGridHost getGridHost(); // null for most purposes.
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,17 +23,13 @@
|
||||||
|
|
||||||
package appeng.api.implementations.guiobjects;
|
package appeng.api.implementations.guiobjects;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.networking.energy.IEnergySource;
|
import appeng.api.networking.energy.IEnergySource;
|
||||||
import appeng.api.storage.IMEMonitor;
|
import appeng.api.storage.IMEMonitor;
|
||||||
import appeng.api.storage.ITerminalHost;
|
import appeng.api.storage.ITerminalHost;
|
||||||
import appeng.api.storage.data.IAEItemStack;
|
import appeng.api.storage.data.IAEItemStack;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Obtained via {@link IGuiItem} getGuiObject
|
* Obtained via {@link IGuiItem} getGuiObject
|
||||||
*/
|
*/
|
||||||
public interface IPortableCell extends ITerminalHost, IMEMonitor<IAEItemStack>, IEnergySource, IGuiItemObject
|
public interface IPortableCell
|
||||||
{
|
extends ITerminalHost, IMEMonitor<IAEItemStack>, IEnergySource, IGuiItemObject {}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
@ -23,50 +23,46 @@
|
||||||
|
|
||||||
package appeng.api.implementations.items;
|
package appeng.api.implementations.items;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.config.AccessRestriction;
|
import appeng.api.config.AccessRestriction;
|
||||||
import appeng.api.networking.energy.IAEPowerStorage;
|
import appeng.api.networking.energy.IAEPowerStorage;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Basically the same as {@link IAEPowerStorage}, but for items.
|
* Basically the same as {@link IAEPowerStorage}, but for items.
|
||||||
*/
|
*/
|
||||||
public interface IAEItemPowerStorage
|
public interface IAEItemPowerStorage {
|
||||||
{
|
/**
|
||||||
|
* Inject amt, power into the device, it will store what it can, and return
|
||||||
|
* the amount unable to be stored.
|
||||||
|
*
|
||||||
|
* @return amount unable to be stored
|
||||||
|
*/
|
||||||
|
double injectAEPower(ItemStack is, double amt);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Inject amt, power into the device, it will store what it can, and return
|
* Attempt to extract power from the device, it will extract what it can and
|
||||||
* the amount unable to be stored.
|
* return it.
|
||||||
*
|
*
|
||||||
* @return amount unable to be stored
|
* @param amt to be extracted power from device
|
||||||
*/
|
* @return what it could extract
|
||||||
double injectAEPower( ItemStack is, double amt );
|
*/
|
||||||
|
double extractAEPower(ItemStack is, double amt);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attempt to extract power from the device, it will extract what it can and
|
* @return the current maximum power ( this can change :P )
|
||||||
* return it.
|
*/
|
||||||
*
|
double getAEMaxPower(ItemStack is);
|
||||||
* @param amt to be extracted power from device
|
|
||||||
* @return what it could extract
|
|
||||||
*/
|
|
||||||
double extractAEPower( ItemStack is, double amt );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the current maximum power ( this can change :P )
|
* @return the current AE Power Level, this may exceed getMEMaxPower()
|
||||||
*/
|
*/
|
||||||
double getAEMaxPower( ItemStack is );
|
double getAECurrentPower(ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the current AE Power Level, this may exceed getMEMaxPower()
|
* Control the power flow by telling what the network can do, either add? or
|
||||||
*/
|
* subtract? or both!
|
||||||
double getAECurrentPower( ItemStack is );
|
*
|
||||||
|
* @return access restriction of network
|
||||||
/**
|
*/
|
||||||
* Control the power flow by telling what the network can do, either add? or
|
AccessRestriction getPowerFlow(ItemStack is);
|
||||||
* subtract? or both!
|
|
||||||
*
|
|
||||||
* @return access restriction of network
|
|
||||||
*/
|
|
||||||
AccessRestriction getPowerFlow( ItemStack is );
|
|
||||||
}
|
}
|
|
@ -23,26 +23,22 @@
|
||||||
|
|
||||||
package appeng.api.implementations.items;
|
package appeng.api.implementations.items;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implemented on AE's wrench(s) as a substitute for if BC's API is not
|
* Implemented on AE's wrench(s) as a substitute for if BC's API is not
|
||||||
* available.
|
* available.
|
||||||
*/
|
*/
|
||||||
public interface IAEWrench
|
public interface IAEWrench {
|
||||||
{
|
/**
|
||||||
|
* Check if the wrench can be used.
|
||||||
/**
|
*
|
||||||
* Check if the wrench can be used.
|
* @param player wrenching player
|
||||||
*
|
* @param x x pos of wrenched block
|
||||||
* @param player wrenching player
|
* @param y y pos of wrenched block
|
||||||
* @param x x pos of wrenched block
|
* @param z z pos of wrenched block
|
||||||
* @param y y pos of wrenched block
|
* @return true if wrench can be used
|
||||||
* @param z z pos of wrenched block
|
*/
|
||||||
* @return true if wrench can be used
|
boolean canWrench(ItemStack wrench, EntityPlayer player, int x, int y, int z);
|
||||||
*/
|
|
||||||
boolean canWrench( ItemStack wrench, EntityPlayer player, int x, int y, int z );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
|
|
||||||
package appeng.api.implementations.items;
|
package appeng.api.implementations.items;
|
||||||
|
|
||||||
|
import java.util.EnumSet;
|
||||||
|
|
||||||
import appeng.api.config.SecurityPermissions;
|
import appeng.api.config.SecurityPermissions;
|
||||||
import appeng.api.features.IPlayerRegistry;
|
import appeng.api.features.IPlayerRegistry;
|
||||||
|
@ -30,58 +31,54 @@ import appeng.api.networking.security.ISecurityRegistry;
|
||||||
import com.mojang.authlib.GameProfile;
|
import com.mojang.authlib.GameProfile;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import java.util.EnumSet;
|
public interface IBiometricCard {
|
||||||
|
/**
|
||||||
|
* Set the {@link GameProfile} to null, to clear it.
|
||||||
|
*/
|
||||||
|
void setProfile(ItemStack itemStack, GameProfile username);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return {@link GameProfile} of the player encoded on this card, or a blank string.
|
||||||
|
*/
|
||||||
|
GameProfile getProfile(ItemStack is);
|
||||||
|
|
||||||
public interface IBiometricCard
|
/**
|
||||||
{
|
* @param itemStack card
|
||||||
|
* @return the full list of permissions encoded on the card.
|
||||||
|
*/
|
||||||
|
EnumSet<SecurityPermissions> getPermissions(ItemStack itemStack);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the {@link GameProfile} to null, to clear it.
|
* Check if a permission is encoded on the card.
|
||||||
*/
|
*
|
||||||
void setProfile( ItemStack itemStack, GameProfile username );
|
* @param permission card
|
||||||
|
* @return true if this permission is set on the card.
|
||||||
|
*/
|
||||||
|
boolean hasPermission(ItemStack is, SecurityPermissions permission);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@link GameProfile} of the player encoded on this card, or a blank string.
|
* remove a permission from the item stack.
|
||||||
*/
|
*
|
||||||
GameProfile getProfile( ItemStack is );
|
* @param itemStack card
|
||||||
|
* @param permission to be removed permission
|
||||||
|
*/
|
||||||
|
void removePermission(ItemStack itemStack, SecurityPermissions permission);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param itemStack card
|
* add a permission to the item stack.
|
||||||
* @return the full list of permissions encoded on the card.
|
*
|
||||||
*/
|
* @param itemStack card
|
||||||
EnumSet<SecurityPermissions> getPermissions( ItemStack itemStack );
|
* @param permission to be added permission
|
||||||
|
*/
|
||||||
|
void addPermission(ItemStack itemStack, SecurityPermissions permission);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a permission is encoded on the card.
|
* lets you handle submission of security values on the card for custom behavior.
|
||||||
*
|
*
|
||||||
* @param permission card
|
* @param registry security registry
|
||||||
* @return true if this permission is set on the card.
|
* @param pr player registry
|
||||||
*/
|
* @param is card
|
||||||
boolean hasPermission( ItemStack is, SecurityPermissions permission );
|
*/
|
||||||
|
void
|
||||||
/**
|
registerPermissions(ISecurityRegistry registry, IPlayerRegistry pr, ItemStack is);
|
||||||
* remove a permission from the item stack.
|
|
||||||
*
|
|
||||||
* @param itemStack card
|
|
||||||
* @param permission to be removed permission
|
|
||||||
*/
|
|
||||||
void removePermission( ItemStack itemStack, SecurityPermissions permission );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* add a permission to the item stack.
|
|
||||||
*
|
|
||||||
* @param itemStack card
|
|
||||||
* @param permission to be added permission
|
|
||||||
*/
|
|
||||||
void addPermission( ItemStack itemStack, SecurityPermissions permission );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* lets you handle submission of security values on the card for custom behavior.
|
|
||||||
*
|
|
||||||
* @param registry security registry
|
|
||||||
* @param pr player registry
|
|
||||||
* @param is card
|
|
||||||
*/
|
|
||||||
void registerPermissions( ISecurityRegistry registry, IPlayerRegistry pr, ItemStack is );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,16 +23,12 @@
|
||||||
|
|
||||||
package appeng.api.implementations.items;
|
package appeng.api.implementations.items;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
public interface IGrowableCrystal {
|
||||||
|
ItemStack triggerGrowth(ItemStack is);
|
||||||
|
|
||||||
public interface IGrowableCrystal
|
float getMultiplier(Block blk, Material mat);
|
||||||
{
|
|
||||||
|
|
||||||
ItemStack triggerGrowth( ItemStack is );
|
|
||||||
|
|
||||||
float getMultiplier( Block blk, Material mat );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,23 +23,19 @@
|
||||||
|
|
||||||
package appeng.api.implementations.items;
|
package appeng.api.implementations.items;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lets you specify the name of the group of items this falls under.
|
* Lets you specify the name of the group of items this falls under.
|
||||||
*/
|
*/
|
||||||
public interface IItemGroup
|
public interface IItemGroup {
|
||||||
{
|
/**
|
||||||
|
* returning null, is the same as not implementing the interface at all.
|
||||||
/**
|
*
|
||||||
* returning null, is the same as not implementing the interface at all.
|
* @param is item
|
||||||
*
|
* @return an unlocalized string to use for the items group name.
|
||||||
* @param is item
|
*/
|
||||||
* @return an unlocalized string to use for the items group name.
|
String getUnlocalizedGroupName(Set<ItemStack> otherItems, ItemStack is);
|
||||||
*/
|
|
||||||
String getUnlocalizedGroupName( Set<ItemStack> otherItems, ItemStack is );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,54 +23,50 @@
|
||||||
|
|
||||||
package appeng.api.implementations.items;
|
package appeng.api.implementations.items;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Memory Card API
|
* Memory Card API
|
||||||
* <p>
|
* <p>
|
||||||
* AE's Memory Card Item Class implements this interface.
|
* AE's Memory Card Item Class implements this interface.
|
||||||
*/
|
*/
|
||||||
public interface IMemoryCard
|
public interface IMemoryCard {
|
||||||
{
|
/**
|
||||||
|
* Configures the data stored on the memory card, the SettingsName, will be
|
||||||
|
* localized when displayed.
|
||||||
|
*
|
||||||
|
* @param is item
|
||||||
|
* @param SettingsName unlocalized string that represents the tile entity.
|
||||||
|
* @param data may contain a String called "tooltip" which is is a
|
||||||
|
* unlocalized string displayed after the settings name, optional
|
||||||
|
* but can be used to add details to the card for later.
|
||||||
|
*/
|
||||||
|
void setMemoryCardContents(ItemStack is, String SettingsName, NBTTagCompound data);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configures the data stored on the memory card, the SettingsName, will be
|
* returns the settings name provided by a previous call to
|
||||||
* localized when displayed.
|
* setMemoryCardContents, or "AppEng.GuiITooltip.Blank" if there was no
|
||||||
*
|
* previous call to setMemoryCardContents.
|
||||||
* @param is item
|
*
|
||||||
* @param SettingsName unlocalized string that represents the tile entity.
|
* @param is item
|
||||||
* @param data may contain a String called "tooltip" which is is a
|
* @return setting name
|
||||||
* unlocalized string displayed after the settings name, optional
|
*/
|
||||||
* but can be used to add details to the card for later.
|
String getSettingsName(ItemStack is);
|
||||||
*/
|
|
||||||
void setMemoryCardContents( ItemStack is, String SettingsName, NBTTagCompound data );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* returns the settings name provided by a previous call to
|
* @param is item
|
||||||
* setMemoryCardContents, or "AppEng.GuiITooltip.Blank" if there was no
|
* @return the NBT Data previously saved by setMemoryCardContents, or an
|
||||||
* previous call to setMemoryCardContents.
|
* empty NBTCompound
|
||||||
*
|
*/
|
||||||
* @param is item
|
NBTTagCompound getData(ItemStack is);
|
||||||
* @return setting name
|
|
||||||
*/
|
|
||||||
String getSettingsName( ItemStack is );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param is item
|
* notify the user of a outcome related to the memory card.
|
||||||
* @return the NBT Data previously saved by setMemoryCardContents, or an
|
*
|
||||||
* empty NBTCompound
|
* @param player that used the card.
|
||||||
*/
|
* @param msg which message to send.
|
||||||
NBTTagCompound getData( ItemStack is );
|
*/
|
||||||
|
void notifyUser(EntityPlayer player, MemoryCardMessages msg);
|
||||||
/**
|
|
||||||
* notify the user of a outcome related to the memory card.
|
|
||||||
*
|
|
||||||
* @param player that used the card.
|
|
||||||
* @param msg which message to send.
|
|
||||||
*/
|
|
||||||
void notifyUser( EntityPlayer player, MemoryCardMessages msg );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,71 +23,69 @@
|
||||||
|
|
||||||
package appeng.api.implementations.items;
|
package appeng.api.implementations.items;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.implementations.TransitionResult;
|
import appeng.api.implementations.TransitionResult;
|
||||||
import appeng.api.util.WorldCoord;
|
import appeng.api.util.WorldCoord;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implemented on a {@link Item}
|
* Implemented on a {@link Item}
|
||||||
*/
|
*/
|
||||||
public interface ISpatialStorageCell
|
public interface ISpatialStorageCell {
|
||||||
{
|
/**
|
||||||
|
* @param is spatial storage cell
|
||||||
|
* @return true if this item is a spatial storage cell
|
||||||
|
*/
|
||||||
|
boolean isSpatialStorage(ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param is spatial storage cell
|
* @param is spatial storage cell
|
||||||
* @return true if this item is a spatial storage cell
|
* @return the maximum size of the spatial storage cell along any given axis
|
||||||
*/
|
*/
|
||||||
boolean isSpatialStorage( ItemStack is );
|
int getMaxStoredDim(ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param is spatial storage cell
|
* @param is spatial storage cell
|
||||||
* @return the maximum size of the spatial storage cell along any given axis
|
* @return the world for this cell
|
||||||
*/
|
*/
|
||||||
int getMaxStoredDim( ItemStack is );
|
World getWorld(ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param is spatial storage cell
|
* get the currently stored size.
|
||||||
* @return the world for this cell
|
*
|
||||||
*/
|
* @param is spatial storage cell
|
||||||
World getWorld( ItemStack is );
|
* @return size of spatial
|
||||||
|
*/
|
||||||
|
WorldCoord getStoredSize(ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get the currently stored size.
|
* Minimum coordinates in its world for the storage cell.
|
||||||
*
|
*
|
||||||
* @param is spatial storage cell
|
* @param is spatial storage cell
|
||||||
* @return size of spatial
|
* @return minimum coordinate of dimension
|
||||||
*/
|
*/
|
||||||
WorldCoord getStoredSize( ItemStack is );
|
WorldCoord getMin(ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Minimum coordinates in its world for the storage cell.
|
* Maximum coordinates in its world for the storage cell.
|
||||||
*
|
*
|
||||||
* @param is spatial storage cell
|
* @param is spatial storage cell
|
||||||
* @return minimum coordinate of dimension
|
* @return maximum coordinate of dimension
|
||||||
*/
|
*/
|
||||||
WorldCoord getMin( ItemStack is );
|
WorldCoord getMax(ItemStack is);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maximum coordinates in its world for the storage cell.
|
* Perform a spatial swap with the contents of the cell, and the world.
|
||||||
*
|
*
|
||||||
* @param is spatial storage cell
|
* @param is spatial storage cell
|
||||||
* @return maximum coordinate of dimension
|
* @param w world of spatial
|
||||||
*/
|
* @param min min coord
|
||||||
WorldCoord getMax( ItemStack is );
|
* @param max max coord
|
||||||
|
* @param doTransition transition
|
||||||
/**
|
* @return result of transition
|
||||||
* Perform a spatial swap with the contents of the cell, and the world.
|
*/
|
||||||
*
|
TransitionResult doSpatialTransition(
|
||||||
* @param is spatial storage cell
|
ItemStack is, World w, WorldCoord min, WorldCoord max, boolean doTransition
|
||||||
* @param w world of spatial
|
);
|
||||||
* @param min min coord
|
|
||||||
* @param max max coord
|
|
||||||
* @param doTransition transition
|
|
||||||
* @return result of transition
|
|
||||||
*/
|
|
||||||
TransitionResult doSpatialTransition( ItemStack is, World w, WorldCoord min, WorldCoord max, boolean doTransition );
|
|
||||||
}
|
}
|
|
@ -23,12 +23,10 @@
|
||||||
|
|
||||||
package appeng.api.implementations.items;
|
package appeng.api.implementations.items;
|
||||||
|
|
||||||
|
|
||||||
import appeng.api.storage.ICellWorkbenchItem;
|
import appeng.api.storage.ICellWorkbenchItem;
|
||||||
import appeng.api.storage.data.IAEItemStack;
|
import appeng.api.storage.data.IAEItemStack;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Any item which implements this can be treated as an IMEInventory via
|
* Any item which implements this can be treated as an IMEInventory via
|
||||||
* Util.getCell / Util.isCell It automatically handles the internals and NBT
|
* Util.getCell / Util.isCell It automatically handles the internals and NBT
|
||||||
|
@ -39,78 +37,76 @@ import net.minecraft.item.ItemStack;
|
||||||
* <p>
|
* <p>
|
||||||
* The standard AE implementation only provides 1-63 Types
|
* The standard AE implementation only provides 1-63 Types
|
||||||
*/
|
*/
|
||||||
public interface IStorageCell extends ICellWorkbenchItem
|
public interface IStorageCell extends ICellWorkbenchItem {
|
||||||
{
|
/**
|
||||||
|
* It wont work if the return is not a multiple of 8.
|
||||||
|
* The limit is ({@link Integer#MAX_VALUE} + 1) / 8.
|
||||||
|
*
|
||||||
|
* @param cellItem item
|
||||||
|
* @return number of bytes
|
||||||
|
*/
|
||||||
|
int getBytes(ItemStack cellItem);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* It wont work if the return is not a multiple of 8.
|
* Determines the number of bytes used for any type included on the cell.
|
||||||
* The limit is ({@link Integer#MAX_VALUE} + 1) / 8.
|
*
|
||||||
*
|
* @param cellItem item
|
||||||
* @param cellItem item
|
* @return number of bytes
|
||||||
* @return number of bytes
|
* @deprecated use {@link IStorageCell#getBytesPerType(ItemStack)}
|
||||||
*/
|
*/
|
||||||
int getBytes( ItemStack cellItem );
|
@Deprecated
|
||||||
|
int BytePerType(ItemStack cellItem);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines the number of bytes used for any type included on the cell.
|
* Determines the number of bytes used for any type included on the cell.
|
||||||
*
|
*
|
||||||
* @param cellItem item
|
* @param cellItem item
|
||||||
* @return number of bytes
|
* @return number of bytes
|
||||||
* @deprecated use {@link IStorageCell#getBytesPerType(ItemStack)}
|
*/
|
||||||
*/
|
int getBytesPerType(ItemStack cellItem);
|
||||||
@Deprecated
|
|
||||||
int BytePerType( ItemStack cellItem );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines the number of bytes used for any type included on the cell.
|
* Must be between 1 and 63, indicates how many types you want to store on
|
||||||
*
|
* the item.
|
||||||
* @param cellItem item
|
*
|
||||||
* @return number of bytes
|
* @param cellItem item
|
||||||
*/
|
* @return number of types
|
||||||
int getBytesPerType( ItemStack cellItem );
|
*/
|
||||||
|
int getTotalTypes(ItemStack cellItem);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Must be between 1 and 63, indicates how many types you want to store on
|
* Allows you to fine tune which items are allowed on a given cell, if you
|
||||||
* the item.
|
* don't care, just return false; As the handler for this type of cell is
|
||||||
*
|
* still the default cells, the normal AE black list is also applied.
|
||||||
* @param cellItem item
|
*
|
||||||
* @return number of types
|
* @param cellItem item
|
||||||
*/
|
* @param requestedAddition requested addition
|
||||||
int getTotalTypes( ItemStack cellItem );
|
* @return true to preventAdditionOfItem
|
||||||
|
*/
|
||||||
|
boolean isBlackListed(ItemStack cellItem, IAEItemStack requestedAddition);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allows you to fine tune which items are allowed on a given cell, if you
|
* Allows you to specify if this storage cell can be stored inside other
|
||||||
* don't care, just return false; As the handler for this type of cell is
|
* storage cells, only set this for special items like the matter cannon
|
||||||
* still the default cells, the normal AE black list is also applied.
|
* that are not general purpose storage.
|
||||||
*
|
*
|
||||||
* @param cellItem item
|
* @return true if the storage cell can be stored inside other storage
|
||||||
* @param requestedAddition requested addition
|
* cells, this is generally false, except for certain situations
|
||||||
* @return true to preventAdditionOfItem
|
* such as the matter cannon.
|
||||||
*/
|
*/
|
||||||
boolean isBlackListed( ItemStack cellItem, IAEItemStack requestedAddition );
|
boolean storableInStorageCell();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allows you to specify if this storage cell can be stored inside other
|
* Allows an item to selectively enable or disable its status as a storage
|
||||||
* storage cells, only set this for special items like the matter cannon
|
* cell.
|
||||||
* that are not general purpose storage.
|
*
|
||||||
*
|
* @param i item
|
||||||
* @return true if the storage cell can be stored inside other storage
|
* @return if the ItemStack should behavior as a storage cell.
|
||||||
* cells, this is generally false, except for certain situations
|
*/
|
||||||
* such as the matter cannon.
|
boolean isStorageCell(ItemStack i);
|
||||||
*/
|
|
||||||
boolean storableInStorageCell();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allows an item to selectively enable or disable its status as a storage
|
* @return drain in ae/t this storage cell will use.
|
||||||
* cell.
|
*/
|
||||||
*
|
double getIdleDrain();
|
||||||
* @param i item
|
|
||||||
* @return if the ItemStack should behavior as a storage cell.
|
|
||||||
*/
|
|
||||||
boolean isStorageCell( ItemStack i );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return drain in ae/t this storage cell will use.
|
|
||||||
*/
|
|
||||||
double getIdleDrain();
|
|
||||||
}
|
}
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue