mirror of
https://github.com/GTNewHorizons/Electro-Magic-Tools.git
synced 2026-11-18 19:29:29 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
c312069d28
commit
6bdb2c0b96
100 files changed
+3171
-3401
No files matched your search
@@ -1,5 +1,11 @@
|
||||
package emt;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.SidedProxy;
|
||||
@@ -19,10 +25,6 @@ import emt.network.PacketNodeInfo;
|
||||
import emt.proxy.CommonProxy;
|
||||
import emt.tile.solar.Solars;
|
||||
import emt.util.*;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@Mod(
|
||||
modid = EMT.MOD_ID,
|
||||
@@ -31,6 +33,7 @@ import org.apache.logging.log4j.Logger;
|
||||
guiFactory = EMT.GUI_FACTORY,
|
||||
dependencies = EMT.DEPENDS)
|
||||
public class EMT {
|
||||
|
||||
public static final String NAME = "Electro-Magic Tools";
|
||||
public static final String MOD_ID = "EMT";
|
||||
public static final String VERSION = "GRADLETOKEN_VERSION";
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package emt.block;
|
||||
|
||||
import emt.EMT;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
|
||||
import emt.EMT;
|
||||
|
||||
public abstract class BlockBase extends Block {
|
||||
|
||||
public final String name;
|
||||
|
||||
public BlockBase(String unlocName, Material material, String textureName, SoundType soundType, float hardness) {
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package emt.block;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.TileEntityEMT;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -15,6 +10,12 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.TileEntityEMT;
|
||||
|
||||
public abstract class BlockBaseContainer extends BlockContainer {
|
||||
|
||||
public int instance;
|
||||
@@ -27,18 +28,13 @@ public abstract class BlockBaseContainer extends BlockContainer {
|
||||
this(unlocName, material, soundType, 1, hardness);
|
||||
}
|
||||
|
||||
public BlockBaseContainer(
|
||||
String unlocName, Material material, SoundType soundType, int countOfMetas, float hardness) {
|
||||
public BlockBaseContainer(String unlocName, Material material, SoundType soundType, int countOfMetas,
|
||||
float hardness) {
|
||||
this(unlocName, material, soundType, countOfMetas, 0, hardness);
|
||||
}
|
||||
|
||||
public BlockBaseContainer(
|
||||
String unlocName,
|
||||
Material material,
|
||||
SoundType soundType,
|
||||
int countOfMetas,
|
||||
int curInstance,
|
||||
float hardness) {
|
||||
public BlockBaseContainer(String unlocName, Material material, SoundType soundType, int countOfMetas,
|
||||
int curInstance, float hardness) {
|
||||
super(material);
|
||||
this.setBlockName(EMT.MOD_ID + "." + unlocName);
|
||||
this.setCreativeTab(EMT.TAB);
|
||||
@@ -154,6 +150,7 @@ public abstract class BlockBaseContainer extends BlockContainer {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static class IconSet {
|
||||
|
||||
public IIcon top;
|
||||
public IIcon bottom;
|
||||
public IIcon side;
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package emt.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.TileElectricCloud;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -12,10 +9,16 @@ import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.client.fx.ParticleEngine;
|
||||
import thaumcraft.client.fx.particles.FXSparkle;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.TileElectricCloud;
|
||||
|
||||
public class BlockElectricCloud extends BlockBase {
|
||||
|
||||
public IIcon icon;
|
||||
|
||||
public BlockElectricCloud(String unlocName) {
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
package emt.block;
|
||||
|
||||
import com.gtnewhorizons.modularui.api.UIInfos;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.generator.TileEntityBaseGenerator;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.EntitySmokeFX;
|
||||
@@ -18,6 +14,13 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.gtnewhorizons.modularui.api.UIInfos;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.generator.TileEntityBaseGenerator;
|
||||
|
||||
public class BlockEssentiaGenerators extends BlockBaseContainer {
|
||||
|
||||
private static int subtypes = 6;
|
||||
@@ -79,8 +82,8 @@ public class BlockEssentiaGenerators extends BlockBaseContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int i, int j, int k, EntityPlayer player, int s, float f1, float f2, float f3) {
|
||||
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer player, int s, float f1, float f2,
|
||||
float f3) {
|
||||
if (player.isSneaking()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1,15 +1,8 @@
|
||||
package emt.block;
|
||||
|
||||
import com.gtnewhorizons.modularui.api.UIInfos;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.gthandler.common.implementations.automation.EssentiaFiller;
|
||||
import emt.tile.TileEntityEtherealMacerator;
|
||||
import emt.tile.TileEntityIndustrialWandRecharge;
|
||||
import ic2.api.item.IC2Items;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -23,6 +16,16 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.gtnewhorizons.modularui.api.UIInfos;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.gthandler.common.implementations.automation.EssentiaFiller;
|
||||
import emt.tile.TileEntityEtherealMacerator;
|
||||
import emt.tile.TileEntityIndustrialWandRecharge;
|
||||
import ic2.api.item.IC2Items;
|
||||
|
||||
public class BlockMachines extends BlockBaseContainer {
|
||||
|
||||
public BlockMachines(String name) {
|
||||
@@ -77,8 +80,8 @@ public class BlockMachines extends BlockBaseContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7,
|
||||
float par8, float par9) {
|
||||
if (!world.isRemote) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if (te instanceof TileEntityIndustrialWandRecharge || te instanceof TileEntityEtherealMacerator) {
|
||||
@@ -125,8 +128,7 @@ public class BlockMachines extends BlockBaseContainer {
|
||||
new ItemStack(item.getItem(), item.stackSize, item.getItemDamage()));
|
||||
|
||||
if (item.hasTagCompound()) {
|
||||
entityItem.getEntityItem().setTagCompound((NBTTagCompound)
|
||||
item.getTagCompound().copy());
|
||||
entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy());
|
||||
}
|
||||
|
||||
float factor = 0.05F;
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package emt.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.TileEntityPortableNode;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -12,7 +9,12 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.Explosion;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.common.blocks.BlockAiry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.TileEntityPortableNode;
|
||||
|
||||
public class BlockPortableNode extends BlockAiry {
|
||||
|
||||
@@ -67,8 +69,8 @@ public class BlockPortableNode extends BlockAiry {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7,
|
||||
float par8, float par9) {
|
||||
if (!world.isRemote && player.isSneaking() && player.getHeldItem() == null) {
|
||||
world.setBlockToAir(x, y, z);
|
||||
world.removeTileEntity(x, y, z);
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package emt.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -13,6 +11,10 @@ import net.minecraft.world.Explosion;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
|
||||
public class BlockShield extends Block {
|
||||
|
||||
public BlockShield(String name) {
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
package emt.block;
|
||||
|
||||
import com.gtnewhorizons.modularui.api.UIInfos;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.solar.Solars;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -18,6 +14,13 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.gtnewhorizons.modularui.api.UIInfos;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.solar.Solars;
|
||||
|
||||
public class BlockSolars extends BlockBaseContainer {
|
||||
|
||||
public BlockSolars(String name, int countOfMetas, int instance) {
|
||||
@@ -41,14 +44,13 @@ public class BlockSolars extends BlockBaseContainer {
|
||||
IIcon airSide = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside");
|
||||
IIcon earthSide = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/earth/earthside");
|
||||
|
||||
IIcon[] sides = {side, orderSide, darkSide, airSide, earthSide, waterSide, fireSide};
|
||||
IIcon[] sides = { side, orderSide, darkSide, airSide, earthSide, waterSide, fireSide };
|
||||
|
||||
if (instance != 1 && instance != 0)
|
||||
for (int i = 0; i < countOfMetas; i++) {
|
||||
iconSets[i].bottom = bottom;
|
||||
iconSets[i].side = sides[(Objects.requireNonNull(Solars.getTileEntitySolarBase(instance, i)).aspect)];
|
||||
iconSets[i].top = tripleSolarTop;
|
||||
}
|
||||
if (instance != 1 && instance != 0) for (int i = 0; i < countOfMetas; i++) {
|
||||
iconSets[i].bottom = bottom;
|
||||
iconSets[i].side = sides[(Objects.requireNonNull(Solars.getTileEntitySolarBase(instance, i)).aspect)];
|
||||
iconSets[i].top = tripleSolarTop;
|
||||
}
|
||||
else if (instance == 0) {
|
||||
for (int i = 0; i < countOfMetas; i++) {
|
||||
iconSets[i].bottom = bottom;
|
||||
@@ -136,8 +138,8 @@ public class BlockSolars extends BlockBaseContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int i, int j, int k, EntityPlayer player, int s, float f1, float f2, float f3) {
|
||||
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer player, int s, float f1, float f2,
|
||||
float f3) {
|
||||
if (player.isSneaking()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
package emt.client;
|
||||
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
public class EMTKeys {
|
||||
|
||||
public static KeyBinding keyUnequip;
|
||||
|
||||
public static void registerKeys() {
|
||||
|
||||
@@ -6,17 +6,17 @@ import com.gtnewhorizons.modularui.api.drawable.UITexture;
|
||||
|
||||
public class EMT_UITextures {
|
||||
|
||||
public static final UITexture OVERLAY_SLOT_FUSION_CRAFTING =
|
||||
UITexture.fullImage(TEXTURE_PATH, "guis/overlay_slot/fusion_crafter");
|
||||
public static final UITexture OVERLAY_SLOT_FUSION_CRAFTING = UITexture
|
||||
.fullImage(TEXTURE_PATH, "guis/overlay_slot/fusion_crafter");
|
||||
public static final UITexture OVERLAY_SLOT_WAND = UITexture.fullImage(TEXTURE_PATH, "guis/overlay_slot/wand");
|
||||
|
||||
public static final UITexture PICTURE_GAUGE_EMPTY_25 =
|
||||
UITexture.fullImage(TEXTURE_PATH, "guis/picture/gauge_empty_25");
|
||||
public static final UITexture PICTURE_GAUGE_GENERATOR =
|
||||
UITexture.fullImage(TEXTURE_PATH, "guis/picture/gauge_generator");
|
||||
public static final UITexture PICTURE_GAUGE_EMPTY_25 = UITexture
|
||||
.fullImage(TEXTURE_PATH, "guis/picture/gauge_empty_25");
|
||||
public static final UITexture PICTURE_GAUGE_GENERATOR = UITexture
|
||||
.fullImage(TEXTURE_PATH, "guis/picture/gauge_generator");
|
||||
public static final UITexture PICTURE_GAUGE_SOLAR = UITexture.fullImage(TEXTURE_PATH, "guis/picture/gauge_solar");
|
||||
public static final UITexture PICTURE_GAUGE_EMPTY_11 =
|
||||
UITexture.fullImage(TEXTURE_PATH, "guis/picture/gauge_empty_11");
|
||||
public static final UITexture PICTURE_SOLAR_INDICATOR =
|
||||
UITexture.fullImage(TEXTURE_PATH, "guis/picture/solar_indicator");
|
||||
public static final UITexture PICTURE_GAUGE_EMPTY_11 = UITexture
|
||||
.fullImage(TEXTURE_PATH, "guis/picture/gauge_empty_11");
|
||||
public static final UITexture PICTURE_SOLAR_INDICATOR = UITexture
|
||||
.fullImage(TEXTURE_PATH, "guis/picture/solar_indicator");
|
||||
}
|
||||
@@ -2,17 +2,19 @@ package emt.client.gui.config;
|
||||
|
||||
import static emt.util.EMTConfigHandler.*;
|
||||
|
||||
import cpw.mods.fml.client.config.GuiConfig;
|
||||
import cpw.mods.fml.client.config.IConfigElement;
|
||||
import emt.EMT;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraftforge.common.config.ConfigCategory;
|
||||
import net.minecraftforge.common.config.ConfigElement;
|
||||
|
||||
import cpw.mods.fml.client.config.GuiConfig;
|
||||
import cpw.mods.fml.client.config.IConfigElement;
|
||||
import emt.EMT;
|
||||
|
||||
public class EMTGuiConfig extends GuiConfig {
|
||||
|
||||
public EMTGuiConfig(GuiScreen parentScreen) {
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package emt.client.gui.config;
|
||||
|
||||
import cpw.mods.fml.client.IModGuiFactory;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
|
||||
import cpw.mods.fml.client.IModGuiFactory;
|
||||
|
||||
public class EMTGuiFactory implements IModGuiFactory {
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
package emt.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumAction;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelSpecialArmor extends ModelBiped {
|
||||
|
||||
public ModelRenderer rightWing;
|
||||
public ModelRenderer leftWing;
|
||||
public ModelRenderer center;
|
||||
@@ -71,14 +73,8 @@ public class ModelSpecialArmor extends ModelBiped {
|
||||
model.rotateAngleZ = z;
|
||||
}
|
||||
|
||||
public void render(
|
||||
Entity entity,
|
||||
float p_78088_2_,
|
||||
float p_78088_3_,
|
||||
float p_78088_4_,
|
||||
float p_78088_5_,
|
||||
float p_78088_6_,
|
||||
float scale) {
|
||||
public void render(Entity entity, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_,
|
||||
float p_78088_6_, float scale) {
|
||||
EntityPlayer player = (EntityPlayer) entity;
|
||||
this.heldItemRight = player.inventory.getCurrentItem() != null ? 1 : 0;
|
||||
this.isRiding = player.isRiding();
|
||||
@@ -103,14 +99,8 @@ public class ModelSpecialArmor extends ModelBiped {
|
||||
}
|
||||
}
|
||||
|
||||
public void setRotationAngles(
|
||||
float p_78087_1_,
|
||||
float p_78087_2_,
|
||||
float p_78087_3_,
|
||||
float p_78087_4_,
|
||||
float p_78087_5_,
|
||||
float p_78087_6_,
|
||||
Entity entity) {
|
||||
public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_,
|
||||
float p_78087_5_, float p_78087_6_, Entity entity) {
|
||||
super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, entity);
|
||||
if (this.isJumping) {
|
||||
this.rightWing.rotateAngleY = 0.5f;
|
||||
|
||||
@@ -1,18 +1,21 @@
|
||||
package emt.client.renderer;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.entity.EntityLaser;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.entity.EntityLaser;
|
||||
|
||||
public class RenderLaser extends Render {
|
||||
|
||||
private static final ResourceLocation laserTexture =
|
||||
new ResourceLocation(EMT.TEXTURE_PATH, "textures/models/lasermodel.png");
|
||||
private static final ResourceLocation laserTexture = new ResourceLocation(
|
||||
EMT.TEXTURE_PATH,
|
||||
"textures/models/lasermodel.png");
|
||||
|
||||
@Override
|
||||
public void doRender(Entity entityLaser, double x, double y, double z, float par8, float pTick) {
|
||||
|
||||
@@ -2,8 +2,6 @@ package emt.client.renderer;
|
||||
|
||||
import static org.lwjgl.opengl.GL11.*;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.entity.EntityShield;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GLAllocation;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
@@ -11,12 +9,18 @@ import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.entity.EntityShield;
|
||||
|
||||
public class RenderShield extends Render {
|
||||
private static final ResourceLocation shieldTexture =
|
||||
new ResourceLocation(EMT.TEXTURE_PATH, "textures/models/shield.png");
|
||||
|
||||
private static final ResourceLocation shieldTexture = new ResourceLocation(
|
||||
EMT.TEXTURE_PATH,
|
||||
"textures/models/shield.png");
|
||||
static int glCallList;
|
||||
|
||||
static {
|
||||
@@ -80,11 +84,8 @@ public class RenderShield extends Render {
|
||||
glDisable(GL_CULL_FACE);
|
||||
|
||||
glPushMatrix();
|
||||
if (((EntityShield) entityShield).owner != null
|
||||
&& !Minecraft.getMinecraft()
|
||||
.thePlayer
|
||||
.getDisplayName()
|
||||
.equals(((EntityShield) entityShield).owner.getDisplayName())) {
|
||||
if (((EntityShield) entityShield).owner != null && !Minecraft.getMinecraft().thePlayer.getDisplayName()
|
||||
.equals(((EntityShield) entityShield).owner.getDisplayName())) {
|
||||
glTranslated(x, y, z);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
package emt.command;
|
||||
|
||||
import emt.util.EMTEssentiasOutputs;
|
||||
import emt.util.EMTTextHelper;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.ICommand;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
@@ -12,7 +11,10 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.nbt.NBTTagString;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import emt.util.EMTEssentiasOutputs;
|
||||
import emt.util.EMTTextHelper;
|
||||
|
||||
public class CommandOutputs extends CommandBase {
|
||||
|
||||
@@ -32,24 +34,28 @@ public class CommandOutputs extends CommandBase {
|
||||
for (final Aspect aspect : Aspect.aspects.values()) {
|
||||
++counter;
|
||||
|
||||
if (aspect.equals(Aspect.ENERGY)
|
||||
|| aspect.equals(Aspect.TREE)
|
||||
if (aspect.equals(Aspect.ENERGY) || aspect.equals(Aspect.TREE)
|
||||
|| aspect.equals(Aspect.FIRE)
|
||||
|| aspect.equals(Aspect.AURA)
|
||||
|| aspect.equals(Aspect.GREED)
|
||||
|| aspect.equals(Aspect.AIR))
|
||||
text3 += aspect.getTag() + ": "
|
||||
+ String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag()) / 20D / 20D) + "EU\n";
|
||||
+ String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag()) / 20D / 20D)
|
||||
+ "EU\n";
|
||||
|
||||
if (counter < 12) {
|
||||
text2 += aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag()) / 20D)
|
||||
text2 += aspect.getTag() + ": "
|
||||
+ String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag()) / 20D)
|
||||
+ "EU/t\n";
|
||||
text += aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag()))
|
||||
text += aspect.getTag() + ": "
|
||||
+ String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag()))
|
||||
+ "EU\n";
|
||||
} else {
|
||||
text2 += aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag()) / 20D)
|
||||
text2 += aspect.getTag() + ": "
|
||||
+ String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag()) / 20D)
|
||||
+ "EU\n";
|
||||
text += aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag()))
|
||||
text += aspect.getTag() + ": "
|
||||
+ String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag()))
|
||||
+ "EU\n";
|
||||
bookL.add(text);
|
||||
bookL2.add(text2);
|
||||
@@ -118,12 +124,8 @@ public class CommandOutputs extends CommandBase {
|
||||
public void processCommand(ICommandSender command, String[] astring) {
|
||||
ItemStack book = mkbook();
|
||||
|
||||
if (!command.getEntityWorld()
|
||||
.getPlayerEntityByName(command.getCommandSenderName())
|
||||
.inventory
|
||||
if (!command.getEntityWorld().getPlayerEntityByName(command.getCommandSenderName()).inventory
|
||||
.addItemStackToInventory(book))
|
||||
command.getEntityWorld()
|
||||
.getPlayerEntityByName(command.getCommandSenderName())
|
||||
.entityDropItem(book, 0);
|
||||
command.getEntityWorld().getPlayerEntityByName(command.getCommandSenderName()).entityDropItem(book, 0);
|
||||
}
|
||||
}
|
||||
@@ -30,7 +30,8 @@ public class EntityArcher extends EntitySnowman implements IExtendedEntityProper
|
||||
this.tasks.addTask(1, new EntityAISwimming(this));
|
||||
this.tasks.addTask(2, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
|
||||
this.targetTasks.addTask(
|
||||
3, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, true, false, IMob.mobSelector));
|
||||
3,
|
||||
new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, true, false, IMob.mobSelector));
|
||||
this.tasks.addTask(4, new EntityAIWander(this, 0.30D));
|
||||
}
|
||||
|
||||
@@ -84,13 +85,17 @@ public class EntityArcher extends EntitySnowman implements IExtendedEntityProper
|
||||
|
||||
@Override
|
||||
public void attackEntityWithRangedAttack(EntityLivingBase entity, float par2) {
|
||||
EntityArrow entityarrow = new EntityArrow(this.worldObj, this, entity, 1.6F, (float)
|
||||
(14 - this.worldObj.difficultySetting.getDifficultyId() * 4));
|
||||
EntityArrow entityarrow = new EntityArrow(
|
||||
this.worldObj,
|
||||
this,
|
||||
entity,
|
||||
1.6F,
|
||||
(float) (14 - this.worldObj.difficultySetting.getDifficultyId() * 4));
|
||||
int powerLevel = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, this.getHeldItem());
|
||||
int punchLevel = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, this.getHeldItem());
|
||||
entityarrow.setDamage((double) (par2 * 2.0F)
|
||||
+ this.rand.nextGaussian() * 0.25D
|
||||
+ (double) ((float) this.worldObj.difficultySetting.getDifficultyId() * 0.11F));
|
||||
entityarrow.setDamage(
|
||||
(double) (par2 * 2.0F) + this.rand.nextGaussian() * 0.25D
|
||||
+ (double) ((float) this.worldObj.difficultySetting.getDifficultyId() * 0.11F));
|
||||
|
||||
if (powerLevel > 0) {
|
||||
entityarrow.setDamage(entityarrow.getDamage() + (double) powerLevel * 0.5D + 0.5D);
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package emt.entity;
|
||||
|
||||
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.IProjectile;
|
||||
@@ -16,9 +13,15 @@ import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class EntityEnergyBall extends Entity implements IProjectile, IEntityAdditionalSpawnData {
|
||||
|
||||
public static final int RADIUS = 8;
|
||||
public static final int MAX_TICKS_IN_TILE = 60;
|
||||
|
||||
@@ -102,8 +105,8 @@ public class EntityEnergyBall extends Entity implements IProjectile, IEntityAddi
|
||||
|
||||
for (int chX = -chunkSize; chX < chunkSize; chX++) {
|
||||
for (int chZ = -chunkSize; chZ < chunkSize; chZ++) {
|
||||
Chunk chunk = worldObj.getChunkFromChunkCoords(
|
||||
chX + (int) (this.posX / 16), chZ + (int) (this.posZ / 16));
|
||||
Chunk chunk = worldObj
|
||||
.getChunkFromChunkCoords(chX + (int) (this.posX / 16), chZ + (int) (this.posZ / 16));
|
||||
|
||||
if (chunk.isChunkLoaded && chunk.hasEntities) {
|
||||
for (int i = 0; i < chunk.entityLists.length; i++) {
|
||||
@@ -112,8 +115,8 @@ public class EntityEnergyBall extends Entity implements IProjectile, IEntityAddi
|
||||
double width = entity.posX - this.posX;
|
||||
double height = entity.posY - this.posY;
|
||||
double length = entity.posZ - this.posZ;
|
||||
double hyp =
|
||||
MathHelper.sqrt_double((width * width) + (length * length) + (height * height));
|
||||
double hyp = MathHelper
|
||||
.sqrt_double((width * width) + (length * length) + (height * height));
|
||||
|
||||
if (hyp <= RADIUS) {
|
||||
entities.add(entity);
|
||||
@@ -135,8 +138,8 @@ public class EntityEnergyBall extends Entity implements IProjectile, IEntityAddi
|
||||
else {
|
||||
/** Collision detection **/
|
||||
Vec3 vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
|
||||
Vec3 vec3next = Vec3.createVectorHelper(
|
||||
this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
|
||||
Vec3 vec3next = Vec3
|
||||
.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
|
||||
MovingObjectPosition mop = this.worldObj.rayTraceBlocks(vec3, vec3next);
|
||||
|
||||
this.ticksInAir++;
|
||||
@@ -151,9 +154,8 @@ public class EntityEnergyBall extends Entity implements IProjectile, IEntityAddi
|
||||
float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
|
||||
this.rotationYaw = (float) (Math.atan2(this.motionZ, this.motionX) * 180.0D / Math.PI) + 90.0F;
|
||||
|
||||
for (this.rotationPitch = (float) (Math.atan2((double) f1, this.motionY) * 180.0D / Math.PI) - 90.0F;
|
||||
this.rotationPitch - this.prevRotationPitch < -180.0F;
|
||||
this.prevRotationPitch -= 360.0F) {
|
||||
for (this.rotationPitch = (float) (Math.atan2((double) f1, this.motionY) * 180.0D / Math.PI)
|
||||
- 90.0F; this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {
|
||||
;
|
||||
}
|
||||
|
||||
@@ -217,7 +219,7 @@ public class EntityEnergyBall extends Entity implements IProjectile, IEntityAddi
|
||||
@Override
|
||||
public void writeEntityToNBT(NBTTagCompound nbt) {
|
||||
nbt.setByte("inTile", (byte) (this.inTile ? 1 : 0));
|
||||
nbt.setTag("direction", this.newDoubleNBTList(new double[] {this.motionX, this.motionY, this.motionZ}));
|
||||
nbt.setTag("direction", this.newDoubleNBTList(new double[] { this.motionX, this.motionY, this.motionZ }));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package emt.entity;
|
||||
|
||||
import cpw.mods.fml.common.registry.IThrowableEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -17,7 +15,12 @@ import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.common.registry.IThrowableEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class EntityLaser extends Entity implements IThrowableEntity, IProjectile {
|
||||
|
||||
public Entity shootingEntity;
|
||||
private Block inTile;
|
||||
private int xTile;
|
||||
@@ -99,8 +102,8 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile
|
||||
|
||||
if (block.getMaterial() != Material.air) {
|
||||
block.setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile);
|
||||
AxisAlignedBB axisalignedbb =
|
||||
block.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile);
|
||||
AxisAlignedBB axisalignedbb = block
|
||||
.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile);
|
||||
|
||||
if (axisalignedbb != null
|
||||
&& axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) {
|
||||
@@ -109,8 +112,8 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile
|
||||
}
|
||||
|
||||
block.setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile);
|
||||
AxisAlignedBB axisalignedbb =
|
||||
block.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile);
|
||||
AxisAlignedBB axisalignedbb = block
|
||||
.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile);
|
||||
|
||||
if (axisalignedbb != null
|
||||
&& axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) {
|
||||
@@ -121,7 +124,12 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile
|
||||
int k = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile);
|
||||
if (!this.worldObj.isRemote) {
|
||||
this.worldObj.createExplosion(
|
||||
this, (int) this.posX, (int) this.posY, (int) this.posZ, explosionStrength, true);
|
||||
this,
|
||||
(int) this.posX,
|
||||
(int) this.posY,
|
||||
(int) this.posZ,
|
||||
explosionStrength,
|
||||
true);
|
||||
this.setDead();
|
||||
}
|
||||
|
||||
@@ -142,12 +150,12 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile
|
||||
} else {
|
||||
++this.ticksInAir;
|
||||
Vec3 vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
|
||||
Vec3 vec3next = Vec3.createVectorHelper(
|
||||
this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
|
||||
Vec3 vec3next = Vec3
|
||||
.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
|
||||
MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec3, vec3next, false, true, false);
|
||||
vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
|
||||
vec3next = Vec3.createVectorHelper(
|
||||
this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
|
||||
vec3next = Vec3
|
||||
.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
|
||||
|
||||
if (movingobjectposition != null) {
|
||||
vec3next = Vec3.createVectorHelper(
|
||||
@@ -159,9 +167,7 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile
|
||||
Entity entity = null;
|
||||
List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(
|
||||
this,
|
||||
this.boundingBox
|
||||
.addCoord(this.motionX, this.motionY, this.motionZ)
|
||||
.expand(1.0D, 1.0D, 1.0D));
|
||||
this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D));
|
||||
double d0 = 0.0D;
|
||||
int l;
|
||||
float down;
|
||||
@@ -171,8 +177,8 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile
|
||||
|
||||
if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) {
|
||||
down = 0.3F;
|
||||
AxisAlignedBB axisalignedbb1 =
|
||||
entity1.boundingBox.expand((double) down, (double) down, (double) down);
|
||||
AxisAlignedBB axisalignedbb1 = entity1.boundingBox
|
||||
.expand((double) down, (double) down, (double) down);
|
||||
MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec3next, vec3);
|
||||
|
||||
if (movingobjectposition1 != null) {
|
||||
@@ -190,14 +196,12 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile
|
||||
movingobjectposition = new MovingObjectPosition(entity);
|
||||
}
|
||||
|
||||
if (movingobjectposition != null
|
||||
&& movingobjectposition.entityHit != null
|
||||
if (movingobjectposition != null && movingobjectposition.entityHit != null
|
||||
&& movingobjectposition.entityHit instanceof EntityPlayer) {
|
||||
EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit;
|
||||
|
||||
if (entityplayer.capabilities.disableDamage
|
||||
|| this.shootingEntity instanceof EntityPlayer
|
||||
&& !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) {
|
||||
if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer
|
||||
&& !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) {
|
||||
movingobjectposition = null;
|
||||
}
|
||||
}
|
||||
@@ -211,7 +215,12 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile
|
||||
this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ);
|
||||
if (!this.worldObj.isRemote) {
|
||||
this.worldObj.createExplosion(
|
||||
this, (int) this.posX, (int) this.posY, (int) this.posZ, explosionStrength, true);
|
||||
this,
|
||||
(int) this.posX,
|
||||
(int) this.posY,
|
||||
(int) this.posZ,
|
||||
explosionStrength,
|
||||
true);
|
||||
this.setDead();
|
||||
}
|
||||
} else {
|
||||
@@ -238,9 +247,8 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile
|
||||
f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
|
||||
this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
|
||||
|
||||
for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f2) * 180.0D / Math.PI);
|
||||
this.rotationPitch - this.prevRotationPitch < -180.0F;
|
||||
this.prevRotationPitch -= 360.0F)
|
||||
for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f2) * 180.0D
|
||||
/ Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F)
|
||||
;
|
||||
|
||||
while (this.rotationPitch - this.prevRotationPitch >= 180.0F) {
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
package emt.entity;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class EntityShield extends Entity {
|
||||
|
||||
public EntityPlayer owner;
|
||||
|
||||
public boolean needCheck = true;
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
package emt.gthandler.common.blocks;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
@@ -7,13 +16,6 @@ import emt.gthandler.common.items.EMT_CasingBlock;
|
||||
import gregtech.api.enums.Textures;
|
||||
import gregtech.api.render.TextureFactory;
|
||||
import gregtech.common.blocks.GT_Block_Casings_Abstract;
|
||||
import java.util.List;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
public class EMT_GT_Block extends GT_Block_Casings_Abstract {
|
||||
|
||||
|
||||
@@ -1,18 +1,20 @@
|
||||
package emt.gthandler.common.implementations;
|
||||
|
||||
import gregtech.api.enums.GT_Values;
|
||||
import gregtech.api.interfaces.ITexture;
|
||||
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
import gregtech.api.metatileentity.MetaTileEntity;
|
||||
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import gregtech.api.enums.GT_Values;
|
||||
import gregtech.api.interfaces.ITexture;
|
||||
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
import gregtech.api.metatileentity.MetaTileEntity;
|
||||
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
|
||||
|
||||
public class EssentiaHatch extends GT_MetaTileEntity_Hatch_Input {
|
||||
|
||||
@@ -50,7 +52,10 @@ public class EssentiaHatch extends GT_MetaTileEntity_Hatch_Input {
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new EssentiaHatch(
|
||||
"Essentia Hatch " + GT_Values.VN[this.mTier], this.mTier, this.getDescription(), this.mTextures);
|
||||
"Essentia Hatch " + GT_Values.VN[this.mTier],
|
||||
this.mTier,
|
||||
this.getDescription(),
|
||||
this.mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -72,26 +77,19 @@ public class EssentiaHatch extends GT_MetaTileEntity_Hatch_Input {
|
||||
|
||||
return ret;
|
||||
|
||||
/*String[] old = super.getInfoData();
|
||||
if (old.length!=0) {
|
||||
String[] newDescription = new String[old.length + 1];
|
||||
for (int i = 0; i < old.length; i++) {
|
||||
newDescription[i] = old[i];
|
||||
}
|
||||
newDescription[old.length] = "This Contains: " + current.size() + " different Aspects";
|
||||
return newDescription;
|
||||
}else
|
||||
return new String[]{"This Contains: " + current.size() + " different Aspects"};*/
|
||||
/*
|
||||
* String[] old = super.getInfoData(); if (old.length!=0) { String[] newDescription = new String[old.length +
|
||||
* 1]; for (int i = 0; i < old.length; i++) { newDescription[i] = old[i]; } newDescription[old.length] =
|
||||
* "This Contains: " + current.size() + " different Aspects"; return newDescription; }else return new
|
||||
* String[]{"This Contains: " + current.size() + " different Aspects"};
|
||||
*/
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getDescription() { // this is the fucking tooltip -_-'
|
||||
return new String[] {
|
||||
"Essentia Hatch for usage in Multiblocks",
|
||||
"Can only be filled with the Essentia Filler",
|
||||
"Can hold " + Integer.toString((ApTe * (mTier + 1))) + " Different Essentia Types",
|
||||
"Can hold " + Integer.toString((64 * ApTe * (mTier + 1))) + " Essentia in total"
|
||||
};
|
||||
return new String[] { "Essentia Hatch for usage in Multiblocks", "Can only be filled with the Essentia Filler",
|
||||
"Can hold " + Integer.toString((ApTe * (mTier + 1))) + " Different Essentia Types",
|
||||
"Can hold " + Integer.toString((64 * ApTe * (mTier + 1))) + " Essentia in total" };
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,19 +1,21 @@
|
||||
package emt.gthandler.common.implementations.automation;
|
||||
|
||||
import emt.gthandler.common.implementations.EssentiaHatch;
|
||||
import emt.tile.TileEntityEMT;
|
||||
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
|
||||
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import thaumcraft.api.ThaumcraftApiHelper;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.aspects.IAspectContainer;
|
||||
import thaumcraft.api.aspects.IEssentiaTransport;
|
||||
import emt.gthandler.common.implementations.EssentiaHatch;
|
||||
import emt.tile.TileEntityEMT;
|
||||
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
|
||||
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
|
||||
public class EssentiaFiller extends TileEntityEMT implements IAspectContainer, IEssentiaTransport {
|
||||
|
||||
@@ -90,14 +92,13 @@ public class EssentiaFiller extends TileEntityEMT implements IAspectContainer, I
|
||||
|
||||
private boolean checkTE(final TileEntity T) {
|
||||
if (T == null) return false;
|
||||
if (this.current.visSize() > 0)
|
||||
if (T instanceof IGregTechTileEntity) {
|
||||
IMetaTileEntity M = ((IGregTechTileEntity) T).getMetaTileEntity();
|
||||
if (M instanceof EssentiaHatch) {
|
||||
if (((EssentiaHatch) M).addAspectList(current)) this.current = new AspectList();
|
||||
return true;
|
||||
}
|
||||
if (this.current.visSize() > 0) if (T instanceof IGregTechTileEntity) {
|
||||
IMetaTileEntity M = ((IGregTechTileEntity) T).getMetaTileEntity();
|
||||
if (M instanceof EssentiaHatch) {
|
||||
if (((EssentiaHatch) M).addAspectList(current)) this.current = new AspectList();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -106,7 +107,11 @@ public class EssentiaFiller extends TileEntityEMT implements IAspectContainer, I
|
||||
TileEntity[] te = new TileEntity[ForgeDirection.VALID_DIRECTIONS.length];
|
||||
for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) {
|
||||
te[i] = ThaumcraftApiHelper.getConnectableTile(
|
||||
this.worldObj, this.xCoord, this.yCoord, this.zCoord, ForgeDirection.VALID_DIRECTIONS[i]);
|
||||
this.worldObj,
|
||||
this.xCoord,
|
||||
this.yCoord,
|
||||
this.zCoord,
|
||||
ForgeDirection.VALID_DIRECTIONS[i]);
|
||||
if (te[i] != null) {
|
||||
IEssentiaTransport pipe = (IEssentiaTransport) te[i];
|
||||
if (!pipe.canOutputTo(ForgeDirection.VALID_DIRECTIONS[i])) {
|
||||
@@ -165,10 +170,9 @@ public class EssentiaFiller extends TileEntityEMT implements IAspectContainer, I
|
||||
@Override
|
||||
public boolean doesContainerContain(AspectList aspectList) {
|
||||
ArrayList<Boolean> ret = new ArrayList<Boolean>();
|
||||
for (Aspect a : aspectList.aspects.keySet())
|
||||
if (current.aspects.containsKey(a)) {
|
||||
ret.add(true);
|
||||
} else ret.add(false);
|
||||
for (Aspect a : aspectList.aspects.keySet()) if (current.aspects.containsKey(a)) {
|
||||
ret.add(true);
|
||||
} else ret.add(false);
|
||||
return !ret.contains(false);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,47 +1,41 @@
|
||||
package emt.gthandler.common.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.gthandler.common.blocks.EMT_GT_Block;
|
||||
import gregtech.api.util.GT_LanguageManager;
|
||||
import gregtech.common.blocks.GT_Item_Casings_Abstract;
|
||||
import java.util.List;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
public class EMT_CasingBlock extends GT_Item_Casings_Abstract {
|
||||
|
||||
public static final Block[] EMT_GT_BLOCKS = {
|
||||
new EMT_GT_Block(new String[] {
|
||||
EMT.TEXTURE_PATH + ":machines/side",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/inner",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/siderawI",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/rawcoreI",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/siderawII",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/rawcoreII",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/rawcoreII", // unused?
|
||||
EMT.TEXTURE_PATH + ":machines/GT/ROBUST_NAQUADAH_ALLOY",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/BLOODY_ICHORIUM",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/DRACONIUM",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/WYVERN",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/AWAKENED_DRACONIUM",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/CHAOTIC",
|
||||
})
|
||||
};
|
||||
public static final Block[] EMT_GT_BLOCKS = { new EMT_GT_Block(
|
||||
new String[] { EMT.TEXTURE_PATH + ":machines/side", EMT.TEXTURE_PATH + ":machines/GT/inner",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/siderawI", EMT.TEXTURE_PATH + ":machines/GT/rawcoreI",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/siderawII", EMT.TEXTURE_PATH + ":machines/GT/rawcoreII",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/rawcoreII", // unused?
|
||||
EMT.TEXTURE_PATH + ":machines/GT/ROBUST_NAQUADAH_ALLOY",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/BLOODY_ICHORIUM", EMT.TEXTURE_PATH + ":machines/GT/DRACONIUM",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/WYVERN", EMT.TEXTURE_PATH + ":machines/GT/AWAKENED_DRACONIUM",
|
||||
EMT.TEXTURE_PATH + ":machines/GT/CHAOTIC", }) };
|
||||
|
||||
protected final String deccCasing01Tooltip = GT_LanguageManager.addStringLocalization(
|
||||
"gt.casing01tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 1");
|
||||
protected final String deccCasing02Tooltip = GT_LanguageManager.addStringLocalization(
|
||||
"gt.casing02tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 2");
|
||||
protected final String deccCasing03Tooltip = GT_LanguageManager.addStringLocalization(
|
||||
"gt.casing03tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 3");
|
||||
protected final String deccCasing04Tooltip = GT_LanguageManager.addStringLocalization(
|
||||
"gt.casing04tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 4");
|
||||
protected final String deccCasing05Tooltip = GT_LanguageManager.addStringLocalization(
|
||||
"gt.casing05tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 5");
|
||||
protected final String deccCasing01Tooltip = GT_LanguageManager
|
||||
.addStringLocalization("gt.casing01tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 1");
|
||||
protected final String deccCasing02Tooltip = GT_LanguageManager
|
||||
.addStringLocalization("gt.casing02tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 2");
|
||||
protected final String deccCasing03Tooltip = GT_LanguageManager
|
||||
.addStringLocalization("gt.casing03tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 3");
|
||||
protected final String deccCasing04Tooltip = GT_LanguageManager
|
||||
.addStringLocalization("gt.casing04tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 4");
|
||||
protected final String deccCasing05Tooltip = GT_LanguageManager
|
||||
.addStringLocalization("gt.casing05tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 5");
|
||||
|
||||
public EMT_CasingBlock(final Block par1) {
|
||||
super(par1);
|
||||
@@ -62,8 +56,8 @@ public class EMT_CasingBlock extends GT_Item_Casings_Abstract {
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT) // so it only gets sent clientside?
|
||||
public void addInformation(
|
||||
final ItemStack aStack, final EntityPlayer aPlayer, final List aList, final boolean aF3_H) {
|
||||
public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList,
|
||||
final boolean aF3_H) {
|
||||
super.addInformation(aStack, aPlayer, aList, aF3_H);
|
||||
|
||||
switch (getDamage(aStack)) {
|
||||
|
||||
@@ -2,6 +2,15 @@ package emt.gthandler.common.loader;
|
||||
|
||||
import static emt.command.CommandOutputs.mkbook;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import emt.gthandler.common.implementations.EssentiaHatch;
|
||||
import emt.gthandler.common.items.EMT_CasingBlock;
|
||||
@@ -14,14 +23,6 @@ import gregtech.api.enums.Materials;
|
||||
import gregtech.api.enums.OrePrefixes;
|
||||
import gregtech.api.util.GT_ModHandler;
|
||||
import gregtech.api.util.GT_OreDictUnificator;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
|
||||
public class EMT_GT_Loader implements Runnable {
|
||||
|
||||
@@ -37,129 +38,107 @@ public class EMT_GT_Loader implements Runnable {
|
||||
|
||||
for (int i = 0; i < TIERS; i++) {
|
||||
EHatch[i] = new EssentiaHatch(
|
||||
aIDoffset + i, "Essentia Hatch " + GT_Values.VN[i], "Essentia Hatch " + GT_Values.VN[i], i)
|
||||
.getStackForm(1L);
|
||||
aIDoffset + i,
|
||||
"Essentia Hatch " + GT_Values.VN[i],
|
||||
"Essentia Hatch " + GT_Values.VN[i],
|
||||
i).getStackForm(1L);
|
||||
}
|
||||
|
||||
LEG = new EMT_Large_Essentia_Gen(
|
||||
aIDoffset + GT_Values.VN.length + 1, "Large Essentia Generator", "Large Essentia Generator")
|
||||
.getStackForm(1L);
|
||||
aIDoffset + GT_Values.VN.length + 1,
|
||||
"Large Essentia Generator",
|
||||
"Large Essentia Generator").getStackForm(1L);
|
||||
|
||||
// Dragonblood recipe for magics haters
|
||||
if (Loader.isModLoaded("miscutils")) {
|
||||
GT_Values.RA.addMixerRecipe(
|
||||
new ItemStack[] {
|
||||
new ItemStack(Blocks.dragon_egg, 1),
|
||||
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L),
|
||||
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L)
|
||||
},
|
||||
new FluidStack[] {Materials.Radon.getPlasma(144)},
|
||||
new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L)},
|
||||
new FluidStack[] {new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)},
|
||||
new ItemStack[] { new ItemStack(Blocks.dragon_egg, 1),
|
||||
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L),
|
||||
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L) },
|
||||
new FluidStack[] { Materials.Radon.getPlasma(144) },
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L) },
|
||||
new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288) },
|
||||
14000,
|
||||
1966080);
|
||||
}
|
||||
// Casing blocks
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1L),
|
||||
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 4L)
|
||||
},
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1L),
|
||||
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 4L) },
|
||||
Materials.SolderingAlloy.getMolten(576L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 2),
|
||||
100,
|
||||
(int) (GT_Values.V[5] - (GT_Values.V[5] / 10)));
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Indium, 1L),
|
||||
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Tungsten, 4L)
|
||||
},
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Indium, 1L),
|
||||
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Tungsten, 4L) },
|
||||
Materials.SolderingAlloy.getMolten(576L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 3),
|
||||
100,
|
||||
(int) (GT_Values.V[5] - (GT_Values.V[5] / 10)));
|
||||
if (Loader.isModLoaded("ThaumicTinkerer"))
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 2),
|
||||
GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 2L, 2)
|
||||
},
|
||||
Materials.Concrete.getMolten(2304L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 4),
|
||||
100,
|
||||
(int) (GT_Values.V[5] - (GT_Values.V[5] / 10)));
|
||||
else
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 2), Materials.ElectrumFlux.getPlates(8)
|
||||
},
|
||||
Materials.Concrete.getMolten(2304L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 4),
|
||||
100,
|
||||
(int) (GT_Values.V[5] - (GT_Values.V[5] / 10)));
|
||||
if (Loader.isModLoaded("ThaumicTinkerer")) GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 2),
|
||||
GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 2L, 2) },
|
||||
Materials.Concrete.getMolten(2304L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 4),
|
||||
100,
|
||||
(int) (GT_Values.V[5] - (GT_Values.V[5] / 10)));
|
||||
else GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 2),
|
||||
Materials.ElectrumFlux.getPlates(8) },
|
||||
Materials.Concrete.getMolten(2304L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 4),
|
||||
100,
|
||||
(int) (GT_Values.V[5] - (GT_Values.V[5] / 10)));
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 3),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 8L)
|
||||
},
|
||||
new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 3),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 8L) },
|
||||
Materials.Osmiridium.getMolten(576L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 5),
|
||||
100,
|
||||
(int) (GT_Values.V[5] - (GT_Values.V[5] / 10)));
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 6L),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 6L)
|
||||
},
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 6L),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 6L) },
|
||||
Materials.Void.getMolten(1152L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 7),
|
||||
24000,
|
||||
491520);
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
GT_ModHandler.getModItem("dreamcraft", "tile.BloodyIchorium", 1, 0),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L)
|
||||
},
|
||||
new ItemStack[] { GT_ModHandler.getModItem("dreamcraft", "tile.BloodyIchorium", 1, 0),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L) },
|
||||
Materials.Void.getMolten(1152L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 8),
|
||||
24000,
|
||||
491520);
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 8),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 6L),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0)
|
||||
},
|
||||
new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 8),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 6L),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0) },
|
||||
Materials.Void.getMolten(2304L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 9),
|
||||
24000,
|
||||
491520); // uv
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 9),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6L),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 2, 0)
|
||||
},
|
||||
new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 9),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6L),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 2, 0) },
|
||||
Materials.Void.getMolten(4608L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 10),
|
||||
12000,
|
||||
1996080); // uhv, you need uhv to get the thing anyway?
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 10),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 6L),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 3, 0)
|
||||
},
|
||||
new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 10),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 6L),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 3, 0) },
|
||||
Materials.Void.getMolten(9216L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 11),
|
||||
12000,
|
||||
7864320); // uev
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 11),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6L),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "chaoticCore", 4, 0)
|
||||
},
|
||||
new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 11),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6L),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "chaoticCore", 4, 0) },
|
||||
Materials.Void.getMolten(18432L),
|
||||
new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 12),
|
||||
12000,
|
||||
@@ -169,23 +148,21 @@ public class EMT_GT_Loader implements Runnable {
|
||||
|
||||
DECC = new DE_Fusion_Crafter(5001, "de_fusion_crafter", "Draconic Evolution Fusion Crafter").getStackForm(1L);
|
||||
|
||||
/* New DECF controller recipe moved to TT. only create the old one here if tectech or blood magic is not around.*/
|
||||
/*
|
||||
* New DECF controller recipe moved to TT. only create the old one here if tectech or blood magic is not around.
|
||||
*/
|
||||
|
||||
if (!(Loader.isModLoaded("tectech") && Loader.isModLoaded("AWWayofTime"))) {
|
||||
GT_Values.RA.addAssemblylineRecipe(
|
||||
GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10780),
|
||||
144000,
|
||||
new Object[] {
|
||||
GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10780),
|
||||
ItemList.Robot_Arm_LuV.get(2L),
|
||||
ItemList.Electric_Motor_LuV.get(2L),
|
||||
ItemList.Field_Generator_LuV.get(1L),
|
||||
new Object[] {OrePrefixes.circuit.get(Materials.Master), 2},
|
||||
ItemList.Casing_Coil_Naquadah.get(8L),
|
||||
},
|
||||
new FluidStack[] {
|
||||
Materials.SolderingAlloy.getMolten(2304L), Materials.Thaumium.getMolten(1440L),
|
||||
},
|
||||
new Object[] { GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10780),
|
||||
ItemList.Robot_Arm_LuV.get(2L), ItemList.Electric_Motor_LuV.get(2L),
|
||||
ItemList.Field_Generator_LuV.get(1L),
|
||||
new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 },
|
||||
ItemList.Casing_Coil_Naquadah.get(8L), },
|
||||
new FluidStack[] { Materials.SolderingAlloy.getMolten(2304L),
|
||||
Materials.Thaumium.getMolten(1440L), },
|
||||
DECC,
|
||||
1500,
|
||||
16384);
|
||||
@@ -193,7 +170,7 @@ public class EMT_GT_Loader implements Runnable {
|
||||
|
||||
for (int i = 0; i < ItemList.HATCHES_INPUT.length; i++) {
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {ItemList.HATCHES_INPUT[i].get(1L), new ItemStack(ConfigBlocks.blockTube, 1, 4)},
|
||||
new ItemStack[] { ItemList.HATCHES_INPUT[i].get(1L), new ItemStack(ConfigBlocks.blockTube, 1, 4) },
|
||||
Materials.Thaumium.getMolten(288L),
|
||||
EHatch[i],
|
||||
100,
|
||||
@@ -201,17 +178,16 @@ public class EMT_GT_Loader implements Runnable {
|
||||
}
|
||||
|
||||
ResearchMultiblock = new GT_MetaTileEntity_ResearchCompleter(
|
||||
aIDoffset + GT_Values.VN.length + 2, "Research Completer", "Research Completer")
|
||||
.getStackForm(1L);
|
||||
aIDoffset + GT_Values.VN.length + 2,
|
||||
"Research Completer",
|
||||
"Research Completer").getStackForm(1L);
|
||||
}
|
||||
|
||||
public void runlate() {
|
||||
GT_Values.RA.addAssemblerRecipe(
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.book),
|
||||
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1L),
|
||||
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)
|
||||
},
|
||||
new ItemStack[] { new ItemStack(Items.book),
|
||||
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1L),
|
||||
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE) },
|
||||
GT_Values.NF,
|
||||
mkbook(),
|
||||
128,
|
||||
|
||||
@@ -3,6 +3,13 @@ package emt.gthandler.common.loader;
|
||||
import static gregtech.api.enums.GT_Values.E;
|
||||
import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import emt.client.gui.EMT_UITextures;
|
||||
import emt.init.EMTItems;
|
||||
@@ -13,74 +20,51 @@ import gregtech.api.enums.OrePrefixes;
|
||||
import gregtech.api.util.GT_ModHandler;
|
||||
import gregtech.api.util.GT_OreDictUnificator;
|
||||
import gregtech.api.util.GT_Recipe;
|
||||
import java.util.HashSet;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
public class EMT_RecipeAdder {
|
||||
|
||||
public static final GT_Recipe.GT_Recipe_Map sFusionCraftingRecipes = new GT_Recipe.GT_Recipe_Map(
|
||||
new HashSet<>(16),
|
||||
"emt.recipe.fusioncrafting",
|
||||
"Draconic Evolution Fusion Crafter",
|
||||
null,
|
||||
RES_PATH_GUI + "basicmachines/FusionCrafter",
|
||||
9,
|
||||
1,
|
||||
1,
|
||||
0,
|
||||
1,
|
||||
"Tier Casing: ",
|
||||
1,
|
||||
E,
|
||||
false,
|
||||
true)
|
||||
.setSlotOverlay(false, false, EMT_UITextures.OVERLAY_SLOT_FUSION_CRAFTING);
|
||||
new HashSet<>(16),
|
||||
"emt.recipe.fusioncrafting",
|
||||
"Draconic Evolution Fusion Crafter",
|
||||
null,
|
||||
RES_PATH_GUI + "basicmachines/FusionCrafter",
|
||||
9,
|
||||
1,
|
||||
1,
|
||||
0,
|
||||
1,
|
||||
"Tier Casing: ",
|
||||
1,
|
||||
E,
|
||||
false,
|
||||
true).setSlotOverlay(false, false, EMT_UITextures.OVERLAY_SLOT_FUSION_CRAFTING);
|
||||
|
||||
public static void addFusionCraftingRecipe(
|
||||
ItemStack[] inputs,
|
||||
FluidStack[] fluidinputs,
|
||||
ItemStack[] outputs,
|
||||
FluidStack[] fluidoutputs,
|
||||
int aDuration,
|
||||
int aEUt,
|
||||
int aTier) {
|
||||
sFusionCraftingRecipes.addRecipe(
|
||||
true, inputs, outputs, null, fluidinputs, fluidoutputs, aDuration, aEUt, aTier);
|
||||
public static void addFusionCraftingRecipe(ItemStack[] inputs, FluidStack[] fluidinputs, ItemStack[] outputs,
|
||||
FluidStack[] fluidoutputs, int aDuration, int aEUt, int aTier) {
|
||||
sFusionCraftingRecipes
|
||||
.addRecipe(true, inputs, outputs, null, fluidinputs, fluidoutputs, aDuration, aEUt, aTier);
|
||||
}
|
||||
|
||||
public static void addFusionCraftingRecipeNonOptimized(
|
||||
ItemStack[] inputs,
|
||||
FluidStack[] fluidinputs,
|
||||
ItemStack[] outputs,
|
||||
FluidStack[] fluidoutputs,
|
||||
int aDuration,
|
||||
int aEUt,
|
||||
int aTier) {
|
||||
sFusionCraftingRecipes.addRecipe(
|
||||
false, inputs, outputs, null, fluidinputs, fluidoutputs, aDuration, aEUt, aTier);
|
||||
public static void addFusionCraftingRecipeNonOptimized(ItemStack[] inputs, FluidStack[] fluidinputs,
|
||||
ItemStack[] outputs, FluidStack[] fluidoutputs, int aDuration, int aEUt, int aTier) {
|
||||
sFusionCraftingRecipes
|
||||
.addRecipe(false, inputs, outputs, null, fluidinputs, fluidoutputs, aDuration, aEUt, aTier);
|
||||
}
|
||||
|
||||
public static void addFusionCraftingRecipe(
|
||||
ItemStack[] inputs, ItemStack output, int aDuration, int aEUt, int aTier) {
|
||||
addFusionCraftingRecipe(inputs, null, new ItemStack[] {output}, null, aDuration, aEUt, aTier);
|
||||
public static void addFusionCraftingRecipe(ItemStack[] inputs, ItemStack output, int aDuration, int aEUt,
|
||||
int aTier) {
|
||||
addFusionCraftingRecipe(inputs, null, new ItemStack[] { output }, null, aDuration, aEUt, aTier);
|
||||
}
|
||||
|
||||
// Use this if you don't want your recipes quantity to be splitted
|
||||
public static void addFusionCraftingRecipeNonOptimized(
|
||||
ItemStack[] inputs,
|
||||
FluidStack fluidinput,
|
||||
ItemStack output,
|
||||
FluidStack fluidoutput,
|
||||
int aDuration,
|
||||
int aEUt,
|
||||
int aTier) {
|
||||
public static void addFusionCraftingRecipeNonOptimized(ItemStack[] inputs, FluidStack fluidinput, ItemStack output,
|
||||
FluidStack fluidoutput, int aDuration, int aEUt, int aTier) {
|
||||
addFusionCraftingRecipeNonOptimized(
|
||||
inputs,
|
||||
new FluidStack[] {fluidinput},
|
||||
new ItemStack[] {output},
|
||||
new FluidStack[] {fluidoutput},
|
||||
new FluidStack[] { fluidinput },
|
||||
new ItemStack[] { output },
|
||||
new FluidStack[] { fluidoutput },
|
||||
aDuration,
|
||||
aEUt,
|
||||
aTier);
|
||||
@@ -91,12 +75,9 @@ public class EMT_RecipeAdder {
|
||||
// CORES
|
||||
|
||||
addFusionCraftingRecipeNonOptimized(
|
||||
new ItemStack[] {
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1),
|
||||
ItemList.QuantumEye.get(1L),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 16)
|
||||
},
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1), ItemList.QuantumEye.get(1L),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 16) },
|
||||
Materials.Sunnarium.getMolten(1440),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0),
|
||||
GT_Values.NF,
|
||||
@@ -105,13 +86,10 @@ public class EMT_RecipeAdder {
|
||||
1);
|
||||
|
||||
addFusionCraftingRecipeNonOptimized(
|
||||
new ItemStack[] {
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 4, 0),
|
||||
ItemList.QuantumStar.get(1L),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 17),
|
||||
},
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 4, 0),
|
||||
ItemList.QuantumStar.get(1L), new ItemStack(EMTItems.itemEMTItems, 0, 17), },
|
||||
Materials.Neutronium.getMolten(1440),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0),
|
||||
GT_Values.NF,
|
||||
@@ -120,13 +98,11 @@ public class EMT_RecipeAdder {
|
||||
2);
|
||||
if (Loader.isModLoaded("supersolarpanel")) {
|
||||
addFusionCraftingRecipeNonOptimized(
|
||||
new ItemStack[] {
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0),
|
||||
GT_ModHandler.getModItem("supersolarpanel", "enderquantumcomponent", 1, 0),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 18)
|
||||
},
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0),
|
||||
GT_ModHandler.getModItem("supersolarpanel", "enderquantumcomponent", 1, 0),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 18) },
|
||||
Materials.Infinity.getMolten(1440),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0),
|
||||
GT_Values.NF,
|
||||
@@ -135,13 +111,11 @@ public class EMT_RecipeAdder {
|
||||
3);
|
||||
} else {
|
||||
addFusionCraftingRecipeNonOptimized(
|
||||
new ItemStack[] {
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0),
|
||||
GT_ModHandler.getModItem("dreamcraft", "item.ManyullynCrystal", 1, 0),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 18)
|
||||
},
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0),
|
||||
GT_ModHandler.getModItem("dreamcraft", "item.ManyullynCrystal", 1, 0),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 18) },
|
||||
Materials.Infinity.getMolten(1440),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0),
|
||||
GT_Values.NF,
|
||||
@@ -151,13 +125,11 @@ public class EMT_RecipeAdder {
|
||||
}
|
||||
|
||||
addFusionCraftingRecipeNonOptimized(
|
||||
new ItemStack[] {
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 4, 0),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "chaosFragment", 2, 2),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 19)
|
||||
},
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 4, 0),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "chaosFragment", 2, 2),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 19) },
|
||||
Materials.SpaceTime.getMolten(1440),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "chaoticCore", 1, 0),
|
||||
GT_Values.NF,
|
||||
@@ -168,26 +140,22 @@ public class EMT_RecipeAdder {
|
||||
// ENERGY CORES
|
||||
|
||||
addFusionCraftingRecipe(
|
||||
new ItemStack[] {
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4),
|
||||
GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 4, 1),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 17)
|
||||
},
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8),
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4),
|
||||
GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 4, 1),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 17) },
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 1, 0),
|
||||
1000,
|
||||
500000,
|
||||
2);
|
||||
|
||||
addFusionCraftingRecipe(
|
||||
new ItemStack[] {
|
||||
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 4, 0),
|
||||
GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 4, 4),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 18)
|
||||
},
|
||||
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 4, 0),
|
||||
GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 4, 4),
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0),
|
||||
new ItemStack(EMTItems.itemEMTItems, 0, 18) },
|
||||
GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 1, 1),
|
||||
2000,
|
||||
2000000,
|
||||
@@ -197,10 +165,8 @@ public class EMT_RecipeAdder {
|
||||
if (Loader.isModLoaded("miscutils")) {
|
||||
|
||||
addFusionCraftingRecipeNonOptimized(
|
||||
new ItemStack[] {
|
||||
new ItemStack(Blocks.dragon_egg, 0),
|
||||
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64)
|
||||
},
|
||||
new ItemStack[] { new ItemStack(Blocks.dragon_egg, 0),
|
||||
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64) },
|
||||
Materials.Radon.getPlasma(144),
|
||||
null,
|
||||
new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288),
|
||||
@@ -209,10 +175,8 @@ public class EMT_RecipeAdder {
|
||||
3);
|
||||
|
||||
addFusionCraftingRecipeNonOptimized(
|
||||
new ItemStack[] {
|
||||
GT_ModHandler.getModItem("witchery", "infinityegg", 0),
|
||||
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64)
|
||||
},
|
||||
new ItemStack[] { GT_ModHandler.getModItem("witchery", "infinityegg", 0),
|
||||
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64) },
|
||||
Materials.Radon.getPlasma(72),
|
||||
null,
|
||||
new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432),
|
||||
|
||||
+78
-126
@@ -5,8 +5,19 @@ import static gregtech.api.enums.GT_Values.V;
|
||||
import static gregtech.api.enums.Textures.BlockIcons.*;
|
||||
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
|
||||
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.gthandler.common.items.EMT_CasingBlock;
|
||||
import emt.gthandler.common.loader.EMT_RecipeAdder;
|
||||
@@ -19,15 +30,9 @@ import gregtech.api.render.TextureFactory;
|
||||
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
|
||||
import gregtech.api.util.GT_Recipe;
|
||||
import gregtech.api.util.GT_Utility;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
public class DE_Fusion_Crafter extends GT_MetaTileEntity_EnhancedMultiBlockBase<DE_Fusion_Crafter> {
|
||||
|
||||
private static final int CASING_INDEX = (1 << 7) + (15 + 48);
|
||||
private int mTierCasing = 0;
|
||||
private int mFusionTierCasing = 0;
|
||||
@@ -47,61 +52,47 @@ public class DE_Fusion_Crafter extends GT_MetaTileEntity_EnhancedMultiBlockBase<
|
||||
}
|
||||
|
||||
private static final String STRUCTURE_PIECE_MAIN = "main";
|
||||
private static final List<Pair<Block, Integer>> fusionCasingTiers =
|
||||
Arrays.asList(Pair.of(GregTech_API.sBlockCasings4, 6), Pair.of(GregTech_API.sBlockCasings4, 8));
|
||||
private static final List<Pair<Block, Integer>> fusionCasingTiers = Arrays
|
||||
.asList(Pair.of(GregTech_API.sBlockCasings4, 6), Pair.of(GregTech_API.sBlockCasings4, 8));
|
||||
private static final List<Pair<Block, Integer>> coreTiers = Arrays.asList(
|
||||
Pair.of(EMT_CasingBlock.EMT_GT_BLOCKS[0], 8),
|
||||
Pair.of(EMT_CasingBlock.EMT_GT_BLOCKS[0], 9),
|
||||
Pair.of(EMT_CasingBlock.EMT_GT_BLOCKS[0], 10),
|
||||
Pair.of(EMT_CasingBlock.EMT_GT_BLOCKS[0], 11),
|
||||
Pair.of(EMT_CasingBlock.EMT_GT_BLOCKS[0], 12));
|
||||
private static final IStructureDefinition<DE_Fusion_Crafter> STRUCTURE_DEFINITION =
|
||||
StructureDefinition.<DE_Fusion_Crafter>builder()
|
||||
.addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][] {
|
||||
{"nnnnn", "nnnnn", "nnnnn", "nnnnn", "nnnnn"},
|
||||
{" ", " F ", " FfF ", " F ", " "},
|
||||
{" ", " F ", " FfF ", " F ", " "},
|
||||
{"RRRRR", "R F R", "RFfFR", "R F R", "RRRRR"},
|
||||
{" ", " F ", " FfF ", " F ", " "},
|
||||
{" ", " F ", " FfF ", " F ", " "},
|
||||
{"RRRRR", "R F R", "RFfFR", "R F R", "RRRRR"},
|
||||
{" ", " F ", " FfF ", " F ", " "},
|
||||
{" ", " F ", " FfF ", " F ", " "},
|
||||
{"NN~NN", "NNNNN", "NNNNN", "NNNNN", "NNNNN"}
|
||||
}))
|
||||
.addElement(
|
||||
'N',
|
||||
ofChain(
|
||||
onElementPass(e -> e.mCasing++, ofBlock(EMT_CasingBlock.EMT_GT_BLOCKS[0], 7)),
|
||||
ofHatchAdder(DE_Fusion_Crafter::addEnergyInputToMachineList, CASING_INDEX, 1),
|
||||
ofHatchAdder(DE_Fusion_Crafter::addInputToMachineList, CASING_INDEX, 1),
|
||||
ofHatchAdder(DE_Fusion_Crafter::addOutputToMachineList, CASING_INDEX, 1),
|
||||
ofHatchAdder(DE_Fusion_Crafter::addMaintenanceToMachineList, CASING_INDEX, 1)))
|
||||
.addElement('n', onElementPass(e -> e.mCasing++, ofBlock(EMT_CasingBlock.EMT_GT_BLOCKS[0], 7)))
|
||||
.addElement('f', ofBlock(GregTech_API.sBlockCasings4, 7))
|
||||
.addElement(
|
||||
'F',
|
||||
ofBlocksTiered(
|
||||
(Block b, int m) -> {
|
||||
if (b != GregTech_API.sBlockCasings4 || (m != 6 && m != 8)) return -2;
|
||||
return m == 6 ? 1 : 2;
|
||||
},
|
||||
fusionCasingTiers,
|
||||
-1,
|
||||
(e, i) -> e.mFusionTierCasing = i,
|
||||
e -> e.mFusionTierCasing))
|
||||
.addElement(
|
||||
'R',
|
||||
ofBlocksTiered(
|
||||
(Block b, int m) -> {
|
||||
if (b != EMT_CasingBlock.EMT_GT_BLOCKS[0] || m < 8 || m > 12) return -2;
|
||||
return m - 7;
|
||||
},
|
||||
coreTiers,
|
||||
-1,
|
||||
(e, i) -> e.mTierCasing = i,
|
||||
e -> e.mTierCasing))
|
||||
.build();
|
||||
private static final IStructureDefinition<DE_Fusion_Crafter> STRUCTURE_DEFINITION = StructureDefinition
|
||||
.<DE_Fusion_Crafter>builder()
|
||||
.addShape(
|
||||
STRUCTURE_PIECE_MAIN,
|
||||
transpose(
|
||||
new String[][] { { "nnnnn", "nnnnn", "nnnnn", "nnnnn", "nnnnn" },
|
||||
{ " ", " F ", " FfF ", " F ", " " },
|
||||
{ " ", " F ", " FfF ", " F ", " " },
|
||||
{ "RRRRR", "R F R", "RFfFR", "R F R", "RRRRR" },
|
||||
{ " ", " F ", " FfF ", " F ", " " },
|
||||
{ " ", " F ", " FfF ", " F ", " " },
|
||||
{ "RRRRR", "R F R", "RFfFR", "R F R", "RRRRR" },
|
||||
{ " ", " F ", " FfF ", " F ", " " },
|
||||
{ " ", " F ", " FfF ", " F ", " " },
|
||||
{ "NN~NN", "NNNNN", "NNNNN", "NNNNN", "NNNNN" } }))
|
||||
.addElement(
|
||||
'N',
|
||||
ofChain(
|
||||
onElementPass(e -> e.mCasing++, ofBlock(EMT_CasingBlock.EMT_GT_BLOCKS[0], 7)),
|
||||
ofHatchAdder(DE_Fusion_Crafter::addEnergyInputToMachineList, CASING_INDEX, 1),
|
||||
ofHatchAdder(DE_Fusion_Crafter::addInputToMachineList, CASING_INDEX, 1),
|
||||
ofHatchAdder(DE_Fusion_Crafter::addOutputToMachineList, CASING_INDEX, 1),
|
||||
ofHatchAdder(DE_Fusion_Crafter::addMaintenanceToMachineList, CASING_INDEX, 1)))
|
||||
.addElement('n', onElementPass(e -> e.mCasing++, ofBlock(EMT_CasingBlock.EMT_GT_BLOCKS[0], 7)))
|
||||
.addElement('f', ofBlock(GregTech_API.sBlockCasings4, 7))
|
||||
.addElement('F', ofBlocksTiered((Block b, int m) -> {
|
||||
if (b != GregTech_API.sBlockCasings4 || (m != 6 && m != 8)) return -2;
|
||||
return m == 6 ? 1 : 2;
|
||||
}, fusionCasingTiers, -1, (e, i) -> e.mFusionTierCasing = i, e -> e.mFusionTierCasing))
|
||||
.addElement('R', ofBlocksTiered((Block b, int m) -> {
|
||||
if (b != EMT_CasingBlock.EMT_GT_BLOCKS[0] || m < 8 || m > 12) return -2;
|
||||
return m - 7;
|
||||
}, coreTiers, -1, (e, i) -> e.mTierCasing = i, e -> e.mTierCasing)).build();
|
||||
|
||||
@Override
|
||||
public IStructureDefinition<DE_Fusion_Crafter> getStructureDefinition() {
|
||||
@@ -122,86 +113,48 @@ public class DE_Fusion_Crafter extends GT_MetaTileEntity_EnhancedMultiBlockBase<
|
||||
@Override
|
||||
protected GT_Multiblock_Tooltip_Builder createTooltip() {
|
||||
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
|
||||
tt.addMachineType("Fusion Crafter")
|
||||
.addInfo("Controller Block for the Draconic Evolution Fusion Crafter")
|
||||
tt.addMachineType("Fusion Crafter").addInfo("Controller Block for the Draconic Evolution Fusion Crafter")
|
||||
.addInfo("Machine can be overclocked by using casings above the recipe tier:")
|
||||
.addInfo("Recipe time is divided by number of tiers above the recipe")
|
||||
.addInfo("Normal EU OC still applies !")
|
||||
.addInfo("To see the structure, use a " + EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE
|
||||
+ "Tech" + EnumChatFormatting.GRAY + " structure hologram on the Controller!")
|
||||
.addSeparator()
|
||||
.beginStructureBlock(5, 10, 5, false)
|
||||
.addController("Front bottom center")
|
||||
.addInfo(
|
||||
"To see the structure, use a " + EnumChatFormatting.BLUE
|
||||
+ "Tec"
|
||||
+ EnumChatFormatting.DARK_BLUE
|
||||
+ "Tech"
|
||||
+ EnumChatFormatting.GRAY
|
||||
+ " structure hologram on the Controller!")
|
||||
.addSeparator().beginStructureBlock(5, 10, 5, false).addController("Front bottom center")
|
||||
.addCasingInfo("Naquadah Alloy Fusion Casing", 19)
|
||||
.addOtherStructurePart("Fusion Coil Block", "Center pillar")
|
||||
.addOtherStructurePart("Fusion Machine Casing", "Touching Fusion Coil Block at every side")
|
||||
.addOtherStructurePart("Tiered Fusion Casing", "Rings (5x5 hollow) at layer 4 and 7")
|
||||
.addStructureInfo("Bloody Ichorium for tier 1, Draconium for tier 2, etc")
|
||||
.addStructureInfo("To use tier 3 + you have to use fusion casing MK II")
|
||||
.addInputBus("Any bottom casing", 1)
|
||||
.addInputHatch("Any bottom casing", 1)
|
||||
.addOutputBus("Any bottom casing", 1)
|
||||
.addOutputHatch("Any bottom casing", 1)
|
||||
.addEnergyHatch("Any bottom casing", 1)
|
||||
.addMaintenanceHatch("Any bottom casing", 1)
|
||||
.addInputBus("Any bottom casing", 1).addInputHatch("Any bottom casing", 1)
|
||||
.addOutputBus("Any bottom casing", 1).addOutputHatch("Any bottom casing", 1)
|
||||
.addEnergyHatch("Any bottom casing", 1).addMaintenanceHatch("Any bottom casing", 1)
|
||||
.toolTipFinisher(EMT.NAME);
|
||||
return tt;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITexture[] getTexture(
|
||||
IGregTechTileEntity aBaseMetaTileEntity,
|
||||
byte aSide,
|
||||
byte aFacing,
|
||||
byte aColorIndex,
|
||||
boolean aActive,
|
||||
boolean aRedstone) {
|
||||
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
|
||||
boolean aActive, boolean aRedstone) {
|
||||
if (aSide == aFacing) {
|
||||
if (aActive)
|
||||
return new ITexture[] {
|
||||
TextureFactory.of(MACHINE_CASING_MAGIC),
|
||||
TextureFactory.builder()
|
||||
.addIcon(OVERLAY_TELEPORTER_ACTIVE)
|
||||
.extFacing()
|
||||
.build(),
|
||||
TextureFactory.builder()
|
||||
.addIcon(OVERLAY_TELEPORTER_ACTIVE_GLOW)
|
||||
.extFacing()
|
||||
.glow()
|
||||
.build()
|
||||
};
|
||||
return new ITexture[] {
|
||||
TextureFactory.of(MACHINE_CASING_MAGIC),
|
||||
TextureFactory.builder().addIcon(OVERLAY_TELEPORTER).extFacing().build(),
|
||||
TextureFactory.builder()
|
||||
.addIcon(OVERLAY_TELEPORTER_GLOW)
|
||||
.extFacing()
|
||||
.glow()
|
||||
.build()
|
||||
};
|
||||
if (aActive) return new ITexture[] { TextureFactory.of(MACHINE_CASING_MAGIC),
|
||||
TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_ACTIVE).extFacing().build(),
|
||||
TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_ACTIVE_GLOW).extFacing().glow().build() };
|
||||
return new ITexture[] { TextureFactory.of(MACHINE_CASING_MAGIC),
|
||||
TextureFactory.builder().addIcon(OVERLAY_TELEPORTER).extFacing().build(),
|
||||
TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_GLOW).extFacing().glow().build() };
|
||||
}
|
||||
if (aActive)
|
||||
return new ITexture[] {
|
||||
TextureFactory.of(MACHINE_CASING_MAGIC),
|
||||
TextureFactory.builder()
|
||||
.addIcon(MACHINE_CASING_MAGIC_ACTIVE)
|
||||
.extFacing()
|
||||
.build(),
|
||||
TextureFactory.builder()
|
||||
.addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW)
|
||||
.extFacing()
|
||||
.glow()
|
||||
.build()
|
||||
};
|
||||
return new ITexture[] {
|
||||
TextureFactory.of(MACHINE_CASING_MAGIC),
|
||||
TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC).extFacing().build(),
|
||||
TextureFactory.builder()
|
||||
.addIcon(MACHINE_CASING_MAGIC_GLOW)
|
||||
.extFacing()
|
||||
.glow()
|
||||
.build()
|
||||
};
|
||||
if (aActive) return new ITexture[] { TextureFactory.of(MACHINE_CASING_MAGIC),
|
||||
TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE).extFacing().build(),
|
||||
TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW).extFacing().glow().build() };
|
||||
return new ITexture[] { TextureFactory.of(MACHINE_CASING_MAGIC),
|
||||
TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC).extFacing().build(),
|
||||
TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_GLOW).extFacing().glow().build() };
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -222,10 +175,9 @@ public class DE_Fusion_Crafter extends GT_MetaTileEntity_EnhancedMultiBlockBase<
|
||||
if (tInputs.length > 0) {
|
||||
long tVoltage = getMaxInputVoltage();
|
||||
byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
|
||||
GT_Recipe tRecipe = EMT_RecipeAdder.sFusionCraftingRecipes.findRecipe(
|
||||
getBaseMetaTileEntity(), false, V[tTier], tFluids, tInputs);
|
||||
if ((tRecipe != null)
|
||||
&& (this.mTierCasing >= tRecipe.mSpecialValue)
|
||||
GT_Recipe tRecipe = EMT_RecipeAdder.sFusionCraftingRecipes
|
||||
.findRecipe(getBaseMetaTileEntity(), false, V[tTier], tFluids, tInputs);
|
||||
if ((tRecipe != null) && (this.mTierCasing >= tRecipe.mSpecialValue)
|
||||
&& (tRecipe.isRecipeInputEqual(true, tFluids, tInputs))) {
|
||||
calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 2, tVoltage);
|
||||
if (this.mEUt > 0) this.mEUt = (-this.mEUt);
|
||||
@@ -233,8 +185,8 @@ public class DE_Fusion_Crafter extends GT_MetaTileEntity_EnhancedMultiBlockBase<
|
||||
this.mEfficiencyIncrease = 10000;
|
||||
this.mMaxProgresstime /= ((mTierCasing - tRecipe.mSpecialValue) + 1);
|
||||
this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
|
||||
this.mOutputItems = new ItemStack[] {tRecipe.getOutput(0), tRecipe.getOutput(1)};
|
||||
this.mOutputFluids = new FluidStack[] {tRecipe.getFluidOutput(0)};
|
||||
this.mOutputItems = new ItemStack[] { tRecipe.getOutput(0), tRecipe.getOutput(1) };
|
||||
this.mOutputFluids = new FluidStack[] { tRecipe.getFluidOutput(0) };
|
||||
updateSlots();
|
||||
return true;
|
||||
}
|
||||
|
||||
+61
-93
@@ -1,5 +1,16 @@
|
||||
package emt.gthandler.common.tileentities.machines.multi.generator;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.visnet.VisNetHandler;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import emt.gthandler.common.implementations.EssentiaHatch;
|
||||
import emt.gthandler.common.items.EMT_CasingBlock;
|
||||
import emt.util.EMTEssentiasOutputs;
|
||||
@@ -12,15 +23,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
|
||||
import gregtech.api.objects.GT_RenderedTexture;
|
||||
import gregtech.api.objects.XSTR;
|
||||
import java.util.ArrayList;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.visnet.VisNetHandler;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
|
||||
public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
|
||||
@@ -39,26 +41,20 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
|
||||
@Override
|
||||
public String[] getDescription() {
|
||||
return new String[] {
|
||||
"Controller Block for the Large Essentia Generator.",
|
||||
"Produces energy from magical essentia decay.",
|
||||
"Size(WxHxD): 7x4x7, Controller (Bottom, Center)",
|
||||
"Top-Middle 5x1x5 layer are Muffler Hatches",
|
||||
"Middle 5x2x5 layer are Essentia Diffusion Cells",
|
||||
"Everything from here on goes either in the bottom or on the sides",
|
||||
"1x Fluid Input Hatch",
|
||||
"1x Essentia Input Hatch",
|
||||
"1x Dynamo Hatches",
|
||||
"1x Maintenance Hatch",
|
||||
"The outer hull is made out of Magic Containing Casings",
|
||||
"Produces 20x more than the singleblock generator per essentia",
|
||||
"Causes magical and serious conventional pollution",
|
||||
"Needs 1L Lubricant per second or will cause way more conventional pollution",
|
||||
"Needs 10 " + EMTTextHelper.LIGHT_BLUE + "Aqua" + EMTTextHelper.LIGHT_GRAY
|
||||
+ " cVis per second or will cause way more magical pollution",
|
||||
"Added by EMT",
|
||||
"Made by bartimaeusnek"
|
||||
};
|
||||
return new String[] { "Controller Block for the Large Essentia Generator.",
|
||||
"Produces energy from magical essentia decay.", "Size(WxHxD): 7x4x7, Controller (Bottom, Center)",
|
||||
"Top-Middle 5x1x5 layer are Muffler Hatches", "Middle 5x2x5 layer are Essentia Diffusion Cells",
|
||||
"Everything from here on goes either in the bottom or on the sides", "1x Fluid Input Hatch",
|
||||
"1x Essentia Input Hatch", "1x Dynamo Hatches", "1x Maintenance Hatch",
|
||||
"The outer hull is made out of Magic Containing Casings",
|
||||
"Produces 20x more than the singleblock generator per essentia",
|
||||
"Causes magical and serious conventional pollution",
|
||||
"Needs 1L Lubricant per second or will cause way more conventional pollution",
|
||||
"Needs 10 " + EMTTextHelper.LIGHT_BLUE
|
||||
+ "Aqua"
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ " cVis per second or will cause way more magical pollution",
|
||||
"Added by EMT", "Made by bartimaeusnek" };
|
||||
}
|
||||
|
||||
public int getCurrentEfficiency(ItemStack itemStack) {
|
||||
@@ -67,23 +63,15 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITexture[] getTexture(
|
||||
IGregTechTileEntity aBaseMetaTileEntity,
|
||||
byte aSide,
|
||||
byte aFacing,
|
||||
byte aColorIndex,
|
||||
boolean aActive,
|
||||
boolean aRedstone) {
|
||||
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
|
||||
boolean aActive, boolean aRedstone) {
|
||||
if (aSide == aFacing) {
|
||||
return new ITexture[] {
|
||||
Textures.BlockIcons.getCasingTextureForId(CASING_INDEX),
|
||||
new GT_RenderedTexture(
|
||||
aActive
|
||||
? Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE
|
||||
: Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER)
|
||||
};
|
||||
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX),
|
||||
new GT_RenderedTexture(
|
||||
aActive ? Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE
|
||||
: Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER) };
|
||||
}
|
||||
return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(CASING_INDEX)};
|
||||
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX) };
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -195,8 +183,8 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
for (int x = -3; x <= 3; x++) {
|
||||
for (int z = -3; z <= 3; z++) {
|
||||
for (int h = 0; h <= 3; h++) {
|
||||
final IGregTechTileEntity tTileEntity =
|
||||
aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, h, zDir + z);
|
||||
final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity
|
||||
.getIGregTechTileEntityOffset(xDir + x, h, zDir + z);
|
||||
|
||||
if (!(Math.abs(x) == 3 || Math.abs(z) == 3)) {
|
||||
// Muffler on top.
|
||||
@@ -207,7 +195,8 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
} else if (h != 0) {
|
||||
// inside Special Blocks
|
||||
if (aBaseMetaTileEntity.getBlockOffset(xDir + x, h, zDir + z)
|
||||
!= EMT_CasingBlock.EMT_GT_BLOCKS[0]) return false;
|
||||
!= EMT_CasingBlock.EMT_GT_BLOCKS[0])
|
||||
return false;
|
||||
else if ((aBaseMetaTileEntity.getMetaIDOffset(xDir + x, h, zDir + z) != 1)) return false;
|
||||
} else if (!(this.addEssetiaHatchToList(tTileEntity, CASING_INDEX)
|
||||
|| this.addDynamoToMachineList(tTileEntity, CASING_INDEX)
|
||||
@@ -215,7 +204,8 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
|| this.addInputToMachineList(tTileEntity, CASING_INDEX)))
|
||||
// ground still casings
|
||||
if (aBaseMetaTileEntity.getBlockOffset(xDir + x, h, zDir + z)
|
||||
!= EMT_CasingBlock.EMT_GT_BLOCKS[0]) return false;
|
||||
!= EMT_CasingBlock.EMT_GT_BLOCKS[0])
|
||||
return false;
|
||||
else if ((aBaseMetaTileEntity.getMetaIDOffset(xDir + x, h, zDir + z) != 0)) return false;
|
||||
|
||||
} else if (h != 0) {
|
||||
@@ -225,8 +215,9 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
|| this.addMaintenanceToMachineList(tTileEntity, CASING_INDEX)
|
||||
|| this.addInputToMachineList(tTileEntity, CASING_INDEX)))
|
||||
if (aBaseMetaTileEntity.getBlockOffset(xDir + x, h, zDir + z)
|
||||
!= EMT_CasingBlock.EMT_GT_BLOCKS[0]) return false;
|
||||
else if ((aBaseMetaTileEntity.getMetaIDOffset(xDir + x, h, zDir + z) != 0)) return false;
|
||||
!= EMT_CasingBlock.EMT_GT_BLOCKS[0])
|
||||
return false;
|
||||
else if ((aBaseMetaTileEntity.getMetaIDOffset(xDir + x, h, zDir + z) != 0)) return false;
|
||||
} else if (h == 0) {
|
||||
// top and bottom corners
|
||||
if (!(this.addEssetiaHatchToList(tTileEntity, CASING_INDEX)
|
||||
@@ -234,10 +225,10 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
|| this.addMaintenanceToMachineList(tTileEntity, CASING_INDEX)
|
||||
|| this.addInputToMachineList(tTileEntity, CASING_INDEX)))
|
||||
if (((xDir + x) != 0) || ((zDir + z) != 0)) // controller
|
||||
if (aBaseMetaTileEntity.getBlockOffset(xDir + x, h, zDir + z)
|
||||
!= EMT_CasingBlock.EMT_GT_BLOCKS[0]) return false;
|
||||
else if ((aBaseMetaTileEntity.getMetaIDOffset(xDir + x, h, zDir + z) != 0))
|
||||
if (aBaseMetaTileEntity.getBlockOffset(xDir + x, h, zDir + z)
|
||||
!= EMT_CasingBlock.EMT_GT_BLOCKS[0])
|
||||
return false;
|
||||
else if ((aBaseMetaTileEntity.getMetaIDOffset(xDir + x, h, zDir + z) != 0)) return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -250,14 +241,9 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
if (this.mMaintenanceHatches.size() != 1) return false;
|
||||
|
||||
/*
|
||||
//repair shit debug shit
|
||||
this.mWrench = true;
|
||||
this.mScrewdriver = true;
|
||||
this.mSoftHammer = true;
|
||||
this.mHardHammer = true;
|
||||
this.mSolderingTool = true;
|
||||
this.mCrowbar = true;
|
||||
*/
|
||||
* //repair shit debug shit this.mWrench = true; this.mScrewdriver = true; this.mSoftHammer = true;
|
||||
* this.mHardHammer = true; this.mSolderingTool = true; this.mCrowbar = true;
|
||||
*/
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -318,12 +304,9 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
@Override
|
||||
public boolean checkRecipe(ItemStack arg0) {
|
||||
/*
|
||||
if (!this.getBaseMetaTileEntity().isActive())
|
||||
if (this.mEfficiency > 100)
|
||||
this.mEfficiency -= 8;
|
||||
else
|
||||
this.mEfficiency = 100;
|
||||
*/
|
||||
* if (!this.getBaseMetaTileEntity().isActive()) if (this.mEfficiency > 100) this.mEfficiency -= 8; else
|
||||
* this.mEfficiency = 100;
|
||||
*/
|
||||
if (this.mEssentiaHatches.get(0).fuelleft() > 0) {
|
||||
this.mMaxProgresstime = 1;
|
||||
this.mProgresstime = 0;
|
||||
@@ -362,19 +345,9 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
|
||||
// gets a chanche to release flux gas based on missing efficiency, min 1%
|
||||
if ((R.nextInt(getMaxEfficiency(null)) > (this.mEfficiency > 100 ? this.mEfficiency : 100)) || outOfcVis) {
|
||||
x = this.mMufflerHatches
|
||||
.get(RANDOMHATCH)
|
||||
.getBaseMetaTileEntity()
|
||||
.getXCoord();
|
||||
y = this.mMufflerHatches
|
||||
.get(RANDOMHATCH)
|
||||
.getBaseMetaTileEntity()
|
||||
.getYCoord()
|
||||
+ 1;
|
||||
z = this.mMufflerHatches
|
||||
.get(RANDOMHATCH)
|
||||
.getBaseMetaTileEntity()
|
||||
.getZCoord();
|
||||
x = this.mMufflerHatches.get(RANDOMHATCH).getBaseMetaTileEntity().getXCoord();
|
||||
y = this.mMufflerHatches.get(RANDOMHATCH).getBaseMetaTileEntity().getYCoord() + 1;
|
||||
z = this.mMufflerHatches.get(RANDOMHATCH).getBaseMetaTileEntity().getZCoord();
|
||||
WORLD.setBlock(x, y, z, ConfigBlocks.blockFluxGas, R.nextInt(8), 3);
|
||||
}
|
||||
}
|
||||
@@ -424,17 +397,12 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
|
||||
return old;
|
||||
}
|
||||
|
||||
/* @Override
|
||||
public void explodeMultiblock() {
|
||||
|
||||
final World WORLD=this.getBaseMetaTileEntity().getWorld();
|
||||
final int xDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX * 3;
|
||||
final int zDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ * 3;
|
||||
|
||||
for (int x = -3; x <= 3; x++)
|
||||
for (int z = -3; z <= 3; z++)
|
||||
for (int h = 0; h <= 3; h++)
|
||||
WORLD.setBlock(xDir+x, this.getBaseMetaTileEntity().getYCoord()+h, zDir+z, ConfigBlocks.blockFluxGas, 8, 3);
|
||||
super.explodeMultiblock();
|
||||
}*/
|
||||
/*
|
||||
* @Override public void explodeMultiblock() { final World WORLD=this.getBaseMetaTileEntity().getWorld(); final int
|
||||
* xDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX * 3; final int zDir =
|
||||
* ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ * 3; for (int x = -3; x <= 3;
|
||||
* x++) for (int z = -3; z <= 3; z++) for (int h = 0; h <= 3; h++) WORLD.setBlock(xDir+x,
|
||||
* this.getBaseMetaTileEntity().getYCoord()+h, zDir+z, ConfigBlocks.blockFluxGas, 8, 3); super.explodeMultiblock();
|
||||
* }
|
||||
*/
|
||||
}
|
||||
@@ -2,6 +2,10 @@ package emt.init;
|
||||
|
||||
import static thaumcraft.api.ThaumcraftApi.registerObjectTag;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import emt.block.*;
|
||||
import emt.item.block.ItemBlockElectricCloud;
|
||||
@@ -10,9 +14,6 @@ import emt.item.block.ItemBlockMachines;
|
||||
import emt.item.block.ItemBlockSolars;
|
||||
import emt.tile.solar.Solars;
|
||||
import ic2.api.item.IC2Items;
|
||||
import net.minecraft.block.Block;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
|
||||
public class EMTBlocks {
|
||||
|
||||
@@ -62,17 +63,11 @@ public class EMTBlocks {
|
||||
new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 2).add(Aspect.MECHANISM, 1));
|
||||
registerObjectTag(
|
||||
IC2Items.getItem("waterMill"),
|
||||
new AspectList()
|
||||
.add(Aspect.METAL, 2)
|
||||
.add(Aspect.ENERGY, 1)
|
||||
.add(Aspect.WATER, 2)
|
||||
new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 1).add(Aspect.WATER, 2)
|
||||
.add(Aspect.MECHANISM, 1));
|
||||
registerObjectTag(
|
||||
IC2Items.getItem("solarPanel"),
|
||||
new AspectList()
|
||||
.add(Aspect.METAL, 1)
|
||||
.add(Aspect.ENERGY, 1)
|
||||
.add(Aspect.LIGHT, 2)
|
||||
new AspectList().add(Aspect.METAL, 1).add(Aspect.ENERGY, 1).add(Aspect.LIGHT, 2)
|
||||
.add(Aspect.MECHANISM, 1));
|
||||
registerObjectTag(
|
||||
IC2Items.getItem("windMill"),
|
||||
@@ -94,31 +89,19 @@ public class EMTBlocks {
|
||||
new AspectList().add(Aspect.METAL, 2).add(Aspect.FIRE, 2).add(Aspect.MECHANISM, 1));
|
||||
registerObjectTag(
|
||||
IC2Items.getItem("electroFurnace"),
|
||||
new AspectList()
|
||||
.add(Aspect.METAL, 2)
|
||||
.add(Aspect.ENERGY, 1)
|
||||
.add(Aspect.FIRE, 3)
|
||||
new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 1).add(Aspect.FIRE, 3)
|
||||
.add(Aspect.MECHANISM, 1));
|
||||
registerObjectTag(
|
||||
IC2Items.getItem("macerator"),
|
||||
new AspectList()
|
||||
.add(Aspect.METAL, 1)
|
||||
.add(Aspect.ENERGY, 2)
|
||||
.add(Aspect.MINE, 2)
|
||||
new AspectList().add(Aspect.METAL, 1).add(Aspect.ENERGY, 2).add(Aspect.MINE, 2)
|
||||
.add(Aspect.MECHANISM, 1));
|
||||
registerObjectTag(
|
||||
IC2Items.getItem("extractor"),
|
||||
new AspectList()
|
||||
.add(Aspect.METAL, 2)
|
||||
.add(Aspect.ENERGY, 1)
|
||||
.add(Aspect.CRAFT, 2)
|
||||
new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 1).add(Aspect.CRAFT, 2)
|
||||
.add(Aspect.MECHANISM, 1));
|
||||
registerObjectTag(
|
||||
IC2Items.getItem("compressor"),
|
||||
new AspectList()
|
||||
.add(Aspect.METAL, 1)
|
||||
.add(Aspect.ENERGY, 2)
|
||||
.add(Aspect.VOID, 3)
|
||||
new AspectList().add(Aspect.METAL, 1).add(Aspect.ENERGY, 2).add(Aspect.VOID, 3)
|
||||
.add(Aspect.MECHANISM, 1));
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,15 @@
|
||||
package emt.init;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.EntityList.EntityEggInfo;
|
||||
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
import emt.EMT;
|
||||
import emt.entity.EntityArcher;
|
||||
import emt.entity.EntityEnergyBall;
|
||||
import emt.entity.EntityLaser;
|
||||
import emt.entity.EntityShield;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.EntityList.EntityEggInfo;
|
||||
|
||||
public class EMTEntities {
|
||||
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
package emt.init;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.util.EnumHelper;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import emt.EMT;
|
||||
import emt.item.ItemElectricScribingTools;
|
||||
@@ -32,12 +39,6 @@ import emt.item.tool.omnitool.ItemOmnitoolDiamond;
|
||||
import emt.item.tool.omnitool.ItemOmnitoolIron;
|
||||
import emt.item.tool.omnitool.ItemOmnitoolThaumium;
|
||||
import ic2.core.init.InternalName;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.util.EnumHelper;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
|
||||
public class EMTItems {
|
||||
|
||||
@@ -78,8 +79,8 @@ public class EMTItems {
|
||||
public static Item nanoWing;
|
||||
public static Item quantumWing;
|
||||
public static Item quantumArmor;
|
||||
public static ItemArmor.ArmorMaterial featherWingMaterial =
|
||||
EnumHelper.addArmorMaterial("FEATEHRWiNG", 1, new int[] {2, 2, 2, 2}, 6);
|
||||
public static ItemArmor.ArmorMaterial featherWingMaterial = EnumHelper
|
||||
.addArmorMaterial("FEATEHRWiNG", 1, new int[] { 2, 2, 2, 2 }, 6);
|
||||
|
||||
public static void registerItems() {
|
||||
itemEMTItems = new ItemMaterials();
|
||||
@@ -124,8 +125,8 @@ public class EMTItems {
|
||||
.setUnlocalizedName(EMT.MOD_ID + ".boots.traveller.quantum");
|
||||
GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller");
|
||||
|
||||
electricScribingTools =
|
||||
new ItemElectricScribingTools().setUnlocalizedName(EMT.MOD_ID + ".scribingtools.electric");
|
||||
electricScribingTools = new ItemElectricScribingTools()
|
||||
.setUnlocalizedName(EMT.MOD_ID + ".scribingtools.electric");
|
||||
GameRegistry.registerItem(electricScribingTools, "ElectricScribingTools");
|
||||
|
||||
featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(EMT.MOD_ID + ".wing.feather");
|
||||
@@ -135,8 +136,8 @@ public class EMTItems {
|
||||
.setUnlocalizedName(EMT.MOD_ID + ".wing.thaumium");
|
||||
GameRegistry.registerItem(thaumiumWing, "ThaumiumWing");
|
||||
|
||||
nanoWing =
|
||||
new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(EMT.MOD_ID + ".wing.nano");
|
||||
nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1)
|
||||
.setUnlocalizedName(EMT.MOD_ID + ".wing.nano");
|
||||
GameRegistry.registerItem(nanoWing, "NanosuitWing");
|
||||
|
||||
quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1)
|
||||
|
||||
@@ -3,6 +3,24 @@ package emt.init;
|
||||
import static emt.util.EMTRandomHelper.getChargedItem;
|
||||
import static thaumcraft.api.ThaumcraftApi.*;
|
||||
|
||||
import java.util.Iterator;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.crafting.CrucibleRecipe;
|
||||
import thaumcraft.api.crafting.InfusionRecipe;
|
||||
import thaumcraft.api.crafting.ShapedArcaneRecipe;
|
||||
import thaumcraft.api.crafting.ShapelessArcaneRecipe;
|
||||
import thaumcraft.common.blocks.ItemJarNode;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
@@ -14,22 +32,6 @@ import ic2.api.recipe.RecipeInputItemStack;
|
||||
import ic2.api.recipe.Recipes;
|
||||
import ic2.core.BasicMachineRecipeManager;
|
||||
import ic2.core.Ic2Items;
|
||||
import java.util.Iterator;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.crafting.CrucibleRecipe;
|
||||
import thaumcraft.api.crafting.InfusionRecipe;
|
||||
import thaumcraft.api.crafting.ShapedArcaneRecipe;
|
||||
import thaumcraft.api.crafting.ShapelessArcaneRecipe;
|
||||
import thaumcraft.common.blocks.ItemJarNode;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
|
||||
public class EMTRecipes {
|
||||
|
||||
@@ -179,7 +181,10 @@ public class EMTRecipes {
|
||||
'Z',
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 11));
|
||||
featherWings = GameRegistry.addShapedRecipe(
|
||||
new ItemStack(EMTItems.featherWing), "XX", 'X', new ItemStack(EMTItems.itemEMTItems, 1, 12));
|
||||
new ItemStack(EMTItems.featherWing),
|
||||
"XX",
|
||||
'X',
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 12));
|
||||
taintedFeathers = GameRegistry.addShapedRecipe(
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 13),
|
||||
" X ",
|
||||
@@ -246,15 +251,25 @@ public class EMTRecipes {
|
||||
|
||||
/** Smelting Recipes **/
|
||||
GameRegistry.addSmelting(
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F);
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 1),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 6),
|
||||
0.0F);
|
||||
GameRegistry.addSmelting(
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F);
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 2),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 6),
|
||||
0.0F);
|
||||
GameRegistry.addSmelting(
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F);
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 3),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 3),
|
||||
0.0F);
|
||||
GameRegistry.addSmelting(
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 4), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F);
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 4),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 3),
|
||||
0.0F);
|
||||
GameRegistry.addSmelting(
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 10), new ItemStack(EMTItems.itemEMTItems, 2, 8), 0.0F);
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 10),
|
||||
new ItemStack(EMTItems.itemEMTItems, 2, 8),
|
||||
0.0F);
|
||||
}
|
||||
|
||||
private static void registerShaplessRecipes() {}
|
||||
@@ -277,10 +292,8 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.uuMatterInfusions,
|
||||
IC2Items.getItem("Uran238"),
|
||||
new ItemStack[] {
|
||||
uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell,
|
||||
uuMCell
|
||||
});
|
||||
new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell,
|
||||
uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack uranium = IC2Items.getItem("Uran238").copy();
|
||||
uranium.stackSize = 2;
|
||||
@@ -290,7 +303,7 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.lesserUUMInfusions,
|
||||
new ItemStack(Items.diamond),
|
||||
new ItemStack[] {uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack diamond = new ItemStack(Items.diamond).copy();
|
||||
diamond.stackSize = 1;
|
||||
@@ -300,7 +313,7 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapUUMInfusions,
|
||||
new ItemStack(Items.gold_ingot),
|
||||
new ItemStack[] {uuMCell, uuMCell, uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack gold = new ItemStack(Items.gold_ingot).copy();
|
||||
gold.stackSize = 2;
|
||||
@@ -310,7 +323,7 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapestUUMInfusions,
|
||||
new ItemStack(Items.iron_ingot),
|
||||
new ItemStack[] {uuMCell, uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack ironOre = new ItemStack(Blocks.iron_ore).copy();
|
||||
ironOre.stackSize = 16;
|
||||
@@ -320,11 +333,10 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapUUMInfusions,
|
||||
new ItemStack(Blocks.stonebrick),
|
||||
new ItemStack[] {uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell });
|
||||
|
||||
/**
|
||||
* ItemStack copperOre = Items.getItem("copperOre").copy(); BUGGED IN
|
||||
* 1.6 IF IC2 OREGEN IS DISABLED
|
||||
* ItemStack copperOre = Items.getItem("copperOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED
|
||||
**/
|
||||
ItemStack copperOre = IC2Items.getItem("crushedCopperOre").copy();
|
||||
copperOre.stackSize = 32;
|
||||
@@ -334,11 +346,10 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapUUMInfusions,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6),
|
||||
new ItemStack[] {uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell });
|
||||
|
||||
/**
|
||||
* ItemStack tinOre = Items.getItem("tinOre").copy(); BUGGED IN 1.6 IF
|
||||
* IC2 OREGEN IS DISABLED
|
||||
* ItemStack tinOre = Items.getItem("tinOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED
|
||||
**/
|
||||
ItemStack tinOre = IC2Items.getItem("crushedTinOre").copy();
|
||||
tinOre.stackSize = 32;
|
||||
@@ -348,11 +359,10 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapUUMInfusions,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7),
|
||||
new ItemStack[] {uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell });
|
||||
|
||||
/**
|
||||
* ItemStack leadOre = Items.getItem("leadOre").copy(); BUGGED IN 1.6 IF
|
||||
* IC2 OREGEN IS DISABLED
|
||||
* ItemStack leadOre = Items.getItem("leadOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED
|
||||
**/
|
||||
ItemStack leadOre = IC2Items.getItem("crushedLeadOre").copy();
|
||||
leadOre.stackSize = 32;
|
||||
@@ -362,7 +372,7 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapUUMInfusions,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0),
|
||||
new ItemStack[] {uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell });
|
||||
|
||||
ItemStack uraniumOre = IC2Items.getItem("uraniumOre").copy();
|
||||
uraniumOre.stackSize = 8;
|
||||
@@ -372,7 +382,7 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.lesserUUMInfusions,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1),
|
||||
new ItemStack[] {uuMCell, uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack coal = new ItemStack(Items.coal, 1, 0).copy();
|
||||
coal.stackSize = 16;
|
||||
@@ -382,7 +392,7 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapUUMInfusions,
|
||||
new ItemStack(Items.coal, 1, 1),
|
||||
new ItemStack[] {uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell });
|
||||
|
||||
ItemStack stickyResin = IC2Items.getItem("resin").copy();
|
||||
stickyResin.stackSize = 21;
|
||||
@@ -392,7 +402,7 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapUUMInfusions,
|
||||
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {uuMCell, uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack redstone = new ItemStack(Items.redstone).copy();
|
||||
redstone.stackSize = 24;
|
||||
@@ -402,7 +412,7 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapUUMInfusions,
|
||||
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {uuMCell, uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack lapisLazuli = new ItemStack(Items.dye, 1, 4).copy();
|
||||
lapisLazuli.stackSize = 8;
|
||||
@@ -412,7 +422,7 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapUUMInfusions,
|
||||
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {uuMCell, uuMCell, uuMCell});
|
||||
new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack glowstone = new ItemStack(Blocks.glowstone).copy();
|
||||
glowstone.stackSize = 1;
|
||||
@@ -422,7 +432,7 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.cheapestUUMInfusions,
|
||||
new ItemStack(Items.glowstone_dust),
|
||||
new ItemStack[] {uuMCell});
|
||||
new ItemStack[] { uuMCell });
|
||||
}
|
||||
|
||||
public static void registerLateRecipes() {
|
||||
@@ -433,14 +443,9 @@ public class EMTRecipes {
|
||||
10,
|
||||
new AspectList().add(Aspect.GREED, 64).add(Aspect.EXCHANGE, 128),
|
||||
new ItemStack(EMTBlocks.essentiaGens, 1, 0),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Blocks.gold_block),
|
||||
new ItemStack(Blocks.gold_block),
|
||||
new ItemStack(Blocks.gold_block),
|
||||
new ItemStack(Blocks.gold_block),
|
||||
new ItemStack(Blocks.gold_block),
|
||||
new ItemStack(Blocks.gold_block)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Blocks.gold_block), new ItemStack(Blocks.gold_block),
|
||||
new ItemStack(Blocks.gold_block), new ItemStack(Blocks.gold_block),
|
||||
new ItemStack(Blocks.gold_block), new ItemStack(Blocks.gold_block) });
|
||||
|
||||
thaumiumDrill = addInfusionCraftingRecipe(
|
||||
"Thaumium Drill",
|
||||
@@ -448,14 +453,9 @@ public class EMTRecipes {
|
||||
5,
|
||||
EMTCraftingAspects.thaumiumDrillCrafting,
|
||||
new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.diamond),
|
||||
new ItemStack(Items.diamond),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
IC2Items.getItem("denseplateiron")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.diamond),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron") });
|
||||
|
||||
thaumiumChainsaw = addInfusionCraftingRecipe(
|
||||
"Thaumium Chainsaw",
|
||||
@@ -463,14 +463,9 @@ public class EMTRecipes {
|
||||
5,
|
||||
EMTCraftingAspects.thaumiumChainsawCrafting,
|
||||
new ItemStack(EMTItems.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.diamond),
|
||||
new ItemStack(Items.diamond),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
IC2Items.getItem("denseplateiron")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.diamond),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron") });
|
||||
|
||||
thaumicQuantumHelmet = addInfusionCraftingRecipe(
|
||||
"Quantum Goggles of Revealing",
|
||||
@@ -478,15 +473,10 @@ public class EMTRecipes {
|
||||
6,
|
||||
EMTCraftingAspects.thaumicQuantumHelmetCrafting,
|
||||
new ItemStack(EMTItems.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.diamond),
|
||||
new ItemStack(Items.milk_bucket),
|
||||
new ItemStack(IC2Items.getItem("quantumHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("advancedCircuit")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.milk_bucket),
|
||||
new ItemStack(IC2Items.getItem("quantumHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit") });
|
||||
|
||||
thaumicNanoHelmet = addInfusionCraftingRecipe(
|
||||
"Nanosuit Goggles of Revealing",
|
||||
@@ -494,15 +484,10 @@ public class EMTRecipes {
|
||||
5,
|
||||
EMTCraftingAspects.thaumicNanoHelmetCrafting,
|
||||
new ItemStack(EMTItems.electricGoggles, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.diamond),
|
||||
new ItemStack(Items.gold_ingot),
|
||||
new ItemStack(IC2Items.getItem("nanoHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
IC2Items.getItem("carbonPlate"),
|
||||
IC2Items.getItem("electronicCircuit")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.gold_ingot),
|
||||
new ItemStack(IC2Items.getItem("nanoHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
thaumiumOmnitool = addInfusionCraftingRecipe(
|
||||
"Thaumium Omnitool",
|
||||
@@ -510,14 +495,10 @@ public class EMTRecipes {
|
||||
6,
|
||||
EMTCraftingAspects.thaumiumOmnitoolCrafting,
|
||||
new ItemStack(EMTItems.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMTItems.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
IC2Items.getItem("carbonPlate"),
|
||||
IC2Items.getItem("plateobsidian")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(EMTItems.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"),
|
||||
IC2Items.getItem("plateobsidian") });
|
||||
|
||||
diamondOmnitoolToThaumium = addInfusionCraftingRecipe(
|
||||
"Thaumium Omnitool",
|
||||
@@ -525,14 +506,11 @@ public class EMTRecipes {
|
||||
6,
|
||||
EMTCraftingAspects.thaumiumOmnitoolCrafting,
|
||||
new ItemStack(EMTItems.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Blocks.diamond_block),
|
||||
new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9),
|
||||
new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9),
|
||||
new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("carbonPlate"),
|
||||
IC2Items.getItem("advancedCircuit")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Blocks.diamond_block),
|
||||
new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9),
|
||||
new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9),
|
||||
new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("carbonPlate"), IC2Items.getItem("advancedCircuit") });
|
||||
|
||||
explosionFocus = addInfusionCraftingRecipe(
|
||||
"Explosion Focus",
|
||||
@@ -541,12 +519,9 @@ public class EMTRecipes {
|
||||
EMTCraftingAspects.laserFocusCrafting,
|
||||
new ItemStack(ConfigItems.itemFocusHellbat, 1),
|
||||
new ItemStack[] {
|
||||
new ItemStack(IC2Items.getItem("miningLaser").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(Items.arrow),
|
||||
new ItemStack(Items.gunpowder),
|
||||
new ItemStack(Items.firework_charge),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 1)
|
||||
});
|
||||
new ItemStack(IC2Items.getItem("miningLaser").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(Items.arrow), new ItemStack(Items.gunpowder),
|
||||
new ItemStack(Items.firework_charge), new ItemStack(ConfigItems.itemResource, 1, 1) });
|
||||
|
||||
shieldFocus = addInfusionCraftingRecipe(
|
||||
"Shield Focus",
|
||||
@@ -554,15 +529,10 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.shieldFocusCrafting,
|
||||
new ItemStack(ConfigItems.itemFocusPortableHole, 1),
|
||||
new ItemStack[] {
|
||||
IC2Items.getItem("reinforcedStone"),
|
||||
IC2Items.getItem("reinforcedGlass"),
|
||||
IC2Items.getItem("reinforcedStone"),
|
||||
IC2Items.getItem("reinforcedGlass"),
|
||||
new ItemStack(Blocks.soul_sand),
|
||||
new ItemStack(Blocks.obsidian),
|
||||
new ItemStack(Blocks.obsidian)
|
||||
});
|
||||
new ItemStack[] { IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"),
|
||||
IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"),
|
||||
new ItemStack(Blocks.soul_sand), new ItemStack(Blocks.obsidian),
|
||||
new ItemStack(Blocks.obsidian) });
|
||||
|
||||
potentiaGenerator = addInfusionCraftingRecipe(
|
||||
"Potentia Generator",
|
||||
@@ -570,16 +540,10 @@ public class EMTRecipes {
|
||||
6,
|
||||
EMTCraftingAspects.potentiaGeneratorCrafting,
|
||||
IC2Items.getItem("semifluidGenerator"),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.diamond),
|
||||
new ItemStack(ConfigItems.itemFocusTrade),
|
||||
new ItemStack(Blocks.hopper),
|
||||
new ItemStack(ConfigBlocks.blockJar),
|
||||
IC2Items.getItem("mvTransformer"),
|
||||
IC2Items.getItem("advancedMachine"),
|
||||
IC2Items.getItem("orewashingplant"),
|
||||
IC2Items.getItem("scrap")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(ConfigItems.itemFocusTrade),
|
||||
new ItemStack(Blocks.hopper), new ItemStack(ConfigBlocks.blockJar),
|
||||
IC2Items.getItem("mvTransformer"), IC2Items.getItem("advancedMachine"),
|
||||
IC2Items.getItem("orewashingplant"), IC2Items.getItem("scrap") });
|
||||
|
||||
streamChainsaw = addInfusionCraftingRecipe(
|
||||
"Chainsaw of the Stream",
|
||||
@@ -587,14 +551,10 @@ public class EMTRecipes {
|
||||
6,
|
||||
EMTCraftingAspects.streamChaisnawCrafting,
|
||||
new ItemStack(EMTItems.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.water_bucket),
|
||||
new ItemStack(ConfigItems.itemAxeElemental),
|
||||
new ItemStack(ConfigBlocks.blockMagicalLog),
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("overclockerUpgrade")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Items.water_bucket), new ItemStack(ConfigItems.itemAxeElemental),
|
||||
new ItemStack(ConfigBlocks.blockMagicalLog),
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade") });
|
||||
|
||||
rockbreakerDrill = addInfusionCraftingRecipe(
|
||||
"Drill of the Rockbreaker",
|
||||
@@ -602,16 +562,11 @@ public class EMTRecipes {
|
||||
6,
|
||||
EMTCraftingAspects.rockbreakerDrillCrafting,
|
||||
new ItemStack(EMTItems.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.flint_and_steel),
|
||||
new ItemStack(Items.fire_charge),
|
||||
new ItemStack(ConfigItems.itemPickElemental),
|
||||
new ItemStack(ConfigItems.itemShovelElemental),
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("reinforcedStone"),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("overclockerUpgrade")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge),
|
||||
new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental),
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("reinforcedStone"), IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("overclockerUpgrade") });
|
||||
|
||||
thorHammer = addInfusionCraftingRecipe(
|
||||
"Mjolnir",
|
||||
@@ -619,14 +574,10 @@ public class EMTRecipes {
|
||||
7,
|
||||
EMTCraftingAspects.thorHammerCrafting,
|
||||
new ItemStack(EMTItems.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 6),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 6),
|
||||
new ItemStack(ConfigItems.itemSwordElemental),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 1),
|
||||
new ItemStack(ConfigItems.itemFocusShock),
|
||||
IC2Items.getItem("rubber")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(EMTItems.itemEMTItems, 1, 6),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 6), new ItemStack(ConfigItems.itemSwordElemental),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemFocusShock),
|
||||
IC2Items.getItem("rubber") });
|
||||
|
||||
superchargedThorHammer = addInfusionCraftingRecipe(
|
||||
"Supercharged Mjolnir",
|
||||
@@ -634,17 +585,12 @@ public class EMTRecipes {
|
||||
10,
|
||||
EMTCraftingAspects.superchargedThorHammerCrafting,
|
||||
new ItemStack(EMTItems.thorHammer, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 6),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 6),
|
||||
new ItemStack(Blocks.web),
|
||||
new ItemStack(ConfigItems.itemFocusHellbat),
|
||||
new ItemStack(ConfigItems.itemSwordElemental),
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(EMTItems.itemEMTItems, 1, 6),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 6), new ItemStack(Blocks.web),
|
||||
new ItemStack(ConfigItems.itemFocusHellbat), new ItemStack(ConfigItems.itemSwordElemental),
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"),
|
||||
new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE) });
|
||||
|
||||
wandRecharger = addInfusionCraftingRecipe(
|
||||
"Industrial Wand Charging Station",
|
||||
@@ -652,13 +598,9 @@ public class EMTRecipes {
|
||||
6,
|
||||
EMTCraftingAspects.wandCharger,
|
||||
new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5),
|
||||
new ItemStack[] {
|
||||
IC2Items.getItem("replicator"),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
new ItemStack(Blocks.diamond_block),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 5),
|
||||
new ItemStack(ConfigBlocks.blockJar)
|
||||
});
|
||||
new ItemStack[] { IC2Items.getItem("replicator"), IC2Items.getItem("iridiumPlate"),
|
||||
new ItemStack(Blocks.diamond_block), new ItemStack(ConfigItems.itemShard, 1, 5),
|
||||
new ItemStack(ConfigBlocks.blockJar) });
|
||||
|
||||
solarHelmetRevealing = addInfusionCraftingRecipe(
|
||||
"Solar Helmet of Revealing",
|
||||
@@ -666,12 +608,9 @@ public class EMTRecipes {
|
||||
5,
|
||||
EMTCraftingAspects.solarHelmetRevealing,
|
||||
new ItemStack(EMTItems.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
IC2Items.getItem("glassFiberCableItem"),
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 4)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(EMTBlocks.solars[0], 1, 1), IC2Items.getItem("glassFiberCableItem"),
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 4) });
|
||||
|
||||
electricBootsTravel = addInfusionCraftingRecipe(
|
||||
"Electric Boots of the Traveller",
|
||||
@@ -679,13 +618,9 @@ public class EMTRecipes {
|
||||
2,
|
||||
EMTCraftingAspects.electricBootsTravel,
|
||||
new ItemStack(ConfigItems.itemBootsTraveller),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.diamond),
|
||||
IC2Items.getItem("elemotor"),
|
||||
IC2Items.getItem("coil"),
|
||||
IC2Items.getItem("hazmatBoots"),
|
||||
new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Items.diamond), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"),
|
||||
IC2Items.getItem("hazmatBoots"),
|
||||
new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE) });
|
||||
|
||||
nanoBootsTravel = addInfusionCraftingRecipe(
|
||||
"Nano Boots of the Traveller",
|
||||
@@ -693,11 +628,9 @@ public class EMTRecipes {
|
||||
2,
|
||||
EMTCraftingAspects.nanoBootsTravel,
|
||||
new ItemStack(EMTItems.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.diamond),
|
||||
new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Items.diamond),
|
||||
new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE) });
|
||||
|
||||
quantumBootsTravel = addInfusionCraftingRecipe(
|
||||
"Quantum Boots of the Traveller",
|
||||
@@ -705,12 +638,10 @@ public class EMTRecipes {
|
||||
2,
|
||||
EMTCraftingAspects.quantumBootsTravel,
|
||||
new ItemStack(EMTItems.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Blocks.diamond_block),
|
||||
new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("iridiumPlate")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Blocks.diamond_block),
|
||||
new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("iridiumPlate") });
|
||||
|
||||
etheralProcessor = addInfusionCraftingRecipe(
|
||||
"Etheral Processor",
|
||||
@@ -718,16 +649,11 @@ public class EMTRecipes {
|
||||
3,
|
||||
EMTCraftingAspects.etherealProcessor,
|
||||
IC2Items.getItem("macerator"),
|
||||
new ItemStack[] {
|
||||
IC2Items.getItem("electroFurnace"),
|
||||
new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9),
|
||||
new ItemStack(Blocks.end_stone),
|
||||
new ItemStack(Blocks.end_stone),
|
||||
new ItemStack(Blocks.iron_block),
|
||||
new ItemStack(Blocks.iron_block),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5)
|
||||
});
|
||||
new ItemStack[] { IC2Items.getItem("electroFurnace"),
|
||||
new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(Blocks.end_stone),
|
||||
new ItemStack(Blocks.end_stone), new ItemStack(Blocks.iron_block),
|
||||
new ItemStack(Blocks.iron_block), new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5) });
|
||||
|
||||
tripleCompressedSolar = addInfusionCraftingRecipe(
|
||||
"Compressed Solars",
|
||||
@@ -735,16 +661,10 @@ public class EMTRecipes {
|
||||
2,
|
||||
EMTCraftingAspects.compressedSolars,
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1),
|
||||
new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1) });
|
||||
|
||||
electricHoeGrowth = addInfusionCraftingRecipe(
|
||||
"Electric Hoe of Growth",
|
||||
@@ -753,13 +673,10 @@ public class EMTRecipes {
|
||||
EMTCraftingAspects.electricHoeGrowth,
|
||||
new ItemStack(ConfigItems.itemHoeElemental),
|
||||
new ItemStack[] {
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(IC2Items.getItem("electricHoe").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(Items.dye, 1, 15),
|
||||
IC2Items.getItem("elemotor"),
|
||||
IC2Items.getItem("coil"),
|
||||
new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE)
|
||||
});
|
||||
new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(IC2Items.getItem("electricHoe").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(Items.dye, 1, 15), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"),
|
||||
new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE) });
|
||||
|
||||
chargeFocus = addInfusionCraftingRecipe(
|
||||
"Wand Focus: Charging",
|
||||
@@ -767,14 +684,10 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.chargeFocus,
|
||||
new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
IC2Items.getItem("generator"),
|
||||
IC2Items.getItem("batBox"),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)
|
||||
});
|
||||
new ItemStack[] { IC2Items.getItem("generator"), IC2Items.getItem("batBox"),
|
||||
new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5),
|
||||
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE) });
|
||||
|
||||
wandChargeFocus = addInfusionCraftingRecipe(
|
||||
"Wand Focus: Wand Charging",
|
||||
@@ -782,12 +695,9 @@ public class EMTRecipes {
|
||||
5,
|
||||
EMTCraftingAspects.wandChargeFocus,
|
||||
new ItemStack(EMTBlocks.emtMachines, 1, 0),
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMTItems.chargeFocus),
|
||||
new ItemStack(IC2Items.getItem("energyPack").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("iridiumPlate")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(EMTItems.chargeFocus),
|
||||
new ItemStack(IC2Items.getItem("energyPack").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate") });
|
||||
|
||||
energyBallFocus = addInfusionCraftingRecipe(
|
||||
"Wand Focus: Energy Ball",
|
||||
@@ -795,12 +705,9 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTResearchAspects.energyBallFocusResearch,
|
||||
new ItemStack(ConfigItems.itemFocusShock),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Blocks.tnt),
|
||||
new ItemStack(IC2Items.getItem("advBattery").getItem()),
|
||||
new ItemStack(IC2Items.getItem("advBattery").getItem()),
|
||||
new ItemStack(IC2Items.getItem("advBattery").getItem())
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Blocks.tnt), new ItemStack(IC2Items.getItem("advBattery").getItem()),
|
||||
new ItemStack(IC2Items.getItem("advBattery").getItem()),
|
||||
new ItemStack(IC2Items.getItem("advBattery").getItem()) });
|
||||
|
||||
inventoryChargingRing = addInfusionCraftingRecipe(
|
||||
"Inventory Charging Ring",
|
||||
@@ -808,15 +715,10 @@ public class EMTRecipes {
|
||||
6,
|
||||
EMTCraftingAspects.inventoryChargingRing,
|
||||
new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1),
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMTItems.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("generator"),
|
||||
IC2Items.getItem("geothermalGenerator"),
|
||||
IC2Items.getItem("solarPanel"),
|
||||
ic2.core.Ic2Items.WindKineticGenerator,
|
||||
ic2.core.Ic2Items.WaterKineticGenerator,
|
||||
IC2Items.getItem("nuclearReactor")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(EMTItems.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"),
|
||||
IC2Items.getItem("solarPanel"), ic2.core.Ic2Items.WindKineticGenerator,
|
||||
ic2.core.Ic2Items.WaterKineticGenerator, IC2Items.getItem("nuclearReactor") });
|
||||
|
||||
armorChargingRing = addInfusionCraftingRecipe(
|
||||
"Armor Charging Ring",
|
||||
@@ -824,15 +726,10 @@ public class EMTRecipes {
|
||||
6,
|
||||
EMTCraftingAspects.armorChargingRing,
|
||||
new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1),
|
||||
new ItemStack[] {
|
||||
new ItemStack(EMTItems.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("generator"),
|
||||
IC2Items.getItem("geothermalGenerator"),
|
||||
IC2Items.getItem("solarPanel"),
|
||||
ic2.core.Ic2Items.WindKineticGenerator,
|
||||
ic2.core.Ic2Items.WaterKineticGenerator,
|
||||
IC2Items.getItem("nuclearReactor")
|
||||
});
|
||||
new ItemStack[] { new ItemStack(EMTItems.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE),
|
||||
IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"),
|
||||
IC2Items.getItem("solarPanel"), ic2.core.Ic2Items.WindKineticGenerator,
|
||||
ic2.core.Ic2Items.WaterKineticGenerator, IC2Items.getItem("nuclearReactor") });
|
||||
|
||||
nanoWings = addInfusionCraftingRecipe(
|
||||
"Nanosuit Wings",
|
||||
@@ -840,13 +737,10 @@ public class EMTRecipes {
|
||||
4,
|
||||
EMTCraftingAspects.nanoWing,
|
||||
new ItemStack(EMTItems.thaumiumWing),
|
||||
new ItemStack[] {
|
||||
IC2Items.getItem("carbonPlate"),
|
||||
IC2Items.getItem("carbonPlate"),
|
||||
IC2Items.getItem("carbonPlate"),
|
||||
new ItemStack(IC2Items.getItem("nanoBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 1)
|
||||
});
|
||||
new ItemStack[] { IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"),
|
||||
IC2Items.getItem("carbonPlate"),
|
||||
new ItemStack(IC2Items.getItem("nanoBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 1) });
|
||||
|
||||
quantumWings = addInfusionCraftingRecipe(
|
||||
"Quantum Wings",
|
||||
@@ -854,13 +748,10 @@ public class EMTRecipes {
|
||||
6,
|
||||
EMTCraftingAspects.quantumWing,
|
||||
new ItemStack(EMTItems.nanoWing, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 1)
|
||||
});
|
||||
new ItemStack[] { IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 1) });
|
||||
|
||||
infusedQuantumArmor = addInfusionCraftingRecipe(
|
||||
"Infused Quantum Armor",
|
||||
@@ -868,14 +759,9 @@ public class EMTRecipes {
|
||||
5,
|
||||
EMTCraftingAspects.quantumWing,
|
||||
new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.diamond),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("iridiumPlate"),
|
||||
new ItemStack(EMTBlocks.shield),
|
||||
new ItemStack(EMTBlocks.shield)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(Items.diamond), IC2Items.getItem("iridiumPlate"),
|
||||
IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"),
|
||||
new ItemStack(EMTBlocks.shield), new ItemStack(EMTBlocks.shield) });
|
||||
|
||||
/** Arcane Worktable Recipes **/
|
||||
diamondOmnitool = addShapelessArcaneCraftingRecipe(
|
||||
@@ -1171,7 +1057,10 @@ public class EMTRecipes {
|
||||
ItemStack itemStack = new ItemStack(ConfigItems.itemJarNode);
|
||||
((ItemJarNode) itemStack.getItem()).setAspects(itemStack, new AspectList());
|
||||
portableNode = addCrucibleRecipe(
|
||||
"Portable Node", new ItemStack(EMTBlocks.portableNode), itemStack, EMTCraftingAspects.portableNode);
|
||||
"Portable Node",
|
||||
new ItemStack(EMTBlocks.portableNode),
|
||||
itemStack,
|
||||
EMTCraftingAspects.portableNode);
|
||||
|
||||
uuMCrystal = addCrucibleRecipe(
|
||||
"UU-Matter Infusion",
|
||||
@@ -1184,57 +1073,51 @@ public class EMTRecipes {
|
||||
/* Ore Clusters Macerator Recipes */
|
||||
ItemStack ironClusterRecipe = IC2Items.getItem("smallIronDust").copy();
|
||||
ironClusterRecipe.stackSize = 22;
|
||||
((BasicMachineRecipeManager) Recipes.macerator)
|
||||
.addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 16)),
|
||||
null,
|
||||
true,
|
||||
ironClusterRecipe);
|
||||
((BasicMachineRecipeManager) Recipes.macerator).addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 16)),
|
||||
null,
|
||||
true,
|
||||
ironClusterRecipe);
|
||||
|
||||
ItemStack goldClusterRecipe = IC2Items.getItem("smallGoldDust").copy();
|
||||
goldClusterRecipe.stackSize = 22;
|
||||
((BasicMachineRecipeManager) Recipes.macerator)
|
||||
.addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 31)),
|
||||
null,
|
||||
true,
|
||||
goldClusterRecipe);
|
||||
((BasicMachineRecipeManager) Recipes.macerator).addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 31)),
|
||||
null,
|
||||
true,
|
||||
goldClusterRecipe);
|
||||
|
||||
ItemStack copperClusterRecipe = IC2Items.getItem("smallCopperDust").copy();
|
||||
copperClusterRecipe.stackSize = 22;
|
||||
((BasicMachineRecipeManager) Recipes.macerator)
|
||||
.addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 17)),
|
||||
null,
|
||||
true,
|
||||
copperClusterRecipe);
|
||||
((BasicMachineRecipeManager) Recipes.macerator).addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 17)),
|
||||
null,
|
||||
true,
|
||||
copperClusterRecipe);
|
||||
|
||||
ItemStack tinClusterRecipe = IC2Items.getItem("smallTinDust").copy();
|
||||
tinClusterRecipe.stackSize = 22;
|
||||
((BasicMachineRecipeManager) Recipes.macerator)
|
||||
.addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 18)),
|
||||
null,
|
||||
true,
|
||||
tinClusterRecipe);
|
||||
((BasicMachineRecipeManager) Recipes.macerator).addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 18)),
|
||||
null,
|
||||
true,
|
||||
tinClusterRecipe);
|
||||
|
||||
ItemStack silverClusterRecipe = IC2Items.getItem("smallSilverDust").copy();
|
||||
silverClusterRecipe.stackSize = 22;
|
||||
((BasicMachineRecipeManager) Recipes.macerator)
|
||||
.addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 19)),
|
||||
null,
|
||||
true,
|
||||
silverClusterRecipe);
|
||||
((BasicMachineRecipeManager) Recipes.macerator).addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 19)),
|
||||
null,
|
||||
true,
|
||||
silverClusterRecipe);
|
||||
|
||||
ItemStack leadClusterRecipe = IC2Items.getItem("smallLeadDust").copy();
|
||||
leadClusterRecipe.stackSize = 22;
|
||||
((BasicMachineRecipeManager) Recipes.macerator)
|
||||
.addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 20)),
|
||||
null,
|
||||
true,
|
||||
leadClusterRecipe);
|
||||
((BasicMachineRecipeManager) Recipes.macerator).addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 20)),
|
||||
null,
|
||||
true,
|
||||
leadClusterRecipe);
|
||||
|
||||
/* Thaumium Plates Recipes */
|
||||
thaumiumPlate = GameRegistry.addShapedRecipe(
|
||||
@@ -1255,9 +1138,7 @@ public class EMTRecipes {
|
||||
|
||||
/* Ore Processing for Amber and Cinnabar */
|
||||
if (EMTConfigHandler.removeAmberAndCinnabarMacerating) {
|
||||
for (Iterator<IRecipeInput> it =
|
||||
Recipes.macerator.getRecipes().keySet().iterator();
|
||||
it.hasNext(); ) {
|
||||
for (Iterator<IRecipeInput> it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext();) {
|
||||
IRecipeInput input = it.next();
|
||||
if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) {
|
||||
it.remove();
|
||||
@@ -1265,9 +1146,7 @@ public class EMTRecipes {
|
||||
}
|
||||
}
|
||||
|
||||
for (Iterator<IRecipeInput> it =
|
||||
Recipes.macerator.getRecipes().keySet().iterator();
|
||||
it.hasNext(); ) {
|
||||
for (Iterator<IRecipeInput> it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext();) {
|
||||
IRecipeInput input = it.next();
|
||||
if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0))) {
|
||||
it.remove();
|
||||
@@ -1278,7 +1157,9 @@ public class EMTRecipes {
|
||||
ItemStack crushedAmberRecipe = new ItemStack(EMTItems.itemEMTItems, 1, 1);
|
||||
crushedAmberRecipe.stackSize = 2;
|
||||
Recipes.macerator.addRecipe(
|
||||
new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7)), null, crushedAmberRecipe);
|
||||
new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7)),
|
||||
null,
|
||||
crushedAmberRecipe);
|
||||
|
||||
ItemStack crushedCinnabarRecipe = new ItemStack(EMTItems.itemEMTItems, 1, 3);
|
||||
crushedCinnabarRecipe.stackSize = 2;
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -2,23 +2,18 @@ package emt.init;
|
||||
|
||||
import static thaumcraft.api.aspects.Aspect.*;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.util.EMTResearchItem;
|
||||
import gregtech.api.enums.ItemList;
|
||||
import gregtech.api.enums.Materials;
|
||||
import gregtech.api.enums.OrePrefixes;
|
||||
import gregtech.api.util.GT_OreDictUnificator;
|
||||
import gregtech.api.util.GT_Utility;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.ThaumcraftApiHelper;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
@@ -28,6 +23,13 @@ import thaumcraft.api.crafting.InfusionRecipe;
|
||||
import thaumcraft.api.crafting.ShapedArcaneRecipe;
|
||||
import thaumcraft.api.research.ResearchItem;
|
||||
import thaumcraft.api.research.ResearchPage;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTResearchItem;
|
||||
import gregtech.api.enums.ItemList;
|
||||
import gregtech.api.enums.Materials;
|
||||
import gregtech.api.enums.OrePrefixes;
|
||||
import gregtech.api.util.GT_OreDictUnificator;
|
||||
import gregtech.api.util.GT_Utility;
|
||||
|
||||
public class EMT_GTNH_Recipes_And_Researches implements Runnable {
|
||||
|
||||
@@ -36,40 +38,35 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable {
|
||||
private static LinkedHashMap<String, CrucibleRecipe> cruciblRecipeLinkedHashMap = new LinkedHashMap<>();
|
||||
|
||||
private static AspectList getPrimals(int amount) {
|
||||
return new AspectList()
|
||||
.add(ORDER, amount)
|
||||
.add(ENTROPY, amount)
|
||||
.add(AIR, amount)
|
||||
.add(EARTH, amount)
|
||||
.add(WATER, amount)
|
||||
.add(FIRE, amount);
|
||||
return new AspectList().add(ORDER, amount).add(ENTROPY, amount).add(AIR, amount).add(EARTH, amount)
|
||||
.add(WATER, amount).add(FIRE, amount);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
// ItemStack glue =new ItemStack(EMTItems.itemEMTItems,1,8);
|
||||
// HashSet<ShapelessRecipes> recipesHashSet = new HashSet<>();
|
||||
// recipesHashSet.add(new ShapelessRecipes(glue,
|
||||
// ItemStack glue =new ItemStack(EMTItems.itemEMTItems,1,8);
|
||||
// HashSet<ShapelessRecipes> recipesHashSet = new HashSet<>();
|
||||
// recipesHashSet.add(new ShapelessRecipes(glue,
|
||||
// Arrays.asList(GT_ModHandler.getModItem("TConstruct","materials",1,36),GT_ModHandler.getModItem("TConstruct","materials",1,36))));
|
||||
// recipesHashSet.add(new ShapelessRecipes(glue,
|
||||
// recipesHashSet.add(new ShapelessRecipes(glue,
|
||||
// Collections.singletonList(GT_ModHandler.getModItem("TConstruct", "materials", 2, 36))));
|
||||
// for ( ShapelessRecipes sr : recipesHashSet)
|
||||
// CraftingManager.getInstance().getRecipeList().add(sr);
|
||||
// for ( ShapelessRecipes sr : recipesHashSet)
|
||||
// CraftingManager.getInstance().getRecipeList().add(sr);
|
||||
//
|
||||
// //Rubber ball recipes
|
||||
// //Rubber ball recipes
|
||||
//
|
||||
// GT_Values.RA.addAlloySmelterRecipe(Materials.RubberTreeSap.getDust(4),ItemList.Shape_Mold_Ball.get(0),new
|
||||
// ItemStack(EMTItems.itemEMTItems,1,10),200,16);
|
||||
// GT_Values.RA.addAssemblerRecipe(new ItemStack[]{new ItemStack(Items.paper,12),new
|
||||
// GT_Values.RA.addAssemblerRecipe(new ItemStack[]{new ItemStack(Items.paper,12),new
|
||||
// ItemStack(EMTItems.itemEMTItems,1,10)},Materials.Glue.getMolten(6912),new
|
||||
// ItemStack(EMTItems.itemEMTItems,1,9),600,30);
|
||||
//
|
||||
// GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ball.get(0),Materials.Rubber.getMolten(576),new
|
||||
// ItemStack(EMTItems.itemEMTItems,1,10),100,30);
|
||||
// GT_Values.RA.addPulveriserRecipe(new ItemStack(EMTItems.itemEMTItems,1,10),new
|
||||
// GT_Values.RA.addPulveriserRecipe(new ItemStack(EMTItems.itemEMTItems,1,10),new
|
||||
// ItemStack[]{Materials.Rubber.getDust(4)},null,300,2);
|
||||
// GT_Values.RA.addFormingPressRecipe(Materials.Rubber.getPlates(4),ItemList.Shape_Mold_Ball.get(0),new
|
||||
// GT_Values.RA.addFormingPressRecipe(Materials.Rubber.getPlates(4),ItemList.Shape_Mold_Ball.get(0),new
|
||||
// ItemStack(EMTItems.itemEMTItems,1,10),100,30);
|
||||
|
||||
EMTResearches.addResearchTab();
|
||||
@@ -126,25 +123,24 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable {
|
||||
|
||||
private void runResreaches() {
|
||||
HashSet<ResearchItem> researches = new HashSet<>();
|
||||
researches.add(new EMTResearchItem(
|
||||
"ElectricMagicTools", 0, 0, 0, new ResourceLocation(EMT.TEXTURE_PATH, "textures/misc/emt.png"))
|
||||
.setSpecial()
|
||||
.setAutoUnlock()
|
||||
.setPages(new ResearchPage("")));
|
||||
researches.add(new EMTResearchItem(
|
||||
researches.add(
|
||||
new EMTResearchItem(
|
||||
"ElectricMagicTools",
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
new ResourceLocation(EMT.TEXTURE_PATH, "textures/misc/emt.png")).setSpecial().setAutoUnlock()
|
||||
.setPages(new ResearchPage("")));
|
||||
researches.add(
|
||||
new EMTResearchItem(
|
||||
"DiamondChainsaw",
|
||||
new AspectList()
|
||||
.add(GREED, 12)
|
||||
.add(FIRE, 9)
|
||||
.add(METAL, 6)
|
||||
.add(EARTH, 3),
|
||||
new AspectList().add(GREED, 12).add(FIRE, 9).add(METAL, 6).add(EARTH, 3),
|
||||
0,
|
||||
-2,
|
||||
2,
|
||||
new ItemStack(EMTItems.diamondChainsaw))
|
||||
.setPages(new ResearchPage(arcaneRecipeLinkedHashMap.get("DiamondChainsaw")))
|
||||
.setRound()
|
||||
.setParentsHidden("ElectricMagicTools"));
|
||||
.setPages(new ResearchPage(arcaneRecipeLinkedHashMap.get("DiamondChainsaw"))).setRound()
|
||||
.setParentsHidden("ElectricMagicTools"));
|
||||
// researches.add(new EMTResearchItem("DiamondChainsaw",new
|
||||
// AspectList().add(GREED,12).add(FIRE,9).add(METAL,6).add(EARTH,3),0,-2,2,new
|
||||
// ItemStack(EMTItems.diamondChainsaw)).setRound());
|
||||
@@ -152,6 +148,7 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable {
|
||||
}
|
||||
|
||||
class ShapedArcaneRecipeIgnoresNBT extends ShapedArcaneRecipe {
|
||||
|
||||
protected String research;
|
||||
protected ItemStack result;
|
||||
protected AspectList aspects;
|
||||
@@ -167,9 +164,8 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable {
|
||||
this.recipe = recipe;
|
||||
int rows = 0;
|
||||
int colums = 0;
|
||||
if (!(recipe[0] instanceof String))
|
||||
throw new UnsupportedOperationException(
|
||||
"The Recipe must start with at least one String for the first row!");
|
||||
if (!(recipe[0] instanceof String)) throw new UnsupportedOperationException(
|
||||
"The Recipe must start with at least one String for the first row!");
|
||||
int i = 0;
|
||||
rowcolm = new int[3];
|
||||
do {
|
||||
@@ -207,19 +203,17 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable {
|
||||
GT_OreDictUnificator.getFirstOre(itemReplacement, 1),
|
||||
GT_OreDictUnificator.get(slot),
|
||||
true))
|
||||
if (!OreDictionary.getOres((String) itemReplacement)
|
||||
.contains(slot)) return false;
|
||||
if (!OreDictionary.getOres((String) itemReplacement).contains(slot)) return false;
|
||||
} else if (itemReplacement instanceof ItemStack) {
|
||||
if (!GT_Utility.isStackValid(itemReplacement)) {
|
||||
return false;
|
||||
}
|
||||
if (!GT_Utility.areStacksEqual((ItemStack) itemReplacement, slot, true))
|
||||
if (!GT_Utility.areUnificationsEqual((ItemStack) itemReplacement, slot, true))
|
||||
if (!(((ItemStack) itemReplacement)
|
||||
.getItem()
|
||||
.equals(slot.getItem())
|
||||
if (!(((ItemStack) itemReplacement).getItem().equals(slot.getItem())
|
||||
&& ((ItemStack) itemReplacement).getItemDamage()
|
||||
== OreDictionary.WILDCARD_VALUE)) return false;
|
||||
== OreDictionary.WILDCARD_VALUE))
|
||||
return false;
|
||||
} else if (itemReplacement instanceof Collection) {
|
||||
boolean hit = false;
|
||||
for (Object o : (Collection) itemReplacement) {
|
||||
@@ -227,7 +221,8 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable {
|
||||
|| GT_Utility.areUnificationsEqual((ItemStack) o, slot, true)
|
||||
|| (((ItemStack) o).getItem().equals(slot.getItem())
|
||||
&& ((ItemStack) itemReplacement).getItemDamage()
|
||||
== OreDictionary.WILDCARD_VALUE)) hit = true;
|
||||
== OreDictionary.WILDCARD_VALUE))
|
||||
hit = true;
|
||||
}
|
||||
if (!hit) {
|
||||
return false;
|
||||
|
||||
@@ -5,6 +5,7 @@ import emt.tile.solar.Solars;
|
||||
import emt.util.EMTEssentiasOutputs;
|
||||
|
||||
public class Registry {
|
||||
|
||||
private static final EMT_GT_Loader gtloader = new EMT_GT_Loader();
|
||||
|
||||
public static void registerPreInit() {}
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
package emt.item;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
|
||||
public class ItemBase extends Item {
|
||||
|
||||
public ItemBase(String unlocName, String textureName) {
|
||||
@@ -23,7 +24,6 @@ public class ItemBase extends Item {
|
||||
|
||||
public String getItemStackDisplayName(ItemStack stack) {
|
||||
return (EMTTextHelper.GREEN
|
||||
+ StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name"))
|
||||
.trim();
|
||||
+ StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim();
|
||||
}
|
||||
}
|
||||
@@ -1,18 +1,20 @@
|
||||
package emt.item;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import thaumcraft.api.IScribeTools;
|
||||
import thaumcraft.common.items.ItemInkwell;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
|
||||
public class ItemElectricScribingTools extends ItemInkwell implements IElectricItem, IScribeTools {
|
||||
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
package emt.item;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import thaumcraft.api.IRunicArmor;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -8,16 +20,6 @@ import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import thaumcraft.api.IRunicArmor;
|
||||
|
||||
public class ItemIC2Baubles extends ItemBase implements IBauble, IRunicArmor {
|
||||
|
||||
@@ -89,8 +91,8 @@ public class ItemIC2Baubles extends ItemBase implements IBauble, IRunicArmor {
|
||||
for (int i = 0; i < ((EntityPlayer) player).inventory.armorInventory.length; i++) {
|
||||
if (energyLeft > 0) {
|
||||
if ((((EntityPlayer) player).inventory.armorInventory[i] != null)
|
||||
&& (((EntityPlayer) player).inventory.armorInventory[i].getItem()
|
||||
instanceof IElectricItem)) {
|
||||
&& (((EntityPlayer) player).inventory.armorInventory[i]
|
||||
.getItem() instanceof IElectricItem)) {
|
||||
double sentPacket = ElectricItem.manager.charge(
|
||||
((EntityPlayer) player).inventory.armorInventory[i],
|
||||
energyLeft,
|
||||
@@ -111,8 +113,8 @@ public class ItemIC2Baubles extends ItemBase implements IBauble, IRunicArmor {
|
||||
for (int i = 0; i < ((EntityPlayer) player).inventory.mainInventory.length; i++) {
|
||||
if (energyLeft > 0) {
|
||||
if ((((EntityPlayer) player).inventory.mainInventory[i] != null)
|
||||
&& (((EntityPlayer) player).inventory.mainInventory[i].getItem()
|
||||
instanceof IElectricItem)) {
|
||||
&& (((EntityPlayer) player).inventory.mainInventory[i]
|
||||
.getItem() instanceof IElectricItem)) {
|
||||
double sentPacket = ElectricItem.manager.charge(
|
||||
((EntityPlayer) player).inventory.mainInventory[i],
|
||||
energyLeft,
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package emt.item;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -19,8 +17,12 @@ import net.minecraft.util.MovingObjectPosition.MovingObjectType;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.ArrowNockEvent;
|
||||
|
||||
import thaumcraft.common.config.Config;
|
||||
import thaumcraft.common.lib.utils.InventoryUtils;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
|
||||
public class ItemMaterials extends Item {
|
||||
|
||||
@@ -157,8 +159,8 @@ public class ItemMaterials extends Item {
|
||||
float f1 = player.prevRotationPitch + ((player.rotationPitch - player.prevRotationPitch) * f);
|
||||
float f2 = player.prevRotationYaw + ((player.rotationYaw - player.prevRotationYaw) * f);
|
||||
double playerX = player.prevPosX + ((player.posX - player.prevPosX) * f);
|
||||
double playerY =
|
||||
(player.prevPosY + ((player.posY - player.prevPosY) * f) + 1.6200000000000001D) - player.yOffset;
|
||||
double playerY = (player.prevPosY + ((player.posY - player.prevPosY) * f) + 1.6200000000000001D)
|
||||
- player.yOffset;
|
||||
double playerZ = player.prevPosZ + ((player.posZ - player.prevPosZ) * f);
|
||||
Vec3 playerLoc = Vec3.createVectorHelper(playerX, playerY, playerZ);
|
||||
float f3 = MathHelper.cos((-f2 * 0.01745329F) - 3.141593F);
|
||||
@@ -216,8 +218,7 @@ public class ItemMaterials extends Item {
|
||||
|
||||
public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) {
|
||||
super.onUpdate(stack, world, entity, par4, par5);
|
||||
if ((!entity.worldObj.isRemote)
|
||||
&& ((stack.getItemDamage() == 13))
|
||||
if ((!entity.worldObj.isRemote) && ((stack.getItemDamage() == 13))
|
||||
&& ((entity instanceof EntityLivingBase))
|
||||
&& (!((EntityLivingBase) entity).isEntityUndead())
|
||||
&& (!((EntityLivingBase) entity).isPotionActive(Config.potionTaintPoisonID))
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
package emt.item;
|
||||
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -20,11 +15,19 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import thaumcraft.api.IRunicArmor;
|
||||
import thaumcraft.api.IWarpingGear;
|
||||
import thaumcraft.api.ThaumcraftApiHelper;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
|
||||
public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRunicArmor {
|
||||
|
||||
private static final String NBT_TAG_FORGE_DATA = "EMT";
|
||||
private static final String NBT_TAG_MIND_CORRUPTION = "MindCorruption";
|
||||
private static final String NBT_TAG_WARP = "warp";
|
||||
@@ -60,8 +63,9 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
@Override
|
||||
public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) {
|
||||
String colourCode = "" + EnumChatFormatting.DARK_RED;
|
||||
list.add(colourCode
|
||||
+ "The Ring whispers to you, promising power. But at what cost? Long-term usage is NOT advised.");
|
||||
list.add(
|
||||
colourCode
|
||||
+ "The Ring whispers to you, promising power. But at what cost? Long-term usage is NOT advised.");
|
||||
list.add(colourCode + "Can RUIN your game if you don't understand what this does. READ THE QUEST!!");
|
||||
super.addInformation(itemStack, player, list, par4);
|
||||
}
|
||||
@@ -128,11 +132,11 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
// Stop doing this 20 times per second...
|
||||
if (random.nextInt(20) > 0) return;
|
||||
|
||||
/* Why dump to a new tag when you can just grab the tag and work with it?
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
((EntityPlayer) player).writeToNBT(tag);
|
||||
NBTTagCompound forgeTag = tag.getCompoundTag("ForgeData");
|
||||
*/
|
||||
/*
|
||||
* Why dump to a new tag when you can just grab the tag and work with it? NBTTagCompound tag = new
|
||||
* NBTTagCompound(); ((EntityPlayer) player).writeToNBT(tag); NBTTagCompound forgeTag =
|
||||
* tag.getCompoundTag("ForgeData");
|
||||
*/
|
||||
|
||||
// Retrieve Players NBT Data
|
||||
|
||||
@@ -149,12 +153,17 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
// stack, false ) ));
|
||||
|
||||
if (corruption == 0) {
|
||||
((EntityPlayer) player)
|
||||
.addChatMessage(new ChatComponentText(
|
||||
((EntityPlayer) player).addChatMessage(
|
||||
new ChatComponentText(
|
||||
EMTTextHelper.PURPLE + "You have worn the Ring. Your soul has now been forever "
|
||||
+ EMTTextHelper.PURPLE + "tainted. " + EMTTextHelper.RED + EMTTextHelper.ITALIC
|
||||
+ "Beware of wearing the ring. The tainting will only " + EMTTextHelper.RED
|
||||
+ EMTTextHelper.ITALIC + "increase, and strange things will start happening."));
|
||||
+ EMTTextHelper.PURPLE
|
||||
+ "tainted. "
|
||||
+ EMTTextHelper.RED
|
||||
+ EMTTextHelper.ITALIC
|
||||
+ "Beware of wearing the ring. The tainting will only "
|
||||
+ EMTTextHelper.RED
|
||||
+ EMTTextHelper.ITALIC
|
||||
+ "increase, and strange things will start happening."));
|
||||
}
|
||||
// First effect should become active after ~5 Minutes
|
||||
else if (corruption > 300 && corruption < 1400 && random.nextInt(100) == 0) {
|
||||
@@ -176,33 +185,41 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
if (corruption >= 300) { // worn more than 5 minutes
|
||||
if (random.nextInt(100) == 0) { // every 100 seconds
|
||||
getItemWarpLevel(stack, true);
|
||||
((EntityPlayer) player)
|
||||
.addChatMessage(new ChatComponentText(
|
||||
EMTTextHelper.PURPLE + "The Ring suddenly starts to glow purple"));
|
||||
((EntityPlayer) player).addChatMessage(
|
||||
new ChatComponentText(EMTTextHelper.PURPLE + "The Ring suddenly starts to glow purple"));
|
||||
}
|
||||
if (random.nextInt(300) == 0) { // randomly every 5 minutes
|
||||
ThaumcraftApiHelper.addWarpToPlayer((EntityPlayer) player, 1, false); // adds 1 perm warp
|
||||
ThaumcraftApiHelper.addStickyWarpToPlayer(
|
||||
(EntityPlayer) player, random.nextInt(1)); // adds 0-1 sticky warp
|
||||
((EntityPlayer) player)
|
||||
.addChatMessage(new ChatComponentText(
|
||||
EMTTextHelper.PURPLE + "Your body suddenly starts to glow purple"));
|
||||
ThaumcraftApiHelper.addStickyWarpToPlayer((EntityPlayer) player, random.nextInt(1)); // adds 0-1
|
||||
// sticky warp
|
||||
((EntityPlayer) player).addChatMessage(
|
||||
new ChatComponentText(EMTTextHelper.PURPLE + "Your body suddenly starts to glow purple"));
|
||||
}
|
||||
if (corruption >= 3600) { // if you wear it for more than an hour total
|
||||
if (random.nextInt(300) == 0) {
|
||||
ThaumcraftApiHelper.addWarpToPlayer(
|
||||
(EntityPlayer) player, 5 + random.nextInt(5), false); // adds 5-10 perm warp
|
||||
ThaumcraftApiHelper.addStickyWarpToPlayer(
|
||||
(EntityPlayer) player, 5 + random.nextInt(5)); // adds 5-10 sticky warp
|
||||
ThaumcraftApiHelper.addWarpToPlayer(
|
||||
(EntityPlayer) player,
|
||||
10 + random.nextInt(40),
|
||||
true); // adds 10-50 temp warp, but this is ultra easy to remove
|
||||
((EntityPlayer) player)
|
||||
.addChatMessage(
|
||||
new ChatComponentText(
|
||||
EMTTextHelper.PURPLE
|
||||
+ "Your body resonates with the Ring and suddenly starts to glow purple ominously"));
|
||||
ThaumcraftApiHelper.addWarpToPlayer((EntityPlayer) player, 5 + random.nextInt(5), false); // adds
|
||||
// 5-10
|
||||
// perm
|
||||
// warp
|
||||
ThaumcraftApiHelper.addStickyWarpToPlayer((EntityPlayer) player, 5 + random.nextInt(5)); // adds
|
||||
// 5-10
|
||||
// sticky
|
||||
// warp
|
||||
ThaumcraftApiHelper.addWarpToPlayer((EntityPlayer) player, 10 + random.nextInt(40), true); // adds
|
||||
// 10-50
|
||||
// temp
|
||||
// warp,
|
||||
// but
|
||||
// this
|
||||
// is
|
||||
// ultra
|
||||
// easy
|
||||
// to
|
||||
// remove
|
||||
((EntityPlayer) player).addChatMessage(
|
||||
new ChatComponentText(
|
||||
EMTTextHelper.PURPLE
|
||||
+ "Your body resonates with the Ring and suddenly starts to glow purple ominously"));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -216,11 +233,9 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
public void onEquipped(ItemStack stack, EntityLivingBase player) {
|
||||
// This purges all corruption once the ring is put on / a second ring is equipped?
|
||||
/*
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
((EntityPlayer) player).writeToNBT(tag);
|
||||
tag.getCompoundTag( NBT_TAG_FORGE_DATA ).setInteger( NBT_TAG_MIND_CORRUPTION, 0);
|
||||
((EntityPlayer) player).readFromNBT(tag);
|
||||
*/
|
||||
* NBTTagCompound tag = new NBTTagCompound(); ((EntityPlayer) player).writeToNBT(tag); tag.getCompoundTag(
|
||||
* NBT_TAG_FORGE_DATA ).setInteger( NBT_TAG_MIND_CORRUPTION, 0); ((EntityPlayer) player).readFromNBT(tag);
|
||||
*/
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -229,11 +244,10 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
if (!((EntityPlayer) player).capabilities.isCreativeMode)
|
||||
((EntityPlayer) player).capabilities.disableDamage = false;
|
||||
|
||||
/* Wtf? Remove ForgeData tag? There are more mods using this tag than just emt!
|
||||
((EntityPlayer) player).writeToNBT(tag);
|
||||
tag.removeTag( NBT_TAG_FORGE_DATA );
|
||||
((EntityPlayer) player).readFromNBT(tag);
|
||||
*/
|
||||
/*
|
||||
* Wtf? Remove ForgeData tag? There are more mods using this tag than just emt! ((EntityPlayer)
|
||||
* player).writeToNBT(tag); tag.removeTag( NBT_TAG_FORGE_DATA ); ((EntityPlayer) player).readFromNBT(tag);
|
||||
*/
|
||||
player.addPotionEffect(new PotionEffect(Potion.confusion.id, 200, 1, false));
|
||||
}
|
||||
|
||||
@@ -253,13 +267,12 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
boolean tRet = false;
|
||||
if (random.nextInt(5) == 0) {
|
||||
tRet = true;
|
||||
((EntityPlayer) player)
|
||||
.addChatMessage(new ChatComponentText(EMTTextHelper.GREEN
|
||||
+ "You removed the Ring. Maybe you should think twice before using it next time?"));
|
||||
} else
|
||||
((EntityPlayer) player)
|
||||
.addChatMessage(new ChatComponentText(
|
||||
EMTTextHelper.PURPLE + "Nooo, don't remove me! I give you great power!"));
|
||||
((EntityPlayer) player).addChatMessage(
|
||||
new ChatComponentText(
|
||||
EMTTextHelper.GREEN
|
||||
+ "You removed the Ring. Maybe you should think twice before using it next time?"));
|
||||
} else((EntityPlayer) player).addChatMessage(
|
||||
new ChatComponentText(EMTTextHelper.PURPLE + "Nooo, don't remove me! I give you great power!"));
|
||||
|
||||
return tRet;
|
||||
}
|
||||
|
||||
@@ -1,16 +1,7 @@
|
||||
package emt.item.armor.boots;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.init.EMTItems;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTTextHelper;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import ic2.api.item.IMetalArmor;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -26,11 +17,22 @@ import net.minecraftforge.common.ISpecialArmor;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingFallEvent;
|
||||
|
||||
import thaumcraft.api.IRunicArmor;
|
||||
import thaumcraft.api.IVisDiscountGear;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.items.armor.Hover;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.init.EMTItems;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTTextHelper;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import ic2.api.item.IMetalArmor;
|
||||
|
||||
public class ItemElectricBootsTraveller extends ItemArmor
|
||||
implements IRunicArmor, IElectricItem, IVisDiscountGear, IMetalArmor, ISpecialArmor {
|
||||
@@ -71,15 +73,15 @@ public class ItemElectricBootsTraveller extends ItemArmor
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArmorProperties getProperties(
|
||||
EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
|
||||
public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
|
||||
int slot) {
|
||||
if (source.isUnblockable()) {
|
||||
return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 0);
|
||||
} else {
|
||||
double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio();
|
||||
int energyPerDamage = getEnergyPerDamage();
|
||||
double damageLimit =
|
||||
energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage;
|
||||
double damageLimit = energyPerDamage <= 0 ? 0
|
||||
: (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage;
|
||||
return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, absorptionRatio, (int) damageLimit);
|
||||
}
|
||||
}
|
||||
@@ -138,11 +140,13 @@ public class ItemElectricBootsTraveller extends ItemArmor
|
||||
} else if (Hover.getHover(player.getEntityId())) {
|
||||
// Base ItemBootsTraveller jumpBonus equals to jumpBonus of Electric Boots,
|
||||
// so any other boots factor can be calculated via proportion method
|
||||
player.jumpMovementFactor =
|
||||
0.03F / ((ItemElectricBootsTraveller) EMTItems.electricBootsTraveller).jumpBonus * jumpBonus;
|
||||
player.jumpMovementFactor = 0.03F
|
||||
/ ((ItemElectricBootsTraveller) EMTItems.electricBootsTraveller).jumpBonus
|
||||
* jumpBonus;
|
||||
} else {
|
||||
player.jumpMovementFactor =
|
||||
0.05F / ((ItemElectricBootsTraveller) EMTItems.electricBootsTraveller).jumpBonus * jumpBonus;
|
||||
player.jumpMovementFactor = 0.05F
|
||||
/ ((ItemElectricBootsTraveller) EMTItems.electricBootsTraveller).jumpBonus
|
||||
* jumpBonus;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -151,8 +155,7 @@ public class ItemElectricBootsTraveller extends ItemArmor
|
||||
public void onPlayerJump(LivingEvent.LivingJumpEvent event) {
|
||||
if (event.entityLiving instanceof EntityPlayer) {
|
||||
EntityPlayer player = (EntityPlayer) event.entityLiving;
|
||||
boolean hasArmor = player.getCurrentArmor(0) != null
|
||||
&& player.getCurrentArmor(0).getItem() == this;
|
||||
boolean hasArmor = player.getCurrentArmor(0) != null && player.getCurrentArmor(0).getItem() == this;
|
||||
|
||||
if (hasArmor) player.motionY += jumpBonus;
|
||||
}
|
||||
@@ -174,8 +177,8 @@ public class ItemElectricBootsTraveller extends ItemArmor
|
||||
EntityPlayer entity = (EntityPlayer) event.entity;
|
||||
if ((entity.inventory.armorInventory[0] != null)
|
||||
&& (entity.inventory.armorInventory[0].getItem() instanceof ItemElectricBootsTraveller)) {
|
||||
ItemElectricBootsTraveller tUsedBoots =
|
||||
(ItemElectricBootsTraveller) entity.inventory.armorInventory[0].getItem();
|
||||
ItemElectricBootsTraveller tUsedBoots = (ItemElectricBootsTraveller) entity.inventory.armorInventory[0]
|
||||
.getItem();
|
||||
ItemStack stack = entity.inventory.armorInventory[0];
|
||||
|
||||
// Check if we dropped the minimum amount; To cover the jump-boost bonus without penalty
|
||||
@@ -183,10 +186,8 @@ public class ItemElectricBootsTraveller extends ItemArmor
|
||||
event.setCanceled(true);
|
||||
} else {
|
||||
float tEnergyDemand = tUsedBoots.energyPerDamage
|
||||
* (((event.distance > tUsedBoots.getMaxHealthyDropDist())
|
||||
? event.distance * 3
|
||||
: event.distance)
|
||||
- 4.0F);
|
||||
* (((event.distance > tUsedBoots.getMaxHealthyDropDist()) ? event.distance * 3
|
||||
: event.distance) - 4.0F);
|
||||
if (tEnergyDemand <= ElectricItem.manager.getCharge(stack)) {
|
||||
// EMT.LOGGER.info( String.format("FD: %f DMG: %f EPD: %d HDD: %f", event.distance,
|
||||
// tEnergyDemand, tUsedBoots.energyPerDamage, tUsedBoots.getMaxHealthyDropDist() ));
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
package emt.item.armor.boots;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller {
|
||||
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
package emt.item.armor.boots;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller {
|
||||
|
||||
|
||||
@@ -1,23 +1,9 @@
|
||||
package emt.item.armor.chestplate;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.client.model.ModelSpecialArmor;
|
||||
import emt.init.EMTItems;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IC2Items;
|
||||
import ic2.core.IC2;
|
||||
import ic2.core.audio.AudioSource;
|
||||
import ic2.core.audio.PositionSpec;
|
||||
import ic2.core.init.InternalName;
|
||||
import ic2.core.item.armor.ItemArmorElectric;
|
||||
import ic2.core.util.StackUtil;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -34,7 +20,23 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingFallEvent;
|
||||
|
||||
import thaumcraft.api.IRunicArmor;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.client.model.ModelSpecialArmor;
|
||||
import emt.init.EMTItems;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IC2Items;
|
||||
import ic2.core.IC2;
|
||||
import ic2.core.audio.AudioSource;
|
||||
import ic2.core.audio.PositionSpec;
|
||||
import ic2.core.init.InternalName;
|
||||
import ic2.core.item.armor.ItemArmorElectric;
|
||||
import ic2.core.util.StackUtil;
|
||||
|
||||
public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements IRunicArmor {
|
||||
|
||||
@@ -173,11 +175,13 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I
|
||||
nbt.setByte("wing", JETPACK);
|
||||
// int charge = (int) ElectricItem.manager.getCharge(itemStack);
|
||||
// if (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < 30000) {
|
||||
// ElectricItem.manager.use(itemStack, 30000 - ElectricItem.manager.getCharge(currentStack),
|
||||
// ElectricItem.manager.use(itemStack, 30000 - ElectricItem.manager.getCharge(currentStack),
|
||||
// player);
|
||||
// }
|
||||
nbt.setInteger("jetpackCharge", (int) (ElectricItem.manager.getCharge(
|
||||
currentStack) /* + charge - (int) ElectricItem.manager.getCharge(itemStack))*/));
|
||||
nbt.setInteger(
|
||||
"jetpackCharge",
|
||||
(int) (ElectricItem.manager.getCharge(
|
||||
currentStack) /* + charge - (int) ElectricItem.manager.getCharge(itemStack)) */));
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
||||
} else if (currentItem == EMTItems.thaumiumWing) {
|
||||
IC2.platform.messagePlayer(player, "Thaumium wings enabled.", new Object[0]);
|
||||
@@ -188,26 +192,29 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I
|
||||
nbt.setByte("wing", NANO);
|
||||
// int charge = (int) ElectricItem.manager.getCharge(itemStack);
|
||||
// if (ElectricItem.manager.getCharge(currentStack) < ItemNanoWing.maxCharge) {
|
||||
// ElectricItem.manager.use(itemStack, ItemNanoWing.maxCharge -
|
||||
// ElectricItem.manager.use(itemStack, ItemNanoWing.maxCharge -
|
||||
// ElectricItem.manager.getCharge(currentStack), player);
|
||||
// }
|
||||
nbt.setInteger(
|
||||
"NWCharge",
|
||||
(int)
|
||||
(ElectricItem.manager.getCharge(
|
||||
player.inventory
|
||||
.getCurrentItem()) /* + charge - (int) ElectricItem.manager.getCharge(itemStack)*/));
|
||||
(int) (ElectricItem.manager.getCharge(
|
||||
player.inventory.getCurrentItem()) /*
|
||||
* + charge - (int)
|
||||
* ElectricItem.manager.getCharge(itemStack)
|
||||
*/));
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
||||
} else if (currentItem == EMTItems.quantumWing) {
|
||||
IC2.platform.messagePlayer(player, "Quantum wings enabled.", new Object[0]);
|
||||
nbt.setByte("wing", QUANTUM);
|
||||
// int charge = (int) ElectricItem.manager.getCharge(itemStack);
|
||||
// if (ElectricItem.manager.getCharge(currentStack) < ItemQuantumWing.maxCharge) {
|
||||
// ElectricItem.manager.use(itemStack, ItemQuantumWing.maxCharge -
|
||||
// ElectricItem.manager.use(itemStack, ItemQuantumWing.maxCharge -
|
||||
// ElectricItem.manager.getCharge(currentStack), player);
|
||||
// }
|
||||
nbt.setInteger("QWCharge", (int) (ElectricItem.manager.getCharge(
|
||||
currentStack) /* + charge - (int) ElectricItem.manager.getCharge(itemStack)*/));
|
||||
nbt.setInteger(
|
||||
"QWCharge",
|
||||
(int) (ElectricItem.manager.getCharge(
|
||||
currentStack) /* + charge - (int) ElectricItem.manager.getCharge(itemStack) */));
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
||||
}
|
||||
}
|
||||
@@ -218,8 +225,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I
|
||||
if (wing == JETPACK) {
|
||||
IC2.platform.messagePlayer(player, "Jetpack disabled.", new Object[0]);
|
||||
nbt.setByte("wing", NONE);
|
||||
ItemStack charged =
|
||||
new ItemStack(IC2Items.getItem("electricJetpack").getItem());
|
||||
ItemStack charged = new ItemStack(IC2Items.getItem("electricJetpack").getItem());
|
||||
if (nbt.getInteger("jetpackCharge") > 0)
|
||||
ElectricItem.manager.charge(charged, nbt.getInteger("jetpackCharge"), 1, true, false);
|
||||
else ElectricItem.manager.charge(charged, 0, 1, true, false);
|
||||
@@ -230,7 +236,8 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I
|
||||
IC2.platform.messagePlayer(player, "Thaumium wings disabled.", new Object[0]);
|
||||
nbt.setByte("wing", NONE);
|
||||
player.inventory.setInventorySlotContents(
|
||||
player.inventory.currentItem, new ItemStack(EMTItems.thaumiumWing));
|
||||
player.inventory.currentItem,
|
||||
new ItemStack(EMTItems.thaumiumWing));
|
||||
}
|
||||
|
||||
if (wing == NANO) {
|
||||
@@ -417,8 +424,8 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I
|
||||
}
|
||||
|
||||
if (((float) ElectricItem.manager.getCharge(stack) / (float) jetpackMaxCharge) <= dropPercentage) {
|
||||
power = (float)
|
||||
(power * (ElectricItem.manager.getCharge(stack) / (float) jetpackMaxCharge) * dropPercentage);
|
||||
power = (float) (power * (ElectricItem.manager.getCharge(stack) / (float) jetpackMaxCharge)
|
||||
* dropPercentage);
|
||||
}
|
||||
|
||||
if (IC2.keyboard.isForwardKeyDown(player)) {
|
||||
@@ -475,15 +482,8 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I
|
||||
return true;
|
||||
}
|
||||
|
||||
void useWings(
|
||||
EntityPlayer player,
|
||||
ItemStack stack,
|
||||
World world,
|
||||
float motionY,
|
||||
float motionXZ,
|
||||
float f1,
|
||||
int amount,
|
||||
boolean isElectric) {
|
||||
void useWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1,
|
||||
int amount, boolean isElectric) {
|
||||
NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack);
|
||||
boolean isJumping = IC2.keyboard.isJumpKeyDown(player);
|
||||
nbt.setBoolean("isJumping", isJumping);
|
||||
|
||||
@@ -1,14 +1,7 @@
|
||||
package emt.item.armor.goggles;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTTextHelper;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import ic2.api.item.IMetalArmor;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -21,11 +14,20 @@ import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ISpecialArmor;
|
||||
|
||||
import thaumcraft.api.IGoggles;
|
||||
import thaumcraft.api.IRunicArmor;
|
||||
import thaumcraft.api.IVisDiscountGear;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.nodes.IRevealer;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTTextHelper;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import ic2.api.item.IMetalArmor;
|
||||
|
||||
public class ItemElectricGoggles extends ItemArmor
|
||||
implements IRunicArmor, IElectricItem, IVisDiscountGear, IGoggles, IRevealer, IMetalArmor, ISpecialArmor {
|
||||
@@ -112,15 +114,15 @@ public class ItemElectricGoggles extends ItemArmor
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArmorProperties getProperties(
|
||||
EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
|
||||
public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
|
||||
int slot) {
|
||||
if (source.isUnblockable()) {
|
||||
return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 0);
|
||||
} else {
|
||||
double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio();
|
||||
int energyPerDamage = getEnergyPerDamage();
|
||||
double damageLimit =
|
||||
energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage;
|
||||
double damageLimit = energyPerDamage <= 0 ? 0
|
||||
: (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage;
|
||||
return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, absorptionRatio, (int) damageLimit);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
package emt.item.armor.goggles;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.IC2Items;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.IC2Items;
|
||||
|
||||
public class ItemNanoGoggles extends ItemElectricGoggles {
|
||||
|
||||
public ItemNanoGoggles(ArmorMaterial material, int renderIndex, int armorType) {
|
||||
|
||||
@@ -1,21 +1,23 @@
|
||||
package emt.item.armor.goggles;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.IC2Items;
|
||||
import ic2.core.IC2;
|
||||
import ic2.core.util.Keyboard;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class ItemQuantumGoggles extends ItemNanoGoggles {
|
||||
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
package emt.item.armor.goggles;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -14,15 +10,19 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
|
||||
public class ItemSolarHelmetRevealing extends ItemQuantumGoggles {
|
||||
|
||||
private static final Map potionCost = new HashMap();
|
||||
/*private int ticker;
|
||||
private int generating;
|
||||
private boolean sunIsUp;
|
||||
private boolean skyIsVisible;
|
||||
private boolean noSunWorld;
|
||||
private boolean dampPlace;*/
|
||||
/*
|
||||
* private int ticker; private int generating; private boolean sunIsUp; private boolean skyIsVisible; private
|
||||
* boolean noSunWorld; private boolean dampPlace;
|
||||
*/
|
||||
private int genDay;
|
||||
private int genNight;
|
||||
|
||||
@@ -83,8 +83,8 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles {
|
||||
if (enerj > 0) {
|
||||
if ((player.inventory.armorInventory[i] != null)
|
||||
&& (player.inventory.armorInventory[i].getItem() instanceof IElectricItem)) {
|
||||
double sentPacket =
|
||||
ElectricItem.manager.charge(player.inventory.armorInventory[i], enerj, 4, false, false);
|
||||
double sentPacket = ElectricItem.manager
|
||||
.charge(player.inventory.armorInventory[i], enerj, 4, false, false);
|
||||
enerj -= sentPacket;
|
||||
}
|
||||
} else {
|
||||
@@ -95,8 +95,8 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles {
|
||||
if (enerj > 0) {
|
||||
if ((player.inventory.mainInventory[j] != null)
|
||||
&& (player.inventory.mainInventory[j].getItem() instanceof IElectricItem)) {
|
||||
double sentPacket =
|
||||
ElectricItem.manager.charge(player.inventory.mainInventory[j], enerj, 4, false, false);
|
||||
double sentPacket = ElectricItem.manager
|
||||
.charge(player.inventory.mainInventory[j], enerj, 4, false, false);
|
||||
enerj -= sentPacket;
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -1,13 +1,5 @@
|
||||
package emt.item.armor.wings;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.client.model.ModelWings;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.core.IC2;
|
||||
import ic2.core.util.StackUtil;
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -17,9 +9,19 @@ import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.IRunicArmor;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.client.model.ModelWings;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.core.IC2;
|
||||
import ic2.core.util.StackUtil;
|
||||
|
||||
public class ItemFeatherWing extends ItemArmor implements IRunicArmor {
|
||||
|
||||
public int visDiscount = 0;
|
||||
|
||||
public ItemFeatherWing(ArmorMaterial material, int par3, int par4) {
|
||||
@@ -66,8 +68,8 @@ public class ItemFeatherWing extends ItemArmor implements IRunicArmor {
|
||||
useWings(player, stack, world, 0.11f, 0.9f, 0.9f, 0);
|
||||
}
|
||||
|
||||
public void useWings(
|
||||
EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1, int amount) {
|
||||
public void useWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1,
|
||||
int amount) {
|
||||
NBTTagCompound nbtData = StackUtil.getOrCreateNbtData(stack);
|
||||
|
||||
boolean isJmuping = nbtData.getBoolean("isJumping");
|
||||
|
||||
@@ -1,13 +1,7 @@
|
||||
package emt.item.armor.wings;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import ic2.api.item.IMetalArmor;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -20,6 +14,14 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ISpecialArmor;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import ic2.api.item.IMetalArmor;
|
||||
|
||||
public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectricItem, ISpecialArmor, IMetalArmor {
|
||||
|
||||
public static int maxCharge = 1000000;
|
||||
@@ -103,15 +105,15 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArmorProperties getProperties(
|
||||
EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
|
||||
public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
|
||||
int slot) {
|
||||
if (source.isUnblockable()) {
|
||||
return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 3);
|
||||
} else {
|
||||
double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio();
|
||||
int energyPerDamage = getEnergyPerDamage();
|
||||
double damageLimit =
|
||||
energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage;
|
||||
double damageLimit = energyPerDamage <= 0 ? 0
|
||||
: (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage;
|
||||
return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(3, absorptionRatio, (int) damageLimit);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
package emt.item.armor.wings;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
|
||||
public class ItemQuantumWing extends ItemNanoWing {
|
||||
|
||||
public static int maxCharge = 10000000;
|
||||
public int tier = 4;
|
||||
|
||||
|
||||
@@ -1,18 +1,20 @@
|
||||
package emt.item.armor.wings;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.api.IVisDiscountGear;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
|
||||
public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisDiscountGear, IRepairable {
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package emt.item.block;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
@@ -9,6 +7,9 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
|
||||
public class ItemBlockElectricCloud extends ItemBlock {
|
||||
|
||||
public IIcon icon;
|
||||
@@ -29,8 +30,7 @@ public class ItemBlockElectricCloud extends ItemBlock {
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(ItemStack stack) {
|
||||
return EMTTextHelper.PURPLE
|
||||
+ EMTTextHelper.BOLD
|
||||
return EMTTextHelper.PURPLE + EMTTextHelper.BOLD
|
||||
+ StatCollector.translateToLocal(getUnlocalizedName() + ".name");
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,20 @@
|
||||
package emt.item.block;
|
||||
|
||||
import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTEssentiasOutputs;
|
||||
import emt.util.EMTTextHelper;
|
||||
import gregtech.api.enums.GT_Values;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTEssentiasOutputs;
|
||||
import emt.util.EMTTextHelper;
|
||||
import gregtech.api.enums.GT_Values;
|
||||
|
||||
public class ItemBlockEssentiaGenerators extends ItemBlock {
|
||||
|
||||
@@ -62,95 +65,145 @@ public class ItemBlockEssentiaGenerators extends ItemBlock {
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
|
||||
switch (is.getItemDamage()) {
|
||||
case 0:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString(
|
||||
(int) (EMTEssentiasOutputs.outputs.get(Aspect.ENERGY.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY + "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.ENERGY.getTag())) + " A");
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.ENERGY.getTag()))) + " EU");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString(
|
||||
(int) (EMTEssentiasOutputs.outputs.get(Aspect.ENERGY.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.ENERGY.getTag()))
|
||||
+ " A");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.ENERGY.getTag())))
|
||||
+ " EU");
|
||||
break;
|
||||
|
||||
case 1:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString((int) (EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY + "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag())) + " A");
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag()))) + " EU");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString(
|
||||
(int) (EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag()))
|
||||
+ " A");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag())))
|
||||
+ " EU");
|
||||
break;
|
||||
|
||||
case 2:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString((int) (EMTEssentiasOutputs.outputs.get(Aspect.AURA.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY + "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.AURA.getTag())) + " A");
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.AURA.getTag()))) + " EU");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString(
|
||||
(int) (EMTEssentiasOutputs.outputs.get(Aspect.AURA.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.AURA.getTag()))
|
||||
+ " A");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.AURA.getTag())))
|
||||
+ " EU");
|
||||
break;
|
||||
|
||||
case 3:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString((int) (EMTEssentiasOutputs.outputs.get(Aspect.TREE.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY + "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.TREE.getTag())) + " A");
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag()))) + " EU");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString(
|
||||
(int) (EMTEssentiasOutputs.outputs.get(Aspect.TREE.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.TREE.getTag()))
|
||||
+ " A");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag())))
|
||||
+ " EU");
|
||||
break;
|
||||
|
||||
case 4:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString((int) (EMTEssentiasOutputs.outputs.get(Aspect.AIR.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY + "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.AIR.getTag())) + " A");
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.AIR.getTag()))) + " EU");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString(
|
||||
(int) (EMTEssentiasOutputs.outputs.get(Aspect.AIR.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.AIR.getTag()))
|
||||
+ " A");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.AIR.getTag())))
|
||||
+ " EU");
|
||||
break;
|
||||
|
||||
case 5:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString((int) (EMTEssentiasOutputs.outputs.get(Aspect.GREED.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY + "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.GREED.getTag())) + " A");
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.GREED.getTag()))) + " EU");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Generating")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Integer.toString(
|
||||
(int) (EMTEssentiasOutputs.outputs.get(Aspect.GREED.getTag()) / 20 / 20))
|
||||
+ " EU/t");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.Output")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ "128 EU/t @ "
|
||||
+ getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.GREED.getTag()))
|
||||
+ " A");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN
|
||||
+ StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.GREED.getTag())))
|
||||
+ " EU");
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
list.add(EMTTextHelper.YELLOW + StatCollector.translateToLocal("emt.Storage") + EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString(EMTConfigHandler.EssentiaGeneratorStorage) + " EU");
|
||||
list.add(
|
||||
EMTTextHelper.YELLOW + StatCollector.translateToLocal("emt.Storage")
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ Double.toString(EMTConfigHandler.EssentiaGeneratorStorage)
|
||||
+ " EU");
|
||||
} else list.add(StatCollector.translateToLocal("emt.PressShift"));
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package emt.item.block;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
|
||||
@@ -3,22 +3,25 @@ package emt.item.block;
|
||||
import static emt.util.EMTTextHelper.localize;
|
||||
import static gregtech.api.util.GT_Utility.formatNumbers;
|
||||
|
||||
import java.io.StringReader;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.util.StringTranslate;
|
||||
|
||||
import org.apache.commons.io.input.ReaderInputStream;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import emt.EMT;
|
||||
import emt.block.BlockBaseContainer;
|
||||
import emt.tile.solar.Solars;
|
||||
import emt.tile.solar.TileEntitySolarBase;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTTextHelper;
|
||||
import java.io.StringReader;
|
||||
import java.util.List;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.util.StringTranslate;
|
||||
import org.apache.commons.io.input.ReaderInputStream;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
public class ItemBlockSolars extends ItemBlock {
|
||||
|
||||
@@ -33,8 +36,9 @@ public class ItemBlockSolars extends ItemBlock {
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack itemstack) {
|
||||
final String solarName = Solars.getNameFromSolar(this.instance, itemstack.getItemDamage());
|
||||
final String unlocalizedName =
|
||||
"tile." + EMT.MOD_ID + "." + Solars.getUnlocalizedName(this.instance, itemstack.getItemDamage());
|
||||
final String unlocalizedName = "tile." + EMT.MOD_ID
|
||||
+ "."
|
||||
+ Solars.getUnlocalizedName(this.instance, itemstack.getItemDamage());
|
||||
final String unlocalizedKey = unlocalizedName + ".name";
|
||||
if (!StatCollector.canTranslate(unlocalizedKey))
|
||||
StringTranslate.inject(new ReaderInputStream(new StringReader(unlocalizedKey + "=" + solarName)));
|
||||
@@ -53,188 +57,347 @@ public class ItemBlockSolars extends ItemBlock {
|
||||
if (instance == 0) {
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0: {
|
||||
list.add(formatNumbers(EMTConfigHandler.compressedSolarOutput)
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
formatNumbers(EMTConfigHandler.compressedSolarOutput)
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
list.add(formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
list.add(formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
break;
|
||||
}
|
||||
case 3: { // aqua
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.compressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(2F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.underwater"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(3F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(6F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.thunder"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.underwater"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(3F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.raining"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(6F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.thunder"));
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.doubleCompressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.underwater"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(3F * EMTConfigHandler.doubleCompressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(6F * EMTConfigHandler.doubleCompressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.thunder"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.underwater"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(3F * EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.raining"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(6F * EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.thunder"));
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.tripleCompressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.underwater"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(3F * EMTConfigHandler.tripleCompressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(6F * EMTConfigHandler.tripleCompressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.thunder"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.underwater"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(3F * EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.raining"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(6F * EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.thunder"));
|
||||
break;
|
||||
}
|
||||
|
||||
case 6: { // dark
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.compressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(2F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.day"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.doubleCompressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.day"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.tripleCompressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.day"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 9: { // ordo
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(2F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.compressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.day"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 10: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.doubleCompressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.day"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
|
||||
case 11: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.tripleCompressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.day"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 12: { // fire
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.compressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple") + " "
|
||||
+ localize("tooltip.EMT.output.double.lava"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " "
|
||||
+ localize("tooltip.EMT.output.double.nether"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.triple")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.output.double.lava"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.output.double.nether"));
|
||||
break;
|
||||
}
|
||||
case 13: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple") + " "
|
||||
+ localize("tooltip.EMT.output.double.lava"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " "
|
||||
+ localize("tooltip.EMT.output.double.nether"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.triple")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.output.double.lava"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.output.double.nether"));
|
||||
break;
|
||||
}
|
||||
case 14: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple") + " "
|
||||
+ localize("tooltip.EMT.output.double.lava"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " "
|
||||
+ localize("tooltip.EMT.output.double.nether"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.triple")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.output.double.lava"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.output.double.nether"));
|
||||
break;
|
||||
}
|
||||
case 15: { // aer
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.compressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half.height"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double.half.height"));
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -245,47 +408,78 @@ public class ItemBlockSolars extends ItemBlock {
|
||||
} else if (instance == 1) {
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half.height"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double.half.height"));
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half.height"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double.half.height"));
|
||||
break;
|
||||
}
|
||||
case 2: { // terra
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.compressedSolarOutput) + " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half.low"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.compressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double.half.low"));
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half.low"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double.half.low"));
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half.low"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double.half.low"));
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -296,76 +490,151 @@ public class ItemBlockSolars extends ItemBlock {
|
||||
} else {
|
||||
switch (te.aspect) {
|
||||
case 1:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(2F * te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " " + localize("tooltip.EMT.day"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(0.75F * te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.day"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.night"));
|
||||
break;
|
||||
case 2:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(0.75F * te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(2F * te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " " + localize("tooltip.EMT.night"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(0.75F * te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.day"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.night"));
|
||||
break;
|
||||
case 3:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half.height"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double.half.height"));
|
||||
break;
|
||||
case 4:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half.low"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double.half.low"));
|
||||
break;
|
||||
case 5:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(2F * te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " " + localize("tooltip.EMT.underwater"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(3F * te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " " + localize("tooltip.EMT.raining"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(6F * te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " " + localize("tooltip.EMT.thunder"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(2F * te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.underwater"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(3F * te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.raining"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(6F * te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.thunder"));
|
||||
break;
|
||||
case 6:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple") + " "
|
||||
+ localize("tooltip.EMT.output.double.lava"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " "
|
||||
+ localize("tooltip.EMT.output.double.nether"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.triple")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.output.double.lava"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ localize("tooltip.EMT.output.double")
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.output.double.nether"));
|
||||
break;
|
||||
default:
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(te.output) + " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions")
|
||||
+ ": "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(te.output)
|
||||
+ " "
|
||||
+ localize("tooltip.EMT.euPerTick"));
|
||||
break;
|
||||
}
|
||||
}
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.OutputMax") + " "
|
||||
+ EMTTextHelper.LIGHT_GRAY + formatNumbers(te.calculateMaxVoltAmp()[0]) + "EU/t @ "
|
||||
+ formatNumbers(te.calculateMaxVoltAmp()[1])
|
||||
+ "A");
|
||||
list.add(
|
||||
EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.OutputMax")
|
||||
+ " "
|
||||
+ EMTTextHelper.LIGHT_GRAY
|
||||
+ formatNumbers(te.calculateMaxVoltAmp()[0])
|
||||
+ "EU/t @ "
|
||||
+ formatNumbers(te.calculateMaxVoltAmp()[1])
|
||||
+ "A");
|
||||
} else list.add(StatCollector.translateToLocal("emt.PressShift"));
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,7 @@
|
||||
package emt.item.focus;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
@@ -12,9 +10,13 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.ItemFocusBasic;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
|
||||
public abstract class ItemBaseFocus extends ItemFocusBasic {
|
||||
|
||||
@@ -74,10 +76,7 @@ public abstract class ItemBaseFocus extends ItemFocusBasic {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onFocusRightClick(
|
||||
ItemStack paramItemStack,
|
||||
World paramWorld,
|
||||
EntityPlayer paramEntityPlayer,
|
||||
public ItemStack onFocusRightClick(ItemStack paramItemStack, World paramWorld, EntityPlayer paramEntityPlayer,
|
||||
MovingObjectPosition paramMovingObjectPosition) {
|
||||
if (isUseItem(paramItemStack)) paramEntityPlayer.setItemInUse(paramItemStack, Integer.MAX_VALUE);
|
||||
return paramItemStack;
|
||||
|
||||
@@ -1,27 +1,24 @@
|
||||
package emt.item.focus;
|
||||
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.FocusUpgradeType;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
|
||||
public class ItemChargeFocus extends ItemBaseFocus {
|
||||
|
||||
private static final AspectList visCost = new AspectList()
|
||||
.add(Aspect.FIRE, 10)
|
||||
.add(Aspect.WATER, 10)
|
||||
.add(Aspect.AIR, 10)
|
||||
.add(Aspect.EARTH, 10)
|
||||
.add(Aspect.ORDER, 10)
|
||||
.add(Aspect.ENTROPY, 10);
|
||||
private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10)
|
||||
.add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10);
|
||||
|
||||
public ItemChargeFocus() {
|
||||
super("charge");
|
||||
@@ -35,9 +32,9 @@ public class ItemChargeFocus extends ItemBaseFocus {
|
||||
@Override
|
||||
public AspectList getVisCost(ItemStack stack) {
|
||||
AspectList actualCost = new AspectList();
|
||||
for (Entry<Aspect, Integer> e : visCost.aspects.entrySet())
|
||||
actualCost.add(
|
||||
e.getKey(), (int) (e.getValue() * Math.pow(1.1, getUpgradeLevel(stack, FocusUpgradeType.potency))));
|
||||
for (Entry<Aspect, Integer> e : visCost.aspects.entrySet()) actualCost.add(
|
||||
e.getKey(),
|
||||
(int) (e.getValue() * Math.pow(1.1, getUpgradeLevel(stack, FocusUpgradeType.potency))));
|
||||
return visCost;
|
||||
}
|
||||
|
||||
@@ -47,7 +44,7 @@ public class ItemChargeFocus extends ItemBaseFocus {
|
||||
}
|
||||
|
||||
public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) {
|
||||
return new FocusUpgradeType[] {FocusUpgradeType.potency, FocusUpgradeType.frugal};
|
||||
return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal };
|
||||
}
|
||||
|
||||
public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) {
|
||||
@@ -55,8 +52,8 @@ public class ItemChargeFocus extends ItemBaseFocus {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onFocusRightClick(
|
||||
ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) {
|
||||
public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player,
|
||||
MovingObjectPosition movingobjectposition) {
|
||||
ItemWandCasting wand = (ItemWandCasting) itemstack.getItem();
|
||||
if (player.capabilities.isCreativeMode
|
||||
|| wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) {
|
||||
@@ -68,8 +65,8 @@ public class ItemChargeFocus extends ItemBaseFocus {
|
||||
if (energyLeft > 0) {
|
||||
if ((player.inventory.armorInventory[i] != null)
|
||||
&& (player.inventory.armorInventory[i].getItem() instanceof IElectricItem)) {
|
||||
double sentPacket = ElectricItem.manager.charge(
|
||||
player.inventory.armorInventory[i], energyLeft, 4, false, false);
|
||||
double sentPacket = ElectricItem.manager
|
||||
.charge(player.inventory.armorInventory[i], energyLeft, 4, false, false);
|
||||
energyLeft -= sentPacket;
|
||||
}
|
||||
} else {
|
||||
@@ -80,8 +77,8 @@ public class ItemChargeFocus extends ItemBaseFocus {
|
||||
if (energyLeft > 0) {
|
||||
if ((player.inventory.mainInventory[j] != null)
|
||||
&& (player.inventory.mainInventory[j].getItem() instanceof IElectricItem)) {
|
||||
double sentPacket = ElectricItem.manager.charge(
|
||||
player.inventory.mainInventory[j], energyLeft, 4, false, false);
|
||||
double sentPacket = ElectricItem.manager
|
||||
.charge(player.inventory.mainInventory[j], energyLeft, 4, false, false);
|
||||
energyLeft -= sentPacket;
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -5,14 +5,14 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
public class ItemChristmasFocus extends ItemBaseFocus {
|
||||
|
||||
private static final AspectList visCost =
|
||||
new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500);
|
||||
private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500);
|
||||
|
||||
public ItemChristmasFocus() {
|
||||
super("christmas");
|
||||
@@ -34,8 +34,8 @@ public class ItemChristmasFocus extends ItemBaseFocus {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onFocusRightClick(
|
||||
ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition mop) {
|
||||
public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player,
|
||||
MovingObjectPosition mop) {
|
||||
ItemWandCasting wand = (ItemWandCasting) itemstack.getItem();
|
||||
if ((mop != null) && (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)) {
|
||||
int x = mop.blockX;
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
package emt.item.focus;
|
||||
|
||||
import emt.entity.EntityEnergyBall;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import emt.entity.EntityEnergyBall;
|
||||
import ic2.api.item.ElectricItem;
|
||||
|
||||
public class ItemEnergyBallFocus extends ItemBaseFocus {
|
||||
|
||||
public ItemEnergyBallFocus() {
|
||||
@@ -42,12 +43,10 @@ public class ItemEnergyBallFocus extends ItemBaseFocus {
|
||||
}
|
||||
|
||||
float rotX = (-MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI)
|
||||
* MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI))
|
||||
* 100;
|
||||
* MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI)) * 100;
|
||||
float rotY = (-MathHelper.sin(player.rotationPitch / 180.0F * (float) Math.PI)) * 100;
|
||||
float rotZ = (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI)
|
||||
* MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI))
|
||||
* 100;
|
||||
* MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI)) * 100;
|
||||
world.spawnEntityInWorld(new EntityEnergyBall(world, player, rotX, rotY, rotZ));
|
||||
|
||||
return stack;
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
package emt.item.focus;
|
||||
|
||||
import emt.entity.EntityLaser;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.FocusUpgradeType;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import emt.entity.EntityLaser;
|
||||
|
||||
public class ItemExplosionFocus extends ItemBaseFocus {
|
||||
private static final AspectList visCost =
|
||||
new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200);
|
||||
|
||||
private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200);
|
||||
|
||||
public ItemExplosionFocus() {
|
||||
super("explosion");
|
||||
@@ -34,8 +35,8 @@ public class ItemExplosionFocus extends ItemBaseFocus {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onFocusRightClick(
|
||||
ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) {
|
||||
public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player,
|
||||
MovingObjectPosition movingobjectposition) {
|
||||
ItemWandCasting wand = (ItemWandCasting) itemstack.getItem();
|
||||
if (player.capabilities.isCreativeMode
|
||||
|| wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) {
|
||||
@@ -50,12 +51,13 @@ public class ItemExplosionFocus extends ItemBaseFocus {
|
||||
}
|
||||
|
||||
public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) {
|
||||
return new FocusUpgradeType[] {FocusUpgradeType.potency, FocusUpgradeType.frugal};
|
||||
return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal };
|
||||
}
|
||||
|
||||
/**
|
||||
* Use this method to define custom logic about which upgrades can be applied. This can be used to set up upgrade "trees"
|
||||
* that make certain upgrades available only when others are unlocked first, when certain research is completed, or similar logic.
|
||||
* Use this method to define custom logic about which upgrades can be applied. This can be used to set up upgrade
|
||||
* "trees" that make certain upgrades available only when others are unlocked first, when certain research is
|
||||
* completed, or similar logic.
|
||||
*/
|
||||
public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) {
|
||||
return true;
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
package emt.item.focus;
|
||||
|
||||
import emt.entity.EntityShield;
|
||||
import ic2.core.IC2;
|
||||
import java.util.LinkedList;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import emt.entity.EntityShield;
|
||||
import ic2.core.IC2;
|
||||
|
||||
public class ItemShieldFocus extends ItemBaseFocus {
|
||||
private static final AspectList visCost =
|
||||
new AspectList().add(Aspect.ORDER, 5).add(Aspect.WATER, 5).add(Aspect.AIR, 5);
|
||||
|
||||
private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 5).add(Aspect.WATER, 5)
|
||||
.add(Aspect.AIR, 5);
|
||||
|
||||
public ItemShieldFocus() {
|
||||
super("shield");
|
||||
@@ -53,13 +56,12 @@ public class ItemShieldFocus extends ItemBaseFocus {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onFocusRightClick(
|
||||
ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition paramMovingObjectPosition) {
|
||||
public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player,
|
||||
MovingObjectPosition paramMovingObjectPosition) {
|
||||
ItemWandCasting wand = (ItemWandCasting) itemstack.getItem();
|
||||
player.setItemInUse(itemstack, Integer.MAX_VALUE);
|
||||
if (!world.isRemote
|
||||
&& (player.capabilities.isCreativeMode
|
||||
|| wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true))) {
|
||||
if (!world.isRemote && (player.capabilities.isCreativeMode
|
||||
|| wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true))) {
|
||||
EntityShield shield = new EntityShield(world, player);
|
||||
world.spawnEntityInWorld(shield);
|
||||
}
|
||||
|
||||
@@ -1,24 +1,21 @@
|
||||
package emt.item.focus;
|
||||
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.FocusUpgradeType;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
|
||||
public class ItemWandChargingFocus extends ItemBaseFocus {
|
||||
|
||||
AspectList visCost = new AspectList()
|
||||
.add(Aspect.FIRE, 10)
|
||||
.add(Aspect.WATER, 10)
|
||||
.add(Aspect.AIR, 10)
|
||||
.add(Aspect.EARTH, 10)
|
||||
.add(Aspect.ORDER, 10)
|
||||
.add(Aspect.ENTROPY, 10);
|
||||
AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10)
|
||||
.add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10);
|
||||
|
||||
public ItemWandChargingFocus() {
|
||||
super("chargeWand");
|
||||
@@ -42,14 +39,14 @@ public class ItemWandChargingFocus extends ItemBaseFocus {
|
||||
@Override
|
||||
public AspectList getVisCost(ItemStack stack) {
|
||||
AspectList actualCost = new AspectList();
|
||||
for (Entry<Aspect, Integer> e : visCost.aspects.entrySet())
|
||||
actualCost.add(
|
||||
e.getKey(), (int) (e.getValue() * Math.pow(1.1, getUpgradeLevel(stack, FocusUpgradeType.potency))));
|
||||
for (Entry<Aspect, Integer> e : visCost.aspects.entrySet()) actualCost.add(
|
||||
e.getKey(),
|
||||
(int) (e.getValue() * Math.pow(1.1, getUpgradeLevel(stack, FocusUpgradeType.potency))));
|
||||
return visCost;
|
||||
}
|
||||
|
||||
public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) {
|
||||
return new FocusUpgradeType[] {FocusUpgradeType.potency, FocusUpgradeType.frugal};
|
||||
return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal };
|
||||
}
|
||||
|
||||
public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) {
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
package emt.item.tool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -16,10 +12,16 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.blocks.BlockCustomPlant;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.lib.utils.Utils;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
|
||||
public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem {
|
||||
|
||||
@@ -64,17 +66,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) {
|
||||
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7,
|
||||
float par8, float par9, float par10) {
|
||||
if (stack.hasTagCompound()) {
|
||||
stack.stackTagCompound.setBoolean("Unbreakable", true);
|
||||
}
|
||||
@@ -111,7 +104,12 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem {
|
||||
}
|
||||
if (did) {
|
||||
world.playSoundEffect(
|
||||
x + 0.5D, y + 0.5D, z + 0.5D, "thaumcraft:wand", 0.75F, 0.9F + world.rand.nextFloat() * 0.2F);
|
||||
x + 0.5D,
|
||||
y + 0.5D,
|
||||
z + 0.5D,
|
||||
"thaumcraft:wand",
|
||||
0.75F,
|
||||
0.9F + world.rand.nextFloat() * 0.2F);
|
||||
}
|
||||
}
|
||||
if (stack.hasTagCompound()) {
|
||||
|
||||
@@ -1,14 +1,7 @@
|
||||
package emt.item.tool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.entity.EntityArcher;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTTextHelper;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -23,6 +16,15 @@ import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.entity.EntityArcher;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTTextHelper;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
|
||||
public class ItemElectricThorHammer extends ItemSword implements IElectricItem {
|
||||
|
||||
private final int hitCost = 5000;
|
||||
@@ -68,8 +70,9 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem {
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
|
||||
list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
|
||||
list.add(EMTTextHelper.localize("tooltip.EMT.hammer.electric")
|
||||
.replace("%player%", player.getCommandSenderName()));
|
||||
list.add(
|
||||
EMTTextHelper.localize("tooltip.EMT.hammer.electric")
|
||||
.replace("%player%", player.getCommandSenderName()));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package emt.item.tool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -18,7 +15,12 @@ import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
|
||||
public class ItemThorHammer extends ItemSword implements IRepairable {
|
||||
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package emt.item.tool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -12,9 +9,15 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.common.entities.projectile.EntityAlumentum;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
|
||||
public class ItemThorHammerBroken extends ItemSword implements IRepairable {
|
||||
|
||||
|
||||
@@ -1,16 +1,9 @@
|
||||
package emt.item.tool.chainsaw;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import ic2.core.IC2;
|
||||
import ic2.core.util.StackUtil;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockTorch;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -34,6 +27,15 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.IShearable;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import ic2.core.IC2;
|
||||
import ic2.core.util.StackUtil;
|
||||
|
||||
public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
|
||||
|
||||
public int maxCharge = 50000;
|
||||
@@ -56,16 +58,15 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6,
|
||||
EntityLivingBase entityLiving) {
|
||||
ElectricItem.manager.use(stack, cost, entityLiving);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canHarvestBlock(Block block, ItemStack stack) {
|
||||
return Items.diamond_axe.canHarvestBlock(block, stack)
|
||||
|| Items.diamond_sword.canHarvestBlock(block, stack)
|
||||
return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack)
|
||||
|| Items.shears.canHarvestBlock(block, stack);
|
||||
}
|
||||
|
||||
@@ -105,17 +106,8 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onItemUse(
|
||||
ItemStack stack,
|
||||
EntityPlayer player,
|
||||
World world,
|
||||
int x,
|
||||
int y,
|
||||
int z,
|
||||
int side,
|
||||
float xOffset,
|
||||
float yOffset,
|
||||
float zOffset) {
|
||||
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
|
||||
float xOffset, float yOffset, float zOffset) {
|
||||
for (int i = 0; i < player.inventory.mainInventory.length; i++) {
|
||||
ItemStack torchStack = player.inventory.mainInventory[i];
|
||||
if (torchStack == null) {
|
||||
@@ -198,7 +190,11 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
|
||||
double yOffset = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
|
||||
double zOffset = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
|
||||
EntityItem entityitem = new EntityItem(
|
||||
player.worldObj, (double) x + xOffset, (double) y + yOffset, (double) z + zOffset, stack);
|
||||
player.worldObj,
|
||||
(double) x + xOffset,
|
||||
(double) y + yOffset,
|
||||
(double) z + zOffset,
|
||||
stack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
player.worldObj.spawnEntityInWorld(entityitem);
|
||||
}
|
||||
@@ -221,8 +217,8 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
|
||||
}
|
||||
if (entity instanceof IShearable) {
|
||||
IShearable target = (IShearable) entity;
|
||||
if (target.isShearable(
|
||||
itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) {
|
||||
if (target
|
||||
.isShearable(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) {
|
||||
ArrayList<ItemStack> drops = target.onSheared(
|
||||
itemstack,
|
||||
entity.worldObj,
|
||||
|
||||
@@ -1,22 +1,24 @@
|
||||
package emt.item.tool.chainsaw;
|
||||
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumAction;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.common.lib.network.PacketHandler;
|
||||
import thaumcraft.common.lib.network.fx.PacketFXBlockBubble;
|
||||
import thaumcraft.common.lib.utils.BlockUtils;
|
||||
import thaumcraft.common.lib.utils.Utils;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.ElectricItem;
|
||||
|
||||
public class ItemStreamChainsaw extends ItemThaumiumChainsaw {
|
||||
|
||||
@@ -49,20 +51,10 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onItemUse(
|
||||
ItemStack itemstack,
|
||||
EntityPlayer player,
|
||||
World world,
|
||||
int x,
|
||||
int y,
|
||||
int z,
|
||||
int par7,
|
||||
float par8,
|
||||
float par9,
|
||||
float par10) {
|
||||
public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int par7,
|
||||
float par8, float par9, float par10) {
|
||||
Block bi = world.getBlock(x, y, z);
|
||||
if ((!player.isSneaking())
|
||||
&& (Utils.isWoodLog(world, x, y, z))
|
||||
if ((!player.isSneaking()) && (Utils.isWoodLog(world, x, y, z))
|
||||
&& ElectricItem.manager.getCharge(itemstack) > cost) {
|
||||
if (!world.isRemote) {
|
||||
if (BlockUtils.breakFurthestBlock(world, x, y, z, bi, player)) {
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
package emt.item.tool.chainsaw;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -12,6 +8,11 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import ic2.api.item.ElectricItem;
|
||||
|
||||
public class ItemThaumiumChainsaw extends ItemDiamondChainsaw {
|
||||
|
||||
public ItemThaumiumChainsaw() {
|
||||
@@ -31,8 +32,8 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6,
|
||||
EntityLivingBase entityLiving) {
|
||||
ElectricItem.manager.use(stack, cost, entityLiving);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1,13 +1,9 @@
|
||||
package emt.item.tool.drill;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -26,47 +22,25 @@ import net.minecraft.util.MovingObjectPosition.MovingObjectType;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.entities.EntityFollowingItem;
|
||||
import thaumcraft.common.lib.utils.BlockUtils;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
|
||||
public class ItemRockbreakerDrill extends ItemThaumiumDrill {
|
||||
|
||||
private static final Block[] isEffective = {
|
||||
Blocks.nether_brick,
|
||||
Blocks.netherrack,
|
||||
Blocks.glowstone,
|
||||
Blocks.iron_block,
|
||||
Blocks.gold_block,
|
||||
Blocks.diamond_block,
|
||||
Blocks.lapis_block,
|
||||
Blocks.redstone_block,
|
||||
Blocks.redstone_ore,
|
||||
Blocks.emerald_ore,
|
||||
Blocks.emerald_block,
|
||||
Blocks.stonebrick,
|
||||
Blocks.glass,
|
||||
Blocks.stone,
|
||||
Blocks.gold_ore,
|
||||
Blocks.iron_ore,
|
||||
Blocks.coal_ore,
|
||||
Blocks.cobblestone,
|
||||
Blocks.diamond_ore,
|
||||
Blocks.lapis_ore,
|
||||
Blocks.dirt,
|
||||
Blocks.gravel,
|
||||
Blocks.sand,
|
||||
Blocks.sandstone,
|
||||
Blocks.soul_sand,
|
||||
Blocks.clay,
|
||||
Blocks.grass,
|
||||
Blocks.snow_layer,
|
||||
Blocks.snow,
|
||||
Blocks.farmland,
|
||||
Blocks.hardened_clay,
|
||||
Blocks.stained_hardened_clay,
|
||||
Blocks.mossy_cobblestone
|
||||
};
|
||||
private static final Block[] isEffective = { Blocks.nether_brick, Blocks.netherrack, Blocks.glowstone,
|
||||
Blocks.iron_block, Blocks.gold_block, Blocks.diamond_block, Blocks.lapis_block, Blocks.redstone_block,
|
||||
Blocks.redstone_ore, Blocks.emerald_ore, Blocks.emerald_block, Blocks.stonebrick, Blocks.glass,
|
||||
Blocks.stone, Blocks.gold_ore, Blocks.iron_ore, Blocks.coal_ore, Blocks.cobblestone, Blocks.diamond_ore,
|
||||
Blocks.lapis_ore, Blocks.dirt, Blocks.gravel, Blocks.sand, Blocks.sandstone, Blocks.soul_sand, Blocks.clay,
|
||||
Blocks.grass, Blocks.snow_layer, Blocks.snow, Blocks.farmland, Blocks.hardened_clay,
|
||||
Blocks.stained_hardened_clay, Blocks.mossy_cobblestone };
|
||||
public int searchCost = 1000;
|
||||
public int hitCost = 400;
|
||||
int side;
|
||||
@@ -103,8 +77,8 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
|
||||
|
||||
@Override
|
||||
public boolean onBlockStartBreak(ItemStack itemstack, int X, int Y, int Z, EntityPlayer player) {
|
||||
MovingObjectPosition movingobjectposition =
|
||||
BlockUtils.getTargetBlock(((Entity) (player)).worldObj, player, true);
|
||||
MovingObjectPosition movingobjectposition = BlockUtils
|
||||
.getTargetBlock(((Entity) (player)).worldObj, player, true);
|
||||
if (movingobjectposition != null && movingobjectposition.typeOfHit == MovingObjectType.BLOCK) {
|
||||
side = movingobjectposition.sideHit;
|
||||
}
|
||||
@@ -112,8 +86,8 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) {
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z,
|
||||
EntityLivingBase entityLiving) {
|
||||
if (EMTConfigHandler.toolsInBore == false) {
|
||||
cost = 350;
|
||||
} else {
|
||||
@@ -162,9 +136,8 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
|
||||
continue;
|
||||
}
|
||||
ItemStack is;
|
||||
for (Iterator i$ = ret.iterator();
|
||||
i$.hasNext();
|
||||
world.spawnEntityInWorld(new EntityFollowingItem(
|
||||
for (Iterator i$ = ret.iterator(); i$.hasNext(); world.spawnEntityInWorld(
|
||||
new EntityFollowingItem(
|
||||
world,
|
||||
(double) x + (double) xx + 0.5D,
|
||||
(double) y + (double) yy + 0.5D,
|
||||
@@ -181,25 +154,12 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onItemUse(
|
||||
ItemStack stack,
|
||||
EntityPlayer player,
|
||||
World world,
|
||||
int x,
|
||||
int y,
|
||||
int z,
|
||||
int side,
|
||||
float xOffset,
|
||||
float yOffset,
|
||||
float zOffset) {
|
||||
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
|
||||
float xOffset, float yOffset, float zOffset) {
|
||||
if (!player.isSneaking()) {
|
||||
for (int i = 0; i < player.inventory.mainInventory.length; i++) {
|
||||
ItemStack torchStack = player.inventory.mainInventory[i];
|
||||
if (torchStack == null
|
||||
|| !torchStack
|
||||
.getUnlocalizedName()
|
||||
.toLowerCase(Locale.US)
|
||||
.contains("torch")) {
|
||||
if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase(Locale.US).contains("torch")) {
|
||||
continue;
|
||||
}
|
||||
Item item = torchStack.getItem();
|
||||
@@ -208,8 +168,8 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
|
||||
}
|
||||
int oldMeta = torchStack.getItemDamage();
|
||||
int oldSize = torchStack.stackSize;
|
||||
boolean result =
|
||||
torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset);
|
||||
boolean result = torchStack
|
||||
.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset);
|
||||
if (player.capabilities.isCreativeMode) {
|
||||
torchStack.setItemDamage(oldMeta);
|
||||
torchStack.stackSize = oldSize;
|
||||
@@ -244,8 +204,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
|
||||
|
||||
public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) {
|
||||
if (!((Entity) (player)).worldObj.isRemote
|
||||
&& (!(entity instanceof EntityPlayer)
|
||||
|| MinecraftServer.getServer().isPVPEnabled())) {
|
||||
&& (!(entity instanceof EntityPlayer) || MinecraftServer.getServer().isPVPEnabled())) {
|
||||
entity.setFire(2);
|
||||
}
|
||||
return super.onLeftClickEntity(stack, player, entity);
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
package emt.item.tool.drill;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -19,6 +14,13 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
|
||||
public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem {
|
||||
|
||||
public int maxCharge = 100000;
|
||||
@@ -58,8 +60,8 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6,
|
||||
EntityLivingBase entityLiving) {
|
||||
if (EMTConfigHandler.toolsInBore == false) {
|
||||
cost = 250;
|
||||
} else {
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package emt.item.tool.omnitool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -13,6 +8,12 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
|
||||
public class ItemOmnitoolDiamond extends ItemOmnitoolIron {
|
||||
|
||||
public ItemOmnitoolDiamond() {
|
||||
@@ -36,8 +37,8 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6,
|
||||
EntityLivingBase entityLiving) {
|
||||
if (!EMTConfigHandler.toolsInBore) {
|
||||
cost = 200;
|
||||
} else {
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
package emt.item.tool.omnitool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -23,6 +18,13 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
|
||||
public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
|
||||
|
||||
public int maxCharge = 50000;
|
||||
@@ -61,8 +63,8 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6,
|
||||
EntityLivingBase entityLiving) {
|
||||
if (!EMTConfigHandler.toolsInBore) {
|
||||
cost = 100;
|
||||
} else {
|
||||
@@ -74,8 +76,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
|
||||
|
||||
@Override
|
||||
public boolean canHarvestBlock(Block block, ItemStack stack) {
|
||||
return Items.iron_axe.canHarvestBlock(block, stack)
|
||||
|| Items.iron_sword.canHarvestBlock(block, stack)
|
||||
return Items.iron_axe.canHarvestBlock(block, stack) || Items.iron_sword.canHarvestBlock(block, stack)
|
||||
|| Items.iron_pickaxe.canHarvestBlock(block, stack)
|
||||
|| Items.iron_shovel.canHarvestBlock(block, stack)
|
||||
|| Items.shears.canHarvestBlock(block, stack);
|
||||
@@ -107,21 +108,11 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onItemUse(
|
||||
ItemStack stack,
|
||||
EntityPlayer player,
|
||||
World world,
|
||||
int x,
|
||||
int y,
|
||||
int z,
|
||||
int side,
|
||||
float xOffset,
|
||||
float yOffset,
|
||||
float zOffset) {
|
||||
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
|
||||
float xOffset, float yOffset, float zOffset) {
|
||||
for (int i = 0; i < player.inventory.mainInventory.length; i++) {
|
||||
ItemStack torchStack = player.inventory.mainInventory[i];
|
||||
if (torchStack == null
|
||||
|| !torchStack.getUnlocalizedName().toLowerCase(Locale.US).contains("torch")) {
|
||||
if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase(Locale.US).contains("torch")) {
|
||||
continue;
|
||||
}
|
||||
Item item = torchStack.getItem();
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package emt.item.tool.omnitool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -13,6 +8,12 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import ic2.api.item.ElectricItem;
|
||||
|
||||
public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond {
|
||||
|
||||
public ItemOmnitoolThaumium() {
|
||||
@@ -36,8 +37,8 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6,
|
||||
EntityLivingBase entityLiving) {
|
||||
if (!EMTConfigHandler.toolsInBore) {
|
||||
cost = 300;
|
||||
} else {
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package emt.nei;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import codechicken.nei.api.IConfigureNEI;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import emt.EMT;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
public class NEI_Config implements IConfigureNEI {
|
||||
|
||||
|
||||
@@ -11,17 +11,8 @@ public class PacketEMTKeys implements IMessage, IMessageHandler<PacketEMTKeys, I
|
||||
@Override
|
||||
public IMessage onMessage(PacketEMTKeys message, MessageContext ctx) {
|
||||
if (ctx.getServerHandler().playerEntity.inventory.armorInventory[2] != null
|
||||
&& ctx.getServerHandler()
|
||||
.playerEntity
|
||||
.inventory
|
||||
.armorInventory[2]
|
||||
.getItem()
|
||||
== EMTItems.quantumArmor) {
|
||||
ctx.getServerHandler()
|
||||
.playerEntity
|
||||
.inventory
|
||||
.armorInventory[2]
|
||||
.stackTagCompound
|
||||
&& ctx.getServerHandler().playerEntity.inventory.armorInventory[2].getItem() == EMTItems.quantumArmor) {
|
||||
ctx.getServerHandler().playerEntity.inventory.armorInventory[2].stackTagCompound
|
||||
.setBoolean("unequip", true);
|
||||
}
|
||||
return null;
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
package emt.network;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
@@ -8,9 +12,6 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.tile.GT_MetaTileEntity_ResearchCompleter;
|
||||
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
public class PacketNodeInfo implements IMessage, IMessageHandler<PacketNodeInfo, IMessage> {
|
||||
|
||||
@@ -57,8 +58,8 @@ public class PacketNodeInfo implements IMessage, IMessageHandler<PacketNodeInfo,
|
||||
if (tileEntity instanceof IGregTechTileEntity) {
|
||||
IGregTechTileEntity gtTile = (IGregTechTileEntity) tileEntity;
|
||||
if (gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_ResearchCompleter) {
|
||||
GT_MetaTileEntity_ResearchCompleter researchCompleter =
|
||||
(GT_MetaTileEntity_ResearchCompleter) gtTile.getMetaTileEntity();
|
||||
GT_MetaTileEntity_ResearchCompleter researchCompleter = (GT_MetaTileEntity_ResearchCompleter) gtTile
|
||||
.getMetaTileEntity();
|
||||
researchCompleter.setNodeValues(message.nodeDistance, message.nodeColor);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
package emt.proxy;
|
||||
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.entity.RenderSnowMan;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
import emt.client.EMTKeys;
|
||||
import emt.client.renderer.RenderLaser;
|
||||
@@ -8,10 +13,6 @@ import emt.entity.EntityArcher;
|
||||
import emt.entity.EntityEnergyBall;
|
||||
import emt.entity.EntityLaser;
|
||||
import emt.entity.EntityShield;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.entity.RenderSnowMan;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public class ClientProxy extends CommonProxy {
|
||||
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package emt.tile;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import gregtech.api.enums.GT_Values;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
public class DefinitelyNotAIC2Source {
|
||||
|
||||
public final TileEntity parent;
|
||||
protected long capacity;
|
||||
protected byte tier;
|
||||
|
||||
@@ -4,8 +4,27 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
|
||||
import static gregtech.api.enums.Textures.BlockIcons.*;
|
||||
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.research.ResearchCategories;
|
||||
import thaumcraft.api.research.ResearchItem;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.lib.research.ResearchManager;
|
||||
import thaumcraft.common.lib.research.ResearchNoteData;
|
||||
import thaumcraft.common.tiles.TileNode;
|
||||
|
||||
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
|
||||
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
|
||||
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import emt.EMT;
|
||||
import emt.network.PacketNodeInfo;
|
||||
@@ -18,24 +37,10 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMul
|
||||
import gregtech.api.render.TextureFactory;
|
||||
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
|
||||
import gregtech.api.util.GT_Utility;
|
||||
import java.util.ArrayList;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.research.ResearchCategories;
|
||||
import thaumcraft.api.research.ResearchItem;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.lib.research.ResearchManager;
|
||||
import thaumcraft.common.lib.research.ResearchNoteData;
|
||||
import thaumcraft.common.tiles.TileNode;
|
||||
|
||||
public class GT_MetaTileEntity_ResearchCompleter
|
||||
extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_ResearchCompleter> {
|
||||
|
||||
private static final int CASING_INDEX = 184;
|
||||
private static final int MAX_LENGTH = 13;
|
||||
private static final int RECIPE_LENGTH = 1200;
|
||||
@@ -58,52 +63,38 @@ public class GT_MetaTileEntity_ResearchCompleter
|
||||
private static final String STRUCTURE_PIECE_LATER = "later";
|
||||
private static final String STRUCTURE_PIECE_LAST = "last";
|
||||
private static final String STRUCTURE_PIECE_LATER_HINT = "laterHint";
|
||||
private static final IStructureDefinition<GT_MetaTileEntity_ResearchCompleter> STRUCTURE_DEFINITION =
|
||||
StructureDefinition.<GT_MetaTileEntity_ResearchCompleter>builder()
|
||||
.addShape(STRUCTURE_PIECE_FIRST, transpose(new String[][] {
|
||||
{"ccc"}, {"g~g"}, {"ccc"},
|
||||
}))
|
||||
.addShape(STRUCTURE_PIECE_LATER, transpose(new String[][] {
|
||||
{"c c"}, {"gxg"}, {"c c"},
|
||||
}))
|
||||
.addShape(STRUCTURE_PIECE_LAST, transpose(new String[][] {
|
||||
{"c"}, {"g"}, {"c"},
|
||||
}))
|
||||
.addShape(STRUCTURE_PIECE_LATER_HINT, transpose(new String[][] {
|
||||
{"c c"}, {"g g"}, {"c c"},
|
||||
}))
|
||||
.addElement(
|
||||
'c',
|
||||
ofChain( // Magical machine casing or hatch
|
||||
ofHatchAdder(
|
||||
GT_MetaTileEntity_ResearchCompleter::addEnergyInputToMachineList,
|
||||
CASING_INDEX,
|
||||
1),
|
||||
ofHatchAdder(
|
||||
GT_MetaTileEntity_ResearchCompleter::addInputToMachineList,
|
||||
CASING_INDEX,
|
||||
1),
|
||||
ofHatchAdder(
|
||||
GT_MetaTileEntity_ResearchCompleter::addOutputToMachineList,
|
||||
CASING_INDEX,
|
||||
1),
|
||||
ofHatchAdder(
|
||||
GT_MetaTileEntity_ResearchCompleter::addMaintenanceToMachineList,
|
||||
CASING_INDEX,
|
||||
1),
|
||||
onElementPass(
|
||||
GT_MetaTileEntity_ResearchCompleter::onCasingFound,
|
||||
ofBlock(GregTech_API.sBlockCasings8, 8))))
|
||||
.addElement(
|
||||
'x',
|
||||
ofChain( // Check for the end but otherwise treat as a skipped spot
|
||||
onElementPass(
|
||||
GT_MetaTileEntity_ResearchCompleter::onEndFound,
|
||||
ofBlock(ConfigBlocks.blockCosmeticOpaque, 2)),
|
||||
isAir(), // Forgive me
|
||||
notAir()))
|
||||
.addElement('g', ofBlock(ConfigBlocks.blockCosmeticOpaque, 2)) // Warded glass
|
||||
.build();
|
||||
private static final IStructureDefinition<GT_MetaTileEntity_ResearchCompleter> STRUCTURE_DEFINITION = StructureDefinition
|
||||
.<GT_MetaTileEntity_ResearchCompleter>builder()
|
||||
.addShape(STRUCTURE_PIECE_FIRST, transpose(new String[][] { { "ccc" }, { "g~g" }, { "ccc" }, }))
|
||||
.addShape(STRUCTURE_PIECE_LATER, transpose(new String[][] { { "c c" }, { "gxg" }, { "c c" }, }))
|
||||
.addShape(STRUCTURE_PIECE_LAST, transpose(new String[][] { { "c" }, { "g" }, { "c" }, }))
|
||||
.addShape(STRUCTURE_PIECE_LATER_HINT, transpose(new String[][] { { "c c" }, { "g g" }, { "c c" }, }))
|
||||
.addElement(
|
||||
'c',
|
||||
ofChain( // Magical machine casing or hatch
|
||||
ofHatchAdder(
|
||||
GT_MetaTileEntity_ResearchCompleter::addEnergyInputToMachineList,
|
||||
CASING_INDEX,
|
||||
1),
|
||||
ofHatchAdder(GT_MetaTileEntity_ResearchCompleter::addInputToMachineList, CASING_INDEX, 1),
|
||||
ofHatchAdder(GT_MetaTileEntity_ResearchCompleter::addOutputToMachineList, CASING_INDEX, 1),
|
||||
ofHatchAdder(
|
||||
GT_MetaTileEntity_ResearchCompleter::addMaintenanceToMachineList,
|
||||
CASING_INDEX,
|
||||
1),
|
||||
onElementPass(
|
||||
GT_MetaTileEntity_ResearchCompleter::onCasingFound,
|
||||
ofBlock(GregTech_API.sBlockCasings8, 8))))
|
||||
.addElement(
|
||||
'x',
|
||||
ofChain( // Check for the end but otherwise treat as a skipped spot
|
||||
onElementPass(
|
||||
GT_MetaTileEntity_ResearchCompleter::onEndFound,
|
||||
ofBlock(ConfigBlocks.blockCosmeticOpaque, 2)),
|
||||
isAir(), // Forgive me
|
||||
notAir()))
|
||||
.addElement('g', ofBlock(ConfigBlocks.blockCosmeticOpaque, 2)) // Warded glass
|
||||
.build();
|
||||
|
||||
public GT_MetaTileEntity_ResearchCompleter(int aID, String aName, String aNameRegional) {
|
||||
super(aID, aName, aNameRegional);
|
||||
@@ -267,7 +258,7 @@ public class GT_MetaTileEntity_ResearchCompleter
|
||||
}
|
||||
|
||||
// Create a completed version of the note to output
|
||||
this.mOutputItems = new ItemStack[] {GT_Utility.copyAmount(1L, stack)};
|
||||
this.mOutputItems = new ItemStack[] { GT_Utility.copyAmount(1L, stack) };
|
||||
this.mOutputItems[0].stackTagCompound.setBoolean("complete", true);
|
||||
this.mOutputItems[0].setItemDamage(64);
|
||||
stack.stackSize -= 1;
|
||||
@@ -301,8 +292,7 @@ public class GT_MetaTileEntity_ResearchCompleter
|
||||
if (!checkPiece(STRUCTURE_PIECE_LATER, 1, 1, -(mLength - 1))) return false;
|
||||
}
|
||||
|
||||
return endFound
|
||||
&& mLength >= 3
|
||||
return endFound && mLength >= 3
|
||||
&& checkPiece(STRUCTURE_PIECE_LAST, 0, 1, -(mLength - 1))
|
||||
&& mCasing >= mLength * 3;
|
||||
}
|
||||
@@ -341,41 +331,19 @@ public class GT_MetaTileEntity_ResearchCompleter
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITexture[] getTexture(
|
||||
IGregTechTileEntity aBaseMetaTileEntity,
|
||||
byte aSide,
|
||||
byte aFacing,
|
||||
byte aColorIndex,
|
||||
boolean aActive,
|
||||
boolean aRedstone) {
|
||||
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
|
||||
boolean aActive, boolean aRedstone) {
|
||||
if (aSide == aFacing) {
|
||||
if (aActive)
|
||||
return new ITexture[] {
|
||||
Textures.BlockIcons.getCasingTextureForId(CASING_INDEX),
|
||||
TextureFactory.builder()
|
||||
.addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE)
|
||||
.extFacing()
|
||||
.build(),
|
||||
TextureFactory.builder()
|
||||
.addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE_GLOW)
|
||||
.extFacing()
|
||||
.glow()
|
||||
.build()
|
||||
};
|
||||
return new ITexture[] {
|
||||
Textures.BlockIcons.getCasingTextureForId(CASING_INDEX),
|
||||
TextureFactory.builder()
|
||||
.addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER)
|
||||
.extFacing()
|
||||
.build(),
|
||||
TextureFactory.builder()
|
||||
.addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER_GLOW)
|
||||
.extFacing()
|
||||
.glow()
|
||||
.build()
|
||||
};
|
||||
if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX),
|
||||
TextureFactory.builder().addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE).extFacing().build(),
|
||||
TextureFactory.builder().addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE_GLOW).extFacing().glow()
|
||||
.build() };
|
||||
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX),
|
||||
TextureFactory.builder().addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER).extFacing().build(),
|
||||
TextureFactory.builder().addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER_GLOW).extFacing().glow()
|
||||
.build() };
|
||||
}
|
||||
return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(CASING_INDEX)};
|
||||
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX) };
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -386,19 +354,13 @@ public class GT_MetaTileEntity_ResearchCompleter
|
||||
@Override
|
||||
protected GT_Multiblock_Tooltip_Builder createTooltip() {
|
||||
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
|
||||
tt.addMachineType("Research Completer")
|
||||
.addInfo("Controller block for the Research Completer")
|
||||
tt.addMachineType("Research Completer").addInfo("Controller block for the Research Completer")
|
||||
.addInfo("Completes Thaumcraft research notes using EU and Thaumcraft nodes")
|
||||
.addInfo("Place nodes in the center row")
|
||||
.addSeparator()
|
||||
.beginVariableStructureBlock(3, 3, 3, 3, 3, MAX_LENGTH, true)
|
||||
.addController("Front center")
|
||||
.addInfo("Place nodes in the center row").addSeparator()
|
||||
.beginVariableStructureBlock(3, 3, 3, 3, 3, MAX_LENGTH, true).addController("Front center")
|
||||
.addOtherStructurePart("Magical machine casing", "Top and bottom layers outside. 3 x L minimum")
|
||||
.addOtherStructurePart("Warded glass", "Middle layer outside")
|
||||
.addEnergyHatch("Any casing")
|
||||
.addMaintenanceHatch("Any casing")
|
||||
.addInputBus("Any casing")
|
||||
.addOutputBus("Any casing")
|
||||
.addOtherStructurePart("Warded glass", "Middle layer outside").addEnergyHatch("Any casing")
|
||||
.addMaintenanceHatch("Any casing").addInputBus("Any casing").addOutputBus("Any casing")
|
||||
.toolTipFinisher("Electro-Magic Tools");
|
||||
return tt;
|
||||
}
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
package emt.tile;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
import thaumcraft.client.fx.ParticleEngine;
|
||||
import thaumcraft.client.fx.particles.FXWisp;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import thaumcraft.client.fx.ParticleEngine;
|
||||
import thaumcraft.client.fx.particles.FXWisp;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
|
||||
public class TileElectricCloud extends TileEntity {
|
||||
|
||||
@@ -18,9 +19,9 @@ public class TileElectricCloud extends TileEntity {
|
||||
|
||||
@Override
|
||||
public void updateEntity() {
|
||||
if (worldObj.isRemote
|
||||
&& FMLCommonHandler.instance().getSide().isClient()
|
||||
&& FMLClientHandler.instance().getClient().renderViewEntity != null) fx();
|
||||
if (worldObj.isRemote && FMLCommonHandler.instance().getSide().isClient()
|
||||
&& FMLClientHandler.instance().getClient().renderViewEntity != null)
|
||||
fx();
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -7,6 +7,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
public class TileEntityEMT extends TileEntity {
|
||||
|
||||
public int facing;
|
||||
public boolean isOn;
|
||||
|
||||
|
||||
@@ -1,5 +1,15 @@
|
||||
package emt.tile;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.ISidedInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
|
||||
import com.gtnewhorizons.modularui.api.ModularUITextures;
|
||||
import com.gtnewhorizons.modularui.api.forge.InvWrapper;
|
||||
import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI;
|
||||
@@ -8,26 +18,19 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
|
||||
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
|
||||
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
|
||||
import com.gtnewhorizons.modularui.common.widget.TextWidget;
|
||||
|
||||
import emt.init.EMTBlocks;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTTextHelper;
|
||||
import gregtech.api.gui.modularui.GT_UITextures;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.ISidedInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
|
||||
public class TileEntityEtherealMacerator extends TileEntityEMT
|
||||
implements ISidedInventory, IWrenchable, ITileWithModularUI {
|
||||
|
||||
private static final int[] slots_top = new int[] {0};
|
||||
private static final int[] slots_bottom = new int[] {2, 1};
|
||||
private static final int[] slots_sides = new int[] {1};
|
||||
private static final int[] slots_top = new int[] { 0 };
|
||||
private static final int[] slots_bottom = new int[] { 2, 1 };
|
||||
private static final int[] slots_sides = new int[] { 1 };
|
||||
public int maceratingSpeed = EMTConfigHandler.etherealProcessorBaseSpeed;
|
||||
public int cookTime;
|
||||
private ItemStack[] slots = new ItemStack[3];
|
||||
@@ -183,19 +186,19 @@ public class TileEntityEtherealMacerator extends TileEntityEMT
|
||||
} else if (this.slots[1].isItemEqual(new ItemStack(ConfigItems.itemNugget, 1, 6))
|
||||
&& this.isOverLimit(1) == false
|
||||
&& this.isOverLimit(2) == false) {
|
||||
slots[1] = new ItemStack(getStackInSlot(1).getItem(), slots[1].stackSize + 1, 2);
|
||||
}
|
||||
slots[1] = new ItemStack(getStackInSlot(1).getItem(), slots[1].stackSize + 1, 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) {
|
||||
return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this
|
||||
? false
|
||||
return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false
|
||||
: par1EntityPlayer.getDistanceSq(
|
||||
(double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D)
|
||||
<= 64.0D;
|
||||
(double) this.xCoord + 0.5D,
|
||||
(double) this.yCoord + 0.5D,
|
||||
(double) this.zCoord + 0.5D) <= 64.0D;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -293,20 +296,19 @@ public class TileEntityEtherealMacerator extends TileEntityEMT
|
||||
builder.bindPlayerInventory(buildContext.getPlayer());
|
||||
InvWrapper invWrapper = new InvWrapper(this);
|
||||
|
||||
builder.widget(new SlotWidget(invWrapper, 0)
|
||||
.setFilter(stack ->
|
||||
isAllowed(stack) && FurnaceRecipes.smelting().getSmeltingResult(stack) != null)
|
||||
builder.widget(
|
||||
new SlotWidget(invWrapper, 0)
|
||||
.setFilter(
|
||||
stack -> isAllowed(stack) && FurnaceRecipes.smelting().getSmeltingResult(stack) != null)
|
||||
.setPos(55, 25))
|
||||
.widget(new SlotWidget(invWrapper, 2)
|
||||
.setAccess(true, false)
|
||||
.setBackground(ModularUITextures.ITEM_SLOT.withFixedSize(26, 26, -4, -4))
|
||||
.setPos(115, 25))
|
||||
.widget(
|
||||
new SlotWidget(invWrapper, 2).setAccess(true, false)
|
||||
.setBackground(ModularUITextures.ITEM_SLOT.withFixedSize(26, 26, -4, -4))
|
||||
.setPos(115, 25))
|
||||
.widget(new SlotWidget(invWrapper, 1).setAccess(true, false).setPos(115, 52))
|
||||
.widget(new ProgressBar()
|
||||
.setTexture(GT_UITextures.PROGRESSBAR_MACERATE, 20)
|
||||
.setProgress(() -> (float) cookTime / maceratingSpeed)
|
||||
.setPos(81, 36)
|
||||
.setSize(20, 18))
|
||||
.widget(
|
||||
new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_MACERATE, 20)
|
||||
.setProgress(() -> (float) cookTime / maceratingSpeed).setPos(81, 36).setSize(20, 18))
|
||||
.widget(new TextWidget(EMTTextHelper.localize("gui.EMT.etherealMacerator.title")).setPos(6, 6));
|
||||
|
||||
return builder.build();
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
package emt.tile;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
import com.gtnewhorizons.modularui.api.ModularUITextures;
|
||||
import com.gtnewhorizons.modularui.api.forge.InvWrapper;
|
||||
import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI;
|
||||
@@ -7,6 +19,7 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
|
||||
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
|
||||
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
|
||||
import com.gtnewhorizons.modularui.common.widget.TextWidget;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import emt.client.gui.EMT_UITextures;
|
||||
import emt.init.EMTBlocks;
|
||||
@@ -14,19 +27,10 @@ import emt.util.EMTConfigHandler;
|
||||
import emt.util.EMTTextHelper;
|
||||
import ic2.api.energy.tile.IEnergySink;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
public class TileEntityIndustrialWandRecharge extends TileEntityEMT
|
||||
implements IInventory, IWrenchable, IEnergySink, ITileWithModularUI {
|
||||
|
||||
private static final int capacity = 1000000;
|
||||
private static final int tier = 4;
|
||||
private double energyStored = 0;
|
||||
@@ -60,8 +64,7 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT
|
||||
}
|
||||
|
||||
private boolean useEnergy(double amount) {
|
||||
if (this.canUseEnergy(amount)
|
||||
&& !FMLCommonHandler.instance().getEffectiveSide().isClient()) {
|
||||
if (this.canUseEnergy(amount) && !FMLCommonHandler.instance().getEffectiveSide().isClient()) {
|
||||
this.energyStored -= amount;
|
||||
return true;
|
||||
} else {
|
||||
@@ -256,9 +259,9 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT
|
||||
builder.setBackground(ModularUITextures.VANILLA_BACKGROUND);
|
||||
builder.bindPlayerInventory(buildContext.getPlayer());
|
||||
|
||||
builder.widget(new SlotWidget(new InvWrapper(this), 0)
|
||||
.setBackground(ModularUITextures.ITEM_SLOT, EMT_UITextures.OVERLAY_SLOT_WAND)
|
||||
.setPos(79, 34))
|
||||
builder.widget(
|
||||
new SlotWidget(new InvWrapper(this), 0)
|
||||
.setBackground(ModularUITextures.ITEM_SLOT, EMT_UITextures.OVERLAY_SLOT_WAND).setPos(79, 34))
|
||||
.widget(new TextWidget(EMTTextHelper.localize("gui.EMT.wandRecharge.title")).setPos(6, 6));
|
||||
|
||||
return builder.build();
|
||||
|
||||
@@ -1,5 +1,23 @@
|
||||
package emt.tile.generator;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
||||
import thaumcraft.api.ThaumcraftApiHelper;
|
||||
import thaumcraft.api.aspects.*;
|
||||
import thaumcraft.common.lib.network.PacketHandler;
|
||||
import thaumcraft.common.lib.network.fx.PacketFXEssentiaSource;
|
||||
|
||||
import com.gtnewhorizons.modularui.api.ModularUITextures;
|
||||
import com.gtnewhorizons.modularui.api.drawable.Text;
|
||||
import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI;
|
||||
@@ -8,6 +26,7 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
|
||||
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
|
||||
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
|
||||
import com.gtnewhorizons.modularui.common.widget.TextWidget;
|
||||
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import emt.client.gui.EMT_UITextures;
|
||||
import emt.tile.DefinitelyNotAIC2Source;
|
||||
@@ -21,31 +40,10 @@ import gregtech.api.interfaces.tileentity.IEnergyConnected;
|
||||
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
|
||||
import gregtech.api.net.GT_Packet_Block_Event;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import thaumcraft.api.ThaumcraftApiHelper;
|
||||
import thaumcraft.api.aspects.*;
|
||||
import thaumcraft.common.lib.network.PacketHandler;
|
||||
import thaumcraft.common.lib.network.fx.PacketFXEssentiaSource;
|
||||
|
||||
public class TileEntityBaseGenerator extends TileEntityEMT
|
||||
implements IInventory,
|
||||
IAspectContainer,
|
||||
IEssentiaTransport,
|
||||
IHasWorldObjectAndCoords,
|
||||
IEnergyConnected,
|
||||
IBasicEnergyContainer,
|
||||
ITileWithModularUI {
|
||||
public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory, IAspectContainer, IEssentiaTransport,
|
||||
IHasWorldObjectAndCoords, IEnergyConnected, IBasicEnergyContainer, ITileWithModularUI {
|
||||
|
||||
public DefinitelyNotAIC2Source energySource = new DefinitelyNotAIC2Source(this, 100000L, 2);
|
||||
public Aspect aspect;
|
||||
public double generating;
|
||||
@@ -153,15 +151,18 @@ public class TileEntityBaseGenerator extends TileEntityEMT
|
||||
TileEntity[] te = new TileEntity[ForgeDirection.VALID_DIRECTIONS.length];
|
||||
for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) {
|
||||
te[i] = ThaumcraftApiHelper.getConnectableTile(
|
||||
this.worldObj, this.xCoord, this.yCoord, this.zCoord, ForgeDirection.VALID_DIRECTIONS[i]);
|
||||
this.worldObj,
|
||||
this.xCoord,
|
||||
this.yCoord,
|
||||
this.zCoord,
|
||||
ForgeDirection.VALID_DIRECTIONS[i]);
|
||||
if (te[i] != null) {
|
||||
IEssentiaTransport pipe = (IEssentiaTransport) te[i];
|
||||
if (!pipe.canOutputTo(ForgeDirection.VALID_DIRECTIONS[i])) {
|
||||
return;
|
||||
}
|
||||
if ((pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]) != null)
|
||||
&& (pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i])
|
||||
.equals(this.aspect))
|
||||
&& (pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]).equals(this.aspect))
|
||||
&& (pipe.getSuctionAmount(ForgeDirection.VALID_DIRECTIONS[i])
|
||||
< getSuctionAmount(ForgeDirection.VALID_DIRECTIONS[i]))) {
|
||||
addToContainer(this.aspect, pipe.takeEssentia(this.aspect, 1, ForgeDirection.VALID_DIRECTIONS[i]));
|
||||
@@ -470,7 +471,8 @@ public class TileEntityBaseGenerator extends TileEntityEMT
|
||||
@Override
|
||||
public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) {
|
||||
return decreaseStoredEnergyUnits(
|
||||
aVoltage * aAmperage, this.energySource.getEnergyStored() > aVoltage * aAmperage);
|
||||
aVoltage * aAmperage,
|
||||
this.energySource.getEnergyStored() > aVoltage * aAmperage);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -871,45 +873,47 @@ public class TileEntityBaseGenerator extends TileEntityEMT
|
||||
ModularWindow.Builder builder = ModularWindow.builder(176, 107);
|
||||
builder.setBackground(ModularUITextures.VANILLA_BACKGROUND);
|
||||
|
||||
builder.widget(new TextWidget(
|
||||
new Text(getInventoryName()).color(0x64fc06).shadow())
|
||||
.setPos(9, 9))
|
||||
.widget(new ProgressBar()
|
||||
builder.widget(new TextWidget(new Text(getInventoryName()).color(0x64fc06).shadow()).setPos(9, 9)).widget(
|
||||
new ProgressBar()
|
||||
.setTexture(EMT_UITextures.PICTURE_GAUGE_EMPTY_25, EMT_UITextures.PICTURE_GAUGE_GENERATOR, 25)
|
||||
.setProgress(() -> (float) storage / this.maxstorage)
|
||||
.setSynced(false, false)
|
||||
.setPos(9, 24)
|
||||
.setProgress(() -> (float) storage / this.maxstorage).setSynced(false, false).setPos(9, 24)
|
||||
.setSize(25, 11))
|
||||
.widget(new ProgressBar()
|
||||
.setTexture(EMT_UITextures.PICTURE_GAUGE_EMPTY_25, EMT_UITextures.PICTURE_GAUGE_GENERATOR, 25)
|
||||
.setProgress(() -> (float) fuel / this.maxfuel)
|
||||
.setSynced(false, false)
|
||||
.setPos(9, 43)
|
||||
.setSize(25, 11))
|
||||
.widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("emt.Storage")
|
||||
+ EMTTextHelper.formatNumber(storage) + "/"
|
||||
+ EMTTextHelper.formatNumber(maxstorage) + "EU")
|
||||
.setSynced(false)
|
||||
.setDefaultColor(0)
|
||||
.setPos(36, 22))
|
||||
.widget(
|
||||
new ProgressBar()
|
||||
.setTexture(
|
||||
EMT_UITextures.PICTURE_GAUGE_EMPTY_25,
|
||||
EMT_UITextures.PICTURE_GAUGE_GENERATOR,
|
||||
25)
|
||||
.setProgress(() -> (float) fuel / this.maxfuel).setSynced(false, false).setPos(9, 43)
|
||||
.setSize(25, 11))
|
||||
.widget(
|
||||
TextWidget
|
||||
.dynamicString(
|
||||
() -> StatCollector.translateToLocal("emt.Storage")
|
||||
+ EMTTextHelper.formatNumber(storage)
|
||||
+ "/"
|
||||
+ EMTTextHelper.formatNumber(maxstorage)
|
||||
+ "EU")
|
||||
.setSynced(false).setDefaultColor(0).setPos(36, 22))
|
||||
.widget(new FakeSyncWidget.IntegerSyncer(() -> storage, val -> storage = val))
|
||||
.widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("emt.Generating")
|
||||
+ (isActive ? generating / 20 / 20 : 0) + " EU/t")
|
||||
.setSynced(false)
|
||||
.setDefaultColor(0)
|
||||
.setPos(36, 35))
|
||||
.widget(
|
||||
TextWidget.dynamicString(
|
||||
() -> StatCollector.translateToLocal("emt.Generating")
|
||||
+ (isActive ? generating / 20 / 20 : 0)
|
||||
+ " EU/t")
|
||||
.setSynced(false).setDefaultColor(0).setPos(36, 35))
|
||||
.widget(new FakeSyncWidget.DoubleSyncer(() -> generating, val -> generating = val))
|
||||
.widget(new FakeSyncWidget.BooleanSyncer(() -> isActive, val -> isActive = val))
|
||||
.widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("emt.Fuel") + ": " + fuel)
|
||||
.setSynced(false)
|
||||
.setDefaultColor(0)
|
||||
.setPos(36, 48))
|
||||
.widget(
|
||||
TextWidget.dynamicString(() -> StatCollector.translateToLocal("emt.Fuel") + ": " + fuel)
|
||||
.setSynced(false).setDefaultColor(0).setPos(36, 48))
|
||||
.widget(new FakeSyncWidget.ByteSyncer(() -> fuel, val -> fuel = val))
|
||||
.widget(TextWidget.dynamicString(() ->
|
||||
StatCollector.translateToLocal("emt.remaining_second") + ((fuel * 20 * 20) - tick) / 20)
|
||||
.setSynced(false)
|
||||
.setDefaultColor(0)
|
||||
.setPos(36, 63))
|
||||
.widget(
|
||||
TextWidget
|
||||
.dynamicString(
|
||||
() -> StatCollector.translateToLocal("emt.remaining_second")
|
||||
+ ((fuel * 20 * 20) - tick) / 20)
|
||||
.setSynced(false).setDefaultColor(0).setPos(36, 63))
|
||||
.widget(new FakeSyncWidget.IntegerSyncer(() -> tick, val -> tick = val));
|
||||
|
||||
return builder.build();
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
package emt.tile.generator;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import emt.tile.DefinitelyNotAIC2Source;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
|
||||
public abstract class TileEntityCompressedGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityCompressedGenerator(Aspect aspect) {
|
||||
super();
|
||||
this.energySource = new DefinitelyNotAIC2Source(this, 1000000L, 3);
|
||||
|
||||
@@ -2,17 +2,21 @@ package emt.tile.solar;
|
||||
|
||||
import static thaumcraft.api.aspects.Aspect.*;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import emt.init.EMTBlocks;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import gregtech.api.enums.GT_Values;
|
||||
import gregtech.api.enums.Materials;
|
||||
import java.util.LinkedHashMap;
|
||||
import javax.annotation.Nullable;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
|
||||
// Solar Factory
|
||||
public enum Solars {
|
||||
|
||||
// compability to older versions
|
||||
Compressed(EMTConfigHandler.compressedSolarOutput, null, 0, 0, "solar.compressed"),
|
||||
Double_Compressed(EMTConfigHandler.doubleCompressedSolarOutput, null, 0, 1, "solar.doublecompressed"),
|
||||
@@ -38,68 +42,67 @@ public enum Solars {
|
||||
|
||||
// New Solars
|
||||
Quadruple_Compressed(EMTConfigHandler.quadrupleCompressedSolarOutput, null, 2, 0, "Quadruple_Compressed_Solar"),
|
||||
Quadruple_Compressed_Ordo(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, ORDER, 2, 1, "Quadruple_Compressed_Ordo_Solar"),
|
||||
Quadruple_Compressed_Perditio(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, ENTROPY, 2, 2, "Quadruple_Compressed_Perditio_Solar"),
|
||||
Quadruple_Compressed_Aer(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, AIR, 2, 3, "Quadruple_Compressed_Aer_Solar"),
|
||||
Quadruple_Compressed_Terra(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, EARTH, 2, 4, "Quadruple_Compressed_Terra_Solar"),
|
||||
Quadruple_Compressed_Aqua(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, WATER, 2, 5, "Quadruple_Compressed_Aqua_Solar"),
|
||||
Quadruple_Compressed_Ignis(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, FIRE, 2, 6, "Quadruple_Compressed_Ignis_Solar"),
|
||||
Quadruple_Compressed_Ordo(EMTConfigHandler.quadrupleCompressedSolarOutput, ORDER, 2, 1,
|
||||
"Quadruple_Compressed_Ordo_Solar"),
|
||||
Quadruple_Compressed_Perditio(EMTConfigHandler.quadrupleCompressedSolarOutput, ENTROPY, 2, 2,
|
||||
"Quadruple_Compressed_Perditio_Solar"),
|
||||
Quadruple_Compressed_Aer(EMTConfigHandler.quadrupleCompressedSolarOutput, AIR, 2, 3,
|
||||
"Quadruple_Compressed_Aer_Solar"),
|
||||
Quadruple_Compressed_Terra(EMTConfigHandler.quadrupleCompressedSolarOutput, EARTH, 2, 4,
|
||||
"Quadruple_Compressed_Terra_Solar"),
|
||||
Quadruple_Compressed_Aqua(EMTConfigHandler.quadrupleCompressedSolarOutput, WATER, 2, 5,
|
||||
"Quadruple_Compressed_Aqua_Solar"),
|
||||
Quadruple_Compressed_Ignis(EMTConfigHandler.quadrupleCompressedSolarOutput, FIRE, 2, 6,
|
||||
"Quadruple_Compressed_Ignis_Solar"),
|
||||
Quintuple_Compressed(EMTConfigHandler.quintupleCompressedSolarOutput, null, 2, 7, "Quintuple_Compressed_Solar"),
|
||||
Quintuple_Compressed_Ordo(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, ORDER, 2, 8, "Quintuple_Compressed_Ordo_Solar"),
|
||||
Quintuple_Compressed_Perditio(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, ENTROPY, 2, 9, "Quintuple_Compressed_Perditio_Solar"),
|
||||
Quintuple_Compressed_Aer(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, AIR, 2, 10, "Quintuple_Compressed_Aer_Solar"),
|
||||
Quintuple_Compressed_Terra(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, EARTH, 2, 11, "Quintuple_Compressed_Terra_Solar"),
|
||||
Quintuple_Compressed_Aqua(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, WATER, 2, 12, "Quintuple_Compressed_Aqua_Solar"),
|
||||
Quintuple_Compressed_Ignis(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, FIRE, 2, 13, "Quintuple_Compressed_Ignis_Solar"),
|
||||
Quintuple_Compressed_Ordo(EMTConfigHandler.quintupleCompressedSolarOutput, ORDER, 2, 8,
|
||||
"Quintuple_Compressed_Ordo_Solar"),
|
||||
Quintuple_Compressed_Perditio(EMTConfigHandler.quintupleCompressedSolarOutput, ENTROPY, 2, 9,
|
||||
"Quintuple_Compressed_Perditio_Solar"),
|
||||
Quintuple_Compressed_Aer(EMTConfigHandler.quintupleCompressedSolarOutput, AIR, 2, 10,
|
||||
"Quintuple_Compressed_Aer_Solar"),
|
||||
Quintuple_Compressed_Terra(EMTConfigHandler.quintupleCompressedSolarOutput, EARTH, 2, 11,
|
||||
"Quintuple_Compressed_Terra_Solar"),
|
||||
Quintuple_Compressed_Aqua(EMTConfigHandler.quintupleCompressedSolarOutput, WATER, 2, 12,
|
||||
"Quintuple_Compressed_Aqua_Solar"),
|
||||
Quintuple_Compressed_Ignis(EMTConfigHandler.quintupleCompressedSolarOutput, FIRE, 2, 13,
|
||||
"Quintuple_Compressed_Ignis_Solar"),
|
||||
Sextuple_Compressed(EMTConfigHandler.sextupleCompressedSolarOutput, null, 2, 14, "Sextuple_Compressed_Solar"),
|
||||
Sextuple_Compressed_Ordo(
|
||||
EMTConfigHandler.sextupleCompressedSolarOutput, ORDER, 2, 15, "Sextuple_Compressed_Ordo_Solar"),
|
||||
Sextuple_Compressed_Perditio(
|
||||
EMTConfigHandler.sextupleCompressedSolarOutput, ENTROPY, 3, 0, "Sextuple_Compressed_Perditio_Solar"),
|
||||
Sextuple_Compressed_Ordo(EMTConfigHandler.sextupleCompressedSolarOutput, ORDER, 2, 15,
|
||||
"Sextuple_Compressed_Ordo_Solar"),
|
||||
Sextuple_Compressed_Perditio(EMTConfigHandler.sextupleCompressedSolarOutput, ENTROPY, 3, 0,
|
||||
"Sextuple_Compressed_Perditio_Solar"),
|
||||
Sextuple_Compressed_Aer(EMTConfigHandler.sextupleCompressedSolarOutput, AIR, 3, 1, "Sextuple_Compressed_Aer_Solar"),
|
||||
Sextuple_Compressed_Terra(
|
||||
EMTConfigHandler.sextupleCompressedSolarOutput, EARTH, 3, 2, "Sextuple_Compressed_Terra_Solar"),
|
||||
Sextuple_Compressed_Aqua(
|
||||
EMTConfigHandler.sextupleCompressedSolarOutput, WATER, 3, 3, "Sextuple_Compressed_Aqua_Solar"),
|
||||
Sextuple_Compressed_Ignis(
|
||||
EMTConfigHandler.sextupleCompressedSolarOutput, FIRE, 3, 4, "Sextuple_Compressed_Ignis_Solar"),
|
||||
Sextuple_Compressed_Terra(EMTConfigHandler.sextupleCompressedSolarOutput, EARTH, 3, 2,
|
||||
"Sextuple_Compressed_Terra_Solar"),
|
||||
Sextuple_Compressed_Aqua(EMTConfigHandler.sextupleCompressedSolarOutput, WATER, 3, 3,
|
||||
"Sextuple_Compressed_Aqua_Solar"),
|
||||
Sextuple_Compressed_Ignis(EMTConfigHandler.sextupleCompressedSolarOutput, FIRE, 3, 4,
|
||||
"Sextuple_Compressed_Ignis_Solar"),
|
||||
Septuple_Compressed(EMTConfigHandler.septupleCompressedSolarOutput, null, 3, 5, "Septuple_Compressed_Solar"),
|
||||
Septuple_Compressed_Ordo(
|
||||
EMTConfigHandler.septupleCompressedSolarOutput, ORDER, 3, 6, "Septuple_Compressed_Ordo_Solar"),
|
||||
Septuple_Compressed_Perditio(
|
||||
EMTConfigHandler.septupleCompressedSolarOutput, ENTROPY, 3, 7, "Septuple_Compressed_Perditio_Solar"),
|
||||
Septuple_Compressed_Ordo(EMTConfigHandler.septupleCompressedSolarOutput, ORDER, 3, 6,
|
||||
"Septuple_Compressed_Ordo_Solar"),
|
||||
Septuple_Compressed_Perditio(EMTConfigHandler.septupleCompressedSolarOutput, ENTROPY, 3, 7,
|
||||
"Septuple_Compressed_Perditio_Solar"),
|
||||
Septuple_Compressed_Aer(EMTConfigHandler.septupleCompressedSolarOutput, AIR, 3, 8, "Septuple_Compressed_Aer_Solar"),
|
||||
Septuple_Compressed_Terra(
|
||||
EMTConfigHandler.septupleCompressedSolarOutput, EARTH, 3, 9, "Septuple_Compressed_Terra_Solar"),
|
||||
Septuple_Compressed_Aqua(
|
||||
EMTConfigHandler.septupleCompressedSolarOutput, WATER, 3, 10, "Septuple_Compressed_Aqua_Solar"),
|
||||
Septuple_Compressed_Ignis(
|
||||
EMTConfigHandler.septupleCompressedSolarOutput, FIRE, 3, 11, "Septuple_Compressed_Ignis_Solar"),
|
||||
Septuple_Compressed_Terra(EMTConfigHandler.septupleCompressedSolarOutput, EARTH, 3, 9,
|
||||
"Septuple_Compressed_Terra_Solar"),
|
||||
Septuple_Compressed_Aqua(EMTConfigHandler.septupleCompressedSolarOutput, WATER, 3, 10,
|
||||
"Septuple_Compressed_Aqua_Solar"),
|
||||
Septuple_Compressed_Ignis(EMTConfigHandler.septupleCompressedSolarOutput, FIRE, 3, 11,
|
||||
"Septuple_Compressed_Ignis_Solar"),
|
||||
Octuple_Compressed(EMTConfigHandler.octupleCompressedSolarOutput, null, 3, 12, "Octuple_Compressed_Solar"),
|
||||
Octuple_Compressed_Ordo(
|
||||
EMTConfigHandler.octupleCompressedSolarOutput, ORDER, 3, 13, "Octuple_Compressed_Ordo_Solar"),
|
||||
Octuple_Compressed_Perditio(
|
||||
EMTConfigHandler.octupleCompressedSolarOutput, ENTROPY, 3, 14, "Octuple_Compressed_Perditio_Solar"),
|
||||
Octuple_Compressed_Ordo(EMTConfigHandler.octupleCompressedSolarOutput, ORDER, 3, 13,
|
||||
"Octuple_Compressed_Ordo_Solar"),
|
||||
Octuple_Compressed_Perditio(EMTConfigHandler.octupleCompressedSolarOutput, ENTROPY, 3, 14,
|
||||
"Octuple_Compressed_Perditio_Solar"),
|
||||
Octuple_Compressed_Aer(EMTConfigHandler.octupleCompressedSolarOutput, AIR, 3, 15, "Octuple_Compressed_Aer_Solar"),
|
||||
Octuple_Compressed_Terra(
|
||||
EMTConfigHandler.octupleCompressedSolarOutput, EARTH, 4, 0, "Octuple_Compressed_Terra_Solar"),
|
||||
Octuple_Compressed_Aqua(
|
||||
EMTConfigHandler.octupleCompressedSolarOutput, WATER, 4, 1, "Octuple_Compressed_Aqua_Solar"),
|
||||
Octuple_Compressed_Ignis(
|
||||
EMTConfigHandler.octupleCompressedSolarOutput, FIRE, 4, 2, "Octuple_Compressed_Ignis_Solar"),
|
||||
;
|
||||
Octuple_Compressed_Terra(EMTConfigHandler.octupleCompressedSolarOutput, EARTH, 4, 0,
|
||||
"Octuple_Compressed_Terra_Solar"),
|
||||
Octuple_Compressed_Aqua(EMTConfigHandler.octupleCompressedSolarOutput, WATER, 4, 1,
|
||||
"Octuple_Compressed_Aqua_Solar"),
|
||||
Octuple_Compressed_Ignis(EMTConfigHandler.octupleCompressedSolarOutput, FIRE, 4, 2,
|
||||
"Octuple_Compressed_Ignis_Solar"),;
|
||||
|
||||
private static final LinkedHashMap<Long, Solars> cachemap = new LinkedHashMap<>();
|
||||
final int instance, meta;
|
||||
@@ -136,7 +139,9 @@ public enum Solars {
|
||||
new ItemStack(EMTBlocks.solars[s.instance], 1, s.meta),
|
||||
Materials.Chlorine.getGas(1000),
|
||||
new ItemStack(
|
||||
EMTBlocks.solars[getBaseSolar(s.output).instance], 1, getBaseSolar(s.output).meta),
|
||||
EMTBlocks.solars[getBaseSolar(s.output).instance],
|
||||
1,
|
||||
getBaseSolar(s.output).meta),
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
|
||||
@@ -1,26 +1,5 @@
|
||||
package emt.tile.solar;
|
||||
|
||||
import com.gtnewhorizons.modularui.api.ModularUITextures;
|
||||
import com.gtnewhorizons.modularui.api.drawable.Text;
|
||||
import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI;
|
||||
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
|
||||
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
|
||||
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
|
||||
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
|
||||
import com.gtnewhorizons.modularui.common.widget.TextWidget;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import emt.client.gui.EMT_UITextures;
|
||||
import emt.init.EMTBlocks;
|
||||
import emt.tile.DefinitelyNotAIC2Source;
|
||||
import emt.tile.TileEntityEMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
import gregtech.api.enums.GT_Values;
|
||||
import gregtech.api.interfaces.tileentity.IBasicEnergyContainer;
|
||||
import gregtech.api.interfaces.tileentity.IEnergyConnected;
|
||||
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
|
||||
import gregtech.api.net.GT_Packet_Block_Event;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -34,16 +13,35 @@ import net.minecraft.world.World;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.visnet.VisNetHandler;
|
||||
|
||||
public class TileEntitySolarBase extends TileEntityEMT
|
||||
implements IInventory,
|
||||
IWrenchable,
|
||||
IHasWorldObjectAndCoords,
|
||||
IEnergyConnected,
|
||||
IBasicEnergyContainer,
|
||||
ITileWithModularUI {
|
||||
import com.gtnewhorizons.modularui.api.ModularUITextures;
|
||||
import com.gtnewhorizons.modularui.api.drawable.Text;
|
||||
import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI;
|
||||
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
|
||||
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
|
||||
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
|
||||
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
|
||||
import com.gtnewhorizons.modularui.common.widget.TextWidget;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import emt.client.gui.EMT_UITextures;
|
||||
import emt.init.EMTBlocks;
|
||||
import emt.tile.DefinitelyNotAIC2Source;
|
||||
import emt.tile.TileEntityEMT;
|
||||
import emt.util.EMTTextHelper;
|
||||
import gregtech.api.enums.GT_Values;
|
||||
import gregtech.api.interfaces.tileentity.IBasicEnergyContainer;
|
||||
import gregtech.api.interfaces.tileentity.IEnergyConnected;
|
||||
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
|
||||
import gregtech.api.net.GT_Packet_Block_Event;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IWrenchable, IHasWorldObjectAndCoords,
|
||||
IEnergyConnected, IBasicEnergyContainer, ITileWithModularUI {
|
||||
|
||||
private static final byte NOTHING = 0;
|
||||
private static final byte ORDO = 1;
|
||||
@@ -111,8 +109,7 @@ public class TileEntitySolarBase extends TileEntityEMT
|
||||
|
||||
@Override
|
||||
public void updateEntity() {
|
||||
this.side = !this.worldObj.isRemote
|
||||
? FMLCommonHandler.instance().getEffectiveSide().isServer()
|
||||
this.side = !this.worldObj.isRemote ? FMLCommonHandler.instance().getEffectiveSide().isServer()
|
||||
: FMLCommonHandler.instance().getSide().isServer();
|
||||
if (!side) return;
|
||||
this.dead = false;
|
||||
@@ -164,9 +161,9 @@ public class TileEntitySolarBase extends TileEntityEMT
|
||||
case AQUA: {
|
||||
if (worldObj.isThundering()) return 6F;
|
||||
else if (worldObj.isRaining()) return 3F;
|
||||
else if (!worldObj.isThundering()
|
||||
&& !worldObj.isRaining()
|
||||
&& worldObj.getBlock(xCoord, yCoord + 1, zCoord).equals(Blocks.water)) return 2F;
|
||||
else if (!worldObj.isThundering() && !worldObj.isRaining()
|
||||
&& worldObj.getBlock(xCoord, yCoord + 1, zCoord).equals(Blocks.water))
|
||||
return 2F;
|
||||
else return 1F;
|
||||
}
|
||||
case IGNIS: {
|
||||
@@ -437,25 +434,25 @@ public class TileEntitySolarBase extends TileEntityEMT
|
||||
@Override
|
||||
public long getOutputAmperage() {
|
||||
return calculateMaxVoltAmp()[1];
|
||||
// long ret;
|
||||
// if (this.energySource.getSourceTier() <= 4) {
|
||||
// if (this.generating <= GT_Values.V[this.energySource.getSourceTier() - 2]) {
|
||||
// ret = 1L;
|
||||
// }
|
||||
// if (this.generating % GT_Values.V[this.energySource.getSourceTier() - 2] == 0.0D) {
|
||||
// ret = (long) (this.generating / GT_Values.V[this.energySource.getSourceTier() - 2]);
|
||||
// } else
|
||||
// ret = (long) (1L + (this.generating / GT_Values.V[this.energySource.getSourceTier() - 2]));
|
||||
// } else {
|
||||
// if (this.generating <= GT_Values.V[this.energySource.getSourceTier() - 1]) {
|
||||
// ret = 1L;
|
||||
// }
|
||||
// if (this.generating % GT_Values.V[this.energySource.getSourceTier()] == 0.0D) {
|
||||
// ret = (long) (this.generating / GT_Values.V[this.energySource.getSourceTier() - 1]);
|
||||
// } else
|
||||
// ret = (long) (1L + (this.generating / GT_Values.V[this.energySource.getSourceTier() - 1]));
|
||||
// }
|
||||
// return ret;
|
||||
// long ret;
|
||||
// if (this.energySource.getSourceTier() <= 4) {
|
||||
// if (this.generating <= GT_Values.V[this.energySource.getSourceTier() - 2]) {
|
||||
// ret = 1L;
|
||||
// }
|
||||
// if (this.generating % GT_Values.V[this.energySource.getSourceTier() - 2] == 0.0D) {
|
||||
// ret = (long) (this.generating / GT_Values.V[this.energySource.getSourceTier() - 2]);
|
||||
// } else
|
||||
// ret = (long) (1L + (this.generating / GT_Values.V[this.energySource.getSourceTier() - 2]));
|
||||
// } else {
|
||||
// if (this.generating <= GT_Values.V[this.energySource.getSourceTier() - 1]) {
|
||||
// ret = 1L;
|
||||
// }
|
||||
// if (this.generating % GT_Values.V[this.energySource.getSourceTier()] == 0.0D) {
|
||||
// ret = (long) (this.generating / GT_Values.V[this.energySource.getSourceTier() - 1]);
|
||||
// } else
|
||||
// ret = (long) (1L + (this.generating / GT_Values.V[this.energySource.getSourceTier() - 1]));
|
||||
// }
|
||||
// return ret;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -491,7 +488,8 @@ public class TileEntitySolarBase extends TileEntityEMT
|
||||
@Override
|
||||
public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) {
|
||||
return decreaseStoredEnergyUnits(
|
||||
aVoltage * aAmperage, this.energySource.getEnergyStored() > aVoltage * aAmperage);
|
||||
aVoltage * aAmperage,
|
||||
this.energySource.getEnergyStored() > aVoltage * aAmperage);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -892,33 +890,30 @@ public class TileEntitySolarBase extends TileEntityEMT
|
||||
ModularWindow.Builder builder = ModularWindow.builder(176, 107);
|
||||
builder.setBackground(ModularUITextures.VANILLA_BACKGROUND);
|
||||
|
||||
builder.widget(new TextWidget(
|
||||
new Text(getInventoryName()).color(0x64fc06).shadow())
|
||||
.setPos(9, 9))
|
||||
.widget(new ProgressBar()
|
||||
builder.widget(new TextWidget(new Text(getInventoryName()).color(0x64fc06).shadow()).setPos(9, 9)).widget(
|
||||
new ProgressBar()
|
||||
.setTexture(EMT_UITextures.PICTURE_GAUGE_EMPTY_25, EMT_UITextures.PICTURE_GAUGE_SOLAR, 25)
|
||||
.setProgress(() -> (float) storage / this.maxstorage)
|
||||
.setSynced(false, false)
|
||||
.setPos(9, 24)
|
||||
.setProgress(() -> (float) storage / this.maxstorage).setSynced(false, false).setPos(9, 24)
|
||||
.setSize(25, 11))
|
||||
.widget(new ProgressBar()
|
||||
.setTexture(EMT_UITextures.PICTURE_GAUGE_EMPTY_11, EMT_UITextures.PICTURE_SOLAR_INDICATOR, 11)
|
||||
.setProgress(() -> generating > 9 ? 1f : 0f)
|
||||
.setSynced(false, false)
|
||||
.setPos(9, 43)
|
||||
.setSize(11, 11))
|
||||
.widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("emt.Storage")
|
||||
+ EMTTextHelper.formatNumber(storage) + "/"
|
||||
+ EMTTextHelper.formatNumber(maxstorage) + "EU")
|
||||
.setSynced(false)
|
||||
.setDefaultColor(0)
|
||||
.setPos(36, 22))
|
||||
.widget(
|
||||
new ProgressBar()
|
||||
.setTexture(
|
||||
EMT_UITextures.PICTURE_GAUGE_EMPTY_11,
|
||||
EMT_UITextures.PICTURE_SOLAR_INDICATOR,
|
||||
11)
|
||||
.setProgress(() -> generating > 9 ? 1f : 0f).setSynced(false, false).setPos(9, 43)
|
||||
.setSize(11, 11))
|
||||
.widget(
|
||||
TextWidget.dynamicString(
|
||||
() -> StatCollector.translateToLocal("emt.Storage") + EMTTextHelper
|
||||
.formatNumber(storage) + "/" + EMTTextHelper.formatNumber(maxstorage) + "EU")
|
||||
.setSynced(false).setDefaultColor(0).setPos(36, 22))
|
||||
.widget(new FakeSyncWidget.LongSyncer(() -> storage, val -> storage = val))
|
||||
.widget(TextWidget.dynamicString(
|
||||
() -> StatCollector.translateToLocal("emt.Generating") + generating + " EU/t")
|
||||
.setSynced(false)
|
||||
.setDefaultColor(0)
|
||||
.setPos(36, 35))
|
||||
.widget(
|
||||
TextWidget
|
||||
.dynamicString(
|
||||
() -> StatCollector.translateToLocal("emt.Generating") + generating + " EU/t")
|
||||
.setSynced(false).setDefaultColor(0).setPos(36, 35))
|
||||
.widget(new FakeSyncWidget.DoubleSyncer(() -> generating, val -> generating = val));
|
||||
|
||||
return builder.build();
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
package emt.util;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
|
||||
@@ -11,11 +15,9 @@ import emt.network.PacketEMTKeys;
|
||||
import ic2.core.IC2;
|
||||
import ic2.core.audio.AudioSource;
|
||||
import ic2.core.audio.PositionSpec;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public class EMTClientEventHandler {
|
||||
|
||||
public AudioSource audio;
|
||||
public Item lastItem;
|
||||
|
||||
@@ -31,21 +33,18 @@ public class EMTClientEventHandler {
|
||||
if (e.side == Side.CLIENT) {
|
||||
|
||||
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
||||
Item curItem = player.inventory.getCurrentItem() == null
|
||||
? null
|
||||
Item curItem = player.inventory.getCurrentItem() == null ? null
|
||||
: player.inventory.getCurrentItem().getItem();
|
||||
|
||||
if (curItem == EMTItems.diamondChainsaw
|
||||
|| curItem == EMTItems.streamChainsaw
|
||||
if (curItem == EMTItems.diamondChainsaw || curItem == EMTItems.streamChainsaw
|
||||
|| curItem == EMTItems.thaumiumChainsaw) {
|
||||
if (audio == null)
|
||||
audio = IC2.audioManager.createSource(
|
||||
player,
|
||||
PositionSpec.Hand,
|
||||
"Tools/Chainsaw/ChainsawIdle.ogg",
|
||||
true,
|
||||
false,
|
||||
IC2.audioManager.getDefaultVolume());
|
||||
if (audio == null) audio = IC2.audioManager.createSource(
|
||||
player,
|
||||
PositionSpec.Hand,
|
||||
"Tools/Chainsaw/ChainsawIdle.ogg",
|
||||
true,
|
||||
false,
|
||||
IC2.audioManager.getDefaultVolume());
|
||||
if (audio != null) {
|
||||
audio.updatePosition();
|
||||
audio.play();
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
package emt.util;
|
||||
|
||||
import emt.gthandler.common.loader.EMT_GT_Loader;
|
||||
import gregtech.api.enums.GT_Values;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
import emt.gthandler.common.loader.EMT_GT_Loader;
|
||||
import gregtech.api.enums.GT_Values;
|
||||
|
||||
/**
|
||||
* TODO: Need to rewrite...
|
||||
**/
|
||||
@@ -159,50 +161,48 @@ public class EMTConfigHandler {
|
||||
config.addCustomCategoryComment(RANDOM, "Options that don't fit into the other categories.");
|
||||
|
||||
capesOn = config.get(
|
||||
RANDOM,
|
||||
"Enable capes",
|
||||
true,
|
||||
"This config option is to enable or disable capes for people who have them. "
|
||||
+ "Seriously, you shouldn't touch that unless you have another cape and "
|
||||
+ "it conflicts with it.")
|
||||
RANDOM,
|
||||
"Enable capes",
|
||||
true,
|
||||
"This config option is to enable or disable capes for people who have them. "
|
||||
+ "Seriously, you shouldn't touch that unless you have another cape and "
|
||||
+ "it conflicts with it.")
|
||||
.getBoolean(capesOn);
|
||||
toolsInBore = config.get(
|
||||
RANDOM,
|
||||
"Tools for Arcane Bore",
|
||||
false,
|
||||
"This will augment the durablilty of the tools, and will also decrease the EU cost to 1. "
|
||||
+ "The tools should have the same number of uses than before.")
|
||||
RANDOM,
|
||||
"Tools for Arcane Bore",
|
||||
false,
|
||||
"This will augment the durablilty of the tools, and will also decrease the EU cost to 1. "
|
||||
+ "The tools should have the same number of uses than before.")
|
||||
.getBoolean(toolsInBore);
|
||||
nightVisionOff = config.get(
|
||||
RANDOM,
|
||||
"Disable nightvision helmets",
|
||||
false,
|
||||
"This was added because of mods making you totally blind if using nightvision. For example, enable that when in the Deep Dark.")
|
||||
RANDOM,
|
||||
"Disable nightvision helmets",
|
||||
false,
|
||||
"This was added because of mods making you totally blind if using nightvision. For example, enable that when in the Deep Dark.")
|
||||
.getBoolean(nightVisionOff);
|
||||
enchanting = config.get(RANDOM, "Enable enchanting tools", false, "Warning: the enchantability is low.")
|
||||
.getBoolean(enchanting);
|
||||
smoke = config.get(
|
||||
RANDOM,
|
||||
"Disable smoke effect for boots",
|
||||
false,
|
||||
"This effect only appears when the player isn't on the ground")
|
||||
.getBoolean(smoke);
|
||||
oneRingSpawn = config.get(
|
||||
RANDOM, "Disable One Ring in dungeon chests", true, "There is a recipe to get this item.")
|
||||
RANDOM,
|
||||
"Disable smoke effect for boots",
|
||||
false,
|
||||
"This effect only appears when the player isn't on the ground").getBoolean(smoke);
|
||||
oneRingSpawn = config
|
||||
.get(RANDOM, "Disable One Ring in dungeon chests", true, "There is a recipe to get this item.")
|
||||
.getBoolean(oneRingSpawn);
|
||||
chanceTaintedMjolnir = config.get(
|
||||
RANDOM,
|
||||
"Tainted Mjolnir spawning change",
|
||||
25,
|
||||
"If you have a lot of mods adding dungeon loot, you should definetely increase this")
|
||||
.getInt();
|
||||
RANDOM,
|
||||
"Tainted Mjolnir spawning change",
|
||||
25,
|
||||
"If you have a lot of mods adding dungeon loot, you should definetely increase this").getInt();
|
||||
chanceOneRing = config.get(
|
||||
RANDOM,
|
||||
"One Ring spawning chance",
|
||||
15,
|
||||
"If you have a lot of mods adding dungeon loot, you should definetely increase this")
|
||||
.getInt();
|
||||
removeAmberAndCinnabarMacerating = config.get(
|
||||
RANDOM,
|
||||
"One Ring spawning chance",
|
||||
15,
|
||||
"If you have a lot of mods adding dungeon loot, you should definetely increase this").getInt();
|
||||
removeAmberAndCinnabarMacerating = config
|
||||
.get(
|
||||
RANDOM,
|
||||
"Clear Amber/Cinnabar Macerating",
|
||||
true,
|
||||
@@ -210,14 +210,15 @@ public class EMTConfigHandler {
|
||||
.getBoolean(removeAmberAndCinnabarMacerating);
|
||||
impactOfRain = config.get(RANDOM, "Impact of rain", true, "The impact of rain on all wings")
|
||||
.getBoolean(impactOfRain);
|
||||
etherealMaceratorWhiteList.addAll(Arrays.asList(config.get(
|
||||
RANDOM,
|
||||
"White List for Ethereal Processor",
|
||||
new String[] {"ore", "cluster"},
|
||||
"The allowed ore dictionary prefix for Ethereal Processor.")
|
||||
.getStringList()));
|
||||
etherealMaceratorWhiteList.addAll(
|
||||
Arrays.asList(
|
||||
config.get(
|
||||
RANDOM,
|
||||
"White List for Ethereal Processor",
|
||||
new String[] { "ore", "cluster" },
|
||||
"The allowed ore dictionary prefix for Ethereal Processor.").getStringList()));
|
||||
|
||||
// DEFAULTS - Aer - 15,000 Aqua - 5,000 Ignis - 20,000 Ordo - 16,000 Perditio - 10,000 Terra - 2,000
|
||||
// DEFAULTS - Aer - 15,000 Aqua - 5,000 Ignis - 20,000 Ordo - 16,000 Perditio - 10,000 Terra - 2,000
|
||||
airOutput = config.get(OUTPUTS, "Aer Output", 15000).getDouble(airOutput);
|
||||
waterOutput = config.get(OUTPUTS, "Aqua Output", 5000).getDouble(waterOutput);
|
||||
fireOutput = config.get(OUTPUTS, "Ignis Output", 20000).getDouble(fireOutput);
|
||||
@@ -227,13 +228,14 @@ public class EMTConfigHandler {
|
||||
outputCap = config.get(OUTPUTS, "Output Cap", -1).getDouble(outputCap);
|
||||
|
||||
EssentiaGeneratorStorage = config.get(
|
||||
VALUES,
|
||||
"Essentia Generator Storage",
|
||||
1000000,
|
||||
"This is the number you have to modify if you want to change the size of the "
|
||||
+ "internal buffer of the Essentia Generator")
|
||||
VALUES,
|
||||
"Essentia Generator Storage",
|
||||
1000000,
|
||||
"This is the number you have to modify if you want to change the size of the "
|
||||
+ "internal buffer of the Essentia Generator")
|
||||
.getDouble(EssentiaGeneratorStorage);
|
||||
EMT_GT_Loader.aIDoffset = config.get(
|
||||
EMT_GT_Loader.aIDoffset = config
|
||||
.get(
|
||||
VALUES,
|
||||
"aID offset for Gregetch Machinery",
|
||||
(13000 - GT_Values.VN.length - 1),
|
||||
@@ -241,7 +243,8 @@ public class EMTConfigHandler {
|
||||
+ " IDs, do not change if you dont know what you are doing!")
|
||||
.getInt(13000 - GT_Values.VN.length - 1);
|
||||
|
||||
wandChargerConsumption = config.get(
|
||||
wandChargerConsumption = config
|
||||
.get(
|
||||
VALUES,
|
||||
"Wand Charging Station Consumption",
|
||||
50000,
|
||||
@@ -249,121 +252,118 @@ public class EMTConfigHandler {
|
||||
+ "Station use more or less EU to charge 1 unit of Vis on your wand.")
|
||||
.getDouble(wandChargerConsumption);
|
||||
compressedSolarOutput = config.get(
|
||||
VALUES,
|
||||
"Compressed Solar Panel Output",
|
||||
10,
|
||||
"This is the number you have to modify if you want to make the Compressed Solar Panel yield "
|
||||
+ "more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
VALUES,
|
||||
"Compressed Solar Panel Output",
|
||||
10,
|
||||
"This is the number you have to modify if you want to make the Compressed Solar Panel yield "
|
||||
+ "more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
.getDouble(compressedSolarOutput);
|
||||
doubleCompressedSolarOutput = config.get(
|
||||
VALUES,
|
||||
"Double Compressed Solar Panel Output",
|
||||
100,
|
||||
"This is the number you have to modify if you want to make the Double Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
VALUES,
|
||||
"Double Compressed Solar Panel Output",
|
||||
100,
|
||||
"This is the number you have to modify if you want to make the Double Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
.getDouble(doubleCompressedSolarOutput);
|
||||
tripleCompressedSolarOutput = config.get(
|
||||
VALUES,
|
||||
"Triple Compressed Solar Panel Output",
|
||||
1000,
|
||||
"This is the number you have to modify if you want to make the Triple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
VALUES,
|
||||
"Triple Compressed Solar Panel Output",
|
||||
1000,
|
||||
"This is the number you have to modify if you want to make the Triple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
.getDouble(tripleCompressedSolarOutput);
|
||||
quadrupleCompressedSolarOutput = config.get(
|
||||
VALUES,
|
||||
"Quadruple Compressed Solar Panel Output",
|
||||
10000,
|
||||
"This is the number you have to modify if you want to make the Quadruple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
VALUES,
|
||||
"Quadruple Compressed Solar Panel Output",
|
||||
10000,
|
||||
"This is the number you have to modify if you want to make the Quadruple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
.getDouble(quadrupleCompressedSolarOutput);
|
||||
quintupleCompressedSolarOutput = config.get(
|
||||
VALUES,
|
||||
"Quintouple Compressed Solar Panel Output",
|
||||
100000,
|
||||
"This is the number you have to modify if you want to make the Quintouple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
VALUES,
|
||||
"Quintouple Compressed Solar Panel Output",
|
||||
100000,
|
||||
"This is the number you have to modify if you want to make the Quintouple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
.getDouble(quintupleCompressedSolarOutput);
|
||||
sextupleCompressedSolarOutput = config.get(
|
||||
VALUES,
|
||||
"Sextouple Compressed Solar Panel Output",
|
||||
1000000,
|
||||
"This is the number you have to modify if you want to make the Sextouple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
VALUES,
|
||||
"Sextouple Compressed Solar Panel Output",
|
||||
1000000,
|
||||
"This is the number you have to modify if you want to make the Sextouple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
.getDouble(sextupleCompressedSolarOutput);
|
||||
septupleCompressedSolarOutput = config.get(
|
||||
VALUES,
|
||||
"Septouple Compressed Solar Panel Output",
|
||||
10000000,
|
||||
"This is the number you have to modify if you want to make the Septouple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
VALUES,
|
||||
"Septouple Compressed Solar Panel Output",
|
||||
10000000,
|
||||
"This is the number you have to modify if you want to make the Septouple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
.getDouble(septupleCompressedSolarOutput);
|
||||
octupleCompressedSolarOutput = config.get(
|
||||
VALUES,
|
||||
"Octtouple Compressed Solar Panel Output",
|
||||
100000000,
|
||||
"This is the number you have to modify if you want to make the Octtouple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
VALUES,
|
||||
"Octtouple Compressed Solar Panel Output",
|
||||
100000000,
|
||||
"This is the number you have to modify if you want to make the Octtouple Compressed Solar Panel "
|
||||
+ "yield more or less EU per tick. Really, you shouldn't touch that, "
|
||||
+ "since it's pretty balanced as it is.")
|
||||
.getDouble(octupleCompressedSolarOutput);
|
||||
|
||||
nanoBootsSpeed = config.get(
|
||||
VALUES, "Nano Boots of the Traveller Speed", 0.25, "Watch out, that goes up REALLY quickly.")
|
||||
nanoBootsSpeed = config
|
||||
.get(VALUES, "Nano Boots of the Traveller Speed", 0.25, "Watch out, that goes up REALLY quickly.")
|
||||
.getDouble(nanoBootsSpeed);
|
||||
quantumBootsSpeed = config.get(
|
||||
VALUES, "Quantum Boots of the Traveller Speed", 0.5, "Watch out, that goes up REALLY quickly.")
|
||||
quantumBootsSpeed = config
|
||||
.get(VALUES, "Quantum Boots of the Traveller Speed", 0.5, "Watch out, that goes up REALLY quickly.")
|
||||
.getDouble(quantumBootsSpeed);
|
||||
nanoBootsJump = config.get(
|
||||
VALUES, "Nano Boots of the Traveller jump", 0.6, "Watch out, that goes up REALLY quickly.")
|
||||
nanoBootsJump = config
|
||||
.get(VALUES, "Nano Boots of the Traveller jump", 0.6, "Watch out, that goes up REALLY quickly.")
|
||||
.getDouble(nanoBootsJump);
|
||||
quantumBootsJump = config.get(
|
||||
VALUES, "Quantum Boots of the Traveller jump", 0.9, "Watch out, that goes up REALLY quickly.")
|
||||
quantumBootsJump = config
|
||||
.get(VALUES, "Quantum Boots of the Traveller jump", 0.9, "Watch out, that goes up REALLY quickly.")
|
||||
.getDouble(nanoBootsJump);
|
||||
etherealProcessorBaseSpeed = config.get(
|
||||
VALUES, "Etheral Processor speed", 400, "Default is 400, the double of a regular furnace")
|
||||
etherealProcessorBaseSpeed = config
|
||||
.get(VALUES, "Etheral Processor speed", 400, "Default is 400, the double of a regular furnace")
|
||||
.getInt();
|
||||
etherealProcessorBonus = config.get(
|
||||
VALUES,
|
||||
"Ethereal Processor Bonus",
|
||||
10,
|
||||
"This number is the chance of getting a Thaumium Ingot as a bonus when "
|
||||
+ "processing an item in the machine. It is 1 out of the number you will enter. "
|
||||
+ "The default is 1/10 chance.")
|
||||
.getInt();
|
||||
chargeFocusProduction = config.get(VALUES, "Wand Focus: Charge production", 64, "Default is 64")
|
||||
.getInt();
|
||||
armorBaubleProduction = config.get(VALUES, "Armor Charging Ring production", 32, "Default is 32")
|
||||
VALUES,
|
||||
"Ethereal Processor Bonus",
|
||||
10,
|
||||
"This number is the chance of getting a Thaumium Ingot as a bonus when "
|
||||
+ "processing an item in the machine. It is 1 out of the number you will enter. "
|
||||
+ "The default is 1/10 chance.")
|
||||
.getInt();
|
||||
chargeFocusProduction = config.get(VALUES, "Wand Focus: Charge production", 64, "Default is 64").getInt();
|
||||
armorBaubleProduction = config.get(VALUES, "Armor Charging Ring production", 32, "Default is 32").getInt();
|
||||
inventoryBaubleProdution = config.get(VALUES, "Inventory Charging Ring production", 32, "Default is 32")
|
||||
.getInt();
|
||||
wandChargeFocusCost = config.get(VALUES, "Wand Focus: Wand Charging Cost", 40000, "Default is 40000")
|
||||
.getInt();
|
||||
wandChargeFocusCost = config.get(VALUES, "Wand Focus: Wand Charging Cost", 40000, "Default is 40000").getInt();
|
||||
|
||||
nanoBootsMinDrop = config.get(
|
||||
VALUES,
|
||||
"Nano Boots of the Traveller minimum drop",
|
||||
6.0,
|
||||
"The distance allowed to fall without any damage")
|
||||
.getDouble(nanoBootsMinDrop);
|
||||
nanoBootsMaxDrop = config.get(
|
||||
VALUES,
|
||||
"Nano Boots of the Traveller minimum drop",
|
||||
6.0,
|
||||
"The distance allowed to fall without any damage").getDouble(nanoBootsMinDrop);
|
||||
nanoBootsMaxDrop = config
|
||||
.get(
|
||||
VALUES,
|
||||
"Nano Boots of the Traveller maximum healthy drop",
|
||||
35.0,
|
||||
"Energy amount drained will tripled if player drops more than this amount of blocks")
|
||||
.getDouble(nanoBootsMaxDrop);
|
||||
quantumBootsMinDrop = config.get(
|
||||
VALUES,
|
||||
"Quantum Boots of the Traveller minimum drop",
|
||||
10.0,
|
||||
"The distance allowed to fall without any damage")
|
||||
.getDouble(quantumBootsMinDrop);
|
||||
quantumBootsMaxDrop = config.get(
|
||||
VALUES,
|
||||
"Quantum Boots of the Traveller minimum drop",
|
||||
10.0,
|
||||
"The distance allowed to fall without any damage").getDouble(quantumBootsMinDrop);
|
||||
quantumBootsMaxDrop = config
|
||||
.get(
|
||||
VALUES,
|
||||
"Quantum Boots of the Traveller maximum healthy drop",
|
||||
100.0,
|
||||
@@ -371,56 +371,50 @@ public class EMTConfigHandler {
|
||||
.getDouble(quantumBootsMaxDrop);
|
||||
|
||||
thaumiumDrillResearch = config.get(RESEARCH, "Thaumium Drill", false).getBoolean(thaumiumDrillResearch);
|
||||
thaumiumChainsawResearch =
|
||||
config.get(RESEARCH, "Thaumium Chainsaw", false).getBoolean(thaumiumChainsawResearch);
|
||||
thaumiumChainsawResearch = config.get(RESEARCH, "Thaumium Chainsaw", false)
|
||||
.getBoolean(thaumiumChainsawResearch);
|
||||
thaumiumDrillResearch = config.get(RESEARCH, "Thaumium Omnitool", false).getBoolean(thaumiumOmnitoolResearch);
|
||||
rockbreakerDrillResearch =
|
||||
config.get(RESEARCH, "Drill of the Rockbreaker", false).getBoolean(rockbreakerDrillResearch);
|
||||
streamChainsawResearch =
|
||||
config.get(RESEARCH, "Chainsaw of the Stream", false).getBoolean(streamChainsawResearch);
|
||||
electricGooglesResearch =
|
||||
config.get(RESEARCH, "Electric Googles of Revealing", false).getBoolean(electricGooglesResearch);
|
||||
nanoGooglesResearch =
|
||||
config.get(RESEARCH, "Nanosuit Googles of Revealing", false).getBoolean(nanoGooglesResearch);
|
||||
quantumGooglesResearch =
|
||||
config.get(RESEARCH, "Quantum Googles of Revealing", false).getBoolean(quantumGooglesResearch);
|
||||
rockbreakerDrillResearch = config.get(RESEARCH, "Drill of the Rockbreaker", false)
|
||||
.getBoolean(rockbreakerDrillResearch);
|
||||
streamChainsawResearch = config.get(RESEARCH, "Chainsaw of the Stream", false)
|
||||
.getBoolean(streamChainsawResearch);
|
||||
electricGooglesResearch = config.get(RESEARCH, "Electric Googles of Revealing", false)
|
||||
.getBoolean(electricGooglesResearch);
|
||||
nanoGooglesResearch = config.get(RESEARCH, "Nanosuit Googles of Revealing", false)
|
||||
.getBoolean(nanoGooglesResearch);
|
||||
quantumGooglesResearch = config.get(RESEARCH, "Quantum Googles of Revealing", false)
|
||||
.getBoolean(quantumGooglesResearch);
|
||||
ironOmnitoolResearch = config.get(RESEARCH, "Omnitool", false).getBoolean(ironOmnitoolResearch);
|
||||
diamondOmnitoolResearch =
|
||||
config.get(RESEARCH, "Diamond Omnitool", false).getBoolean(diamondOmnitoolResearch);
|
||||
diamondOmnitoolResearch = config.get(RESEARCH, "Diamond Omnitool", false).getBoolean(diamondOmnitoolResearch);
|
||||
explosionFocusResearch = config.get(RESEARCH, "Explosion Focus", false).getBoolean(explosionFocusResearch);
|
||||
christmasFocusResearch = config.get(RESEARCH, "Kris-tmas Focus", false).getBoolean(christmasFocusResearch);
|
||||
energyBallFocusResearch =
|
||||
config.get(RESEARCH, "EnergyBall Focus", false).getBoolean(christmasFocusResearch);
|
||||
energyBallFocusResearch = config.get(RESEARCH, "EnergyBall Focus", false).getBoolean(christmasFocusResearch);
|
||||
shieldFocusResearch = config.get(RESEARCH, "Shield Focus", false).getBoolean(shieldFocusResearch);
|
||||
shieldBlockResearch = config.get(RESEARCH, "Shield Block", false).getBoolean(shieldBlockResearch);
|
||||
potentiaGeneratorResearch =
|
||||
config.get(RESEARCH, "Potentia Generator", false).getBoolean(potentiaGeneratorResearch);
|
||||
potentiaGeneratorResearch = config.get(RESEARCH, "Potentia Generator", false)
|
||||
.getBoolean(potentiaGeneratorResearch);
|
||||
ignisGeneratorResearch = config.get(RESEARCH, "Ignis Generator", false).getBoolean(ignisGeneratorResearch);
|
||||
auramGeneratorResearch = config.get(RESEARCH, "Auram Generator", false).getBoolean(auramGeneratorResearch);
|
||||
arborGeneratorResearch = config.get(RESEARCH, "Arbor Generator", false).getBoolean(arborGeneratorResearch);
|
||||
lucrumGeneratorResearch =
|
||||
config.get(RESEARCH, "Lucrum Generator", false).getBoolean(lucrumGeneratorResearch);
|
||||
wandChargingSationResearch =
|
||||
config.get(RESEARCH, "Industrial Wand Charging Station", false).getBoolean(wandChargingSationResearch);
|
||||
tinyUraniumResearch =
|
||||
config.get(RESEARCH, "Tiny Piles of Uranium", false).getBoolean(tinyUraniumResearch);
|
||||
lucrumGeneratorResearch = config.get(RESEARCH, "Lucrum Generator", false).getBoolean(lucrumGeneratorResearch);
|
||||
wandChargingSationResearch = config.get(RESEARCH, "Industrial Wand Charging Station", false)
|
||||
.getBoolean(wandChargingSationResearch);
|
||||
tinyUraniumResearch = config.get(RESEARCH, "Tiny Piles of Uranium", false).getBoolean(tinyUraniumResearch);
|
||||
thorHammerResearch = config.get(RESEARCH, "Mjolnir", false).getBoolean(thorHammerResearch);
|
||||
superchargedThorHammerResearch =
|
||||
config.get(RESEARCH, "Supercharged Mjolnir", false).getBoolean(superchargedThorHammerResearch);
|
||||
compressedSolarsResearch =
|
||||
config.get(RESEARCH, "Compressed Solars", false).getBoolean(compressedSolarsResearch);
|
||||
solarHelmetResearch =
|
||||
config.get(RESEARCH, "Solar Helmet of Revealing", false).getBoolean(solarHelmetResearch);
|
||||
electricBootsResearch =
|
||||
config.get(RESEARCH, "Electric Boots of the Traveller", false).getBoolean(electricBootsResearch);
|
||||
nanoBootsResearch =
|
||||
config.get(RESEARCH, "Nano Boots of the Traveller", false).getBoolean(nanoBootsResearch);
|
||||
quantumBootsResearch =
|
||||
config.get(RESEARCH, "Quantum Boots of the Traveller", false).getBoolean(quantumBootsResearch);
|
||||
electricScribingToolsResearch =
|
||||
config.get(RESEARCH, "Electric Scribing Tools", false).getBoolean(electricScribingToolsResearch);
|
||||
etherealProcessorResearch =
|
||||
config.get(RESEARCH, "Ethereal Processor", false).getBoolean(etherealProcessorResearch);
|
||||
superchargedThorHammerResearch = config.get(RESEARCH, "Supercharged Mjolnir", false)
|
||||
.getBoolean(superchargedThorHammerResearch);
|
||||
compressedSolarsResearch = config.get(RESEARCH, "Compressed Solars", false)
|
||||
.getBoolean(compressedSolarsResearch);
|
||||
solarHelmetResearch = config.get(RESEARCH, "Solar Helmet of Revealing", false).getBoolean(solarHelmetResearch);
|
||||
electricBootsResearch = config.get(RESEARCH, "Electric Boots of the Traveller", false)
|
||||
.getBoolean(electricBootsResearch);
|
||||
nanoBootsResearch = config.get(RESEARCH, "Nano Boots of the Traveller", false).getBoolean(nanoBootsResearch);
|
||||
quantumBootsResearch = config.get(RESEARCH, "Quantum Boots of the Traveller", false)
|
||||
.getBoolean(quantumBootsResearch);
|
||||
electricScribingToolsResearch = config.get(RESEARCH, "Electric Scribing Tools", false)
|
||||
.getBoolean(electricScribingToolsResearch);
|
||||
etherealProcessorResearch = config.get(RESEARCH, "Ethereal Processor", false)
|
||||
.getBoolean(etherealProcessorResearch);
|
||||
waterSolarsResearch = config.get(RESEARCH, "Water Solar Panels", false).getBoolean(waterSolarsResearch);
|
||||
darkSolarsResearch = config.get(RESEARCH, "Entropy Solar Panels", false).getBoolean(darkSolarsResearch);
|
||||
orderSolarsResearch = config.get(RESEARCH, "Order Solar Panels", false).getBoolean(orderSolarsResearch);
|
||||
@@ -430,21 +424,20 @@ public class EMTConfigHandler {
|
||||
saxumGenResearch = config.get(RESEARCH, "Saxum Generator", false).getBoolean(saxumGenResearch);
|
||||
uuMInfusionResearch = config.get(RESEARCH, "UU-Mater Infusion", false).getBoolean(uuMInfusionResearch);
|
||||
portableNodeResarch = config.get(RESEARCH, "Portable Node", false).getBoolean(portableNodeResarch);
|
||||
electricHoeGrowthResearch =
|
||||
config.get(RESEARCH, "Electric Hoe of Growth", false).getBoolean(electricHoeGrowthResearch);
|
||||
chargeFocusResearch =
|
||||
config.get(RESEARCH, "Wand Focus: Charging", false).getBoolean(chargeFocusResearch);
|
||||
wandChargeFocusResearch =
|
||||
config.get(RESEARCH, "Wand Focus: Wand Charging", false).getBoolean(wandChargeFocusResearch);
|
||||
inventoryChargingRing =
|
||||
config.get(RESEARCH, "Inventory Charging Ring", false).getBoolean(inventoryChargingRing);
|
||||
electricHoeGrowthResearch = config.get(RESEARCH, "Electric Hoe of Growth", false)
|
||||
.getBoolean(electricHoeGrowthResearch);
|
||||
chargeFocusResearch = config.get(RESEARCH, "Wand Focus: Charging", false).getBoolean(chargeFocusResearch);
|
||||
wandChargeFocusResearch = config.get(RESEARCH, "Wand Focus: Wand Charging", false)
|
||||
.getBoolean(wandChargeFocusResearch);
|
||||
inventoryChargingRing = config.get(RESEARCH, "Inventory Charging Ring", false)
|
||||
.getBoolean(inventoryChargingRing);
|
||||
armorChargingRing = config.get(RESEARCH, "Armor Charging Ring", false).getBoolean(armorChargingRing);
|
||||
thaumiumWingResearch =
|
||||
config.get(RESEARCH, "Thaumium Reinforced Wings", false).getBoolean(thaumiumWingResearch);
|
||||
thaumiumWingResearch = config.get(RESEARCH, "Thaumium Reinforced Wings", false)
|
||||
.getBoolean(thaumiumWingResearch);
|
||||
nanoWingResearch = config.get(RESEARCH, "Nanosuit Wings", false).getBoolean(nanoWingResearch);
|
||||
quantumWingsResearch = config.get(RESEARCH, "Quantum Wings", false).getBoolean(quantumWingsResearch);
|
||||
infusedQuantumChestplate =
|
||||
config.get(RESEARCH, "Infused Quantum Chestplate", false).getBoolean(infusedQuantumChestplate);
|
||||
infusedQuantumChestplate = config.get(RESEARCH, "Infused Quantum Chestplate", false)
|
||||
.getBoolean(infusedQuantumChestplate);
|
||||
aerGeneratorResearch = config.get(RESEARCH, "Aer Generator", false).getBoolean(aerGeneratorResearch);
|
||||
|
||||
if (config.hasChanged()) {
|
||||
|
||||
@@ -5,178 +5,99 @@ import thaumcraft.api.aspects.AspectList;
|
||||
|
||||
public class EMTCraftingAspects {
|
||||
|
||||
public static AspectList thaumiumDrillCrafting =
|
||||
new AspectList().add(Aspect.TOOL, 16).add(Aspect.MINE, 16).add(Aspect.ENERGY, 16);
|
||||
public static AspectList thaumiumChainsawCrafting =
|
||||
new AspectList().add(Aspect.TOOL, 16).add(Aspect.WEAPON, 16).add(Aspect.ENERGY, 16);
|
||||
public static AspectList thaumicQuantumHelmetCrafting =
|
||||
new AspectList().add(Aspect.ARMOR, 25).add(Aspect.SENSES, 25).add(Aspect.ENERGY, 25);
|
||||
public static AspectList diamondOmnitoolCrafting =
|
||||
new AspectList().add(Aspect.ORDER, 15).add(Aspect.AIR, 15);
|
||||
public static AspectList thaumiumOmnitoolCrafting = new AspectList()
|
||||
.add(Aspect.TOOL, 25)
|
||||
.add(Aspect.MINE, 25)
|
||||
.add(Aspect.ENERGY, 25)
|
||||
.add(Aspect.WEAPON, 25);
|
||||
public static AspectList thaumicNanoHelmetCrafting =
|
||||
new AspectList().add(Aspect.ARMOR, 16).add(Aspect.SENSES, 16).add(Aspect.ENERGY, 16);
|
||||
public static AspectList laserFocusCrafting = new AspectList()
|
||||
.add(Aspect.FIRE, 30)
|
||||
.add(Aspect.MOTION, 16)
|
||||
.add(Aspect.WEAPON, 30)
|
||||
.add(Aspect.DEATH, 16);
|
||||
public static AspectList christmasFocusCrafting =
|
||||
new AspectList().add(Aspect.ORDER, 20).add(Aspect.AIR, 20);
|
||||
public static AspectList shieldFocusCrafting = new AspectList()
|
||||
.add(Aspect.AIR, 16)
|
||||
.add(Aspect.ARMOR, 20)
|
||||
.add(Aspect.CRYSTAL, 16)
|
||||
.add(Aspect.TRAP, 20)
|
||||
.add(Aspect.LIFE, 16);
|
||||
public static AspectList electricGogglesCrafting =
|
||||
new AspectList().add(Aspect.AIR, 20).add(Aspect.ORDER, 20).add(Aspect.WATER, 20);
|
||||
public static AspectList potentiaGeneratorCrafting = new AspectList()
|
||||
.add(Aspect.ENERGY, 32)
|
||||
.add(Aspect.MAGIC, 32)
|
||||
.add(Aspect.METAL, 32)
|
||||
.add(Aspect.EXCHANGE, 32);
|
||||
public static AspectList ignisGeneratorCrafting =
|
||||
new AspectList().add(Aspect.FIRE, 16).add(Aspect.EXCHANGE, 8);
|
||||
public static AspectList auramGeneratorCrafting =
|
||||
new AspectList().add(Aspect.AURA, 16).add(Aspect.EXCHANGE, 8);
|
||||
public static AspectList arborGeneratorCrafting =
|
||||
new AspectList().add(Aspect.TREE, 16).add(Aspect.EXCHANGE, 8);
|
||||
public static AspectList streamChaisnawCrafting = new AspectList()
|
||||
.add(Aspect.ENERGY, 48)
|
||||
.add(Aspect.TREE, 48)
|
||||
.add(Aspect.TOOL, 32)
|
||||
.add(Aspect.WATER, 32);
|
||||
public static AspectList rockbreakerDrillCrafting =
|
||||
new AspectList().add(Aspect.TOOL, 32).add(Aspect.ENERGY, 48).add(Aspect.MINE, 32);
|
||||
public static AspectList shieldBlockCrafting =
|
||||
new AspectList().add(Aspect.ORDER, 1).add(Aspect.ENTROPY, 1);
|
||||
public static AspectList tinyUraniumCrafting = new AspectList()
|
||||
.add(Aspect.FIRE, 1)
|
||||
.add(Aspect.WATER, 1)
|
||||
.add(Aspect.AIR, 1)
|
||||
.add(Aspect.EARTH, 1)
|
||||
.add(Aspect.ORDER, 1)
|
||||
.add(Aspect.ENTROPY, 1);
|
||||
public static AspectList thorHammerCrafting =
|
||||
new AspectList().add(Aspect.WEAPON, 48).add(Aspect.WEATHER, 48).add(Aspect.ELDRITCH, 32);
|
||||
public static AspectList superchargedThorHammerCrafting =
|
||||
new AspectList().add(Aspect.WEAPON, 48).add(Aspect.ENERGY, 64).add(Aspect.BEAST, 32);
|
||||
public static AspectList wandCharger = new AspectList()
|
||||
.add(Aspect.ENERGY, 48)
|
||||
.add(Aspect.CRAFT, 48)
|
||||
.add(Aspect.EXCHANGE, 48)
|
||||
.add(Aspect.GREED, 64);
|
||||
public static AspectList compressedSolars = new AspectList()
|
||||
.add(Aspect.FIRE, 8)
|
||||
.add(Aspect.WATER, 8)
|
||||
.add(Aspect.AIR, 8)
|
||||
.add(Aspect.EARTH, 8)
|
||||
.add(Aspect.ORDER, 8)
|
||||
.add(Aspect.ENTROPY, 8);
|
||||
public static AspectList solarHelmetRevealing =
|
||||
new AspectList().add(Aspect.ENERGY, 32).add(Aspect.AIR, 32).add(Aspect.LIGHT, 25);
|
||||
public static AspectList electricBootsTravel =
|
||||
new AspectList().add(Aspect.ENERGY, 16).add(Aspect.ARMOR, 32).add(Aspect.MOTION, 32);
|
||||
public static AspectList nanoBootsTravel =
|
||||
new AspectList().add(Aspect.ENERGY, 25).add(Aspect.ARMOR, 32).add(Aspect.MOTION, 48);
|
||||
public static AspectList quantumBootsTravel =
|
||||
new AspectList().add(Aspect.ENERGY, 32).add(Aspect.ARMOR, 32).add(Aspect.MOTION, 64);
|
||||
public static AspectList electricScribingTools =
|
||||
new AspectList().add(Aspect.AIR, 16).add(Aspect.ORDER, 16).add(Aspect.ENTROPY, 16);
|
||||
public static AspectList etherealProcessor =
|
||||
new AspectList().add(Aspect.MECHANISM, 16).add(Aspect.MAGIC, 16).add(Aspect.CRAFT, 16);
|
||||
public static AspectList waterSolars =
|
||||
new AspectList().add(Aspect.WATER, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList darkSolars =
|
||||
new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList orderSolars =
|
||||
new AspectList().add(Aspect.ORDER, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList fireSolars =
|
||||
new AspectList().add(Aspect.FIRE, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList airSolars =
|
||||
new AspectList().add(Aspect.AIR, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList earthSolars =
|
||||
new AspectList().add(Aspect.EARTH, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList uuMatterInfusions = new AspectList()
|
||||
.add(Aspect.FIRE, 32)
|
||||
.add(Aspect.WATER, 32)
|
||||
.add(Aspect.AIR, 32)
|
||||
.add(Aspect.EARTH, 32)
|
||||
.add(Aspect.ORDER, 32)
|
||||
.add(Aspect.ENTROPY, 32);
|
||||
public static AspectList lesserUUMInfusions = new AspectList()
|
||||
.add(Aspect.FIRE, 16)
|
||||
.add(Aspect.WATER, 16)
|
||||
.add(Aspect.AIR, 16)
|
||||
.add(Aspect.EARTH, 16)
|
||||
.add(Aspect.ORDER, 16)
|
||||
public static AspectList thaumiumDrillCrafting = new AspectList().add(Aspect.TOOL, 16).add(Aspect.MINE, 16)
|
||||
.add(Aspect.ENERGY, 16);
|
||||
public static AspectList thaumiumChainsawCrafting = new AspectList().add(Aspect.TOOL, 16).add(Aspect.WEAPON, 16)
|
||||
.add(Aspect.ENERGY, 16);
|
||||
public static AspectList thaumicQuantumHelmetCrafting = new AspectList().add(Aspect.ARMOR, 25)
|
||||
.add(Aspect.SENSES, 25).add(Aspect.ENERGY, 25);
|
||||
public static AspectList diamondOmnitoolCrafting = new AspectList().add(Aspect.ORDER, 15).add(Aspect.AIR, 15);
|
||||
public static AspectList thaumiumOmnitoolCrafting = new AspectList().add(Aspect.TOOL, 25).add(Aspect.MINE, 25)
|
||||
.add(Aspect.ENERGY, 25).add(Aspect.WEAPON, 25);
|
||||
public static AspectList thaumicNanoHelmetCrafting = new AspectList().add(Aspect.ARMOR, 16).add(Aspect.SENSES, 16)
|
||||
.add(Aspect.ENERGY, 16);
|
||||
public static AspectList laserFocusCrafting = new AspectList().add(Aspect.FIRE, 30).add(Aspect.MOTION, 16)
|
||||
.add(Aspect.WEAPON, 30).add(Aspect.DEATH, 16);
|
||||
public static AspectList christmasFocusCrafting = new AspectList().add(Aspect.ORDER, 20).add(Aspect.AIR, 20);
|
||||
public static AspectList shieldFocusCrafting = new AspectList().add(Aspect.AIR, 16).add(Aspect.ARMOR, 20)
|
||||
.add(Aspect.CRYSTAL, 16).add(Aspect.TRAP, 20).add(Aspect.LIFE, 16);
|
||||
public static AspectList electricGogglesCrafting = new AspectList().add(Aspect.AIR, 20).add(Aspect.ORDER, 20)
|
||||
.add(Aspect.WATER, 20);
|
||||
public static AspectList potentiaGeneratorCrafting = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.MAGIC, 32)
|
||||
.add(Aspect.METAL, 32).add(Aspect.EXCHANGE, 32);
|
||||
public static AspectList ignisGeneratorCrafting = new AspectList().add(Aspect.FIRE, 16).add(Aspect.EXCHANGE, 8);
|
||||
public static AspectList auramGeneratorCrafting = new AspectList().add(Aspect.AURA, 16).add(Aspect.EXCHANGE, 8);
|
||||
public static AspectList arborGeneratorCrafting = new AspectList().add(Aspect.TREE, 16).add(Aspect.EXCHANGE, 8);
|
||||
public static AspectList streamChaisnawCrafting = new AspectList().add(Aspect.ENERGY, 48).add(Aspect.TREE, 48)
|
||||
.add(Aspect.TOOL, 32).add(Aspect.WATER, 32);
|
||||
public static AspectList rockbreakerDrillCrafting = new AspectList().add(Aspect.TOOL, 32).add(Aspect.ENERGY, 48)
|
||||
.add(Aspect.MINE, 32);
|
||||
public static AspectList shieldBlockCrafting = new AspectList().add(Aspect.ORDER, 1).add(Aspect.ENTROPY, 1);
|
||||
public static AspectList tinyUraniumCrafting = new AspectList().add(Aspect.FIRE, 1).add(Aspect.WATER, 1)
|
||||
.add(Aspect.AIR, 1).add(Aspect.EARTH, 1).add(Aspect.ORDER, 1).add(Aspect.ENTROPY, 1);
|
||||
public static AspectList thorHammerCrafting = new AspectList().add(Aspect.WEAPON, 48).add(Aspect.WEATHER, 48)
|
||||
.add(Aspect.ELDRITCH, 32);
|
||||
public static AspectList superchargedThorHammerCrafting = new AspectList().add(Aspect.WEAPON, 48)
|
||||
.add(Aspect.ENERGY, 64).add(Aspect.BEAST, 32);
|
||||
public static AspectList wandCharger = new AspectList().add(Aspect.ENERGY, 48).add(Aspect.CRAFT, 48)
|
||||
.add(Aspect.EXCHANGE, 48).add(Aspect.GREED, 64);
|
||||
public static AspectList compressedSolars = new AspectList().add(Aspect.FIRE, 8).add(Aspect.WATER, 8)
|
||||
.add(Aspect.AIR, 8).add(Aspect.EARTH, 8).add(Aspect.ORDER, 8).add(Aspect.ENTROPY, 8);
|
||||
public static AspectList solarHelmetRevealing = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.AIR, 32)
|
||||
.add(Aspect.LIGHT, 25);
|
||||
public static AspectList electricBootsTravel = new AspectList().add(Aspect.ENERGY, 16).add(Aspect.ARMOR, 32)
|
||||
.add(Aspect.MOTION, 32);
|
||||
public static AspectList nanoBootsTravel = new AspectList().add(Aspect.ENERGY, 25).add(Aspect.ARMOR, 32)
|
||||
.add(Aspect.MOTION, 48);
|
||||
public static AspectList quantumBootsTravel = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.ARMOR, 32)
|
||||
.add(Aspect.MOTION, 64);
|
||||
public static AspectList electricScribingTools = new AspectList().add(Aspect.AIR, 16).add(Aspect.ORDER, 16)
|
||||
.add(Aspect.ENTROPY, 16);
|
||||
public static AspectList cheapUUMInfusions = new AspectList()
|
||||
.add(Aspect.FIRE, 8)
|
||||
.add(Aspect.WATER, 8)
|
||||
.add(Aspect.AIR, 8)
|
||||
.add(Aspect.EARTH, 8)
|
||||
.add(Aspect.ORDER, 8)
|
||||
.add(Aspect.ENTROPY, 8);
|
||||
public static AspectList cheapestUUMInfusions = new AspectList()
|
||||
.add(Aspect.FIRE, 4)
|
||||
.add(Aspect.WATER, 4)
|
||||
.add(Aspect.AIR, 4)
|
||||
.add(Aspect.EARTH, 4)
|
||||
.add(Aspect.ORDER, 4)
|
||||
.add(Aspect.ENTROPY, 4);
|
||||
public static AspectList portableNode =
|
||||
new AspectList().add(Aspect.MAGIC, 32).add(Aspect.AURA, 32).add(Aspect.GREED, 32);
|
||||
public static AspectList electricHoeGrowth = new AspectList()
|
||||
.add(Aspect.ENERGY, 32)
|
||||
.add(Aspect.PLANT, 25)
|
||||
.add(Aspect.CROP, 32)
|
||||
public static AspectList etherealProcessor = new AspectList().add(Aspect.MECHANISM, 16).add(Aspect.MAGIC, 16)
|
||||
.add(Aspect.CRAFT, 16);
|
||||
public static AspectList waterSolars = new AspectList().add(Aspect.WATER, 16).add(Aspect.MAGIC, 16)
|
||||
.add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList darkSolars = new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.MAGIC, 16)
|
||||
.add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList orderSolars = new AspectList().add(Aspect.ORDER, 16).add(Aspect.MAGIC, 16)
|
||||
.add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList fireSolars = new AspectList().add(Aspect.FIRE, 16).add(Aspect.MAGIC, 16)
|
||||
.add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList airSolars = new AspectList().add(Aspect.AIR, 16).add(Aspect.MAGIC, 16)
|
||||
.add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList earthSolars = new AspectList().add(Aspect.EARTH, 16).add(Aspect.MAGIC, 16)
|
||||
.add(Aspect.EXCHANGE, 16);
|
||||
public static AspectList uuMatterInfusions = new AspectList().add(Aspect.FIRE, 32).add(Aspect.WATER, 32)
|
||||
.add(Aspect.AIR, 32).add(Aspect.EARTH, 32).add(Aspect.ORDER, 32).add(Aspect.ENTROPY, 32);
|
||||
public static AspectList lesserUUMInfusions = new AspectList().add(Aspect.FIRE, 16).add(Aspect.WATER, 16)
|
||||
.add(Aspect.AIR, 16).add(Aspect.EARTH, 16).add(Aspect.ORDER, 16).add(Aspect.ENTROPY, 16);
|
||||
public static AspectList cheapUUMInfusions = new AspectList().add(Aspect.FIRE, 8).add(Aspect.WATER, 8)
|
||||
.add(Aspect.AIR, 8).add(Aspect.EARTH, 8).add(Aspect.ORDER, 8).add(Aspect.ENTROPY, 8);
|
||||
public static AspectList cheapestUUMInfusions = new AspectList().add(Aspect.FIRE, 4).add(Aspect.WATER, 4)
|
||||
.add(Aspect.AIR, 4).add(Aspect.EARTH, 4).add(Aspect.ORDER, 4).add(Aspect.ENTROPY, 4);
|
||||
public static AspectList portableNode = new AspectList().add(Aspect.MAGIC, 32).add(Aspect.AURA, 32)
|
||||
.add(Aspect.GREED, 32);
|
||||
public static AspectList electricHoeGrowth = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.PLANT, 25)
|
||||
.add(Aspect.CROP, 32).add(Aspect.MAGIC, 48);
|
||||
public static AspectList chargeFocus = new AspectList().add(Aspect.EXCHANGE, 25).add(Aspect.ENERGY, 32)
|
||||
.add(Aspect.MECHANISM, 32);
|
||||
public static AspectList wandChargeFocus = new AspectList().add(Aspect.ENERGY, 48).add(Aspect.AURA, 32)
|
||||
.add(Aspect.EXCHANGE, 48).add(Aspect.GREED, 64);
|
||||
public static AspectList inventoryChargingRing = new AspectList().add(Aspect.ENERGY, 64).add(Aspect.CRYSTAL, 32)
|
||||
.add(Aspect.MAGIC, 48);
|
||||
public static AspectList chargeFocus =
|
||||
new AspectList().add(Aspect.EXCHANGE, 25).add(Aspect.ENERGY, 32).add(Aspect.MECHANISM, 32);
|
||||
public static AspectList wandChargeFocus = new AspectList()
|
||||
.add(Aspect.ENERGY, 48)
|
||||
.add(Aspect.AURA, 32)
|
||||
.add(Aspect.EXCHANGE, 48)
|
||||
.add(Aspect.GREED, 64);
|
||||
public static AspectList inventoryChargingRing =
|
||||
new AspectList().add(Aspect.ENERGY, 64).add(Aspect.CRYSTAL, 32).add(Aspect.MAGIC, 48);
|
||||
public static AspectList armorChargingRing =
|
||||
new AspectList().add(Aspect.ENERGY, 64).add(Aspect.ARMOR, 32).add(Aspect.MAGIC, 48);
|
||||
public static AspectList thaumiumWing = new AspectList()
|
||||
.add(Aspect.FIRE, 48)
|
||||
.add(Aspect.WATER, 48)
|
||||
.add(Aspect.AIR, 48)
|
||||
.add(Aspect.EARTH, 48)
|
||||
.add(Aspect.ORDER, 48)
|
||||
.add(Aspect.ENTROPY, 48);
|
||||
public static AspectList nanoWing = new AspectList()
|
||||
.add(Aspect.FLIGHT, 48)
|
||||
.add(Aspect.AIR, 32)
|
||||
.add(Aspect.MECHANISM, 48)
|
||||
.add(Aspect.ENERGY, 32);
|
||||
public static AspectList quantumWing = new AspectList()
|
||||
.add(Aspect.FLIGHT, 48)
|
||||
.add(Aspect.AIR, 32)
|
||||
.add(Aspect.MECHANISM, 48)
|
||||
.add(Aspect.ENERGY, 32)
|
||||
.add(Aspect.ARMOR, 48);
|
||||
public static AspectList aerGenerator =
|
||||
new AspectList().add(Aspect.EXCHANGE, 16).add(Aspect.AIR, 8);
|
||||
public static AspectList uuMatterCrystal =
|
||||
new AspectList().add(Aspect.CRYSTAL, 8).add(Aspect.COLD, 8).add(Aspect.MAGIC, 8);
|
||||
public static AspectList researchCompleter = new AspectList()
|
||||
.add(Aspect.FIRE, 50)
|
||||
.add(Aspect.WATER, 50)
|
||||
.add(Aspect.AIR, 50)
|
||||
.add(Aspect.EARTH, 50)
|
||||
.add(Aspect.ORDER, 50)
|
||||
.add(Aspect.ENTROPY, 50);
|
||||
public static AspectList magicalMachineCasing =
|
||||
new AspectList().add(Aspect.FIRE, 8).add(Aspect.AIR, 8).add(Aspect.ORDER, 8);
|
||||
public static AspectList armorChargingRing = new AspectList().add(Aspect.ENERGY, 64).add(Aspect.ARMOR, 32)
|
||||
.add(Aspect.MAGIC, 48);
|
||||
public static AspectList thaumiumWing = new AspectList().add(Aspect.FIRE, 48).add(Aspect.WATER, 48)
|
||||
.add(Aspect.AIR, 48).add(Aspect.EARTH, 48).add(Aspect.ORDER, 48).add(Aspect.ENTROPY, 48);
|
||||
public static AspectList nanoWing = new AspectList().add(Aspect.FLIGHT, 48).add(Aspect.AIR, 32)
|
||||
.add(Aspect.MECHANISM, 48).add(Aspect.ENERGY, 32);
|
||||
public static AspectList quantumWing = new AspectList().add(Aspect.FLIGHT, 48).add(Aspect.AIR, 32)
|
||||
.add(Aspect.MECHANISM, 48).add(Aspect.ENERGY, 32).add(Aspect.ARMOR, 48);
|
||||
public static AspectList aerGenerator = new AspectList().add(Aspect.EXCHANGE, 16).add(Aspect.AIR, 8);
|
||||
public static AspectList uuMatterCrystal = new AspectList().add(Aspect.CRYSTAL, 8).add(Aspect.COLD, 8)
|
||||
.add(Aspect.MAGIC, 8);
|
||||
public static AspectList researchCompleter = new AspectList().add(Aspect.FIRE, 50).add(Aspect.WATER, 50)
|
||||
.add(Aspect.AIR, 50).add(Aspect.EARTH, 50).add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50);
|
||||
public static AspectList magicalMachineCasing = new AspectList().add(Aspect.FIRE, 8).add(Aspect.AIR, 8)
|
||||
.add(Aspect.ORDER, 8);
|
||||
}
|
||||
@@ -1,9 +1,10 @@
|
||||
package emt.util;
|
||||
|
||||
import emt.init.EMTItems;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import emt.init.EMTItems;
|
||||
|
||||
public class EMTCreativeTab extends CreativeTabs {
|
||||
|
||||
public EMTCreativeTab(String tabLabel) {
|
||||
|
||||
@@ -1,22 +1,29 @@
|
||||
package emt.util;
|
||||
|
||||
import emt.init.EMTItems;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.WeightedRandomChestContent;
|
||||
import net.minecraftforge.common.ChestGenHooks;
|
||||
|
||||
import emt.init.EMTItems;
|
||||
|
||||
public class EMTDungeonChestGenerator {
|
||||
|
||||
public static void generateLoot() {
|
||||
if (!EMTConfigHandler.thorHammerResearch) {
|
||||
ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST)
|
||||
.addItem(new WeightedRandomChestContent(
|
||||
new ItemStack(EMTItems.taintedThorHammer), 0, 1, EMTConfigHandler.chanceTaintedMjolnir));
|
||||
ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(
|
||||
new WeightedRandomChestContent(
|
||||
new ItemStack(EMTItems.taintedThorHammer),
|
||||
0,
|
||||
1,
|
||||
EMTConfigHandler.chanceTaintedMjolnir));
|
||||
}
|
||||
if (!EMTConfigHandler.oneRingSpawn) {
|
||||
ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST)
|
||||
.addItem(new WeightedRandomChestContent(
|
||||
new ItemStack(EMTItems.onering), 0, 1, EMTConfigHandler.chanceOneRing));
|
||||
ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(
|
||||
new WeightedRandomChestContent(
|
||||
new ItemStack(EMTItems.onering),
|
||||
0,
|
||||
1,
|
||||
EMTConfigHandler.chanceOneRing));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package emt.util;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
|
||||
public class EMTEssentiasOutputs {
|
||||
|
||||
@@ -1,15 +1,5 @@
|
||||
package emt.util;
|
||||
|
||||
import baubles.api.BaublesApi;
|
||||
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
||||
import emt.EMT;
|
||||
import emt.init.EMTBlocks;
|
||||
import emt.init.EMTItems;
|
||||
import emt.item.armor.wings.ItemFeatherWing;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.monster.EntityCreeper;
|
||||
@@ -21,8 +11,19 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingHurtEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.entities.monster.EntityTaintChicken;
|
||||
import baubles.api.BaublesApi;
|
||||
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
||||
import emt.EMT;
|
||||
import emt.init.EMTBlocks;
|
||||
import emt.init.EMTItems;
|
||||
import emt.item.armor.wings.ItemFeatherWing;
|
||||
import ic2.api.item.ElectricItem;
|
||||
|
||||
public class EMTEventHandler {
|
||||
|
||||
@@ -63,7 +64,8 @@ public class EMTEventHandler {
|
||||
}
|
||||
if (event.entityLiving instanceof EntityTaintChicken) {
|
||||
event.entityLiving.entityDropItem(
|
||||
new ItemStack(EMTItems.itemEMTItems, event.entityLiving.worldObj.rand.nextInt(3), 13), 1);
|
||||
new ItemStack(EMTItems.itemEMTItems, event.entityLiving.worldObj.rand.nextInt(3), 13),
|
||||
1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package emt.util;
|
||||
|
||||
import ic2.api.item.ElectricItem;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import ic2.api.item.ElectricItem;
|
||||
|
||||
public class EMTRandomHelper {
|
||||
|
||||
public static ItemStack getChargedItem(Item item, int charge) {
|
||||
@@ -15,6 +17,7 @@ public class EMTRandomHelper {
|
||||
}
|
||||
|
||||
public static class Bolt {
|
||||
|
||||
public ArrayList<Point> points = new ArrayList<Point>();
|
||||
public float angleZ = 0;
|
||||
public float angleY = 0;
|
||||
@@ -55,6 +58,7 @@ public class EMTRandomHelper {
|
||||
}
|
||||
|
||||
public static class Point {
|
||||
|
||||
public float x = 0;
|
||||
public float y = 0;
|
||||
public float z = 0;
|
||||
|
||||
@@ -5,133 +5,93 @@ import thaumcraft.api.aspects.AspectList;
|
||||
|
||||
public class EMTResearchAspects {
|
||||
|
||||
public static AspectList thaumiumDrillResearch =
|
||||
new AspectList().add(Aspect.ENERGY, 5).add(Aspect.TOOL, 6).add(Aspect.MINE, 4);
|
||||
public static AspectList thaumiumChainsawResearch =
|
||||
new AspectList().add(Aspect.ENERGY, 5).add(Aspect.WEAPON, 6).add(Aspect.TOOL, 4);
|
||||
public static AspectList thaumicQuantumHelmet =
|
||||
new AspectList().add(Aspect.ARMOR, 8).add(Aspect.ENERGY, 4).add(Aspect.SENSES, 6);
|
||||
public static AspectList diamondOmnitoolResearch = new AspectList()
|
||||
.add(Aspect.ENERGY, 2)
|
||||
.add(Aspect.TOOL, 3)
|
||||
.add(Aspect.MINE, 2)
|
||||
.add(Aspect.WEAPON, 2);
|
||||
public static AspectList thaumiumOmnitoolResearch = new AspectList()
|
||||
.add(Aspect.ENERGY, 5)
|
||||
.add(Aspect.TOOL, 6)
|
||||
.add(Aspect.MINE, 4)
|
||||
.add(Aspect.WEAPON, 6);
|
||||
public static AspectList thaumicNanoHelmet =
|
||||
new AspectList().add(Aspect.ENERGY, 5).add(Aspect.SENSES, 8).add(Aspect.ARMOR, 6);
|
||||
public static AspectList laserFocusResearch =
|
||||
new AspectList().add(Aspect.FIRE, 3).add(Aspect.DEATH, 2).add(Aspect.WEAPON, 3);
|
||||
public static AspectList christmasFocusResearch = new AspectList()
|
||||
.add(Aspect.COLD, 2)
|
||||
.add(Aspect.BEAST, 5)
|
||||
.add(Aspect.LIFE, 6)
|
||||
.add(Aspect.DEATH, 2);
|
||||
public static AspectList energyBallFocusResearch =
|
||||
new AspectList().add(Aspect.ENERGY, 10).add(Aspect.MAGIC, 5).add(Aspect.LIFE, 6);
|
||||
public static AspectList shieldFocusResearch = new AspectList()
|
||||
.add(Aspect.ARMOR, 5)
|
||||
.add(Aspect.AIR, 2)
|
||||
.add(Aspect.CRYSTAL, 3)
|
||||
.add(Aspect.TRAP, 2);
|
||||
public static AspectList electricGogglesResearch =
|
||||
new AspectList().add(Aspect.ARMOR, 8).add(Aspect.ENERGY, 5).add(Aspect.SENSES, 6);
|
||||
public static AspectList potentiaGeneratorResearch =
|
||||
new AspectList().add(Aspect.ENERGY, 4).add(Aspect.EXCHANGE, 4).add(Aspect.METAL, 3);
|
||||
public static AspectList ignisGeneratorResearch =
|
||||
new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.FIRE, 3);
|
||||
public static AspectList auramGeneratorResearch =
|
||||
new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.AURA, 3);
|
||||
public static AspectList arborGeneratorResearch =
|
||||
new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.TREE, 3);
|
||||
public static AspectList lucrumGeneratorResearch =
|
||||
new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.GREED, 3);
|
||||
public static AspectList streamChainsawResearch = new AspectList()
|
||||
.add(Aspect.TOOL, 3)
|
||||
.add(Aspect.TREE, 3)
|
||||
.add(Aspect.WATER, 6)
|
||||
public static AspectList thaumiumDrillResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.TOOL, 6)
|
||||
.add(Aspect.MINE, 4);
|
||||
public static AspectList thaumiumChainsawResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.WEAPON, 6)
|
||||
.add(Aspect.TOOL, 4);
|
||||
public static AspectList thaumicQuantumHelmet = new AspectList().add(Aspect.ARMOR, 8).add(Aspect.ENERGY, 4)
|
||||
.add(Aspect.SENSES, 6);
|
||||
public static AspectList diamondOmnitoolResearch = new AspectList().add(Aspect.ENERGY, 2).add(Aspect.TOOL, 3)
|
||||
.add(Aspect.MINE, 2).add(Aspect.WEAPON, 2);
|
||||
public static AspectList thaumiumOmnitoolResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.TOOL, 6)
|
||||
.add(Aspect.MINE, 4).add(Aspect.WEAPON, 6);
|
||||
public static AspectList thaumicNanoHelmet = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.SENSES, 8)
|
||||
.add(Aspect.ARMOR, 6);
|
||||
public static AspectList laserFocusResearch = new AspectList().add(Aspect.FIRE, 3).add(Aspect.DEATH, 2)
|
||||
.add(Aspect.WEAPON, 3);
|
||||
public static AspectList christmasFocusResearch = new AspectList().add(Aspect.COLD, 2).add(Aspect.BEAST, 5)
|
||||
.add(Aspect.LIFE, 6).add(Aspect.DEATH, 2);
|
||||
public static AspectList energyBallFocusResearch = new AspectList().add(Aspect.ENERGY, 10).add(Aspect.MAGIC, 5)
|
||||
.add(Aspect.LIFE, 6);
|
||||
public static AspectList shieldFocusResearch = new AspectList().add(Aspect.ARMOR, 5).add(Aspect.AIR, 2)
|
||||
.add(Aspect.CRYSTAL, 3).add(Aspect.TRAP, 2);
|
||||
public static AspectList electricGogglesResearch = new AspectList().add(Aspect.ARMOR, 8).add(Aspect.ENERGY, 5)
|
||||
.add(Aspect.SENSES, 6);
|
||||
public static AspectList potentiaGeneratorResearch = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.EXCHANGE, 4)
|
||||
.add(Aspect.METAL, 3);
|
||||
public static AspectList ignisGeneratorResearch = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.FIRE, 3);
|
||||
public static AspectList auramGeneratorResearch = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.AURA, 3);
|
||||
public static AspectList arborGeneratorResearch = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.TREE, 3);
|
||||
public static AspectList lucrumGeneratorResearch = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.GREED, 3);
|
||||
public static AspectList streamChainsawResearch = new AspectList().add(Aspect.TOOL, 3).add(Aspect.TREE, 3)
|
||||
.add(Aspect.WATER, 6).add(Aspect.ENERGY, 4);
|
||||
public static AspectList rockbreakerDrillResearch = new AspectList().add(Aspect.ENERGY, 3).add(Aspect.FIRE, 2)
|
||||
.add(Aspect.MINE, 3);
|
||||
public static AspectList shieldBlockResearch = new AspectList().add(Aspect.ARMOR, 3).add(Aspect.TRAP, 2);
|
||||
public static AspectList tinyUraniumResearch = new AspectList().add(Aspect.POISON, 4).add(Aspect.DEATH, 3)
|
||||
.add(Aspect.EXCHANGE, 3);
|
||||
public static AspectList thorHammerResearch = new AspectList().add(Aspect.WEAPON, 3).add(Aspect.WEATHER, 4)
|
||||
.add(Aspect.ELDRITCH, 3);
|
||||
public static AspectList superchargedThorHammerResearch = new AspectList().add(Aspect.WEAPON, 4)
|
||||
.add(Aspect.ENERGY, 6).add(Aspect.BEAST, 4);
|
||||
public static AspectList wandCharger = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.CRAFT, 2)
|
||||
.add(Aspect.EXCHANGE, 3).add(Aspect.GREED, 5);
|
||||
public static AspectList compressedSolars = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.LIGHT, 3)
|
||||
.add(Aspect.METAL, 2);
|
||||
public static AspectList solarHelmetRevealing = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.AIR, 2)
|
||||
.add(Aspect.LIGHT, 4);
|
||||
public static AspectList electricBootsTravel = new AspectList().add(Aspect.ENERGY, 2).add(Aspect.ARMOR, 5)
|
||||
.add(Aspect.MOTION, 2);
|
||||
public static AspectList nanoBootsTravel = new AspectList().add(Aspect.ENERGY, 3).add(Aspect.ARMOR, 5)
|
||||
.add(Aspect.MOTION, 3);
|
||||
public static AspectList quantumBootsTravel = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.ARMOR, 5)
|
||||
.add(Aspect.MOTION, 4);
|
||||
public static AspectList electricScribingTools = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.DARKNESS, 3)
|
||||
.add(Aspect.CRAFT, 1);
|
||||
public static AspectList etherealProcessor = new AspectList().add(Aspect.MECHANISM, 3).add(Aspect.MAGIC, 4)
|
||||
.add(Aspect.CRAFT, 5);
|
||||
public static AspectList waterSolars = new AspectList().add(Aspect.WATER, 4).add(Aspect.MAGIC, 3)
|
||||
.add(Aspect.ENERGY, 4);
|
||||
public static AspectList rockbreakerDrillResearch =
|
||||
new AspectList().add(Aspect.ENERGY, 3).add(Aspect.FIRE, 2).add(Aspect.MINE, 3);
|
||||
public static AspectList shieldBlockResearch =
|
||||
new AspectList().add(Aspect.ARMOR, 3).add(Aspect.TRAP, 2);
|
||||
public static AspectList tinyUraniumResearch =
|
||||
new AspectList().add(Aspect.POISON, 4).add(Aspect.DEATH, 3).add(Aspect.EXCHANGE, 3);
|
||||
public static AspectList thorHammerResearch =
|
||||
new AspectList().add(Aspect.WEAPON, 3).add(Aspect.WEATHER, 4).add(Aspect.ELDRITCH, 3);
|
||||
public static AspectList superchargedThorHammerResearch =
|
||||
new AspectList().add(Aspect.WEAPON, 4).add(Aspect.ENERGY, 6).add(Aspect.BEAST, 4);
|
||||
public static AspectList wandCharger = new AspectList()
|
||||
.add(Aspect.ENERGY, 4)
|
||||
.add(Aspect.CRAFT, 2)
|
||||
.add(Aspect.EXCHANGE, 3)
|
||||
public static AspectList darkSolars = new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.MAGIC, 3)
|
||||
.add(Aspect.ENERGY, 4);
|
||||
public static AspectList orderSolars = new AspectList().add(Aspect.ORDER, 4).add(Aspect.MAGIC, 3)
|
||||
.add(Aspect.ENERGY, 4);
|
||||
public static AspectList fireSolars = new AspectList().add(Aspect.FIRE, 4).add(Aspect.MAGIC, 3)
|
||||
.add(Aspect.ENERGY, 4);
|
||||
public static AspectList airSolars = new AspectList().add(Aspect.AIR, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4);
|
||||
public static AspectList earthSolars = new AspectList().add(Aspect.EARTH, 4).add(Aspect.MAGIC, 3)
|
||||
.add(Aspect.ENERGY, 4);
|
||||
public static AspectList uuMInfusion = new AspectList().add(Aspect.ELDRITCH, 4).add(Aspect.MAGIC, 4)
|
||||
.add(Aspect.CRAFT, 5);
|
||||
public static AspectList portableNode = new AspectList().add(Aspect.MAGIC, 5).add(Aspect.AURA, 5)
|
||||
.add(Aspect.GREED, 5);
|
||||
public static AspectList compressedSolars =
|
||||
new AspectList().add(Aspect.ENERGY, 4).add(Aspect.LIGHT, 3).add(Aspect.METAL, 2);
|
||||
public static AspectList solarHelmetRevealing =
|
||||
new AspectList().add(Aspect.ENERGY, 5).add(Aspect.AIR, 2).add(Aspect.LIGHT, 4);
|
||||
public static AspectList electricBootsTravel =
|
||||
new AspectList().add(Aspect.ENERGY, 2).add(Aspect.ARMOR, 5).add(Aspect.MOTION, 2);
|
||||
public static AspectList nanoBootsTravel =
|
||||
new AspectList().add(Aspect.ENERGY, 3).add(Aspect.ARMOR, 5).add(Aspect.MOTION, 3);
|
||||
public static AspectList quantumBootsTravel =
|
||||
new AspectList().add(Aspect.ENERGY, 4).add(Aspect.ARMOR, 5).add(Aspect.MOTION, 4);
|
||||
public static AspectList electricScribingTools =
|
||||
new AspectList().add(Aspect.ENERGY, 5).add(Aspect.DARKNESS, 3).add(Aspect.CRAFT, 1);
|
||||
public static AspectList etherealProcessor =
|
||||
new AspectList().add(Aspect.MECHANISM, 3).add(Aspect.MAGIC, 4).add(Aspect.CRAFT, 5);
|
||||
public static AspectList waterSolars =
|
||||
new AspectList().add(Aspect.WATER, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4);
|
||||
public static AspectList darkSolars =
|
||||
new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4);
|
||||
public static AspectList orderSolars =
|
||||
new AspectList().add(Aspect.ORDER, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4);
|
||||
public static AspectList fireSolars =
|
||||
new AspectList().add(Aspect.FIRE, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4);
|
||||
public static AspectList airSolars =
|
||||
new AspectList().add(Aspect.AIR, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4);
|
||||
public static AspectList earthSolars =
|
||||
new AspectList().add(Aspect.EARTH, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4);
|
||||
public static AspectList uuMInfusion =
|
||||
new AspectList().add(Aspect.ELDRITCH, 4).add(Aspect.MAGIC, 4).add(Aspect.CRAFT, 5);
|
||||
public static AspectList portableNode =
|
||||
new AspectList().add(Aspect.MAGIC, 5).add(Aspect.AURA, 5).add(Aspect.GREED, 5);
|
||||
public static AspectList electricHoeGrowth = new AspectList()
|
||||
.add(Aspect.ENERGY, 4)
|
||||
.add(Aspect.PLANT, 4)
|
||||
.add(Aspect.CROP, 5)
|
||||
public static AspectList electricHoeGrowth = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.PLANT, 4)
|
||||
.add(Aspect.CROP, 5).add(Aspect.MAGIC, 4);
|
||||
public static AspectList chargeFocus = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.ENERGY, 5)
|
||||
.add(Aspect.MECHANISM, 4);
|
||||
public static AspectList wandChargeFocus = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.AURA, 4)
|
||||
.add(Aspect.EXCHANGE, 4).add(Aspect.GREED, 5);
|
||||
public static AspectList inventoryChargingRing = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.CRYSTAL, 4)
|
||||
.add(Aspect.MAGIC, 4);
|
||||
public static AspectList chargeFocus =
|
||||
new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.ENERGY, 5).add(Aspect.MECHANISM, 4);
|
||||
public static AspectList wandChargeFocus = new AspectList()
|
||||
.add(Aspect.ENERGY, 5)
|
||||
.add(Aspect.AURA, 4)
|
||||
.add(Aspect.EXCHANGE, 4)
|
||||
.add(Aspect.GREED, 5);
|
||||
public static AspectList inventoryChargingRing =
|
||||
new AspectList().add(Aspect.ENERGY, 4).add(Aspect.CRYSTAL, 4).add(Aspect.MAGIC, 4);
|
||||
public static AspectList armorChargingRing =
|
||||
new AspectList().add(Aspect.ENERGY, 4).add(Aspect.ARMOR, 4).add(Aspect.MAGIC, 4);
|
||||
public static AspectList thaumiumWing =
|
||||
new AspectList().add(Aspect.FLIGHT, 5).add(Aspect.AIR, 5).add(Aspect.MECHANISM, 8);
|
||||
public static AspectList nanoWing = new AspectList()
|
||||
.add(Aspect.FLIGHT, 5)
|
||||
.add(Aspect.AIR, 5)
|
||||
.add(Aspect.MECHANISM, 8)
|
||||
.add(Aspect.ENERGY, 4);
|
||||
public static AspectList quantumWing = new AspectList()
|
||||
.add(Aspect.FLIGHT, 5)
|
||||
.add(Aspect.AIR, 5)
|
||||
.add(Aspect.MECHANISM, 8)
|
||||
.add(Aspect.ENERGY, 4);
|
||||
public static AspectList aerGenerator =
|
||||
new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.AIR, 3);
|
||||
public static AspectList researchCompleter = new AspectList()
|
||||
.add(Aspect.MIND, 8)
|
||||
.add(Aspect.MECHANISM, 5)
|
||||
.add(Aspect.EXCHANGE, 5)
|
||||
.add(Aspect.AURA, 4);
|
||||
public static AspectList armorChargingRing = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.ARMOR, 4)
|
||||
.add(Aspect.MAGIC, 4);
|
||||
public static AspectList thaumiumWing = new AspectList().add(Aspect.FLIGHT, 5).add(Aspect.AIR, 5)
|
||||
.add(Aspect.MECHANISM, 8);
|
||||
public static AspectList nanoWing = new AspectList().add(Aspect.FLIGHT, 5).add(Aspect.AIR, 5)
|
||||
.add(Aspect.MECHANISM, 8).add(Aspect.ENERGY, 4);
|
||||
public static AspectList quantumWing = new AspectList().add(Aspect.FLIGHT, 5).add(Aspect.AIR, 5)
|
||||
.add(Aspect.MECHANISM, 8).add(Aspect.ENERGY, 4);
|
||||
public static AspectList aerGenerator = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.AIR, 3);
|
||||
public static AspectList researchCompleter = new AspectList().add(Aspect.MIND, 8).add(Aspect.MECHANISM, 5)
|
||||
.add(Aspect.EXCHANGE, 5).add(Aspect.AURA, 4);
|
||||
}
|
||||
@@ -1,13 +1,14 @@
|
||||
package emt.util;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.research.ResearchItem;
|
||||
import thaumcraft.api.research.ResearchPage;
|
||||
import thaumcraft.api.research.ResearchPage.PageType;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class EMTResearchItem extends ResearchItem {
|
||||
|
||||
@@ -51,7 +52,7 @@ public class EMTResearchItem extends ResearchItem {
|
||||
page.text = "emt.text." + key + (page.text.equals("") ? "" : "." + page.text);
|
||||
|
||||
if (page.type == PageType.INFUSION_CRAFTING) {
|
||||
if (parentsHidden == null || parentsHidden.length == 0) parentsHidden = new String[] {"INFUSION"};
|
||||
if (parentsHidden == null || parentsHidden.length == 0) parentsHidden = new String[] { "INFUSION" };
|
||||
else {
|
||||
String[] newParents = new String[parentsHidden.length + 1];
|
||||
newParents[0] = "INFUSION";
|
||||
|
||||
Reference in new issue
Block a user