Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Slight change in armor, and addition of biomass

Browse source
This commit is contained in:
Robert S 2014-05-17 04:45:12 -04:00
parent 0d5adb2dc2
commit b46c9847be
5 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atomic/src/main/scala/resonantinduction/atomic/Atomic.java
View file

@ -491,10 +491,10 @@ public class Atomic
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(blockElectromagnet, 1, 1), new Object[] { blockElectromagnet, Block.glass }));
// Hazmat Suit
GameRegistry.addRecipe(new ShapedOreRecipe(itemHazmatTop, new Object[] { "SSS", "BAB", "SCS", 'A', Item.helmetLeather, 'C', UniversalRecipe.CIRCUIT_T1.get(Settings.allowAlternateRecipes), 'S', Block.cloth }));
GameRegistry.addRecipe(new ShapedOreRecipe(itemHazmatBody, new Object[] { "SSS", "BAB", "SCS", 'A', Item.plateLeather, 'C', UniversalRecipe.CIRCUIT_T1.get(Settings.allowAlternateRecipes), 'S', Block.cloth }));
GameRegistry.addRecipe(new ShapedOreRecipe(itemHazmatLeggings, new Object[] { "SSS", "BAB", "SCS", 'A', Item.legsLeather, 'C', UniversalRecipe.CIRCUIT_T1.get(Settings.allowAlternateRecipes), 'S', Block.cloth }));
GameRegistry.addRecipe(new ShapedOreRecipe(itemHazmatBoots, new Object[] { "SSS", "BAB", "SCS", 'A', Item.bootsLeather, 'C', UniversalRecipe.CIRCUIT_T1.get(Settings.allowAlternateRecipes), 'S', Block.cloth }));
GameRegistry.addRecipe(new ShapedOreRecipe(itemHazmatTop, new Object[] { "SSS", "BAB", "SCS", 'A', Item.helmetLeather, 'C', Item.silk, 'S', Block.cloth }));
GameRegistry.addRecipe(new ShapedOreRecipe(itemHazmatBody, new Object[] { "SSS", "BAB", "SCS", 'A', Item.plateLeather, 'C', Item.silk, 'S', Block.cloth }));
GameRegistry.addRecipe(new ShapedOreRecipe(itemHazmatLeggings, new Object[] { "SSS", "BAB", "SCS", 'A', Item.legsLeather, 'C', Item.silk, 'S', Block.cloth }));
GameRegistry.addRecipe(new ShapedOreRecipe(itemHazmatBoots, new Object[] { "SSS", "BAB", "SCS", 'A', Item.bootsLeather, 'C', Item.silk, 'S', Block.cloth }));
EntityRegistry.registerGlobalEntityID(EntityParticle.class, "ASParticle", EntityRegistry.findGlobalUniqueEntityId());
EntityRegistry.registerModEntity(EntityParticle.class, "ASParticle", ENTITY_ID_PREFIX, this, 80, 3, true);

21
atomic/src/main/scala/resonantinduction/atomic/process/ItemHazmat.java
View file

@ -6,6 +6,7 @@ import net.minecraft.item.EnumArmorMaterial;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import resonant.api.armor.IAntiPoisonArmor;
import resonantinduction.core.Reference;
import resonantinduction.core.TabRI;
@ -13,9 +14,9 @@ import resonantinduction.core.TabRI;
/** Hazmat */
public class ItemHazmat extends ItemArmor implements IAntiPoisonArmor
{
public ItemHazmat(int par1, EnumArmorMaterial par2EnumArmorMaterial, int par3, int par4)
public ItemHazmat(int id, EnumArmorMaterial material, int index, int slot)
{
super(par1, par2EnumArmorMaterial, par3, par4);
super(id, material, index, slot);
this.setCreativeTab(TabRI.DEFAULT);
this.setMaxDamage(200000);
}
@ -51,4 +52,20 @@ public class ItemHazmat extends ItemArmor implements IAntiPoisonArmor
{
return this.armorType;
}
@Override
public boolean isPartOfSet(ItemStack armorStack, ItemStack compareStack)
{
if(armorStack != null && compareStack != null)
{
return armorStack.getItem().equals(compareStack.getItem());
}
return false;
}
@Override
public boolean areAllPartsNeeded(ItemStack armorStack, EntityLivingBase entity, DamageSource source, Object... data)
{
return true;
}
}

BIN
src/main/resources/assets/resonantinduction/textures/items/biomass.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

4
src/main/scala/resonantinduction/core/ResonantInduction.java
View file

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.logging.Logger;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.BlockFluidFinite;
@ -22,6 +23,7 @@ import resonantinduction.core.handler.TextureHookHandler;
import resonantinduction.core.prefab.part.PacketMultiPart;
import resonantinduction.core.resource.BlockDust;
import resonantinduction.core.resource.BlockMachineMaterial;
import resonantinduction.core.resource.ItemBiomass;
import resonantinduction.core.resource.ItemOreResource;
import resonantinduction.core.resource.ResourceGenerator;
import resonantinduction.core.resource.TileDust;
@ -77,6 +79,7 @@ public class ResonantInduction
public static Block blockOre;
public static ItemOreResource itemRubble, itemDust, itemRefinedDust;
public static ItemOreResourceBucket itemBucketMixture, itemBucketMolten;
public static Item itemBiomass;
public static Block blockDust, blockRefinedDust;
public static Block blockMachinePart;
@ -106,6 +109,7 @@ public class ResonantInduction
itemRefinedDust = new ItemOreResource(Settings.getNextItemID("oreRefinedDust"), "oreRefinedDust");
itemBucketMixture = new ItemOreResourceBucket(Settings.getNextItemID("bucketMixture"), "bucketMixture", false);
itemBucketMolten = new ItemOreResourceBucket(Settings.getNextItemID("bucketMolten"), "bucketMolten", true);
itemBiomass = contentRegistry.createItem(ItemBiomass.class);
GameRegistry.registerItem(itemRubble, itemRubble.getUnlocalizedName());
GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName());

14
src/main/scala/resonantinduction/core/resource/ItemBiomass.java Normal file
View file

@ -0,0 +1,14 @@
package resonantinduction.core.resource;
import resonant.lib.prefab.item.ItemTooltip;
/** Bio mass item used as a crafting part and fuel
*
* @author Darkguardsman */
public class ItemBiomass extends ItemTooltip
{
public ItemBiomass(int id)
{
super(id);
}
}