maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shift-Right click on non-block to clear freq. transmitter and advanced drill/chainsaw recipes.

Browse source
This commit is contained in:
Prospector 2016-05-15 21:24:35 -07:00
parent 58037e3c9c
commit 3cf950d491
6 changed files with 63 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/main/java/techreborn/init/ModRecipes.java
View file

@ -13,6 +13,7 @@ import org.apache.commons.lang3.ArrayUtils;
import reborncore.api.recipe.RecipeHandler;
import reborncore.common.util.CraftingHelper;
import reborncore.common.util.OreUtil;
import reborncore.common.util.StringUtils;
import techreborn.Core;
import techreborn.api.ScrapboxList;
import techreborn.api.TechRebornAPI;
@ -40,6 +41,18 @@ public class ModRecipes
public static ItemStack dyes = new ItemStack(Items.DYE, 1, OreDictionary.WILDCARD_VALUE);
public static Item hammer = ModItems.hammer;
public static Item ironDrill = TechRebornAPI.recipeCompact.getItem("miningDrill").getItem();
public static ItemStack ironDrillStack = new ItemStack(ironDrill, 1, OreDictionary.WILDCARD_VALUE);
public static Item diamondDrill = ModItems.diamondDrill;
public static ItemStack diamondDrillStack = new ItemStack(diamondDrill, 1, OreDictionary.WILDCARD_VALUE);
public static Item ironChainsaw = ModItems.ironChainsaw;
public static ItemStack ironChainsawStack = new ItemStack(ironChainsaw, 1, OreDictionary.WILDCARD_VALUE);
public static Item diamondChainsaw = ModItems.diamondChainsaw;
public static ItemStack diamondChainsawStack = new ItemStack(diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE);
public static void init()
{
addShapelessRecipes();
@ -746,7 +759,7 @@ public class ModRecipes
{
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName(part), " O ", "OIO", " O ", 'I',
new ItemStack(Items.IRON_INGOT), 'O',
"ingot" + capitalizeFirstLetter(part.replace("Gear", "")));
"ingot" + StringUtils.toFirstCapital(part.replace("Gear", "")));
}
}
@ -851,14 +864,14 @@ public class ModRecipes
'C', ItemParts.getPartByName("CoolantSimple"), 'S', ItemCells.getCellByName("sodium"), 'P',
ItemCells.getCellByName("potassium"));
Core.logHelper.info("Shapped Recipes Added");
}
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.advancedDrill), "ODO", "AOA", 'O', ItemUpgrades.getUpgradeByName("Overclock"),
'D', diamondDrillStack, 'A', "circuitAdvanced");
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.advancedChainsaw), "ODO", "AOA", 'O', ItemUpgrades.getUpgradeByName("Overclock"),
'D', diamondChainsawStack, 'A', "circuitAdvanced");
public static String capitalizeFirstLetter(String original)
{
if (original.length() == 0)
return original;
return original.substring(0, 1).toUpperCase() + original.substring(1);
Core.logHelper.info("Shapped Recipes Added");
}
static void addShapelessRecipes()
@ -1157,8 +1170,8 @@ public class ModRecipes
if (OreUtil.hasBlock(ore) && OreUtil.hasPlate(ore))
{
RecipeHandler.addRecipe(
new PlateCuttingMachineRecipe(OreUtil.getStackFromName("block" + capitalizeFirstLetter(ore)),
OreUtil.getStackFromName("plate" + capitalizeFirstLetter(ore), 9), 200, 16));
new PlateCuttingMachineRecipe(OreUtil.getStackFromName("block" + StringUtils.toFirstCapital(ore)),
OreUtil.getStackFromName("plate" + StringUtils.toFirstCapital(ore), 9), 200, 16));
}
}
@ -1487,17 +1500,17 @@ public class ModRecipes
if (OreUtil.hasIngot(ore) && OreUtil.hasDustSmall(ore) && OreUtil.hasBlock(ore))
{
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(OreUtil.getStackFromName("block" + capitalizeFirstLetter(ore)),
new IndustrialGrinderRecipe(OreUtil.getStackFromName("block" + StringUtils.toFirstCapital(ore)),
null, new FluidStack(FluidRegistry.WATER, 1000),
OreUtil.getStackFromName("ingot" + capitalizeFirstLetter(ore)),
OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 6),
OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 2), null, 100, 120));
OreUtil.getStackFromName("ingot" + StringUtils.toFirstCapital(ore)),
OreUtil.getStackFromName("dustSmall" + StringUtils.toFirstCapital(ore), 6),
OreUtil.getStackFromName("dustSmall" + StringUtils.toFirstCapital(ore), 2), null, 100, 120));
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(OreUtil.getStackFromName("block" + capitalizeFirstLetter(ore)),
new IndustrialGrinderRecipe(OreUtil.getStackFromName("block" + StringUtils.toFirstCapital(ore)),
new ItemStack(Items.WATER_BUCKET), null,
OreUtil.getStackFromName("ingot" + capitalizeFirstLetter(ore)),
OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 6),
OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 2),
OreUtil.getStackFromName("ingot" + StringUtils.toFirstCapital(ore)),
OreUtil.getStackFromName("dustSmall" + StringUtils.toFirstCapital(ore), 6),
OreUtil.getStackFromName("dustSmall" + StringUtils.toFirstCapital(ore), 2),
new ItemStack(Items.BUCKET), 100, 120));
}
}
@ -3319,7 +3332,7 @@ public class ModRecipes
if (ConfigTechReborn.ExpensiveDiamondDrill)
CraftingHelper
.addShapedOreRecipe(TechRebornAPI.recipeCompact.getItem("diamondDrill"), " D ", "DBD", "TCT", 'D',
"gemDiamond", 'T', "ingotTitanium", 'B', drillStack, 'C',
"diamondTR", 'T', "ingotTitanium", 'B', drillStack, 'C',
TechRebornAPI.recipeCompact.getItem("advancedCircuit"));
if (ConfigTechReborn.ExpensiveSolar)

