mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-22 05:02:25 +00:00
4 files changed
+77
-31
No files matched your search
+29
-3
@@ -6,11 +6,25 @@ buildscript {
|
||||
}
|
||||
dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' }
|
||||
}
|
||||
plugins {
|
||||
id 'idea'
|
||||
id 'java'
|
||||
}
|
||||
|
||||
|
||||
apply plugin: 'forge'
|
||||
apply plugin: 'maven-publish'
|
||||
apply plugin: 'curseforge'
|
||||
|
||||
idea.module.downloadJavadoc = true
|
||||
idea.module.downloadSources = true
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = 1.8
|
||||
targetCompatibility = 1.8
|
||||
compileJava.options.encoding = 'UTF-8'
|
||||
|
||||
ext.buildnumber = 0
|
||||
if (System.getenv('BUILD_NUMBER') != null)
|
||||
project.buildnumber = System.getenv('BUILD_NUMBER')
|
||||
@@ -46,6 +60,7 @@ configurations {
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
maven { url = "http://mobiusstrip.eu/maven" }
|
||||
maven { url = "http://chickenbones.net/maven/" }
|
||||
@@ -65,15 +80,26 @@ dependencies {
|
||||
compile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api"
|
||||
compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev"
|
||||
compile "net.sengir.forestry:${forestry_version}:api"
|
||||
compile ("com.pahimar.ee3:EquivalentExchange3:${ee3_version}:dev") {
|
||||
compileOnly ("com.pahimar.ee3:EquivalentExchange3:${ee3_version}:dev") {
|
||||
transitive = false
|
||||
}
|
||||
|
||||
// WAILA ships really old CCC/CCL versions, so we force the new versions
|
||||
compile "codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:dev"
|
||||
compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev"
|
||||
|
||||
compile "li.cil.oc:OpenComputers:${opencomputers_version}:api"
|
||||
|
||||
compileOnly "li.cil.oc:OpenComputers:${opencomputers_version}:api"
|
||||
|
||||
// Missing Libs -_-' -bart
|
||||
compileOnly "mekanism:MekanismAll:1.7.10-9.1.1.283:dev"
|
||||
compileOnly "appeng:appliedenergistics2:rv3-beta-6:dev"
|
||||
compileOnly "powercrystals:MineFactoryReloaded:[1.7.10]2.8.2B1-201:dev"
|
||||
compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"
|
||||
compileOnly "dan200.computercraft:ComputerCraft:1.75"
|
||||
compileOnly "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"
|
||||
compileOnly "mods.railcraft:Railcraft_1.7.10:9.12.3.0:dev"
|
||||
compileOnly "codechicken:ForgeMultipart:1.7.10-1.2.0.347:dev"
|
||||
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
|
||||
forge_version=10.13.4.1614-1.7.10
|
||||
forgeDep_version=10.13.4.1614
|
||||
|
||||
mod_version=2.3.1.10_beta
|
||||
mod_version=2.3.1.11_beta
|
||||
|
||||
#Comment out this line to get rid of the appendix
|
||||
#mod_appendix=beta
|
||||
@@ -10,7 +10,7 @@ mod_version=2.3.1.10_beta
|
||||
buildcraft_version=6.1.5
|
||||
waila_version=1.5.10
|
||||
ccc_version=1.0.7.46
|
||||
ccl_version=1.1.3.138
|
||||
ccl_version=1.1.3.140
|
||||
ae2_version=rv3-stable-24
|
||||
endercore_version=1.7.10-0.2.0.35_beta
|
||||
ee3_version=1.7.10-0.3.507
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
package crazypants.enderio;
|
||||
|
||||
public class Tst {
|
||||
|
||||
/**
|
||||
* @param args
|
||||
*/
|
||||
public static void main(String[] args) {
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package crazypants.enderio.machine;
|
||||
|
||||
import crazypants.enderio.power.*;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.MathHelper;
|
||||
@@ -8,13 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||
import com.enderio.core.common.vecmath.VecmathUtil;
|
||||
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.material.ItemCapacitor;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.enderio.power.Capacitors;
|
||||
import crazypants.enderio.power.ICapacitor;
|
||||
import crazypants.enderio.power.ICapacitorItem;
|
||||
import crazypants.enderio.power.IInternalPoweredTile;
|
||||
import crazypants.enderio.power.PowerHandlerUtil;
|
||||
|
||||
public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile {
|
||||
|
||||
@@ -188,15 +183,8 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
@Override
|
||||
public void readCommon(NBTTagCompound nbtRoot) {
|
||||
super.readCommon(nbtRoot);
|
||||
setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]);
|
||||
int energy;
|
||||
if(nbtRoot.hasKey("storedEnergy")) {
|
||||
float storedEnergyMJ = nbtRoot.getFloat("storedEnergy");
|
||||
energy = (int) (storedEnergyMJ * 10);
|
||||
} else {
|
||||
energy = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY);
|
||||
}
|
||||
setEnergyStored(energy);
|
||||
handleCapacitorLoading(nbtRoot);
|
||||
handleStoredEnergyLoading(nbtRoot);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -205,8 +193,51 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
@Override
|
||||
public void writeCommon(NBTTagCompound nbtRoot) {
|
||||
super.writeCommon(nbtRoot);
|
||||
|
||||
//Write Energy
|
||||
nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF);
|
||||
//Write Capacitor Type DEPRECATED
|
||||
nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal());
|
||||
//Write Actual Capacitor
|
||||
writeCap(nbtRoot);
|
||||
}
|
||||
|
||||
private static final String CAPACITOR_TAG_STRING = "internalCapacitor";
|
||||
|
||||
private void writeCap(NBTTagCompound nbtRoot) {
|
||||
NBTTagCompound cap = new NBTTagCompound();
|
||||
cap.setInteger("MaxEnergyStored", capacitor.getMaxEnergyStored());
|
||||
cap.setInteger("MaxEnergyExtracted", capacitor.getMaxEnergyExtracted());
|
||||
cap.setInteger("MaxEnergyReceived", capacitor.getMaxEnergyReceived());
|
||||
cap.setInteger("Tier", capacitor.getTier());
|
||||
nbtRoot.setTag(CAPACITOR_TAG_STRING, cap);
|
||||
}
|
||||
|
||||
private void readCap(NBTTagCompound nbtRoot) {
|
||||
NBTTagCompound cap = nbtRoot.getCompoundTag(CAPACITOR_TAG_STRING);
|
||||
setCapacitor(new BasicCapacitor(
|
||||
cap.getInteger("Tier"),
|
||||
cap.getInteger("MaxEnergyExtracted"),
|
||||
cap.getInteger("MaxEnergyStored"),
|
||||
cap.getInteger("MaxEnergyReceived")
|
||||
));
|
||||
}
|
||||
|
||||
private void handleCapacitorLoading(NBTTagCompound nbtRoot){
|
||||
if (nbtRoot.hasKey(CAPACITOR_TAG_STRING))
|
||||
readCap(nbtRoot);
|
||||
else //Read Capacitor Type DEPRECATED
|
||||
setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]);
|
||||
}
|
||||
|
||||
private void handleStoredEnergyLoading(NBTTagCompound nbtRoot){
|
||||
int energy;
|
||||
if (nbtRoot.hasKey("storedEnergy")) {
|
||||
float storedEnergyMJ = nbtRoot.getFloat("storedEnergy");
|
||||
energy = (int) (storedEnergyMJ * 10);
|
||||
} else {
|
||||
energy = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY);
|
||||
}
|
||||
setEnergyStored(energy);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user