This commit is contained in:
Stuart Pomeroy 2016-03-28 21:43:53 +01:00
commit 816c92d6b1
4 changed files with 34 additions and 22 deletions

View file

@ -43,7 +43,7 @@ configurations {
compile.extendsFrom shade compile.extendsFrom shade
} }
version = "1.0.2" version = "1.0.3"
def ENV = System.getenv() def ENV = System.getenv()
if (ENV.BUILD_NUMBER) { if (ENV.BUILD_NUMBER) {
@ -75,7 +75,7 @@ dependencies {
if(!f.exists()){ if(!f.exists()){
f.mkdir() f.mkdir()
} }
compile 'RebornCore:RebornCore-1.9:2.0.3.+:dev' compile 'RebornCore:RebornCore-1.9:2.0.4.+:dev'
deobfCompile "mezz.jei:jei_1.9:3.1.+" deobfCompile "mezz.jei:jei_1.9:3.1.+"
deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.1.0_55:universal' deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.1.0_55:universal'
} }

View file

@ -376,6 +376,13 @@ public class ModRecipes
CraftingHelper.addShapedOreRecipe(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', CraftingHelper.addShapedOreRecipe(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A',
"ingot" + name.substring(0, 1).toUpperCase() + name.substring(1)); "ingot" + name.substring(0, 1).toUpperCase() + name.substring(1));
} }
CraftingHelper.addShapedOreRecipe(ItemCells.getCellByName("empty", 16, false), " T ", "T T", " T ",
'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFence, 6), " ", "RRR", "RRR",
'R', ItemIngots.getIngotByName("refinedIron"));
addGemToolRecipes(new ItemStack(ModItems.rubySword), new ItemStack(ModItems.rubyPickaxe), new ItemStack(ModItems.rubyAxe), new ItemStack(ModItems.rubyHoe), addGemToolRecipes(new ItemStack(ModItems.rubySword), new ItemStack(ModItems.rubyPickaxe), new ItemStack(ModItems.rubyAxe), new ItemStack(ModItems.rubyHoe),
new ItemStack(ModItems.rubySpade), new ItemStack(ModItems.rubyHelmet), new ItemStack(ModItems.rubyChestplate), new ItemStack(ModItems.rubyLeggings), new ItemStack(ModItems.rubyBoots), ItemGems.getGemByName("ruby")); new ItemStack(ModItems.rubySpade), new ItemStack(ModItems.rubyHelmet), new ItemStack(ModItems.rubyChestplate), new ItemStack(ModItems.rubyLeggings), new ItemStack(ModItems.rubyBoots), ItemGems.getGemByName("ruby"));
@ -385,7 +392,11 @@ public class ModRecipes
addGemToolRecipes(new ItemStack(ModItems.peridotSword), new ItemStack(ModItems.peridotPickaxe), new ItemStack(ModItems.peridotAxe), new ItemStack(ModItems.peridotHoe), addGemToolRecipes(new ItemStack(ModItems.peridotSword), new ItemStack(ModItems.peridotPickaxe), new ItemStack(ModItems.peridotAxe), new ItemStack(ModItems.peridotHoe),
new ItemStack(ModItems.peridotSpade), new ItemStack(ModItems.peridotHelmet), new ItemStack(ModItems.peridotChestplate), new ItemStack(ModItems.peridotLeggings), new ItemStack(ModItems.peridotBoots), ItemGems.getGemByName("peridot")); new ItemStack(ModItems.peridotSpade), new ItemStack(ModItems.peridotHelmet), new ItemStack(ModItems.peridotChestplate), new ItemStack(ModItems.peridotLeggings), new ItemStack(ModItems.peridotBoots), ItemGems.getGemByName("peridot"));
addGemToolRecipes(new ItemStack(ModItems.bronzeSword), new ItemStack(ModItems.bronzePickaxe), new ItemStack(ModItems.bronzeAxe), new ItemStack(ModItems.bronzeHoe),
new ItemStack(ModItems.bronzeSpade), new ItemStack(ModItems.bronzeHelmet), new ItemStack(ModItems.bronzeChestplate), new ItemStack(ModItems.bronzeLeggings), new ItemStack(ModItems.bronzeBoots), ItemIngots.getIngotByName("bronze"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.ironChainsaw), " SS", "SCS", "BS ", CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.ironChainsaw), " SS", "SCS", "BS ",
'S', "ingotSteel", 'B', TechRebornAPI.recipeCompact.getItem("reBattery"), 'C', 'S', "ingotSteel", 'B', TechRebornAPI.recipeCompact.getItem("reBattery"), 'C',
TechRebornAPI.recipeCompact.getItem("electronicCircuit")); TechRebornAPI.recipeCompact.getItem("electronicCircuit"));
@ -520,11 +531,6 @@ public class ModRecipes
ItemParts.getPartByName("advancedAlloy"), 'C', ItemPlates.getPlateByName("carbon"), 'M', ItemParts.getPartByName("advancedAlloy"), 'C', ItemPlates.getPlateByName("carbon"), 'M',
BlockMachineFrame.getFrameByName("machine", 1)); BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper.addShapedOreRecipe(BlockStorage.getStorageBlockByName("sapphire"), "AAA", "AAA", "AAA", 'A',
"gemSapphire");
CraftingHelper
.addShapedOreRecipe(BlockStorage.getStorageBlockByName("ruby"), "AAA", "AAA", "AAA", 'A', "gemRuby");
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataStorageCircuit"), "EEE", "ECE", "EEE", 'E', CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataStorageCircuit"), "EEE", "ECE", "EEE", 'E',
new ItemStack(Items.emerald), 'C', ItemParts.getPartByName("electronicCircuit")); new ItemStack(Items.emerald), 'C', ItemParts.getPartByName("electronicCircuit"));

View file

@ -13,6 +13,7 @@ import net.minecraft.item.ItemSword;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
@ -81,19 +82,19 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITextur
return false; return false;
} }
@SideOnly(Side.CLIENT) // @SideOnly(Side.CLIENT)
@Override // @Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) // public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
{ // {
if (ItemNBTHelper.verifyExistance(stack, "isActive")) // if (ItemNBTHelper.verifyExistance(stack, "isActive"))
{ // {
list.add("Active"); // list.add("Active");
} else if (!ItemNBTHelper.verifyExistance(stack, "isActive")) // } else if (!ItemNBTHelper.verifyExistance(stack, "isActive"))
{ // {
list.add("Not Active"); // list.add("Not Active");
} // }
super.addInformation(stack, player, list, par4); // super.addInformation(stack, player, list, par4);
} // }
@Override @Override
public boolean isRepairable() public boolean isRepairable()
@ -179,4 +180,10 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITextur
{ {
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
} }
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced)
{
tooltip.add(TextFormatting.RED + "WIP Coming Soon");
}
} }

View file

@ -28,7 +28,6 @@ public class StackWIPHandler
wipBlocks.add(ModBlocks.ElectricCraftingTable); wipBlocks.add(ModBlocks.ElectricCraftingTable);
wipBlocks.add(ModBlocks.playerDetector); wipBlocks.add(ModBlocks.playerDetector);
wipBlocks.add(ModBlocks.chargeBench); wipBlocks.add(ModBlocks.chargeBench);
wipBlocks.add(ModBlocks.playerDetector);
wipBlocks.add(ModBlocks.Magicenergeyconverter); wipBlocks.add(ModBlocks.Magicenergeyconverter);
addHead("modmuss50"); addHead("modmuss50");