diff --git a/build.properties b/build.properties index f5eaa0d..e81e573 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.4.1481 -mod_version=1.2.0B1 +mod_version=1.2.0B3 mod_name=ElectroMagicTools diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b0dd98c..cd50406 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip diff --git a/src/main/java/baubles/api/BaubleType.java b/src/api/java/baubles/api/BaubleType.java similarity index 100% rename from src/main/java/baubles/api/BaubleType.java rename to src/api/java/baubles/api/BaubleType.java diff --git a/src/main/java/baubles/api/BaublesApi.java b/src/api/java/baubles/api/BaublesApi.java similarity index 100% rename from src/main/java/baubles/api/BaublesApi.java rename to src/api/java/baubles/api/BaublesApi.java diff --git a/src/main/java/baubles/api/IBauble.java b/src/api/java/baubles/api/IBauble.java similarity index 100% rename from src/main/java/baubles/api/IBauble.java rename to src/api/java/baubles/api/IBauble.java diff --git a/src/main/java/baubles/api/package-info.java b/src/api/java/baubles/api/package-info.java similarity index 100% rename from src/main/java/baubles/api/package-info.java rename to src/api/java/baubles/api/package-info.java diff --git a/src/api/java/ic2/api/Direction.class b/src/api/java/ic2/api/Direction.class new file mode 100644 index 0000000..a125f3e Binary files /dev/null and b/src/api/java/ic2/api/Direction.class differ diff --git a/src/main/java/ic2/api/Direction.java b/src/api/java/ic2/api/Direction.java similarity index 83% rename from src/main/java/ic2/api/Direction.java rename to src/api/java/ic2/api/Direction.java index f0c687b..b550ca3 100644 --- a/src/main/java/ic2/api/Direction.java +++ b/src/api/java/ic2/api/Direction.java @@ -1,5 +1,8 @@ package ic2.api; +import java.util.EnumSet; +import java.util.Set; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -36,6 +39,15 @@ public enum Direction { */ ZP; + private Direction() { + int side = ordinal() / 2; + int sign = getSign(); + + xOffset = side == 0 ? sign : 0; + yOffset = side == 1 ? sign : 0; + zOffset = side == 2 ? sign : 0; + } + public static Direction fromSideValue(int side) { return directions[(side + 2) % 6]; } @@ -83,7 +95,7 @@ public enum Direction { /** * Get the inverse of this direction (XN -> XP, XP -> XN, etc.) - * + * * @return Inverse direction */ public Direction getInverse() { @@ -92,7 +104,7 @@ public enum Direction { /** * Convert this direction to a Minecraft side value. - * + * * @return Minecraft side value */ public int toSideValue() { @@ -112,6 +124,12 @@ public enum Direction { return ForgeDirection.getOrientation(toSideValue()); } + public final int xOffset; + public final int yOffset; + public final int zOffset; + public static final Direction[] directions = Direction.values(); + public static final Set noDirections = EnumSet.noneOf(Direction.class); + public static final Set allDirections = EnumSet.allOf(Direction.class); } diff --git a/src/main/java/ic2/api/crops/BaseSeed.class b/src/api/java/ic2/api/crops/BaseSeed.class similarity index 100% rename from src/main/java/ic2/api/crops/BaseSeed.class rename to src/api/java/ic2/api/crops/BaseSeed.class diff --git a/src/main/java/ic2/api/crops/BaseSeed.java b/src/api/java/ic2/api/crops/BaseSeed.java similarity index 100% rename from src/main/java/ic2/api/crops/BaseSeed.java rename to src/api/java/ic2/api/crops/BaseSeed.java diff --git a/src/api/java/ic2/api/crops/CropCard.class b/src/api/java/ic2/api/crops/CropCard.class new file mode 100644 index 0000000..73a1177 Binary files /dev/null and b/src/api/java/ic2/api/crops/CropCard.class differ diff --git a/src/main/java/ic2/api/crops/CropCard.java b/src/api/java/ic2/api/crops/CropCard.java similarity index 98% rename from src/main/java/ic2/api/crops/CropCard.java rename to src/api/java/ic2/api/crops/CropCard.java index 091b9ad..8d97252 100644 --- a/src/main/java/ic2/api/crops/CropCard.java +++ b/src/api/java/ic2/api/crops/CropCard.java @@ -263,10 +263,8 @@ public abstract class CropCard { * * @return Chance to drop the gains */ - public float dropGainChance() { - float base = 1F; - for (int i = 0; i < tier(); i++) {base*=0.95;} - return base; + public float dropGainChance() { // TODO: change to double + return (float) Math.pow(0.95, tier()); } /** @@ -398,7 +396,7 @@ public abstract class CropCard { */ public boolean isWeed(ICropTile crop) { return crop.getSize() >= 2 && - (crop == Crops.weed || crop.getGrowth() >= 24); + (crop.getCrop() == Crops.weed || crop.getGrowth() >= 24); } diff --git a/src/main/java/ic2/api/crops/Crops.class b/src/api/java/ic2/api/crops/Crops.class similarity index 100% rename from src/main/java/ic2/api/crops/Crops.class rename to src/api/java/ic2/api/crops/Crops.class diff --git a/src/main/java/ic2/api/crops/Crops.java b/src/api/java/ic2/api/crops/Crops.java similarity index 100% rename from src/main/java/ic2/api/crops/Crops.java rename to src/api/java/ic2/api/crops/Crops.java diff --git a/src/main/java/ic2/api/crops/ICropTile.class b/src/api/java/ic2/api/crops/ICropTile.class similarity index 100% rename from src/main/java/ic2/api/crops/ICropTile.class rename to src/api/java/ic2/api/crops/ICropTile.class diff --git a/src/main/java/ic2/api/crops/ICropTile.java b/src/api/java/ic2/api/crops/ICropTile.java similarity index 100% rename from src/main/java/ic2/api/crops/ICropTile.java rename to src/api/java/ic2/api/crops/ICropTile.java diff --git a/src/main/java/ic2/api/crops/package-info.class b/src/api/java/ic2/api/crops/package-info.class similarity index 100% rename from src/main/java/ic2/api/crops/package-info.class rename to src/api/java/ic2/api/crops/package-info.class diff --git a/src/main/java/ic2/api/crops/package-info.java b/src/api/java/ic2/api/crops/package-info.java similarity index 100% rename from src/main/java/ic2/api/crops/package-info.java rename to src/api/java/ic2/api/crops/package-info.java diff --git a/src/main/java/ic2/api/energy/EnergyNet.class b/src/api/java/ic2/api/energy/EnergyNet.class similarity index 100% rename from src/main/java/ic2/api/energy/EnergyNet.class rename to src/api/java/ic2/api/energy/EnergyNet.class diff --git a/src/main/java/ic2/api/energy/EnergyNet.java b/src/api/java/ic2/api/energy/EnergyNet.java similarity index 100% rename from src/main/java/ic2/api/energy/EnergyNet.java rename to src/api/java/ic2/api/energy/EnergyNet.java diff --git a/src/main/java/ic2/api/energy/IEnergyNet.class b/src/api/java/ic2/api/energy/IEnergyNet.class similarity index 100% rename from src/main/java/ic2/api/energy/IEnergyNet.class rename to src/api/java/ic2/api/energy/IEnergyNet.class diff --git a/src/main/java/ic2/api/energy/IEnergyNet.java b/src/api/java/ic2/api/energy/IEnergyNet.java similarity index 100% rename from src/main/java/ic2/api/energy/IEnergyNet.java rename to src/api/java/ic2/api/energy/IEnergyNet.java diff --git a/src/main/java/ic2/api/energy/NodeStats.class b/src/api/java/ic2/api/energy/NodeStats.class similarity index 100% rename from src/main/java/ic2/api/energy/NodeStats.class rename to src/api/java/ic2/api/energy/NodeStats.class diff --git a/src/main/java/ic2/api/energy/NodeStats.java b/src/api/java/ic2/api/energy/NodeStats.java similarity index 100% rename from src/main/java/ic2/api/energy/NodeStats.java rename to src/api/java/ic2/api/energy/NodeStats.java diff --git a/src/main/java/ic2/api/energy/event/EnergyTileEvent.class b/src/api/java/ic2/api/energy/event/EnergyTileEvent.class similarity index 100% rename from src/main/java/ic2/api/energy/event/EnergyTileEvent.class rename to src/api/java/ic2/api/energy/event/EnergyTileEvent.class diff --git a/src/main/java/ic2/api/energy/event/EnergyTileEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileEvent.java similarity index 100% rename from src/main/java/ic2/api/energy/event/EnergyTileEvent.java rename to src/api/java/ic2/api/energy/event/EnergyTileEvent.java diff --git a/src/main/java/ic2/api/energy/event/EnergyTileLoadEvent.class b/src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.class similarity index 100% rename from src/main/java/ic2/api/energy/event/EnergyTileLoadEvent.class rename to src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.class diff --git a/src/main/java/ic2/api/energy/event/EnergyTileLoadEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.java similarity index 100% rename from src/main/java/ic2/api/energy/event/EnergyTileLoadEvent.java rename to src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.java diff --git a/src/main/java/ic2/api/energy/event/EnergyTileUnloadEvent.class b/src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.class similarity index 100% rename from src/main/java/ic2/api/energy/event/EnergyTileUnloadEvent.class rename to src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.class diff --git a/src/main/java/ic2/api/energy/event/EnergyTileUnloadEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.java similarity index 100% rename from src/main/java/ic2/api/energy/event/EnergyTileUnloadEvent.java rename to src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.java diff --git a/src/main/java/ic2/api/energy/event/package-info.class b/src/api/java/ic2/api/energy/event/package-info.class similarity index 100% rename from src/main/java/ic2/api/energy/event/package-info.class rename to src/api/java/ic2/api/energy/event/package-info.class diff --git a/src/main/java/ic2/api/energy/event/package-info.java b/src/api/java/ic2/api/energy/event/package-info.java similarity index 100% rename from src/main/java/ic2/api/energy/event/package-info.java rename to src/api/java/ic2/api/energy/event/package-info.java diff --git a/src/main/java/ic2/api/energy/package-info.class b/src/api/java/ic2/api/energy/package-info.class similarity index 100% rename from src/main/java/ic2/api/energy/package-info.class rename to src/api/java/ic2/api/energy/package-info.class diff --git a/src/main/java/ic2/api/energy/package-info.java b/src/api/java/ic2/api/energy/package-info.java similarity index 100% rename from src/main/java/ic2/api/energy/package-info.java rename to src/api/java/ic2/api/energy/package-info.java diff --git a/src/main/java/ic2/api/energy/prefab/BasicSink.class b/src/api/java/ic2/api/energy/prefab/BasicSink.class similarity index 100% rename from src/main/java/ic2/api/energy/prefab/BasicSink.class rename to src/api/java/ic2/api/energy/prefab/BasicSink.class diff --git a/src/main/java/ic2/api/energy/prefab/BasicSink.java b/src/api/java/ic2/api/energy/prefab/BasicSink.java similarity index 100% rename from src/main/java/ic2/api/energy/prefab/BasicSink.java rename to src/api/java/ic2/api/energy/prefab/BasicSink.java diff --git a/src/main/java/ic2/api/energy/prefab/BasicSource.class b/src/api/java/ic2/api/energy/prefab/BasicSource.class similarity index 100% rename from src/main/java/ic2/api/energy/prefab/BasicSource.class rename to src/api/java/ic2/api/energy/prefab/BasicSource.class diff --git a/src/main/java/ic2/api/energy/prefab/BasicSource.java b/src/api/java/ic2/api/energy/prefab/BasicSource.java similarity index 100% rename from src/main/java/ic2/api/energy/prefab/BasicSource.java rename to src/api/java/ic2/api/energy/prefab/BasicSource.java diff --git a/src/main/java/ic2/api/energy/prefab/package-info.class b/src/api/java/ic2/api/energy/prefab/package-info.class similarity index 100% rename from src/main/java/ic2/api/energy/prefab/package-info.class rename to src/api/java/ic2/api/energy/prefab/package-info.class diff --git a/src/main/java/ic2/api/energy/prefab/package-info.java b/src/api/java/ic2/api/energy/prefab/package-info.java similarity index 100% rename from src/main/java/ic2/api/energy/prefab/package-info.java rename to src/api/java/ic2/api/energy/prefab/package-info.java diff --git a/src/main/java/ic2/api/energy/tile/IEnergyAcceptor.class b/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.class similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergyAcceptor.class rename to src/api/java/ic2/api/energy/tile/IEnergyAcceptor.class diff --git a/src/main/java/ic2/api/energy/tile/IEnergyAcceptor.java b/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergyAcceptor.java rename to src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java diff --git a/src/main/java/ic2/api/energy/tile/IEnergyConductor.class b/src/api/java/ic2/api/energy/tile/IEnergyConductor.class similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergyConductor.class rename to src/api/java/ic2/api/energy/tile/IEnergyConductor.class diff --git a/src/main/java/ic2/api/energy/tile/IEnergyConductor.java b/src/api/java/ic2/api/energy/tile/IEnergyConductor.java similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergyConductor.java rename to src/api/java/ic2/api/energy/tile/IEnergyConductor.java diff --git a/src/main/java/ic2/api/energy/tile/IEnergyEmitter.class b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.class similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergyEmitter.class rename to src/api/java/ic2/api/energy/tile/IEnergyEmitter.class diff --git a/src/main/java/ic2/api/energy/tile/IEnergyEmitter.java b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergyEmitter.java rename to src/api/java/ic2/api/energy/tile/IEnergyEmitter.java diff --git a/src/main/java/ic2/api/energy/tile/IEnergySink.class b/src/api/java/ic2/api/energy/tile/IEnergySink.class similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergySink.class rename to src/api/java/ic2/api/energy/tile/IEnergySink.class diff --git a/src/main/java/ic2/api/energy/tile/IEnergySink.java b/src/api/java/ic2/api/energy/tile/IEnergySink.java similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergySink.java rename to src/api/java/ic2/api/energy/tile/IEnergySink.java diff --git a/src/main/java/ic2/api/energy/tile/IEnergySource.class b/src/api/java/ic2/api/energy/tile/IEnergySource.class similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergySource.class rename to src/api/java/ic2/api/energy/tile/IEnergySource.class diff --git a/src/main/java/ic2/api/energy/tile/IEnergySource.java b/src/api/java/ic2/api/energy/tile/IEnergySource.java similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergySource.java rename to src/api/java/ic2/api/energy/tile/IEnergySource.java diff --git a/src/main/java/ic2/api/energy/tile/IEnergyTile.class b/src/api/java/ic2/api/energy/tile/IEnergyTile.class similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergyTile.class rename to src/api/java/ic2/api/energy/tile/IEnergyTile.class diff --git a/src/main/java/ic2/api/energy/tile/IEnergyTile.java b/src/api/java/ic2/api/energy/tile/IEnergyTile.java similarity index 100% rename from src/main/java/ic2/api/energy/tile/IEnergyTile.java rename to src/api/java/ic2/api/energy/tile/IEnergyTile.java diff --git a/src/main/java/ic2/api/energy/tile/IHeatSource.class b/src/api/java/ic2/api/energy/tile/IHeatSource.class similarity index 100% rename from src/main/java/ic2/api/energy/tile/IHeatSource.class rename to src/api/java/ic2/api/energy/tile/IHeatSource.class diff --git a/src/main/java/ic2/api/energy/tile/IHeatSource.java b/src/api/java/ic2/api/energy/tile/IHeatSource.java similarity index 100% rename from src/main/java/ic2/api/energy/tile/IHeatSource.java rename to src/api/java/ic2/api/energy/tile/IHeatSource.java diff --git a/src/main/java/ic2/api/energy/tile/IKineticSource.class b/src/api/java/ic2/api/energy/tile/IKineticSource.class similarity index 100% rename from src/main/java/ic2/api/energy/tile/IKineticSource.class rename to src/api/java/ic2/api/energy/tile/IKineticSource.class diff --git a/src/main/java/ic2/api/energy/tile/IKineticSource.java b/src/api/java/ic2/api/energy/tile/IKineticSource.java similarity index 100% rename from src/main/java/ic2/api/energy/tile/IKineticSource.java rename to src/api/java/ic2/api/energy/tile/IKineticSource.java diff --git a/src/main/java/ic2/api/energy/tile/IMetaDelegate.class b/src/api/java/ic2/api/energy/tile/IMetaDelegate.class similarity index 100% rename from src/main/java/ic2/api/energy/tile/IMetaDelegate.class rename to src/api/java/ic2/api/energy/tile/IMetaDelegate.class diff --git a/src/main/java/ic2/api/energy/tile/IMetaDelegate.java b/src/api/java/ic2/api/energy/tile/IMetaDelegate.java similarity index 100% rename from src/main/java/ic2/api/energy/tile/IMetaDelegate.java rename to src/api/java/ic2/api/energy/tile/IMetaDelegate.java diff --git a/src/main/java/ic2/api/energy/tile/package-info.class b/src/api/java/ic2/api/energy/tile/package-info.class similarity index 100% rename from src/main/java/ic2/api/energy/tile/package-info.class rename to src/api/java/ic2/api/energy/tile/package-info.class diff --git a/src/main/java/ic2/api/energy/tile/package-info.java b/src/api/java/ic2/api/energy/tile/package-info.java similarity index 100% rename from src/main/java/ic2/api/energy/tile/package-info.java rename to src/api/java/ic2/api/energy/tile/package-info.java diff --git a/src/main/java/ic2/api/energy/usage.txt b/src/api/java/ic2/api/energy/usage.txt similarity index 100% rename from src/main/java/ic2/api/energy/usage.txt rename to src/api/java/ic2/api/energy/usage.txt diff --git a/src/main/java/ic2/api/event/ExplosionEvent.class b/src/api/java/ic2/api/event/ExplosionEvent.class similarity index 100% rename from src/main/java/ic2/api/event/ExplosionEvent.class rename to src/api/java/ic2/api/event/ExplosionEvent.class diff --git a/src/main/java/ic2/api/event/ExplosionEvent.java b/src/api/java/ic2/api/event/ExplosionEvent.java similarity index 100% rename from src/main/java/ic2/api/event/ExplosionEvent.java rename to src/api/java/ic2/api/event/ExplosionEvent.java diff --git a/src/main/java/ic2/api/event/LaserEvent$LaserExplodesEvent.class b/src/api/java/ic2/api/event/LaserEvent$LaserExplodesEvent.class similarity index 100% rename from src/main/java/ic2/api/event/LaserEvent$LaserExplodesEvent.class rename to src/api/java/ic2/api/event/LaserEvent$LaserExplodesEvent.class diff --git a/src/main/java/ic2/api/event/LaserEvent$LaserHitsBlockEvent.class b/src/api/java/ic2/api/event/LaserEvent$LaserHitsBlockEvent.class similarity index 100% rename from src/main/java/ic2/api/event/LaserEvent$LaserHitsBlockEvent.class rename to src/api/java/ic2/api/event/LaserEvent$LaserHitsBlockEvent.class diff --git a/src/main/java/ic2/api/event/LaserEvent$LaserHitsEntityEvent.class b/src/api/java/ic2/api/event/LaserEvent$LaserHitsEntityEvent.class similarity index 100% rename from src/main/java/ic2/api/event/LaserEvent$LaserHitsEntityEvent.class rename to src/api/java/ic2/api/event/LaserEvent$LaserHitsEntityEvent.class diff --git a/src/main/java/ic2/api/event/LaserEvent$LaserShootEvent.class b/src/api/java/ic2/api/event/LaserEvent$LaserShootEvent.class similarity index 100% rename from src/main/java/ic2/api/event/LaserEvent$LaserShootEvent.class rename to src/api/java/ic2/api/event/LaserEvent$LaserShootEvent.class diff --git a/src/main/java/ic2/api/event/LaserEvent.class b/src/api/java/ic2/api/event/LaserEvent.class similarity index 100% rename from src/main/java/ic2/api/event/LaserEvent.class rename to src/api/java/ic2/api/event/LaserEvent.class diff --git a/src/main/java/ic2/api/event/LaserEvent.java b/src/api/java/ic2/api/event/LaserEvent.java similarity index 100% rename from src/main/java/ic2/api/event/LaserEvent.java rename to src/api/java/ic2/api/event/LaserEvent.java diff --git a/src/main/java/ic2/api/event/PaintEvent.class b/src/api/java/ic2/api/event/PaintEvent.class similarity index 100% rename from src/main/java/ic2/api/event/PaintEvent.class rename to src/api/java/ic2/api/event/PaintEvent.class diff --git a/src/main/java/ic2/api/event/PaintEvent.java b/src/api/java/ic2/api/event/PaintEvent.java similarity index 100% rename from src/main/java/ic2/api/event/PaintEvent.java rename to src/api/java/ic2/api/event/PaintEvent.java diff --git a/src/main/java/ic2/api/event/RetextureEvent.class b/src/api/java/ic2/api/event/RetextureEvent.class similarity index 100% rename from src/main/java/ic2/api/event/RetextureEvent.class rename to src/api/java/ic2/api/event/RetextureEvent.class diff --git a/src/main/java/ic2/api/event/RetextureEvent.java b/src/api/java/ic2/api/event/RetextureEvent.java similarity index 100% rename from src/main/java/ic2/api/event/RetextureEvent.java rename to src/api/java/ic2/api/event/RetextureEvent.java diff --git a/src/main/java/ic2/api/event/package-info.class b/src/api/java/ic2/api/event/package-info.class similarity index 100% rename from src/main/java/ic2/api/event/package-info.class rename to src/api/java/ic2/api/event/package-info.class diff --git a/src/main/java/ic2/api/event/package-info.java b/src/api/java/ic2/api/event/package-info.java similarity index 100% rename from src/main/java/ic2/api/event/package-info.java rename to src/api/java/ic2/api/event/package-info.java diff --git a/src/main/java/ic2/api/info/IEnergyValueProvider.class b/src/api/java/ic2/api/info/IEnergyValueProvider.class similarity index 100% rename from src/main/java/ic2/api/info/IEnergyValueProvider.class rename to src/api/java/ic2/api/info/IEnergyValueProvider.class diff --git a/src/main/java/ic2/api/info/IEnergyValueProvider.java b/src/api/java/ic2/api/info/IEnergyValueProvider.java similarity index 100% rename from src/main/java/ic2/api/info/IEnergyValueProvider.java rename to src/api/java/ic2/api/info/IEnergyValueProvider.java diff --git a/src/main/java/ic2/api/info/IFuelValueProvider.class b/src/api/java/ic2/api/info/IFuelValueProvider.class similarity index 100% rename from src/main/java/ic2/api/info/IFuelValueProvider.class rename to src/api/java/ic2/api/info/IFuelValueProvider.class diff --git a/src/main/java/ic2/api/info/IFuelValueProvider.java b/src/api/java/ic2/api/info/IFuelValueProvider.java similarity index 100% rename from src/main/java/ic2/api/info/IFuelValueProvider.java rename to src/api/java/ic2/api/info/IFuelValueProvider.java diff --git a/src/main/java/ic2/api/info/Info.class b/src/api/java/ic2/api/info/Info.class similarity index 100% rename from src/main/java/ic2/api/info/Info.class rename to src/api/java/ic2/api/info/Info.class diff --git a/src/main/java/ic2/api/info/Info.java b/src/api/java/ic2/api/info/Info.java similarity index 100% rename from src/main/java/ic2/api/info/Info.java rename to src/api/java/ic2/api/info/Info.java diff --git a/src/main/java/ic2/api/info/package-info.class b/src/api/java/ic2/api/info/package-info.class similarity index 100% rename from src/main/java/ic2/api/info/package-info.class rename to src/api/java/ic2/api/info/package-info.class diff --git a/src/main/java/ic2/api/info/package-info.java b/src/api/java/ic2/api/info/package-info.java similarity index 100% rename from src/main/java/ic2/api/info/package-info.java rename to src/api/java/ic2/api/info/package-info.java diff --git a/src/main/java/ic2/api/item/ElectricItem.class b/src/api/java/ic2/api/item/ElectricItem.class similarity index 100% rename from src/main/java/ic2/api/item/ElectricItem.class rename to src/api/java/ic2/api/item/ElectricItem.class diff --git a/src/main/java/ic2/api/item/ElectricItem.java b/src/api/java/ic2/api/item/ElectricItem.java similarity index 100% rename from src/main/java/ic2/api/item/ElectricItem.java rename to src/api/java/ic2/api/item/ElectricItem.java diff --git a/src/main/java/ic2/api/item/IBackupElectricItemManager.class b/src/api/java/ic2/api/item/IBackupElectricItemManager.class similarity index 100% rename from src/main/java/ic2/api/item/IBackupElectricItemManager.class rename to src/api/java/ic2/api/item/IBackupElectricItemManager.class diff --git a/src/main/java/ic2/api/item/IBackupElectricItemManager.java b/src/api/java/ic2/api/item/IBackupElectricItemManager.java similarity index 100% rename from src/main/java/ic2/api/item/IBackupElectricItemManager.java rename to src/api/java/ic2/api/item/IBackupElectricItemManager.java diff --git a/src/main/java/ic2/api/item/IBlockCuttingBlade.class b/src/api/java/ic2/api/item/IBlockCuttingBlade.class similarity index 100% rename from src/main/java/ic2/api/item/IBlockCuttingBlade.class rename to src/api/java/ic2/api/item/IBlockCuttingBlade.class diff --git a/src/main/java/ic2/api/item/IBlockCuttingBlade.java b/src/api/java/ic2/api/item/IBlockCuttingBlade.java similarity index 100% rename from src/main/java/ic2/api/item/IBlockCuttingBlade.java rename to src/api/java/ic2/api/item/IBlockCuttingBlade.java diff --git a/src/main/java/ic2/api/item/IBoxable.class b/src/api/java/ic2/api/item/IBoxable.class similarity index 100% rename from src/main/java/ic2/api/item/IBoxable.class rename to src/api/java/ic2/api/item/IBoxable.class diff --git a/src/main/java/ic2/api/item/IBoxable.java b/src/api/java/ic2/api/item/IBoxable.java similarity index 100% rename from src/main/java/ic2/api/item/IBoxable.java rename to src/api/java/ic2/api/item/IBoxable.java diff --git a/src/main/java/ic2/api/item/IC2Items.class b/src/api/java/ic2/api/item/IC2Items.class similarity index 100% rename from src/main/java/ic2/api/item/IC2Items.class rename to src/api/java/ic2/api/item/IC2Items.class diff --git a/src/main/java/ic2/api/item/IC2Items.java b/src/api/java/ic2/api/item/IC2Items.java similarity index 100% rename from src/main/java/ic2/api/item/IC2Items.java rename to src/api/java/ic2/api/item/IC2Items.java diff --git a/src/main/java/ic2/api/item/ICustomDamageItem.class b/src/api/java/ic2/api/item/ICustomDamageItem.class similarity index 100% rename from src/main/java/ic2/api/item/ICustomDamageItem.class rename to src/api/java/ic2/api/item/ICustomDamageItem.class diff --git a/src/main/java/ic2/api/item/ICustomDamageItem.java b/src/api/java/ic2/api/item/ICustomDamageItem.java similarity index 100% rename from src/main/java/ic2/api/item/ICustomDamageItem.java rename to src/api/java/ic2/api/item/ICustomDamageItem.java diff --git a/src/main/java/ic2/api/item/IDebuggable.class b/src/api/java/ic2/api/item/IDebuggable.class similarity index 100% rename from src/main/java/ic2/api/item/IDebuggable.class rename to src/api/java/ic2/api/item/IDebuggable.class diff --git a/src/main/java/ic2/api/item/IDebuggable.java b/src/api/java/ic2/api/item/IDebuggable.java similarity index 100% rename from src/main/java/ic2/api/item/IDebuggable.java rename to src/api/java/ic2/api/item/IDebuggable.java diff --git a/src/main/java/ic2/api/item/IElectricItem.class b/src/api/java/ic2/api/item/IElectricItem.class similarity index 100% rename from src/main/java/ic2/api/item/IElectricItem.class rename to src/api/java/ic2/api/item/IElectricItem.class diff --git a/src/main/java/ic2/api/item/IElectricItem.java b/src/api/java/ic2/api/item/IElectricItem.java similarity index 100% rename from src/main/java/ic2/api/item/IElectricItem.java rename to src/api/java/ic2/api/item/IElectricItem.java diff --git a/src/main/java/ic2/api/item/IElectricItemManager.class b/src/api/java/ic2/api/item/IElectricItemManager.class similarity index 100% rename from src/main/java/ic2/api/item/IElectricItemManager.class rename to src/api/java/ic2/api/item/IElectricItemManager.class diff --git a/src/main/java/ic2/api/item/IElectricItemManager.java b/src/api/java/ic2/api/item/IElectricItemManager.java similarity index 100% rename from src/main/java/ic2/api/item/IElectricItemManager.java rename to src/api/java/ic2/api/item/IElectricItemManager.java diff --git a/src/main/java/ic2/api/item/IItemHudInfo.class b/src/api/java/ic2/api/item/IItemHudInfo.class similarity index 100% rename from src/main/java/ic2/api/item/IItemHudInfo.class rename to src/api/java/ic2/api/item/IItemHudInfo.class diff --git a/src/main/java/ic2/api/item/IItemHudInfo.java b/src/api/java/ic2/api/item/IItemHudInfo.java similarity index 100% rename from src/main/java/ic2/api/item/IItemHudInfo.java rename to src/api/java/ic2/api/item/IItemHudInfo.java diff --git a/src/api/java/ic2/api/item/IKineticRotor$GearboxType.class b/src/api/java/ic2/api/item/IKineticRotor$GearboxType.class new file mode 100644 index 0000000..3e3e8df Binary files /dev/null and b/src/api/java/ic2/api/item/IKineticRotor$GearboxType.class differ diff --git a/src/api/java/ic2/api/item/IKineticRotor.class b/src/api/java/ic2/api/item/IKineticRotor.class new file mode 100644 index 0000000..4bba1eb Binary files /dev/null and b/src/api/java/ic2/api/item/IKineticRotor.class differ diff --git a/src/main/java/ic2/api/item/IKineticWindRotor.java b/src/api/java/ic2/api/item/IKineticRotor.java similarity index 68% rename from src/main/java/ic2/api/item/IKineticWindRotor.java rename to src/api/java/ic2/api/item/IKineticRotor.java index de696e3..a61d162 100644 --- a/src/main/java/ic2/api/item/IKineticWindRotor.java +++ b/src/api/java/ic2/api/item/IKineticRotor.java @@ -3,7 +3,7 @@ package ic2.api.item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -public interface IKineticWindRotor { +public interface IKineticRotor { int getDiameter(ItemStack stack); ResourceLocation getRotorRenderTexture(ItemStack stack); @@ -13,4 +13,11 @@ public interface IKineticWindRotor { int getMinWindStrength(ItemStack stack); int getMaxWindStrength(ItemStack stack); + + boolean isAcceptedType(ItemStack stack, GearboxType type); + + public static enum GearboxType { + WATER, + WIND, + } } diff --git a/src/api/java/ic2/api/item/ILatheItem$ILatheTool.class b/src/api/java/ic2/api/item/ILatheItem$ILatheTool.class new file mode 100644 index 0000000..46efc50 Binary files /dev/null and b/src/api/java/ic2/api/item/ILatheItem$ILatheTool.class differ diff --git a/src/api/java/ic2/api/item/ILatheItem.class b/src/api/java/ic2/api/item/ILatheItem.class new file mode 100644 index 0000000..b6a25ef Binary files /dev/null and b/src/api/java/ic2/api/item/ILatheItem.class differ diff --git a/src/main/java/ic2/api/item/ILatheItem.java b/src/api/java/ic2/api/item/ILatheItem.java similarity index 61% rename from src/main/java/ic2/api/item/ILatheItem.java rename to src/api/java/ic2/api/item/ILatheItem.java index 2baffc8..45988c4 100644 --- a/src/main/java/ic2/api/item/ILatheItem.java +++ b/src/api/java/ic2/api/item/ILatheItem.java @@ -6,6 +6,9 @@ import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +/** + * Interface used for Items that can be processed in the Turning Table + */ public interface ILatheItem { /** @@ -44,4 +47,24 @@ public interface ILatheItem { @SideOnly(Side.CLIENT) ResourceLocation getTexture(ItemStack stack); + /** + * This is similar to the Block HarvestLevel. Requires a different tool for a different hardness + * for ex. the Iron Turning Blank has a Hardness of 2 (Like Iron Ore (Harvest Level)). + * In this case however it requires a Tool hardness of one above (3) + */ + int getHardness(ItemStack stack); + + /** + * Interface used for Tools that can be used to modify {@link ILatheItem} + */ + public static interface ILatheTool extends ICustomDamageItem { + + /** + * This is similar to the Tool HarvestLevel. Requires a different tool for a different hardness + * for ex. the Iron Turning Blank has a Hardness of 2 (Like Iron Ore (Harvest Level)). + * The tool requires a hardness of one level above (in this case 3) + */ + int getHardness(ItemStack stack); + } + } diff --git a/src/main/java/ic2/api/item/IMetalArmor.class b/src/api/java/ic2/api/item/IMetalArmor.class similarity index 100% rename from src/main/java/ic2/api/item/IMetalArmor.class rename to src/api/java/ic2/api/item/IMetalArmor.class diff --git a/src/main/java/ic2/api/item/IMetalArmor.java b/src/api/java/ic2/api/item/IMetalArmor.java similarity index 100% rename from src/main/java/ic2/api/item/IMetalArmor.java rename to src/api/java/ic2/api/item/IMetalArmor.java diff --git a/src/main/java/ic2/api/item/ISpecialElectricItem.class b/src/api/java/ic2/api/item/ISpecialElectricItem.class similarity index 100% rename from src/main/java/ic2/api/item/ISpecialElectricItem.class rename to src/api/java/ic2/api/item/ISpecialElectricItem.class diff --git a/src/main/java/ic2/api/item/ISpecialElectricItem.java b/src/api/java/ic2/api/item/ISpecialElectricItem.java similarity index 100% rename from src/main/java/ic2/api/item/ISpecialElectricItem.java rename to src/api/java/ic2/api/item/ISpecialElectricItem.java diff --git a/src/main/java/ic2/api/item/ITerraformingBP.class b/src/api/java/ic2/api/item/ITerraformingBP.class similarity index 100% rename from src/main/java/ic2/api/item/ITerraformingBP.class rename to src/api/java/ic2/api/item/ITerraformingBP.class diff --git a/src/main/java/ic2/api/item/ITerraformingBP.java b/src/api/java/ic2/api/item/ITerraformingBP.java similarity index 100% rename from src/main/java/ic2/api/item/ITerraformingBP.java rename to src/api/java/ic2/api/item/ITerraformingBP.java diff --git a/src/main/java/ic2/api/item/ItemWrapper.class b/src/api/java/ic2/api/item/ItemWrapper.class similarity index 100% rename from src/main/java/ic2/api/item/ItemWrapper.class rename to src/api/java/ic2/api/item/ItemWrapper.class diff --git a/src/main/java/ic2/api/item/ItemWrapper.java b/src/api/java/ic2/api/item/ItemWrapper.java similarity index 100% rename from src/main/java/ic2/api/item/ItemWrapper.java rename to src/api/java/ic2/api/item/ItemWrapper.java diff --git a/src/main/java/ic2/api/item/package-info.class b/src/api/java/ic2/api/item/package-info.class similarity index 100% rename from src/main/java/ic2/api/item/package-info.class rename to src/api/java/ic2/api/item/package-info.class diff --git a/src/main/java/ic2/api/item/package-info.java b/src/api/java/ic2/api/item/package-info.java similarity index 100% rename from src/main/java/ic2/api/item/package-info.java rename to src/api/java/ic2/api/item/package-info.java diff --git a/src/main/java/ic2/api/network/INetworkClientTileEntityEventListener.class b/src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.class similarity index 100% rename from src/main/java/ic2/api/network/INetworkClientTileEntityEventListener.class rename to src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.class diff --git a/src/main/java/ic2/api/network/INetworkClientTileEntityEventListener.java b/src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.java similarity index 100% rename from src/main/java/ic2/api/network/INetworkClientTileEntityEventListener.java rename to src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.java diff --git a/src/main/java/ic2/api/network/INetworkDataProvider.class b/src/api/java/ic2/api/network/INetworkDataProvider.class similarity index 100% rename from src/main/java/ic2/api/network/INetworkDataProvider.class rename to src/api/java/ic2/api/network/INetworkDataProvider.class diff --git a/src/main/java/ic2/api/network/INetworkDataProvider.java b/src/api/java/ic2/api/network/INetworkDataProvider.java similarity index 100% rename from src/main/java/ic2/api/network/INetworkDataProvider.java rename to src/api/java/ic2/api/network/INetworkDataProvider.java diff --git a/src/main/java/ic2/api/network/INetworkItemEventListener.class b/src/api/java/ic2/api/network/INetworkItemEventListener.class similarity index 100% rename from src/main/java/ic2/api/network/INetworkItemEventListener.class rename to src/api/java/ic2/api/network/INetworkItemEventListener.class diff --git a/src/main/java/ic2/api/network/INetworkItemEventListener.java b/src/api/java/ic2/api/network/INetworkItemEventListener.java similarity index 100% rename from src/main/java/ic2/api/network/INetworkItemEventListener.java rename to src/api/java/ic2/api/network/INetworkItemEventListener.java diff --git a/src/main/java/ic2/api/network/INetworkTileEntityEventListener.class b/src/api/java/ic2/api/network/INetworkTileEntityEventListener.class similarity index 100% rename from src/main/java/ic2/api/network/INetworkTileEntityEventListener.class rename to src/api/java/ic2/api/network/INetworkTileEntityEventListener.class diff --git a/src/main/java/ic2/api/network/INetworkTileEntityEventListener.java b/src/api/java/ic2/api/network/INetworkTileEntityEventListener.java similarity index 100% rename from src/main/java/ic2/api/network/INetworkTileEntityEventListener.java rename to src/api/java/ic2/api/network/INetworkTileEntityEventListener.java diff --git a/src/main/java/ic2/api/network/INetworkUpdateListener.class b/src/api/java/ic2/api/network/INetworkUpdateListener.class similarity index 100% rename from src/main/java/ic2/api/network/INetworkUpdateListener.class rename to src/api/java/ic2/api/network/INetworkUpdateListener.class diff --git a/src/main/java/ic2/api/network/INetworkUpdateListener.java b/src/api/java/ic2/api/network/INetworkUpdateListener.java similarity index 100% rename from src/main/java/ic2/api/network/INetworkUpdateListener.java rename to src/api/java/ic2/api/network/INetworkUpdateListener.java diff --git a/src/api/java/ic2/api/network/NetworkHelper.class b/src/api/java/ic2/api/network/NetworkHelper.class new file mode 100644 index 0000000..73ba569 Binary files /dev/null and b/src/api/java/ic2/api/network/NetworkHelper.class differ diff --git a/src/main/java/ic2/api/network/NetworkHelper.java b/src/api/java/ic2/api/network/NetworkHelper.java similarity index 97% rename from src/main/java/ic2/api/network/NetworkHelper.java rename to src/api/java/ic2/api/network/NetworkHelper.java index 5f9138d..a91d03a 100644 --- a/src/main/java/ic2/api/network/NetworkHelper.java +++ b/src/api/java/ic2/api/network/NetworkHelper.java @@ -178,7 +178,7 @@ public final class NetworkHelper { */ private static Object getInstance() { try { - return Class.forName(getPackage() + ".core.IC2").getDeclaredField("network").get(null); + return Class.forName(getPackage() + ".core.util.SideGateway").getMethod("get").invoke(Class.forName(getPackage() + ".core.IC2").getDeclaredField("network").get(null)); } catch (Throwable e) { throw new RuntimeException(e); } diff --git a/src/main/java/ic2/api/network/package-info.class b/src/api/java/ic2/api/network/package-info.class similarity index 100% rename from src/main/java/ic2/api/network/package-info.class rename to src/api/java/ic2/api/network/package-info.class diff --git a/src/main/java/ic2/api/network/package-info.java b/src/api/java/ic2/api/network/package-info.java similarity index 100% rename from src/main/java/ic2/api/network/package-info.java rename to src/api/java/ic2/api/network/package-info.java diff --git a/src/main/java/ic2/api/package-info.class b/src/api/java/ic2/api/package-info.class similarity index 100% rename from src/main/java/ic2/api/package-info.class rename to src/api/java/ic2/api/package-info.class diff --git a/src/main/java/ic2/api/package-info.java b/src/api/java/ic2/api/package-info.java similarity index 100% rename from src/main/java/ic2/api/package-info.java rename to src/api/java/ic2/api/package-info.java diff --git a/src/main/java/ic2/api/reactor/IReactor.class b/src/api/java/ic2/api/reactor/IReactor.class similarity index 100% rename from src/main/java/ic2/api/reactor/IReactor.class rename to src/api/java/ic2/api/reactor/IReactor.class diff --git a/src/main/java/ic2/api/reactor/IReactor.java b/src/api/java/ic2/api/reactor/IReactor.java similarity index 100% rename from src/main/java/ic2/api/reactor/IReactor.java rename to src/api/java/ic2/api/reactor/IReactor.java diff --git a/src/main/java/ic2/api/reactor/IReactorChamber.class b/src/api/java/ic2/api/reactor/IReactorChamber.class similarity index 100% rename from src/main/java/ic2/api/reactor/IReactorChamber.class rename to src/api/java/ic2/api/reactor/IReactorChamber.class diff --git a/src/main/java/ic2/api/reactor/IReactorChamber.java b/src/api/java/ic2/api/reactor/IReactorChamber.java similarity index 100% rename from src/main/java/ic2/api/reactor/IReactorChamber.java rename to src/api/java/ic2/api/reactor/IReactorChamber.java diff --git a/src/main/java/ic2/api/reactor/IReactorComponent.class b/src/api/java/ic2/api/reactor/IReactorComponent.class similarity index 100% rename from src/main/java/ic2/api/reactor/IReactorComponent.class rename to src/api/java/ic2/api/reactor/IReactorComponent.class diff --git a/src/main/java/ic2/api/reactor/IReactorComponent.java b/src/api/java/ic2/api/reactor/IReactorComponent.java similarity index 100% rename from src/main/java/ic2/api/reactor/IReactorComponent.java rename to src/api/java/ic2/api/reactor/IReactorComponent.java diff --git a/src/main/java/ic2/api/reactor/package-info.class b/src/api/java/ic2/api/reactor/package-info.class similarity index 100% rename from src/main/java/ic2/api/reactor/package-info.class rename to src/api/java/ic2/api/reactor/package-info.class diff --git a/src/main/java/ic2/api/reactor/package-info.java b/src/api/java/ic2/api/reactor/package-info.java similarity index 100% rename from src/main/java/ic2/api/reactor/package-info.java rename to src/api/java/ic2/api/reactor/package-info.java diff --git a/src/main/java/ic2/api/recipe/ICannerBottleRecipeManager$Input.class b/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager$Input.class similarity index 100% rename from src/main/java/ic2/api/recipe/ICannerBottleRecipeManager$Input.class rename to src/api/java/ic2/api/recipe/ICannerBottleRecipeManager$Input.class diff --git a/src/main/java/ic2/api/recipe/ICannerBottleRecipeManager.class b/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.class similarity index 100% rename from src/main/java/ic2/api/recipe/ICannerBottleRecipeManager.class rename to src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.class diff --git a/src/main/java/ic2/api/recipe/ICannerBottleRecipeManager.java b/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java similarity index 100% rename from src/main/java/ic2/api/recipe/ICannerBottleRecipeManager.java rename to src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java diff --git a/src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager$Input.class b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager$Input.class similarity index 100% rename from src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager$Input.class rename to src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager$Input.class diff --git a/src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager.class b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.class similarity index 100% rename from src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager.class rename to src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.class diff --git a/src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager.java b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java similarity index 100% rename from src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager.java rename to src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java diff --git a/src/main/java/ic2/api/recipe/ICraftingRecipeManager.class b/src/api/java/ic2/api/recipe/ICraftingRecipeManager.class similarity index 100% rename from src/main/java/ic2/api/recipe/ICraftingRecipeManager.class rename to src/api/java/ic2/api/recipe/ICraftingRecipeManager.class diff --git a/src/main/java/ic2/api/recipe/ICraftingRecipeManager.java b/src/api/java/ic2/api/recipe/ICraftingRecipeManager.java similarity index 100% rename from src/main/java/ic2/api/recipe/ICraftingRecipeManager.java rename to src/api/java/ic2/api/recipe/ICraftingRecipeManager.java diff --git a/src/main/java/ic2/api/recipe/IFluidHeatManager$BurnProperty.class b/src/api/java/ic2/api/recipe/IFluidHeatManager$BurnProperty.class similarity index 100% rename from src/main/java/ic2/api/recipe/IFluidHeatManager$BurnProperty.class rename to src/api/java/ic2/api/recipe/IFluidHeatManager$BurnProperty.class diff --git a/src/main/java/ic2/api/recipe/IFluidHeatManager.class b/src/api/java/ic2/api/recipe/IFluidHeatManager.class similarity index 100% rename from src/main/java/ic2/api/recipe/IFluidHeatManager.class rename to src/api/java/ic2/api/recipe/IFluidHeatManager.class diff --git a/src/main/java/ic2/api/recipe/IFluidHeatManager.java b/src/api/java/ic2/api/recipe/IFluidHeatManager.java similarity index 100% rename from src/main/java/ic2/api/recipe/IFluidHeatManager.java rename to src/api/java/ic2/api/recipe/IFluidHeatManager.java diff --git a/src/main/java/ic2/api/recipe/ILiquidAcceptManager.class b/src/api/java/ic2/api/recipe/ILiquidAcceptManager.class similarity index 100% rename from src/main/java/ic2/api/recipe/ILiquidAcceptManager.class rename to src/api/java/ic2/api/recipe/ILiquidAcceptManager.class diff --git a/src/main/java/ic2/api/recipe/ILiquidAcceptManager.java b/src/api/java/ic2/api/recipe/ILiquidAcceptManager.java similarity index 100% rename from src/main/java/ic2/api/recipe/ILiquidAcceptManager.java rename to src/api/java/ic2/api/recipe/ILiquidAcceptManager.java diff --git a/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager$HeatExchangeProperty.class b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager$HeatExchangeProperty.class new file mode 100644 index 0000000..1934b96 Binary files /dev/null and b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager$HeatExchangeProperty.class differ diff --git a/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.class b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.class new file mode 100644 index 0000000..0d6ca4e Binary files /dev/null and b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.class differ diff --git a/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java new file mode 100644 index 0000000..504a003 --- /dev/null +++ b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java @@ -0,0 +1,25 @@ +package ic2.api.recipe; + +import java.util.Map; + +import net.minecraftforge.fluids.Fluid; + +public interface ILiquidHeatExchangerManager extends ILiquidAcceptManager { + + void addFluid(String fluidName, String fluidOutput, int huPerMB); + + HeatExchangeProperty getHeatExchangeProperty(Fluid fluid); + + Map getHeatExchangeProperties(); + + public static class HeatExchangeProperty { + public HeatExchangeProperty(Fluid outputFluid, int huPerMB) { + this.outputFluid = outputFluid; + this.huPerMB = huPerMB; + } + + public final Fluid outputFluid; + public final int huPerMB; + } + +} diff --git a/src/main/java/ic2/api/recipe/IListRecipeManager.class b/src/api/java/ic2/api/recipe/IListRecipeManager.class similarity index 100% rename from src/main/java/ic2/api/recipe/IListRecipeManager.class rename to src/api/java/ic2/api/recipe/IListRecipeManager.class diff --git a/src/main/java/ic2/api/recipe/IListRecipeManager.java b/src/api/java/ic2/api/recipe/IListRecipeManager.java similarity index 100% rename from src/main/java/ic2/api/recipe/IListRecipeManager.java rename to src/api/java/ic2/api/recipe/IListRecipeManager.java diff --git a/src/main/java/ic2/api/recipe/IMachineRecipeManager.class b/src/api/java/ic2/api/recipe/IMachineRecipeManager.class similarity index 100% rename from src/main/java/ic2/api/recipe/IMachineRecipeManager.class rename to src/api/java/ic2/api/recipe/IMachineRecipeManager.class diff --git a/src/main/java/ic2/api/recipe/IMachineRecipeManager.java b/src/api/java/ic2/api/recipe/IMachineRecipeManager.java similarity index 100% rename from src/main/java/ic2/api/recipe/IMachineRecipeManager.java rename to src/api/java/ic2/api/recipe/IMachineRecipeManager.java diff --git a/src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.class b/src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.class similarity index 100% rename from src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.class rename to src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.class diff --git a/src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.java b/src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.java similarity index 100% rename from src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.java rename to src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.java diff --git a/src/main/java/ic2/api/recipe/IPatternStorage.class b/src/api/java/ic2/api/recipe/IPatternStorage.class similarity index 100% rename from src/main/java/ic2/api/recipe/IPatternStorage.class rename to src/api/java/ic2/api/recipe/IPatternStorage.class diff --git a/src/main/java/ic2/api/recipe/IPatternStorage.java b/src/api/java/ic2/api/recipe/IPatternStorage.java similarity index 100% rename from src/main/java/ic2/api/recipe/IPatternStorage.java rename to src/api/java/ic2/api/recipe/IPatternStorage.java diff --git a/src/main/java/ic2/api/recipe/IRecipeInput.class b/src/api/java/ic2/api/recipe/IRecipeInput.class similarity index 100% rename from src/main/java/ic2/api/recipe/IRecipeInput.class rename to src/api/java/ic2/api/recipe/IRecipeInput.class diff --git a/src/main/java/ic2/api/recipe/IRecipeInput.java b/src/api/java/ic2/api/recipe/IRecipeInput.java similarity index 100% rename from src/main/java/ic2/api/recipe/IRecipeInput.java rename to src/api/java/ic2/api/recipe/IRecipeInput.java diff --git a/src/main/java/ic2/api/recipe/IScrapboxManager.class b/src/api/java/ic2/api/recipe/IScrapboxManager.class similarity index 100% rename from src/main/java/ic2/api/recipe/IScrapboxManager.class rename to src/api/java/ic2/api/recipe/IScrapboxManager.class diff --git a/src/main/java/ic2/api/recipe/IScrapboxManager.java b/src/api/java/ic2/api/recipe/IScrapboxManager.java similarity index 100% rename from src/main/java/ic2/api/recipe/IScrapboxManager.java rename to src/api/java/ic2/api/recipe/IScrapboxManager.java diff --git a/src/main/java/ic2/api/recipe/ISemiFluidFuelManager$BurnProperty.class b/src/api/java/ic2/api/recipe/ISemiFluidFuelManager$BurnProperty.class similarity index 100% rename from src/main/java/ic2/api/recipe/ISemiFluidFuelManager$BurnProperty.class rename to src/api/java/ic2/api/recipe/ISemiFluidFuelManager$BurnProperty.class diff --git a/src/main/java/ic2/api/recipe/ISemiFluidFuelManager.class b/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.class similarity index 100% rename from src/main/java/ic2/api/recipe/ISemiFluidFuelManager.class rename to src/api/java/ic2/api/recipe/ISemiFluidFuelManager.class diff --git a/src/main/java/ic2/api/recipe/ISemiFluidFuelManager.java b/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java similarity index 100% rename from src/main/java/ic2/api/recipe/ISemiFluidFuelManager.java rename to src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java diff --git a/src/main/java/ic2/api/recipe/RecipeInputFluidContainer.class b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.class similarity index 100% rename from src/main/java/ic2/api/recipe/RecipeInputFluidContainer.class rename to src/api/java/ic2/api/recipe/RecipeInputFluidContainer.class diff --git a/src/main/java/ic2/api/recipe/RecipeInputFluidContainer.java b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java similarity index 100% rename from src/main/java/ic2/api/recipe/RecipeInputFluidContainer.java rename to src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java diff --git a/src/main/java/ic2/api/recipe/RecipeInputItemStack.class b/src/api/java/ic2/api/recipe/RecipeInputItemStack.class similarity index 100% rename from src/main/java/ic2/api/recipe/RecipeInputItemStack.class rename to src/api/java/ic2/api/recipe/RecipeInputItemStack.class diff --git a/src/main/java/ic2/api/recipe/RecipeInputItemStack.java b/src/api/java/ic2/api/recipe/RecipeInputItemStack.java similarity index 100% rename from src/main/java/ic2/api/recipe/RecipeInputItemStack.java rename to src/api/java/ic2/api/recipe/RecipeInputItemStack.java diff --git a/src/main/java/ic2/api/recipe/RecipeInputOreDict.class b/src/api/java/ic2/api/recipe/RecipeInputOreDict.class similarity index 100% rename from src/main/java/ic2/api/recipe/RecipeInputOreDict.class rename to src/api/java/ic2/api/recipe/RecipeInputOreDict.class diff --git a/src/main/java/ic2/api/recipe/RecipeInputOreDict.java b/src/api/java/ic2/api/recipe/RecipeInputOreDict.java similarity index 100% rename from src/main/java/ic2/api/recipe/RecipeInputOreDict.java rename to src/api/java/ic2/api/recipe/RecipeInputOreDict.java diff --git a/src/main/java/ic2/api/recipe/RecipeOutput.class b/src/api/java/ic2/api/recipe/RecipeOutput.class similarity index 90% rename from src/main/java/ic2/api/recipe/RecipeOutput.class rename to src/api/java/ic2/api/recipe/RecipeOutput.class index 0dad69c..a7d6b3f 100644 Binary files a/src/main/java/ic2/api/recipe/RecipeOutput.class and b/src/api/java/ic2/api/recipe/RecipeOutput.class differ diff --git a/src/main/java/ic2/api/recipe/RecipeOutput.java b/src/api/java/ic2/api/recipe/RecipeOutput.java similarity index 94% rename from src/main/java/ic2/api/recipe/RecipeOutput.java rename to src/api/java/ic2/api/recipe/RecipeOutput.java index 34c7fe9..80ad5fb 100644 --- a/src/main/java/ic2/api/recipe/RecipeOutput.java +++ b/src/api/java/ic2/api/recipe/RecipeOutput.java @@ -25,8 +25,7 @@ public final class RecipeOutput { RecipeOutput ro = (RecipeOutput) obj; if (items.size() == ro.items.size() && - (metadata == null && ro.metadata == null || metadata != null && ro.metadata != null) && - metadata.equals(ro.metadata)) { + (metadata == null && ro.metadata == null || metadata != null && ro.metadata != null && metadata.equals(ro.metadata))) { Iterator itA = items.iterator(); Iterator itB = ro.items.iterator(); diff --git a/src/main/java/ic2/api/recipe/Recipes.class b/src/api/java/ic2/api/recipe/Recipes.class similarity index 51% rename from src/main/java/ic2/api/recipe/Recipes.class rename to src/api/java/ic2/api/recipe/Recipes.class index 559ffe8..11854ef 100644 Binary files a/src/main/java/ic2/api/recipe/Recipes.class and b/src/api/java/ic2/api/recipe/Recipes.class differ diff --git a/src/main/java/ic2/api/recipe/Recipes.java b/src/api/java/ic2/api/recipe/Recipes.java similarity index 84% rename from src/main/java/ic2/api/recipe/Recipes.java rename to src/api/java/ic2/api/recipe/Recipes.java index 4c12597..0aa0b75 100644 --- a/src/main/java/ic2/api/recipe/Recipes.java +++ b/src/api/java/ic2/api/recipe/Recipes.java @@ -3,7 +3,7 @@ package ic2.api.recipe; /** * General recipe registry. - * + * * @author Richard */ public class Recipes { @@ -23,12 +23,12 @@ public class Recipes { /** * Reference amplifier values: - * + * * 5000: Scrap * 45000: Scrapbox - * + * * As Parameter for the Amplification Value you have to use the NBTTagCompound - * + * * NBTTagCompound nbt = new NBTTagCompound(); * nbt.setInteger("amplification", aValue); * matterAmplifier.addRecipe(yourStack, nbt); @@ -57,4 +57,12 @@ public class Recipes { public static ISemiFluidFuelManager semiFluidGenerator; public static IFluidHeatManager FluidHeatGenerator; + /** + * Used by the Liquid Heat Exchanger to cool down liquids and determine the amount of hu generated for every mb. + */ + public static ILiquidHeatExchangerManager liquidCooldownManager; + /** + * Opposite of {@link #liquidCooldownManager}. This is for Liquids that can be heated up again. + */ + public static ILiquidHeatExchangerManager liquidHeatupManager; } diff --git a/src/main/java/ic2/api/recipe/package-info.class b/src/api/java/ic2/api/recipe/package-info.class similarity index 100% rename from src/main/java/ic2/api/recipe/package-info.class rename to src/api/java/ic2/api/recipe/package-info.class diff --git a/src/main/java/ic2/api/recipe/package-info.java b/src/api/java/ic2/api/recipe/package-info.java similarity index 100% rename from src/main/java/ic2/api/recipe/package-info.java rename to src/api/java/ic2/api/recipe/package-info.java diff --git a/src/main/java/ic2/api/tile/ExplosionWhitelist.class b/src/api/java/ic2/api/tile/ExplosionWhitelist.class similarity index 100% rename from src/main/java/ic2/api/tile/ExplosionWhitelist.class rename to src/api/java/ic2/api/tile/ExplosionWhitelist.class diff --git a/src/main/java/ic2/api/tile/ExplosionWhitelist.java b/src/api/java/ic2/api/tile/ExplosionWhitelist.java similarity index 100% rename from src/main/java/ic2/api/tile/ExplosionWhitelist.java rename to src/api/java/ic2/api/tile/ExplosionWhitelist.java diff --git a/src/main/java/ic2/api/tile/IEnergyStorage.class b/src/api/java/ic2/api/tile/IEnergyStorage.class similarity index 100% rename from src/main/java/ic2/api/tile/IEnergyStorage.class rename to src/api/java/ic2/api/tile/IEnergyStorage.class diff --git a/src/main/java/ic2/api/tile/IEnergyStorage.java b/src/api/java/ic2/api/tile/IEnergyStorage.java similarity index 100% rename from src/main/java/ic2/api/tile/IEnergyStorage.java rename to src/api/java/ic2/api/tile/IEnergyStorage.java diff --git a/src/main/java/ic2/api/tile/IWrenchable.class b/src/api/java/ic2/api/tile/IWrenchable.class similarity index 100% rename from src/main/java/ic2/api/tile/IWrenchable.class rename to src/api/java/ic2/api/tile/IWrenchable.class diff --git a/src/main/java/ic2/api/tile/IWrenchable.java b/src/api/java/ic2/api/tile/IWrenchable.java similarity index 100% rename from src/main/java/ic2/api/tile/IWrenchable.java rename to src/api/java/ic2/api/tile/IWrenchable.java diff --git a/src/main/java/ic2/api/tile/package-info.class b/src/api/java/ic2/api/tile/package-info.class similarity index 100% rename from src/main/java/ic2/api/tile/package-info.class rename to src/api/java/ic2/api/tile/package-info.class diff --git a/src/main/java/ic2/api/tile/package-info.java b/src/api/java/ic2/api/tile/package-info.java similarity index 100% rename from src/main/java/ic2/api/tile/package-info.java rename to src/api/java/ic2/api/tile/package-info.java diff --git a/src/main/java/ic2/api/util/IKeyboard.class b/src/api/java/ic2/api/util/IKeyboard.class similarity index 100% rename from src/main/java/ic2/api/util/IKeyboard.class rename to src/api/java/ic2/api/util/IKeyboard.class diff --git a/src/main/java/ic2/api/util/IKeyboard.java b/src/api/java/ic2/api/util/IKeyboard.java similarity index 100% rename from src/main/java/ic2/api/util/IKeyboard.java rename to src/api/java/ic2/api/util/IKeyboard.java diff --git a/src/main/java/ic2/api/util/Keys.class b/src/api/java/ic2/api/util/Keys.class similarity index 100% rename from src/main/java/ic2/api/util/Keys.class rename to src/api/java/ic2/api/util/Keys.class diff --git a/src/main/java/ic2/api/util/Keys.java b/src/api/java/ic2/api/util/Keys.java similarity index 100% rename from src/main/java/ic2/api/util/Keys.java rename to src/api/java/ic2/api/util/Keys.java diff --git a/src/main/java/ic2/api/util/package-info.class b/src/api/java/ic2/api/util/package-info.class similarity index 100% rename from src/main/java/ic2/api/util/package-info.class rename to src/api/java/ic2/api/util/package-info.class diff --git a/src/main/java/ic2/api/util/package-info.java b/src/api/java/ic2/api/util/package-info.java similarity index 100% rename from src/main/java/ic2/api/util/package-info.java rename to src/api/java/ic2/api/util/package-info.java diff --git a/src/main/java/thaumcraft/api/BlockCoordinates.java b/src/api/java/thaumcraft/api/BlockCoordinates.java similarity index 100% rename from src/main/java/thaumcraft/api/BlockCoordinates.java rename to src/api/java/thaumcraft/api/BlockCoordinates.java diff --git a/src/main/java/thaumcraft/api/IArchitect.java b/src/api/java/thaumcraft/api/IArchitect.java similarity index 100% rename from src/main/java/thaumcraft/api/IArchitect.java rename to src/api/java/thaumcraft/api/IArchitect.java diff --git a/src/main/java/thaumcraft/api/IGoggles.java b/src/api/java/thaumcraft/api/IGoggles.java similarity index 100% rename from src/main/java/thaumcraft/api/IGoggles.java rename to src/api/java/thaumcraft/api/IGoggles.java diff --git a/src/main/java/thaumcraft/api/IRepairable.java b/src/api/java/thaumcraft/api/IRepairable.java similarity index 100% rename from src/main/java/thaumcraft/api/IRepairable.java rename to src/api/java/thaumcraft/api/IRepairable.java diff --git a/src/main/java/thaumcraft/api/IRepairableExtended.java b/src/api/java/thaumcraft/api/IRepairableExtended.java similarity index 100% rename from src/main/java/thaumcraft/api/IRepairableExtended.java rename to src/api/java/thaumcraft/api/IRepairableExtended.java diff --git a/src/main/java/thaumcraft/api/IRunicArmor.java b/src/api/java/thaumcraft/api/IRunicArmor.java similarity index 100% rename from src/main/java/thaumcraft/api/IRunicArmor.java rename to src/api/java/thaumcraft/api/IRunicArmor.java diff --git a/src/main/java/thaumcraft/api/IScribeTools.java b/src/api/java/thaumcraft/api/IScribeTools.java similarity index 100% rename from src/main/java/thaumcraft/api/IScribeTools.java rename to src/api/java/thaumcraft/api/IScribeTools.java diff --git a/src/main/java/thaumcraft/api/IVisDiscountGear.java b/src/api/java/thaumcraft/api/IVisDiscountGear.java similarity index 100% rename from src/main/java/thaumcraft/api/IVisDiscountGear.java rename to src/api/java/thaumcraft/api/IVisDiscountGear.java diff --git a/src/main/java/thaumcraft/api/IWarpingGear.java b/src/api/java/thaumcraft/api/IWarpingGear.java similarity index 100% rename from src/main/java/thaumcraft/api/IWarpingGear.java rename to src/api/java/thaumcraft/api/IWarpingGear.java diff --git a/src/main/java/thaumcraft/api/ItemApi.java b/src/api/java/thaumcraft/api/ItemApi.java similarity index 100% rename from src/main/java/thaumcraft/api/ItemApi.java rename to src/api/java/thaumcraft/api/ItemApi.java diff --git a/src/main/java/thaumcraft/api/ItemRunic.java b/src/api/java/thaumcraft/api/ItemRunic.java similarity index 100% rename from src/main/java/thaumcraft/api/ItemRunic.java rename to src/api/java/thaumcraft/api/ItemRunic.java diff --git a/src/main/java/thaumcraft/api/ThaumcraftApi.java b/src/api/java/thaumcraft/api/ThaumcraftApi.java similarity index 100% rename from src/main/java/thaumcraft/api/ThaumcraftApi.java rename to src/api/java/thaumcraft/api/ThaumcraftApi.java diff --git a/src/main/java/thaumcraft/api/ThaumcraftApiHelper.java b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java similarity index 100% rename from src/main/java/thaumcraft/api/ThaumcraftApiHelper.java rename to src/api/java/thaumcraft/api/ThaumcraftApiHelper.java diff --git a/src/main/java/thaumcraft/api/TileThaumcraft.java b/src/api/java/thaumcraft/api/TileThaumcraft.java similarity index 100% rename from src/main/java/thaumcraft/api/TileThaumcraft.java rename to src/api/java/thaumcraft/api/TileThaumcraft.java diff --git a/src/main/java/thaumcraft/api/WorldCoordinates.java b/src/api/java/thaumcraft/api/WorldCoordinates.java similarity index 100% rename from src/main/java/thaumcraft/api/WorldCoordinates.java rename to src/api/java/thaumcraft/api/WorldCoordinates.java diff --git a/src/main/java/thaumcraft/api/aspects/Aspect.java b/src/api/java/thaumcraft/api/aspects/Aspect.java similarity index 100% rename from src/main/java/thaumcraft/api/aspects/Aspect.java rename to src/api/java/thaumcraft/api/aspects/Aspect.java diff --git a/src/main/java/thaumcraft/api/aspects/AspectList.java b/src/api/java/thaumcraft/api/aspects/AspectList.java similarity index 100% rename from src/main/java/thaumcraft/api/aspects/AspectList.java rename to src/api/java/thaumcraft/api/aspects/AspectList.java diff --git a/src/main/java/thaumcraft/api/aspects/AspectSourceHelper.java b/src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java similarity index 100% rename from src/main/java/thaumcraft/api/aspects/AspectSourceHelper.java rename to src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java diff --git a/src/main/java/thaumcraft/api/aspects/IAspectContainer.java b/src/api/java/thaumcraft/api/aspects/IAspectContainer.java similarity index 100% rename from src/main/java/thaumcraft/api/aspects/IAspectContainer.java rename to src/api/java/thaumcraft/api/aspects/IAspectContainer.java diff --git a/src/main/java/thaumcraft/api/aspects/IAspectSource.java b/src/api/java/thaumcraft/api/aspects/IAspectSource.java similarity index 100% rename from src/main/java/thaumcraft/api/aspects/IAspectSource.java rename to src/api/java/thaumcraft/api/aspects/IAspectSource.java diff --git a/src/main/java/thaumcraft/api/aspects/IEssentiaContainerItem.java b/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java similarity index 100% rename from src/main/java/thaumcraft/api/aspects/IEssentiaContainerItem.java rename to src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java diff --git a/src/main/java/thaumcraft/api/aspects/IEssentiaTransport.java b/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java similarity index 100% rename from src/main/java/thaumcraft/api/aspects/IEssentiaTransport.java rename to src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java diff --git a/src/main/java/thaumcraft/api/crafting/CrucibleRecipe.java b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java similarity index 100% rename from src/main/java/thaumcraft/api/crafting/CrucibleRecipe.java rename to src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java diff --git a/src/main/java/thaumcraft/api/crafting/IArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java similarity index 100% rename from src/main/java/thaumcraft/api/crafting/IArcaneRecipe.java rename to src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java diff --git a/src/main/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java similarity index 100% rename from src/main/java/thaumcraft/api/crafting/IInfusionStabiliser.java rename to src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java diff --git a/src/main/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java similarity index 100% rename from src/main/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java rename to src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java diff --git a/src/main/java/thaumcraft/api/crafting/InfusionRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java similarity index 100% rename from src/main/java/thaumcraft/api/crafting/InfusionRecipe.java rename to src/api/java/thaumcraft/api/crafting/InfusionRecipe.java diff --git a/src/main/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java similarity index 100% rename from src/main/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java rename to src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java diff --git a/src/main/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java similarity index 100% rename from src/main/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java rename to src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java diff --git a/src/main/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java similarity index 100% rename from src/main/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java rename to src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java diff --git a/src/main/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java similarity index 100% rename from src/main/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java rename to src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java diff --git a/src/main/java/thaumcraft/api/entities/IEldritchMob.java b/src/api/java/thaumcraft/api/entities/IEldritchMob.java similarity index 100% rename from src/main/java/thaumcraft/api/entities/IEldritchMob.java rename to src/api/java/thaumcraft/api/entities/IEldritchMob.java diff --git a/src/main/java/thaumcraft/api/entities/ITaintedMob.java b/src/api/java/thaumcraft/api/entities/ITaintedMob.java similarity index 100% rename from src/main/java/thaumcraft/api/entities/ITaintedMob.java rename to src/api/java/thaumcraft/api/entities/ITaintedMob.java diff --git a/src/main/java/thaumcraft/api/internal/DummyInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java similarity index 100% rename from src/main/java/thaumcraft/api/internal/DummyInternalMethodHandler.java rename to src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java diff --git a/src/main/java/thaumcraft/api/internal/IInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java similarity index 100% rename from src/main/java/thaumcraft/api/internal/IInternalMethodHandler.java rename to src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java diff --git a/src/main/java/thaumcraft/api/internal/WeightedRandomLoot.java b/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java similarity index 100% rename from src/main/java/thaumcraft/api/internal/WeightedRandomLoot.java rename to src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java diff --git a/src/main/java/thaumcraft/api/nodes/INode.java b/src/api/java/thaumcraft/api/nodes/INode.java similarity index 100% rename from src/main/java/thaumcraft/api/nodes/INode.java rename to src/api/java/thaumcraft/api/nodes/INode.java diff --git a/src/main/java/thaumcraft/api/nodes/IRevealer.java b/src/api/java/thaumcraft/api/nodes/IRevealer.java similarity index 100% rename from src/main/java/thaumcraft/api/nodes/IRevealer.java rename to src/api/java/thaumcraft/api/nodes/IRevealer.java diff --git a/src/main/java/thaumcraft/api/nodes/NodeModifier.java b/src/api/java/thaumcraft/api/nodes/NodeModifier.java similarity index 100% rename from src/main/java/thaumcraft/api/nodes/NodeModifier.java rename to src/api/java/thaumcraft/api/nodes/NodeModifier.java diff --git a/src/main/java/thaumcraft/api/nodes/NodeType.java b/src/api/java/thaumcraft/api/nodes/NodeType.java similarity index 100% rename from src/main/java/thaumcraft/api/nodes/NodeType.java rename to src/api/java/thaumcraft/api/nodes/NodeType.java diff --git a/src/main/java/thaumcraft/api/package-info.java b/src/api/java/thaumcraft/api/package-info.java similarity index 100% rename from src/main/java/thaumcraft/api/package-info.java rename to src/api/java/thaumcraft/api/package-info.java diff --git a/src/main/java/thaumcraft/api/potions/PotionFluxTaint.java b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java similarity index 100% rename from src/main/java/thaumcraft/api/potions/PotionFluxTaint.java rename to src/api/java/thaumcraft/api/potions/PotionFluxTaint.java diff --git a/src/main/java/thaumcraft/api/potions/PotionVisExhaust.java b/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java similarity index 100% rename from src/main/java/thaumcraft/api/potions/PotionVisExhaust.java rename to src/api/java/thaumcraft/api/potions/PotionVisExhaust.java diff --git a/src/main/java/thaumcraft/api/research/IScanEventHandler.java b/src/api/java/thaumcraft/api/research/IScanEventHandler.java similarity index 100% rename from src/main/java/thaumcraft/api/research/IScanEventHandler.java rename to src/api/java/thaumcraft/api/research/IScanEventHandler.java diff --git a/src/main/java/thaumcraft/api/research/ResearchCategories.java b/src/api/java/thaumcraft/api/research/ResearchCategories.java similarity index 100% rename from src/main/java/thaumcraft/api/research/ResearchCategories.java rename to src/api/java/thaumcraft/api/research/ResearchCategories.java diff --git a/src/main/java/thaumcraft/api/research/ResearchCategoryList.java b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java similarity index 100% rename from src/main/java/thaumcraft/api/research/ResearchCategoryList.java rename to src/api/java/thaumcraft/api/research/ResearchCategoryList.java diff --git a/src/main/java/thaumcraft/api/research/ResearchItem.java b/src/api/java/thaumcraft/api/research/ResearchItem.java similarity index 100% rename from src/main/java/thaumcraft/api/research/ResearchItem.java rename to src/api/java/thaumcraft/api/research/ResearchItem.java diff --git a/src/main/java/thaumcraft/api/research/ResearchPage.java b/src/api/java/thaumcraft/api/research/ResearchPage.java similarity index 100% rename from src/main/java/thaumcraft/api/research/ResearchPage.java rename to src/api/java/thaumcraft/api/research/ResearchPage.java diff --git a/src/main/java/thaumcraft/api/research/ScanResult.java b/src/api/java/thaumcraft/api/research/ScanResult.java similarity index 100% rename from src/main/java/thaumcraft/api/research/ScanResult.java rename to src/api/java/thaumcraft/api/research/ScanResult.java diff --git a/src/main/java/thaumcraft/api/visnet/TileVisNode.java b/src/api/java/thaumcraft/api/visnet/TileVisNode.java similarity index 100% rename from src/main/java/thaumcraft/api/visnet/TileVisNode.java rename to src/api/java/thaumcraft/api/visnet/TileVisNode.java diff --git a/src/main/java/thaumcraft/api/visnet/VisNetHandler.java b/src/api/java/thaumcraft/api/visnet/VisNetHandler.java similarity index 100% rename from src/main/java/thaumcraft/api/visnet/VisNetHandler.java rename to src/api/java/thaumcraft/api/visnet/VisNetHandler.java diff --git a/src/main/java/thaumcraft/api/wands/FocusUpgradeType.java b/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java similarity index 100% rename from src/main/java/thaumcraft/api/wands/FocusUpgradeType.java rename to src/api/java/thaumcraft/api/wands/FocusUpgradeType.java diff --git a/src/main/java/thaumcraft/api/wands/IWandRodOnUpdate.java b/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java similarity index 100% rename from src/main/java/thaumcraft/api/wands/IWandRodOnUpdate.java rename to src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java diff --git a/src/main/java/thaumcraft/api/wands/IWandTriggerManager.java b/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java similarity index 100% rename from src/main/java/thaumcraft/api/wands/IWandTriggerManager.java rename to src/api/java/thaumcraft/api/wands/IWandTriggerManager.java diff --git a/src/main/java/thaumcraft/api/wands/IWandable.java b/src/api/java/thaumcraft/api/wands/IWandable.java similarity index 100% rename from src/main/java/thaumcraft/api/wands/IWandable.java rename to src/api/java/thaumcraft/api/wands/IWandable.java diff --git a/src/main/java/thaumcraft/api/wands/ItemFocusBasic.java b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java similarity index 100% rename from src/main/java/thaumcraft/api/wands/ItemFocusBasic.java rename to src/api/java/thaumcraft/api/wands/ItemFocusBasic.java diff --git a/src/main/java/thaumcraft/api/wands/StaffRod.java b/src/api/java/thaumcraft/api/wands/StaffRod.java similarity index 100% rename from src/main/java/thaumcraft/api/wands/StaffRod.java rename to src/api/java/thaumcraft/api/wands/StaffRod.java diff --git a/src/main/java/thaumcraft/api/wands/WandCap.java b/src/api/java/thaumcraft/api/wands/WandCap.java similarity index 100% rename from src/main/java/thaumcraft/api/wands/WandCap.java rename to src/api/java/thaumcraft/api/wands/WandCap.java diff --git a/src/main/java/thaumcraft/api/wands/WandRod.java b/src/api/java/thaumcraft/api/wands/WandRod.java similarity index 100% rename from src/main/java/thaumcraft/api/wands/WandRod.java rename to src/api/java/thaumcraft/api/wands/WandRod.java diff --git a/src/main/java/thaumcraft/api/wands/WandTriggerRegistry.java b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java similarity index 100% rename from src/main/java/thaumcraft/api/wands/WandTriggerRegistry.java rename to src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java diff --git a/src/main/java/ic2/api/Direction.class b/src/main/java/ic2/api/Direction.class deleted file mode 100644 index 9377993..0000000 Binary files a/src/main/java/ic2/api/Direction.class and /dev/null differ diff --git a/src/main/java/ic2/api/crops/CropCard.class b/src/main/java/ic2/api/crops/CropCard.class deleted file mode 100644 index e117b0c..0000000 Binary files a/src/main/java/ic2/api/crops/CropCard.class and /dev/null differ diff --git a/src/main/java/ic2/api/item/IKineticWindRotor.class b/src/main/java/ic2/api/item/IKineticWindRotor.class deleted file mode 100644 index 00f10fc..0000000 Binary files a/src/main/java/ic2/api/item/IKineticWindRotor.class and /dev/null differ diff --git a/src/main/java/ic2/api/item/ILatheItem.class b/src/main/java/ic2/api/item/ILatheItem.class deleted file mode 100644 index 7bbb877..0000000 Binary files a/src/main/java/ic2/api/item/ILatheItem.class and /dev/null differ diff --git a/src/main/java/ic2/api/network/NetworkHelper.class b/src/main/java/ic2/api/network/NetworkHelper.class deleted file mode 100644 index 85ff02b..0000000 Binary files a/src/main/java/ic2/api/network/NetworkHelper.class and /dev/null differ diff --git a/src/main/java/tombenpotter/emt/ElectroMagicTools.java b/src/main/java/tombenpotter/emt/ElectroMagicTools.java index 6155a39..03ccfd3 100644 --- a/src/main/java/tombenpotter/emt/ElectroMagicTools.java +++ b/src/main/java/tombenpotter/emt/ElectroMagicTools.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/src/main/java/tombenpotter/emt/client/EMTKeys.java b/src/main/java/tombenpotter/emt/client/EMTKeys.java index 8fa688e..5064ff3 100644 --- a/src/main/java/tombenpotter/emt/client/EMTKeys.java +++ b/src/main/java/tombenpotter/emt/client/EMTKeys.java @@ -8,32 +8,20 @@ import java.util.Set; import org.lwjgl.input.Keyboard; +import tombenpotter.emt.common.util.TextHelper; import cpw.mods.fml.client.registry.ClientRegistry; import net.minecraft.client.settings.KeyBinding; public class EMTKeys{ - private static Map keys = new HashMap(); - - public static void addKey(KeyBinding kb, String name){ - keys.put(name, kb); - } + public static KeyBinding keyUnequip; public static void registerKeys(){ - addKey(new KeyBinding("UnEquip", Keyboard.KEY_Z, "EMT"), "UnEquip"); - - for(Entry entry : keys.entrySet()){ - ClientRegistry.registerKeyBinding(entry.getValue()); - } + keyUnequip = new KeyBinding(TextHelper.localize("gui.EMT.key.unequip"), Keyboard.KEY_Z, "EMT"); + ClientRegistry.registerKeyBinding(keyUnequip); + } - public static KeyBinding getKey(String name){ - - for(Entry entry : keys.entrySet()){ - if(name.equals(entry.getKey())){ - return entry.getValue(); - } - } - - return null; + public static boolean keyUnequipPressed(){ + return keyUnequip.getIsKeyPressed(); } } \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java b/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java index c99ec5d..13eca43 100644 --- a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.client.gui; import net.minecraft.client.Minecraft; diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java b/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java index 24da41a..490a41d 100644 --- a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java +++ b/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.client.gui; import net.minecraft.client.Minecraft; diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java b/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java index 3118bc5..cc0344f 100644 --- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java +++ b/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.client.gui.container; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java index 3f8cd7a..cb23171 100644 --- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java +++ b/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.client.gui.container; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java b/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java index 33baace..9fca981 100644 --- a/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java +++ b/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java @@ -34,7 +34,6 @@ public class ModelCpecialArmor extends ModelBiped public int heldItemRight; public boolean isSneak; public boolean aimedBow; - private static final String __OBFID = "CL_00000840"; public ModelCpecialArmor() { diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderArcher.java b/src/main/java/tombenpotter/emt/client/renderer/RenderArcher.java deleted file mode 100644 index 96a1d6c..0000000 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderArcher.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.client.renderer; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.entity.RenderSnowMan; - -@SideOnly(Side.CLIENT) -public class RenderArcher extends RenderSnowMan { - -} diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java index 71549a9..c6e85e7 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.client.renderer; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/tombenpotter/emt/common/EMTResearch.java b/src/main/java/tombenpotter/emt/common/EMTResearch.java index 3b1e7b6..fe4d859 100644 --- a/src/main/java/tombenpotter/emt/common/EMTResearch.java +++ b/src/main/java/tombenpotter/emt/common/EMTResearch.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common; import ic2.api.item.IC2Items; diff --git a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java index 04b1be8..b9b87ac 100644 --- a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java +++ b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common; import cpw.mods.fml.common.Loader; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java index 6265fbd..5252b1d 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java index 79468cb..956d079 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java index 60a43eb..4f3203b 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java index 2853349..f4a3673 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java b/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java index ac50e02..0bfd7df 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java b/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java index 541bcd5..d96f3fe 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java @@ -22,7 +22,6 @@ public class BlockRegistry { public static Block emtSolars; public static Block emtMachines; public static Block emtSolars2; - //public static Block essentiaGenerator; public static void registerBlocks() { @@ -43,8 +42,5 @@ public class BlockRegistry { essentiaGens = new BlockEssentiaGenerators().setBlockName(ModInformation.modid + ".essentiaGens"); GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "EssentiaGenerators"); - - //essentiaGenerator = new BlockEssentiaGenerator().setBlockName(ModInformation.modid + ".essentiaGenerator"); - //GameRegistry.registerBlock(essentiaGenerator, ItemBlockEssentiaGenerator.class, "Essentia Generator"); } } diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java b/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java index faad4c8..f1f3f5a 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.blocks; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java b/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java index 656ce0d..606ee15 100644 --- a/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java +++ b/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.entities; import cpw.mods.fml.common.registry.EntityRegistry; @@ -23,7 +11,6 @@ public class BaseEntityRegistry { private static int startEID = 300; private static int entityIDs = 0; - private static final Class ARCHER_CLASS = EntityArcher.class; private static int getUniqueEntityID() { @@ -45,6 +32,6 @@ public class BaseEntityRegistry { EntityRegistry.registerModEntity(EntityLaser.class, "entityLaser", entityIDs++, ElectroMagicTools.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityArcher.class, "entityArcher", entityIDs++, ElectroMagicTools.instance, 80, 3, true); - registerEntityEgg(ARCHER_CLASS, 0x99111F, 0xE5685); + registerEntityEgg(EntityArcher.class, 0x99111F, 0xE5685); } } diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java b/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java index 65bceb8..e3d5f90 100644 --- a/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java +++ b/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.entities; import net.minecraft.enchantment.Enchantment; diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java b/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java index 669d4a1..62bd03b 100644 --- a/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java +++ b/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java @@ -187,7 +187,7 @@ public class EntityLaser extends Entity implements IProjectile { Vec3 vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); Vec3 vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec31, vec3, false, true, false); - vec31 = Vec3.createVectorHelper(this.posX - 5, this.posY, this.posZ); + vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (movingobjectposition != null) { @@ -252,9 +252,9 @@ public class EntityLaser extends Entity implements IProjectile { this.zTile = movingobjectposition.blockZ; this.inTile = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); this.inData = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); - this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX)); - this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY)); - this.motionZ = (double) ((float) (movingobjectposition.hitVec.zCoord - this.posZ)); + this.motionX = movingobjectposition.hitVec.xCoord - this.posX; + this.motionY = movingobjectposition.hitVec.yCoord - this.posY; + this.motionZ = movingobjectposition.hitVec.zCoord - this.posZ; f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); this.posX -= this.motionX / (double) f2 * 0.05000000074505806D; this.posY -= this.motionY / (double) f2 * 0.05000000074505806D; diff --git a/src/main/java/tombenpotter/emt/common/items/ItemBaseChainsaw.java b/src/main/java/tombenpotter/emt/common/items/ItemBaseChainsaw.java deleted file mode 100644 index e02a657..0000000 --- a/src/main/java/tombenpotter/emt/common/items/ItemBaseChainsaw.java +++ /dev/null @@ -1,127 +0,0 @@ -package tombenpotter.emt.common.items; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemAxe; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.StatList; -import net.minecraft.world.World; -import net.minecraftforge.common.IShearable; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.RandomHelper; - -import java.util.ArrayList; -import java.util.Random; - -public class ItemBaseChainsaw extends ItemAxe { - - public String textureName; - - public ItemBaseChainsaw(ToolMaterial material, int maxDamage, String textureName) { - super(material); - this.setCreativeTab(ElectroMagicTools.tabEMT); - this.setMaxStackSize(1); - this.setMaxDamage(maxDamage); - this.textureName = textureName; - this.efficiencyOnProperMaterial = this.toolMaterial.getEfficiencyOnProperMaterial(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaws" + textureName); - } - - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) { - if ((double) block.getBlockHardness(world, x, y, z) != 0.0D) stack.damageItem(1, entityLiving); - return true; - } - - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return false; - } - - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (block.getHarvestTool(meta) == null) { - return efficiencyOnProperMaterial; - } else { - if ((canHarvestBlock(block, stack) && (block.getHarvestTool(meta).equals("axe")) || Items.shears.canHarvestBlock(block, stack))) { - return efficiencyOnProperMaterial; - } - } - return super.getDigSpeed(stack, block, meta); - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - return RandomHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); - } - - @Override - public boolean isRepairable() { - return false; - } - - @Override - public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) { - return false; - } - - @Override - public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) return 0; - else return toolMaterial.getEnchantability(); - } - - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - return ConfigHandler.enchanting; - } - - @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase entityliving, EntityLivingBase attacker) { - stack.damageItem(1, attacker); - return true; - } - - @Override - public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { - if (player.worldObj.isRemote) { - return false; - } - Block block = player.worldObj.getBlock(x, y, z); - if (block instanceof IShearable) { - IShearable target = (IShearable) block; - if (target.isShearable(stack, player.worldObj, x, y, z)) { - ArrayList drops = target.onSheared(stack, player.worldObj, x, y, z, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); - Random rand = new Random(); - for (ItemStack drop : drops) { - float f = 0.7F; - double d = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d1 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d2 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(player.worldObj, (double) x + d, (double) y + d1, (double) z + d2, drop); - entityitem.delayBeforeCanPickup = 10; - player.worldObj.spawnEntityInWorld(entityitem); - } - stack.damageItem(1, player); - player.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(block)], 1); - } - } - return false; - } -} diff --git a/src/main/java/tombenpotter/emt/common/items/ItemBaseDrill.java b/src/main/java/tombenpotter/emt/common/items/ItemBaseDrill.java deleted file mode 100644 index 5fa46b6..0000000 --- a/src/main/java/tombenpotter/emt/common/items/ItemBaseDrill.java +++ /dev/null @@ -1,89 +0,0 @@ -package tombenpotter.emt.common.items; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemPickaxe; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.RandomHelper; - -public class ItemBaseDrill extends ItemPickaxe { - - public String textureName; - - public ItemBaseDrill(ToolMaterial material, int maxDamage, String textureName) { - super(material); - this.setCreativeTab(ElectroMagicTools.tabEMT); - this.setMaxStackSize(1); - this.setMaxDamage(maxDamage); - this.textureName = textureName; - this.efficiencyOnProperMaterial = this.toolMaterial.getEfficiencyOnProperMaterial(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/drills/" + textureName); - } - - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) { - if ((double) block.getBlockHardness(world, x, y, z) != 0.0D) stack.damageItem(1, entityLiving); - return true; - } - - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return false; - } - - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (block.getHarvestTool(meta) == null) { - return efficiencyOnProperMaterial; - } else { - if (canHarvestBlock(block, stack) && (block.getHarvestTool(meta).equals("pickaxe") || block.getHarvestTool(meta).equals("shovel"))) { - return efficiencyOnProperMaterial; - } - } - return super.getDigSpeed(stack, block, meta); - } - - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) { - return true; - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - return RandomHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); - } - - @Override - public boolean isRepairable() { - return false; - } - - @Override - public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) { - return false; - } - - @Override - public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) return 0; - else return toolMaterial.getEnchantability(); - } - - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - return ConfigHandler.enchanting; - } -} diff --git a/src/main/java/tombenpotter/emt/common/items/ItemBaseOmnitool.java b/src/main/java/tombenpotter/emt/common/items/ItemBaseOmnitool.java deleted file mode 100644 index 44f28b2..0000000 --- a/src/main/java/tombenpotter/emt/common/items/ItemBaseOmnitool.java +++ /dev/null @@ -1,122 +0,0 @@ -package tombenpotter.emt.common.items; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemPickaxe; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.StatList; -import net.minecraft.world.World; -import net.minecraftforge.common.IShearable; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.RandomHelper; - -import java.util.ArrayList; -import java.util.Random; - -public class ItemBaseOmnitool extends ItemPickaxe { - - public String textureName; - - public ItemBaseOmnitool(ToolMaterial material, int maxDamage, String textureName) { - super(material); - this.setCreativeTab(ElectroMagicTools.tabEMT); - this.setMaxStackSize(1); - this.setMaxDamage(maxDamage); - this.textureName = textureName; - this.efficiencyOnProperMaterial = this.toolMaterial.getEfficiencyOnProperMaterial(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitools" + textureName); - } - - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) { - if ((double) block.getBlockHardness(world, x, y, z) != 0.0D) stack.damageItem(1, entityLiving); - return true; - } - - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return false; - } - - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (block.getHarvestTool(meta) == null) { - return efficiencyOnProperMaterial; - } else { - if (canHarvestBlock(block, stack) && (block.getHarvestTool(meta).equals("pickaxe") || block.getHarvestTool(meta).equals("shovel")) || block.getHarvestTool(meta).equals("axe") || Items.shears.canHarvestBlock(block, stack)) { - return efficiencyOnProperMaterial; - } - } - return super.getDigSpeed(stack, block, meta); - } - - @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase entityliving, EntityLivingBase attacker) { - stack.damageItem(1, attacker); - return true; - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - return RandomHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); - } - - @Override - public boolean isRepairable() { - return false; - } - - @Override - public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) return 0; - else return toolMaterial.getEnchantability(); - } - - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - return ConfigHandler.enchanting; - } - - @Override - public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { - if (player.worldObj.isRemote) { - return false; - } - Block block = player.worldObj.getBlock(x, y, z); - if (block instanceof IShearable) { - IShearable target = (IShearable) block; - if (target.isShearable(stack, player.worldObj, x, y, z)) { - ArrayList drops = target.onSheared(stack, player.worldObj, x, y, z, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); - Random rand = new Random(); - for (ItemStack drop : drops) { - float f = 0.7F; - double d = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d1 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d2 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(player.worldObj, (double) x + d, (double) y + d1, (double) z + d2, drop); - entityitem.delayBeforeCanPickup = 10; - player.worldObj.spawnEntityInWorld(entityitem); - } - stack.damageItem(1, player); - player.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(block)], 1); - } - } - return false; - } -} diff --git a/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java b/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java index da3676a..4fa53f1 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java b/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java index b8e9c79..c7995ef 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java b/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java index 590d42b..b37d4f0 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java +++ b/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java @@ -11,12 +11,12 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApi; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.items.armor.ItemInfusedQuantum; import tombenpotter.emt.common.items.armor.wings.ItemFeatherWing; import tombenpotter.emt.common.items.armor.wings.ItemThaumiumReinforcedWing; import tombenpotter.emt.common.items.armor.boots.ItemElectricBootsTraveller; import tombenpotter.emt.common.items.armor.boots.ItemNanoBootsTraveller; import tombenpotter.emt.common.items.armor.boots.ItemQuantumBootsTraveller; +import tombenpotter.emt.common.items.armor.chestplates.ItemInfusedQuantumChestplate; import tombenpotter.emt.common.items.armor.goggles.ItemElectricGoggles; import tombenpotter.emt.common.items.armor.goggles.ItemNanoGoggles; import tombenpotter.emt.common.items.armor.goggles.ItemQuantumGoggles; @@ -88,7 +88,7 @@ public class ItemRegistry { onering = new ItemOneRing(); GameRegistry.registerItem(onering, "BaseBaubles"); - quantumArmor = new ItemInfusedQuantum(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.modid + ".quantum"); + quantumArmor = new ItemInfusedQuantumChestplate(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.modid + ".quantum"); electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric"); GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing"); diff --git a/src/main/java/tombenpotter/emt/common/items/ItemShardCarver.java b/src/main/java/tombenpotter/emt/common/items/ItemShardCarver.java deleted file mode 100644 index 987965c..0000000 --- a/src/main/java/tombenpotter/emt/common/items/ItemShardCarver.java +++ /dev/null @@ -1,14 +0,0 @@ -package tombenpotter.emt.common.items; - -import net.minecraft.item.Item; -import tombenpotter.emt.ElectroMagicTools; - -public class ItemShardCarver extends Item { - - public ItemShardCarver(int maxDamage) { - this.setCreativeTab(ElectroMagicTools.tabEMT); - this.setMaxDamage(maxDamage); - this.setMaxStackSize(1); - this.setNoRepair(); - } -} diff --git a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java index a6d5628..fda4e22 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java @@ -1,24 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - * - * Attention: this class originally belongs to the ThaumicTinkerer mod. - * All I did was modifying it to fulfill my needs. - * - * ThaumicTinkerer is Open Source and distributed under a - * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License - * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) - * - * http://www.minecraftforum.net/topic/1813058- - ******************************************************************************/ - package tombenpotter.emt.common.items.armor.boots; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java index b1a9c90..185c667 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java @@ -1,24 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - * - * Attention: this class originally belongs to the ThaumicTinkerer mod. - * All I did was modifying it to fulfill my needs. - * - * ThaumicTinkerer is Open Source and distributed under a - * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License - * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) - * - * http://www.minecraftforum.net/topic/1813058- - ******************************************************************************/ - package tombenpotter.emt.common.items.armor.boots; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java index 845c515..e74b098 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java @@ -1,24 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - * - * Attention: this class originally belongs to the ThaumicTinkerer mod. - * All I did was modifying it to fulfill my needs. - * - * ThaumicTinkerer is Open Source and distributed under a - * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License - * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) - * - * http://www.minecraftforum.net/topic/1813058- - ******************************************************************************/ - package tombenpotter.emt.common.items.armor.boots; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/ItemInfusedQuantum.java b/src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java similarity index 50% rename from src/main/java/tombenpotter/emt/common/items/armor/ItemInfusedQuantum.java rename to src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java index 409e652..b158b60 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/ItemInfusedQuantum.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items.armor; +package tombenpotter.emt.common.items.armor.chestplates; import cpw.mods.fml.common.eventhandler.EventBus; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -34,6 +34,8 @@ import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.model.ModelCpecialArmor; import tombenpotter.emt.client.model.ModelWings; import tombenpotter.emt.common.items.ItemRegistry; +import tombenpotter.emt.common.items.armor.wings.ItemNanoWing; +import tombenpotter.emt.common.items.armor.wings.ItemQuantumWing; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.RandomHelper; import tombenpotter.emt.common.util.TextHelper; @@ -55,13 +57,14 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.FoodStats; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.ISpecialArmor.ArmorProperties; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingFallEvent; -public class ItemInfusedQuantum extends ItemArmorElectric { +public class ItemInfusedQuantumChestplate extends ItemArmorElectric { IIcon icon0; IIcon icon1; @@ -74,13 +77,10 @@ public class ItemInfusedQuantum extends ItemArmorElectric { public static AudioSource audioSource; private static boolean lastJetpackUsed = false; - public ItemInfusedQuantum(InternalName internalName, int armorType1) { - super(internalName, InternalName.quantum, armorType1, 2000000, 12000.0D, 4); - + public ItemInfusedQuantumChestplate(InternalName internalName, int armorType) { + super(internalName, InternalName.quantum, armorType, 2000000, 12000.0D, 4); MinecraftForge.EVENT_BUS.register(this); - this.setCreativeTab(ElectroMagicTools.tabEMT); - potionRemovalCost.put(Integer.valueOf(Potion.poison.id), Integer.valueOf(10000)); potionRemovalCost.put(Integer.valueOf(IC2Potion.radiation.id), Integer.valueOf(10000)); potionRemovalCost.put(Integer.valueOf(Potion.wither.id), Integer.valueOf(25000)); @@ -136,153 +136,135 @@ public class ItemInfusedQuantum extends ItemArmorElectric { byte toggleTimer = nbtData.getByte("toggleTimer"); boolean ret = false; - IC2.platform.profilerStartSection("QuantumBodyarmor"); - boolean jetpack = nbtData.getBoolean("jetpack"); boolean hoverMode = nbtData.getBoolean("hoverMode"); boolean jetpackUsed = false; String useother = nbtData.getString("useother"); - if(!useother.equals("TW") && !useother.equals("NW") && !useother.equals("QW") && !useother.equals("Jetpack") && !useother.equals("None")){ - nbtData.setString("useother", "None"); - } + if(!world.isRemote){ - if ((IC2.keyboard.isJumpKeyDown(player)) && (IC2.keyboard.isModeSwitchKeyDown(player)) && (toggleTimer == 0)) { - toggleTimer = 30; - hoverMode = !hoverMode; - if (IC2.platform.isSimulating()) - { - nbtData.setBoolean("hoverMode", hoverMode); - if (hoverMode) + if(!useother.equals("TW") && !useother.equals("NW") && !useother.equals("QW") && !useother.equals("Jetpack") && !useother.equals("None")){ + nbtData.setString("useother", "None"); + } + + if ((IC2.keyboard.isJumpKeyDown(player)) && (IC2.keyboard.isModeSwitchKeyDown(player)) && (toggleTimer == 0)) { + toggleTimer = 30; + hoverMode = !hoverMode; + if (IC2.platform.isSimulating()) { - IC2.platform.messagePlayer(player, "Hover Mode enabled.", new Object[0]); - } else - { - IC2.platform.messagePlayer(player, "Hover Mode disabled.", new Object[0]); + nbtData.setBoolean("hoverMode", hoverMode); + if (hoverMode) + { + IC2.platform.messagePlayer(player, "Hover Mode enabled.", new Object[0]); + } else + { + IC2.platform.messagePlayer(player, "Hover Mode disabled.", new Object[0]); + } } } - } - if(player.inventory.getCurrentItem() != null){ - if(IC2.keyboard.isSneakKeyDown(player) && (player.inventory.getCurrentItem().getUnlocalizedName().equals("ic2.itemArmorJetpackElectric")) && toggleTimer == 0 && useother.equals("None")){ - toggleTimer = 30; - if (IC2.platform.isSimulating()) { - player.inventory.armorInventory[2].stackTagCompound.setBoolean("jetpack", true); + if(player.inventory.getCurrentItem() != null && player.isSneaking() && toggleTimer == 0 && useother.equals("None")){ + if(player.inventory.getCurrentItem().getItem() == IC2Items.getItem("electricJetpack").getItem()){ + nbtData.setBoolean("jetpack", true); IC2.platform.messagePlayer(player, "Jetpack enabled.", new Object[0]); - if(player.inventory.armorInventory[2] == itemStack){ - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "Jetpack"); - player.inventory.armorInventory[2].stackTagCompound.setInteger("jetpackCharge", (int) ElectricItem.manager.getCharge(player.inventory.getCurrentItem())); - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + + nbtData.setString("useother", "Jetpack"); + int charge = (int)ElectricItem.manager.getCharge(itemStack); + if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < 30000){ + ElectricItem.manager.use(itemStack, 30000 - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player); } + nbtData.setInteger("jetpackCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack))); + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + } - } - } - - if(player.inventory.getCurrentItem() != null){ - if(IC2.keyboard.isSneakKeyDown(player) && player.inventory.getCurrentItem().getItem() == ItemRegistry.thaumiumWing && toggleTimer == 0 && useother.equals("None")){ - toggleTimer = 30; - if (IC2.platform.isSimulating()) { + + else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.thaumiumWing){ IC2.platform.messagePlayer(player, "Thaumium wings enabled.", new Object[0]); - if(player.inventory.armorInventory[2] == itemStack){ - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "TW"); - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); - } + player.inventory.armorInventory[2].stackTagCompound.setString("useother", "TW"); + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } - } - } - - if(player.inventory.getCurrentItem() != null){ - if(IC2.keyboard.isSneakKeyDown(player) && player.inventory.getCurrentItem().getItem() == ItemRegistry.nanoWing && toggleTimer == 0 && useother.equals("None")){ - toggleTimer = 30; - if (IC2.platform.isSimulating()) { + + else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.nanoWing){ IC2.platform.messagePlayer(player, "Nano wings enabled.", new Object[0]); - if(player.inventory.armorInventory[2] == itemStack){ - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "NW"); - player.inventory.armorInventory[2].stackTagCompound.setInteger("NWCharge", (int) ElectricItem.manager.getCharge(player.inventory.getCurrentItem())); - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.inventory.armorInventory[2].stackTagCompound.setString("useother", "NW"); + int charge = (int)ElectricItem.manager.getCharge(itemStack); + if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < ItemNanoWing.maxCharge){ + ElectricItem.manager.use(itemStack, ItemNanoWing.maxCharge - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player); } + nbtData.setInteger("NWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack))); + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } - } - } - - if(player.inventory.getCurrentItem() != null){ - if(IC2.keyboard.isSneakKeyDown(player) && player.inventory.getCurrentItem().getItem() == ItemRegistry.quantumWing && toggleTimer == 0 && useother.equals("None")){ - toggleTimer = 30; - if (IC2.platform.isSimulating()) { + + else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.quantumWing){ IC2.platform.messagePlayer(player, "Quantum wings enabled.", new Object[0]); - if(player.inventory.armorInventory[2] == itemStack){ - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "QW"); - player.inventory.armorInventory[2].stackTagCompound.setInteger("QWCharge", (int) ElectricItem.manager.getCharge(player.inventory.getCurrentItem())); - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.inventory.armorInventory[2].stackTagCompound.setString("useother", "QW"); + int charge = (int)ElectricItem.manager.getCharge(itemStack); + if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < ItemQuantumWing.maxCharge){ + ElectricItem.manager.use(itemStack, ItemQuantumWing.maxCharge - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player); } + nbtData.setInteger("QWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack))); + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } } + + if(player.inventory.getCurrentItem() == null && player.inventory.armorInventory[2] == itemStack && nbtData.getBoolean("unequip") && player.isSneaking() && toggleTimer == 0 && IC2.platform.isSimulating()){ + toggleTimer = 30; + + if(useother.equals("Jetpack")){ + IC2.platform.messagePlayer(player, "Jetpack disabled.", new Object[0]); + player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); + ItemStack charged = new ItemStack(IC2Items.getItem("electricJetpack").getItem()); + if(player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge") > 0) + ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), 1, true, false); + else + ElectricItem.manager.charge(charged, 0, 1, true, false); + player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); + } + + if(useother.equals("TW")){ + IC2.platform.messagePlayer(player, "Thaumium wings disabled.", new Object[0]); + player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); + player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(ItemRegistry.thaumiumWing)); + } + + if(useother.equals("NW")){ + IC2.platform.messagePlayer(player, "Nano wings disabled.", new Object[0]); + player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); + ItemStack charged = new ItemStack(ItemRegistry.nanoWing); + if(nbtData.getInteger("NWCharge") > 0) + ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge"), 3, true, false); + else + ElectricItem.manager.charge(charged, 0, 3, true, false); + player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); + } + + if(useother.equals("QW")){ + IC2.platform.messagePlayer(player, "Quantum wings disabled.", new Object[0]); + player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); + ItemStack charged = new ItemStack(ItemRegistry.quantumWing); + if(nbtData.getInteger("QWCharge") > 0) + ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge"), 3, true, false); + else + ElectricItem.manager.charge(charged, 0, 3, true, false); + player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); + } + + nbtData.setBoolean("unequip", false); + + } } - if(player.inventory.getCurrentItem() == null && nbtData.getBoolean("unequip") && player.isSneaking() && toggleTimer == 0 && IC2.platform.isSimulating()){ - toggleTimer = 30; - if(player.inventory.armorInventory[2] == itemStack){ - if(player.inventory.getCurrentItem() == null){ - if(useother.equals("Jetpack")){ - IC2.platform.messagePlayer(player, "Jetpack disabled.", new Object[0]); - jetpack = false; - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); - ItemStack charged = new ItemStack(IC2Items.getItem("electricJetpack").getItem()); - if(player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge") > 50) - ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), true, false); - else - ElectricItem.manager.charge(charged, 50, 50, true, false); - player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); - } - - if(useother.equals("TW")){ - IC2.platform.messagePlayer(player, "Thaumium wings disabled.", new Object[0]); - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); - player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(ItemRegistry.thaumiumWing)); - } - - if(useother.equals("NW")){ - IC2.platform.messagePlayer(player, "Nano wings disabled.", new Object[0]); - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); - ItemStack charged = new ItemStack(ItemRegistry.nanoWing); - if(player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge") > 1) - ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge"), player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge"), true, false); - else - ElectricItem.manager.charge(charged, 1, 1, true, false); - player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); - } - - if(useother.equals("QW")){ - IC2.platform.messagePlayer(player, "Quantum wings disabled.", new Object[0]); - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); - ItemStack charged = new ItemStack(ItemRegistry.quantumWing); - if(player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge") > 1) - ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge"), player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge"), true, false); - else - ElectricItem.manager.charge(charged, 1, 1, true, false); - player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); - } - - nbtData.setBoolean("unequip", false); - } - } - } - - if ((jetpack) && ((IC2.keyboard.isJumpKeyDown(player)) && (useother.equals("Jetpack")) || ((hoverMode) && (player.motionY < -0.029999999329447746D)))) { + if ((IC2.keyboard.isJumpKeyDown(player) && useother.equals("Jetpack")) || (hoverMode && player.motionY < -0.029999999329447746D)) { jetpackUsed = useJetpack(player, hoverMode, itemStack); } - if ((useother.equals("TW"))) { - useWings(player, itemStack, world, 0.15f, 0.7f, 0.5f, false); - } + if(useother.equals("TW")) + useWings(player, itemStack, world, 0.15f, 0.7f, 0.5f, 0, false); + if(useother.equals("NW")) + useWings(player, itemStack, world, 0.25f, 0.6f, 0.3f, 5, true); + if(useother.equals("QW")) + useWings(player, itemStack, world, 0.33f, 0.5f, 0.2f, 7, true); - if ((useother.equals("NW"))) { - useWings(player, itemStack, world, 0.25f, 0.6f, 0.3f, true); - } - - if ((useother.equals("QW"))) { - useWings(player, itemStack, world, 0.33f, 0.5f, 0.2f, true); - } if ((IC2.platform.isSimulating()) && (toggleTimer > 0)) { toggleTimer = (byte) (toggleTimer - 1); @@ -308,15 +290,10 @@ public class ItemInfusedQuantum extends ItemArmorElectric { } } - if(world.isRemote){ - getIconIndex(itemStack); - } ret = jetpackUsed; player.extinguish(); - IC2.platform.profilerEndSection(); - if (ret) { player.inventoryContainer.detectAndSendChanges(); } @@ -327,48 +304,38 @@ public class ItemInfusedQuantum extends ItemArmorElectric { public IIcon getIconIndex(ItemStack stack){ try{ String useother = stack.stackTagCompound.getString("useother"); - if(useother.equals("Jetpack")){ + + if(useother.equals("Jetpack")) return icon1; - } - if(useother.equals("TW")){ + if(useother.equals("TW")) return icon2; - } - if(useother.equals("NW")){ + if(useother.equals("NW")) return icon3; - } - if(useother.equals("QW")){ + if(useother.equals("QW")) return icon4; - } - } - catch(Exception ex){ + return icon0; } - - return icon0; + catch(Exception ex){return icon0;} } @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining){ try{ String useother = stack.stackTagCompound.getString("useother"); - if(useother.equals("Jetpack")){ + + if(useother.equals("Jetpack")) return icon1; - } - if(useother.equals("TW")){ + if(useother.equals("TW")) return icon2; - } - if(useother.equals("NW")){ + if(useother.equals("NW")) return icon3; - } - if(useother.equals("QW")){ + if(useother.equals("QW")) return icon4; - } - } - catch(Exception e){ + return icon0; } - - return icon0; + catch(Exception e){return icon0;} } @Override @@ -384,18 +351,15 @@ public class ItemInfusedQuantum extends ItemArmorElectric { @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { String useother = stack.stackTagCompound.getString("useother"); - if(useother.equals("Jetpack")){ + + if(useother.equals("Jetpack")) return ModInformation.texturePath + ":textures/models/quantum_jetpack.png"; - } - if(useother.equals("TW")){ + if(useother.equals("TW")) return ModInformation.texturePath + ":textures/models/quantum_wings_t.png"; - } - if(useother.equals("NW")){ + if(useother.equals("NW")) return ModInformation.texturePath + ":textures/models/quantum_wings_n.png"; - } - if(useother.equals("QW")){ + if(useother.equals("QW")) return ModInformation.texturePath + ":textures/models/quantum_wings_q.png"; - } return ModInformation.texturePath + ":textures/models/quantum.png"; } @@ -424,15 +388,17 @@ public class ItemInfusedQuantum extends ItemArmorElectric { public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { try{ String useother = stack.stackTagCompound.getString("useother"); - if(useother.equals("Jetpack")){ - list.add((stack.stackTagCompound.getInteger("jetpackCharge")) + " EU JETPACK"); - } - if(useother.equals("NW")){ - list.add((stack.stackTagCompound.getInteger("NWCharge")) + " EU NW"); - } - if(useother.equals("QW")){ - list.add((stack.stackTagCompound.getInteger("QWCharge")) + " EU QW"); - } + list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + tier); + //list.add(ElectricItem.manager.getCharge(stack) + " EU"); + //if(useother.equals("Jetpack")){ + // list.add(stack.stackTagCompound.getInteger("jetpackCharge") + " EU JETPACK"); + //} + //if(useother.equals("NW")){ + // list.add(stack.stackTagCompound.getInteger("NWCharge") + " EU NW"); + //} + //if(useother.equals("QW")){ + // list.add(stack.stackTagCompound.getInteger("QWCharge") + " EU QW"); + //} } catch(NullPointerException e){} } @@ -441,13 +407,13 @@ public class ItemInfusedQuantum extends ItemArmorElectric { int jetpackMaxCharge = 30000; ItemStack jetpack = player.inventory.armorInventory[2]; - if (stack.stackTagCompound.getInteger("jetpackCharge") == 0){ + if (ElectricItem.manager.getCharge(stack) <= 0) return false; - } + float power = 1.0F; float dropPercentage = 0.05F; - if (((float)stack.stackTagCompound.getInteger("jetpackCharge") / (float)jetpackMaxCharge) <= dropPercentage){ - power = (float) (power * (stack.stackTagCompound.getInteger("jetpackCharge") / (float)jetpackMaxCharge) * dropPercentage); + if (((float)ElectricItem.manager.getCharge(stack) / (float)jetpackMaxCharge) <= dropPercentage){ + power = (float) (power * (ElectricItem.manager.getCharge(stack) / (float)jetpackMaxCharge) * dropPercentage); } if (IC2.keyboard.isForwardKeyDown(player)) { float retruster = 3.5F; @@ -490,51 +456,50 @@ public class ItemInfusedQuantum extends ItemArmorElectric { if (hoverMode) { consume = 10.0D; } - stack.stackTagCompound.setInteger("jetpackCharge", (int)(stack.stackTagCompound.getInteger("jetpackCharge") - consume)); + ElectricItem.manager.use(stack, consume, player); + player.fallDistance = 0.0F; player.distanceWalkedModified = 0.0F; IC2.platform.resetPlayerInAirTime(player); return true; } - void useWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1, boolean isElectric){ + void useWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1, int amount, boolean isElectric){ NBTTagCompound nbtData = StackUtil.getOrCreateNbtData(stack); - - if((nbtData.getString("useother").equals("NW") && nbtData.getInteger("NWCharge") > 0) || (nbtData.getString("useother").equals("QW") && nbtData.getInteger("QWCharge") > 0) || nbtData.getString("useother").equals("TW")){ - - nbtData.setBoolean("isJumping", IC2.keyboard.isJumpKeyDown(player)); - if(nbtData.getBoolean("isJumping")){ - nbtData.setBoolean("isHolding", true); - nbtData.setInteger("f", nbtData.getInteger("f") + 1); - if(nbtData.getInteger("f") > 7) nbtData.setInteger("f", 7); - } - else if(nbtData.getBoolean("isHolding")){ - nbtData.setBoolean("isHolding", false); - player.motionY = motionY * nbtData.getInteger("f"); - if(player.motionX < 0.7 && player.motionZ < 0.7){ - player.motionX /= motionXZ; - player.motionZ /= motionXZ; - } - world.playSoundEffect(player.posX, player.posY, player.posZ, "mob.ghast.fireball", 1, 1); - for(int i = 0; i < 4; i++){ - world.spawnParticle("cloud", player.posX - 1 + (rnd.nextInt(100) / 50d), player.posY - 1, player.posZ - 1 + (rnd.nextInt(100) / 50d), 0, -0.5, 0); - } - nbtData.setInteger("f", 0); - } - if (nbtData.getBoolean("isJumping") && !player.onGround && player.motionY < 0) - player.motionY *= f1; + nbtData.setBoolean("isJumping", IC2.keyboard.isJumpKeyDown(player)); + if(nbtData.getBoolean("isJumping")){ + nbtData.setBoolean("isHolding", true); + nbtData.setInteger("f", nbtData.getInteger("f") + 1); + if(nbtData.getInteger("f") > 7) nbtData.setInteger("f", 7); + } + else if(nbtData.getBoolean("isHolding")){ + nbtData.setBoolean("isHolding", false); + player.motionY = motionY * nbtData.getInteger("f"); + ElectricItem.manager.use(stack, ((motionY * nbtData.getInteger("f")) * 100) * amount, player); + if(player.motionX < 0.5 && player.motionZ < 0.5 && player.motionX > -0.5 && player.motionZ > -0.5){ + player.motionX /= motionXZ; + player.motionZ /= motionXZ; + } + world.playSoundEffect(player.posX, player.posY, player.posZ, "mob.ghast.fireball", 1, 1); + for(int i = 0; i < 4; i++){ + world.spawnParticle("cloud", player.posX - 1 + (rnd.nextInt(100) / 50d), player.posY - 1, player.posZ - 1 + (rnd.nextInt(100) / 50d), 0, -0.5, 0); + } + nbtData.setInteger("f", 0); + } - if (player.isInWater() && !player.capabilities.isCreativeMode) player.motionY += -0.2; + if (nbtData.getBoolean("isJumping") && !player.onGround && player.motionY < 0) + player.motionY *= f1; + + if (player.isInWater() && !player.capabilities.isCreativeMode) player.motionY += -0.2; - if(ConfigHandler.impactOfRain){ - if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode) - player.motionY = -0.3; - } - - if (player.isSneaking() && !player.onGround) player.motionY = -0.6; - - if (player.fallDistance > 0.0F) player.fallDistance = 0; - } + if(ConfigHandler.impactOfRain){ + if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode) + player.motionY = -0.3; + } + if (player.isSneaking() && !player.onGround) player.motionY = -0.6; + + if (player.fallDistance > 0.0F) player.fallDistance = 0; + } } \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java index fb9ebe5..3312620 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.armor.goggles; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java index 7693db8..e3763e9 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.armor.goggles; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java index 46c0550..9abcf8c 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.armor.goggles; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java index d30d90f..3d751bd 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.armor.goggles; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java index 2784645..e7c3070 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java @@ -2,6 +2,7 @@ package tombenpotter.emt.common.items.armor.wings; import java.util.Random; +import ic2.api.item.ElectricItem; import ic2.core.IC2; import ic2.core.util.StackUtil; import cpw.mods.fml.relauncher.Side; @@ -63,10 +64,10 @@ public class ItemFeatherWing extends ItemArmor { @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { - updateWings(player, stack, world, 0.09f, 0.9f, 0.9f); + updateWings(player, stack, world, 0.09f, 0.9f, 0.9f, 0); } - public void updateWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1){ + public void updateWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1, int amount){ NBTTagCompound nbtData = StackUtil.getOrCreateNbtData(stack); boolean isJmuping = nbtData.getBoolean("isJumping"); boolean isHolding = nbtData.getBoolean("isHolding"); @@ -83,7 +84,8 @@ public class ItemFeatherWing extends ItemArmor { nbtData.setBoolean("isHolding", false); player.motionY = motionY * f; - if(player.motionX < 0.7 && player.motionZ < 0.7){ + ElectricItem.manager.use(stack, ((motionY * nbtData.getInteger("f")) * 100) * amount, player); + if(player.motionX < 0.5 && player.motionZ < 0.5 && player.motionX > -0.5 && player.motionZ > -0.5){ player.motionX /= motionXZ; player.motionZ /= motionXZ; } diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java index 89c141c..f6bfd47 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java @@ -25,7 +25,7 @@ import java.util.List; public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectricItem, ISpecialArmor, IMetalArmor { - public int maxCharge = 100000; + public static int maxCharge = 100000; public int tier = 3; public double transferLimit = 1000; public int energyPerDamage = 100; @@ -66,7 +66,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { - this.updateWings(player, stack, world, 0.25f, 0.6f, 0.3f); + this.updateWings(player, stack, world, 0.25f, 0.6f, 0.3f, 5); } @Override diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java index 5f375a4..f441fc6 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java @@ -13,13 +13,13 @@ import tombenpotter.emt.ModInformation; import tombenpotter.emt.common.util.ConfigHandler; public class ItemQuantumWing extends ItemNanoWing { + public static int maxCharge = 1000000; public ItemQuantumWing(ArmorMaterial material, int par3, int par4) { super(material, par3, par4); this.setMaxStackSize(1); this.setMaxDamage(27); this.setCreativeTab(ElectroMagicTools.tabEMT); - maxCharge = 1000000; visDiscount = 6; transferLimit = 10000; energyPerDamage = 1000; @@ -39,6 +39,11 @@ public class ItemQuantumWing extends ItemNanoWing { @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { - this.updateWings(player, stack, world, 0.33f, 0.5f, 0.2f); + this.updateWings(player, stack, world, 0.33f, 0.5f, 0.2f, 7); + } + + @Override + public double getMaxCharge(ItemStack itemStack) { + return maxCharge; } } diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java index d40fd60..de86acb 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java @@ -57,6 +57,6 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { - this.updateWings(player, stack, world, 0.15f, 0.7f, 0.5f); + this.updateWings(player, stack, world, 0.15f, 0.7f, 0.5f, 0); } } diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java index b95d7ed..b94da92 100644 --- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java +++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.blocks; import net.minecraft.block.Block; diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java index c171985..a78b232 100644 --- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.blocks; import net.minecraft.block.Block; diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java index 0d921ff..43b6cfb 100644 --- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.blocks; import net.minecraft.block.Block; diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java index 252fb0a..6896fb9 100644 --- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java +++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.blocks; import net.minecraft.block.Block; diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java index b5e74c8..a3231f4 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.foci; import ic2.api.item.ElectricItem; diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java index 5051061..90f44fa 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.foci; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java index c1aba2f..ed5ab4d 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.foci; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java index 64eceb2..ca0267d 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.foci; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java index 9cc4d30..aba73cb 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.tools; import cpw.mods.fml.relauncher.Side; @@ -55,7 +43,6 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem { this.icon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/hoe_growth"); } - @SuppressWarnings({"rawtypes", "unchecked"}) @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { ItemStack itemStack = new ItemStack(this, 1); @@ -83,8 +70,8 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) { - if(ElectricItem.manager.getCharge(stack) > 50){ - ElectricItem.manager.discharge(stack, 50, 2, true, false, false); + if(ElectricItem.manager.canUse(stack, 50)){ + ElectricItem.manager.use(stack, 50, player); boolean did = false; for (int x1 = -1; x1 <= 1; x1++) { for (int z1 = -1; z1 <= 1; z1++) { @@ -104,24 +91,23 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem { { Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); - if ((block == ConfigBlocks.blockCustomPlant) && (meta == 0) && (ElectricItem.manager.getCharge(stack) + 20 <= this.getMaxCharge(stack))) + if ((block == ConfigBlocks.blockCustomPlant) && (meta == 0) && ElectricItem.manager.canUse(stack, 50)) { ((BlockCustomPlant)block).growGreatTree(world, x, y, z, world.rand); - ElectricItem.manager.discharge(stack, 50, 2, true, false, false); + ElectricItem.manager.use(stack, 50, player); Thaumcraft.proxy.blockSparkle(world, x, y, z, 0, 2); did = true; } - else if ((block == ConfigBlocks.blockCustomPlant) && (meta == 1) && (ElectricItem.manager.getCharge(stack) + 150 <= this.getMaxCharge(stack))) + else if ((block == ConfigBlocks.blockCustomPlant) && (meta == 1) && ElectricItem.manager.canUse(stack, 250)) { ((BlockCustomPlant)block).growSilverTree(world, x, y, z, world.rand); - ElectricItem.manager.discharge(stack, 250, 2, true, false, false); + ElectricItem.manager.use(stack, 250, player); Thaumcraft.proxy.blockSparkle(world, x, y, z, 0, 2); did = true; } } else { - ElectricItem.manager.discharge(stack, 1, 2, true, false, false); Thaumcraft.proxy.blockSparkle(world, x, y, z, 0, 3); } if (did) { diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java index 47c2278..4cadd62 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.tools; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java index e2938a8..f61bc1d 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.tools; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java index 33bcfe7..7c15173 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.tools; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaChainsaw.java deleted file mode 100644 index 31d1eb0..0000000 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaChainsaw.java +++ /dev/null @@ -1,66 +0,0 @@ -package tombenpotter.emt.common.items.tools; - -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import tombenpotter.emt.common.items.ItemBaseChainsaw; -import tombenpotter.emt.common.util.IRefillable; - -public class ItemVanillaChainsaw extends ItemBaseChainsaw implements IRefillable { - - public Item repairMaterial; - public int repairMeta; - public float damageAdded; - - public ItemVanillaChainsaw(ToolMaterial material, int maxDamage, String textureName, Item repairMaterial) { - super(material, maxDamage, textureName); - this.repairMaterial = repairMaterial; - this.repairMeta = 0; - damageAdded = 2; - } - - public ItemVanillaChainsaw(ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, float damageAdded) { - super(material, maxDamage, textureName); - this.repairMaterial = repairMaterial; - this.repairMeta = 0; - this.damageAdded = damageAdded; - } - - public ItemVanillaChainsaw(ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, int repairMeta) { - super(material, maxDamage, textureName); - this.repairMaterial = repairMaterial; - this.repairMeta = repairMeta; - damageAdded = 2; - } - - public ItemVanillaChainsaw(ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, int repairMeta, float damageAdded) { - super(material, maxDamage, textureName); - this.repairMaterial = repairMaterial; - this.repairMeta = repairMeta; - this.damageAdded = damageAdded; - } - - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return (block.getHarvestLevel(new ItemStack(Item.getItemFromBlock(block)).getItemDamage()) <= this.toolMaterial.getHarvestLevel()); - } - - @Override - public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) { - return (stack2.getItem() == repairMaterial && stack2.getItemDamage() == repairMeta) ? true : super.getIsRepairable(stack1, stack2); - } - - @Override - public boolean isRepairable() { - return true; - } - - @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase entityliving, EntityLivingBase attacker) { - stack.damageItem(1, attacker); - entityliving.attackEntityFrom(DamageSource.generic, damageAdded); - return true; - } -} diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaDrill.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaDrill.java deleted file mode 100644 index f6990f2..0000000 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaDrill.java +++ /dev/null @@ -1,32 +0,0 @@ -package tombenpotter.emt.common.items.tools; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.items.ItemBaseDrill; -import tombenpotter.emt.common.util.IRefillable; - -public class ItemVanillaDrill extends ItemBaseDrill implements IRefillable { - - public ItemStack repairMaterial; - - public ItemVanillaDrill(ToolMaterial material, int maxDamage, String textureName, ItemStack repairMaterial) { - super(material, maxDamage, textureName); - this.repairMaterial = repairMaterial; - } - - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return (block.getHarvestLevel(new ItemStack(Item.getItemFromBlock(block)).getItemDamage()) <= this.toolMaterial.getHarvestLevel()); - } - - @Override - public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) { - return stack2.isItemEqual(repairMaterial) ? true : super.getIsRepairable(stack1, stack2); - } - - @Override - public boolean isRepairable() { - return true; - } -} diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaOmnitool.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaOmnitool.java deleted file mode 100644 index 1c887cf..0000000 --- a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaOmnitool.java +++ /dev/null @@ -1,66 +0,0 @@ -package tombenpotter.emt.common.items.tools; - -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import tombenpotter.emt.common.items.ItemBaseOmnitool; -import tombenpotter.emt.common.util.IRefillable; - -public class ItemVanillaOmnitool extends ItemBaseOmnitool implements IRefillable{ - - public Item repairMaterial; - public int repairMeta; - public float damageAdded; - - public ItemVanillaOmnitool(Item.ToolMaterial material, int maxDamage, String textureName, Item repairMaterial) { - super(material, maxDamage, textureName); - this.repairMaterial = repairMaterial; - this.repairMeta = 0; - damageAdded = 4; - } - - public ItemVanillaOmnitool(Item.ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, float damageAdded) { - super(material, maxDamage, textureName); - this.repairMaterial = repairMaterial; - this.repairMeta = 0; - this.damageAdded = damageAdded; - } - - public ItemVanillaOmnitool(Item.ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, int repairMeta) { - super(material, maxDamage, textureName); - this.repairMaterial = repairMaterial; - this.repairMeta = repairMeta; - damageAdded = 4; - } - - public ItemVanillaOmnitool(Item.ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, int repairMeta, float damageAdded) { - super(material, maxDamage, textureName); - this.repairMaterial = repairMaterial; - this.repairMeta = repairMeta; - this.damageAdded = damageAdded; - } - - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return (block.getHarvestLevel(new ItemStack(Item.getItemFromBlock(block)).getItemDamage()) <= this.toolMaterial.getHarvestLevel()); - } - - @Override - public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) { - return (stack2.getItem() == repairMaterial && stack2.getItemDamage() == repairMeta) ? true : super.getIsRepairable(stack1, stack2); - } - - @Override - public boolean isRepairable() { - return true; - } - - @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase entityliving, EntityLivingBase attacker) { - stack.damageItem(1, attacker); - entityliving.attackEntityFrom(DamageSource.generic, damageAdded); - return true; - } -} diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java index e5fa568..db66871 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java @@ -1,24 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.tools.chainsaws; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; +import ic2.core.IC2; +import ic2.core.audio.AudioSource; +import ic2.core.audio.PositionSpec; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -42,6 +34,8 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { public int cost = 200; public int hitCost = 300; public int tier = 2; + public static AudioSource audio; + int tick; public ItemDiamondChainsaw() { super(ToolMaterial.EMERALD); @@ -130,6 +124,27 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); } + + @Override + public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag) + { + if(entity instanceof EntityLivingBase){ + if (IC2.platform.isRendering()) { + if (flag) { + if (audio == null) audio = IC2.audioManager.createSource(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawIdle.ogg", true, false, IC2.audioManager.getDefaultVolume()); + if (audio != null) { + audio.updatePosition(); + audio.play(); + } + } else if (!flag && audio != null) { + audio.stop(); + audio.remove(); + audio = null; + IC2.audioManager.playOnce(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawStop.ogg", true, IC2.audioManager.getDefaultVolume()); + } + } + } + } @Override public boolean isRepairable() { diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java index 7324318..40f8908 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java @@ -1,25 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - * - * This class originally belongs to Azanor, but with his permission I took it, and modified it to make it work as I wanted to. - ******************************************************************************/ - package tombenpotter.emt.common.items.tools.chainsaws; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; +import ic2.core.IC2; +import ic2.core.audio.AudioSource; +import ic2.core.audio.PositionSpec; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; @@ -40,6 +31,7 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw { boolean alternateClient; @SuppressWarnings("rawtypes") public static ArrayList oreDictLogs = new ArrayList(); + public static AudioSource audio; public ItemStreamChainsaw() { this.efficiencyOnProperMaterial = 25F; @@ -84,6 +76,27 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw { return super.onItemUse(itemstack, player, world, x, y, z, par7, par8, par9, par10); } + @Override + public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag) + { + if(entity instanceof EntityLivingBase){ + if (IC2.platform.isRendering()) { + if (flag) { + if (audio == null) audio = IC2.audioManager.createSource(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawIdle.ogg", true, false, IC2.audioManager.getDefaultVolume()); + if (audio != null) { + audio.updatePosition(); + audio.play(); + } + } else if (!flag && audio != null) { + audio.stop(); + audio.remove(); + audio = null; + IC2.audioManager.playOnce(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawStop.ogg", true, IC2.audioManager.getDefaultVolume()); + } + } + } + } + @Override public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { World world = player.worldObj; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java index 5dde992..85a62bd 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java @@ -1,22 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.tools.chainsaws; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; +import ic2.core.IC2; +import ic2.core.audio.AudioSource; +import ic2.core.audio.PositionSpec; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,6 +18,7 @@ import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; public class ItemThaumiumChainsaw extends ItemDiamondChainsaw { + public static AudioSource audio; public ItemThaumiumChainsaw() { this.efficiencyOnProperMaterial = 21F; @@ -36,6 +29,27 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw { cost = 250; hitCost = 350; } + + @Override + public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag) + { + if(entity instanceof EntityLivingBase){ + if (IC2.platform.isRendering()) { + if (flag) { + if (audio == null) audio = IC2.audioManager.createSource(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawIdle.ogg", true, false, IC2.audioManager.getDefaultVolume()); + if (audio != null) { + audio.updatePosition(); + audio.play(); + } + } else if (!flag && audio != null) { + audio.stop(); + audio.remove(); + audio = null; + IC2.audioManager.playOnce(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawStop.ogg", true, IC2.audioManager.getDefaultVolume()); + } + } + } + } @SideOnly(Side.CLIENT) @Override diff --git a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java index cfda7f3..8dd6d78 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java @@ -1,17 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - * - * This class originally belongs to Azanor, but with his permission I took it, and modified it to make it work as I wanted to. - ******************************************************************************/ - package tombenpotter.emt.common.items.tools.drills; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java index e0ee43f..b92a679 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.tools.drills; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java index 79eef35..ac47746 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.tools.omnitools; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java index ee21746..0777f1d 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.tools.omnitools; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java index 355a3e7..5a6929f 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.items.tools.omnitools; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java index d86db0b..bd25bf2 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile; import ic2.api.item.IC2Items; diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java index 4de8972..4121176 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile; import ic2.api.energy.prefab.BasicSink; diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java index 9ed0058..93950a8 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile; import thaumcraft.api.nodes.NodeModifier; diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java index 934d44d..cd8208d 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.generators; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java index 88e0c34..7662e28 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.generators; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java index 985db52..7241f72 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.generators; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java index 9ed3f2c..1541a88 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.generators; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java index 0751cf0..b859dc3 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.air; import ic2.api.energy.prefab.BasicSource; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java index eb23105..f5a12df 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.air; import ic2.api.energy.prefab.BasicSource; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java index 1a379eb..5420569 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.air; import ic2.api.energy.prefab.BasicSource; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java index ae5be2b..ef16231 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java index 9fd7e32..34fa068 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java index 153c6fe..da425ce 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java index 7020c4e..54dd0b0 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java index bb09fb7..cd2847a 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java index 459da91..4b05b75 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java index 2f0cef9..de0adf6 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java index 3aab9de..b9b4a2c 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java index 4499b3c..4ceee2c 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java index dff97e1..77dd392 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java index 1912151..f559da3 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java index 23f8c97..ffe625b 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java index fa204cf..17c3013 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java index 4a84d04..af0671e 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java index 12f9e3f..c14b12b 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java index a24effa..9df0407 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java index 075979f..465bbe8 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java index ce62a7f..e20c134 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/util/CraftingAspects.java b/src/main/java/tombenpotter/emt/common/util/CraftingAspects.java index a4c14b0..96dbabe 100644 --- a/src/main/java/tombenpotter/emt/common/util/CraftingAspects.java +++ b/src/main/java/tombenpotter/emt/common/util/CraftingAspects.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.util; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java b/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java index 1aa8625..2ce43f9 100644 --- a/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.util; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java b/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java index 06841db..13f5356 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java @@ -1,24 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - * - * Attention: this class originally belongs to the ThaumicTinkerer mod. - * All I did was modifying it to fulfill my needs. - * - * ThaumicTinkerer is Open Source and distributed under a - * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License - * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) - * - * http://www.minecraftforum.net/topic/1813058- - ******************************************************************************/ - package tombenpotter.emt.common.util; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java index ac5bd58..059d0e0 100644 --- a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.util; import java.util.Random; @@ -29,7 +17,6 @@ import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.EMTKeys; import tombenpotter.emt.common.items.ItemRegistry; -import tombenpotter.emt.common.items.ItemShardCarver; import tombenpotter.emt.common.network.PacketEMTKeys; import tombenpotter.emt.proxies.ClientProxy; @@ -56,20 +43,10 @@ public class EventHandlerEMT { ElectroMagicTools.logger.info("Refreshing configuration file."); } } - - @SubscribeEvent - public void onCraftedEvent(PlayerEvent.ItemCraftedEvent event) { - for (int i = 0; i < event.craftMatrix.getSizeInventory(); i++) { - if (event.craftMatrix.getStackInSlot(i) != null && event.craftMatrix.getStackInSlot(i).getItem() instanceof ItemShardCarver && event.player != null) { - event.craftMatrix.getStackInSlot(i).stackSize = 2; - event.craftMatrix.getStackInSlot(i).damageItem(1, event.player); - } - } - } @SubscribeEvent public void clientTick(ClientTickEvent e) { - if(EMTKeys.getKey("UnEquip").getIsKeyPressed()){ + if(EMTKeys.keyUnequipPressed()){ ElectroMagicTools.INSTANCE.sendToServer(new PacketEMTKeys()); } } diff --git a/src/main/java/tombenpotter/emt/common/util/ResearchAspects.java b/src/main/java/tombenpotter/emt/common/util/ResearchAspects.java index 16ffe30..c531bbd 100644 --- a/src/main/java/tombenpotter/emt/common/util/ResearchAspects.java +++ b/src/main/java/tombenpotter/emt/common/util/ResearchAspects.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.common.util; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java b/src/main/java/tombenpotter/emt/proxies/ClientProxy.java index 706307c..8ce49d5 100644 --- a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java +++ b/src/main/java/tombenpotter/emt/proxies/ClientProxy.java @@ -1,24 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.proxies; import org.lwjgl.input.Keyboard; +import net.minecraft.client.renderer.entity.RenderSnowMan; import net.minecraft.client.settings.KeyBinding; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import tombenpotter.emt.client.EMTKeys; -import tombenpotter.emt.client.renderer.RenderArcher; import tombenpotter.emt.client.renderer.RenderLaser; import tombenpotter.emt.common.entities.EntityArcher; import tombenpotter.emt.common.entities.EntityLaser; @@ -33,6 +21,6 @@ public class ClientProxy extends CommonProxy { public void registerRenders() { RenderingRegistry.registerEntityRenderingHandler(EntityLaser.class, new RenderLaser()); - RenderingRegistry.registerEntityRenderingHandler(EntityArcher.class, new RenderArcher()); + RenderingRegistry.registerEntityRenderingHandler(EntityArcher.class, new RenderSnowMan()); } } diff --git a/src/main/java/tombenpotter/emt/proxies/CommonProxy.java b/src/main/java/tombenpotter/emt/proxies/CommonProxy.java index dc1293d..dfb2402 100644 --- a/src/main/java/tombenpotter/emt/proxies/CommonProxy.java +++ b/src/main/java/tombenpotter/emt/proxies/CommonProxy.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - package tombenpotter.emt.proxies; import cpw.mods.fml.common.network.IGuiHandler; diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index 048bf00..dfbdc2c 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -11,6 +11,7 @@ gui.EMT.wandRecharge.title=Industrial Wand Recharge Station gui.EMT.inventory=Inventory gui.EMT.book.aspect.output.eu.title=Essentia Outputs Book gui.EMT.book.aspect.output.essentia.eu=EU Output per Essentia +gui.EMT.key.unequip=Unequip #=============Tooltips============= #This comes after a player name. The 's is depicting ownership. @@ -57,45 +58,34 @@ item.EMT.emtitems.denseIronSheet.name=Dense Iron Sheet item.EMT.emtitems.taintedFeather.name=Tainted Feather item.EMT.emtitems.thaumiumWing.name=Thaumium Reinforced Wing item.EMT.emtitems.uumatterDrop.name=Crystallized UU-Matter Drop - item.EMT.emtbauble.euMaker.armor.name=Armor Charging Ring item.EMT.emtbauble.euMaker.inventory.name=Inventory Charging Ring item.EMT.item.bauble.oneRing.name=The One Ring - item.EMT.goggles.electric.name=Electric Goggles of Revealing item.EMT.goggles.nano.name=Nanosuit Goggles of Revealing item.EMT.goggles.quantum.name=Quantum Goggles of Revealing item.EMT.goggles.solar.name=Solar Goggles of Revealing - item.EMT.boots.traveller.electric.name=Electric Boots of the Traveller item.EMT.boots.traveller.nano.name=Nanosuit Boots of the Traveller item.EMT.boots.traveller.quantum.name=Quantum Boots of the Traveller - item.EMT.scribingtools.electric.name=Electric Scribing Tools - item.EMT.wing.feather.name=Feather Duct-Taped Wings item.EMT.wing.thaumium.name=Thaumium Reinforced Wings item.EMT.wing.nano.name=Nanosuit Wings item.EMT.wing.quantum.name=Quantum Wings ic2.EMT.quantum=Infused Quantum Chestplate - item.EMT.hammer.broken.name=Broken Relic of Mjolnir item.EMT.hammer.name=Mjolnir item.EMT.hammer.electric.name=Supercharged Mjolnir - item.EMT.drill.thaumium.name=Thaumium Drill - item.EMT.chainsaw.diamond.name=Diamond Chainsaw item.EMT.chainsaw.thaumium.name=Thaumium Chainsaw - item.EMT.omnitool.iron.name=Iron Omnitool item.EMT.omnitool.diamond.name=Diamond Omnitool item.EMT.omnitool.thaumium.name=Thaumium Omnitool - item.EMT.chainsaw.stream.name=Chainsaw of the Stream item.EMT.drill.rockbreaker.name=Drill of the Rockbreaker item.EMT.hoeofgrowth.electric.name=Electric Hoe of Growth - item.EMT.focus.explosion.name=Wand Focus: Explosion item.EMT.focus.christmas.name=Wand Focus: Kris-tmas item.EMT.focus.shield.name=Wand Focus: Shield diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/electromagictools/lang/ru_RU.lang index 5830b59..aef5418 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang @@ -11,6 +11,7 @@ gui.EMT.wandRecharge.title=Промышленная станция зарядк gui.EMT.inventory=Инвентарь gui.EMT.book.aspect.output.eu.title=Книга выхода эссенции gui.EMT.book.aspect.output.essentia.eu=Выход EU за эссенцию +gui.EMT.key.unequip=Снять #=============Tooltips============= #This comes after a player name. The 's is depicting ownership. @@ -57,45 +58,34 @@ item.EMT.emtitems.denseIronSheet.name=Плотный железный лист item.EMT.emtitems.taintedFeather.name=Заражённое перо item.EMT.emtitems.thaumiumWing.name=Укреплённое таум-крыло item.EMT.emtitems.uumatterDrop.name=Кристаллизированная капля материи - item.EMT.emtbauble.euMaker.armor.name=Кольцо для зарядки брони item.EMT.emtbauble.euMaker.inventory.name=Кольцо для зарядки инвентаря item.EMT.item.bauble.oneRing.name=Кольцо Всевластия - item.EMT.goggles.electric.name=Электрические очки откровения item.EMT.goggles.nano.name=Нано-очки откровения item.EMT.goggles.quantum.name=Квантовые очки откровения item.EMT.goggles.solar.name=Солнечные очки откровения - item.EMT.boots.traveller.electric.name=Электрические ботинки путешественника item.EMT.boots.traveller.nano.name=Нано-ботинки путешественника item.EMT.boots.traveller.quantum.name=Квантовые ботинки путешественника - item.EMT.scribingtools.electric.name=Электрическая чернильница с пером - item.EMT.wing.feather.name=Склеенные крылья из картона item.EMT.wing.thaumium.name=Укреплённые таум-крылья item.EMT.wing.nano.name=Нано-крылья item.EMT.wing.quantum.name=Квантовые крылья ic2.EMT.quantum=Наполненный квантовый нагрудник - item.EMT.hammer.broken.name=Сломанная реликвия Мьёлнира item.EMT.hammer.name=Мьёлнир item.EMT.hammer.electric.name=Сильнозаряженный Мьёлнир - item.EMT.drill.thaumium.name=Таум-бур - item.EMT.chainsaw.diamond.name=Алмазная электропила item.EMT.chainsaw.thaumium.name=Таум-электропила - item.EMT.omnitool.iron.name=Железный мультиинструмент item.EMT.omnitool.diamond.name=Алмазный мультиинструмент item.EMT.omnitool.thaumium.name=Таум-мультиинструмент - item.EMT.chainsaw.stream.name=Электропила Потока item.EMT.drill.rockbreaker.name=Бур Камнелома item.EMT.hoeofgrowth.electric.name=Электрическая мотыга Роста - item.EMT.focus.explosion.name=Набалдашник: Взрыв item.EMT.focus.christmas.name=Набалдашник: Рождество item.EMT.focus.shield.name=Набалдашник: Щит diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png deleted file mode 100644 index c8995c7..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png deleted file mode 100644 index 68c7fe5..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png deleted file mode 100644 index 454852c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png index 797aa00..0c7a36f 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png deleted file mode 100644 index 5f56441..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png deleted file mode 100644 index a6d05e5..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png deleted file mode 100644 index d902d48..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png deleted file mode 100644 index b3e6582..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png deleted file mode 100644 index f9515c6..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png index ddf4eb3..42d071a 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png deleted file mode 100644 index 39b5f9b..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png index efe16f0..a0e5a57 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png deleted file mode 100644 index 192696c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png deleted file mode 100644 index 77fd802..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png and /dev/null differ