mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-16 01:55:12 +00:00
Compare commits
19
Commits
2.3.1.6
...
2.3.1.11_beta
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6ed29e1ae1 | ||
|
|
a388c7ed2d | ||
|
|
d7080d356e | ||
|
|
f7c2a36e36 | ||
|
|
3f57c1ba79 | ||
|
|
1e30b56d65 | ||
|
|
bace7f93fe | ||
|
|
dfd194159f | ||
|
|
15d7f7405b | ||
|
|
364f833b55 | ||
|
|
36eaeeb615 | ||
|
|
49c17652cd | ||
|
|
6abe5ea4a9 | ||
|
|
be44112161 | ||
|
|
88d90c2d07 | ||
|
|
7da7525257 | ||
|
|
3d40b4aae9 | ||
|
|
1b610403b3 | ||
|
|
7d239bd2ab |
No files matched your search
@@ -38,3 +38,4 @@
|
||||
resources/assets/enderio/lang/*.lang.txt
|
||||
*.bat
|
||||
libs/
|
||||
options.txt
|
||||
@@ -1,8 +1,10 @@
|
||||
EnderIO [](http://ci.tterrag.com/job/EnderIO/)
|
||||
EnderIO-Unofficial
|
||||
=======
|
||||
[](http://jenkins.usrv.eu:8080/job/Ender-IO/)
|
||||
This is a unofficial version of EndeIO for 1.7.10, in case of any bugs or problems please do not contact the original developers of EnderIO!
|
||||
|
||||
All code (excluding the bundled APIs from other mods, which are covered by their respective licenses) are released without restriction into the public domain under the CC0 1.0 license (http://creativecommons.org/publicdomain/zero/1.0/legalcode) FAQ (https://wiki.creativecommons.org/CC0_FAQ).
|
||||
Do what you want with it, as long as you smile while doing so. While it is not a requirement, it would be nice to know if it is being used and how, so send me hello to **crazypants.mc at gmail.com**.
|
||||
Do what you want with it, as long as you smile while doing so.
|
||||
|
||||
|
||||
|
||||
|
||||
+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 {
|
||||
|
||||
+3
-3
@@ -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.6_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.6_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
|
||||
@@ -19,4 +19,4 @@ opencomputers_version=MC1.7.10-1.5.+
|
||||
|
||||
toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv3-beta-24,)
|
||||
|
||||
curse_projectId=64578
|
||||
curse_projectId=379275
|
||||
+118
@@ -0,0 +1,118 @@
|
||||
invertYMouse:false
|
||||
mouseSensitivity:0.5
|
||||
fov:0.0
|
||||
gamma:0.0
|
||||
saturation:0.0
|
||||
renderDistance:12
|
||||
guiScale:3
|
||||
particles:0
|
||||
bobView:true
|
||||
anaglyph3d:false
|
||||
advancedOpengl:false
|
||||
maxFps:120
|
||||
fboEnable:true
|
||||
difficulty:2
|
||||
fancyGraphics:true
|
||||
ao:2
|
||||
clouds:true
|
||||
resourcePacks:[]
|
||||
lastServer:
|
||||
lang:en_US
|
||||
chatVisibility:0
|
||||
chatColors:true
|
||||
chatLinks:true
|
||||
chatLinksPrompt:true
|
||||
chatOpacity:1.0
|
||||
snooperEnabled:true
|
||||
fullscreen:false
|
||||
enableVsync:true
|
||||
hideServerAddress:false
|
||||
advancedItemTooltips:true
|
||||
pauseOnLostFocus:true
|
||||
showCape:true
|
||||
touchscreen:false
|
||||
overrideWidth:0
|
||||
overrideHeight:0
|
||||
heldItemTooltips:true
|
||||
chatHeightFocused:1.0
|
||||
chatHeightUnfocused:0.44366196
|
||||
chatScale:1.0
|
||||
chatWidth:1.0
|
||||
showInventoryAchievementHint:false
|
||||
mipmapLevels:4
|
||||
anisotropicFiltering:1
|
||||
streamBytesPerPixel:0.5
|
||||
streamMicVolume:1.0
|
||||
streamSystemVolume:1.0
|
||||
streamKbps:0.5412844
|
||||
streamFps:0.31690142
|
||||
streamCompression:1
|
||||
streamSendMetadata:true
|
||||
streamPreferredServer:
|
||||
streamChatEnabled:0
|
||||
streamChatUserFilter:0
|
||||
streamMicToggleBehavior:0
|
||||
forceUnicodeFont:false
|
||||
key_key.attack:-100
|
||||
key_key.use:-99
|
||||
key_key.forward:17
|
||||
key_key.left:30
|
||||
key_key.back:31
|
||||
key_key.right:32
|
||||
key_key.jump:57
|
||||
key_key.sneak:42
|
||||
key_key.drop:16
|
||||
key_key.inventory:18
|
||||
key_key.chat:20
|
||||
key_key.playerlist:15
|
||||
key_key.pickItem:-98
|
||||
key_key.command:53
|
||||
key_key.screenshot:60
|
||||
key_key.togglePerspective:63
|
||||
key_key.smoothCamera:0
|
||||
key_key.sprint:29
|
||||
key_key.streamStartStop:64
|
||||
key_key.streamPauseUnpause:65
|
||||
key_key.streamCommercial:0
|
||||
key_key.streamToggleMic:0
|
||||
key_key.fullscreen:87
|
||||
key_key.hotbar.1:2
|
||||
key_key.hotbar.2:3
|
||||
key_key.hotbar.3:4
|
||||
key_key.hotbar.4:5
|
||||
key_key.hotbar.5:6
|
||||
key_key.hotbar.6:7
|
||||
key_key.hotbar.7:8
|
||||
key_key.hotbar.8:9
|
||||
key_key.hotbar.9:10
|
||||
key_key.charge:47
|
||||
key_key.extra:46
|
||||
key_key.release:19
|
||||
key_key.toggle:34
|
||||
key_waila.keybind.wailaconfig:82
|
||||
key_waila.keybind.wailadisplay:79
|
||||
key_waila.keybind.liquid:80
|
||||
key_waila.keybind.recipe:81
|
||||
key_waila.keybind.usage:75
|
||||
key_Baubles Inventory:48
|
||||
key_Change Wand Focus:33
|
||||
key_Activate Hover Harness:35
|
||||
key_Misc Wand Toggle:34
|
||||
key_Glider Toggle:34
|
||||
key_Sound Locator:38
|
||||
key_Night Vision:25
|
||||
key_Goggles of Revealing:19
|
||||
key_Step Assist:0
|
||||
key_Speed:0
|
||||
key_Jump:0
|
||||
key_Yeta Wrench Mode:21
|
||||
key_Toggle Electromagnet:0
|
||||
soundCategory_master:0.0
|
||||
soundCategory_music:0.0
|
||||
soundCategory_record:1.0
|
||||
soundCategory_weather:0.0
|
||||
soundCategory_block:1.0
|
||||
soundCategory_hostile:1.0
|
||||
soundCategory_neutral:1.0
|
||||
soundCategory_player:1.0
|
||||
soundCategory_ambient:1.0
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
@@ -1,11 +0,0 @@
|
||||
package crazypants.enderio;
|
||||
|
||||
public class Tst {
|
||||
|
||||
/**
|
||||
* @param args
|
||||
*/
|
||||
public static void main(String[] args) {
|
||||
}
|
||||
|
||||
}
|
||||
@@ -55,6 +55,7 @@ public class ConduitRecipes {
|
||||
String binder = CONDUIT_BINDER.oreDict;
|
||||
|
||||
ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal());
|
||||
ItemStack skeletalContractor = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SKELETAL_CONTRACTOR.ordinal());
|
||||
|
||||
//Recipes
|
||||
addShaped(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.BASIC.ordinal()), "bbb", "b b", "bbb", 'b', binder);
|
||||
@@ -167,6 +168,12 @@ public class ConduitRecipes {
|
||||
ItemStack advFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 1);
|
||||
addShaped(advFilter, "rpr", "pzp", "rpr", 'p', Items.paper, 'z', zombieController, 'r', "dustRedstone");
|
||||
|
||||
ItemStack bigFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 0);
|
||||
addShaped(bigFilter, "opo", "psp", "opo", 'p', Items.paper, 's', skeletalContractor, 'o', "dustObsidian");
|
||||
|
||||
ItemStack bigAdvFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 1);
|
||||
addShaped(bigAdvFilter, "eme", "mfm", "eme", 'm', melodicAlloy, 'f', bigFilter, 'e', END_STEEL.getOreIngot());
|
||||
|
||||
ItemStack modFilter = new ItemStack(EnderIO.itemModItemFilter, 1, 0);
|
||||
addShaped(modFilter, " p ", "pwp", " p ", 'p', Items.paper, 'w', EnderIO.itemYetaWench);
|
||||
|
||||
|
||||
@@ -285,6 +285,7 @@ public class ItemFilter implements IInventory, IItemFilter {
|
||||
numItems = nbtRoot.getInteger("numItems");
|
||||
|
||||
if(numItems<10 && isAdvanced) numItems = 10;
|
||||
else if(numItems<5 && !isAdvanced) numItems = 5;
|
||||
|
||||
items = new ItemStack[numItems];
|
||||
oreIds.clear();
|
||||
|
||||
@@ -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,21 +9,15 @@ 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 {
|
||||
|
||||
// Power
|
||||
private Capacitors capacitorType;
|
||||
private ICapacitor capacitor;
|
||||
private Capacitors capacitorType = Capacitors.BASIC_CAPACITOR;
|
||||
private ICapacitor capacitor = Capacitors.BASIC_CAPACITOR.capacitor;
|
||||
|
||||
private int storedEnergyRF;
|
||||
private int storedEnergyRF = 0;
|
||||
protected float lastSyncPowerStored = -1;
|
||||
|
||||
protected AbstractPoweredMachineEntity(SlotDefinition slotDefinition) {
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -32,15 +32,15 @@ import crazypants.enderio.xp.XpUtil;
|
||||
public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveExperience, IFluidHandler, ITankAccess {
|
||||
|
||||
public static final int POWER_PER_TICK_ONE = Config.soulBinderLevelOnePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_ONE = new BasicCapacitor(POWER_PER_TICK_ONE * 2,
|
||||
private static final BasicCapacitor CAP_ONE = new BasicCapacitor(0,POWER_PER_TICK_ONE * 2,
|
||||
Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_ONE);
|
||||
|
||||
public static final int POWER_PER_TICK_TWO = Config.soulBinderLevelTwoPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_TWO = new BasicCapacitor(POWER_PER_TICK_TWO * 2,
|
||||
private static final BasicCapacitor CAP_TWO = new BasicCapacitor(0,POWER_PER_TICK_TWO * 2,
|
||||
Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_TWO);
|
||||
|
||||
public static final int POWER_PER_TICK_THREE = Config.soulBinderLevelThreePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_THREE = new BasicCapacitor(POWER_PER_TICK_THREE * 2,
|
||||
private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0,POWER_PER_TICK_THREE * 2,
|
||||
Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE);
|
||||
|
||||
private final ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel));
|
||||
|
||||
@@ -48,7 +48,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
|
||||
private final SetMultimap<ChannelType, Channel> sendChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build();
|
||||
private final SetMultimap<ChannelType, Channel> recieveChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build();
|
||||
|
||||
private ICapacitor capacitor = new BasicCapacitor(Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF);
|
||||
private boolean sendChannelsDirty = false;
|
||||
private boolean recieveChannelsDirty = false;
|
||||
private boolean registered = false;
|
||||
@@ -69,12 +68,12 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
|
||||
|
||||
public TileTransceiver() {
|
||||
super(new SlotDefinition(8, 8, 0));
|
||||
|
||||
currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF);
|
||||
railController = new EnderRailController(this);
|
||||
|
||||
sendItemFilter = new ItemFilter(true);
|
||||
recieveItemFilter = new ItemFilter(true);
|
||||
setCapacitor(new BasicCapacitor(0,Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF));
|
||||
}
|
||||
|
||||
public EnderRailController getRailController() {
|
||||
@@ -161,11 +160,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
|
||||
return hasPower();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICapacitor getCapacitor() {
|
||||
return capacitor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPowerUsePerTick() {
|
||||
return Config.transceiverUpkeepCostRF;
|
||||
@@ -260,7 +254,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
|
||||
|
||||
static void readChannels(NBTTagCompound nbtRoot, SetMultimap<ChannelType, Channel> channels, String key) {
|
||||
channels.clear();
|
||||
|
||||
|
||||
if(!nbtRoot.hasKey(key)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -99,6 +99,7 @@ public class MaterialRecipes {
|
||||
|
||||
OreDictionary.registerOre("nuggetPulsatingIron", new ItemStack(EnderIO.itemMaterial, 1, Material.PHASED_IRON_NUGGET.ordinal()));
|
||||
OreDictionary.registerOre("nuggetVibrantAlloy", new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_NUGGET.ordinal()));
|
||||
OreDictionary.registerOre("nuggetEndSteel", new ItemStack(EnderIO.itemMaterial, 1, Material.END_STEEL_NUGGET.ordinal()));
|
||||
|
||||
OreDictionary.registerOre("glass", Blocks.glass);
|
||||
OreDictionary.registerOre("stickWood", Items.stick);
|
||||
|
||||
@@ -1,124 +0,0 @@
|
||||
package crazypants.enderio.trigger;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import buildcraft.api.gates.ActionManager;
|
||||
import buildcraft.api.gates.ITrigger;
|
||||
import buildcraft.api.gates.ITriggerParameter;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.machine.power.TileCapacitorBank;
|
||||
|
||||
public class TriggerEnderIO implements ITrigger {
|
||||
|
||||
public static IIcon[] triggerIcons = new IIcon[5];
|
||||
public static String[] descriptions = new String[] { "Capacitor Bank has no energy stored", "Capacitor Bank has energy stored",
|
||||
"Capacitor Bank is full with energy", "Capacitor Bank is charging items", "Capacitor Bank finished charging items" };
|
||||
|
||||
public String uniqueTag;
|
||||
|
||||
public int triggerID;
|
||||
|
||||
public TriggerEnderIO(String uniqueTag, int triggerID) {
|
||||
this.uniqueTag = uniqueTag;
|
||||
this.triggerID = triggerID;
|
||||
ActionManager.registerTrigger(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return descriptions[triggerID];
|
||||
}
|
||||
|
||||
//@Override
|
||||
public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) {
|
||||
if(tile instanceof TileCapacitorBank) {
|
||||
TileCapacitorBank capacitorBank = (TileCapacitorBank) tile;
|
||||
|
||||
if(triggerID == 0) {
|
||||
return capacitorBank.getEnergyStored() == 0;
|
||||
}
|
||||
if(triggerID == 1) {
|
||||
return capacitorBank.getEnergyStored() != 0;
|
||||
}
|
||||
if(triggerID == 2) {
|
||||
return capacitorBank.getMaxEnergyStored() - capacitorBank.getEnergyStored() < 5;
|
||||
}
|
||||
if(triggerID == 3 || triggerID == 4) {
|
||||
ItemStack[] items = new ItemStack[capacitorBank.getSizeInventory()];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
items[i] = capacitorBank.getStackInSlot(i);
|
||||
}
|
||||
boolean capacitorBankEmpty = true;
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
if(items[i] != null && items[i].getItem() instanceof IChargeableItem) {
|
||||
capacitorBankEmpty = false;
|
||||
}
|
||||
}
|
||||
if(capacitorBankEmpty) {
|
||||
return false;
|
||||
}
|
||||
boolean hasUnchargedItems = false;
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
if(items[i] != null && items[i].getItem() instanceof IChargeableItem) {
|
||||
IChargeableItem item = (IChargeableItem) items[i].getItem();
|
||||
if(item.getEnergyStored(items[i]) < item.getMaxEnergyStored(items[i])) {
|
||||
hasUnchargedItems = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(hasUnchargedItems && triggerID == 3) {
|
||||
return true;
|
||||
}
|
||||
if(!hasUnchargedItems && triggerID == 4) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIcon() {
|
||||
return triggerIcons[triggerID];
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister iconRegistry) {
|
||||
triggerIcons[0] = iconRegistry.registerIcon("enderio:triggers/noEnergy");
|
||||
triggerIcons[1] = iconRegistry.registerIcon("enderio:triggers/hasEnergy");
|
||||
triggerIcons[2] = iconRegistry.registerIcon("enderio:triggers/fullEnergy");
|
||||
triggerIcons[3] = iconRegistry.registerIcon("enderio:triggers/charging");
|
||||
triggerIcons[4] = iconRegistry.registerIcon("enderio:triggers/chargingDone");
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public int getLegacyId() {
|
||||
// return 0;
|
||||
// }
|
||||
|
||||
@Override
|
||||
public String getUniqueTag() {
|
||||
return this.uniqueTag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasParameter() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITriggerParameter createParameter() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean requiresParameter() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
package crazypants.enderio.trigger;
|
||||
|
||||
import java.util.LinkedList;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import buildcraft.api.gates.IOverrideDefaultTriggers;
|
||||
import buildcraft.api.gates.ITrigger;
|
||||
import buildcraft.api.gates.ITriggerProvider;
|
||||
import buildcraft.api.transport.IPipeTile;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.machine.power.TileCapacitorBank;
|
||||
|
||||
public class TriggerProviderEIO implements ITriggerProvider {
|
||||
|
||||
@Override
|
||||
public LinkedList<ITrigger> getNeighborTriggers(Block block, TileEntity tile) {
|
||||
if (tile instanceof IOverrideDefaultTriggers) {
|
||||
return ((IOverrideDefaultTriggers) tile).getTriggers();
|
||||
}
|
||||
|
||||
LinkedList<ITrigger> triggers = new LinkedList<ITrigger>();
|
||||
|
||||
if (tile instanceof TileCapacitorBank) {
|
||||
triggers.add(EnderIO.triggerNoEnergy);
|
||||
triggers.add(EnderIO.triggerHasEnergy);
|
||||
triggers.add(EnderIO.triggerFullEnergy);
|
||||
triggers.add(EnderIO.triggerIsCharging);
|
||||
triggers.add(EnderIO.triggerFinishedCharging);
|
||||
}
|
||||
|
||||
return triggers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LinkedList<ITrigger> getPipeTriggers(IPipeTile pipe) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user