From 7d64233ee4e2c21d24cfe8ab4f513499d2cb796a Mon Sep 17 00:00:00 2001 From: Tombenpotter Date: Sun, 28 Sep 2014 10:42:13 +0200 Subject: [PATCH] A lot of things. Read changelog! --- Changelog.txt | 5 +++++ build.properties | 2 +- src/main/java/tombenpotter/emt/ModInformation.java | 2 +- .../ic2/tile/generators/TileEntityAerGenerator.java | 8 +++++--- .../ic2/tile/generators/TileEntityArborGenerator.java | 2 ++ .../ic2/tile/generators/TileEntityAuramGenerator.java | 8 +++++--- .../ic2/tile/generators/TileEntityBaseGenerator.java | 3 +-- .../ic2/tile/generators/TileEntityIgnisGenerator.java | 2 ++ .../ic2/tile/generators/TileEntityPotentiaGenerator.java | 8 +++++--- 9 files changed, 27 insertions(+), 13 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 423a8ba..6a259ad 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,6 +1,11 @@ Changelog of the mod : Electric Magic Tools, a Thaumcraft 4/Industrial-Craft 2 addon -------------------------------------------------------------------------------------------------------------------------------------------------------- +Version 2.0.0Alpha1: +Since SOMEONE decided to change the modid, and almost everything else, this is now EMT 2.0.0. Hurray, and all that stuff. +Fixed the Essentia Generators crashing when placed in world. Oops. +And, well, as you can see, resumed the work on EMT. Sorry for the delay! :p + Version 1.1.4 : Updated to Minecraft version 1.7.10. Rewrote and improved the Essentia Generator code. It's now very easy to add new ones. diff --git a/build.properties b/build.properties index b667726..573d034 100644 --- a/build.properties +++ b/build.properties @@ -3,5 +3,5 @@ package_group=com.tombenpotter.emt mc_version=1.7.10 forge_version=10.13.0.1208 -mod_version=1.1.4 +mod_version=2.0.0Alpha mod_name=ElectroMagicTools diff --git a/src/main/java/tombenpotter/emt/ModInformation.java b/src/main/java/tombenpotter/emt/ModInformation.java index 44c45f0..dbb4559 100644 --- a/src/main/java/tombenpotter/emt/ModInformation.java +++ b/src/main/java/tombenpotter/emt/ModInformation.java @@ -4,7 +4,7 @@ public class ModInformation { public static final String name = "Electro-Magic Tools"; public static final String modid = "EMT"; - public static final String version = "1.1.4"; + public static final String version = "2.0.0Alpha"; public static final String texturePath = "electromagictools"; public static final String guiFactory = "tombenpotter.emt.client.gui.config.EMTGuiFactory"; public static final String clientProxy = "tombenpotter.emt.proxies.ClientProxy"; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAerGenerator.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAerGenerator.java index 7e2a435..0adf134 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAerGenerator.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAerGenerator.java @@ -1,10 +1,12 @@ package tombenpotter.emt.common.module.ic2.tile.generators; import thaumcraft.api.aspects.Aspect; +import tombenpotter.emt.common.util.EssentiasOutputs; public class TileEntityAerGenerator extends TileEntityBaseGenerator { - public TileEntityAerGenerator() { - aspect = Aspect.AIR; - } + public TileEntityAerGenerator() { + aspect = Aspect.AIR; + EssentiasOutputs.outputs.get(aspect.getTag()); + } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityArborGenerator.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityArborGenerator.java index 03842f3..f60ca98 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityArborGenerator.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityArborGenerator.java @@ -13,10 +13,12 @@ package tombenpotter.emt.common.module.ic2.tile.generators; import thaumcraft.api.aspects.Aspect; +import tombenpotter.emt.common.util.EssentiasOutputs; public class TileEntityArborGenerator extends TileEntityBaseGenerator { public TileEntityArborGenerator() { aspect = Aspect.TREE; + EssentiasOutputs.outputs.get(aspect.getTag()); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAuramGenerator.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAuramGenerator.java index 6073e50..833dadb 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAuramGenerator.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAuramGenerator.java @@ -13,10 +13,12 @@ package tombenpotter.emt.common.module.ic2.tile.generators; import thaumcraft.api.aspects.Aspect; +import tombenpotter.emt.common.util.EssentiasOutputs; public class TileEntityAuramGenerator extends TileEntityBaseGenerator { - public TileEntityAuramGenerator() { - aspect = Aspect.AURA; - } + public TileEntityAuramGenerator() { + aspect = Aspect.AURA; + EssentiasOutputs.outputs.get(aspect.getTag()); + } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityBaseGenerator.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityBaseGenerator.java index f208468..6bcbca6 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityBaseGenerator.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityBaseGenerator.java @@ -7,7 +7,6 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; import tombenpotter.emt.common.module.ic2.tile.TileEntityEMT; import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.EssentiasOutputs; public abstract class TileEntityBaseGenerator extends TileEntityEMT { @@ -18,7 +17,7 @@ public abstract class TileEntityBaseGenerator extends TileEntityEMT { public TileEntityBaseGenerator() { waitTime = 30; - output = EssentiasOutputs.outputs.get(aspect.getTag()); + output = 0; } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityIgnisGenerator.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityIgnisGenerator.java index 7da5686..4f54261 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityIgnisGenerator.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityIgnisGenerator.java @@ -13,10 +13,12 @@ package tombenpotter.emt.common.module.ic2.tile.generators; import thaumcraft.api.aspects.Aspect; +import tombenpotter.emt.common.util.EssentiasOutputs; public class TileEntityIgnisGenerator extends TileEntityBaseGenerator { public TileEntityIgnisGenerator() { aspect = Aspect.FIRE; + EssentiasOutputs.outputs.get(aspect.getTag()); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityPotentiaGenerator.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityPotentiaGenerator.java index d599c05..7c2b275 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityPotentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityPotentiaGenerator.java @@ -13,10 +13,12 @@ package tombenpotter.emt.common.module.ic2.tile.generators; import thaumcraft.api.aspects.Aspect; +import tombenpotter.emt.common.util.EssentiasOutputs; public class TileEntityPotentiaGenerator extends TileEntityBaseGenerator { - public TileEntityPotentiaGenerator() { - aspect = Aspect.ENERGY; - } + public TileEntityPotentiaGenerator() { + aspect = Aspect.ENERGY; + EssentiasOutputs.outputs.get(aspect.getTag()); + } }