mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-13 16:54:06 +00:00
Recipe/docs for the Thorn Chakram.
This commit is contained in:
1 parent
7f1303cc30
commit
1d91bc8996
5 files changed
+25
-3
No files matched your search
@@ -220,6 +220,7 @@ public final class ModCraftingRecipes {
|
||||
public static IRecipe recipeSmeltRod;
|
||||
public static IRecipe recipeWorldSeed;
|
||||
public static IRecipe recipeSpellCloth;
|
||||
public static IRecipe recipeThornChakram;
|
||||
|
||||
public static void init() {
|
||||
// Lexicon Recipe
|
||||
@@ -1445,6 +1446,13 @@ public final class ModCraftingRecipes {
|
||||
'P', LibOreDict.MANA_PEARL);
|
||||
recipeSpellCloth = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Thorn Chakram Recipe
|
||||
addOreDictRecipe(new ItemStack(ModItems.thornChakram),
|
||||
"VVV", "VTV", "VVV",
|
||||
'V', new ItemStack(Blocks.vine),
|
||||
'T', LibOreDict.TERRA_STEEL);
|
||||
recipeThornChakram = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Storage Block Recipes
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0),
|
||||
"III", "III", "III",
|
||||
|
||||
@@ -16,6 +16,8 @@ import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.projectile.EntityThrowable;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
@@ -26,7 +28,7 @@ import vazkii.botania.common.item.ModItems;
|
||||
|
||||
public class EntityThornChakram extends EntityThrowable {
|
||||
|
||||
private static final int MAX_BOUNCES = 8;
|
||||
private static final int MAX_BOUNCES = 16;
|
||||
boolean bounced = false;
|
||||
|
||||
public EntityThornChakram(World world) {
|
||||
@@ -92,9 +94,11 @@ public class EntityThornChakram extends EntityThrowable {
|
||||
return;
|
||||
|
||||
EntityLivingBase thrower = getThrower();
|
||||
if(pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != thrower)
|
||||
if(pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != thrower) {
|
||||
((EntityLivingBase) pos.entityHit).attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causePlayerDamage((EntityPlayer) thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 6);
|
||||
else {
|
||||
if(worldObj.rand.nextInt(3) == 0)
|
||||
((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(Potion.poison.id, 60, 0));
|
||||
} else {
|
||||
int bounces = getTimesBounced();
|
||||
if(bounces < MAX_BOUNCES) {
|
||||
Vector3 currentMovementVec = new Vector3(motionX, motionY, motionZ);
|
||||
|
||||
@@ -157,6 +157,7 @@ public final class LexiconData {
|
||||
public static LexiconEntry smeltRod;
|
||||
public static LexiconEntry worldSeed;
|
||||
public static LexiconEntry spellCloth;
|
||||
public static LexiconEntry thornChakram;
|
||||
|
||||
public static LexiconEntry baublesIntro;
|
||||
public static LexiconEntry tinyPlanet;
|
||||
@@ -603,6 +604,9 @@ public final class LexiconData {
|
||||
spellCloth = new BLexiconEntry(LibLexicon.TOOL_SPELL_CLOTH, categoryTools);
|
||||
spellCloth.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpellCloth));
|
||||
|
||||
thornChakram = new BLexiconEntry(LibLexicon.TOOL_THORN_CHAKRAM, categoryTools);
|
||||
thornChakram.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeThornChakram));
|
||||
|
||||
// BAUBLES ENTRIES
|
||||
baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles);
|
||||
baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2"));
|
||||
|
||||
@@ -138,6 +138,7 @@ public final class LibLexicon {
|
||||
public static final String TOOL_SMELT_ROD = "smeltRod";
|
||||
public static final String TOOL_WORLD_SEED = "worldSeed";
|
||||
public static final String TOOL_SPELL_CLOTH = "spellCloth";
|
||||
public static final String TOOL_THORN_CHAKRAM = "thornChakram";
|
||||
|
||||
public static final String BAUBLE_INTRO = "bIntro";
|
||||
public static final String BAUBLE_TINY_PLANET = "tinyPlanet";
|
||||
|
||||
Reference in new issue
Block a user