This commit is contained in:
fewizz committed 2015-05-03 23:23:29 +03:00
1 parent 12f51ac23a
commit 0d12f5456b
10 files changed
+184 -161

No files matched your search

@@ -338,7 +338,7 @@ public class EMTResearch {
if (ConfigHandler.uuMInfusionResearch == false) {
text = "1";
research = new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(ItemRegistry.itemEMTItems, 1, 16)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem();
research = new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(ItemRegistry.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem();
research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.charcoalToCoal), new ResearchPage(RecipeRegistry.glowstoneDustToBlock), new ResearchPage(RecipeRegistry.stoneBricksToIronOre), new ResearchPage(RecipeRegistry.arcaneStoneToCopperOre), new ResearchPage(RecipeRegistry.arcaneStoneBricksToTinOre), new ResearchPage(RecipeRegistry.amberBlockToLeadOre), new ResearchPage(RecipeRegistry.amberBricksToUraniumOre), new ResearchPage(RecipeRegistry.shardToResin), new ResearchPage(RecipeRegistry.shardToRedstone), new ResearchPage(RecipeRegistry.shardToLapis), new ResearchPage(RecipeRegistry.ironToGold), new ResearchPage(RecipeRegistry.goldToDiamond), new ResearchPage(RecipeRegistry.diamondToUranium), new ResearchPage(RecipeRegistry.uraniumToIridium));
}
@@ -43,7 +43,7 @@ import java.util.Iterator;
public class RecipeRegistry {
public static ItemStack uuMCell = new ItemStack(ItemRegistry.itemEMTItems, 1, 16);
public static ItemStack uuMCell = new ItemStack(ItemRegistry.itemEMTItems, 1, 15);
private static void registerShapedRecipes() {
@@ -54,7 +54,7 @@ public class RecipeRegistry {
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));
featherWings = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.featherWing), "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 12));
taintedFeathers = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 14), " X ", "XYX", " X ", 'X', new ItemStack(ConfigItems.itemResource, 1, 12), 'Y', new ItemStack(Items.feather));
taintedFeathers = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 13), " X ", "XYX", " X ", 'X', new ItemStack(ConfigItems.itemResource, 1, 12), 'Y', new ItemStack(Items.feather));
if (!Loader.isModLoaded("gregtech_addon")) {
GameRegistry.addShapedRecipe(IC2Items.getItem("diamondDrill"), " Y ", "YXY", 'Y', new ItemStack(Items.diamond), 'X', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE));
@@ -241,9 +241,9 @@ public class RecipeRegistry {
electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", new ItemStack(ItemRegistry.electricScribingTools), CraftingAspects.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, 15), CraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 14), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 5), 'Z', new ItemStack(ItemRegistry.itemEMTItems, 1, 13));
thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.thaumiumWing), CraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 15));
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"));
thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.thaumiumWing), CraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 14));
/** Crucible Recipes **/
@@ -324,8 +324,8 @@ public class RecipeRegistry {
thaumiumPlate = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 5), "X", "Y", "Z", 'Y', new ItemStack(ConfigItems.itemResource, 1, 2), 'X', new ItemStack(IC2Items.getItem("ForgeHammer").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(Blocks.obsidian));
Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(ItemRegistry.itemEMTItems, 1, 5));
/* Iron Sheet Recipe */
Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(IC2Items.getItem("denseplateiron")), null, new ItemStack(ItemRegistry.itemEMTItems, 1, 13));
///* Iron Sheet Recipe */
//Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(IC2Items.getItem("denseplateiron")), null, new ItemStack(ItemRegistry.itemEMTItems, 1, 13));
/* Ore Processing for Amber and Cinnabar */
if (ConfigHandler.removeAmberAndCinnabarMacerating) {
@@ -39,7 +39,7 @@ import java.util.List;
public class ItemMaterials extends Item {
public IIcon[] icon = new IIcon[500];
public IIcon[] icon = new IIcon[25];
public ItemMaterials() {
this.setCreativeTab(ElectroMagicTools.tabEMT);
@@ -106,19 +106,19 @@ public class ItemMaterials extends Item {
name = "featherGluedCardboardWing";
break;
}
//case 13: {
// name = "denseIronSheet";
// break;
//}
case 13: {
name = "denseIronSheet";
break;
}
case 14: {
name = "taintedFeather";
break;
}
case 15: {
case 14: {
name = "thaumiumWing";
break;
}
case 16: {
case 15: {
name = "uumatterDrop";
break;
}
@@ -144,10 +144,10 @@ public class ItemMaterials extends Item {
this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":materials/rubberball");
this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":materials/cardboard");
this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":materials/cardboardsheet");
this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":materials/denseironsheet");
this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":materials/taintedfeather");
this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":materials/thaumiumWing");
this.icon[16] = ri.registerIcon(ModInformation.texturePath + ":materials/uumatterdrop");
//this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":materials/denseironsheet");
this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":materials/taintedfeather");
this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":materials/thaumiumWing");
this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":materials/uumatterdrop");
}
@SideOnly(Side.CLIENT)
@@ -158,7 +158,7 @@ public class ItemMaterials extends Item {
@SuppressWarnings({"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) {
for (int i = 1; i <= 16; i++) {
for (int i = 1; i <= 15; i++) {
list.add(new ItemStack(this, 1, i));
}
}
@@ -211,7 +211,7 @@ public class ItemMaterials extends Item {
public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) {
super.onUpdate(stack, world, entity, par4, par5);
if ((!entity.worldObj.isRemote) && ((stack.getItemDamage() == 14)) && ((entity instanceof EntityLivingBase)) && (!((EntityLivingBase) entity).isEntityUndead()) && (!((EntityLivingBase) entity).isPotionActive(Config.potionTaintPoisonID)) && (world.rand.nextInt(4321) <= stack.stackSize)) {
if ((!entity.worldObj.isRemote) && ((stack.getItemDamage() == 13)) && ((entity instanceof EntityLivingBase)) && (!((EntityLivingBase) entity).isEntityUndead()) && (!((EntityLivingBase) entity).isPotionActive(Config.potionTaintPoisonID)) && (world.rand.nextInt(4321) <= stack.stackSize)) {
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Config.potionTaintPoisonID, 120, 0, false));
if ((entity instanceof EntityPlayer)) {
InventoryUtils.consumeInventoryItem((EntityPlayer) entity, stack.getItem(), stack.getItemDamage());
@@ -1,17 +0,0 @@
package tombenpotter.emt.common.modules.te;
public class TERecipeRegistry {
private static void registerShapedRecipes() {
}
private static void registerShapelessRecipes() {
}
public static void registerTERecipes() {
registerShapedRecipes();
registerShapelessRecipes();
}
}
@@ -1,28 +0,0 @@
package tombenpotter.emt.common.modules.te.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import tombenpotter.emt.ElectroMagicTools;
import tombenpotter.emt.ModInformation;
public class BlockTE extends Block {
public BlockTE(String unlocName, Material material, String textureName, SoundType soundType, float hardness) {
super(material);
setBlockName(ModInformation.modid + ".module.te." + unlocName);
setBlockTextureName(ModInformation.texturePath + ":" + textureName);
setCreativeTab(ElectroMagicTools.tabEMT);
setStepSound(soundType);
setHardness(hardness);
}
public BlockTE(String unlocName, Material material, SoundType soundType, float hardness) {
super(material);
setBlockName(ModInformation.modid + ".module.te." + unlocName);
setCreativeTab(ElectroMagicTools.tabEMT);
setStepSound(soundType);
setHardness(hardness);
}
}
@@ -1,8 +0,0 @@
package tombenpotter.emt.common.modules.te.blocks;
public class TEBlockRegistry {
public static void registerTEBlocks() {
}
}
@@ -1,23 +0,0 @@
package tombenpotter.emt.common.modules.te.items;
import net.minecraft.item.Item;
import tombenpotter.emt.ElectroMagicTools;
import tombenpotter.emt.ModInformation;
public class ItemTE extends Item {
public ItemTE(String unlocName, String textureName) {
super();
setUnlocalizedName(ModInformation.modid + ".module.te." + unlocName);
setTextureName(ModInformation.texturePath + ":" + textureName);
setCreativeTab(ElectroMagicTools.tabEMT);
}
public ItemTE(String unlocName) {
super();
setUnlocalizedName(ModInformation.modid + ".module.te." + unlocName);
setCreativeTab(ElectroMagicTools.tabEMT);
}
}
@@ -1,8 +0,0 @@
package tombenpotter.emt.common.modules.te.items;
public class TEItemRegistry {
public static void registerTEItems() {
}
}