upstream/Applied-Energistics-2-Unofficial
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git synced 2026-10-25 20:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dep (#302)

Browse Source 
* update dep files

* update bs

* sa
This commit is contained in:
Martin Robertz authored and GitHub committed 2023-04-27 21:35:27 +02:00
1 parent 94ba73f3f7
commit f803769490
158 files changed
+396 -512
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.gradle
+34 -106
View File
@@ -1,4 +1,4 @@
//version: 1680120787
//version: 1682616243
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -6,29 +6,25 @@
*/
import com.diffplug.blowdryer.Blowdryer
import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute
import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar
import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask
import com.gtnewhorizons.retrofuturagradle.util.Distribution
import com.matthewprenger.cursegradle.CurseArtifact
import com.matthewprenger.cursegradle.CurseRelation
import com.modrinth.minotaur.dependencies.ModDependency
import com.modrinth.minotaur.dependencies.VersionDependency
import cpw.mods.fml.relauncher.Side
import org.gradle.api.tasks.options.Option;
import org.gradle.internal.logging.text.StyledTextOutput.Style
import org.gradle.internal.logging.text.StyledTextOutputFactory
import org.gradle.internal.xml.XmlTransformer
import org.jetbrains.gradle.ext.*
import org.jetbrains.gradle.ext.Application
import org.jetbrains.gradle.ext.Gradle
import javax.inject.Inject
import java.nio.file.Files
import java.nio.file.Paths
import java.util.concurrent.TimeUnit
import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream
import javax.inject.Inject
buildscript {
repositories {
@@ -66,21 +62,22 @@ plugins {
id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false
id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false
id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version
id 'de.undercouch.download' version '5.3.0'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id 'com.palantir.git-version' version '3.0.0' apply false
id 'de.undercouch.download' version '5.4.0'
id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle
id 'com.diffplug.spotless' version '6.7.2' apply false
id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
id 'com.modrinth.minotaur' version '2.+' apply false
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
id 'com.gtnewhorizons.retrofuturagradle' version '1.2.4'
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7'
}
boolean settingsupdated = verifySettingsGradle()
settingsupdated = verifyGitAttributes() || settingsupdated
if (settingsupdated)
throw new GradleException("Settings has been updated, please re-run task.")
if (project.file('.git/HEAD').isFile()) {
// In submodules, .git is a file pointing to the real git dir
if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) {
apply plugin: 'com.palantir.git-version'
}
@@ -132,7 +129,7 @@ propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new
// this is meant to be set using the user wide property file. by default we do nothing.
propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea"
project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts
project.extensions.add(com.diffplug.blowdryer.Blowdryer, "Blowdryer", com.diffplug.blowdryer.Blowdryer) // Make blowdryer available in "apply from:" scripts
if (!disableSpotless) {
apply plugin: 'com.diffplug.spotless'
apply from: Blowdryer.file('spotless.gradle')
@@ -201,6 +198,14 @@ configurations {
canBeConsumed = false
canBeResolved = false
}
create("devOnlyNonPublishable") {
description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)"
canBeConsumed = false
canBeResolved = false
}
compileOnly.extendsFrom(devOnlyNonPublishable)
runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable)
}
if (enableModernJavaSyntax.toBoolean()) {
@@ -399,7 +404,7 @@ minecraft {
username = developmentEnvironmentUserName.toString()
lwjgl3Version = "3.3.2-SNAPSHOT"
lwjgl3Version = "3.3.2"
// Enable assertions in the current mod
extraRunJvmArguments.add("-ea:${modGroup}")
@@ -713,13 +718,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
}
dependencies {
def lwjgl3ifyVersion = '1.3.3'
def lwjgl3ifyVersion = '1.3.5'
def asmVersion = '9.4'
if (modId != 'lwjgl3ify') {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.4')
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8')
}
java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
@@ -793,7 +798,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
public boolean setEnableHotswap(boolean enable) { enableHotswap = enable }
@Inject
public RunHotswappableMinecraftTask(Side side, String superTask, org.gradle.api.invocation.Gradle gradle) {
public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) {
super(side, gradle)
this.lwjglVersion = 3
@@ -802,7 +807,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : []))
this.classpath(project.java17PatchDependenciesCfg)
if (side == Side.CLIENT) {
if (side == Distribution.CLIENT) {
this.classpath(project.minecraftTasks.lwjgl3Configuration)
}
// Use a raw provider instead of map to not create a dependency on the task
@@ -814,7 +819,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
}
}
def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient")
def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient")
runClient17Task.configure {
setup(project)
group = "Modded Minecraft"
@@ -825,7 +830,7 @@ runClient17Task.configure {
userUUID = minecraft.userUUID
}
def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Side.SERVER, "runServer")
def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer")
runServer17Task.configure {
setup(project)
group = "Modded Minecraft"
@@ -866,11 +871,6 @@ tasks.named("jar", Jar).configure {
}
if (usesShadowedDependencies.toBoolean()) {
tasks.register('relocateShadowJar', ConfigureShadowRelocation) {
target = tasks.shadowJar
prefix = modGroup + ".shadow"
enabled = relocateShadowedDependencies.toBoolean()
}
tasks.named("shadowJar", ShadowJar).configure {
manifest {
attributes(getManifestAttributes())
@@ -886,7 +886,8 @@ if (usesShadowedDependencies.toBoolean()) {
]
archiveClassifier.set('dev')
if (relocateShadowedDependencies.toBoolean()) {
dependsOn(relocateShadowJar)
relocationPrefix = modGroup + ".shadow"
enableRelocation = true
}
}
configurations.runtimeElements.outgoing.artifacts.clear()
@@ -1219,7 +1220,7 @@ def addCurseForgeRelation(String type, String name) {
// Updating
def buildscriptGradleVersion = "8.0.2"
def buildscriptGradleVersion = "8.1.1"
tasks.named('wrapper', Wrapper).configure {
gradleVersion = buildscriptGradleVersion
@@ -1388,7 +1389,7 @@ static int replaceParams(File file, Map<String, String> params) {
return 0
}
// Dependency Deobfuscation
// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle)
def deobf(String sourceURL) {
try {
@@ -1430,11 +1431,7 @@ def deobfMaven(String repoURL, String mavenDep) {
}
def deobfCurse(String curseDep) {
try {
return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep")
} catch (Exception ignored) {
out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.")
}
return dependencies.rfg.deobf("curse.maven:$curseDep")
}
// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
@@ -1442,34 +1439,7 @@ def deobf(String sourceURL, String rawFileName) {
String bon2Version = "2.5.1"
String fileName = URLDecoder.decode(rawFileName, "UTF-8")
String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
String bon2Dir = "$cacheDir/forge_gradle/deobf"
String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
if (file(deobfFile).exists()) {
return files(deobfFile)
}
String mappingsVer
String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
if (remoteMappings) {
String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
zipMappings(mappingsZIP, remoteMappings, bon2Dir)
mappingsVer = "snapshot_$id"
} else {
mappingsVer = "${channel}_$mappingsVersion"
}
download.run {
src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
dest bon2File
quiet true
overwrite false
}
download.run {
src sourceURL
@@ -1477,50 +1447,8 @@ def deobf(String sourceURL, String rawFileName) {
quiet true
overwrite false
}
exec {
commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
workingDir bon2Dir
standardOutput = new FileOutputStream("${deobfFile}.log")
}
return files(deobfFile)
return dependencies.rfg.deobf(files(obfFile))
}
def zipMappings(String zipPath, String url, String bon2Dir) {
File zipFile = new File(zipPath)
if (zipFile.exists()) {
return
}
String fieldsCache = "$bon2Dir/data/fields.csv"
String methodsCache = "$bon2Dir/data/methods.csv"
download.run {
src "${url}fields.csv"
dest fieldsCache
quiet true
}
download.run {
src "${url}methods.csv"
dest methodsCache
quiet true
}
zipFile.getParentFile().mkdirs()
ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
zos.putNextEntry(new ZipEntry("fields.csv"))
Files.copy(Paths.get(fieldsCache), zos)
zos.closeEntry()
zos.putNextEntry(new ZipEntry("methods.csv"))
Files.copy(Paths.get(methodsCache), zos)
zos.closeEntry()
zos.close()
}
// Helper methods
def checkPropertyExists(String propertyName) {
dependencies.gradle
+12 -12
View File
@@ -1,16 +1,16 @@
// Add your dependencies here
dependencies {
implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.39-GTNH:dev')
implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev')
implementation('curse.maven:cofh-core-69162:2388751')
implementation('com.github.GTNewHorizons:BuildCraft:7.1.28:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.2.8:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.02:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Jabba:1.2.21:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.5.15:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.32-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:waila:1.5.21:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Railcraft:9.13.10:api') {transitive = false}
implementation('com.github.GTNewHorizons:BuildCraft:7.1.33:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.3.3:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.82:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Jabba:1.2.22:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.5.16:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.2-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:waila:1.5.24:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Railcraft:9.14.1:api') {transitive = false}
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:api')
compileOnly('curse.maven:minefactory-reloaded-66672:2366150')
@@ -24,10 +24,10 @@ dependencies {
functionalTestImplementation('org.junit.platform:junit-platform-engine')
functionalTestImplementation('org.junit.platform:junit-platform-launcher')
functionalTestImplementation('org.junit.platform:junit-platform-reporting')
functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.02:dev') {
functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.82:dev') {
exclude module: "Applied-Energistics-2-Unofficial"
}
functionalTestCompileOnly('com.github.GTNewHorizons:ForestryMC:4.5.8:dev') {transitive = false} // for gt5 api usage
functionalTestCompileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.60:dev') {transitive = false} // for gt5 api usage
functionalTestCompileOnly('com.github.GTNewHorizons:ForestryMC:4.6.6:dev') {transitive = false} // for gt5 api usage
functionalTestCompileOnly('com.github.GTNewHorizons:EnderIO:2.4.11:dev') {transitive = false} // for gt5 api usage
functionalTestCompileOnly('com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev') {transitive = false} // for gt5 api usage
}
gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
src/main/java/appeng/api/config/Upgrades.java
+2 -2
View File
@@ -18,11 +18,11 @@ import java.util.Map;
import net.minecraft.item.ItemStack;
import com.google.common.base.Optional;
import appeng.api.definitions.IItemDefinition;
import appeng.api.util.AEItemDefinition;
import com.google.common.base.Optional;
public enum Upgrades {
/**
src/main/java/appeng/api/implementations/items/IBiometricCard.java
+2 -2
View File
@@ -17,12 +17,12 @@ import java.util.EnumSet;
import net.minecraft.item.ItemStack;
import com.mojang.authlib.GameProfile;
import appeng.api.config.SecurityPermissions;
import appeng.api.features.IPlayerRegistry;
import appeng.api.networking.security.ISecurityRegistry;
import com.mojang.authlib.GameProfile;
public interface IBiometricCard {
/**
src/main/java/appeng/api/networking/crafting/ICraftingGrid.java
+5 -5
View File
@@ -17,16 +17,16 @@ import java.util.concurrent.Future;
import net.minecraft.world.World;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridCache;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.data.IAEItemStack;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridCache;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.data.IAEItemStack;
public interface ICraftingGrid extends IGridCache {
/**
src/main/java/appeng/api/networking/crafting/ICraftingRequester.java
+2 -2
View File
@@ -13,12 +13,12 @@
package appeng.api.networking.crafting;
import com.google.common.collect.ImmutableSet;
import appeng.api.config.Actionable;
import appeng.api.networking.security.IActionHost;
import appeng.api.storage.data.IAEItemStack;
import com.google.common.collect.ImmutableSet;
public interface ICraftingRequester extends IActionHost {
/**
src/main/java/appeng/api/storage/MEMonitorHandler.java
+2 -2
View File
@@ -17,14 +17,14 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
import com.google.common.collect.ImmutableList;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import com.google.common.collect.ImmutableList;
/**
* Common implementation of a simple class that monitors injection/extraction of a inventory to send events to a list of
* listeners.
src/main/java/appeng/block/AEBaseBlock.java
+2 -3
View File
@@ -29,6 +29,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import com.google.common.base.Optional;
import appeng.api.util.IOrientable;
import appeng.api.util.IOrientableBlock;
import appeng.client.render.BaseBlockRender;
@@ -42,9 +44,6 @@ import appeng.helpers.ICustomCollision;
import appeng.tile.AEBaseTile;
import appeng.util.LookDirection;
import appeng.util.Platform;
import com.google.common.base.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/appeng/block/AEBaseStairBlock.java
+2 -2
View File
@@ -15,13 +15,13 @@ import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStairs;
import com.google.common.base.Optional;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.StairBlockFeatureHandler;
import com.google.common.base.Optional;
public abstract class AEBaseStairBlock extends BlockStairs implements IAEFeature {
private final IFeatureHandler features;
src/main/java/appeng/block/AEBaseTileBlock.java
+3 -3
View File
@@ -34,6 +34,9 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.event.world.BlockEvent;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import appeng.api.implementations.items.IMemoryCard;
import appeng.api.implementations.items.MemoryCardMessages;
import appeng.api.implementations.tiles.IColorableTile;
@@ -51,9 +54,6 @@ import appeng.tile.networking.TileCableBus;
import appeng.tile.storage.TileSkyChest;
import appeng.util.Platform;
import appeng.util.SettingsFrom;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import cpw.mods.fml.relauncher.ReflectionHelper;
public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, ITileEntityProvider {
src/main/java/appeng/block/networking/BlockCableBus.java
+2 -2
View File
@@ -32,8 +32,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection;
import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartHost;
import appeng.api.parts.PartItemStack;
@@ -64,6 +62,8 @@ import appeng.util.Platform;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection;
import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType;
@Interface(
iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection",
src/main/java/appeng/client/gui/AEBaseGui.java
+3 -3
View File
@@ -34,6 +34,9 @@ import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import com.google.common.base.Joiner;
import com.google.common.base.Stopwatch;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.gui.widgets.GuiScrollbar;
import appeng.client.gui.widgets.ITooltip;
@@ -57,9 +60,6 @@ import appeng.integration.IntegrationType;
import appeng.integration.abstraction.INEI;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
import com.google.common.base.Joiner;
import com.google.common.base.Stopwatch;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
public abstract class AEBaseGui extends GuiContainer {
src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
+2 -2
View File
@@ -20,6 +20,8 @@ import net.minecraft.item.ItemStack;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
import com.google.common.base.Joiner;
import appeng.api.AEApi;
import appeng.api.storage.ITerminalHost;
import appeng.api.storage.data.IAEItemStack;
@@ -45,8 +47,6 @@ import appeng.parts.reporting.PartTerminal;
import appeng.util.Platform;
import appeng.util.ReadableNumberConverter;
import com.google.common.base.Joiner;
public class GuiCraftConfirm extends AEBaseGui implements ICraftingCPUTableHolder {
public enum DisplayMode {
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
+2 -2
View File
@@ -27,6 +27,8 @@ import net.minecraft.util.ChatComponentTranslation;
import org.apache.commons.lang3.time.DurationFormatUtils;
import org.lwjgl.opengl.GL11;
import com.google.common.base.Joiner;
import appeng.api.AEApi;
import appeng.api.config.SortDir;
import appeng.api.config.SortOrder;
@@ -53,8 +55,6 @@ import appeng.core.sync.packets.PacketValueConfig;
import appeng.util.Platform;
import appeng.util.ReadableNumberConverter;
import com.google.common.base.Joiner;
public class GuiCraftingCPU extends AEBaseGui implements ISortSource {
private static final int GUI_HEIGHT = 184;
src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+2 -2
View File
@@ -23,6 +23,8 @@ import net.minecraft.world.World;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
import com.google.common.collect.HashMultimap;
import appeng.api.AEApi;
import appeng.api.config.ActionItems;
import appeng.api.config.Settings;
@@ -51,8 +53,6 @@ import appeng.integration.IntegrationType;
import appeng.parts.reporting.PartInterfaceTerminal;
import appeng.util.Platform;
import com.google.common.collect.HashMultimap;
public class GuiInterfaceTerminal extends AEBaseGui implements IDropToFillTextField {
private static final int MAGIC_HEIGHT_NUMBER = 52 + 99;
src/main/java/appeng/client/me/ItemRepo.java
+3 -3
View File
@@ -22,6 +22,9 @@ import javax.annotation.Nonnull;
import net.minecraft.item.ItemStack;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import appeng.api.AEApi;
import appeng.api.config.*;
import appeng.api.storage.data.IAEItemStack;
@@ -36,9 +39,6 @@ import appeng.util.Platform;
import appeng.util.item.OreHelper;
import appeng.util.item.OreReference;
import appeng.util.prioitylist.IPartitionList;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import cpw.mods.fml.relauncher.ReflectionHelper;
public class ItemRepo {
src/main/java/appeng/client/render/BusRenderHelper.java
+3 -4
View File
@@ -20,6 +20,9 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition;
import appeng.api.parts.IBoxProvider;
@@ -31,10 +34,6 @@ import appeng.block.networking.BlockCableBus;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.tile.AEBaseTile;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/appeng/client/render/items/ToolBiometricCardRender.java
+2 -2
View File
@@ -18,12 +18,12 @@ import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import com.mojang.authlib.GameProfile;
import appeng.api.implementations.items.IBiometricCard;
import appeng.api.util.AEColor;
import appeng.client.texture.ExtraItemTextures;
import com.mojang.authlib.GameProfile;
public class ToolBiometricCardRender implements IItemRenderer {
@Override
src/main/java/appeng/container/implementations/ContainerCPUTable.java
+2 -2
View File
@@ -7,6 +7,8 @@ import java.util.function.Predicate;
import net.minecraft.entity.player.EntityPlayerMP;
import com.google.common.collect.ImmutableSet;
import appeng.api.networking.IGrid;
import appeng.api.networking.crafting.ICraftingCPU;
import appeng.api.networking.crafting.ICraftingGrid;
@@ -18,8 +20,6 @@ import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketCraftingCPUsUpdate;
import appeng.util.Platform;
import com.google.common.collect.ImmutableSet;
public class ContainerCPUTable implements ICraftingCPUSelectorContainer {
private final AEBaseContainer parent;
src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java
+3 -3
View File
@@ -22,6 +22,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import appeng.api.config.Settings;
import appeng.api.config.Upgrades;
import appeng.api.config.YesNo;
@@ -47,9 +50,6 @@ import appeng.util.inv.AdaptorPlayerHand;
import appeng.util.inv.ItemSlot;
import appeng.util.inv.WrapperInvSlot;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
public final class ContainerInterfaceTerminal extends AEBaseContainer {
/**
src/main/java/appeng/core/AppEng.java
+2 -3
View File
@@ -17,6 +17,8 @@ import javax.annotation.Nonnull;
import net.minecraftforge.common.config.Configuration;
import com.google.common.base.Stopwatch;
import appeng.core.crash.CrashInfo;
import appeng.core.crash.IntegrationCrashEnhancement;
import appeng.core.crash.ModCrashEnhancement;
@@ -33,9 +35,6 @@ import appeng.services.export.ExportConfig;
import appeng.services.export.ExportProcess;
import appeng.services.export.ForgeExportConfig;
import appeng.util.Platform;
import com.google.common.base.Stopwatch;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
src/main/java/appeng/core/CreativeTabFacade.java
+2 -2
View File
@@ -15,11 +15,11 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.items.parts.ItemFacade;
import com.google.common.base.Optional;
public final class CreativeTabFacade extends CreativeTabs {
public static CreativeTabFacade instance = null;
src/main/java/appeng/core/RecipeLoader.java
+2 -2
View File
@@ -18,14 +18,14 @@ import javax.annotation.Nonnull;
import org.apache.commons.io.FileUtils;
import com.google.common.base.Preconditions;
import appeng.api.recipes.IRecipeHandler;
import appeng.recipes.CustomRecipeConfig;
import appeng.recipes.loader.ConfigLoader;
import appeng.recipes.loader.JarLoader;
import appeng.recipes.loader.RecipeResourceCopier;
import com.google.common.base.Preconditions;
/**
* handles the decision if recipes should be loaded from jar, loaded from file system or force copied from jar
*
src/main/java/appeng/core/Registration.java
+2 -3
View File
@@ -25,6 +25,8 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.RecipeSorter.Category;
import com.google.common.base.Preconditions;
import appeng.api.AEApi;
import appeng.api.IAppEngApi;
import appeng.api.config.Upgrades;
@@ -76,9 +78,6 @@ import appeng.tile.AEBaseTile;
import appeng.util.Platform;
import appeng.worldgen.MeteoriteWorldGen;
import appeng.worldgen.QuartzWorldGen;
import com.google.common.base.Preconditions;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
src/main/java/appeng/core/api/ApiPart.java
+2 -2
View File
@@ -31,6 +31,8 @@ import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode;
import com.google.common.base.Joiner;
import appeng.api.parts.CableRenderMode;
import appeng.api.parts.IPartHelper;
import appeng.api.parts.IPartItem;
@@ -45,8 +47,6 @@ import appeng.parts.PartPlacement;
import appeng.tile.networking.TileCableBus;
import appeng.util.Platform;
import com.google.common.base.Joiner;
public class ApiPart implements IPartHelper {
private final Map<String, Class> tileImplementations = new HashMap<String, Class>();
src/main/java/appeng/core/api/definitions/ApiBlocks.java
+2 -2
View File
@@ -13,6 +13,8 @@ package appeng.core.api.definitions;
import java.util.EnumSet;
import java.util.Set;
import com.google.common.collect.ImmutableSet;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.definitions.IBlocks;
import appeng.api.definitions.ITileDefinition;
@@ -41,8 +43,6 @@ import appeng.debug.BlockCubeGenerator;
import appeng.debug.BlockItemGen;
import appeng.debug.BlockPhantomNode;
import com.google.common.collect.ImmutableSet;
/**
* Internal implementation for the API blocks
*/
src/main/java/appeng/core/features/AEBlockFeatureHandler.java
+2 -2
View File
@@ -12,11 +12,11 @@ package appeng.core.features;
import java.util.EnumSet;
import com.google.common.base.Optional;
import appeng.api.definitions.IBlockDefinition;
import appeng.block.AEBaseBlock;
import appeng.core.CreativeTab;
import com.google.common.base.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
public final class AEBlockFeatureHandler implements IFeatureHandler {
src/main/java/appeng/core/features/AECableBusFeatureHandler.java
+2 -2
View File
@@ -14,14 +14,14 @@ import java.util.EnumSet;
import net.minecraft.tileentity.TileEntity;
import com.google.common.base.Optional;
import appeng.api.definitions.ITileDefinition;
import appeng.block.AEBaseTileBlock;
import appeng.block.networking.BlockCableBus;
import appeng.core.CommonHelper;
import appeng.core.CreativeTab;
import appeng.util.Platform;
import com.google.common.base.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
public final class AECableBusFeatureHandler implements IFeatureHandler {
src/main/java/appeng/core/features/AETileBlockFeatureHandler.java
+2 -2
View File
@@ -12,14 +12,14 @@ package appeng.core.features;
import java.util.EnumSet;
import com.google.common.base.Optional;
import appeng.api.definitions.ITileDefinition;
import appeng.block.AEBaseTileBlock;
import appeng.core.CommonHelper;
import appeng.core.CreativeTab;
import appeng.tile.AEBaseTile;
import appeng.util.Platform;
import com.google.common.base.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
public final class AETileBlockFeatureHandler implements IFeatureHandler {
src/main/java/appeng/core/features/BlockDefinition.java
+3 -3
View File
@@ -18,14 +18,14 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import appeng.api.definitions.IBlockDefinition;
import appeng.block.AEBaseBlock;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.ObjectArrays;
import appeng.api.definitions.IBlockDefinition;
import appeng.block.AEBaseBlock;
public class BlockDefinition extends ItemDefinition implements IBlockDefinition {
private static final ItemBlockTransformer ITEMBLOCK_TRANSFORMER = new ItemBlockTransformer();
src/main/java/appeng/core/features/DamagedItemDefinition.java
+2 -2
View File
@@ -16,12 +16,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import appeng.api.definitions.IItemDefinition;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import appeng.api.definitions.IItemDefinition;
public final class DamagedItemDefinition implements IItemDefinition {
private static final ItemTransformer ITEM_TRANSFORMER = new ItemTransformer();
src/main/java/appeng/core/features/ItemDefinition.java
+3 -3
View File
@@ -14,13 +14,13 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import appeng.api.definitions.IItemDefinition;
import appeng.util.Platform;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import appeng.api.definitions.IItemDefinition;
import appeng.util.Platform;
public class ItemDefinition implements IItemDefinition {
private final Optional<Item> item;
src/main/java/appeng/core/features/ItemFeatureHandler.java
+2 -2
View File
@@ -14,12 +14,12 @@ import java.util.EnumSet;
import net.minecraft.item.Item;
import com.google.common.base.Optional;
import appeng.api.definitions.IItemDefinition;
import appeng.core.CreativeTab;
import appeng.core.CreativeTabFacade;
import appeng.items.parts.ItemFacade;
import com.google.common.base.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
public final class ItemFeatureHandler implements IFeatureHandler {
src/main/java/appeng/core/features/MaterialStackSrc.java
+2 -2
View File
@@ -13,10 +13,10 @@ package appeng.core.features;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import appeng.items.materials.MaterialType;
import com.google.common.base.Preconditions;
import appeng.items.materials.MaterialType;
public class MaterialStackSrc implements IStackSrc {
private final MaterialType src;
src/main/java/appeng/core/features/SlabBlockFeatureHandler.java
+2 -2
View File
@@ -12,12 +12,12 @@ package appeng.core.features;
import java.util.EnumSet;
import com.google.common.base.Optional;
import appeng.api.definitions.IBlockDefinition;
import appeng.block.AEBaseItemBlockSlab;
import appeng.block.AEBaseSlabBlock;
import appeng.core.CreativeTab;
import com.google.common.base.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
public class SlabBlockFeatureHandler implements IFeatureHandler {
src/main/java/appeng/core/features/StairBlockFeatureHandler.java
+2 -2
View File
@@ -14,10 +14,10 @@ import java.util.EnumSet;
import net.minecraft.block.BlockStairs;
import com.google.common.base.Optional;
import appeng.api.definitions.IBlockDefinition;
import appeng.core.CreativeTab;
import com.google.common.base.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
public class StairBlockFeatureHandler implements IFeatureHandler {
src/main/java/appeng/core/features/TileDefinition.java
+3 -3
View File
@@ -12,13 +12,13 @@ package appeng.core.features;
import net.minecraft.tileentity.TileEntity;
import appeng.api.definitions.ITileDefinition;
import appeng.block.AEBaseTileBlock;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import appeng.api.definitions.ITileDefinition;
import appeng.block.AEBaseTileBlock;
public final class TileDefinition extends BlockDefinition implements ITileDefinition {
private static final TileEntityTransformer TILEENTITY_TRANSFORMER = new TileEntityTransformer();
src/main/java/appeng/core/features/WrappedDamageItemDefinition.java
+2 -2
View File
@@ -17,12 +17,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import appeng.api.definitions.ITileDefinition;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import appeng.api.definitions.ITileDefinition;
public final class WrappedDamageItemDefinition implements ITileDefinition {
private final ITileDefinition definition;
src/main/java/appeng/core/features/registries/PlayerRegistry.java
+2 -2
View File
@@ -14,11 +14,11 @@ import javax.annotation.Nullable;
import net.minecraft.entity.player.EntityPlayer;
import com.mojang.authlib.GameProfile;
import appeng.api.features.IPlayerRegistry;
import appeng.core.worlddata.WorldData;
import com.mojang.authlib.GameProfile;
public class PlayerRegistry implements IPlayerRegistry {
@Override
src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java
+2 -2
View File
@@ -9,11 +9,11 @@ import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import com.google.common.base.Optional;
import appeng.api.features.IInscriberRecipe;
import appeng.api.features.InscriberProcessType;
import com.google.common.base.Optional;
/**
* Basic inscriber recipe
*
src/main/java/appeng/core/sync/GuiBridge.java
+2 -3
View File
@@ -21,6 +21,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import com.google.common.collect.Lists;
import appeng.api.AEApi;
import appeng.api.config.SecurityPermissions;
import appeng.api.definitions.IComparableDefinition;
@@ -67,9 +69,6 @@ import appeng.tile.storage.TileDrive;
import appeng.tile.storage.TileIOPort;
import appeng.tile.storage.TileSkyChest;
import appeng.util.Platform;
import com.google.common.collect.Lists;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.relauncher.ReflectionHelper;
src/main/java/appeng/core/worlddata/CompassData.java
+2 -2
View File
@@ -14,10 +14,10 @@ import java.io.File;
import javax.annotation.Nonnull;
import appeng.services.CompassService;
import com.google.common.base.Preconditions;
import appeng.services.CompassService;
/**
* @author thatsIch
* @version rv3 - 30.05.2015
src/main/java/appeng/core/worlddata/DimensionData.java
+3 -3
View File
@@ -20,15 +20,15 @@ import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import appeng.api.util.WorldCoord;
import appeng.core.AEConfig;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketNewStorageDimension;
import appeng.hooks.TickHandler;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
/**
* @author thatsIch
* @version rv3 - 30.05.2015
src/main/java/appeng/core/worlddata/PlayerData.java
+2 -2
View File
@@ -20,12 +20,12 @@ import net.minecraftforge.common.config.ConfigCategory;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import appeng.core.CommonHelper;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.mojang.authlib.GameProfile;
import appeng.core.CommonHelper;
/**
* Handles the matching between UUIDs and internal IDs for security systems. This whole system could be replaced by
* storing directly the UUID, using a lot more traffic though
src/main/java/appeng/core/worlddata/SpawnData.java
+2 -2
View File
@@ -22,10 +22,10 @@ import javax.annotation.Nonnull;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import appeng.core.AELog;
import com.google.common.base.Preconditions;
import appeng.core.AELog;
/**
* @author thatsIch
* @version rv3 - 30.05.2015
src/main/java/appeng/core/worlddata/StorageData.java
+2 -2
View File
@@ -20,12 +20,12 @@ import javax.annotation.Nullable;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import com.google.common.base.Preconditions;
import appeng.core.AELog;
import appeng.me.GridStorage;
import appeng.me.GridStorageSearch;
import com.google.common.base.Preconditions;
/**
* @author thatsIch
* @version rv3 - 30.05.2015
src/main/java/appeng/core/worlddata/WorldData.java
+3 -3
View File
@@ -20,13 +20,13 @@ import javax.annotation.Nullable;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.config.Configuration;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import appeng.core.AEConfig;
import appeng.services.CompassService;
import appeng.services.compass.CompassThreadFactory;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
/**
* Singleton access to anything related to world-based data.
* <p>
src/main/java/appeng/crafting/CraftingJob.java
+2 -2
View File
@@ -17,6 +17,8 @@ import java.util.concurrent.TimeUnit;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import com.google.common.base.Stopwatch;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.networking.IGrid;
@@ -36,8 +38,6 @@ import appeng.hooks.TickHandler;
import appeng.me.cache.CraftingGridCache;
import appeng.me.cluster.implementations.CraftingCPUCluster;
import com.google.common.base.Stopwatch;
public class CraftingJob implements ICraftingJob, Runnable {
private static final String LOG_CRAFTING_JOB = "CraftingJob (%s) issued by %s requesting [%s] using %s bytes took %s ms";
src/main/java/appeng/crafting/CraftingTreeNode.java
+2 -2
View File
@@ -16,6 +16,8 @@ import java.util.List;
import net.minecraft.world.World;
import com.google.common.collect.Lists;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.FuzzyMode;
@@ -26,8 +28,6 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.me.cluster.implementations.CraftingCPUCluster;
import com.google.common.collect.Lists;
public class CraftingTreeNode {
// what slot!
src/main/java/appeng/crafting/v2/CraftingCalculations.java
+4 -4
View File
@@ -7,16 +7,16 @@ import java.util.function.ToLongBiFunction;
import org.apache.logging.log4j.Level;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Multimaps;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.core.AELog;
import appeng.crafting.v2.resolvers.*;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Multimaps;
/**
* You can register additional crafting handlers here
*/
src/main/java/appeng/crafting/v2/CraftingContext.java
+5 -5
View File
@@ -12,6 +12,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import com.google.common.collect.ClassToInstanceMap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.MutableClassToInstanceMap;
import appeng.api.AEApi;
import appeng.api.networking.IGrid;
import appeng.api.networking.crafting.ICraftingGrid;
@@ -32,11 +37,6 @@ import appeng.me.cluster.implementations.CraftingCPUCluster;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
import appeng.util.item.OreListMultiMap;
import com.google.common.collect.ClassToInstanceMap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.MutableClassToInstanceMap;
import cpw.mods.fml.common.FMLCommonHandler;
/**
src/main/java/appeng/crafting/v2/CraftingTreeSerializer.java
+2 -3
View File
@@ -9,6 +9,8 @@ import java.util.*;
import net.minecraft.world.World;
import com.google.common.base.Throwables;
import appeng.api.implementations.ICraftingPatternItem;
import appeng.api.networking.crafting.ICraftingPatternDetails;
import appeng.api.storage.data.IAEItemStack;
@@ -17,9 +19,6 @@ import appeng.core.AEConfig;
import appeng.crafting.v2.resolvers.*;
import appeng.util.item.AEFluidStack;
import appeng.util.item.AEItemStack;
import com.google.common.base.Throwables;
import cpw.mods.fml.common.network.ByteBufUtils;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
src/main/java/appeng/crafting/v2/resolvers/CraftableItemResolver.java
+2 -2
View File
@@ -11,6 +11,8 @@ import net.minecraft.world.World;
import org.apache.logging.log4j.Level;
import com.google.common.collect.ImmutableList;
import appeng.api.config.Actionable;
import appeng.api.config.FuzzyMode;
import appeng.api.networking.crafting.ICraftingPatternDetails;
@@ -30,8 +32,6 @@ import appeng.me.cluster.implementations.CraftingCPUCluster;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
import appeng.util.item.HashBasedItemList;
import com.google.common.collect.ImmutableList;
import io.netty.buffer.ByteBuf;
public class CraftableItemResolver implements CraftingRequestResolver<IAEItemStack> {
src/main/java/appeng/helpers/DualityInterface.java
+2 -2
View File
@@ -26,6 +26,8 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import com.google.common.collect.ImmutableSet;
import appeng.api.AEApi;
import appeng.api.config.*;
import appeng.api.crafting.ICraftingIconProvider;
@@ -81,8 +83,6 @@ import appeng.util.inv.ItemSlot;
import appeng.util.inv.WrapperInvSlot;
import appeng.util.item.AEItemStack;
import cofh.api.transport.IItemDuct;
import com.google.common.collect.ImmutableSet;
import cpw.mods.fml.common.Loader;
public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory,
src/main/java/appeng/helpers/MultiCraftingTracker.java
+2 -2
View File
@@ -16,6 +16,8 @@ import java.util.concurrent.Future;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import com.google.common.collect.ImmutableSet;
import appeng.api.AEApi;
import appeng.api.networking.IGrid;
import appeng.api.networking.crafting.ICraftingGrid;
@@ -26,8 +28,6 @@ import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.data.IAEItemStack;
import appeng.util.InventoryAdaptor;
import com.google.common.collect.ImmutableSet;
public class MultiCraftingTracker {
private final int size;
src/main/java/appeng/hooks/AETrading.java
+2 -2
View File
@@ -18,11 +18,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.village.MerchantRecipe;
import net.minecraft.village.MerchantRecipeList;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.definitions.IItemDefinition;
import appeng.api.definitions.IMaterials;
import com.google.common.base.Optional;
import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
public class AETrading implements IVillageTradeHandler {
src/main/java/appeng/hooks/TickHandler.java
+4 -5
View File
@@ -20,6 +20,10 @@ import net.minecraft.world.World;
import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.event.world.WorldEvent;
import com.google.common.base.Stopwatch;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
import appeng.api.AEApi;
import appeng.api.networking.IGridNode;
import appeng.api.networking.crafting.ICraftingJob;
@@ -35,11 +39,6 @@ import appeng.me.NetworkList;
import appeng.tile.AEBaseTile;
import appeng.util.IWorldCallable;
import appeng.util.Platform;
import com.google.common.base.Stopwatch;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
src/main/java/appeng/integration/modules/BuildCraftBuilder.java
+2 -2
View File
@@ -16,6 +16,8 @@ import java.lang.reflect.Method;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.definitions.IBlocks;
@@ -31,8 +33,6 @@ import appeng.integration.modules.BCHelpers.AERotatableBlockSchematic;
import buildcraft.api.blueprints.BuilderAPI;
import buildcraft.api.blueprints.ISchematicRegistry;
import com.google.common.base.Optional;
/**
* The builder has no interface, because it provides no functionality
*
src/main/java/appeng/integration/modules/DSU.java
+1 -1
View File
@@ -12,7 +12,6 @@ package appeng.integration.modules;
import net.minecraft.tileentity.TileEntity;
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
import appeng.api.AEApi;
import appeng.api.storage.IMEInventory;
import appeng.helpers.Reflected;
@@ -21,6 +20,7 @@ import appeng.integration.IntegrationHelper;
import appeng.integration.abstraction.IDSU;
import appeng.integration.modules.helpers.MFRDSUHandler;
import appeng.integration.modules.helpers.MinefactoryReloadedDeepStorageUnit;
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
public class DSU implements IDSU, IIntegrationModule {
src/main/java/appeng/integration/modules/FMP.java
+2 -2
View File
@@ -19,6 +19,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import com.google.common.collect.Lists;
import appeng.api.AEApi;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.definitions.IBlocks;
@@ -41,8 +43,6 @@ import codechicken.multipart.MultiPartRegistry.IPartFactory;
import codechicken.multipart.MultipartGenerator;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
import com.google.common.collect.Lists;
import cpw.mods.fml.common.eventhandler.Event;
public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IFMP {
src/main/java/appeng/integration/modules/ImmibisMicroblocks.java
+4 -5
View File
@@ -12,15 +12,14 @@ package appeng.integration.modules;
import java.lang.reflect.Method;
import mods.immibis.core.api.multipart.ICoverSystem;
import mods.immibis.core.api.multipart.IMultipartTile;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.parts.IPartHost;
@@ -30,8 +29,8 @@ import appeng.helpers.Reflected;
import appeng.integration.IIntegrationModule;
import appeng.integration.IntegrationHelper;
import appeng.integration.abstraction.IImmibisMicroblocks;
import com.google.common.base.Optional;
import mods.immibis.core.api.multipart.ICoverSystem;
import mods.immibis.core.api.multipart.IMultipartTile;
public class ImmibisMicroblocks implements IImmibisMicroblocks, IIntegrationModule {
src/main/java/appeng/integration/modules/Jabba.java
+1 -2
View File
@@ -1,7 +1,5 @@
package appeng.integration.modules;
import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
import net.minecraft.tileentity.TileEntity;
import appeng.api.AEApi;
@@ -12,6 +10,7 @@ import appeng.integration.IIntegrationModule;
import appeng.integration.IntegrationHelper;
import appeng.integration.modules.helpers.JabbaBarrel;
import appeng.integration.modules.helpers.JabbaStorageHandler;
import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
public class Jabba implements IIntegrationModule {
src/main/java/appeng/integration/modules/OpenComputers.java
+1 -1
View File
@@ -10,7 +10,6 @@
package appeng.integration.modules;
import li.cil.oc.api.Items;
import appeng.api.AEApi;
import appeng.api.IAppEngApi;
import appeng.api.config.TunnelType;
@@ -21,6 +20,7 @@ import appeng.integration.IIntegrationModule;
import appeng.integration.IntegrationHelper;
import appeng.integration.IntegrationRegistry;
import appeng.integration.IntegrationType;
import li.cil.oc.api.Items;
public class OpenComputers implements IIntegrationModule {
src/main/java/appeng/integration/modules/RC.java
+2 -3
View File
@@ -10,15 +10,14 @@
package appeng.integration.modules;
import mods.railcraft.api.crafting.IRockCrusherRecipe;
import mods.railcraft.api.crafting.RailcraftCraftingManager;
import net.minecraft.item.ItemStack;
import appeng.helpers.Reflected;
import appeng.integration.IIntegrationModule;
import appeng.integration.IntegrationHelper;
import appeng.integration.abstraction.IRC;
import mods.railcraft.api.crafting.IRockCrusherRecipe;
import mods.railcraft.api.crafting.RailcraftCraftingManager;
public class RC implements IRC, IIntegrationModule {
src/main/java/appeng/integration/modules/Waila.java
+2 -2
View File
@@ -10,8 +10,6 @@
package appeng.integration.modules;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.IWailaRegistrar;
import appeng.helpers.Reflected;
import appeng.integration.IIntegrationModule;
import appeng.integration.IntegrationHelper;
@@ -19,6 +17,8 @@ import appeng.integration.modules.waila.PartWailaDataProvider;
import appeng.integration.modules.waila.TileWailaDataProvider;
import appeng.tile.AEBaseTile;
import cpw.mods.fml.common.event.FMLInterModComms;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.IWailaRegistrar;
public class Waila implements IIntegrationModule {
src/main/java/appeng/integration/modules/helpers/JabbaBarrel.java
+1 -2
View File
@@ -1,7 +1,5 @@
package appeng.integration.modules.helpers;
import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -12,6 +10,7 @@ import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.util.item.AEItemStack;
import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel;
public class JabbaBarrel implements IMEInventory<IAEItemStack> {
src/main/java/appeng/integration/modules/helpers/MinefactoryReloadedDeepStorageUnit.java
+1 -1
View File
@@ -13,7 +13,6 @@ package appeng.integration.modules.helpers;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
import appeng.api.config.Actionable;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.IMEInventory;
@@ -21,6 +20,7 @@ import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.util.item.AEItemStack;
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemStack> {
src/main/java/appeng/integration/modules/waila/BaseWailaDataProvider.java
+4 -4
View File
@@ -12,16 +12,16 @@ package appeng.integration.modules.waila;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
/**
* Base implementation for {@link mcp.mobius.waila.api.IWailaDataProvider}
*
src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java
+6 -7
View File
@@ -12,10 +12,6 @@ package appeng.integration.modules.waila;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -23,12 +19,15 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import appeng.api.parts.IPart;
import appeng.integration.modules.waila.part.*;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import appeng.api.parts.IPart;
import appeng.integration.modules.waila.part.*;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
/**
* Delegation provider for parts through {@link IPartWailaDataProvider}
*
src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java
+5 -6
View File
@@ -12,22 +12,21 @@ package appeng.integration.modules.waila;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import com.google.common.collect.Lists;
import appeng.integration.modules.waila.tile.ChargerWailaDataProvider;
import appeng.integration.modules.waila.tile.CraftingMonitorWailaDataProvider;
import appeng.integration.modules.waila.tile.PowerStateWailaDataProvider;
import appeng.integration.modules.waila.tile.PowerStorageWailaDataProvider;
import com.google.common.collect.Lists;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
/**
* Delegation provider for tiles through {@link mcp.mobius.waila.api.IWailaDataProvider}
src/main/java/appeng/integration/modules/waila/part/BasePartWailaDataProvider.java
+2 -3
View File
@@ -12,9 +12,6 @@ package appeng.integration.modules.waila.part;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -23,6 +20,8 @@ import net.minecraft.world.World;
import appeng.api.parts.IPart;
import appeng.api.parts.PartItemStack;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
/**
* Default implementation of {@link appeng.integration.modules.waila.part.IPartWailaDataProvider}
src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java
+2 -3
View File
@@ -12,9 +12,6 @@ package appeng.integration.modules.waila.part;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -27,6 +24,8 @@ import appeng.parts.networking.PartDenseCable;
import appeng.parts.networking.PartUltraDenseCableSmart;
import gnu.trove.map.TObjectShortMap;
import gnu.trove.map.hash.TObjectShortHashMap;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
/**
* Channel-information provider for WAILA
src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java
+2 -3
View File
@@ -12,9 +12,6 @@ package appeng.integration.modules.waila.part;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -22,6 +19,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import appeng.api.parts.IPart;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
/**
* An abstraction layer of the {@link appeng.integration.modules.waila.part.IPartWailaDataProvider} for
src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java
+4 -5
View File
@@ -12,21 +12,20 @@ package appeng.integration.modules.waila.part;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import com.google.common.collect.Iterators;
import appeng.api.parts.IPart;
import appeng.core.localization.ButtonToolTips;
import appeng.core.localization.WailaText;
import appeng.me.GridAccessException;
import appeng.parts.p2p.PartP2PTunnel;
import com.google.common.collect.Iterators;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
/**
* Provides information about a P2P tunnel to WAILA.
src/main/java/appeng/integration/modules/waila/part/PartAccessor.java
+2 -2
View File
@@ -14,12 +14,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import com.google.common.base.Optional;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartHost;
import appeng.api.parts.SelectedPart;
import com.google.common.base.Optional;
/**
* Accessor to access specific parts for WAILA
*
src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java
+1 -2
View File
@@ -10,12 +10,11 @@
package appeng.integration.modules.waila.part;
import mcp.mobius.waila.api.IWailaConfigHandler;
import net.minecraft.item.ItemStack;
import appeng.api.parts.IPart;
import appeng.api.parts.PartItemStack;
import mcp.mobius.waila.api.IWailaConfigHandler;
/**
* Part ItemStack provider for WAILA
src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java
+2 -2
View File
@@ -12,11 +12,11 @@ package appeng.integration.modules.waila.part;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import appeng.api.implementations.IPowerChannelState;
import appeng.api.parts.IPart;
import appeng.core.localization.WailaText;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
/**
* Power state provider for WAILA
src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java
+2 -2
View File
@@ -12,14 +12,14 @@ package appeng.integration.modules.waila.part;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import appeng.api.implementations.parts.IPartStorageMonitor;
import appeng.api.parts.IPart;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.core.localization.WailaText;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
/**
* Storage monitor provider for WAILA
src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java
+2 -3
View File
@@ -12,9 +12,6 @@ package appeng.integration.modules.waila.tile;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -23,6 +20,8 @@ import net.minecraft.tileentity.TileEntity;
import appeng.core.localization.WailaText;
import appeng.integration.modules.waila.BaseWailaDataProvider;
import appeng.tile.misc.TileCharger;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
/**
* Charger provider for WAILA
src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java
+2 -3
View File
@@ -12,9 +12,6 @@ package appeng.integration.modules.waila.tile;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -22,6 +19,8 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.core.localization.WailaText;
import appeng.integration.modules.waila.BaseWailaDataProvider;
import appeng.tile.crafting.TileCraftingMonitorTile;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
/**
* Crafting-monitor provider for WAILA
src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java
+2 -3
View File
@@ -12,15 +12,14 @@ package appeng.integration.modules.waila.tile;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import appeng.api.implementations.IPowerChannelState;
import appeng.core.localization.WailaText;
import appeng.integration.modules.waila.BaseWailaDataProvider;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
/**
* Power state provider for WAILA
src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java
+3 -4
View File
@@ -12,10 +12,6 @@ package appeng.integration.modules.waila.tile;
import java.util.List;
import mcp.mobius.waila.api.ITaggedList;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -28,6 +24,9 @@ import appeng.integration.modules.waila.BaseWailaDataProvider;
import appeng.util.Platform;
import gnu.trove.map.TObjectLongMap;
import gnu.trove.map.hash.TObjectLongHashMap;
import mcp.mobius.waila.api.ITaggedList;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
/**
* Power storage provider for WAILA
src/main/java/appeng/items/AEBaseItem.java
+1 -2
View File
@@ -18,10 +18,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import appeng.core.features.*;
import com.google.common.base.Optional;
import appeng.core.features.*;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/appeng/items/materials/ItemMultiMaterial.java
+3 -3
View File
@@ -32,6 +32,9 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.oredict.OreDictionary;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import appeng.api.config.Upgrades;
import appeng.api.implementations.IUpgradeableHost;
import appeng.api.implementations.items.IItemGroup;
@@ -50,9 +53,6 @@ import appeng.items.AEBaseItem;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
public final class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule {
public static ItemMultiMaterial instance;
src/main/java/appeng/items/parts/ItemMultiPart.java
+2 -3
View File
@@ -25,6 +25,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import com.google.common.base.Preconditions;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition;
import appeng.api.implementations.items.IItemGroup;
@@ -41,9 +43,6 @@ import appeng.core.localization.GuiText;
import appeng.integration.IntegrationRegistry;
import appeng.integration.IntegrationType;
import appeng.items.AEBaseItem;
import com.google.common.base.Preconditions;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/appeng/items/storage/ItemAdvancedStorageCell.java
+2 -2
View File
@@ -4,14 +4,14 @@ import java.util.EnumSet;
import net.minecraft.item.ItemStack;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.definitions.IItemDefinition;
import appeng.api.exceptions.MissingDefinition;
import appeng.core.features.AEFeature;
import appeng.items.materials.MaterialType;
import com.google.common.base.Optional;
public class ItemAdvancedStorageCell extends ItemBasicStorageCell {
@SuppressWarnings("Guava")
src/main/java/appeng/items/storage/ItemBasicStorageCell.java
+2 -3
View File
@@ -24,6 +24,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.ForgeEventFactory;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.config.FuzzyMode;
import appeng.api.config.IncludeExclude;
@@ -47,9 +49,6 @@ import appeng.items.contents.CellUpgrades;
import appeng.items.materials.MaterialType;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
import com.google.common.base.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/appeng/items/storage/ItemExtremeStorageCell.java
+2 -2
View File
@@ -6,10 +6,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import appeng.core.features.AEFeature;
import com.google.common.base.Optional;
import appeng.core.features.AEFeature;
public class ItemExtremeStorageCell extends ItemBasicStorageCell {
protected final int totalTypes;
src/main/java/appeng/items/storage/ItemSpatialStorageCell.java
+2 -2
View File
@@ -19,6 +19,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
import com.google.common.base.Optional;
import appeng.api.implementations.TransitionResult;
import appeng.api.implementations.items.ISpatialStorageCell;
import appeng.api.util.WorldCoord;
@@ -30,8 +32,6 @@ import appeng.spatial.StorageHelper;
import appeng.spatial.StorageWorldProvider;
import appeng.util.Platform;
import com.google.common.base.Optional;
public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorageCell {
private final int maxRegion;
src/main/java/appeng/items/tools/ToolBiometricCard.java
+2 -2
View File
@@ -22,6 +22,8 @@ import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.event.ForgeEventFactory;
import com.mojang.authlib.GameProfile;
import appeng.api.config.SecurityPermissions;
import appeng.api.features.IPlayerRegistry;
import appeng.api.implementations.items.IBiometricCard;
@@ -32,8 +34,6 @@ import appeng.core.localization.GuiText;
import appeng.items.AEBaseItem;
import appeng.util.Platform;
import com.mojang.authlib.GameProfile;
public class ToolBiometricCard extends AEBaseItem implements IBiometricCard {
public ToolBiometricCard() {
src/main/java/appeng/items/tools/ToolNetworkTool.java
+2 -2
View File
@@ -23,6 +23,8 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import com.google.common.base.Optional;
import appeng.api.implementations.guiobjects.IGuiItem;
import appeng.api.implementations.guiobjects.IGuiItemObject;
import appeng.api.implementations.items.IAEWrench;
@@ -44,8 +46,6 @@ import appeng.transformer.annotations.Integration.Interface;
import appeng.util.Platform;
import buildcraft.api.tools.IToolWrench;
import com.google.common.base.Optional;
@Interface(iface = "buildcraft.api.tools.IToolWrench", iname = IntegrationType.BuildCraftCore)
public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench, IToolWrench {
src/main/java/appeng/items/tools/powered/ToolChargedStaff.java
+2 -2
View File
@@ -18,6 +18,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraftforge.event.ForgeEventFactory;
import com.google.common.base.Optional;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.core.sync.packets.PacketLightning;
@@ -25,8 +27,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.server.ServerHelper;
import appeng.util.Platform;
import com.google.common.base.Optional;
public class ToolChargedStaff extends AEBasePoweredItem {
public ToolChargedStaff() {
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+2 -3
View File
@@ -26,6 +26,8 @@ import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.oredict.OreDictionary;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.FuzzyMode;
@@ -59,9 +61,6 @@ import appeng.tile.misc.TilePaint;
import appeng.util.ItemSorters;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
import com.google.common.base.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
+2 -2
View File
@@ -33,6 +33,8 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.oredict.OreDictionary;
import com.google.common.base.Optional;
import appeng.api.util.DimensionalCoord;
import appeng.block.misc.BlockTinyTNT;
import appeng.core.AEConfig;
@@ -43,8 +45,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.util.InWorldToolOperationResult;
import appeng.util.Platform;
import com.google.common.base.Optional;
public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockTool {
private final Map<InWorldToolOperationIngredient, InWorldToolOperationResult> heatUp;
src/main/java/appeng/items/tools/powered/ToolMassCannon.java
+2 -3
View File
@@ -30,6 +30,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.ForgeDirection;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.FuzzyMode;
@@ -63,9 +65,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.me.storage.CellInventoryHandler;
import appeng.tile.misc.TilePaint;
import appeng.util.Platform;
import com.google.common.base.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/appeng/items/tools/powered/ToolPortableCell.java
+2 -3
View File
@@ -20,6 +20,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.config.FuzzyMode;
import appeng.api.implementations.guiobjects.IGuiItem;
@@ -41,9 +43,6 @@ import appeng.items.contents.PortableCellViewer;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.me.storage.CellInventoryHandler;
import appeng.util.Platform;
import com.google.common.base.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
+2 -3
View File
@@ -20,6 +20,8 @@ import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.event.ForgeEventFactory;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.config.*;
import appeng.api.features.IWirelessTermHandler;
@@ -31,9 +33,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
import appeng.util.Platform;
import com.google.common.base.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java
+2 -2
View File
@@ -19,6 +19,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import com.google.common.base.Optional;
import appeng.api.config.AccessRestriction;
import appeng.api.config.PowerUnits;
import appeng.api.implementations.items.IAEItemPowerStorage;
@@ -26,8 +28,6 @@ import appeng.core.localization.GuiText;
import appeng.items.AEBaseItem;
import appeng.util.Platform;
import com.google.common.base.Optional;
public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPowerStorage {
private static final String POWER_NBT_KEY = "internalCurrentPower";
src/main/java/appeng/items/tools/powered/powersink/IC2.java
+2 -3
View File
@@ -14,14 +14,13 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import com.google.common.base.Optional;
import appeng.api.config.PowerUnits;
import appeng.integration.IntegrationType;
import appeng.transformer.annotations.Integration.Interface;
import appeng.transformer.annotations.Integration.InterfaceList;
import appeng.transformer.annotations.Integration.Method;
import com.google.common.base.Optional;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
Loaded 100 of 158 files, more files were not shown because too many files have changed in this diff. Show more