aboutsummaryrefslogtreecommitdiff
path: root/src/Java/cofh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/cofh')
-rw-r--r--src/Java/cofh/energy/EnergyStorage.java133
-rw-r--r--src/Java/cofh/energy/IEnergyConnection.java8
-rw-r--r--src/Java/cofh/energy/IEnergyContainerItem.java14
-rw-r--r--src/Java/cofh/energy/IEnergyHandler.java19
-rw-r--r--src/Java/cofh/energy/IEnergyProvider.java13
-rw-r--r--src/Java/cofh/energy/IEnergyReceiver.java13
-rw-r--r--src/Java/cofh/energy/IEnergyStorage.java12
-rw-r--r--src/Java/cofh/energy/ItemEnergyContainer.java102
-rw-r--r--src/Java/cofh/energy/TileEnergyHandler.java57
-rw-r--r--src/Java/cofh/mod/BaseMod.java271
-rw-r--r--src/Java/cofh/mod/ChildMod.java17
-rw-r--r--src/Java/cofh/mod/ChildModContainer.java43
12 files changed, 0 insertions, 702 deletions
diff --git a/src/Java/cofh/energy/EnergyStorage.java b/src/Java/cofh/energy/EnergyStorage.java
deleted file mode 100644
index c29b1a814f..0000000000
--- a/src/Java/cofh/energy/EnergyStorage.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package cofh.energy;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-public class EnergyStorage
- implements IEnergyStorage
-{
- protected int energy;
- protected int capacity;
- protected int maxReceive;
- protected int maxExtract;
-
- public EnergyStorage(int capacity)
- {
- this(capacity, capacity, capacity);
- }
-
- public EnergyStorage(int capacity, int maxTransfer)
- {
- this(capacity, maxTransfer, maxTransfer);
- }
-
- public EnergyStorage(int capacity, int maxReceive, int maxExtract)
- {
- this.capacity = capacity;
- this.maxReceive = maxReceive;
- this.maxExtract = maxExtract;
- }
-
- public EnergyStorage readFromNBT(NBTTagCompound nbt)
- {
- this.energy = nbt.getInteger("Energy");
- if (this.energy > this.capacity) {
- this.energy = this.capacity;
- }
- return this;
- }
-
- public NBTTagCompound writeToNBT(NBTTagCompound nbt)
- {
- if (this.energy < 0) {
- this.energy = 0;
- }
- nbt.setInteger("Energy", this.energy);
- return nbt;
- }
-
- public void setCapacity(int capacity)
- {
- this.capacity = capacity;
- if (this.energy > capacity) {
- this.energy = capacity;
- }
- }
-
- public void setMaxTransfer(int maxTransfer)
- {
- setMaxReceive(maxTransfer);
- setMaxExtract(maxTransfer);
- }
-
- public void setMaxReceive(int maxReceive)
- {
- this.maxReceive = maxReceive;
- }
-
- public void setMaxExtract(int maxExtract)
- {
- this.maxExtract = maxExtract;
- }
-
- public int getMaxReceive()
- {
- return this.maxReceive;
- }
-
- public int getMaxExtract()
- {
- return this.maxExtract;
- }
-
- public void setEnergyStored(int energy)
- {
- this.energy = energy;
- if (this.energy > this.capacity) {
- this.energy = this.capacity;
- } else if (this.energy < 0) {
- this.energy = 0;
- }
- }
-
- public void modifyEnergyStored(int energy)
- {
- this.energy += energy;
- if (this.energy > this.capacity) {
- this.energy = this.capacity;
- } else if (this.energy < 0) {
- this.energy = 0;
- }
- }
-
- @Override
-public int receiveEnergy(int maxReceive, boolean simulate)
- {
- int energyReceived = Math.min(this.capacity - this.energy, Math.min(this.maxReceive, maxReceive));
- if (!simulate) {
- this.energy += energyReceived;
- }
- return energyReceived;
- }
-
- @Override
-public int extractEnergy(int maxExtract, boolean simulate)
- {
- int energyExtracted = Math.min(this.energy, Math.min(this.maxExtract, maxExtract));
- if (!simulate) {
- this.energy -= energyExtracted;
- }
- return energyExtracted;
- }
-
- @Override
-public int getEnergyStored()
- {
- return this.energy;
- }
-
- @Override
-public int getMaxEnergyStored()
- {
- return this.capacity;
- }
-}
diff --git a/src/Java/cofh/energy/IEnergyConnection.java b/src/Java/cofh/energy/IEnergyConnection.java
deleted file mode 100644
index 96055c2282..0000000000
--- a/src/Java/cofh/energy/IEnergyConnection.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package cofh.energy;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-public abstract interface IEnergyConnection
-{
- public abstract boolean canConnectEnergy(ForgeDirection paramForgeDirection);
-}
diff --git a/src/Java/cofh/energy/IEnergyContainerItem.java b/src/Java/cofh/energy/IEnergyContainerItem.java
deleted file mode 100644
index 1cce2619ae..0000000000
--- a/src/Java/cofh/energy/IEnergyContainerItem.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cofh.energy;
-
-import net.minecraft.item.ItemStack;
-
-public abstract interface IEnergyContainerItem
-{
- public abstract int receiveEnergy(ItemStack paramItemStack, int paramInt, boolean paramBoolean);
-
- public abstract int extractEnergy(ItemStack paramItemStack, int paramInt, boolean paramBoolean);
-
- public abstract int getEnergyStored(ItemStack paramItemStack);
-
- public abstract int getMaxEnergyStored(ItemStack paramItemStack);
-}
diff --git a/src/Java/cofh/energy/IEnergyHandler.java b/src/Java/cofh/energy/IEnergyHandler.java
deleted file mode 100644
index 81424a971f..0000000000
--- a/src/Java/cofh/energy/IEnergyHandler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cofh.energy;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-public abstract interface IEnergyHandler
-extends IEnergyProvider, IEnergyReceiver
-{
- @Override
- public abstract int receiveEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean);
-
- @Override
- public abstract int extractEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean);
-
- @Override
- public abstract int getEnergyStored(ForgeDirection paramForgeDirection);
-
- @Override
- public abstract int getMaxEnergyStored(ForgeDirection paramForgeDirection);
-}
diff --git a/src/Java/cofh/energy/IEnergyProvider.java b/src/Java/cofh/energy/IEnergyProvider.java
deleted file mode 100644
index 1f92549c53..0000000000
--- a/src/Java/cofh/energy/IEnergyProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cofh.energy;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-public abstract interface IEnergyProvider
- extends IEnergyConnection
-{
- public abstract int extractEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean);
-
- public abstract int getEnergyStored(ForgeDirection paramForgeDirection);
-
- public abstract int getMaxEnergyStored(ForgeDirection paramForgeDirection);
-}
diff --git a/src/Java/cofh/energy/IEnergyReceiver.java b/src/Java/cofh/energy/IEnergyReceiver.java
deleted file mode 100644
index 537b4679d5..0000000000
--- a/src/Java/cofh/energy/IEnergyReceiver.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cofh.energy;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-public abstract interface IEnergyReceiver
- extends IEnergyConnection
-{
- public abstract int receiveEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean);
-
- public abstract int getEnergyStored(ForgeDirection paramForgeDirection);
-
- public abstract int getMaxEnergyStored(ForgeDirection paramForgeDirection);
-}
diff --git a/src/Java/cofh/energy/IEnergyStorage.java b/src/Java/cofh/energy/IEnergyStorage.java
deleted file mode 100644
index d105df55c1..0000000000
--- a/src/Java/cofh/energy/IEnergyStorage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package cofh.energy;
-
-public abstract interface IEnergyStorage
-{
- public abstract int receiveEnergy(int paramInt, boolean paramBoolean);
-
- public abstract int extractEnergy(int paramInt, boolean paramBoolean);
-
- public abstract int getEnergyStored();
-
- public abstract int getMaxEnergyStored();
-}
diff --git a/src/Java/cofh/energy/ItemEnergyContainer.java b/src/Java/cofh/energy/ItemEnergyContainer.java
deleted file mode 100644
index 3467aeaf03..0000000000
--- a/src/Java/cofh/energy/ItemEnergyContainer.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package cofh.energy;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-public class ItemEnergyContainer
- extends Item
- implements IEnergyContainerItem
-{
- protected int capacity;
- protected int maxReceive;
- protected int maxExtract;
-
- public ItemEnergyContainer() {}
-
- public ItemEnergyContainer(int capacity)
- {
- this(capacity, capacity, capacity);
- }
-
- public ItemEnergyContainer(int capacity, int maxTransfer)
- {
- this(capacity, maxTransfer, maxTransfer);
- }
-
- public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract)
- {
- this.capacity = capacity;
- this.maxReceive = maxReceive;
- this.maxExtract = maxExtract;
- }
-
- public ItemEnergyContainer setCapacity(int capacity)
- {
- this.capacity = capacity;
- return this;
- }
-
- public void setMaxTransfer(int maxTransfer)
- {
- setMaxReceive(maxTransfer);
- setMaxExtract(maxTransfer);
- }
-
- public void setMaxReceive(int maxReceive)
- {
- this.maxReceive = maxReceive;
- }
-
- public void setMaxExtract(int maxExtract)
- {
- this.maxExtract = maxExtract;
- }
-
- @Override
-public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate)
- {
- if (container.stackTagCompound == null) {
- container.stackTagCompound = new NBTTagCompound();
- }
- int energy = container.stackTagCompound.getInteger("Energy");
- int energyReceived = Math.min(this.capacity - energy, Math.min(this.maxReceive, maxReceive));
- if (!simulate)
- {
- energy += energyReceived;
- container.stackTagCompound.setInteger("Energy", energy);
- }
- return energyReceived;
- }
-
- @Override
-public int extractEnergy(ItemStack container, int maxExtract, boolean simulate)
- {
- if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) {
- return 0;
- }
- int energy = container.stackTagCompound.getInteger("Energy");
- int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
- if (!simulate)
- {
- energy -= energyExtracted;
- container.stackTagCompound.setInteger("Energy", energy);
- }
- return energyExtracted;
- }
-
- @Override
-public int getEnergyStored(ItemStack container)
- {
- if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) {
- return 0;
- }
- return container.stackTagCompound.getInteger("Energy");
- }
-
- @Override
-public int getMaxEnergyStored(ItemStack container)
- {
- return this.capacity;
- }
-}
diff --git a/src/Java/cofh/energy/TileEnergyHandler.java b/src/Java/cofh/energy/TileEnergyHandler.java
deleted file mode 100644
index bd89f37bc9..0000000000
--- a/src/Java/cofh/energy/TileEnergyHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cofh.energy;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-public class TileEnergyHandler
- extends TileEntity
- implements IEnergyHandler
-{
- protected EnergyStorage storage = new EnergyStorage(32000);
-
- @Override
-public void readFromNBT(NBTTagCompound nbt)
- {
- super.readFromNBT(nbt);
- this.storage.readFromNBT(nbt);
- }
-
- @Override
-public void writeToNBT(NBTTagCompound nbt)
- {
- super.writeToNBT(nbt);
- this.storage.writeToNBT(nbt);
- }
-
- @Override
-public boolean canConnectEnergy(ForgeDirection from)
- {
- return true;
- }
-
- @Override
-public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
- {
- return this.storage.receiveEnergy(maxReceive, simulate);
- }
-
- @Override
-public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
- {
- return this.storage.extractEnergy(maxExtract, simulate);
- }
-
- @Override
-public int getEnergyStored(ForgeDirection from)
- {
- return this.storage.getEnergyStored();
- }
-
- @Override
-public int getMaxEnergyStored(ForgeDirection from)
- {
- return this.storage.getMaxEnergyStored();
- }
-}
diff --git a/src/Java/cofh/mod/BaseMod.java b/src/Java/cofh/mod/BaseMod.java
deleted file mode 100644
index 081526d5e7..0000000000
--- a/src/Java/cofh/mod/BaseMod.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package cofh.mod;
-
-import java.io.*;
-import java.util.*;
-import java.util.Locale;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.helpers.Loader;
-import org.apache.logging.log4j.spi.AbstractLogger;
-
-import com.google.common.base.Strings;
-
-import cpw.mods.fml.common.*;
-import cpw.mods.fml.common.network.NetworkCheckHandler;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.common.versioning.InvalidVersionSpecificationException;
-import cpw.mods.fml.relauncher.FMLLaunchHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.*;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StringTranslate;
-
-import cofh.mod.updater.IUpdatableMod;
-import cofh.mod.updater.ModRange;
-import cofh.mod.updater.ModVersion;
-
-public abstract class BaseMod implements IUpdatableMod {
-
- protected File _configFolder;
- protected final String _modid;
- protected final Logger _log;
-
- protected BaseMod(Logger log) {
-
- String name = getModId();
- _modid = name.toLowerCase(Locale.US);
- _log = log;
- init();
- }
-
- protected BaseMod() {
-
- String name = getModId();
- _modid = name.toLowerCase(Locale.US);
- _log = LogManager.getLogger(name);
- init();
- }
-
- private void init() {
-
- ModContainer container = cpw.mods.fml.common.Loader.instance().activeModContainer();
- if (container.getSource().isDirectory()) {
- FMLCommonHandler.instance().registerCrashCallable(new CrashCallable("Loaded from a directory"));
- } else {
- try {
- JarFile jar = new JarFile(container.getSource());
- ZipEntry file = jar.getEntry("vers.prop");
- if (file != null) {
- BufferedReader reader = new BufferedReader(new InputStreamReader(jar.getInputStream(file)));
- String data = reader.readLine();
- FMLCommonHandler.instance().registerCrashCallable(new CrashCallable(data));
- } else {
- FMLCommonHandler.instance().registerCrashCallable(new CrashCallable("Lacking version information."));
- }
- jar.close();
- } catch (IOException e) {
- FMLCommonHandler.instance().registerCrashCallable(new CrashCallable("Error reading version information." + e.getMessage()));
- }
- }
- }
-
- @NetworkCheckHandler
- public final boolean networkCheck(Map<String, String> remoteVersions, Side side) throws InvalidVersionSpecificationException {
-
- if (!requiresRemoteFrom(side)) {
- return true;
- }
- Mod mod = getClass().getAnnotation(Mod.class);
- String _modid = mod.modid();
- if (!remoteVersions.containsKey(_modid)) {
- return false;
- }
- String remotes = mod.acceptableRemoteVersions();
- if (!"*".equals(remotes)) {
-
- String remote = remoteVersions.get(_modid);
- if (Strings.isNullOrEmpty(remotes)) {
- return getModVersion().equalsIgnoreCase(remote);
- }
- return ModRange.createFromVersionSpec(_modid, remotes).containsVersion(new ModVersion(_modid, remote));
- }
- return true;
- }
-
- protected boolean requiresRemoteFrom(Side side) {
-
- return true;
- }
-
- protected String getConfigBaseFolder() {
-
- String base = getClass().getPackage().getName();
- int i = base.indexOf('.');
- if (i >= 0) {
- return base.substring(0, i);
- }
- return "";
- }
-
- protected void setConfigFolderBase(File folder) {
-
- _configFolder = new File(folder, getConfigBaseFolder() + "/" + _modid + "/");
- }
-
- protected File getConfig(String name) {
-
- return new File(_configFolder, name + ".cfg");
- }
-
- protected File getClientConfig() {
-
- return getConfig("client");
- }
-
- protected File getCommonConfig() {
-
- return getConfig("common");
- }
-
- protected String getAssetDir() {
-
- return _modid;
- }
-
- @Override
- public Logger getLogger() {
-
- return _log;
- }
-
- private void loadLanguageFile(Properties lang, InputStream stream) throws Throwable {
-
- InputStreamReader is = new InputStreamReader(stream, "UTF-8");
-
- Properties langPack = new Properties();
- langPack.load(is);
-
- lang.putAll(langPack);
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- private void loadLanguageFile(String lang, Properties langPack) {
-
- HashMap<String, String> parsedLangFile = new HashMap<String, String>();
- parsedLangFile.putAll((Map) langPack); // lovely casting hack
-
- LanguageRegistry.instance().injectLanguage(lang.intern(), parsedLangFile);
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- protected void loadLang() {
-
- if (FMLLaunchHandler.side() == Side.CLIENT) {
- try {
- loadClientLang();
- return;
- } catch (Throwable t) {
- _log.error(AbstractLogger.CATCHING_MARKER, "???", t);
- }
- }
-
- String path = "assets/" + getAssetDir() + "/language/";
- String lang = "en_US";
- try (InputStream is = Loader.getResource(path + lang + ".lang", null).openStream();) {
- Properties langPack = new Properties();
- loadLanguageFile(langPack, is);
-
- StringTranslate i = ObfuscationReflectionHelper.getPrivateValue(StringTranslate.class, null, "instance", "field_74817_a");
- Map m = ObfuscationReflectionHelper.getPrivateValue(StringTranslate.class, i, "field_74816_c", "languageList");
- m.putAll(langPack);
- } catch (Throwable t) {
- _log.catching(Level.INFO, t);
- }
- }
-
- @SideOnly(Side.CLIENT)
- private void loadClientLang() {
-
- IReloadableResourceManager manager = (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager();
- manager.registerReloadListener(new LangManager(manager));
- }
-
- @SideOnly(Side.CLIENT)
- private class LangManager implements IResourceManagerReloadListener {
-
- private final String _path;
-
- public LangManager(IResourceManager manager) {
-
- _path = getAssetDir() + ":language/";
- onResourceManagerReload(manager);
- }
-
- @Override
- public void onResourceManagerReload(IResourceManager manager) {
-
- String l = null;
- try {
- l = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode();
- } catch (Throwable t) {
- _log.catching(Level.WARN, t);
- }
-
- for (String lang : Arrays.asList("en_US", l)) {
- if (lang != null) {
- Properties langPack = new Properties();
- try {
- List<IResource> files = manager.getAllResources(new ResourceLocation(_path + lang + ".lang"));
- for (IResource file : files) {
- if (file.getInputStream() == null) {
- _log.warn("A resource pack defines an entry for language '" + lang + "' but the InputStream is null.");
- continue;
- }
- try {
- loadLanguageFile(langPack, file.getInputStream());
- } catch (Throwable t) {
- _log.warn(AbstractLogger.CATCHING_MARKER, "A resource pack has a file for language '" + lang + "' but the file is invalid.", t);
- }
- }
- } catch (Throwable t) {
- _log.info(AbstractLogger.CATCHING_MARKER, "No language data for '" + lang + "'", t);
- }
- loadLanguageFile(lang, langPack);
- }
- }
-
- Minecraft.getMinecraft().getLanguageManager().onResourceManagerReload(manager);
- }
- }
-
- private class CrashCallable implements ICrashCallable {
-
- private final String data;
-
- private CrashCallable(String data) {
-
- this.data = data;
- }
-
- @Override
- public String call() throws Exception {
-
- return data;
- }
-
- @Override
- public String getLabel() {
-
- return getModId();
- }
-
- }
-
-}
diff --git a/src/Java/cofh/mod/ChildMod.java b/src/Java/cofh/mod/ChildMod.java
deleted file mode 100644
index b07c35a8a1..0000000000
--- a/src/Java/cofh/mod/ChildMod.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cofh.mod;
-
-import cpw.mods.fml.common.Mod;
-
-
-public @interface ChildMod {
-
- /**
- * The {@link Mod} instance defining this ChildMod
- */
- Mod[] mod();
-
- /**
- * The parent {@link Mod}
- */
- String parent();
-}
diff --git a/src/Java/cofh/mod/ChildModContainer.java b/src/Java/cofh/mod/ChildModContainer.java
deleted file mode 100644
index 994fde93a8..0000000000
--- a/src/Java/cofh/mod/ChildModContainer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cofh.mod;
-
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.eventbus.EventBus;
-
-import cpw.mods.fml.common.*;
-import cpw.mods.fml.common.discovery.ModCandidate;
-import cpw.mods.fml.common.versioning.ArtifactVersion;
-
-public class ChildModContainer extends FMLModContainer {
-
- private final String parent;
-
- @SuppressWarnings("unchecked")
- public ChildModContainer(String className, ModCandidate container, Map<String, Object> modDescriptor) {
-
- super(className, container, (Map<String, Object>)((List<Object>)modDescriptor.get("mod")).get(0));
-
- parent = (String) modDescriptor.get("parent");
- }
-
- @Override
- public boolean registerBus(EventBus bus, LoadController controller) {
-
- Map<String, ModContainer> list = Loader.instance().getIndexedModList();
- l: {
- if (!list.containsKey(parent)) {
- break l;
- }
- for (ArtifactVersion info : this.getMetadata().dependencies) {
- if (!list.containsKey(info.getLabel()) && !ModAPIManager.INSTANCE.hasAPI(info.getLabel())) {
- break l;
- }
- }
- return super.registerBus(bus, controller);
- }
-
- return false;
- }
-
-}