upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-14 01:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Recipe, docs and Stone of Temperance support for the Terra Truncator.

Browse Source
This commit is contained in:
Lizbeth Rika committed 2015-05-15 23:27:47 +01:00
1 parent f20ebefed5
commit e5bdf25268
5 files changed
+27 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java
+9
View File
@@ -259,6 +259,7 @@ public final class ModCraftingRecipes {
public static IRecipe recipeTemperanceStone;
public static IRecipe recipeIncenseStick;
public static IRecipe recipeIncensePlate;
public static IRecipe recipeTerraAxe;
public static void init() {
// Lexicon Recipe
@@ -1728,6 +1729,14 @@ public final class ModCraftingRecipes {
'S', new ItemStack(ModFluffBlocks.livingwoodSlab));
recipeIncensePlate = BotaniaAPI.getLatestAddedRecipe();
// Terra Truncator Recipe
addOreDictRecipe(new ItemStack(ModItems.terraAxe),
"TTG", "TST", " S ",
'T', LibOreDict.TERRA_STEEL,
'G', new ItemStack(Blocks.glowstone),
'S', LibOreDict.LIVINGWOOD_TWIG);
recipeTerraAxe = BotaniaAPI.getLatestAddedRecipe();
// Storage Block Recipes
addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0),
"III", "III", "III",
src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java
+6 -2
View File
@@ -29,6 +29,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.item.ISequentialBreaker;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.item.ItemTemperanceStone;
import vazkii.botania.common.item.equipment.tool.ToolCommons;
import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe;
import vazkii.botania.common.item.relic.ItemLokiRing;
@@ -66,9 +67,12 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker
@Override
public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
return player.isSneaking() ? iconOff : iconOn;
return shouldBreak(player) ? iconOn : iconOff;
}
public boolean shouldBreak(EntityPlayer player) {
return !player.isSneaking() && !ItemTemperanceStone.hasTemperanceActive(player);
}
@Override
public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) {
@@ -88,7 +92,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker
@Override
public void breakOtherBlock(EntityPlayer player, ItemStack stack, int x, int y, int z, int originX, int originY, int originZ, int side) {
if(!player.isSneaking()) {
if(shouldBreak(player)) {
ChunkCoordinates coords = new ChunkCoordinates(x, y, z);
addBlockSwapper(player.worldObj, player, stack, coords, coords, 32, false, true, new ArrayList());
}
src/main/java/vazkii/botania/common/lexicon/LexiconData.java
+4
View File
@@ -181,6 +181,7 @@ public final class LexiconData {
public static LexiconEntry livingwoodBow;
public static LexiconEntry crystalBow;
public static LexiconEntry temperanceStone;
public static LexiconEntry terraAxe;
public static LexiconEntry enderAir;
public static LexiconEntry enderEyeBlock;
@@ -694,6 +695,9 @@ public final class LexiconData {
temperanceStone = new BLexiconEntry(LibLexicon.TOOL_TEMPERANCE_STONE, categoryTools);
temperanceStone.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTemperanceStone));
terraAxe = new BLexiconEntry(LibLexicon.TOOL_TERRA_AXE, categoryTools);
terraAxe.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraAxe));
// ENDER ENTRIES
enderAir = new BLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder);
enderAir.setPriority().setLexiconPages(new PageText("0"));
src/main/java/vazkii/botania/common/lib/LibLexicon.java
+2 -1
View File
@@ -153,7 +153,8 @@ public final class LibLexicon {
public static final String TOOL_LIVINGWOOD_BOW = "livingwoodBow";
public static final String TOOL_CRYSTAL_BOW = "crystalBow";
public static final String TOOL_TEMPERANCE_STONE = "temperanceStone";
public static final String TOOL_TERRA_AXE = "terraAxe";
public static final String ENDER_AIR = "enderAir";
public static final String ENDER_ENDER_EYE_BLOCK = "enderEyeBlock";
public static final String ENDER_PISTON_RELAY = "pistonRelay";