mirror of
https://github.com/GTNewHorizons/Electro-Magic-Tools.git
synced 2026-11-21 12:32:12 +00:00
Merged
This commit is contained in:
commit
7c36996fe3
135 files changed
+1367
-1255
No files matched your search
@@ -20,12 +20,12 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import tombenpotter.emt.common.commands.CommandOutputs;
|
||||
import tombenpotter.emt.common.command.CommandOutputs;
|
||||
import tombenpotter.emt.common.init.EntityRegistry;
|
||||
import tombenpotter.emt.common.init.Registry;
|
||||
import tombenpotter.emt.common.network.PacketEMTKeys;
|
||||
import tombenpotter.emt.common.util.*;
|
||||
import tombenpotter.emt.proxies.CommonProxy;
|
||||
import tombenpotter.emt.proxy.CommonProxy;
|
||||
|
||||
@Mod(modid = ModInformation.modid, name = ModInformation.name, version = ModInformation.version, guiFactory = ModInformation.guiFactory, dependencies = ModInformation.depend)
|
||||
public class ElectroMagicTools {
|
||||
@@ -35,7 +35,7 @@ public class ElectroMagicTools {
|
||||
@SidedProxy(clientSide = ModInformation.clientProxy, serverSide = ModInformation.commonProxy)
|
||||
public static CommonProxy proxy;
|
||||
|
||||
public static CreativeTabs tabEMT = new CreativeTab(ModInformation.modid + ".creativeTab");
|
||||
public static CreativeTabs tabEMT = new EMTCreativeTab(ModInformation.modid + ".creativeTab");
|
||||
public static Logger logger = LogManager.getLogger(ModInformation.name);
|
||||
|
||||
@Instance(ModInformation.modid)
|
||||
@@ -45,11 +45,11 @@ public class ElectroMagicTools {
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
ElectroMagicTools.logger.info("Starting planning the world domination");
|
||||
|
||||
ConfigHandler.init(event.getSuggestedConfigurationFile());
|
||||
EMTConfigHandler.init(event.getSuggestedConfigurationFile());
|
||||
FMLCommonHandler.instance().bus().register(new EMTEventHandler());
|
||||
Registry.register();
|
||||
EssentiasOutputs.addPrimalOutputs();
|
||||
EssentiasOutputs.addOutputs();
|
||||
EMTEssentiasOutputs.addPrimalOutputs();
|
||||
EMTEssentiasOutputs.addOutputs();
|
||||
registerPackets();
|
||||
|
||||
ElectroMagicTools.logger.info("Planning complete");
|
||||
@@ -64,7 +64,7 @@ public class ElectroMagicTools {
|
||||
ElectroMagicTools.logger.info("Making mobs drop additional items");
|
||||
MinecraftForge.EVENT_BUS.register(new EMTEventHandler());
|
||||
ElectroMagicTools.logger.info("Adding dungeon loot");
|
||||
DungeonChestGenerator.generateLoot();
|
||||
EMTDungeonChestGenerator.generateLoot();
|
||||
|
||||
ElectroMagicTools.logger.info("Registering entities");
|
||||
EntityRegistry.registerEMTEntities();
|
||||
|
||||
@@ -7,8 +7,8 @@ public class ModInformation {
|
||||
public static final String version = "1.2.4";
|
||||
public static final String texturePath = "electromagictools";
|
||||
public static final String guiFactory = "tombenpotter.emt.client.gui.config.EMTGuiFactory";
|
||||
public static final String clientProxy = "tombenpotter.emt.proxies.ClientProxy";
|
||||
public static final String commonProxy = "tombenpotter.emt.proxies.CommonProxy";
|
||||
public static final String clientProxy = "tombenpotter.emt.proxy.ClientProxy";
|
||||
public static final String commonProxy = "tombenpotter.emt.proxy.CommonProxy";
|
||||
public static final String channel = "ElectroMagicTools";
|
||||
public static final String depend = "required-after:Thaumcraft ; required-after:IC2";
|
||||
}
|
||||
@@ -8,7 +8,7 @@ import java.util.Set;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
|
||||
@@ -16,7 +16,7 @@ public class EMTKeys {
|
||||
public static KeyBinding keyUnequip;
|
||||
|
||||
public static void registerKeys() {
|
||||
keyUnequip = new KeyBinding(TextHelper.localize("gui.EMT.key.unequip"), Keyboard.KEY_Z, "EMT");
|
||||
keyUnequip = new KeyBinding(EMTTextHelper.localize("gui.EMT.key.unequip"), Keyboard.KEY_Z, "EMT");
|
||||
ClientRegistry.registerKeyBinding(keyUnequip);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.client.gui.container.ContainerEtheralMacerator;
|
||||
import tombenpotter.emt.common.tile.TileEntityEtherealMacerator;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
public class GuiEtherealMacerator extends GuiContainer {
|
||||
|
||||
@@ -28,7 +28,7 @@ public class GuiEtherealMacerator extends GuiContainer {
|
||||
}
|
||||
|
||||
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
|
||||
this.fontRendererObj.drawString(TextHelper.localize("gui.EMT.etherealMacerator.title"), 6, 6, 4210752);
|
||||
this.fontRendererObj.drawString(TextHelper.localize("gui.EMT.inventory"), 8, this.ySize - 96 + 2, 4210752);
|
||||
this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.etherealMacerator.title"), 6, 6, 4210752);
|
||||
this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.inventory"), 8, this.ySize - 96 + 2, 4210752);
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.client.gui.container.ContainerIndustrialWandRecharge;
|
||||
import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
public class GuiIndustrialWandRecharger extends GuiContainer {
|
||||
|
||||
@@ -28,7 +28,7 @@ public class GuiIndustrialWandRecharger extends GuiContainer {
|
||||
}
|
||||
|
||||
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
|
||||
this.fontRendererObj.drawString(TextHelper.localize("gui.EMT.wandRecharge.title"), 6, 6, 4210752);
|
||||
this.fontRendererObj.drawString(TextHelper.localize("gui.EMT.inventory"), 8, this.ySize - 96 + 2, 4210752);
|
||||
this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.wandRecharge.title"), 6, 6, 4210752);
|
||||
this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.inventory"), 8, this.ySize - 96 + 2, 4210752);
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import static tombenpotter.emt.common.util.ConfigHandler.*;
|
||||
import static tombenpotter.emt.common.util.EMTConfigHandler.*;
|
||||
|
||||
public class EMTGuiConfig extends GuiConfig {
|
||||
|
||||
|
||||
@@ -15,35 +15,22 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelCpecialArmor extends ModelBiped {
|
||||
public ModelRenderer bipedHead;
|
||||
public ModelRenderer bipedBody;
|
||||
public ModelRenderer bipedRightArm;
|
||||
public ModelRenderer bipedLeftArm;
|
||||
|
||||
public ModelRenderer rightWing;
|
||||
public ModelRenderer leftWing;
|
||||
public ModelRenderer center;
|
||||
|
||||
public ModelRenderer jetpack;
|
||||
|
||||
public boolean isJumping;
|
||||
|
||||
public int type = 0;// 0 - nothing, 1 - jetpack, 2 - wings
|
||||
public int heldItemLeft;
|
||||
public int heldItemRight;
|
||||
public boolean isSneak;
|
||||
public boolean aimedBow;
|
||||
|
||||
public ModelCpecialArmor() {
|
||||
this(0.0F, 0);
|
||||
this(1, 0);
|
||||
}
|
||||
|
||||
public ModelCpecialArmor(float p_i1148_1_, int type) {
|
||||
this(p_i1148_1_, 0.0F, 64, 32, type);
|
||||
public ModelCpecialArmor(float scale, int type) {
|
||||
this(scale, 0.0F, 64, 32, type);
|
||||
}
|
||||
|
||||
public ModelCpecialArmor(float p_i1149_1_, float p_i1149_2_, int p_i1149_3_, int p_i1149_4_, int type) {
|
||||
|
||||
this.type = type;
|
||||
switch (this.type) {
|
||||
case 1:
|
||||
|
||||
@@ -7,60 +7,51 @@ import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.entities.EntityLaser;
|
||||
import tombenpotter.emt.common.entity.EntityLaser;
|
||||
|
||||
public class RenderLaser extends Render {
|
||||
|
||||
private static final ResourceLocation laserTexture = new ResourceLocation(ModInformation.texturePath, "textures/models/lasermodel.png");
|
||||
|
||||
public void renderArrow(EntityLaser entityLaser, double par2, double par4, double par6, float par8, float par9) {
|
||||
|
||||
public void doRender(Entity entityLaser, double x, double y, double z, float par8, float par9) {
|
||||
this.bindEntityTexture(entityLaser);
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float) par2, (float) par4, (float) par6);
|
||||
GL11.glRotatef(entityLaser.prevRotationYaw + (entityLaser.rotationYaw - entityLaser.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glRotatef(entityLaser.prevRotationPitch + (entityLaser.rotationPitch - entityLaser.prevRotationPitch) * par9, 0.0F, 0.0F, 1.0F);
|
||||
GL11.glTranslated(x, y, z);
|
||||
GL11.glRotatef(entityLaser.prevRotationYaw + (entityLaser.rotationYaw - entityLaser.prevRotationYaw) * par9 - 90, 0, 1, 0);
|
||||
GL11.glRotatef(entityLaser.prevRotationPitch + (entityLaser.rotationPitch - entityLaser.prevRotationPitch) * par9, 0, 0, 1);
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
byte b0 = 0;
|
||||
float f2 = 0.4F;
|
||||
float f3 = 0.7F;
|
||||
float f4 = (float) (0 + b0 * 10) / 32.0F;
|
||||
float f5 = (float) (5 + b0 * 10) / 32.0F;
|
||||
float f6 = 0.0F;
|
||||
float f7 = 0.15625F;
|
||||
float f8 = (float) (5 + b0 * 10) / 32.0F;
|
||||
float f9 = (float) (10 + b0 * 10) / 32.0F;
|
||||
float f2 = 0.4f;
|
||||
float f3 = 0.7f;
|
||||
float f4 = (float) (0 + b0 * 10) / 32f;
|
||||
float f5 = (float) (5 + b0 * 10) / 32f;
|
||||
float f10 = 0.05625F;
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
|
||||
GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.0F);
|
||||
GL11.glRotatef(45, 1, 0, 0);
|
||||
GL11.glScalef(f10, f10, f10);
|
||||
GL11.glTranslatef(-4.0F, 0.0F, 0.0F);
|
||||
GL11.glNormal3f(f10, 0.0F, 0.0F);
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double) f6, (double) f8);
|
||||
tessellator.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double) f7, (double) f8);
|
||||
tessellator.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double) f7, (double) f9);
|
||||
tessellator.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double) f6, (double) f9);
|
||||
tessellator.draw();
|
||||
GL11.glNormal3f(-f10, 0.0F, 0.0F);
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double) f6, (double) f8);
|
||||
tessellator.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double) f7, (double) f8);
|
||||
tessellator.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double) f7, (double) f9);
|
||||
tessellator.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double) f6, (double) f9);
|
||||
tessellator.draw();
|
||||
GL11.glTranslatef(-4, 0, 0);
|
||||
GL11.glPushAttrib(GL11.GL_LIGHTING);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F);
|
||||
GL11.glNormal3f(0.0F, 0.0F, f10);
|
||||
GL11.glRotatef(90, 1, 0, 0);
|
||||
GL11.glNormal3f(0, 0, f10);
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.addVertexWithUV(-8.0D, -2.0D, 0.0D, (double) f2, (double) f4);
|
||||
tessellator.addVertexWithUV(8.0D, -2.0D, 0.0D, (double) f3, (double) f4);
|
||||
tessellator.addVertexWithUV(8.0D, 2.0D, 0.0D, (double) f3, (double) f5);
|
||||
tessellator.addVertexWithUV(-8.0D, 2.0D, 0.0D, (double) f2, (double) f5);
|
||||
tessellator.addVertexWithUV(-8, 0, 0, f2, f4);
|
||||
tessellator.addVertexWithUV(8, 0, 0, f3, f4);
|
||||
tessellator.addVertexWithUV(8, 4, 0, f3, f5);
|
||||
tessellator.addVertexWithUV(-8, 4, 0, f2, f5);
|
||||
tessellator.draw();
|
||||
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.addVertexWithUV(8, 0, 0, f2, f4);
|
||||
tessellator.addVertexWithUV(-8, 0, 0, f3, f4);
|
||||
tessellator.addVertexWithUV(-8, 4, 0, f3, f5);
|
||||
tessellator.addVertexWithUV(8, 4, 0, f2, f5);
|
||||
tessellator.draw();
|
||||
}
|
||||
GL11.glPopAttrib();
|
||||
|
||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||
GL11.glPopMatrix();
|
||||
@@ -73,8 +64,4 @@ public class RenderLaser extends Render {
|
||||
protected ResourceLocation getEntityTexture(Entity par1Entity) {
|
||||
return this.getArrowTextures((EntityLaser) par1Entity);
|
||||
}
|
||||
|
||||
public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) {
|
||||
this.renderArrow((EntityLaser) par1Entity, par2, par4, par6, par8, par9);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
package tombenpotter.emt.client.renderer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.entity.EntityLaser;
|
||||
|
||||
public class RenderShield extends Render {
|
||||
private static final ResourceLocation shieldTexture = new ResourceLocation(ModInformation.texturePath, "textures/models/shield.png");
|
||||
|
||||
private static final float[] values = new float[6912];
|
||||
|
||||
static{
|
||||
float sin1;
|
||||
float cos1;
|
||||
|
||||
float sin2;
|
||||
float cos2;
|
||||
|
||||
float hsin1 = 0;
|
||||
float hcos1 = 1;
|
||||
|
||||
float hsin2;
|
||||
float hcos2;
|
||||
|
||||
int i = 0;
|
||||
|
||||
for (float h = 0; h < 360; h += 15) {
|
||||
sin1 = 0;
|
||||
cos1 = 1;
|
||||
|
||||
hsin2 = MathHelper.sin((float) Math.toRadians(h + 15));
|
||||
hcos2 = MathHelper.cos((float) Math.toRadians(h + 15));
|
||||
|
||||
for (float angle = 0; angle < 360; angle += 15) {
|
||||
sin2 = MathHelper.sin((float) Math.toRadians(angle + 15));
|
||||
cos2 = MathHelper.cos((float) Math.toRadians(angle + 15));
|
||||
|
||||
values[i] = sin1 * hcos1;
|
||||
values[i + 1] = hsin1;
|
||||
values[i + 2] = cos1 * hcos1;
|
||||
|
||||
values[i + 3] = sin1 * hcos2;
|
||||
values[i + 4] = hsin2;
|
||||
values[i + 5] = cos1 * hcos2;
|
||||
|
||||
values[i + 6] = sin2 * hcos2;
|
||||
values[i + 7] = hsin2;
|
||||
values[i + 8] = cos2 * hcos2;
|
||||
|
||||
values[i + 9] = sin2 * hcos1;
|
||||
values[i + 10] = hsin1;
|
||||
values[i + 11] = cos2 * hcos1;
|
||||
|
||||
i += 12;
|
||||
|
||||
sin1 = sin2;
|
||||
cos1 = cos2;
|
||||
}
|
||||
|
||||
hsin1 = hsin2;
|
||||
hcos1 = hcos2;
|
||||
}
|
||||
}
|
||||
|
||||
public void doRender(Entity entityLaser, double x, double y, double z, float par8, float par9) {
|
||||
this.bindEntityTexture(entityLaser);
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslated(x, y, z);
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GL11.glPushAttrib(GL11.GL_LIGHTING);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
|
||||
for (int v = 0; v < values.length; v += 12) {
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.addVertexWithUV(values[v] , values[v + 1] , values[v + 2] , 1, 1);
|
||||
tessellator.addVertexWithUV(values[v + 3] , values[v + 4] , values[v + 5] , 1, 0);
|
||||
tessellator.addVertexWithUV(values[v + 6] , values[v + 7] , values[v + 8] , 0, 0);
|
||||
tessellator.addVertexWithUV(values[v + 9] , values[v + 10], values[v + 11], 0, 1);
|
||||
tessellator.draw();
|
||||
}
|
||||
|
||||
GL11.glPopAttrib();
|
||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ResourceLocation getEntityTexture(Entity texture) {
|
||||
return shieldTexture;
|
||||
}
|
||||
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.block;
|
||||
|
||||
import ic2.api.item.IC2Items;
|
||||
|
||||
+17
-17
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -11,22 +11,22 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.tile.solars.air.TileEntityAirSolar;
|
||||
import tombenpotter.emt.common.tile.solars.compressed.TileEntityCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solars.compressed.TileEntityDoubleCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solars.compressed.TileEntityTripleCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solars.dark.TileEntityDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solars.dark.TileEntityDoubleDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solars.dark.TileEntityTripleDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solars.fire.TileEntityDoubleFireSolar;
|
||||
import tombenpotter.emt.common.tile.solars.fire.TileEntityFireSolar;
|
||||
import tombenpotter.emt.common.tile.solars.fire.TileEntityTripleFireSolar;
|
||||
import tombenpotter.emt.common.tile.solars.order.TileEntityDoubleOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solars.order.TileEntityOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solars.order.TileEntityTripleOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solars.water.TileEntityDoubleWaterSolar;
|
||||
import tombenpotter.emt.common.tile.solars.water.TileEntityTripleWaterSolar;
|
||||
import tombenpotter.emt.common.tile.solars.water.TileEntityWaterSolar;
|
||||
import tombenpotter.emt.common.tile.solar.air.TileEntityAirSolar;
|
||||
import tombenpotter.emt.common.tile.solar.compressed.TileEntityCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solar.compressed.TileEntityDoubleCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solar.compressed.TileEntityTripleCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solar.dark.TileEntityDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solar.dark.TileEntityDoubleDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solar.dark.TileEntityTripleDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solar.fire.TileEntityDoubleFireSolar;
|
||||
import tombenpotter.emt.common.tile.solar.fire.TileEntityFireSolar;
|
||||
import tombenpotter.emt.common.tile.solar.fire.TileEntityTripleFireSolar;
|
||||
import tombenpotter.emt.common.tile.solar.order.TileEntityDoubleOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solar.order.TileEntityOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solar.order.TileEntityTripleOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solar.water.TileEntityDoubleWaterSolar;
|
||||
import tombenpotter.emt.common.tile.solar.water.TileEntityTripleWaterSolar;
|
||||
import tombenpotter.emt.common.tile.solar.water.TileEntityWaterSolar;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
+6
-6
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -11,11 +11,11 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.tile.solars.air.TileEntityDoubleAirSolar;
|
||||
import tombenpotter.emt.common.tile.solars.air.TileEntityTripleAirSolar;
|
||||
import tombenpotter.emt.common.tile.solars.earth.TileEntityDoubleEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solars.earth.TileEntityEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solars.earth.TileEntityTripleEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solar.air.TileEntityDoubleAirSolar;
|
||||
import tombenpotter.emt.common.tile.solar.air.TileEntityTripleAirSolar;
|
||||
import tombenpotter.emt.common.tile.solar.earth.TileEntityDoubleEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solar.earth.TileEntityEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solar.earth.TileEntityTripleEarthSolar;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
+16
-3
@@ -1,8 +1,10 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.EntitySmokeFX;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -10,11 +12,13 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.tile.generators.*;
|
||||
import tombenpotter.emt.common.tile.generator.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class BlockEssentiaGenerators extends BlockBaseContainer {
|
||||
|
||||
public BlockEssentiaGenerators() {
|
||||
@@ -73,6 +77,15 @@ public class BlockEssentiaGenerators extends BlockBaseContainer {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void randomDisplayTick(World world, int x, int y, int z, Random random) {
|
||||
world.spawnParticle("largesmoke", x + 0.5f, y + 1.0f, z + 0.5f, 0.0D, 0.0D, 0.0D);
|
||||
int color = ((TileEntityBaseGenerator)world.getTileEntity(x, y, z)).aspect.getColor();
|
||||
float r = (float)(color >> 16 & 0xff) / 255F;
|
||||
float g = (float)(color >> 8 & 0xff) / 255F;
|
||||
float b = (float)(color & 0xff) / 255F;
|
||||
|
||||
for(int i = 0; i < 3; i++){
|
||||
EntitySmokeFX fx = new EntitySmokeFX(world, x + 0.5f, y + 1.1, z + 0.5f, 0, 0.1, 0, 3);
|
||||
fx.setRBGColorF(r, g, b);
|
||||
Minecraft.getMinecraft().effectRenderer.addEffect(fx);
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.blocks;
|
||||
package tombenpotter.emt.common.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
+6
-6
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.commands;
|
||||
package tombenpotter.emt.common.command;
|
||||
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.ICommand;
|
||||
@@ -9,8 +9,8 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.nbt.NBTTagString;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.EssentiasOutputs;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTEssentiasOutputs;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@@ -50,13 +50,13 @@ public class CommandOutputs extends CommandBase {
|
||||
|
||||
@Override
|
||||
public void processCommand(ICommandSender command, String[] astring) {
|
||||
text = TextHelper.localize("gui.EMT.book.aspect.output.essentia.eu") + ": ";
|
||||
text = EMTTextHelper.localize("gui.EMT.book.aspect.output.essentia.eu") + ": ";
|
||||
Collection<Aspect> aspectCollection = Aspect.aspects.values();
|
||||
for (Aspect aspect : aspectCollection) {
|
||||
String text2 = addStrings(text, (aspect.getTag() + ": " + String.valueOf(EssentiasOutputs.outputs.get(aspect.getTag())) + "\n"));
|
||||
String text2 = addStrings(text, (aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag())) + "\n"));
|
||||
text = text2;
|
||||
}
|
||||
addOutputsBook(TextHelper.localize("gui.EMT.book.aspect.output.eu.title"), text, command, astring);
|
||||
addOutputsBook(EMTTextHelper.localize("gui.EMT.book.aspect.output.eu.title"), text, command, astring);
|
||||
}
|
||||
|
||||
public void addOutputsBook(String title, String text, ICommandSender command, String[] astring) {
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.entities;
|
||||
package tombenpotter.emt.common.entity;
|
||||
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.entities;
|
||||
package tombenpotter.emt.common.entity;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -0,0 +1,127 @@
|
||||
package tombenpotter.emt.common.entity;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import ic2.core.IC2;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.command.IEntitySelector;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.IProjectile;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class EntityShield extends Entity implements IProjectile {
|
||||
EntityPlayer owner;
|
||||
|
||||
public EntityShield(World world) {
|
||||
super(world);
|
||||
this.setSize(4, 4);
|
||||
this.ignoreFrustumCheck = true;
|
||||
owner = Minecraft.getMinecraft().thePlayer;
|
||||
this.setPosition(owner.posX, owner.posY, owner.posZ);
|
||||
}
|
||||
|
||||
public EntityShield(World world, EntityPlayer player) {
|
||||
super(world);
|
||||
this.setSize(4, 4);
|
||||
owner = player;
|
||||
this.setPosition(player.posX, player.posY, player.posZ);
|
||||
this.ignoreFrustumCheck = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void entityInit() {
|
||||
this.dataWatcher.addObject(16, Byte.valueOf((byte) 0));
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) {
|
||||
this.setPosition(par1, par3, par5);
|
||||
this.setRotation(par7, par8);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void readEntityFromNBT(NBTTagCompound p_70037_1_) {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void writeEntityToNBT(NBTTagCompound p_70014_1_) {
|
||||
}
|
||||
|
||||
public AxisAlignedBB getBoundingBox() {
|
||||
return this.boundingBox;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canBePushed() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public void setPosition(double x, double y, double z) {
|
||||
this.posX = x;
|
||||
this.posY = y + 0.5f;
|
||||
this.posZ = z;
|
||||
float f = this.width / 2.0F;
|
||||
float f1 = this.height;
|
||||
this.boundingBox.setBounds(x - (double) f, y - (double) this.yOffset - 2 + (double) this.ySize, z - (double) f, x + (double) f, y - (double) this.yOffset - 2 + (double) this.ySize + (double) f1, z + (double) f);
|
||||
}
|
||||
|
||||
public void onUpdate() {
|
||||
super.onUpdate();
|
||||
if (!owner.worldObj.isRemote) {
|
||||
this.setPosition(owner.posX, owner.posY, owner.posZ);
|
||||
if (!owner.isUsingItem()) {
|
||||
this.setDead();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public int getBrightnessForRender(float p_70070_1_){
|
||||
return 240;
|
||||
}
|
||||
|
||||
public void applyEntityCollision(Entity entity) {
|
||||
if (entity.riddenByEntity != this && entity.ridingEntity != this) {
|
||||
double ePosX = entity.posX - this.posX;
|
||||
double ePosZ = entity.posZ - this.posZ;
|
||||
double d2 = MathHelper.abs_max(ePosX, ePosZ);
|
||||
d2 = (double) MathHelper.sqrt_double(d2);
|
||||
ePosX /= d2;
|
||||
ePosZ /= d2;
|
||||
double d3 = 1.0D / d2;
|
||||
|
||||
if (d3 > 1.0D) {
|
||||
d3 = 1.0D;
|
||||
}
|
||||
|
||||
ePosX *= d3;
|
||||
ePosZ *= d3;
|
||||
ePosX *= 0.05000000074505806D;
|
||||
ePosZ *= 0.05000000074505806D;
|
||||
ePosX *= (double) (1.0F - this.entityCollisionReduction);
|
||||
ePosZ *= (double) (1.0F - this.entityCollisionReduction);
|
||||
this.addVelocity(-ePosX * 1000, 0.0D, -ePosZ * 1000);
|
||||
entity.addVelocity(ePosX * 1000, 0.0D, ePosZ * 1000);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public boolean isInRangeToRender3d(double x, double y, double z) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setThrowableHeading(double p_70186_1_, double p_70186_3_, double p_70186_5_, float p_70186_7_, float p_70186_8_) {
|
||||
}
|
||||
}
|
||||
@@ -8,17 +8,17 @@ import static thaumcraft.api.ThaumcraftApi.*;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.blocks.BlockEMTMachines;
|
||||
import tombenpotter.emt.common.blocks.BlockEMTSolars;
|
||||
import tombenpotter.emt.common.blocks.BlockEMTSolars2;
|
||||
import tombenpotter.emt.common.blocks.BlockEssentiaGenerators;
|
||||
import tombenpotter.emt.common.blocks.BlockPortableNode;
|
||||
import tombenpotter.emt.common.blocks.BlockShield;
|
||||
import tombenpotter.emt.common.items.blocks.ItemBlockEMTMachines;
|
||||
import tombenpotter.emt.common.items.blocks.ItemBlockEMTSolars;
|
||||
import tombenpotter.emt.common.items.blocks.ItemBlockEMTSolars2;
|
||||
import tombenpotter.emt.common.items.blocks.ItemBlockEssentiaGenerator;
|
||||
import tombenpotter.emt.common.items.blocks.ItemBlockEssentiaGenerators;
|
||||
import tombenpotter.emt.common.block.BlockEMTMachines;
|
||||
import tombenpotter.emt.common.block.BlockEMTSolars;
|
||||
import tombenpotter.emt.common.block.BlockEMTSolars2;
|
||||
import tombenpotter.emt.common.block.BlockEssentiaGenerators;
|
||||
import tombenpotter.emt.common.block.BlockPortableNode;
|
||||
import tombenpotter.emt.common.block.BlockShield;
|
||||
import tombenpotter.emt.common.item.block.ItemBlockEMTMachines;
|
||||
import tombenpotter.emt.common.item.block.ItemBlockEMTSolars;
|
||||
import tombenpotter.emt.common.item.block.ItemBlockEMTSolars2;
|
||||
import tombenpotter.emt.common.item.block.ItemBlockEssentiaGenerator;
|
||||
import tombenpotter.emt.common.item.block.ItemBlockEssentiaGenerators;
|
||||
|
||||
public class BlockRegistry {
|
||||
|
||||
|
||||
@@ -5,8 +5,9 @@ import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.EntityList.EntityEggInfo;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.common.entities.EntityArcher;
|
||||
import tombenpotter.emt.common.entities.EntityLaser;
|
||||
import tombenpotter.emt.common.entity.EntityArcher;
|
||||
import tombenpotter.emt.common.entity.EntityLaser;
|
||||
import tombenpotter.emt.common.entity.EntityShield;
|
||||
|
||||
public class EntityRegistry {
|
||||
|
||||
@@ -22,7 +23,6 @@ public class EntityRegistry {
|
||||
return startEID;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public static void registerEntityEgg(Class<? extends Entity> entity, int colPrim, int colSec) {
|
||||
int id = getUniqueEntityID();
|
||||
EntityList.IDtoClassMapping.put(id, entity);
|
||||
@@ -34,6 +34,7 @@ public class EntityRegistry {
|
||||
|
||||
cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntityLaser.class, "laser", entityIDs++, ElectroMagicTools.instance, 80, 3, true);
|
||||
cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntityArcher.class, "archer", entityIDs++, ElectroMagicTools.instance, 80, 3, true);
|
||||
cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntityShield.class, "shield", entityIDs++, ElectroMagicTools.instance, 80, 3, true);
|
||||
registerEntityEgg(EntityArcher.class, 0x99111F, 0xE5685);
|
||||
}
|
||||
}
|
||||
@@ -11,39 +11,39 @@ import net.minecraftforge.common.util.EnumHelper;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.items.ItemElectricScribingTools;
|
||||
import tombenpotter.emt.common.items.ItemIC2Baubles;
|
||||
import tombenpotter.emt.common.items.ItemMaterials;
|
||||
import tombenpotter.emt.common.items.ItemOneRing;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemFeatherWing;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemThaumiumReinforcedWing;
|
||||
import tombenpotter.emt.common.items.armor.boots.ItemElectricBootsTraveller;
|
||||
import tombenpotter.emt.common.items.armor.boots.ItemNanoBootsTraveller;
|
||||
import tombenpotter.emt.common.items.armor.boots.ItemQuantumBootsTraveller;
|
||||
import tombenpotter.emt.common.items.armor.chestplates.ItemInfusedQuantumChestplate;
|
||||
import tombenpotter.emt.common.items.armor.goggles.ItemElectricGoggles;
|
||||
import tombenpotter.emt.common.items.armor.goggles.ItemNanoGoggles;
|
||||
import tombenpotter.emt.common.items.armor.goggles.ItemQuantumGoggles;
|
||||
import tombenpotter.emt.common.items.armor.goggles.ItemSolarHelmetRevealing;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemNanoWing;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemQuantumWing;
|
||||
import tombenpotter.emt.common.items.foci.ItemChargeFocus;
|
||||
import tombenpotter.emt.common.items.foci.ItemChristmasFocus;
|
||||
import tombenpotter.emt.common.items.foci.ItemExplosionFocus;
|
||||
import tombenpotter.emt.common.items.foci.ItemShieldFocus;
|
||||
import tombenpotter.emt.common.items.foci.ItemWandChargingFocus;
|
||||
import tombenpotter.emt.common.items.tools.ItemElectricHoeGrowth;
|
||||
import tombenpotter.emt.common.items.tools.ItemElectricThorHammer;
|
||||
import tombenpotter.emt.common.items.tools.ItemThorHammer;
|
||||
import tombenpotter.emt.common.items.tools.ItemThorHammerBroken;
|
||||
import tombenpotter.emt.common.items.tools.chainsaws.ItemDiamondChainsaw;
|
||||
import tombenpotter.emt.common.items.tools.chainsaws.ItemStreamChainsaw;
|
||||
import tombenpotter.emt.common.items.tools.chainsaws.ItemThaumiumChainsaw;
|
||||
import tombenpotter.emt.common.items.tools.drills.ItemRockbreakerDrill;
|
||||
import tombenpotter.emt.common.items.tools.drills.ItemThaumiumDrill;
|
||||
import tombenpotter.emt.common.items.tools.omnitools.ItemOmnitoolDiamond;
|
||||
import tombenpotter.emt.common.items.tools.omnitools.ItemOmnitoolIron;
|
||||
import tombenpotter.emt.common.items.tools.omnitools.ItemOmnitoolThaumium;
|
||||
import tombenpotter.emt.common.item.ItemElectricScribingTools;
|
||||
import tombenpotter.emt.common.item.ItemIC2Baubles;
|
||||
import tombenpotter.emt.common.item.ItemMaterials;
|
||||
import tombenpotter.emt.common.item.ItemOneRing;
|
||||
import tombenpotter.emt.common.item.armor.boots.ItemElectricBootsTraveller;
|
||||
import tombenpotter.emt.common.item.armor.boots.ItemNanoBootsTraveller;
|
||||
import tombenpotter.emt.common.item.armor.boots.ItemQuantumBootsTraveller;
|
||||
import tombenpotter.emt.common.item.armor.chestplate.ItemInfusedQuantumChestplate;
|
||||
import tombenpotter.emt.common.item.armor.goggles.ItemElectricGoggles;
|
||||
import tombenpotter.emt.common.item.armor.goggles.ItemNanoGoggles;
|
||||
import tombenpotter.emt.common.item.armor.goggles.ItemQuantumGoggles;
|
||||
import tombenpotter.emt.common.item.armor.goggles.ItemSolarHelmetRevealing;
|
||||
import tombenpotter.emt.common.item.armor.wings.ItemFeatherWing;
|
||||
import tombenpotter.emt.common.item.armor.wings.ItemNanoWing;
|
||||
import tombenpotter.emt.common.item.armor.wings.ItemQuantumWing;
|
||||
import tombenpotter.emt.common.item.armor.wings.ItemThaumiumReinforcedWing;
|
||||
import tombenpotter.emt.common.item.focus.ItemChargeFocus;
|
||||
import tombenpotter.emt.common.item.focus.ItemChristmasFocus;
|
||||
import tombenpotter.emt.common.item.focus.ItemExplosionFocus;
|
||||
import tombenpotter.emt.common.item.focus.ItemShieldFocus;
|
||||
import tombenpotter.emt.common.item.focus.ItemWandChargingFocus;
|
||||
import tombenpotter.emt.common.item.tool.ItemElectricHoeGrowth;
|
||||
import tombenpotter.emt.common.item.tool.ItemElectricThorHammer;
|
||||
import tombenpotter.emt.common.item.tool.ItemThorHammer;
|
||||
import tombenpotter.emt.common.item.tool.ItemThorHammerBroken;
|
||||
import tombenpotter.emt.common.item.tool.chainsaw.ItemDiamondChainsaw;
|
||||
import tombenpotter.emt.common.item.tool.chainsaw.ItemStreamChainsaw;
|
||||
import tombenpotter.emt.common.item.tool.chainsaw.ItemThaumiumChainsaw;
|
||||
import tombenpotter.emt.common.item.tool.drill.ItemRockbreakerDrill;
|
||||
import tombenpotter.emt.common.item.tool.drill.ItemThaumiumDrill;
|
||||
import tombenpotter.emt.common.item.tool.omnitool.ItemOmnitoolDiamond;
|
||||
import tombenpotter.emt.common.item.tool.omnitool.ItemOmnitoolIron;
|
||||
import tombenpotter.emt.common.item.tool.omnitool.ItemOmnitoolThaumium;
|
||||
|
||||
public class ItemRegistry {
|
||||
|
||||
|
||||
@@ -31,9 +31,9 @@ import thaumcraft.common.blocks.ItemJarNode;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.CraftingAspects;
|
||||
import tombenpotter.emt.common.util.RandomHelper;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTCraftingAspects;
|
||||
import tombenpotter.emt.common.util.EMTRandomHelper;
|
||||
|
||||
import java.util.Iterator;
|
||||
|
||||
@@ -44,8 +44,8 @@ public class RecipeRegistry {
|
||||
private static void registerShapedRecipes() {
|
||||
|
||||
/** Crafting Recipes **/
|
||||
ironOmnitool = GameRegistry.addShapedRecipe(RandomHelper.getChargedItem(ItemRegistry.ironOmnitool, 10), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron"));
|
||||
diamondChainsaw = GameRegistry.addShapedRecipe(RandomHelper.getChargedItem(ItemRegistry.diamondChainsaw, 10), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE));
|
||||
ironOmnitool = GameRegistry.addShapedRecipe(EMTRandomHelper.getChargedItem(ItemRegistry.ironOmnitool, 10), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron"));
|
||||
diamondChainsaw = GameRegistry.addShapedRecipe(EMTRandomHelper.getChargedItem(ItemRegistry.diamondChainsaw, 10), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE));
|
||||
ductTape = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 9), "XXX", "YYY", "XXX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 8), 'Y', new ItemStack(Items.paper));
|
||||
featherMesh = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 7), "XYX", "YXY", "XYX", 'X', new ItemStack(Items.feather), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 9));
|
||||
featherWing = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 12), "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 7), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 8), 'Z', new ItemStack(ItemRegistry.itemEMTItems, 1, 11));
|
||||
@@ -90,23 +90,23 @@ public class RecipeRegistry {
|
||||
|
||||
ItemStack iridium = IC2Items.getItem("iridiumOre").copy();
|
||||
iridium.stackSize = 2;
|
||||
uraniumToIridium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", iridium, 4, CraftingAspects.uuMatterInfusions, IC2Items.getItem("Uran238"), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell });
|
||||
uraniumToIridium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", iridium, 4, EMTCraftingAspects.uuMatterInfusions, IC2Items.getItem("Uran238"), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack uranium = IC2Items.getItem("Uran238").copy();
|
||||
uranium.stackSize = 2;
|
||||
diamondToUranium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uranium, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(Items.diamond), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell });
|
||||
diamondToUranium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uranium, 4, EMTCraftingAspects.lesserUUMInfusions, new ItemStack(Items.diamond), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack diamond = new ItemStack(Items.diamond).copy();
|
||||
diamond.stackSize = 1;
|
||||
goldToDiamond = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", diamond, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.gold_ingot), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell });
|
||||
goldToDiamond = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", diamond, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(Items.gold_ingot), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack gold = new ItemStack(Items.gold_ingot).copy();
|
||||
gold.stackSize = 2;
|
||||
ironToGold = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", gold, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.iron_ingot), new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
ironToGold = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", gold, 4, EMTCraftingAspects.cheapestUUMInfusions, new ItemStack(Items.iron_ingot), new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack ironOre = new ItemStack(Blocks.iron_ore).copy();
|
||||
ironOre.stackSize = 16;
|
||||
stoneBricksToIronOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", ironOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Blocks.stonebrick), new ItemStack[] { uuMCell, uuMCell });
|
||||
stoneBricksToIronOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", ironOre, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(Blocks.stonebrick), new ItemStack[] { uuMCell, uuMCell });
|
||||
|
||||
/**
|
||||
* ItemStack copperOre = Items.getItem("copperOre").copy(); BUGGED IN
|
||||
@@ -114,7 +114,7 @@ public class RecipeRegistry {
|
||||
**/
|
||||
ItemStack copperOre = IC2Items.getItem("crushedCopperOre").copy();
|
||||
copperOre.stackSize = 32;
|
||||
arcaneStoneToCopperOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", copperOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack[] { uuMCell, uuMCell });
|
||||
arcaneStoneToCopperOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", copperOre, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack[] { uuMCell, uuMCell });
|
||||
|
||||
/**
|
||||
* ItemStack tinOre = Items.getItem("tinOre").copy(); BUGGED IN 1.6 IF
|
||||
@@ -122,7 +122,7 @@ public class RecipeRegistry {
|
||||
**/
|
||||
ItemStack tinOre = IC2Items.getItem("crushedTinOre").copy();
|
||||
tinOre.stackSize = 32;
|
||||
arcaneStoneBricksToTinOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", tinOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new ItemStack[] { uuMCell, uuMCell });
|
||||
arcaneStoneBricksToTinOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", tinOre, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new ItemStack[] { uuMCell, uuMCell });
|
||||
|
||||
/**
|
||||
* ItemStack leadOre = Items.getItem("leadOre").copy(); BUGGED IN 1.6 IF
|
||||
@@ -130,200 +130,200 @@ public class RecipeRegistry {
|
||||
**/
|
||||
ItemStack leadOre = IC2Items.getItem("crushedLeadOre").copy();
|
||||
leadOre.stackSize = 32;
|
||||
amberBlockToLeadOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", leadOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0), new ItemStack[] { uuMCell, uuMCell });
|
||||
amberBlockToLeadOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", leadOre, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0), new ItemStack[] { uuMCell, uuMCell });
|
||||
|
||||
ItemStack uraniumOre = IC2Items.getItem("uraniumOre").copy();
|
||||
uraniumOre.stackSize = 8;
|
||||
amberBricksToUraniumOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uraniumOre, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1), new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
amberBricksToUraniumOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uraniumOre, 4, EMTCraftingAspects.lesserUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1), new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack coal = new ItemStack(Items.coal, 1, 0).copy();
|
||||
coal.stackSize = 16;
|
||||
charcoalToCoal = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", coal, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.coal, 1, 1), new ItemStack[] { uuMCell, uuMCell });
|
||||
charcoalToCoal = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", coal, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(Items.coal, 1, 1), new ItemStack[] { uuMCell, uuMCell });
|
||||
|
||||
ItemStack stickyResin = IC2Items.getItem("resin").copy();
|
||||
stickyResin.stackSize = 21;
|
||||
shardToResin = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", stickyResin, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
shardToResin = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", stickyResin, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack redstone = new ItemStack(Items.redstone).copy();
|
||||
redstone.stackSize = 24;
|
||||
shardToRedstone = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", redstone, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
shardToRedstone = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", redstone, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack lapisLazuli = new ItemStack(Items.dye, 1, 4).copy();
|
||||
lapisLazuli.stackSize = 8;
|
||||
shardToLapis = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", lapisLazuli, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
shardToLapis = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", lapisLazuli, 4, EMTCraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell });
|
||||
|
||||
ItemStack glowstone = new ItemStack(Blocks.glowstone).copy();
|
||||
glowstone.stackSize = 1;
|
||||
glowstoneDustToBlock = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", glowstone, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.glowstone_dust), new ItemStack[] { uuMCell });
|
||||
glowstoneDustToBlock = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", glowstone, 4, EMTCraftingAspects.cheapestUUMInfusions, new ItemStack(Items.glowstone_dust), new ItemStack[] { uuMCell });
|
||||
}
|
||||
|
||||
public static void registerLateRecipes() {
|
||||
/** Infusion Recipes **/
|
||||
thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", RandomHelper.getChargedItem(ItemRegistry.thaumiumDrill, 10), 5, CraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", EMTRandomHelper.getChargedItem(ItemRegistry.thaumiumDrill, 10), 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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron") });
|
||||
|
||||
thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", RandomHelper.getChargedItem(ItemRegistry.thaumiumChainsaw, 10), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE),
|
||||
thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", EMTRandomHelper.getChargedItem(ItemRegistry.thaumiumChainsaw, 10), 5, EMTCraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron") });
|
||||
|
||||
thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", RandomHelper.getChargedItem(ItemRegistry.quantumThaumicHelmet, 10), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE),
|
||||
thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", EMTRandomHelper.getChargedItem(ItemRegistry.quantumThaumicHelmet, 10), 6, EMTCraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit") });
|
||||
|
||||
thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", RandomHelper.getChargedItem(ItemRegistry.nanoThaumicHelmet, 10), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE),
|
||||
thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", EMTRandomHelper.getChargedItem(ItemRegistry.nanoThaumicHelmet, 10), 5, EMTCraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", RandomHelper.getChargedItem(ItemRegistry.thaumiumOmnitool, 10), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE),
|
||||
thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", EMTRandomHelper.getChargedItem(ItemRegistry.thaumiumOmnitool, 10), 6, EMTCraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] { new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian") });
|
||||
|
||||
diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE),
|
||||
diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, EMTCraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.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") });
|
||||
|
||||
explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(ItemRegistry.explosionFocus), 6, CraftingAspects.laserFocusCrafting, new ItemStack(ConfigItems.itemFocusHellbat, 1),
|
||||
explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(ItemRegistry.explosionFocus), 6, 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) });
|
||||
|
||||
shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(ItemRegistry.shieldFocus), 4, CraftingAspects.shieldFocusCrafting, new ItemStack(ConfigItems.itemFocusPortableHole, 1),
|
||||
shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(ItemRegistry.shieldFocus), 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) });
|
||||
|
||||
potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 0), 6, CraftingAspects.potentiaGeneratorCrafting, IC2Items.getItem("semifluidGenerator"),
|
||||
potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 0), 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") });
|
||||
|
||||
streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", RandomHelper.getChargedItem(ItemRegistry.streamChainsaw, 10), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE),
|
||||
streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", EMTRandomHelper.getChargedItem(ItemRegistry.streamChainsaw, 10), 6, EMTCraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.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") });
|
||||
|
||||
rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", RandomHelper.getChargedItem(ItemRegistry.rockbreakerDrill, 10), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge),
|
||||
rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", EMTRandomHelper.getChargedItem(ItemRegistry.rockbreakerDrill, 10), 6, EMTCraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.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") });
|
||||
|
||||
thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(ItemRegistry.thorHammer), 7, CraftingAspects.thorHammerCrafting, new ItemStack(ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE),
|
||||
thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(ItemRegistry.thorHammer), 7, EMTCraftingAspects.thorHammerCrafting, new ItemStack(ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] { new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemFocusShock), IC2Items.getItem("rubber") });
|
||||
|
||||
superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", RandomHelper.getChargedItem(ItemRegistry.electricThorHammer, 10), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE),
|
||||
superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", EMTRandomHelper.getChargedItem(ItemRegistry.electricThorHammer, 10), 10, EMTCraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] { new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.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 = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(BlockRegistry.emtMachines, 1, 0), 6, CraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5),
|
||||
wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(BlockRegistry.emtMachines, 1, 0), 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) });
|
||||
|
||||
solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", RandomHelper.getChargedItem(ItemRegistry.solarHelmetRevealing, 10), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE),
|
||||
solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", EMTRandomHelper.getChargedItem(ItemRegistry.solarHelmetRevealing, 10), 5, EMTCraftingAspects.solarHelmetRevealing, new ItemStack(ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] { new ItemStack(BlockRegistry.emtSolars, 1, 1), IC2Items.getItem("glassFiberCableItem"), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, 4) });
|
||||
|
||||
electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.electricBootsTraveller, 10), 2, CraftingAspects.electricBootsTravel, new ItemStack(ConfigItems.itemBootsTraveller),
|
||||
electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", EMTRandomHelper.getChargedItem(ItemRegistry.electricBootsTraveller, 10), 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) });
|
||||
|
||||
nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.nanoBootsTraveller, 10), 2, CraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE),
|
||||
nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", EMTRandomHelper.getChargedItem(ItemRegistry.nanoBootsTraveller, 10), 2, EMTCraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.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) });
|
||||
|
||||
quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.quantumBootsTraveller, 10), 2, CraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE),
|
||||
quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", EMTRandomHelper.getChargedItem(ItemRegistry.quantumBootsTraveller, 10), 2, EMTCraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.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") });
|
||||
|
||||
etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(BlockRegistry.emtMachines, 1, 1), 3, CraftingAspects.etherealProcessor, IC2Items.getItem("macerator"),
|
||||
etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(BlockRegistry.emtMachines, 1, 1), 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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5) });
|
||||
|
||||
tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 2), 2, CraftingAspects.compressedSolars, new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack[] { new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1),
|
||||
tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 2), 2, EMTCraftingAspects.compressedSolars, new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack[] { new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1),
|
||||
new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1) });
|
||||
|
||||
electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", RandomHelper.getChargedItem(ItemRegistry.electricHoeGrowth, 10), 4, CraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental),
|
||||
electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", EMTRandomHelper.getChargedItem(ItemRegistry.electricHoeGrowth, 10), 4, 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) });
|
||||
|
||||
chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(ItemRegistry.chargeFocus), 4, CraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(ItemRegistry.chargeFocus), 4, EMTCraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
new ItemStack[] { IC2Items.getItem("generator"), IC2Items.getItem("batBox"), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE) });
|
||||
|
||||
wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(ItemRegistry.wandChargeFocus), 5, CraftingAspects.wandChargeFocus, new ItemStack(BlockRegistry.emtMachines, 1, 0),
|
||||
wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(ItemRegistry.wandChargeFocus), 5, EMTCraftingAspects.wandChargeFocus, new ItemStack(BlockRegistry.emtMachines, 1, 0),
|
||||
new ItemStack[] { new ItemStack(ItemRegistry.chargeFocus), new ItemStack(IC2Items.getItem("energyPack").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate") });
|
||||
|
||||
inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 1), 6, CraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1),
|
||||
inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 1), 6, EMTCraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1),
|
||||
new ItemStack[] { new ItemStack(ItemRegistry.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 = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 0), 6, CraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1),
|
||||
armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 0), 6, EMTCraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1),
|
||||
new ItemStack[] { new ItemStack(ItemRegistry.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 = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", RandomHelper.getChargedItem(ItemRegistry.nanoWing, 10), 4, CraftingAspects.nanoWing, new ItemStack(ItemRegistry.thaumiumWing),
|
||||
nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", EMTRandomHelper.getChargedItem(ItemRegistry.nanoWing, 10), 4, EMTCraftingAspects.nanoWing, new ItemStack(ItemRegistry.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) });
|
||||
|
||||
quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", RandomHelper.getChargedItem(ItemRegistry.quantumWing, 10), 6, CraftingAspects.quantumWing, new ItemStack(ItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE),
|
||||
quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", EMTRandomHelper.getChargedItem(ItemRegistry.quantumWing, 10), 6, EMTCraftingAspects.quantumWing, new ItemStack(ItemRegistry.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) });
|
||||
|
||||
infusedQuantumArmor = ThaumcraftApi.addInfusionCraftingRecipe("Infused Quantum Armor", RandomHelper.getChargedItem(ItemRegistry.quantumArmor, 10), 5, CraftingAspects.quantumWing, new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE),
|
||||
infusedQuantumArmor = ThaumcraftApi.addInfusionCraftingRecipe("Infused Quantum Armor", EMTRandomHelper.getChargedItem(ItemRegistry.quantumArmor, 10), 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(BlockRegistry.shield), new ItemStack(BlockRegistry.shield) });
|
||||
|
||||
/** Arcane Worktable Recipes **/
|
||||
|
||||
diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", RandomHelper.getChargedItem(ItemRegistry.diamondOmnitool, 10), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE));
|
||||
diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", EMTRandomHelper.getChargedItem(ItemRegistry.diamondOmnitool, 10), EMTCraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE));
|
||||
|
||||
ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE));
|
||||
ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), EMTCraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE));
|
||||
|
||||
christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(ItemRegistry.christmasFocus), CraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost));
|
||||
christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(ItemRegistry.christmasFocus), EMTCraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost));
|
||||
|
||||
electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", RandomHelper.getChargedItem(ItemRegistry.electricGoggles, 10), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A',
|
||||
electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", EMTRandomHelper.getChargedItem(ItemRegistry.electricGoggles, 10), EMTCraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A',
|
||||
new ItemStack(IC2Items.getItem("reBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater);
|
||||
|
||||
electricGoggles2 = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", RandomHelper.getChargedItem(ItemRegistry.electricGoggles, 10), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A',
|
||||
electricGoggles2 = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", EMTRandomHelper.getChargedItem(ItemRegistry.electricGoggles, 10), EMTCraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A',
|
||||
new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater);
|
||||
|
||||
shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Block", new ItemStack(BlockRegistry.shield, 6), CraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian));
|
||||
shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Block", new ItemStack(BlockRegistry.shield, 6), EMTCraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian));
|
||||
|
||||
tinyUranium = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Tiny Uranium", new ItemStack(IC2Items.getItem("smallUran235").getItem(), 7), CraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238"));
|
||||
tinyUranium = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Tiny Uranium", new ItemStack(IC2Items.getItem("smallUran235").getItem(), 7), EMTCraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238"));
|
||||
|
||||
compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel"));
|
||||
compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel"));
|
||||
|
||||
doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(BlockRegistry.emtSolars, 1, 0));
|
||||
doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(BlockRegistry.emtSolars, 1, 0));
|
||||
|
||||
electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", RandomHelper.getChargedItem(ItemRegistry.electricScribingTools, 10), CraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z',
|
||||
electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", EMTRandomHelper.getChargedItem(ItemRegistry.electricScribingTools, 10), EMTCraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z',
|
||||
new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE));
|
||||
|
||||
thaumiumWing = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.itemEMTItems, 1, 14), CraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 13), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 5), 'Z', IC2Items.getItem("plateiron"));
|
||||
thaumiumWing = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.itemEMTItems, 1, 14), EMTCraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 13), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 5), 'Z', IC2Items.getItem("plateiron"));
|
||||
|
||||
thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.thaumiumWing), CraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 14));
|
||||
thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.thaumiumWing), EMTCraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 14));
|
||||
|
||||
/** Crucible Recipes **/
|
||||
|
||||
ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 1), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.ignisGeneratorCrafting);
|
||||
ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 1), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.ignisGeneratorCrafting);
|
||||
|
||||
auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 2), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.auramGeneratorCrafting);
|
||||
auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 2), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.auramGeneratorCrafting);
|
||||
|
||||
arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 3), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.arborGeneratorCrafting);
|
||||
arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 3), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.arborGeneratorCrafting);
|
||||
|
||||
aerGenerator = ThaumcraftApi.addCrucibleRecipe("Aer Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 4), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.aerGenerator);
|
||||
aerGenerator = ThaumcraftApi.addCrucibleRecipe("Aer Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 4), new ItemStack(BlockRegistry.essentiaGens, 1, 0), EMTCraftingAspects.aerGenerator);
|
||||
|
||||
waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.waterSolars);
|
||||
waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.waterSolars);
|
||||
|
||||
doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.waterSolars);
|
||||
doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.waterSolars);
|
||||
|
||||
tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 5), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.waterSolars);
|
||||
tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 5), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.waterSolars);
|
||||
|
||||
darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 6), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.darkSolars);
|
||||
darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 6), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.darkSolars);
|
||||
|
||||
doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 7), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.darkSolars);
|
||||
doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 7), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.darkSolars);
|
||||
|
||||
tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 8), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.darkSolars);
|
||||
tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 8), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.darkSolars);
|
||||
|
||||
orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 9), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.orderSolars);
|
||||
orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 9), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.orderSolars);
|
||||
|
||||
doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 10), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.orderSolars);
|
||||
doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 10), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.orderSolars);
|
||||
|
||||
tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 11), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.orderSolars);
|
||||
tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 11), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.orderSolars);
|
||||
|
||||
fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 12), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.fireSolars);
|
||||
fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 12), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.fireSolars);
|
||||
|
||||
doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 13), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.fireSolars);
|
||||
doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 13), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.fireSolars);
|
||||
|
||||
tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 14), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.fireSolars);
|
||||
tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 14), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.fireSolars);
|
||||
|
||||
airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 15), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.airSolars);
|
||||
airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 15), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.airSolars);
|
||||
|
||||
doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 0), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.airSolars);
|
||||
doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 0), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.airSolars);
|
||||
|
||||
tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.airSolars);
|
||||
tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.airSolars);
|
||||
|
||||
earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 2), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.earthSolars);
|
||||
earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 2), new ItemStack(BlockRegistry.emtSolars, 1, 0), EMTCraftingAspects.earthSolars);
|
||||
|
||||
doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.earthSolars);
|
||||
doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 1), EMTCraftingAspects.earthSolars);
|
||||
|
||||
tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.earthSolars);
|
||||
tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 2), EMTCraftingAspects.earthSolars);
|
||||
|
||||
ItemStack itemStack = new ItemStack(ConfigItems.itemJarNode);
|
||||
((ItemJarNode) itemStack.getItem()).setAspects(itemStack, new AspectList());
|
||||
portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(BlockRegistry.portableNode), itemStack, CraftingAspects.portableNode);
|
||||
portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(BlockRegistry.portableNode), itemStack, EMTCraftingAspects.portableNode);
|
||||
|
||||
uuMCrystal = ThaumcraftApi.addCrucibleRecipe("UU-Matter Infusion", new ItemStack(ItemRegistry.itemEMTItems, 1, 15), Ic2Items.uuMatterCell.copy(), CraftingAspects.uuMatterCrystal);
|
||||
uuMCrystal = ThaumcraftApi.addCrucibleRecipe("UU-Matter Infusion", new ItemStack(ItemRegistry.itemEMTItems, 1, 15), Ic2Items.uuMatterCell.copy(), EMTCraftingAspects.uuMatterCrystal);
|
||||
|
||||
/** IC2 Stuff related recipes **/
|
||||
|
||||
@@ -357,7 +357,7 @@ public class RecipeRegistry {
|
||||
Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(ItemRegistry.itemEMTItems, 1, 5));
|
||||
|
||||
/* Ore Processing for Amber and Cinnabar */
|
||||
if (ConfigHandler.removeAmberAndCinnabarMacerating) {
|
||||
if (EMTConfigHandler.removeAmberAndCinnabarMacerating) {
|
||||
for (Iterator<IRecipeInput> it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext();) {
|
||||
IRecipeInput input = it.next();
|
||||
if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) {
|
||||
|
||||
@@ -3,32 +3,32 @@ package tombenpotter.emt.common.init;
|
||||
import tombenpotter.emt.common.tile.TileEntityEtherealMacerator;
|
||||
import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge;
|
||||
import tombenpotter.emt.common.tile.TileEntityPortableNode;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityAerGenerator;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityArborGenerator;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityAuramGenerator;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityIgnisGenerator;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityPotentiaGenerator;
|
||||
import tombenpotter.emt.common.tile.solars.air.TileEntityAirSolar;
|
||||
import tombenpotter.emt.common.tile.solars.air.TileEntityDoubleAirSolar;
|
||||
import tombenpotter.emt.common.tile.solars.air.TileEntityTripleAirSolar;
|
||||
import tombenpotter.emt.common.tile.solars.compressed.TileEntityCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solars.compressed.TileEntityDoubleCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solars.compressed.TileEntityTripleCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solars.dark.TileEntityDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solars.dark.TileEntityDoubleDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solars.dark.TileEntityTripleDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solars.earth.TileEntityDoubleEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solars.earth.TileEntityEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solars.earth.TileEntityTripleEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solars.fire.TileEntityDoubleFireSolar;
|
||||
import tombenpotter.emt.common.tile.solars.fire.TileEntityFireSolar;
|
||||
import tombenpotter.emt.common.tile.solars.fire.TileEntityTripleFireSolar;
|
||||
import tombenpotter.emt.common.tile.solars.order.TileEntityDoubleOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solars.order.TileEntityOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solars.order.TileEntityTripleOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solars.water.TileEntityDoubleWaterSolar;
|
||||
import tombenpotter.emt.common.tile.solars.water.TileEntityTripleWaterSolar;
|
||||
import tombenpotter.emt.common.tile.solars.water.TileEntityWaterSolar;
|
||||
import tombenpotter.emt.common.tile.generator.TileEntityAerGenerator;
|
||||
import tombenpotter.emt.common.tile.generator.TileEntityArborGenerator;
|
||||
import tombenpotter.emt.common.tile.generator.TileEntityAuramGenerator;
|
||||
import tombenpotter.emt.common.tile.generator.TileEntityIgnisGenerator;
|
||||
import tombenpotter.emt.common.tile.generator.TileEntityPotentiaGenerator;
|
||||
import tombenpotter.emt.common.tile.solar.air.TileEntityAirSolar;
|
||||
import tombenpotter.emt.common.tile.solar.air.TileEntityDoubleAirSolar;
|
||||
import tombenpotter.emt.common.tile.solar.air.TileEntityTripleAirSolar;
|
||||
import tombenpotter.emt.common.tile.solar.compressed.TileEntityCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solar.compressed.TileEntityDoubleCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solar.compressed.TileEntityTripleCompressedSolar;
|
||||
import tombenpotter.emt.common.tile.solar.dark.TileEntityDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solar.dark.TileEntityDoubleDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solar.dark.TileEntityTripleDarkSolar;
|
||||
import tombenpotter.emt.common.tile.solar.earth.TileEntityDoubleEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solar.earth.TileEntityEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solar.earth.TileEntityTripleEarthSolar;
|
||||
import tombenpotter.emt.common.tile.solar.fire.TileEntityDoubleFireSolar;
|
||||
import tombenpotter.emt.common.tile.solar.fire.TileEntityFireSolar;
|
||||
import tombenpotter.emt.common.tile.solar.fire.TileEntityTripleFireSolar;
|
||||
import tombenpotter.emt.common.tile.solar.order.TileEntityDoubleOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solar.order.TileEntityOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solar.order.TileEntityTripleOrderSolar;
|
||||
import tombenpotter.emt.common.tile.solar.water.TileEntityDoubleWaterSolar;
|
||||
import tombenpotter.emt.common.tile.solar.water.TileEntityTripleWaterSolar;
|
||||
import tombenpotter.emt.common.tile.solar.water.TileEntityWaterSolar;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class TileRegistry {
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package tombenpotter.emt.common.items;
|
||||
package tombenpotter.emt.common.item;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
public class ItemBase extends Item {
|
||||
|
||||
@@ -24,6 +24,6 @@ public class ItemBase extends Item {
|
||||
|
||||
public String getItemStackDisplayName(ItemStack stack)
|
||||
{
|
||||
return (TextHelper.GREEN + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim();
|
||||
return (EMTTextHelper.GREEN + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim();
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items;
|
||||
package tombenpotter.emt.common.item;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items;
|
||||
package tombenpotter.emt.common.item;
|
||||
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
@@ -14,7 +14,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
@@ -86,7 +86,7 @@ public class ItemIC2Baubles extends ItemBase implements IBauble {
|
||||
if (stack != null) {
|
||||
if (stack.getItemDamage() == 0) {
|
||||
if (player instanceof EntityPlayer) {
|
||||
int energyLeft = ConfigHandler.armorBaubleProduction;
|
||||
int energyLeft = EMTConfigHandler.armorBaubleProduction;
|
||||
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)) {
|
||||
@@ -101,7 +101,7 @@ public class ItemIC2Baubles extends ItemBase implements IBauble {
|
||||
if (stack != null) {
|
||||
if (stack.getItemDamage() == 1) {
|
||||
if (player instanceof EntityPlayer) {
|
||||
int energyLeft = ConfigHandler.inventoryBaubleProdution;
|
||||
int energyLeft = EMTConfigHandler.inventoryBaubleProdution;
|
||||
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)) {
|
||||
+4
-5
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items;
|
||||
package tombenpotter.emt.common.item;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -130,9 +130,8 @@ public class ItemMaterials extends Item {
|
||||
list.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
}
|
||||
|
||||
public void onUsingTick(ItemStack stack, EntityPlayer player, int count)
|
||||
{
|
||||
|
||||
public void onUsingTick(ItemStack stack, EntityPlayer player, int count) {
|
||||
if (stack != null && stack.getItemDamage() == 6 && this.getMaxItemUseDuration(stack) - count >= 40) {
|
||||
World world = player.worldObj;
|
||||
player.swingItem();
|
||||
@@ -171,7 +170,7 @@ public class ItemMaterials extends Item {
|
||||
}
|
||||
player.stopUsingItem();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
|
||||
if (stack.getItemDamage() == 6) {
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items;
|
||||
package tombenpotter.emt.common.item;
|
||||
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
@@ -17,7 +17,7 @@ import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.IIcon;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
@@ -94,7 +94,7 @@ public class ItemOneRing extends ItemBase implements IBauble {
|
||||
|
||||
if (!player.worldObj.isRemote) {
|
||||
if (corruption <= 0) {
|
||||
((EntityPlayer) player).addChatMessage(new ChatComponentText(TextHelper.PURPLE + "You have worn the Ring. Your soul has now been forever " + TextHelper.PURPLE + "tainted. " + TextHelper.RED + TextHelper.ITALIC + "Beware of wearing the ring. The tainting will only " + TextHelper.RED + TextHelper.ITALIC + "increase, and strange things will start happening."));
|
||||
((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."));
|
||||
}
|
||||
else if (corruption > 6000 && corruption < 24000 && random.nextInt(2000) == 0) {
|
||||
player.addPotionEffect(new PotionEffect(Potion.blindness.id, 500, 2, false));
|
||||
+6
-6
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.boots;
|
||||
package tombenpotter.emt.common.item.armor.boots;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -26,8 +26,8 @@ import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -106,7 +106,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
|
||||
list.add(TextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%");
|
||||
list.add(EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -175,7 +175,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt
|
||||
|
||||
@Override
|
||||
public int getItemEnchantability() {
|
||||
if (ConfigHandler.enchanting == false) {
|
||||
if (EMTConfigHandler.enchanting == false) {
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
@@ -185,7 +185,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt
|
||||
|
||||
@Override
|
||||
public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
|
||||
if (ConfigHandler.enchanting == false) {
|
||||
if (EMTConfigHandler.enchanting == false) {
|
||||
return false;
|
||||
}
|
||||
else {
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.boots;
|
||||
package tombenpotter.emt.common.item.armor.boots;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -6,15 +6,15 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller {
|
||||
|
||||
public ItemNanoBootsTraveller(int par3, int par4) {
|
||||
super(par3, par4);
|
||||
maxCharge = 1000000;
|
||||
speedBonus = (float) ConfigHandler.nanoBootsSpeed;
|
||||
jumpBonus = (float) ConfigHandler.nanoBootsJump;
|
||||
speedBonus = (float) EMTConfigHandler.nanoBootsSpeed;
|
||||
jumpBonus = (float) EMTConfigHandler.nanoBootsJump;
|
||||
visDiscount = 4;
|
||||
transferLimit = 1000;
|
||||
energyPerDamage = 500;
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.boots;
|
||||
package tombenpotter.emt.common.item.armor.boots;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -6,15 +6,15 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller {
|
||||
|
||||
public ItemQuantumBootsTraveller(int par3, int par4) {
|
||||
super(par3, par4);
|
||||
maxCharge = 10000000;
|
||||
speedBonus = (float) ConfigHandler.quantumBootsSpeed;
|
||||
jumpBonus = (float) ConfigHandler.quantumBootsJump;
|
||||
speedBonus = (float) EMTConfigHandler.quantumBootsSpeed;
|
||||
jumpBonus = (float) EMTConfigHandler.quantumBootsJump;
|
||||
visDiscount = 5;
|
||||
transferLimit = 10000;
|
||||
energyPerDamage = 1000;
|
||||
+8
-8
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.chestplates;
|
||||
package tombenpotter.emt.common.item.armor.chestplate;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.EventBus;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
@@ -35,11 +35,11 @@ import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.client.model.ModelCpecialArmor;
|
||||
import tombenpotter.emt.client.model.ModelWings;
|
||||
import tombenpotter.emt.common.init.ItemRegistry;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemNanoWing;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemQuantumWing;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.RandomHelper;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.item.armor.wings.ItemNanoWing;
|
||||
import tombenpotter.emt.common.item.armor.wings.ItemQuantumWing;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTRandomHelper;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -380,7 +380,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
|
||||
|
||||
@Override
|
||||
public int getItemEnchantability() {
|
||||
if (ConfigHandler.enchanting == false)
|
||||
if (EMTConfigHandler.enchanting == false)
|
||||
return 0;
|
||||
else
|
||||
return 4;
|
||||
@@ -530,7 +530,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
|
||||
player.motionY += -0.05;
|
||||
}
|
||||
|
||||
if (ConfigHandler.impactOfRain) {
|
||||
if (EMTConfigHandler.impactOfRain) {
|
||||
if ((world.getBiomeGenForCoords((int) player.posX, (int) player.posZ)).canSpawnLightningBolt() && world.canBlockSeeTheSky((int) player.posX, (int) player.posY, (int) player.posZ) && world.isRaining() && !player.capabilities.isCreativeMode) {
|
||||
player.motionY += -0.05;
|
||||
}
|
||||
+6
-6
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.goggles;
|
||||
package tombenpotter.emt.common.item.armor.goggles;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -22,8 +22,8 @@ import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.nodes.IRevealer;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -75,7 +75,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi
|
||||
|
||||
@Override
|
||||
public int getItemEnchantability() {
|
||||
if (ConfigHandler.enchanting == false) {
|
||||
if (EMTConfigHandler.enchanting == false) {
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
@@ -85,7 +85,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi
|
||||
|
||||
@Override
|
||||
public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
|
||||
if (ConfigHandler.enchanting == false) {
|
||||
if (EMTConfigHandler.enchanting == false) {
|
||||
return false;
|
||||
}
|
||||
else {
|
||||
@@ -139,7 +139,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi
|
||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
|
||||
list.add(TextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%");
|
||||
list.add(EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%");
|
||||
}
|
||||
|
||||
@Override
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.goggles;
|
||||
package tombenpotter.emt.common.item.armor.goggles;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -13,7 +13,7 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class ItemNanoGoggles extends ItemElectricGoggles {
|
||||
|
||||
@@ -42,7 +42,7 @@ public class ItemNanoGoggles extends ItemElectricGoggles {
|
||||
|
||||
@Override
|
||||
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
|
||||
if (ConfigHandler.nightVisionOff == false) {
|
||||
if (EMTConfigHandler.nightVisionOff == false) {
|
||||
if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) {
|
||||
|
||||
int x = MathHelper.floor_double(player.posX);
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.goggles;
|
||||
package tombenpotter.emt.common.item.armor.goggles;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -14,7 +14,7 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
@@ -81,7 +81,7 @@ public class ItemQuantumGoggles extends ItemNanoGoggles {
|
||||
}
|
||||
while (true);
|
||||
|
||||
if (ConfigHandler.nightVisionOff == false) {
|
||||
if (EMTConfigHandler.nightVisionOff == false) {
|
||||
if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) {
|
||||
int x = MathHelper.floor_double(player.posX);
|
||||
int z = MathHelper.floor_double(player.posZ);
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.goggles;
|
||||
package tombenpotter.emt.common.item.armor.goggles;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -15,7 +15,7 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
@@ -69,7 +69,7 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles {
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void onArmorTick(World worldObj, EntityPlayer player, ItemStack itemStack) {
|
||||
if (ConfigHandler.nightVisionOff == false) {
|
||||
if (EMTConfigHandler.nightVisionOff == false) {
|
||||
if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) {
|
||||
|
||||
int x = MathHelper.floor_double(player.posX);
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.wings;
|
||||
package tombenpotter.emt.common.item.armor.wings;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -20,7 +20,7 @@ import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.client.model.ModelWings;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class ItemFeatherWing extends ItemArmor {
|
||||
|
||||
@@ -106,7 +106,7 @@ public class ItemFeatherWing extends ItemArmor {
|
||||
player.motionY += -0.03;
|
||||
}
|
||||
|
||||
if (ConfigHandler.impactOfRain) {
|
||||
if (EMTConfigHandler.impactOfRain) {
|
||||
if ((world.getBiomeGenForCoords((int) player.posX, (int) player.posZ)).canSpawnLightningBolt() && world.canBlockSeeTheSky((int) player.posX, (int) player.posY, (int) player.posZ) && world.isRaining() && !player.capabilities.isCreativeMode) {
|
||||
player.motionY += -0.03;
|
||||
}
|
||||
+5
-5
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.wings;
|
||||
package tombenpotter.emt.common.item.armor.wings;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -18,8 +18,8 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ISpecialArmor;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.items.armor.wings.ItemThaumiumReinforcedWing;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.item.armor.wings.ItemThaumiumReinforcedWing;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -80,7 +80,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri
|
||||
|
||||
@Override
|
||||
public int getItemEnchantability() {
|
||||
if (ConfigHandler.enchanting == false) {
|
||||
if (EMTConfigHandler.enchanting == false) {
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
@@ -90,7 +90,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri
|
||||
|
||||
@Override
|
||||
public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
|
||||
if (ConfigHandler.enchanting == false) {
|
||||
if (EMTConfigHandler.enchanting == false) {
|
||||
return false;
|
||||
}
|
||||
else {
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.wings;
|
||||
package tombenpotter.emt.common.item.armor.wings;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class ItemQuantumWing extends ItemNanoWing {
|
||||
public static int maxCharge = 1000000;
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.armor.wings;
|
||||
package tombenpotter.emt.common.item.armor.wings;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -14,8 +14,8 @@ import thaumcraft.api.IVisDiscountGear;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
import ic2.core.IC2;
|
||||
import ic2.core.util.StackUtil;
|
||||
|
||||
@@ -51,7 +51,7 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
|
||||
list.add(TextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%");
|
||||
list.add(EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%");
|
||||
}
|
||||
|
||||
@Override
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.blocks;
|
||||
package tombenpotter.emt.common.item.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
@@ -0,0 +1,184 @@
|
||||
package tombenpotter.emt.common.item.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static tombenpotter.emt.common.util.EMTTextHelper.localize;
|
||||
|
||||
public class ItemBlockEMTSolars extends ItemBlock {
|
||||
|
||||
public ItemBlockEMTSolars(Block id) {
|
||||
super(id);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack itemstack) {
|
||||
String name = "";
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0: {
|
||||
name = "compressed";
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
name = "doublecompressed";
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
name = "triplecompressed";
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
name = "water";
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
name = "doublewater";
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
name = "triplewater";
|
||||
break;
|
||||
}
|
||||
case 6: {
|
||||
name = "dark";
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
name = "doubledark";
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
name = "tripledark";
|
||||
break;
|
||||
}
|
||||
case 9: {
|
||||
name = "order";
|
||||
break;
|
||||
}
|
||||
case 10: {
|
||||
name = "doubleorder";
|
||||
break;
|
||||
}
|
||||
case 11: {
|
||||
name = "tripleorder";
|
||||
break;
|
||||
}
|
||||
case 12: {
|
||||
name = "fire";
|
||||
break;
|
||||
}
|
||||
case 13: {
|
||||
name = "doublefire";
|
||||
break;
|
||||
}
|
||||
case 14: {
|
||||
name = "triplefire";
|
||||
break;
|
||||
}
|
||||
case 15: {
|
||||
name = "air";
|
||||
break;
|
||||
}
|
||||
default:
|
||||
name = "nothing";
|
||||
break;
|
||||
}
|
||||
return getUnlocalizedName() + "." + name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(int par1) {
|
||||
return par1;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) {
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0: {
|
||||
list.add(EMTConfigHandler.compressedSolarOutput + localize("tooltip.EMT.euPerTick"));
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
list.add(EMTConfigHandler.doubleCompressedSolarOutput + localize("tooltip.EMT.euPerTick"));
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
list.add(EMTConfigHandler.tripleCompressedSolarOutput + localize("tooltip.EMT.euPerTick"));
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining"));
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining"));
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining"));
|
||||
break;
|
||||
}
|
||||
case 6: {
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 9: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple"));
|
||||
break;
|
||||
}
|
||||
case 10: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple"));
|
||||
break;
|
||||
}
|
||||
|
||||
case 11: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple"));
|
||||
break;
|
||||
}
|
||||
case 12: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
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 + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
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 + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + 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: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height"));
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
list.add(localize("tooltip.EMT.forget"));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
package tombenpotter.emt.common.item.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static tombenpotter.emt.common.util.EMTTextHelper.localize;
|
||||
|
||||
public class ItemBlockEMTSolars2 extends ItemBlock {
|
||||
|
||||
public ItemBlockEMTSolars2(Block id) {
|
||||
super(id);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack itemstack) {
|
||||
String name = "";
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0: {
|
||||
name = "doubleair";
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
name = "tripleair";
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
name = "earth";
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
name = "doubleearth";
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
name = "tripleearth";
|
||||
break;
|
||||
}
|
||||
default:
|
||||
name = "nothing";
|
||||
break;
|
||||
}
|
||||
return getUnlocalizedName() + "." + name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(int par1) {
|
||||
return par1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) {
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height"));
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height"));
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low"));
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low"));
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low"));
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
list.add(localize("tooltip.EMT.forget"));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.blocks;
|
||||
package tombenpotter.emt.common.item.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -0,0 +1,53 @@
|
||||
package tombenpotter.emt.common.item.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tombenpotter.emt.common.tile.generator.TileEntityAerGenerator;
|
||||
import tombenpotter.emt.common.tile.generator.TileEntityArborGenerator;
|
||||
import tombenpotter.emt.common.tile.generator.TileEntityAuramGenerator;
|
||||
import tombenpotter.emt.common.tile.generator.TileEntityIgnisGenerator;
|
||||
import tombenpotter.emt.common.tile.generator.TileEntityPotentiaGenerator;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class ItemBlockEssentiaGenerators extends ItemBlock {
|
||||
|
||||
public ItemBlockEssentiaGenerators(Block id) {
|
||||
super(id);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack itemstack) {
|
||||
String name = "";
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0:
|
||||
name = "potentia";
|
||||
break;
|
||||
case 1:
|
||||
name = "ignis";
|
||||
break;
|
||||
case 2:
|
||||
name = "auram";
|
||||
break;
|
||||
case 3:
|
||||
name = "arbor";
|
||||
break;
|
||||
case 4:
|
||||
name = "aer";
|
||||
break;
|
||||
default:
|
||||
name = "nothing";
|
||||
}
|
||||
return getUnlocalizedName() + "." + name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(int meta) {
|
||||
return meta;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.foci;
|
||||
package tombenpotter.emt.common.item.focus;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
+3
-4
@@ -1,9 +1,8 @@
|
||||
package tombenpotter.emt.common.items.foci;
|
||||
package tombenpotter.emt.common.item.focus;
|
||||
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -14,7 +13,7 @@ import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.FocusUpgradeType;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class ItemChargeFocus extends ItemBaseFocus {
|
||||
|
||||
@@ -62,7 +61,7 @@ public class ItemChargeFocus extends ItemBaseFocus {
|
||||
if (player.capabilities.isCreativeMode || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) {
|
||||
if (!world.isRemote) {
|
||||
|
||||
int energyLeft = (int)(ConfigHandler.chargeFocusProduction * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency)));
|
||||
int energyLeft = (int)(EMTConfigHandler.chargeFocusProduction * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency)));
|
||||
for (int i = 0; i < player.inventory.armorInventory.length; i++) {
|
||||
if (energyLeft > 0) {
|
||||
if ((player.inventory.armorInventory[i] != null) && (player.inventory.armorInventory[i].getItem() instanceof IElectricItem)) {
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.foci;
|
||||
package tombenpotter.emt.common.item.focus;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.foci;
|
||||
package tombenpotter.emt.common.item.focus;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -10,7 +10,7 @@ import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.FocusUpgradeType;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import tombenpotter.emt.common.entities.EntityLaser;
|
||||
import tombenpotter.emt.common.entity.EntityLaser;
|
||||
|
||||
public class ItemExplosionFocus extends ItemBaseFocus {
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
package tombenpotter.emt.common.item.focus;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedList;
|
||||
|
||||
import ic2.core.IC2;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
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 tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.common.entity.EntityShield;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
|
||||
public class ItemShieldFocus extends ItemBaseFocus {
|
||||
private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 5).add(Aspect.WATER, 5).add(Aspect.AIR, 5);
|
||||
|
||||
public ItemShieldFocus() {
|
||||
super(".focus.shield", "focus_shield");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getFocusColor(ItemStack stack) {
|
||||
return 0x1E90FF;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AspectList getVisCost(ItemStack stack) {
|
||||
return visCost;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSortingHelper(ItemStack itemstack) {
|
||||
return "SHIELD";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isUseItem(ItemStack stack) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count) {
|
||||
ItemWandCasting wand = (ItemWandCasting) itemstack.getItem();
|
||||
for (PotionEffect effect : new LinkedList<PotionEffect>(player.getActivePotionEffects())) {
|
||||
IC2.platform.removePotion(player, effect.getPotionID());
|
||||
}
|
||||
if (player.capabilities.isCreativeMode)
|
||||
return;
|
||||
if (!wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) {
|
||||
player.stopUsingItem();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
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))) {
|
||||
EntityShield shield = new EntityShield(world, player);
|
||||
world.spawnEntityInWorld(shield);
|
||||
}
|
||||
return itemstack;
|
||||
}
|
||||
}
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.foci;
|
||||
package tombenpotter.emt.common.item.focus;
|
||||
|
||||
import java.util.Map.Entry;
|
||||
|
||||
@@ -9,8 +9,8 @@ import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.FocusUpgradeType;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import tombenpotter.emt.common.items.foci.ItemBaseFocus;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.item.focus.ItemBaseFocus;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class ItemWandChargingFocus extends ItemBaseFocus {
|
||||
|
||||
@@ -65,7 +65,7 @@ public class ItemWandChargingFocus extends ItemBaseFocus {
|
||||
|
||||
ItemStack armor = player.inventory.armorInventory[1];
|
||||
if (armor != null) {
|
||||
if ((ElectricItem.manager.use(armor, ConfigHandler.wandChargeFocusCost / 4, player) && (ElectricItem.manager.use(armor, ConfigHandler.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, ConfigHandler.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, ConfigHandler.wandChargeFocusCost / 4, player)))) {
|
||||
if ((ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player) && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)))) {
|
||||
int amount = (int)(100 * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency)));
|
||||
wandItem.addRealVis(itemstack, Aspect.ORDER, amount, true);
|
||||
wandItem.addRealVis(itemstack, Aspect.FIRE, amount, true);
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools;
|
||||
package tombenpotter.emt.common.item.tool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
+7
-7
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools;
|
||||
package tombenpotter.emt.common.item.tool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -18,9 +18,9 @@ import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.entities.EntityArcher;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.entity.EntityArcher;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -68,7 +68,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem {
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
|
||||
list.add(TextHelper.localize("tooltip.EMT.hammer.electric").replace("%player%", player.getCommandSenderName()));
|
||||
list.add(EMTTextHelper.localize("tooltip.EMT.hammer.electric").replace("%player%", player.getCommandSenderName()));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -145,7 +145,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem {
|
||||
|
||||
@Override
|
||||
public int getItemEnchantability() {
|
||||
if (ConfigHandler.enchanting == false) {
|
||||
if (EMTConfigHandler.enchanting == false) {
|
||||
return 0;
|
||||
} else {
|
||||
return 4;
|
||||
@@ -154,7 +154,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem {
|
||||
|
||||
@Override
|
||||
public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
|
||||
return ConfigHandler.enchanting;
|
||||
return EMTConfigHandler.enchanting;
|
||||
}
|
||||
|
||||
/* IC2 API METHODS */
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools;
|
||||
package tombenpotter.emt.common.item.tool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -18,7 +18,7 @@ import net.minecraft.world.World;
|
||||
import thaumcraft.api.IRepairable;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -90,6 +90,6 @@ public class ItemThorHammer extends ItemSword implements IRepairable {
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
|
||||
list.add(TextHelper.localize("tooltip.EMT.hammer.broken.The Hammer of Thor"));
|
||||
list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.The Hammer of Thor"));
|
||||
}
|
||||
}
|
||||
+6
-6
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools;
|
||||
package tombenpotter.emt.common.item.tool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -17,7 +17,7 @@ import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.common.entities.projectile.EntityAlumentum;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
import tombenpotter.emt.common.util.EMTTextHelper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -63,13 +63,13 @@ public class ItemThorHammerBroken extends ItemSword implements IRepairable {
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer entityPlayer, List list, boolean par4) {
|
||||
list.add(TextHelper.localize("tooltip.EMT.hammer.broken.thor"));
|
||||
list.add(TextHelper.localize("tooltip.EMT.hammer.broken.danger"));
|
||||
list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.thor"));
|
||||
list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.danger"));
|
||||
if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
|
||||
list.add(TextHelper.localize("tooltip.EMT.hammer.broken.plsNoRightClick"));
|
||||
list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.plsNoRightClick"));
|
||||
}
|
||||
else {
|
||||
list.add(TextHelper.localize("tooltip.EMT.hammer.broken.plsRightClick"));
|
||||
list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.plsRightClick"));
|
||||
}
|
||||
}
|
||||
}
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools.chainsaws;
|
||||
package tombenpotter.emt.common.item.tool.chainsaw;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -24,7 +24,7 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
@@ -169,7 +169,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
|
||||
|
||||
@Override
|
||||
public int getItemEnchantability() {
|
||||
if (ConfigHandler.enchanting == false) {
|
||||
if (EMTConfigHandler.enchanting == false) {
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
@@ -179,7 +179,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
|
||||
|
||||
@Override
|
||||
public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
|
||||
return ConfigHandler.enchanting;
|
||||
return EMTConfigHandler.enchanting;
|
||||
}
|
||||
|
||||
/* IC2 API METHODS */
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools.chainsaws;
|
||||
package tombenpotter.emt.common.item.tool.chainsaw;
|
||||
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools.chainsaws;
|
||||
package tombenpotter.emt.common.item.tool.chainsaw;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools.drills;
|
||||
package tombenpotter.emt.common.item.tool.drill;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -26,7 +26,7 @@ import thaumcraft.common.entities.EntityFollowingItem;
|
||||
import thaumcraft.common.lib.utils.BlockUtils;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.ArrayList;
|
||||
@@ -47,7 +47,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
|
||||
setCreativeTab(ElectroMagicTools.tabEMT);
|
||||
this.efficiencyOnProperMaterial = 25F;
|
||||
this.setMaxStackSize(1);
|
||||
if (ConfigHandler.toolsInBore == false) {
|
||||
if (EMTConfigHandler.toolsInBore == false) {
|
||||
this.setMaxDamage(27);
|
||||
}
|
||||
else {
|
||||
@@ -84,7 +84,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) {
|
||||
if (ConfigHandler.toolsInBore == false) {
|
||||
if (EMTConfigHandler.toolsInBore == false) {
|
||||
cost = 350;
|
||||
}
|
||||
else {
|
||||
+8
-8
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools.drills;
|
||||
package tombenpotter.emt.common.item.tool.drill;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.RandomHelper;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTRandomHelper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -33,7 +33,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem {
|
||||
this.efficiencyOnProperMaterial = 20F;
|
||||
this.setCreativeTab(ElectroMagicTools.tabEMT);
|
||||
this.setMaxStackSize(1);
|
||||
if (ConfigHandler.toolsInBore == false) {
|
||||
if (EMTConfigHandler.toolsInBore == false) {
|
||||
this.setMaxDamage(27);
|
||||
} else {
|
||||
this.setMaxDamage(240);
|
||||
@@ -61,7 +61,7 @@ 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) {
|
||||
if (ConfigHandler.toolsInBore == false) {
|
||||
if (EMTConfigHandler.toolsInBore == false) {
|
||||
cost = 250;
|
||||
} else {
|
||||
cost = 1;
|
||||
@@ -95,7 +95,7 @@ public class ItemThaumiumDrill 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) {
|
||||
return RandomHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset);
|
||||
return EMTRandomHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -105,7 +105,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem {
|
||||
|
||||
@Override
|
||||
public int getItemEnchantability() {
|
||||
if (ConfigHandler.enchanting == false) {
|
||||
if (EMTConfigHandler.enchanting == false) {
|
||||
return 0;
|
||||
} else {
|
||||
return 4;
|
||||
@@ -114,7 +114,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem {
|
||||
|
||||
@Override
|
||||
public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
|
||||
return ConfigHandler.enchanting;
|
||||
return EMTConfigHandler.enchanting;
|
||||
}
|
||||
|
||||
/* IC2 API METHODS */
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools.omnitools;
|
||||
package tombenpotter.emt.common.item.tool.omnitool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -12,7 +12,7 @@ import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class ItemOmnitoolDiamond extends ItemOmnitoolIron {
|
||||
|
||||
@@ -21,7 +21,7 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron {
|
||||
this.efficiencyOnProperMaterial = 16F;
|
||||
this.setCreativeTab(ElectroMagicTools.tabEMT);
|
||||
this.setMaxStackSize(1);
|
||||
if (!ConfigHandler.toolsInBore) {
|
||||
if (!EMTConfigHandler.toolsInBore) {
|
||||
this.setMaxDamage(27);
|
||||
}
|
||||
else {
|
||||
@@ -39,7 +39,7 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron {
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
|
||||
if (!ConfigHandler.toolsInBore) {
|
||||
if (!EMTConfigHandler.toolsInBore) {
|
||||
cost = 200;
|
||||
}
|
||||
else {
|
||||
+6
-6
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools.omnitools;
|
||||
package tombenpotter.emt.common.item.tool.omnitool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -19,7 +19,7 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
@@ -35,7 +35,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
|
||||
this.efficiencyOnProperMaterial = 13F;
|
||||
this.setCreativeTab(ElectroMagicTools.tabEMT);
|
||||
this.setMaxStackSize(1);
|
||||
if (!ConfigHandler.toolsInBore) {
|
||||
if (!EMTConfigHandler.toolsInBore) {
|
||||
this.setMaxDamage(27);
|
||||
}
|
||||
else {
|
||||
@@ -66,7 +66,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving)
|
||||
|
||||
{
|
||||
if (!ConfigHandler.toolsInBore) {
|
||||
if (!EMTConfigHandler.toolsInBore) {
|
||||
cost = 100;
|
||||
}
|
||||
else {
|
||||
@@ -140,7 +140,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
|
||||
|
||||
@Override
|
||||
public int getItemEnchantability() {
|
||||
if (!ConfigHandler.enchanting) {
|
||||
if (!EMTConfigHandler.enchanting) {
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
@@ -150,7 +150,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
|
||||
|
||||
@Override
|
||||
public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
|
||||
return ConfigHandler.enchanting;
|
||||
return EMTConfigHandler.enchanting;
|
||||
}
|
||||
|
||||
/* IC2 API METHODS */
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.items.tools.omnitools;
|
||||
package tombenpotter.emt.common.item.tool.omnitool;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -12,7 +12,7 @@ import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.World;
|
||||
import tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.ModInformation;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond {
|
||||
|
||||
@@ -21,7 +21,7 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond {
|
||||
this.efficiencyOnProperMaterial = 21F;
|
||||
this.setCreativeTab(ElectroMagicTools.tabEMT);
|
||||
this.setMaxStackSize(1);
|
||||
if (!ConfigHandler.toolsInBore) {
|
||||
if (!EMTConfigHandler.toolsInBore) {
|
||||
this.setMaxDamage(27);
|
||||
}
|
||||
else {
|
||||
@@ -39,7 +39,7 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond {
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) {
|
||||
if (!ConfigHandler.toolsInBore) {
|
||||
if (!EMTConfigHandler.toolsInBore) {
|
||||
cost = 300;
|
||||
}
|
||||
else {
|
||||
@@ -1,184 +0,0 @@
|
||||
package tombenpotter.emt.common.items.blocks;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static tombenpotter.emt.common.util.TextHelper.localize;
|
||||
|
||||
public class ItemBlockEMTSolars extends ItemBlock {
|
||||
|
||||
public ItemBlockEMTSolars(Block id) {
|
||||
super(id);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack itemstack) {
|
||||
String name = "";
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0: {
|
||||
name = "compressed";
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
name = "doublecompressed";
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
name = "triplecompressed";
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
name = "water";
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
name = "doublewater";
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
name = "triplewater";
|
||||
break;
|
||||
}
|
||||
case 6: {
|
||||
name = "dark";
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
name = "doubledark";
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
name = "tripledark";
|
||||
break;
|
||||
}
|
||||
case 9: {
|
||||
name = "order";
|
||||
break;
|
||||
}
|
||||
case 10: {
|
||||
name = "doubleorder";
|
||||
break;
|
||||
}
|
||||
case 11: {
|
||||
name = "tripleorder";
|
||||
break;
|
||||
}
|
||||
case 12: {
|
||||
name = "fire";
|
||||
break;
|
||||
}
|
||||
case 13: {
|
||||
name = "doublefire";
|
||||
break;
|
||||
}
|
||||
case 14: {
|
||||
name = "triplefire";
|
||||
break;
|
||||
}
|
||||
case 15: {
|
||||
name = "air";
|
||||
break;
|
||||
}
|
||||
default:
|
||||
name = "nothing";
|
||||
break;
|
||||
}
|
||||
return getUnlocalizedName() + "." + name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(int par1) {
|
||||
return par1;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) {
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0: {
|
||||
list.add(ConfigHandler.compressedSolarOutput + localize("tooltip.EMT.euPerTick"));
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
list.add(ConfigHandler.doubleCompressedSolarOutput + localize("tooltip.EMT.euPerTick"));
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
list.add(ConfigHandler.tripleCompressedSolarOutput + localize("tooltip.EMT.euPerTick"));
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining"));
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining"));
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining"));
|
||||
break;
|
||||
}
|
||||
case 6: {
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
|
||||
break;
|
||||
}
|
||||
case 9: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple"));
|
||||
break;
|
||||
}
|
||||
case 10: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple"));
|
||||
break;
|
||||
}
|
||||
|
||||
case 11: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple"));
|
||||
break;
|
||||
}
|
||||
case 12: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether"));
|
||||
break;
|
||||
}
|
||||
case 13: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether"));
|
||||
break;
|
||||
}
|
||||
case 14: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.lava"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether"));
|
||||
break;
|
||||
}
|
||||
case 15: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height"));
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
list.add(localize("tooltip.EMT.forget"));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,91 +0,0 @@
|
||||
package tombenpotter.emt.common.items.blocks;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.TextHelper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static tombenpotter.emt.common.util.TextHelper.localize;
|
||||
|
||||
public class ItemBlockEMTSolars2 extends ItemBlock {
|
||||
|
||||
public ItemBlockEMTSolars2(Block id) {
|
||||
super(id);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack itemstack) {
|
||||
String name = "";
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0: {
|
||||
name = "doubleair";
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
name = "tripleair";
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
name = "earth";
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
name = "doubleearth";
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
name = "tripleearth";
|
||||
break;
|
||||
}
|
||||
default:
|
||||
name = "nothing";
|
||||
break;
|
||||
}
|
||||
return getUnlocalizedName() + "." + name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(int par1) {
|
||||
return par1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) {
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height"));
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height"));
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low"));
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low"));
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
list.add(TextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + TextHelper.LIGHT_GRAY + ConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick"));
|
||||
list.add(TextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + TextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.low"));
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
list.add(localize("tooltip.EMT.forget"));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
package tombenpotter.emt.common.items.blocks;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityAerGenerator;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityArborGenerator;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityAuramGenerator;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityIgnisGenerator;
|
||||
import tombenpotter.emt.common.tile.generators.TileEntityPotentiaGenerator;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
|
||||
public class ItemBlockEssentiaGenerators extends ItemBlock {
|
||||
|
||||
public ItemBlockEssentiaGenerators(Block id) {
|
||||
super(id);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack itemstack) {
|
||||
String name = "";
|
||||
switch (itemstack.getItemDamage()) {
|
||||
case 0:
|
||||
name = "potentia";
|
||||
break;
|
||||
case 1:
|
||||
name = "ignis";
|
||||
break;
|
||||
case 2:
|
||||
name = "auram";
|
||||
break;
|
||||
case 3:
|
||||
name = "arbor";
|
||||
break;
|
||||
case 4:
|
||||
name = "aer";
|
||||
break;
|
||||
default:
|
||||
name = "nothing";
|
||||
}
|
||||
return getUnlocalizedName() + "." + name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
|
||||
switch (stack.getItemDamage()) {
|
||||
case 0:
|
||||
list.add(ConfigHandler.potentiaGenerator + " EU/t");
|
||||
break;
|
||||
case 1:
|
||||
list.add(ConfigHandler.ignisGenerator + " EU/t");
|
||||
break;
|
||||
case 2:
|
||||
list.add(ConfigHandler.auramGenerator + " EU/t");
|
||||
break;
|
||||
case 3:
|
||||
list.add(ConfigHandler.arborGenerator + " EU/t");
|
||||
break;
|
||||
case 4:
|
||||
list.add(ConfigHandler.aerGenerator + " EU/t");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(int meta) {
|
||||
return meta;
|
||||
}
|
||||
}
|
||||
@@ -1,125 +0,0 @@
|
||||
package tombenpotter.emt.common.items.foci;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
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 tombenpotter.emt.ElectroMagicTools;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
|
||||
public class ItemShieldFocus extends ItemBaseFocus {
|
||||
int y1 = 0;
|
||||
ItemStack milk;
|
||||
|
||||
private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10);
|
||||
|
||||
public ItemShieldFocus() {
|
||||
super(".focus.shield", "focus_shield");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getFocusColor(ItemStack stack) {
|
||||
return 0x1E90FF;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AspectList getVisCost(ItemStack stack) {
|
||||
return visCost;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSortingHelper(ItemStack itemstack) {
|
||||
return "SHIELD";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isUseItem(ItemStack stack) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count) {
|
||||
ItemWandCasting wand = (ItemWandCasting) itemstack.getItem();
|
||||
|
||||
if (player.capabilities.isCreativeMode || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) {
|
||||
|
||||
player.motionX = 0.0D;
|
||||
if (!player.capabilities.isCreativeMode && player.motionY < 0)
|
||||
player.motionY = player.motionY / 2;
|
||||
player.motionZ = 0.0D;
|
||||
|
||||
int x = MathHelper.floor_double(player.posX);
|
||||
int y = MathHelper.floor_double(player.posY);
|
||||
int z = MathHelper.floor_double(player.posZ);
|
||||
|
||||
if (milk == null)
|
||||
milk = (new ItemStack(Items.milk_bucket));
|
||||
player.curePotionEffects(milk);
|
||||
|
||||
if (player.motionY > -5) {
|
||||
// Player Level
|
||||
if (player.worldObj.isAirBlock(x + 1, y, z) && player.worldObj.isAirBlock(x - 1, y, z) && player.worldObj.isAirBlock(x, y, z + 1) && player.worldObj.isAirBlock(x, y, z - 1)) {
|
||||
player.worldObj.setBlock(x + 1, y, z, BlockRegistry.shield);
|
||||
player.worldObj.setBlock(x - 1, y, z, BlockRegistry.shield);
|
||||
player.worldObj.setBlock(x, y, z + 1, BlockRegistry.shield);
|
||||
player.worldObj.setBlock(x, y, z - 1, BlockRegistry.shield);
|
||||
}
|
||||
|
||||
// Above the player
|
||||
if (player.worldObj.isAirBlock(x + 1, y + 1, z) && player.worldObj.isAirBlock(x - 1, y + 1, z) && player.worldObj.isAirBlock(x, y + 1, z + 1) && player.worldObj.isAirBlock(x, y + 1, z - 1)) {
|
||||
player.worldObj.setBlock(x + 1, y + 1, z, BlockRegistry.shield);
|
||||
player.worldObj.setBlock(x - 1, y + 1, z, BlockRegistry.shield);
|
||||
player.worldObj.setBlock(x, y + 1, z + 1, BlockRegistry.shield);
|
||||
player.worldObj.setBlock(x, y + 1, z - 1, BlockRegistry.shield);
|
||||
}
|
||||
|
||||
if (y > y1 && (player.worldObj.isAirBlock(x + 1, y - 2, z) && player.worldObj.isAirBlock(x - 1, y - 2, z) && player.worldObj.isAirBlock(x, y - 2, z + 1) && player.worldObj.isAirBlock(x, y - 2, z - 1))
|
||||
|| (player.worldObj.getBlock(x + 1, y - 2, z) == BlockRegistry.shield && player.worldObj.getBlock(x - 1, y - 2, z) == BlockRegistry.shield && player.worldObj.getBlock(x, y - 2, z + 1) == BlockRegistry.shield && player.worldObj.getBlock(x, y - 2, z - 1) == BlockRegistry.shield)) {
|
||||
player.worldObj.setBlockToAir(x + 1, y - 2, z);
|
||||
player.worldObj.setBlockToAir(x - 1, y - 2, z);
|
||||
player.worldObj.setBlockToAir(x, y - 2, z + 1);
|
||||
player.worldObj.setBlockToAir(x, y - 2, z - 1);
|
||||
}
|
||||
|
||||
if (y < y1 && (player.worldObj.isAirBlock(x + 1, y + 2, z) && player.worldObj.isAirBlock(x - 1, y + 2, z) && player.worldObj.isAirBlock(x, y + 2, z + 1) && player.worldObj.isAirBlock(x, y + 2, z - 1))
|
||||
|| (player.worldObj.getBlock(x + 1, y + 2, z) == BlockRegistry.shield && player.worldObj.getBlock(x - 1, y + 2, z) == BlockRegistry.shield && player.worldObj.getBlock(x, y + 2, z + 1) == BlockRegistry.shield && player.worldObj.getBlock(x, y + 2, z - 1) == BlockRegistry.shield)) {
|
||||
player.worldObj.setBlockToAir(x + 1, y + 2, z);
|
||||
player.worldObj.setBlockToAir(x - 1, y + 2, z);
|
||||
player.worldObj.setBlockToAir(x, y + 2, z + 1);
|
||||
player.worldObj.setBlockToAir(x, y + 2, z - 1);
|
||||
}
|
||||
}
|
||||
|
||||
y1 = y;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, EntityPlayer player, int count) {
|
||||
int x = MathHelper.floor_double(player.posX);
|
||||
int y = MathHelper.floor_double(player.posY);
|
||||
int z = MathHelper.floor_double(player.posZ);
|
||||
|
||||
// Player Level
|
||||
if ((player.worldObj.getBlock(x + 1, y, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z + 1) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z - 1) == BlockRegistry.shield)) {
|
||||
player.worldObj.setBlockToAir(x + 1, y, z);
|
||||
player.worldObj.setBlockToAir(x - 1, y, z);
|
||||
player.worldObj.setBlockToAir(x, y, z + 1);
|
||||
player.worldObj.setBlockToAir(x, y, z - 1);
|
||||
}
|
||||
|
||||
// Above the player
|
||||
if ((player.worldObj.getBlock(x + 1, y + 1, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y + 1, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z + 1) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z - 1) == BlockRegistry.shield)) {
|
||||
player.worldObj.setBlockToAir(x + 1, y + 1, z);
|
||||
player.worldObj.setBlockToAir(x - 1, y + 1, z);
|
||||
player.worldObj.setBlockToAir(x, y + 1, z + 1);
|
||||
player.worldObj.setBlockToAir(x, y + 1, z - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,7 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.TileEntityEMT;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable {
|
||||
|
||||
@@ -24,7 +24,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided
|
||||
private static final int[] slots_sides = new int[] { 1 };
|
||||
|
||||
private ItemStack[] slots = new ItemStack[3];
|
||||
public int maceratingSpeed = ConfigHandler.etherealProcessorBaseSpeed;
|
||||
public int maceratingSpeed = EMTConfigHandler.etherealProcessorBaseSpeed;
|
||||
public int cookTime;
|
||||
|
||||
public int getSizeInventory() {
|
||||
@@ -180,7 +180,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided
|
||||
|
||||
public void addBonus() {
|
||||
if (this.canSmelt()) {
|
||||
if (this.worldObj.rand.nextInt(ConfigHandler.etherealProcessorBonus) == 0) {
|
||||
if (this.worldObj.rand.nextInt(EMTConfigHandler.etherealProcessorBonus) == 0) {
|
||||
if (this.slots[1] == null) {
|
||||
this.setInventorySlotContents(1, new ItemStack(ConfigItems.itemNugget, 1, 6));
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.nbt.NBTTagList;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory, IWrenchable {
|
||||
|
||||
@@ -77,7 +77,7 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements I
|
||||
ItemStack wand = getStackInSlot(0);
|
||||
if (wand != null && wand.getItem() instanceof ItemWandCasting) {
|
||||
ItemWandCasting wandItem = (ItemWandCasting) wand.getItem();
|
||||
if (ic2EnergySink.useEnergy(ConfigHandler.wandChargerConsumption) && wandItem.getAspectsWithRoom(wand) != null) {
|
||||
if (ic2EnergySink.useEnergy(EMTConfigHandler.wandChargerConsumption) && wandItem.getAspectsWithRoom(wand) != null) {
|
||||
wandItem.addVis(wand, Aspect.ORDER, 1, true);
|
||||
wandItem.addVis(wand, Aspect.FIRE, 1, true);
|
||||
wandItem.addVis(wand, Aspect.ENTROPY, 1, true);
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package tombenpotter.emt.common.tile.generator;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTEssentiasOutputs;
|
||||
|
||||
public class TileEntityAerGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityAerGenerator() {
|
||||
aspect = Aspect.AIR;
|
||||
output = EMTEssentiasOutputs.outputs.get(aspect.getTag());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package tombenpotter.emt.common.tile.generator;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTEssentiasOutputs;
|
||||
|
||||
public class TileEntityArborGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityArborGenerator() {
|
||||
aspect = Aspect.TREE;
|
||||
output = EMTEssentiasOutputs.outputs.get(aspect.getTag());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package tombenpotter.emt.common.tile.generator;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTEssentiasOutputs;
|
||||
|
||||
public class TileEntityAuramGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityAuramGenerator() {
|
||||
aspect = Aspect.AURA;
|
||||
output = EMTEssentiasOutputs.outputs.get(aspect.getTag());
|
||||
}
|
||||
}
|
||||
+5
-9
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.tile.generators;
|
||||
package tombenpotter.emt.common.tile.generator;
|
||||
|
||||
import ic2.api.energy.prefab.BasicSource;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -6,17 +6,17 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.common.lib.events.EssentiaHandler;
|
||||
import tombenpotter.emt.common.tile.TileEntityEMT;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public abstract class TileEntityBaseGenerator extends TileEntityEMT {
|
||||
|
||||
public BasicSource energySource = new BasicSource(this, 1000000000, 3);
|
||||
public Aspect aspect;
|
||||
public int output;
|
||||
public double output;
|
||||
public int tick = 0;
|
||||
|
||||
public TileEntityBaseGenerator() {
|
||||
output = 20;
|
||||
output = 2000;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -33,7 +33,7 @@ public abstract class TileEntityBaseGenerator extends TileEntityEMT {
|
||||
|
||||
public void createEnergy() {
|
||||
if (!this.worldObj.isRemote && EssentiaHandler.drainEssentia(this, aspect, ForgeDirection.UNKNOWN, 8)) {
|
||||
energySource.addEnergy(output * 20);
|
||||
energySource.addEnergy(output / 20D);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,8 +59,4 @@ public abstract class TileEntityBaseGenerator extends TileEntityEMT {
|
||||
super.writeToNBT(tag);
|
||||
energySource.writeToNBT(tag);
|
||||
}
|
||||
|
||||
public int getOutput() {
|
||||
return output;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package tombenpotter.emt.common.tile.generator;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTEssentiasOutputs;
|
||||
|
||||
public class TileEntityIgnisGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityIgnisGenerator() {
|
||||
aspect = Aspect.FIRE;
|
||||
output = EMTEssentiasOutputs.outputs.get(aspect.getTag());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package tombenpotter.emt.common.tile.generator;
|
||||
|
||||
import ic2.api.energy.prefab.BasicSource;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTEssentiasOutputs;
|
||||
|
||||
public class TileEntityPotentiaGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityPotentiaGenerator() {
|
||||
aspect = Aspect.ENERGY;
|
||||
output = EMTEssentiasOutputs.outputs.get(aspect.getTag());
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package tombenpotter.emt.common.tile.generators;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EssentiasOutputs;
|
||||
|
||||
public class TileEntityAerGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityAerGenerator() {
|
||||
aspect = Aspect.AIR;
|
||||
EssentiasOutputs.outputs.get(aspect.getTag());
|
||||
output = ConfigHandler.aerGenerator;
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package tombenpotter.emt.common.tile.generators;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EssentiasOutputs;
|
||||
|
||||
public class TileEntityArborGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityArborGenerator() {
|
||||
aspect = Aspect.TREE;
|
||||
EssentiasOutputs.outputs.get(aspect.getTag());
|
||||
output = ConfigHandler.arborGenerator;
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package tombenpotter.emt.common.tile.generators;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EssentiasOutputs;
|
||||
|
||||
public class TileEntityAuramGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityAuramGenerator() {
|
||||
aspect = Aspect.AURA;
|
||||
EssentiasOutputs.outputs.get(aspect.getTag());
|
||||
output = ConfigHandler.auramGenerator;
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package tombenpotter.emt.common.tile.generators;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EssentiasOutputs;
|
||||
|
||||
public class TileEntityIgnisGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityIgnisGenerator() {
|
||||
aspect = Aspect.FIRE;
|
||||
EssentiasOutputs.outputs.get(aspect.getTag());
|
||||
output = ConfigHandler.ignisGenerator;
|
||||
}
|
||||
}
|
||||
-15
@@ -1,15 +0,0 @@
|
||||
package tombenpotter.emt.common.tile.generators;
|
||||
|
||||
import ic2.api.energy.prefab.BasicSource;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EssentiasOutputs;
|
||||
|
||||
public class TileEntityPotentiaGenerator extends TileEntityBaseGenerator {
|
||||
|
||||
public TileEntityPotentiaGenerator() {
|
||||
aspect = Aspect.ENERGY;
|
||||
EssentiasOutputs.outputs.get(aspect.getTag());
|
||||
output = ConfigHandler.potentiaGenerator;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tombenpotter.emt.common.tile.solars;
|
||||
package tombenpotter.emt.common.tile.solar;
|
||||
|
||||
import ic2.api.energy.prefab.BasicSource;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
+4
-4
@@ -1,16 +1,16 @@
|
||||
package tombenpotter.emt.common.tile.solars.air;
|
||||
package tombenpotter.emt.common.tile.solar.air;
|
||||
|
||||
import ic2.api.energy.prefab.BasicSource;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.tile.solar.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityAirSolar extends TileEntitySolarBase {
|
||||
|
||||
public TileEntityAirSolar() {
|
||||
output = ConfigHandler.compressedSolarOutput;
|
||||
output = EMTConfigHandler.compressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+3
-3
@@ -1,15 +1,15 @@
|
||||
package tombenpotter.emt.common.tile.solars.air;
|
||||
package tombenpotter.emt.common.tile.solar.air;
|
||||
|
||||
import ic2.api.energy.prefab.BasicSource;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityDoubleAirSolar extends TileEntityAirSolar {
|
||||
|
||||
public TileEntityDoubleAirSolar() {
|
||||
output = ConfigHandler.doubleCompressedSolarOutput;
|
||||
output = EMTConfigHandler.doubleCompressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+3
-3
@@ -1,15 +1,15 @@
|
||||
package tombenpotter.emt.common.tile.solars.air;
|
||||
package tombenpotter.emt.common.tile.solar.air;
|
||||
|
||||
import ic2.api.energy.prefab.BasicSource;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityTripleAirSolar extends TileEntityAirSolar {
|
||||
|
||||
public TileEntityTripleAirSolar() {
|
||||
output = ConfigHandler.tripleCompressedSolarOutput;
|
||||
output = EMTConfigHandler.tripleCompressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+4
-4
@@ -1,15 +1,15 @@
|
||||
package tombenpotter.emt.common.tile.solars.compressed;
|
||||
package tombenpotter.emt.common.tile.solar.compressed;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.tile.solar.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityCompressedSolar extends TileEntitySolarBase {
|
||||
|
||||
public TileEntityCompressedSolar() {
|
||||
output = ConfigHandler.compressedSolarOutput;
|
||||
output = EMTConfigHandler.compressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+4
-4
@@ -1,15 +1,15 @@
|
||||
package tombenpotter.emt.common.tile.solars.compressed;
|
||||
package tombenpotter.emt.common.tile.solar.compressed;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.tile.solar.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityDoubleCompressedSolar extends TileEntitySolarBase {
|
||||
|
||||
public TileEntityDoubleCompressedSolar() {
|
||||
output = ConfigHandler.doubleCompressedSolarOutput;
|
||||
output = EMTConfigHandler.doubleCompressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+4
-4
@@ -1,15 +1,15 @@
|
||||
package tombenpotter.emt.common.tile.solars.compressed;
|
||||
package tombenpotter.emt.common.tile.solar.compressed;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.tile.solar.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityTripleCompressedSolar extends TileEntitySolarBase {
|
||||
|
||||
public TileEntityTripleCompressedSolar() {
|
||||
output = ConfigHandler.tripleCompressedSolarOutput;
|
||||
output = EMTConfigHandler.tripleCompressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+4
-4
@@ -1,15 +1,15 @@
|
||||
package tombenpotter.emt.common.tile.solars.dark;
|
||||
package tombenpotter.emt.common.tile.solar.dark;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.tile.solar.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityDarkSolar extends TileEntitySolarBase {
|
||||
|
||||
public TileEntityDarkSolar() {
|
||||
output = ConfigHandler.compressedSolarOutput;
|
||||
output = EMTConfigHandler.compressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+3
-3
@@ -1,14 +1,14 @@
|
||||
package tombenpotter.emt.common.tile.solars.dark;
|
||||
package tombenpotter.emt.common.tile.solar.dark;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar {
|
||||
|
||||
public TileEntityDoubleDarkSolar() {
|
||||
output = ConfigHandler.doubleCompressedSolarOutput;
|
||||
output = EMTConfigHandler.doubleCompressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+3
-3
@@ -1,14 +1,14 @@
|
||||
package tombenpotter.emt.common.tile.solars.dark;
|
||||
package tombenpotter.emt.common.tile.solar.dark;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityTripleDarkSolar extends TileEntityDarkSolar {
|
||||
|
||||
public TileEntityTripleDarkSolar() {
|
||||
output = ConfigHandler.tripleCompressedSolarOutput;
|
||||
output = EMTConfigHandler.tripleCompressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+3
-3
@@ -1,14 +1,14 @@
|
||||
package tombenpotter.emt.common.tile.solars.earth;
|
||||
package tombenpotter.emt.common.tile.solar.earth;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar {
|
||||
|
||||
public TileEntityDoubleEarthSolar() {
|
||||
output = ConfigHandler.doubleCompressedSolarOutput;
|
||||
output = EMTConfigHandler.doubleCompressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+4
-4
@@ -1,15 +1,15 @@
|
||||
package tombenpotter.emt.common.tile.solars.earth;
|
||||
package tombenpotter.emt.common.tile.solar.earth;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.tile.solar.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityEarthSolar extends TileEntitySolarBase {
|
||||
|
||||
public TileEntityEarthSolar() {
|
||||
output = ConfigHandler.compressedSolarOutput;
|
||||
output = EMTConfigHandler.compressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+3
-3
@@ -1,14 +1,14 @@
|
||||
package tombenpotter.emt.common.tile.solars.earth;
|
||||
package tombenpotter.emt.common.tile.solar.earth;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityTripleEarthSolar extends TileEntityEarthSolar {
|
||||
|
||||
public TileEntityTripleEarthSolar() {
|
||||
output = ConfigHandler.tripleCompressedSolarOutput;
|
||||
output = EMTConfigHandler.tripleCompressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+3
-3
@@ -1,14 +1,14 @@
|
||||
package tombenpotter.emt.common.tile.solars.fire;
|
||||
package tombenpotter.emt.common.tile.solar.fire;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityDoubleFireSolar extends TileEntityFireSolar {
|
||||
|
||||
public TileEntityDoubleFireSolar() {
|
||||
output = ConfigHandler.doubleCompressedSolarOutput;
|
||||
output = EMTConfigHandler.doubleCompressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
+4
-4
@@ -1,15 +1,15 @@
|
||||
package tombenpotter.emt.common.tile.solars.fire;
|
||||
package tombenpotter.emt.common.tile.solar.fire;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tombenpotter.emt.common.init.BlockRegistry;
|
||||
import tombenpotter.emt.common.tile.solars.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.ConfigHandler;
|
||||
import tombenpotter.emt.common.tile.solar.TileEntitySolarBase;
|
||||
import tombenpotter.emt.common.util.EMTConfigHandler;
|
||||
|
||||
public class TileEntityFireSolar extends TileEntitySolarBase {
|
||||
|
||||
public TileEntityFireSolar() {
|
||||
output = ConfigHandler.compressedSolarOutput;
|
||||
output = EMTConfigHandler.compressedSolarOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
Loaded 100 of 135 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user