25
src/main/java/techreborn/items/ItemFrequencyTransmitter.java
View file

@ -4,6 +4,7 @@ import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
@ -50,14 +51,32 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur
TextFormatting.GRAY + " Z: " +
TextFormatting.GOLD + pos.getZ() +
TextFormatting.GRAY + " " + I18n.translateToLocal("techreborn.message.in") + " " +
TextFormatting.GOLD + DimensionManager.getProviderType(world.provider.getDimension()).getName() + " ("+world.provider.getDimension()+")"));
TextFormatting.GOLD + DimensionManager.getProviderType(world.provider.getDimension())
.getName() + " (" + world.provider.getDimension() + ")"));
}
return EnumActionResult.SUCCESS;
}
@Override public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player,
EnumHand hand)
{
if (player.isSneaking())
{
stack.setTagCompound(null);
if (!world.isRemote && ConfigTechReborn.FreqTransmitterChat)
{
ChatUtils.sendNoSpamClient(new TextComponentString(
TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.coordsHaveBeen") + " "
+ TextFormatting.GOLD + I18n.translateToLocal("techreborn.message.cleared")));
}
}
return new ActionResult<>(EnumActionResult.SUCCESS, stack);
}
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
{
if(ConfigTechReborn.FreqTransmitterTooltip)
if (ConfigTechReborn.FreqTransmitterTooltip)
{
if (stack.getTagCompound() != null)
{
@ -73,7 +92,7 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur
} else
{
list.add(TextFormatting.GRAY + "No Coordinates Set");
list.add(TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.noCoordsSet"));
}
}
}

10
src/main/java/techreborn/items/ItemUpgrades.java
View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@ -10,9 +7,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.utils.upgrade.IMachineUpgrade;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.utils.upgrade.IMachineUpgrade;
import java.security.InvalidParameterException;
import java.util.List;
public class ItemUpgrades extends ItemTextureBase implements IMachineUpgrade, ITexturedItem
{
@ -93,6 +93,8 @@ public class ItemUpgrades extends ItemTextureBase implements IMachineUpgrade, IT
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced)
{
tooltip.add(TextFormatting.RED + "WIP Coming Soon");
tooltip.add(TextFormatting.RED + "Upgrades DO NOT function!");
tooltip.add(TextFormatting.RED + "Currently only a crafting ingredient");
}
@Override

13
src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java
View file

@ -1,15 +1,8 @@
package techreborn.items.tools;
import java.util.List;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemAdvancedChainsaw extends ItemChainsaw
{
@ -37,10 +30,4 @@ public class ItemAdvancedChainsaw extends ItemChainsaw
{
return 1;
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced)
{
tooltip.add(TextFormatting.RED + "WIP Coming Soon");
}
}

13
src/main/java/techreborn/items/tools/ItemAdvancedDrill.java
View file

@ -1,15 +1,8 @@
package techreborn.items.tools;
import java.util.List;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemAdvancedDrill extends ItemDrill
{
@ -37,10 +30,4 @@ public class ItemAdvancedDrill extends ItemDrill
{
return 1;
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced)
{
tooltip.add(TextFormatting.RED + "WIP Coming Soon");
}
}

3
src/main/resources/assets/techreborn/lang/en_US.lang
View file

@ -983,6 +983,9 @@ techreborn.recipe.implosioncompressor=Implosion Compressor
techreborn.message.missingmultiblock=Incomplete Multiblock
techreborn.message.setTo=Set to
techreborn.message.in=in
techreborn.message.noCoordsSet=No Coordinates Set
techreborn.message.coordsHaveBeen=Coordinates have been
techreborn.message.cleared=Cleared
#Cables
Cable.copperCable.name=Copper Cable