Implemented Mana Infusion crafting.

This commit is contained in:
Vasco Lavos committed 2014-01-30 21:59:39 +00:00
1 parent 1646dcd9ec
commit 75979478cb
14 files changed
+162 -18

No files matched your search

+16 -2
View File
@@ -19,8 +19,9 @@ import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import vazkii.botania.api.internal.DummyMethodHandler;
import vazkii.botania.api.internal.IInternalMethodHandler;
import vazkii.botania.api.internal.RecipePetals;
import vazkii.botania.api.internal.SubTileDummy;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.subtile.SubTileEntity;
import com.google.common.collect.BiMap;
@@ -32,7 +33,8 @@ public final class BotaniaAPI {
private static List<LexiconEntry> allEntries = new ArrayList<LexiconEntry>();
public static List<RecipePetals> petalRecipes = new ArrayList<RecipePetals>();
public static List<RecipeManaInfusion> manaInfusionRecipes = new ArrayList<RecipeManaInfusion>();
private static BiMap<String, Class<? extends SubTileEntity>> subTiles = HashBiMap.<String, Class<? extends SubTileEntity>> create();
static {
registerSubTile("", SubTileDummy.class);
@@ -57,6 +59,18 @@ public final class BotaniaAPI {
return recipe;
}
/**
* Registers a Mana Infusion Recipe (throw an item in a mana pool)
* @param output The ItemStack to craft
* @param input The input item, be it an ItemStack or an ore dictionary entry String.
* @return The recipe created.
*/
public static RecipeManaInfusion registerManaInfusionRecipe(ItemStack output, Object input, int mana) {
RecipeManaInfusion recipe = new RecipeManaInfusion(output, input, mana);
manaInfusionRecipes.add(recipe);
return recipe;
}
public static void registerSubTile(String key, Class<? extends SubTileEntity> subtileClass) {
subTiles.put(key, subtileClass);
}
@@ -9,7 +9,7 @@
*
* File Created @ [Jan 22, 2014, 5:04:30 PM (GMT)]
*/
package vazkii.botania.api.internal;
package vazkii.botania.api.mana;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.MinecraftForge;
@@ -0,0 +1,45 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under a
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
*
* File Created @ [Jan 30, 2014, 5:57:07 PM (GMT)]
*/
package vazkii.botania.api.recipe;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
public class RecipeManaInfusion {
ItemStack output;
Object input;
int mana;
public RecipeManaInfusion(ItemStack output, Object input, int mana) {
this.output = output;
this.input = input;
this.mana = mana;
}
public boolean matches(ItemStack stack) {
if(input instanceof ItemStack)
return stack.isItemEqual((ItemStack) input);
String oredict = OreDictionary.getOreName(OreDictionary.getOreID(stack));
return oredict.equals(input);
}
public ItemStack getOutput() {
return output;
}
public int getManaToConsume() {
return mana;
}
}
@@ -9,7 +9,7 @@
*
* File Created @ [Jan 22, 2014, 2:02:44 PM (GMT)]
*/
package vazkii.botania.api.internal;
package vazkii.botania.api.recipe;
import java.util.ArrayList;
import java.util.List;
+1 -1
View File
@@ -11,7 +11,7 @@
*/
package vazkii.botania.common;
import vazkii.botania.api.internal.ManaNetworkEvent;
import vazkii.botania.api.mana.ManaNetworkEvent;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.core.proxy.CommonProxy;
import vazkii.botania.common.lib.LibMisc;
@@ -14,6 +14,8 @@ package vazkii.botania.common.block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -25,6 +27,7 @@ import vazkii.botania.client.lib.LibRenderIDs;
import vazkii.botania.common.block.tile.TilePool;
import vazkii.botania.common.lib.LibBlockIDs;
import vazkii.botania.common.lib.LibBlockNames;
import cpw.mods.fml.common.network.PacketDispatcher;
public class BlockPool extends BlockModContainer implements IHUD, IWandable {
@@ -41,6 +44,15 @@ public class BlockPool extends BlockModContainer implements IHUD, IWandable {
public TileEntity createNewTileEntity(World world) {
return new TilePool();
}
@Override
public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) {
if(par5Entity instanceof EntityItem) {
TilePool tile = (TilePool) par1World.getBlockTileEntity(par2, par3, par4);
if(tile.collideEntityItem((EntityItem) par5Entity))
PacketDispatcher.sendPacketToAllInDimension(tile.getDescriptionPacket(), par1World.provider.dimensionId);
}
}
@Override
public boolean isOpaqueCube() {
@@ -21,7 +21,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.RecipePetals;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.common.Botania;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibBlockNames;
@@ -15,22 +15,21 @@ import java.awt.Color;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import vazkii.botania.api.internal.ManaNetworkEvent;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.mana.ManaNetworkEvent;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.client.core.handler.HUDHandler;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.lib.LibBlockNames;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class TilePool extends TileSimpleInventory implements IManaPool {
@@ -65,6 +64,47 @@ public class TilePool extends TileSimpleInventory implements IManaPool {
ManaNetworkEvent.removePool(this);
}
public boolean collideEntityItem(EntityItem item) {
boolean didChange = false;
ItemStack stack = item.getEntityItem();
if(stack == null)
return false;
for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) {
if(recipe.matches(stack)) {
int mana = recipe.getManaToConsume();
if(getCurrentMana() >= mana) {
recieveMana(-mana);
stack.stackSize--;
if(stack.stackSize == 0)
item.setDead();
if(!worldObj.isRemote) {
ItemStack output = recipe.getOutput().copy();
EntityItem outputItem = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, output);
worldObj.spawnEntityInWorld(outputItem);
}
craftingFanciness();
didChange = true;
}
break;
}
}
return didChange;
}
public void craftingFanciness() {
worldObj.playSoundEffect(xCoord, yCoord, zCoord, "random.levelup", 1F, 1F);
for(int i = 0; i < 25; i++) {
float red = (float) Math.random();
float green = (float) Math.random();
float blue = (float) Math.random();
Botania.proxy.sparkleFX(worldObj, xCoord + 0.5 + (Math.random() * 0.4) - 0.2, yCoord + 1, zCoord + 0.5 + (Math.random() * 0.4) - 0.2, red, green, blue, (float) Math.random(), 10);
}
}
@Override
public void updateEntity() {
if(!added) {
@@ -29,10 +29,10 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.internal.ManaNetworkEvent;
import vazkii.botania.api.mana.IManaCollector;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.api.mana.ManaNetworkEvent;
import vazkii.botania.client.core.handler.HUDHandler;
import vazkii.botania.client.core.helper.Vector3;
import vazkii.botania.common.block.ModBlocks;
@@ -19,9 +19,9 @@ import java.util.Map;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChunkCoordinates;
import net.minecraftforge.event.ForgeSubscribe;
import vazkii.botania.api.internal.ManaNetworkEvent;
import vazkii.botania.api.internal.ManaNetworkEvent.Action;
import vazkii.botania.api.internal.ManaNetworkEvent.ManaBlockType;
import vazkii.botania.api.mana.ManaNetworkEvent;
import vazkii.botania.api.mana.ManaNetworkEvent.Action;
import vazkii.botania.api.mana.ManaNetworkEvent.ManaBlockType;
import vazkii.botania.common.core.helper.MathHelper;
public final class ManaNetworkHandler {
@@ -22,6 +22,7 @@ import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.handler.InternalMethodHandler;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.crafting.ModCrafingRecipes;
import vazkii.botania.common.crafting.ModManaInfusionRecipes;
import vazkii.botania.common.crafting.ModPetalRecipes;
import vazkii.botania.common.entity.ModEntities;
import vazkii.botania.common.item.ModItems;
@@ -45,6 +46,7 @@ public class CommonProxy {
ModCrafingRecipes.init();
ModPetalRecipes.init();
ModManaInfusionRecipes.init();
LexiconData.init();
}
@@ -0,0 +1,27 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under a
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
*
* File Created @ [Jan 30, 2014, 6:10:48 PM (GMT)]
*/
package vazkii.botania.common.crafting;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.common.item.ModItems;
public final class ModManaInfusionRecipes {
public static RecipeManaInfusion manasteelRecipe;
public static void init() {
manasteelRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 0), "ingotIron", 1000);
}
}
@@ -14,7 +14,7 @@ package vazkii.botania.common.crafting;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.RecipePetals;
import vazkii.botania.api.recipe.RecipePetals;
public final class ModPetalRecipes {
@@ -42,5 +42,9 @@ public final class ModItems {
OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaResource, 1, 0));
OreDictionary.registerOre(LibOreDict.MANA_PEARL, new ItemStack(manaResource, 1, 1));
OreDictionary.registerOre(LibOreDict.MANA_DIAMOND, new ItemStack(manaResource, 1, 1));
// Vanilla ores (because forge doesn't do this by default for some reason)
OreDictionary.registerOre("ingotIron", Item.ingotIron);
OreDictionary.registerOre("ingotGold", Item.ingotGold);
}
}