diff --git a/src/main/api/java/morph/api/Ability.java b/src/main/api/java/morph/api/Ability.java deleted file mode 100644 index 36a75e9..0000000 --- a/src/main/api/java/morph/api/Ability.java +++ /dev/null @@ -1,208 +0,0 @@ -package morph.api; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/** - * - * Abstract ability class. - * Think of it like the Entity class, extend it to make your own types. - * Some abilities may seem more like traits, but let's just call it an ability for simplicity's sake. - * Please take note that entities inherit their superclass' abilities. - * @author iChun - * - */ -public abstract class Ability -{ - /** - * Ability parent field. Will be null for instances used in registration. Ability is then cloned and parent assigned later on. - */ - private EntityLivingBase parent; - - /** - * Flag for Ability activity. If true, tick/postRender/kill will notbe called. - */ - public boolean inactive; - - /** - * Basic constructor (but you didn't really need me to tell you that ;D ) - */ - public Ability() - { - parent = null; - } - - /** - * Function for mod mob support, with args. - */ - public Ability parse(String[] args) { return this; } - - /** - * Since parent is private it needs a setter. - * @param newParent - */ - public void setParent(EntityLivingBase ent) - { - parent = ent; - } - - /** - * Get's the parent entity for this ability - * @return Entity the ability takes effect on - */ - public EntityLivingBase getParent() - { - return parent; - } - - /** - * Each ability has to return a String type. - * This is used for comparison, saving, as well as construction/loading of Ability. - * Think of it like the way Minecraft registers entities. - * @return Ability type - */ - public abstract String getType(); - - /** - * Ticks every world tick, basically an ability onUpdate, similar to Entity's onUpdate. - * Will only tick if getParent() is not null. - * Please remember that getParent is not necessarily a player. - */ - public abstract void tick(); - - /** - * Called when the ability is finally removed when the parent demorphs or morphs into a state that does not have this ability type. - * This will NOT be called if the parent morphs into another morph that has this type of ability. - */ - public abstract void kill(); - - /** - * Creates a copy of this ability for use with parents. - * As previously stated before the ability instance used during registration is a base so it needs to be cloned for use with parents. - */ - public abstract Ability clone(); - - /** - * Return true for this if you need an inactive copy of this morph in-between morph states (abilities of the next morph are only swapped over when morph is complete) - * Currently used for AbilitySwim to adjust the fog render. - * @return requiresInactiveClone - */ - public boolean requiresInactiveClone() - { - return false; - } - - /** - * Saving of ability to NBTTagCompound. - * Mainly used for synching Abilities between the client-server for mod mobs which do not use the API to add abilities. - * The ability type (getType()) is appended to nbt before function is called. - * Not actually used. - * @param NBTTagCompound saveData - */ - public abstract void save(NBTTagCompound tag); - - /** - * Loading of ability from NBTTagCompound. - * Mainly used to load custom fields from NBT. - * Not actually used. - * @param NBTTagCompound saveData - */ - public abstract void load(NBTTagCompound tag); - - /** - * Rendering to be done post-render. - * EG: Used by AbilitySwim to render air bubbles whilst on land. - */ - @SideOnly(Side.CLIENT) - public abstract void postRender(); - - /** - * Icon location for ability. Can be null. - * Mod's default icons are 32x32. Can be any resolution though. - * @return resourcelocation for icon - */ - @SideOnly(Side.CLIENT) - public abstract ResourceLocation getIcon(); - - @SideOnly(Side.CLIENT) - public boolean entityHasAbility(EntityLivingBase living) - { - return true; - } - - /** - * Registers the ability so the mod can look up the class when attempting to load Ability save data. - * Call this no later than PostInit. - * @param ability type - * @param AbilityClass - */ - public static void registerAbility(String name, Class clz) - { - try { - Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("registerAbility", String.class, Class.class).invoke(null, name, clz); - } catch (Exception e) { - } - } - - /** - * Maps abilities to an Entity. - * Adds on to the previous ability list, so this allows you to add abilities to Entity classes which already have abilities mapped. - * However, only one ability of the same type is allowed for each entity. This method will overwrite abilities of the same type that were already mapped. - * This will also register new abilities which were not registered before (just in case). - * Call this no later than PostInit. - * @param entClass - * @param abilities - */ - public static void mapAbilities(Class entClass, Ability...abilities) - { - try { - Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("mapAbilities", Class.class, Ability[].class).invoke(null, entClass, abilities); - } catch (Exception e) { - } - } - - /** - * Superman's kryptonite. - * @param Entity class to remove ability from - * @param Ability type - */ - public static void removeAbility(Class entClass, String type) - { - try { - Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("removeAbility", Class.class, String.class).invoke(null, entClass, type); - } catch (Exception e) { - } - } - - /** - * Checks to see if the entity class has a mapped ability type. - * @param entClass - * @param Ability type - * @return Entity class has ability type - */ - public static boolean hasAbility(Class entClass, String type) - { - try { - return (Boolean)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("hasAbility", Class.class, String.class).invoke(null, entClass, type); - } catch (Exception e) { - return false; - } - } - - /** - * Creates an ability by type. - * Check out AbilityHandler to see each Ability type and the parse function in their respective classes for the arguments. - * @return - */ - public static Ability createNewAbilityByType(String type, String[] arguments) - { - try { - return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("createNewAbilityByType", String.class, String[].class).invoke(null, type, arguments); - } catch (Exception e) { - return null; - } - } -} diff --git a/src/main/api/java/morph/api/Api.java b/src/main/api/java/morph/api/Api.java deleted file mode 100644 index 1cfb49d..0000000 --- a/src/main/api/java/morph/api/Api.java +++ /dev/null @@ -1,170 +0,0 @@ -package morph.api; - -import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public final class Api -{ - /** - * Returns if a player is has a morph. If morph progress < 1.0F, player is mid-morphing. - * Players demorphing are considered as a player with a morph until the demorph is complete. - * @param Player Username - * @param Clientside (false for Serverside) - */ - public static boolean hasMorph(String playerName, boolean isClient) - { - try { - return (Boolean)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("hasMorph", String.class, boolean.class).invoke(null, playerName, isClient); - } catch (Exception e) { - return false; - } - } - - /** - * Returns morph progression of a player. Time per morph is 80 ticks. - * If player does not have a morph, 1.0F will be returned. - * @param Player Username - * @param Clientside (false for Serverside) - */ - public static float morphProgress(String playerName, boolean isClient) - { - try { - return (Float)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("morphProgress", String.class, boolean.class).invoke(null, playerName, isClient); - } catch (Exception e) { - return 1.0F; - } - } - - /** - * Returns previous entity instance used to render the morph. - * If player does not have a previous morph state, null will be returned. - * @param Player Username - * @param Clientside (false for Serverside) - */ - public static EntityLivingBase getPrevMorphEntity(String playerName, boolean isClient) - { - try { - return (EntityLivingBase)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getPrevMorphEntity", String.class, boolean.class).invoke(null, playerName, isClient); - } catch (Exception e) { - return null; - } - } - - /** - * Returns entity instance used to render the morph. - * If player does not have a morph, null will be returned. - * @param Player Username - * @param Clientside (false for Serverside) - */ - public static EntityLivingBase getMorphEntity(String playerName, boolean isClient) - { - try { - return (EntityLivingBase)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getMorphEntity", String.class, boolean.class).invoke(null, playerName, isClient); - } catch (Exception e) { - return null; - } - } - - /** - * Blacklists an entity from being morphed into. - * Previously saved morphs of the classtype will not be removed. - * @param Class (extends EntityLivingBase) - */ - public static void blacklistEntity(Class clz) - { - try { - Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("blacklistEntity", Class.class).invoke(null, clz); - } catch (Exception e) { - } - } - - /** - * Forces a player to morph into an EntityLivingBase, also adds said entity to the morph list. - * Called Serverside only. - * @param player - * @param living - * @return morphSuccessful - */ - public static boolean forceMorph(EntityPlayerMP player, EntityLivingBase living) - { - try { - return (Boolean)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("forceMorph", EntityPlayerMP.class, EntityLivingBase.class).invoke(null, player, living); - } catch (Exception e) { - return false; - } - } - - /** - * Forces a player to demorph. - * Called Serverside only. - * @param player - */ - public static void forceDemorph(EntityPlayerMP player) - { - try { - Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("forceDemorph", EntityPlayerMP.class).invoke(null, player); - } catch (Exception e) { - } - } - - /** - * Checks if the entity passed on is a Morph. - * If it is, the player name will be passed, else null. - * @param EntityLivingBase instance - * @param Clientside (false for Serverside) - */ - public static String isEntityAMorph(EntityLivingBase living, boolean isClient) - { - try { - return (String)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("isEntityAMorph", EntityLivingBase.class, boolean.class).invoke(null, living, isClient); - } catch (Exception e) { - return null; - } - } - - /** - * Allows the rendering of the next player rendered. - * Prevents Morph from cancelling the player render event to render the morphed entity. - */ - public static void allowNextPlayerRender() - { - try { - Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("allowNextPlayerRender").invoke(null); - } catch (Exception e) { - } - } - - /** - * Returns the black grainy morph skin that overlays the player when the player is morphing - * @return Morph Skin Resource Location - */ - @SideOnly(Side.CLIENT) - public static ResourceLocation getMorphSkinTexture() - { - try { - return (ResourceLocation)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getMorphSkinTexture").invoke(null); - } catch (Exception e) { - return AbstractClientPlayer.locationStevePng; - } - } - - /** - * Assign a specific arm to a model for rendering in First Person. - * @param model Model which arm you are registering for - * @param arm The arm in a ModelRenderer form. - */ - @SideOnly(Side.CLIENT) - public static void registerArmForModel(ModelBase model, ModelRenderer arm) - { - try { - Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("registerArmForModel", ModelBase.class, ModelRenderer.class).invoke(null, model, arm); - } catch (Exception e) { - } - } -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java deleted file mode 100644 index 8eff88d..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java +++ /dev/null @@ -1,113 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; - -/** - * @author PowerCrystals - * - * Class used to register plants and other farming-related things with MFR. Will do nothing if MFR does not exist. - * - */ -public class FactoryRegistry -{ - /* - * This may be called at any time during pre-init, init or post-init, assuming all blocks and items - * that are being accessed from the registry have been appropriately registered. - * Possible messages: - * - * // Registration: - * addLaserPreferredOre | NBTTag with an ItemStack saved on it, with the color on the "value" attribute, - * | A ValuedItem with item and value set. - * registerAutoSpawnerBlacklist | The String identifier of an entity, - * | A subclass of EntityLivingBase. - * registerFertilizable | An instance of IFactoryFertilizable. - * registerFertilizer | An instance of IFactoryFertilizer. - * registerFruitLog | The String identifier of a block. - * registerGrindable | An instance of IFactoryGrindable. - * registerGrinderBlacklist | A subclass of EntityLivingBase. - * registerHarvestable | An instance of IFactoryHarvestable. - * registerLaserOre | NBTTag with an ItemStack saved on it, with the weight on the "value" attribute, - * | A ValuedItem with item and value set. - * registerLiquidDrinkHandler | A ValuedItem with key and object set; ILiquidDrinkHandler expected. - * registerMobEggHandler | An instance of IMobEggHandler. - * registerPickableFruit | An instance of IFactoryFruit. - * registerPlantable | An instance of IFactoryPlantable. - * registerRanchable | An instance of IFactoryRanchable. - * registerRedNetLogicCircuit | An instance of IRedNetLogicCircuit. - * registerRubberTreeBiome | The biomeName field of a biome to white list for rubber trees to spawn in. - * registerSafariNetBlacklist | A subclass of EntityLivingBase. - * registerSafariNetHandler | An instance of ISafariNetHandler. - * registerSludgeDrop | NBTTag with an ItemStack saved on it, with the weight on the "value" attribute, - * | A ValuedItem with item and value set. - * registerSpawnHandler | An instance of IMobSpawnHandler. - * registerVillagerTradeMob | An instance of IRandomMobProvider. - * - * // Simple implementations: - * { Harvestables - * registerHarvestable_Standard | The String identifier of a block. - * registerHarvestable_Log | The String identifier of a block. - * registerHarvestable_Leaves | The String identifier of a block. - * registerHarvestable_Vine | The String identifier of a block. - * registerHarvestable_Shrub | The String identifier of a block. - * registerHarvestable_Mushroom | The String identifier of a block. - * registerHarvestable_Crop | An ItemStack of a block, with a damage value indicating the meta value to harvest at. - * | A ValuedItem with value and object set; Block expected. - * registerHarvestable_Gourd | An NBTTag with the stem and fruit attributes, both String identifiers of blocks. - * } - * { Plantables - * registerPlantable_Standard | An NBTTag with the seed (Item, String identifier), and - * crop (Block, String identifier) attributes set, optionally - * also having the meta (Integer, placed metadata value) attribute set. - * No special checks for location, just sustainability. - * registerPlantable_Crop | An NBTTag with the seed (Item, String identifier), and - * crop (Block, String identifier) attributes set, optionally - * also having the meta (Integer, placed metadata value) attribute set. - * Will automatically hoe dirt and grass into farmland when planting. - * registerPlantable_Sapling | An NBTTag with the sapling (Block, String identifier), and optionally - * the seed (Item, String identifier) attributes set. - * } - * { Fertilizer - * registerFertilizer | An NBTTag with the fert (Item, String identifier), meta (Integer), and - * type (Integer, index into FertilizerType.values()) attributes set. - * } - * { Fertilizables - * registerFertilizable_Grass | The String identifier of a block. Will bonemeal the block and expect - * tall grass be planted above and around it, must be IGrowable. Works with - * the GrowPlant and Grass type fertilizers, not recommended for crop plants. - * registerFertilizable_Gourd | The String identifier of a block. Must be IGrowable, and expects identical - * behavior to vanilla stems. Works with the GrowPlant fertilizers. - * registerFertilizable_Crop | An NBTTag with the plant (Block, String identifier, IGrowable), and - * meta (Integer, max growth phase) attributes set, optionally also having - * the type (Integer, index into FertilizerType) attribute set. - * registerFertilizable_Cocoa | An NBTTag with the plant (Block, String identifier), and optionally also - * the type (Integer, index into FertilizerType) attributes set. - * Expects metadata of the block to exactly match cocoa pods. - * registerFertilizable_Standard | An NBTTag with the plant (Block, String identifier, IGrowable), and - * optionally also the type (Integer, index into FertilizerType) attributes set. - * Expects the block to change when successfully grown (e.g., saplings). - * } - */ - public static void sendMessage(String message, Object value) - { - if (!Loader.isModLoaded("MineFactoryReloaded") || - Loader.instance().activeModContainer() == null) - return; - try - { - Method m = FMLInterModComms.class.getDeclaredMethod("enqueueMessage", Object.class, String.class, IMCMessage.class); - m.setAccessible(true); - Constructor c = IMCMessage.class.getDeclaredConstructor(String.class, Object.class); - c.setAccessible(true); - m.invoke(null, Loader.instance().activeModContainer(), "MineFactoryReloaded", c.newInstance(message, value)); - } - catch(Exception e) - { - e.printStackTrace(); - } - } -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java deleted file mode 100644 index a56208e..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java +++ /dev/null @@ -1,44 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -/** - * @author PowerCrystals - * - * Determines what algorithm the Harvester uses when it encounters this IFactoryHarvestable in the world. - */ -public enum HarvestType -{ - /** - * Just break the single block - no special action needed. e.g. Carrots, flowers, wheat. - */ - Normal, - /** - * Search for harvestable blocks adjacent to this block but leave this block. e.g. Pumpkin, melon - */ - Gourd, - /** - * Search for identical blocks above. - */ - Column, - /** - * Search for identical blocks above but leave the bottom one for the future. e.g. Cactus, sugarcane. - */ - LeaveBottom, - /** - * This block is the base of a tree and the harvester should enter tree-cutting mode. - */ - Tree, - /** - * This block is the base of the tree and the harvester should enter tree-cutting mode. - * The tree is searched for in the negative y axis instead. - */ - TreeFlipped, - /** - * This block is part of a tree as above. - */ - TreeLeaf, - /** - * This block is part of a tree as above, but fruits are cut before logs. e.g. cocoa - * The tree is not searched for. - */ - TreeFruit -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java deleted file mode 100644 index edfb8c9..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java +++ /dev/null @@ -1,35 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.List; -import java.util.Random; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - * - * Defines a grindable entity for the Grinder. - */ -public interface IFactoryGrindable -{ - /** - * @return The class that this grindable instance is handling. This must be a subtype of EntityLivingBase or the entity will never - * be noticed by the Grinder. - */ - public Class getGrindableEntity(); - - /** - * @param world The world this entity is in. - * @param entity The entity instance being ground. - * @param random A Random instance. - * @return The drops generated when this entity is killed. - */ - public List grind(World world, EntityLivingBase entity, Random random); - - /** - * @param entity The entity instance being ground. - * @return Whether this entity has been fully processed or not. - */ - public boolean processEntity(EntityLivingBase entity); -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java deleted file mode 100644 index d4e620a..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java +++ /dev/null @@ -1,71 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.List; -import java.util.Map; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - * - * Defines a harvestable block for the Harvester. - */ -public interface IFactoryHarvestable -{ - /** - * @return The block this harvestable instance is managing. - */ - public Block getPlant(); - - /** - * @return The type of harvest the Harvester should perform on this block. - */ - public HarvestType getHarvestType(); - - /** - * @return Whether or not the Harvester should break the block when harvesting. If false, no changes will be performed by the Harvester itself. - */ - public boolean breakBlock(); - - /** - * @param world The world this block is in. - * @param harvesterSettings The harvester's current settings. Do not modify these. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - * @return True if this block can be harvested. - */ - public boolean canBeHarvested(World world, Map harvesterSettings, int x, int y, int z); - - /** - * @param world The world this block is in. - * @param rand A Random instance to use when generating drops. - * @param harvesterSettings The harvester's current settings. Do not modify these. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - * @return The drops generated by breaking this block. For a default implementation, calling Block.getBlockDropped() is usually sufficient. - */ - public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, int z); - - /** - * Called before the block is going to be harvested. Usually empty. - * @param world The world this block is in. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - */ - public void preHarvest(World world, int x, int y, int z); - - /** - * Called after the block is going to be harvested. Used to re-till soil, for example. - * @param world The world this block is in. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - */ - public void postHarvest(World world, int x, int y, int z); -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java deleted file mode 100644 index 31eba00..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java +++ /dev/null @@ -1,8 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.EntityLivingBase; - -public interface ILiquidDrinkHandler -{ - public void onDrink(EntityLivingBase player); -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java deleted file mode 100644 index 7f5dd7c..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java +++ /dev/null @@ -1,21 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; - -public class MobDrop extends WeightedRandom.Item -{ - private ItemStack _stack; - - public MobDrop(int weight, ItemStack stack) - { - super(weight); - _stack = stack; - } - - public ItemStack getStack() - { - if(_stack == null) return null; - return _stack.copy(); - } -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java deleted file mode 100644 index 3d075fa..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java +++ /dev/null @@ -1,72 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; - -public class ValuedItem -{ - public final int value; - public final ItemStack item; - public final String key; - public final Object object; - - public ValuedItem(int v, ItemStack i) - { - value = v; - item = i; - key = null; - object = null; - } - - public ValuedItem(String v, Object i) - { - value = -1; - item = null; - key = v; - object = i; - } - - /** - * Presently unused but included so that if they do get used in the future, - * people including this in their jar and loading before MFR don't destroy everyone - */ - - public ValuedItem(int v, Object i) - { - value = v; - item = null; - key = null; - object = i; - } - - public ValuedItem(String v, ItemStack i) - { - value = -1; - item = i; - key = v; - object = null; - } - - public ValuedItem(int v, String k, ItemStack i) - { - value = v; - item = i; - key = k; - object = null; - } - - public ValuedItem(int v, String k, Object i) - { - value = v; - item = null; - key = k; - object = i; - } - - public ValuedItem(int v, String k, ItemStack i, Object o) - { - value = v; - item = i; - key = k; - object = o; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java b/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java index 7eb0850..1c90a03 100644 --- a/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java +++ b/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java @@ -4,17 +4,11 @@ import com.arc.bloodarsenal.common.BloodArsenalConfig; import com.arc.bloodarsenal.common.CommonProxy; import com.arc.bloodarsenal.common.block.ModBlocks; import com.arc.bloodarsenal.common.entity.EntityBloodTNT; -import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound; -import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall; -import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; import com.arc.bloodarsenal.common.items.ModItems; import com.arc.bloodarsenal.common.items.sigil.SigilUtils; import com.arc.bloodarsenal.common.misc.VersionChecker; import com.arc.bloodarsenal.client.renderer.block.*; -import com.arc.bloodarsenal.client.renderer.entity.RenderEntityBloodHound; -import com.arc.bloodarsenal.client.renderer.item.ItemRenderGatling; import com.arc.bloodarsenal.client.renderer.item.RenderBow; -import com.arc.bloodarsenal.client.renderer.projectile.RenderEntityGatlingProjectile; import com.arc.bloodarsenal.client.renderer.block.TilePortableAltarRenderer; import com.arc.bloodarsenal.client.renderer.block.item.TilePortableAltarItemRenderer; import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; @@ -23,9 +17,6 @@ import com.arc.bloodarsenal.common.tinkers.IClientCode; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.client.model.ModelWolf; -import net.minecraft.client.renderer.entity.RenderSnowball; -import net.minecraft.client.renderer.entity.RenderTNTPrimed; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.world.World; @@ -46,20 +37,15 @@ public class ClientProxy extends CommonProxy @Override public void registerRenders() { - MinecraftForgeClient.registerItemRenderer(ModItems.energy_gatling, new ItemRenderGatling()); MinecraftForgeClient.registerItemRenderer(ModItems.bound_bow, new RenderBow()); - RenderingRegistry.registerEntityRenderingHandler(EntityGatlingProjectile.class, new RenderEntityGatlingProjectile()); - RenderingRegistry.registerEntityRenderingHandler(EntityBloodTNT.class, new RenderTNTPrimed()); - RenderingRegistry.registerEntityRenderingHandler(EntityBloodBall.class, new RenderSnowball(ModItems.blood_ball)); + RenderingRegistry.registerEntityRenderingHandler(EntityBloodTNT.class, new RenderBloodTNTPrimed()); // RenderingRegistry.registerEntityRenderingHandler(EntityBloodHound.class, new RenderEntityBloodHound(new ModelWolf(), new ModelWolf(), 0.5F)); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.life_infuser), new RenderTileLifeInfuser()); ClientRegistry.bindTileEntitySpecialRenderer(TilePortableAltar.class, new TilePortableAltarRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileLifeInfuser.class, new TileLifeInfuserRenderer()); - - ShaderHelper.initShaders(); } @Override @@ -85,5 +71,6 @@ public class ClientProxy extends CommonProxy MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.portable_altar), new TilePortableAltarItemRenderer()); } - public void executeClientCode(IClientCode clientCode) {} + @Override + public void executeClientCode(IClientCode clientCode) {clientCode.executeClientCode();} } diff --git a/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java b/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java new file mode 100644 index 0000000..f039294 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java @@ -0,0 +1,103 @@ +package com.arc.bloodarsenal.client.renderer.block; + +import com.arc.bloodarsenal.common.block.ModBlocks; +import com.arc.bloodarsenal.common.entity.EntityBloodTNT; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +@SideOnly(Side.CLIENT) +public class RenderBloodTNTPrimed extends Render +{ + private RenderBlocks blockRenderer = new RenderBlocks(); + + public RenderBloodTNTPrimed() + { + this.shadowSize = 0.5F; + } + + /** + * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then + * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic + * (Render 1.0F) + { + f2 = 1.0F; + } + + f2 *= f2; + f2 *= f2; + float f3 = 1.0F + f2 * 0.3F; + GL11.glScalef(f3, f3, f3); + } + + f2 = (1.0F - ((float)p_76986_1_.fuse - p_76986_9_ + 1.0F) / 100.0F) * 0.8F; + this.bindEntityTexture(p_76986_1_); + this.blockRenderer.renderBlockAsItem(ModBlocks.blood_tnt, 0, p_76986_1_.getBrightness(p_76986_9_)); + + if (p_76986_1_.fuse / 5 % 2 == 0) + { + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); + GL11.glColor4f(1.0F, 1.0F, 1.0F, f2); + this.blockRenderer.renderBlockAsItem(ModBlocks.blood_tnt, 0, 1.0F); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_TEXTURE_2D); + } + + GL11.glPopMatrix(); + } + + /** + * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture. + */ + protected ResourceLocation getEntityTexture(EntityBloodTNT p_110775_1_) + { + return TextureMap.locationBlocksTexture; + } + + /** + * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture. + */ + protected ResourceLocation getEntityTexture(Entity p_110775_1_) + { + return this.getEntityTexture((EntityBloodTNT)p_110775_1_); + } + + /** + * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then + * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic + * (Render> 16 & 255) / 255.0F; - float f3 = (float)(i >> 8 & 255) / 255.0F; - float f4 = (float)(i & 255) / 255.0F; - GL11.glColor3f(f2, f3, f4); - GL11.glPushMatrix(); - this.func_77026_a(tessellator, ItemPotion.func_94589_d("overlay")); - GL11.glPopMatrix(); - GL11.glColor3f(1.0F, 1.0F, 1.0F); - } - - this.func_77026_a(tessellator, iicon); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } - } - - private void func_77026_a(Tessellator par1Tessellator, IIcon par2IIcon) - { - float f = par2IIcon.getMinU(); - float f1 = par2IIcon.getMaxU(); - float f2 = par2IIcon.getMinV(); - float f3 = par2IIcon.getMaxV(); - float f4 = 1.0F; - float f5 = 0.5F; - float f6 = 0.25F; - GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - par1Tessellator.startDrawingQuads(); - par1Tessellator.setNormal(0.0F, 1.0F, 0.0F); - par1Tessellator.addVertexWithUV((double)(0.0F - f5), (double)(0.0F - f6), 0.0D, (double)f, (double)f3); - par1Tessellator.addVertexWithUV((double)(f4 - f5), (double)(0.0F - f6), 0.0D, (double)f1, (double)f3); - par1Tessellator.addVertexWithUV((double)(f4 - f5), (double)(f4 - f6), 0.0D, (double)f1, (double)f2); - par1Tessellator.addVertexWithUV((double)(0.0F - f5), (double)(f4 - f6), 0.0D, (double)f, (double)f2); - par1Tessellator.draw(); - } - - @Override - protected ResourceLocation getEntityTexture(Entity entity) - { - return new ResourceLocation("bloodarsenal", "textures/items/blood_ball.png"); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityGatlingProjectile.java b/src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityGatlingProjectile.java deleted file mode 100644 index a779296..0000000 --- a/src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityGatlingProjectile.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.arc.bloodarsenal.client.renderer.projectile; - -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.entity.Entity; -import net.minecraft.entity.IProjectile; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -@SideOnly(Side.CLIENT) -public class RenderEntityGatlingProjectile extends Render -{ - public void renderEntityGatling(Entity entity, double par2, double par4, double par6, float par8, float par9) - { - GL11.glPushMatrix(); - GL11.glTranslatef((float) par2, (float) par4, (float) par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(0.1F, 0.1F, 0.1F); - bindTexture(getEntityTexture(entity)); - Tessellator var12 = Tessellator.instance; - GL11.glRotatef(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - var12.startDrawingQuads(); - var12.setNormal(0.0F, 1.0F, 0.0F); - var12.addVertexWithUV(-0.5F, -0.25F, 0.0D, 0, 1); - var12.addVertexWithUV(0.5F, -0.25F, 0.0D, 1, 1); - var12.addVertexWithUV(0.5F, 0.75F, 0.0D, 1, 0); - var12.addVertexWithUV(-0.5F, 0.75F, 0.0D, 0, 0); - var12.draw(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } - - @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) - { - if (par1Entity instanceof IProjectile) - { - renderEntityGatling(par1Entity, par2, par4, par6, par8, par9); - } - } - - @Override - protected ResourceLocation getEntityTexture(Entity entity) - { - if (BloodArsenalConfig.isRedGood) - { - if (entity instanceof EntityGatlingProjectile) - { - return new ResourceLocation("bloodarsenal", "textures/entities/energyGatlingProjectile2.png"); - } - } - - return new ResourceLocation("bloodarsenal", "textures/entities/energyGatlingProjectile.png"); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java index a801d90..becfe9e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java @@ -1,16 +1,13 @@ package com.arc.bloodarsenal.common; -import com.arc.bloodarsenal.common.entity.ModEntities; import com.arc.bloodarsenal.common.entity.ModLivingDropsEvent; import com.arc.bloodarsenal.common.gui.GuiHandler; import com.arc.bloodarsenal.common.items.ModItems; import com.arc.bloodarsenal.common.items.sigil.holding.AHPacketHandler; -import com.arc.bloodarsenal.common.tinkers.BloodArsenalModifiers; -import com.arc.bloodarsenal.common.tinkers.BloodArsenalTinkers; -import com.arc.bloodarsenal.common.tinkers.RecipeHelper; import com.arc.bloodarsenal.common.misc.CommandDownloadMod; import com.arc.bloodarsenal.common.potion.PotionBloodArsenal; import com.arc.bloodarsenal.common.rituals.RitualRegistry; +import com.arc.bloodarsenal.common.tinkers.BloodArsenalTinkers; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -33,7 +30,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Calendar; -@Mod(modid = BloodArsenal.MODID, version = BloodArsenal.VERSION, name = "Blood Arsenal", dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:TConstruct;after:Waila", guiFactory = "com.arc.bloodarsenal.common.gui.ConfigGuiFactory") +@Mod(modid = BloodArsenal.MODID, version = BloodArsenal.VERSION, name = "Blood Arsenal", dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:guideapi;after:TConstruct;after:Waila", guiFactory = "com.arc.bloodarsenal.common.gui.ConfigGuiFactory") public class BloodArsenal { public final static String MODID = "BloodArsenal"; @@ -86,8 +83,6 @@ public class BloodArsenal ModItems.init(); - ModEntities.init(); - Potion[] potionTypes; for (Field f : Potion.class.getDeclaredFields()) @@ -160,12 +155,14 @@ public class BloodArsenal if (BloodArsenalConfig.tinkersIntegration) { logger.info("Loaded Tinker's Construct integration"); - - BloodArsenalTinkers.init(); - BloodArsenalModifiers.init(); - RecipeHelper.addRecipes(); + BloodArsenalTinkers.INSTANCE.init(); } } + + if (Loader.isModLoaded("guideapi")) + { + + } } @Mod.EventHandler diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java index 701ad78..bc24479 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java @@ -29,14 +29,16 @@ public class BloodArsenalConfig public static boolean ritualDisabledEnchantment; // Block Settings - public static String[] blocksToBeDisabled = {}; + public static String[] blocksToBeDisabled; // Item Settings - public static String[] itemsToBeDisabled = {}; + public static String[] itemsToBeDisabled; - //ModSettings + //Mod Settings public static boolean baublesIntegration; public static boolean tinkersIntegration; + public static int bloodInfusedWoodID; + public static int bloodInfusedIronID; //LP Settings public static int sigilSwimmingCost; @@ -91,6 +93,8 @@ public class BloodArsenalConfig baublesIntegration = config.get(modSettings, "Enable Baubles integration?", true).getBoolean(baublesIntegration); tinkersIntegration = config.get(modSettings, "Enable TConstruct integration?", true).getBoolean(tinkersIntegration); + bloodInfusedWoodID = config.get(modSettings, "Material ID for Blood Infused Wood; Default: 250", 250).getInt(bloodInfusedWoodID); + bloodInfusedIronID = config.get(modSettings, "Material ID for Blood Infused Iron; Defualt: 251", 251).getInt(bloodInfusedIronID); sigilSwimmingCost = config.get(lpSettings, "Sigil of Swimming cost; Default: 150", 150).getInt(sigilSwimmingCost); sigilDivinityCost = config.get(lpSettings, "Sigil of Divinity cost; Default: 1000000", 1000000).getInt(sigilDivinityCost); diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java index 41ac515..bf549a7 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java @@ -22,14 +22,13 @@ public class BloodArsenalRecipes AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.blood_infused_wood), new ItemStack(Blocks.log), 2, 3000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.blood_infused_iron_block), new ItemStack(Blocks.iron_block), 3, 54000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.item_blood_cake), new ItemStack(Items.cake), 3, 10000, 5, 5, false); - AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_iron), new ItemStack(Items.iron_ingot), 2, 6000, 5, 5, false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_iron), new ItemStack(Items.iron_ingot), 3, 6000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_orange), new ItemStack(Items.dye, 1, 14), 1, 200, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_diamond_active), new ItemStack(ModItems.blood_infused_diamond_unactive), 4, 80000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.soul_fragment), new ItemStack(ModItems.heart), 4, 75000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_cookie), new ItemStack(Items.cookie), 1, 2000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_glowstone_dust), new ItemStack(Items.glowstone_dust), 3, 5000, 5, 5, false); - AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_ball), new ItemStack(Items.snowball), 2, 500, 5, 5, false); - AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_money), new ItemStack(Items.paper), 4, 10000, 5, 5, false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_money), new ItemStack(Items.paper), 3, 10000, 5, 5, false); } public static void registerBindingRecipes() @@ -39,7 +38,6 @@ public class BloodArsenalRecipes BindingRegistry.registerRecipe(new ItemStack(ModItems.bound_shears), new ItemStack(Items.shears)); BindingRegistry.registerRecipe(new ItemStack(ModItems.blood_infused_diamond_bound), new ItemStack(ModItems.blood_infused_diamond_active)); BindingRegistry.registerRecipe(new ItemStack(ModItems.bound_igniter), new ItemStack(Items.flint_and_steel)); - //Temporary if (BloodArsenal.isHalloween()) { BindingRegistry.registerRecipe(new ItemStack(ModItems.vampire_cape), new ItemStack(Items.leather_chestplate)); @@ -66,8 +64,8 @@ public class BloodArsenalRecipes addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.blood_stained_ice, 8), "aaa", "aba", "aaa", 'a', Blocks.ice, 'b', apprenticeOrb); addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.blood_stained_glass, 8), "aaa", "aba", "aaa", 'a', Blocks.glass, 'b', apprenticeOrb); - addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.life_infuser), "aba", "aca", "ada", 'a', ModItems.blood_infused_iron, 'b', masterOrb, 'c', WayofTime.alchemicalWizardry.ModBlocks.blockAltar, 'd', new ItemStack(ModItems.blood_infused_diamond_bound)); - addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.lp_materializer), "aba", "bcb", "aba", 'a', ModItems.blood_infused_iron, 'b', imbuedSlate, 'c', masterOrb); + addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.life_infuser), "aba", "aca", "ada", 'a', ModItems.blood_infused_iron, 'b', magicianOrb, 'c', WayofTime.alchemicalWizardry.ModBlocks.blockAltar, 'd', Items.bucket); + addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.lp_materializer), "aba", "bcb", "aba", 'a', ModItems.blood_infused_iron, 'b', imbuedSlate, 'c', magicianOrb); addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.compacter), "aaa", "bcb", "ded", 'a', ModBlocks.blood_infused_planks, 'b', ModItems.blood_infused_diamond_bound, 'c', Blocks.piston, 'd', ModBlocks.blood_infused_iron_block, 'e', archmageOrb); addOreDictBloodOrbRecipe(new ItemStack(ModItems.blood_infused_axe_iron), "aaa", "aba", "cdc", 'a', ModItems.blood_infused_iron, 'b', ModItems.blood_infused_axe_wood, 'c', ModItems.amorphic_catalyst, 'd', magicianOrb); addOreDictBloodOrbRecipe(new ItemStack(ModItems.blood_infused_pickaxe_iron), "aaa", "aba", "cdc", 'a', ModItems.blood_infused_iron, 'b', ModItems.blood_infused_pickaxe_wood, 'c', ModItems.amorphic_catalyst, 'd', magicianOrb); diff --git a/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java b/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java index ea36c94..446e985 100644 --- a/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java +++ b/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java @@ -1,9 +1,6 @@ package com.arc.bloodarsenal.common; import com.arc.bloodarsenal.common.entity.EntityBloodTNT; -import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound; -import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall; -import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; import com.arc.bloodarsenal.common.tinkers.IClientCode; import cpw.mods.fml.common.registry.EntityRegistry; import net.minecraft.world.World; @@ -31,9 +28,9 @@ public class CommonProxy public void registerEntityTrackers() { - EntityRegistry.registerModEntity(EntityGatlingProjectile.class, "gatlingProjectile", 0, BloodArsenal.instance, 128, 5, true); - EntityRegistry.registerModEntity(EntityBloodTNT.class, "bloodTNT", 1, BloodArsenal.instance, 64, 5, true); - EntityRegistry.registerModEntity(EntityBloodBall.class, "bloodBall", 2, BloodArsenal.instance, 128, 5, true); + int entityID = EntityRegistry.findGlobalUniqueEntityId(); + EntityRegistry.registerGlobalEntityID(EntityBloodTNT.class, "bloodTNT", entityID); + EntityRegistry.registerModEntity(EntityBloodTNT.class, "bloodTNT", entityID, BloodArsenal.instance, 64, 100, true); // EntityRegistry.registerModEntity(EntityBloodHound.class, "BloodHound", 3, BloodArsenal.instance, 96, 3, true); } diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java index 5fe32c1..3dca310 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java @@ -4,7 +4,7 @@ import com.arc.bloodarsenal.common.entity.EntityBloodTNT; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; +import net.minecraft.block.BlockTNT; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -17,7 +17,7 @@ import net.minecraft.world.World; import java.util.Random; -public class BlockBloodTNT extends Block +public class BlockBloodTNT extends BlockTNT { @SideOnly(Side.CLIENT) private IIcon top; @@ -26,7 +26,7 @@ public class BlockBloodTNT extends Block public BlockBloodTNT() { - super(Material.tnt); + super(); setHardness(0.0F); setStepSound(soundTypeGrass); } @@ -80,7 +80,7 @@ public class BlockBloodTNT extends Block @Override public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) { - spawnTNT(par1World, par2, par3, par4, par5, (EntityLivingBase) null); + spawnTNT(par1World, par2, par3, par4, par5, null); } public void spawnTNT(World par1World, int par2, int par3, int par4, int par5, EntityLivingBase par6EntityLivingBase) diff --git a/src/main/java/com/arc/bloodarsenal/common/block/fluid/MoltenBloodInfusedIron.java b/src/main/java/com/arc/bloodarsenal/common/block/fluid/MoltenBloodInfusedIron.java deleted file mode 100644 index 7521398..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/block/fluid/MoltenBloodInfusedIron.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.arc.bloodarsenal.common.block.fluid; - -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.BlockFluidClassic; -import net.minecraftforge.fluids.Fluid; - -public class MoltenBloodInfusedIron extends BlockFluidClassic -{ - private IIcon stillIcon; - private IIcon flowingIcon; - private String stillIconTexture; - private String flowIconTexture; - - public MoltenBloodInfusedIron(Fluid fluid, String unlocalizedName, String stillIconTexture, String flowIconTexture) - { - super(fluid, Material.lava); - setResistance(100.0F); - setLightLevel(1.0F); - setCreativeTab(BloodArsenal.BA_TAB); - setBlockName(unlocalizedName); - - this.stillIconTexture = (BloodArsenal.MODID + ":" + stillIconTexture); - this.flowIconTexture = (BloodArsenal.MODID + ":" + flowIconTexture); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister icon) - { - this.stillIcon = icon.registerIcon(this.stillIconTexture); - this.flowingIcon = icon.registerIcon(this.flowIconTexture); - - getFluid().setIcons(this.stillIcon, this.flowingIcon); - } - - public IIcon getStillIcon() - { - return this.stillIcon; - } - - public IIcon getFlowingIcon() - { - return this.flowingIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon func_149735_b(int side, int meta) - { - if (side <= 1) - { - return this.stillIcon; - } - - return this.flowingIcon; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java b/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java index 7a03ab0..96cb8a1 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java @@ -35,18 +35,22 @@ public class EntityBloodTNT extends Entity tntPlacedBy = par8EntityLivingBase; } + @Override public void entityInit() {} + @Override public boolean canTriggerWalking() { return false; } + @Override public boolean canBeCollidedWith() { return !isDead; } + @Override public void onUpdate() { prevPosX = posX; @@ -84,16 +88,19 @@ public class EntityBloodTNT extends Entity worldObj.createExplosion(this, posX, posY, posZ, f, true); } + @Override protected void writeEntityToNBT(NBTTagCompound par1) { par1.setByte("Fuse", (byte) fuse); } + @Override protected void readEntityFromNBT(NBTTagCompound par1) { fuse = par1.getByte("Fuse"); } + @Override @SideOnly(Side.CLIENT) public float getShadowSize() { diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java b/src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java deleted file mode 100644 index 14e617e..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.arc.bloodarsenal.common.entity; - -public class ModEntities -{ - public static void init() - { - int id = 0; - - - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityBloodBall.java b/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityBloodBall.java deleted file mode 100644 index b9f63f3..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityBloodBall.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.arc.bloodarsenal.common.entity.projectile; - -import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -public class EntityBloodBall extends EntityThrowable -{ - public EntityBloodBall(World world) - { - super(world); - } - - public EntityBloodBall(World world, EntityLivingBase entity) - { - super(world, entity); - } - - public EntityBloodBall(World world, double so, double me, double thing) - { - super(world, so, me, thing); - } - - protected void onImpact(MovingObjectPosition object) - { - if (object.entityHit != null) - { - byte b0 = 1; - - object.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), (float)b0); - EntityLivingBase thrower = this.getThrower(); - - if (thrower instanceof EntityPlayer) - { - String throwerName = thrower.getCommandSenderName(); - World worldSave = MinecraftServer.getServer().worldServers[0]; - LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, throwerName); - - if (data == null) - { - data = new LifeEssenceNetwork(throwerName); - worldSave.setItemData(throwerName, data); - } - - SoulNetworkHandler.addCurrentEssenceToMaximum(throwerName, 50, data.maxOrb); - } - } - - for (int i = 0; i < 8; ++i) - { - this.worldObj.spawnParticle("snowballpoof", this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D); - } - - if (!this.worldObj.isRemote) - { - this.setDead(); - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityGatlingProjectile.java b/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityGatlingProjectile.java deleted file mode 100644 index c7f4992..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityGatlingProjectile.java +++ /dev/null @@ -1,501 +0,0 @@ -package com.arc.bloodarsenal.common.entity.projectile; - -import cpw.mods.fml.common.registry.IThrowableEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IProjectile; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; -import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; - -public class EntityGatlingProjectile extends Entity implements IProjectile, IThrowableEntity -{ - protected int xTile = -1; - protected int yTile = -1; - protected int zTile = -1; - protected int inTile = 0; - protected int inData = 0; - protected boolean inGround = false; - public EntityLivingBase shootingEntity; - protected int ticksInAir = 0; - protected int maxTicksInAir = 600; - private int ricochetCounter = 0; - private boolean scheduledForDeath = false; - protected int projectileDamage = 8; - - public EntityGatlingProjectile(World par1World) - { - super(par1World); - setSize(0.5F, 0.5F); - maxTicksInAir = 600; - } - - public EntityGatlingProjectile(World par1World, EntityLivingBase par2EntityPlayer, int damage) - { - super(par1World); - shootingEntity = par2EntityPlayer; - float par3 = 0.8F; - setSize(0.5F, 0.5F); - setLocationAndAngles(par2EntityPlayer.posX, par2EntityPlayer.posY + par2EntityPlayer.getEyeHeight(), par2EntityPlayer.posZ, par2EntityPlayer.rotationYaw, par2EntityPlayer.rotationPitch); - posX -= MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - posY -= 0.2D; - posZ -= MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - setPosition(posX, posY, posZ); - yOffset = 0.0F; - motionX = -MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); - motionZ = MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); - motionY = -MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI); - setThrowableHeading(motionX, motionY, motionZ, par3 * 1.5F, 1.0F); - projectileDamage = damage; - maxTicksInAir = 600; - } - - public EntityGatlingProjectile(World par1World, EntityLivingBase par2EntityPlayer, int damage, int maxTicksInAir, double posX, double posY, double posZ, float rotationYaw, float rotationPitch) - { - super(par1World); - shootingEntity = par2EntityPlayer; - float par3 = 0.8F; - setSize(0.5F, 0.5F); - setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch); - posX -= MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - posY -= 0.2D; - posZ -= MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - setPosition(posX, posY, posZ); - yOffset = 0.0F; - motionX = -MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); - motionZ = MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); - motionY = -MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI); - setThrowableHeading(motionX, motionY, motionZ, par3 * 1.5F, 1.0F); - projectileDamage = damage; - } - - public EntityGatlingProjectile(World par1World, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase, float par4, float par5, int damage, int maxTicksInAir) - { - super(par1World); - renderDistanceWeight = 10.0D; - shootingEntity = par2EntityLivingBase; - posY = par2EntityLivingBase.posY + (double) par2EntityLivingBase.getEyeHeight() - 0.10000000149011612D; - double d0 = par3EntityLivingBase.posX - par2EntityLivingBase.posX; - double d1 = par3EntityLivingBase.boundingBox.minY + (double) (par3EntityLivingBase.height / 1.5F) - posY; - double d2 = par3EntityLivingBase.posZ - par2EntityLivingBase.posZ; - double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2); - - if (d3 >= 1.0E-7D) - { - float f2 = (float) (Math.atan2(d2, d0) * 180.0D / Math.PI) - 90.0F; - float f3 = (float) (-(Math.atan2(d1, d3) * 180.0D / Math.PI)); - double d4 = d0 / d3; - double d5 = d2 / d3; - setLocationAndAngles(par2EntityLivingBase.posX + d4, posY, par2EntityLivingBase.posZ + d5, f2, f3); - yOffset = 0.0F; - float f4 = (float) d3 * 0.2F; - setThrowableHeading(d0, d1, d2, par4, par5); - } - - projectileDamage = damage; - } - - @Override - protected void entityInit() - { - dataWatcher.addObject(16, 0); - } - - @Override - public void setThrowableHeading(double var1, double var3, double var5, float var7, float var8) - { - float var9 = MathHelper.sqrt_double(var1 * var1 + var3 * var3 + var5 * var5); - var1 /= var9; - var3 /= var9; - var5 /= var9; - var1 += rand.nextGaussian() * 0.007499999832361937D * var8; - var3 += rand.nextGaussian() * 0.007499999832361937D * var8; - var5 += rand.nextGaussian() * 0.007499999832361937D * var8; - var1 *= var7; - var3 *= var7; - var5 *= var7; - motionX = var1; - motionY = var3; - motionZ = var5; - float var10 = MathHelper.sqrt_double(var1 * var1 + var5 * var5); - prevRotationYaw = rotationYaw = (float) (Math.atan2(var1, var5) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch = (float) (Math.atan2(var3, var10) * 180.0D / Math.PI); - } - - @Override - @SideOnly(Side.CLIENT) - public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) - { - setPosition(par1, par3, par5); - setRotation(par7, par8); - } - - @Override - @SideOnly(Side.CLIENT) - public void setVelocity(double par1, double par3, double par5) - { - motionX = par1; - motionY = par3; - motionZ = par5; - - if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) - { - float var7 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); - prevRotationYaw = rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch = (float) (Math.atan2(par3, var7) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch; - prevRotationYaw = rotationYaw; - setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - if (ticksInAir > maxTicksInAir) - { - setDead(); - } - - if (shootingEntity == null) - { - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(posX - 1, posY - 1, posZ - 1, posX + 1, posY + 1, posZ + 1)); - Iterator i = players.iterator(); - double closestDistance = Double.MAX_VALUE; - EntityPlayer closestPlayer = null; - - while (i.hasNext()) - { - EntityPlayer e = (EntityPlayer) i.next(); - double distance = e.getDistanceToEntity(this); - - if (distance < closestDistance) - { - closestPlayer = e; - } - } - - if (closestPlayer != null) - { - shootingEntity = closestPlayer; - } - } - - if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) - { - float var1 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); - prevRotationYaw = rotationYaw = (float) (Math.atan2(motionX, motionZ) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch = (float) (Math.atan2(motionY, var1) * 180.0D / Math.PI); - } - - Block var16 = worldObj.getBlock(xTile, yTile, zTile); - - if (var16 != null) - { - var16.setBlockBoundsBasedOnState(worldObj, xTile, yTile, zTile); - AxisAlignedBB var2 = var16.getCollisionBoundingBoxFromPool(worldObj, xTile, yTile, zTile); - - if (var2 != null && var2.isVecInside(Vec3.createVectorHelper(posX, posY, posZ))) - { - inGround = true; - } - } - - if (inGround) - { - Block var18 = worldObj.getBlock(xTile, yTile, zTile); - int var19 = worldObj.getBlockMetadata(xTile, yTile, zTile); - - if (var18.equals(Block.getBlockById(inTile)) && var19 == inData){} - } - else - { - ++ticksInAir; - - if (ticksInAir > 1 && ticksInAir < 3) - { - for (int particles = 0; particles < 3; particles++) - { - doFiringParticles(); - } - } - - Vec3 var17 = Vec3.createVectorHelper(posX, posY, posZ); - Vec3 var3 = Vec3.createVectorHelper(posX + motionX, posY + motionY, posZ + motionZ); - MovingObjectPosition var4 = worldObj.func_147447_a(var17, var3, true, false, false); - var17 = Vec3.createVectorHelper(posX, posY, posZ); - var3 = Vec3.createVectorHelper(posX + motionX, posY + motionY, posZ + motionZ); - - if (var4 != null) - { - var3 = Vec3.createVectorHelper(var4.hitVec.xCoord, var4.hitVec.yCoord, var4.hitVec.zCoord); - } - - Entity var5 = null; - List var6 = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); - double var7 = 0.0D; - Iterator var9 = var6.iterator(); - float var11; - - while (var9.hasNext()) - { - Entity var10 = (Entity) var9.next(); - - if (var10.canBeCollidedWith() && (var10 != shootingEntity || ticksInAir >= 5)) - { - var11 = 0.3F; - AxisAlignedBB var12 = var10.boundingBox.expand(var11, var11, var11); - MovingObjectPosition var13 = var12.calculateIntercept(var17, var3); - - if (var13 != null) - { - double var14 = var17.distanceTo(var13.hitVec); - - if (var14 < var7 || var7 == 0.0D) - { - var5 = var10; - var7 = var14; - } - } - } - } - - if (var5 != null) - { - var4 = new MovingObjectPosition(var5); - } - - if (var4 != null) - { - onImpact(var4); - - if (scheduledForDeath) - { - setDead(); - } - } - - posX += motionX; - posY += motionY; - posZ += motionZ; - MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); - setPosition(posX, posY, posZ); - } - } - - public void doFiringParticles() - { - worldObj.spawnParticle("mobSpellAmbient", posX + smallGauss(0.1D), posY + smallGauss(0.1D), posZ + smallGauss(0.1D), 0.5D, 0.5D, 0.5D); - worldObj.spawnParticle("flame", posX, posY, posZ, gaussian(motionX), gaussian(motionY), gaussian(motionZ)); - } - - @Override - public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) - { - par1NBTTagCompound.setShort("xTile", (short) xTile); - par1NBTTagCompound.setShort("yTile", (short) yTile); - par1NBTTagCompound.setShort("zTile", (short) zTile); - par1NBTTagCompound.setByte("inTile", (byte) inTile); - par1NBTTagCompound.setByte("inData", (byte) inData); - par1NBTTagCompound.setByte("inGround", (byte) (inGround ? 1 : 0)); - par1NBTTagCompound.setInteger("ticksInAir", ticksInAir); - par1NBTTagCompound.setInteger("maxTicksInAir", maxTicksInAir); - par1NBTTagCompound.setInteger("projectileDamage", projectileDamage); - } - - @Override - public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) - { - xTile = par1NBTTagCompound.getShort("xTile"); - yTile = par1NBTTagCompound.getShort("yTile"); - zTile = par1NBTTagCompound.getShort("zTile"); - inTile = par1NBTTagCompound.getByte("inTile") & 255; - inData = par1NBTTagCompound.getByte("inData") & 255; - inGround = par1NBTTagCompound.getByte("inGround") == 1; - ticksInAir = par1NBTTagCompound.getInteger("ticksInAir"); - maxTicksInAir = par1NBTTagCompound.getInteger("maxTicksInAir"); - projectileDamage = par1NBTTagCompound.getInteger("projectileDamage"); - } - - @Override - protected boolean canTriggerWalking() - { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public float getShadowSize() - { - return 0.0F; - } - - @Override - public boolean canAttackWithItem() - { - return false; - } - - public void onImpact(MovingObjectPosition mop) - { - if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY && mop.entityHit != null) - { - if (mop.entityHit == shootingEntity) - { - return; - } - - onImpact(mop.entityHit); - } - else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) - { - groundImpact(mop.sideHit); - worldObj.createExplosion(shootingEntity, posX, posY, posZ, (float) 0.2, true); - } - } - - public void onImpact(Entity mop) - { - if (mop == shootingEntity && ticksInAir > 3) - { - shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1); - setDead(); - } - else - { - doDamage(projectileDamage + d6(), mop); - worldObj.createExplosion(shootingEntity, posX, posY, posZ, (float) 0.2, true); - } - - spawnHitParticles("magicCrit", 8); - setDead(); - } - - private int d6() - { - return rand.nextInt() + 5; - } - - protected void spawnHitParticles(String string, int i) - { - for (int particles = 0; particles < i; particles++) - { - worldObj.spawnParticle(string, posX, posY - (string == "portal" ? 1 : 0), posZ, gaussian(motionX), gaussian(motionY), gaussian(motionZ)); - } - } - - protected void doDamage(int i, Entity mop) - { - mop.attackEntityFrom(getDamageSource(), i); - } - - public DamageSource getDamageSource() - { - return DamageSource.causeMobDamage(shootingEntity); - } - - public void groundImpact(int sideHit) - { - ricochet(sideHit); - } - - public double smallGauss(double d) - { - return (worldObj.rand.nextFloat() - 0.5D) * d; - } - - public double gaussian(double d) - { - return d + d * ((rand.nextFloat() - 0.5D) / 4); - } - - private void ricochet(int sideHit) - { - switch (sideHit) - { - case 0: - case 1: - // topHit, bottomHit, reflect Y - motionY = motionY * -1; - break; - - case 2: - case 3: - // westHit, eastHit, reflect Z - motionZ = motionZ * -1; - break; - - case 4: - case 5: - // southHit, northHit, reflect X - motionX = motionX * -1; - break; - } - - ricochetCounter++; - - if (ricochetCounter > getRicochetMax()) - { - scheduledForDeath = true; - - for (int particles = 0; particles < 4; particles++) - { - switch (sideHit) - { - case 0: - worldObj.spawnParticle("smoke", posX, posY, posZ, gaussian(0.1D), -gaussian(0.1D), gaussian(0.1D)); - break; - - case 1: - worldObj.spawnParticle("smoke", posX, posY, posZ, gaussian(0.1D), gaussian(0.1D), gaussian(0.1D)); - break; - - case 2: - worldObj.spawnParticle("smoke", posX, posY, posZ, gaussian(0.1D), gaussian(0.1D), -gaussian(0.1D)); - break; - - case 3: - worldObj.spawnParticle("smoke", posX, posY, posZ, gaussian(0.1D), gaussian(0.1D), gaussian(0.1D)); - break; - - case 4: - worldObj.spawnParticle("smoke", posX, posY, posZ, -gaussian(0.1D), gaussian(0.1D), gaussian(0.1D)); - break; - - case 5: - worldObj.spawnParticle("smoke", posX, posY, posZ, gaussian(0.1D), gaussian(0.1D), gaussian(0.1D)); - break; - } - } - } - } - - private int getRicochetMax() - { - return 3; - } - - @Override - public Entity getThrower() - { - return shootingEntity; - } - - @Override - public void setThrower(Entity entity) - { - if (entity instanceof EntityLivingBase) - { - shootingEntity = (EntityLivingBase) entity; - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java index cedd9cf..e38bc52 100644 --- a/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java +++ b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java @@ -8,7 +8,6 @@ import java.util.Set; public class ConfigGuiFactory implements IModGuiFactory { - @Override public void initialize(Minecraft minecraftInstance) {} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/BucketHandler.java b/src/main/java/com/arc/bloodarsenal/common/items/BucketHandler.java deleted file mode 100644 index 4db0d33..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/items/BucketHandler.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.arc.bloodarsenal.common.items; - -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import java.util.HashMap; -import java.util.Map; - -public class BucketHandler -{ - private static BucketHandler INSTANCE = new BucketHandler(); - private static HashMap FILLED_BUCKETS = new HashMap(); - - public static BucketHandler getInstance() - { - return INSTANCE; - } - - public static void addBuckets() - { - MoltenBucket bucket = new MoltenBucket(null); - GameRegistry.registerItem(bucket, "extra.bucket"); - - int bucketVol = 1000; - ItemStack emptyBucketStack = FluidContainerRegistry.EMPTY_BUCKET.copy(); - - - - FluidStack fluidStack = FluidRegistry.getFluidStack("molten.blood.infused.iron", bucketVol); - - if (fluidStack != null) - { - int bucketId = 1; - - bucket.addTextureMapping(bucketId, fluidStack.getFluid().getName(), "bucket_fill_blood_infused_iron"); - - ItemStack bucketStack = new ItemStack(bucket, 1, bucketId); - - FILLED_BUCKETS.put(fluidStack.getFluid().getBlock(), bucketStack); - - FluidContainerRegistry.registerFluidContainer(fluidStack, bucketStack, emptyBucketStack); - } - } - - public void fillEvent(FillBucketEvent event) - { - World world = event.world; - MovingObjectPosition pos = event.target; - - Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ); - - ItemStack bucketStack = getFilledBucket(block); - - if (bucketStack == null) - { - return; - } - - world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ); - - event.result = bucketStack; - event.setResult(Event.Result.ALLOW); - } - - public static HashMap getAllBuckets() - { - return FILLED_BUCKETS; - } - - public static ItemStack getFilledBucket(Block fluidBlock) - { - return FILLED_BUCKETS.get(fluidBlock); - } - - public static ItemStack getFilledBucket(String fluidName) - { - Block fluidBlock = FluidRegistry.getFluid(fluidName).getBlock(); - return FILLED_BUCKETS.get(fluidBlock).copy(); - } - - public static boolean isAvailableBucket(int fluidBlockId) - { - return FILLED_BUCKETS.containsKey(Integer.valueOf(fluidBlockId)); - } - - public static boolean isAvailableBucket(String fluidName) - { - Block fluidBlock = FluidRegistry.getFluid(fluidName).getBlock(); - return FILLED_BUCKETS.containsKey(fluidBlock); - } - - public static Block getBlock(ItemStack bucketStack) - { - Block block = Blocks.air; - for (Map.Entry entry : FILLED_BUCKETS.entrySet()) - { - ItemStack stack = entry.getValue(); - if (stack.isItemEqual(bucketStack)) - { - block = entry.getKey(); - break; - } - } - return block; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodBall.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodBall.java deleted file mode 100644 index c15c814..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodBall.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.arc.bloodarsenal.common.items; - -import com.arc.bloodarsenal.common.BloodArsenal; -import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class ItemBloodBall extends Item -{ - public ItemBloodBall() - { - setUnlocalizedName("blood_ball"); - setTextureName("BloodArsenal:blood_ball"); - setMaxStackSize(16); - setCreativeTab(BloodArsenal.BA_TAB); - } - - @Override - public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) - { - if (!player.capabilities.isCreativeMode) - { - --itemStack.stackSize; - } - - world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - - if (!world.isRemote) - { - world.spawnEntityInWorld(new EntityBloodBall(world, player)); - } - - return itemStack; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java index f4f7a14..6d9f87e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java @@ -21,7 +21,7 @@ import java.util.List; public class ItemBloodMoney extends Item { - private static final int[] MONEY_MULTIPLIER = new int[]{1, 4, 16, 64}; + private final int[] MONEY_MULTIPLIER = new int[]{1, 4, 16, 64}; @SideOnly(Side.CLIENT) private IIcon[] icons; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java b/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java index b2c2fc7..0e0fad6 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java @@ -57,14 +57,12 @@ public class ModItems public static Item vampire_greaves; public static Item vampire_boots; public static Item vampire_ring; - public static Item energy_gatling; public static Item sigil_of_swimming; public static Item sigil_of_ender; public static Item blood_infused_glowstone_dust; public static Item self_sacrifice_amulet; public static Item sacrifice_amulet; public static Item sigil_of_divinity; - public static Item blood_ball; public static Item wolf_hide; public static Item blood_money; public static Item blood_burned_string; @@ -125,12 +123,10 @@ public class ModItems vampire_cape = registerItem(new VampireCostume(1), "vampire_cape"); vampire_greaves = registerItem(new VampireCostume(2), "vampire_greaves"); vampire_boots = registerItem(new VampireCostume(3), "vampire_boots"); - energy_gatling = registerItem(new EnergyGatling(), "energy_gatling"); sigil_of_swimming = registerItem(new SigilSwimming(), "sigil_of_swimming"); sigil_of_ender = registerItem(new SigilEnder(), "sigil_of_ender"); blood_infused_glowstone_dust = registerItem(new ItemBloodArsenal(), "blood_infused_glowstone_dust"); sigil_of_divinity = registerItem(new SigilDivinity(), "sigil_of_divinity"); - blood_ball = registerItem(new ItemBloodBall(), "blood_ball"); wolf_hide = registerItem(new ItemBloodArsenal(), "wolf_hide"); blood_money = registerItem(new ItemBloodMoney(), "blood_money"); blood_burned_string = registerItem(new ItemReed(ModBlocks.block_burned_string), "blood_burned_string"); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/MoltenBucket.java b/src/main/java/com/arc/bloodarsenal/common/items/MoltenBucket.java deleted file mode 100644 index d537fb2..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/items/MoltenBucket.java +++ /dev/null @@ -1,249 +0,0 @@ -package com.arc.bloodarsenal.common.items; - -import com.arc.bloodarsenal.common.BloodArsenal; -import com.google.common.collect.HashBiMap; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBucket; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class MoltenBucket extends ItemBucket -{ - private IIcon _filling = null; - private Block _fluidBlock = null; - private int _capacity = 1000; - private HashBiMap fluidNames = HashBiMap.create(); - private HashMap textures = new HashMap(); - private HashMap icons = new HashMap(); - protected static final String pathToTextures = BloodArsenal.MODID + ":" + "bucket/"; - - - public MoltenBucket(Block fluidBlock) - { - super(fluidBlock); - this._fluidBlock = fluidBlock; - setUnlocalizedName("extratic.bucket"); - setCreativeTab(BloodArsenal.BA_TAB ); - setContainerItem(Items.bucket); - setTextureName("minecraft:bucket_empty"); - setMaxDamage(0); - setHasSubtypes(true); - } - - @Override - @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() - { - return true; - } - - @Override - public int getRenderPasses(int damage) - { - return 2; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) - { - this.itemIcon = register.registerIcon(getIconString()); - - - this._filling = register.registerIcon(pathToTextures + "bucket_fill_fblood_infused_iron"); - - for (Map.Entry entry : this.textures.entrySet()) - { - IIcon filling = register.registerIcon(pathToTextures + entry.getValue()); - - this.icons.put(entry.getKey(), filling); - } - } - - @Override - public IIcon getIcon(ItemStack itemStack, int pass) - { - int index = itemStack.getItemDamage(); - - if ((pass == 0) || (index <= 0)) - { - - return this.itemIcon; - } - - IIcon icon = this.icons.get(Integer.valueOf(index)); - - if (icon != null) - { - return icon; - } - - return this.itemIcon; - } - - @Override - public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) - { - if ((itemStack == null) || (itemStack.getItem() != this)) - { - return itemStack; - } - - int index = itemStack.getItemDamage(); - String fluidName = this.fluidNames.get(Integer.valueOf(index)); - - if (fluidName == null) - { - return itemStack; - } - - Block block = BucketHandler.getBlock(itemStack); - - boolean isAir = block == null; - - MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(world, player, isAir); - - if (movingobjectposition == null) - { - return itemStack; - } - - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) - { - int xCoord = movingobjectposition.blockX; - int yCoord = movingobjectposition.blockY; - int zCoord = movingobjectposition.blockZ; - - if (!world.canMineBlock(player, xCoord, yCoord, zCoord)) - { - return itemStack; - } - - if (block == Blocks.air) - { - return new ItemStack(getContainerItem()); - } - - if (movingobjectposition.sideHit == 0) - { - yCoord--; - } - - if (movingobjectposition.sideHit == 1) - { - yCoord++; - } - - if (movingobjectposition.sideHit == 2) - { - zCoord--; - } - - if (movingobjectposition.sideHit == 3) - { - zCoord++; - } - - if (movingobjectposition.sideHit == 4) - { - xCoord--; - } - - if (movingobjectposition.sideHit == 5) - { - xCoord++; - } - - if (!player.canPlayerEdit(xCoord, yCoord, zCoord, movingobjectposition.sideHit, itemStack)) - { - return itemStack; - } - Material material = world.getBlock(xCoord, yCoord, zCoord).getMaterial(); - - if (world.isAirBlock(xCoord, yCoord, zCoord) && !material.isSolid()) - { - if (!world.isRemote && !material.isSolid() && !material.isLiquid()) - { - world.func_147480_a(xCoord, yCoord, zCoord, true); - } - - world.setBlock(xCoord, yCoord, zCoord, block, 0, 3); - - if (!player.capabilities.isCreativeMode) - { - return new ItemStack(getContainerItem()); - } - } - } - return itemStack; - } - - @Override - public boolean tryPlaceContainedLiquid(World world, int xCoord, int yCoord, int zCoord) - { - return false; - } - - public void setCapcity(int capacity) - { - this._capacity = capacity; - } - - @Override - public String getUnlocalizedName(ItemStack itemStack) - { - if (itemStack == null) - { - return getUnlocalizedName(); - } - - int index = itemStack.getItemDamage(); - String fluidName = this.fluidNames.get(Integer.valueOf(index)); - - if (fluidName == null) - { - return getUnlocalizedName(); - } - - return "item.ba.bucket.filled." + fluidName; - } - - public void addTextureMapping(int id, String fluidName, String texture) - { - this.fluidNames.put(id, fluidName); - this.textures.put(id, texture); - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List itemStackList) - { - if (!this.fluidNames.isEmpty()) - { - for (Map.Entry subItem : this.fluidNames.entrySet()) - { - int entryId = subItem.getKey().intValue(); - ItemStack bucketStack = new ItemStack(this, 1, entryId); - itemStackList.add(bucketStack); - } - } - else - { - itemStackList.add(new ItemStack(this, 1, 0)); - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java b/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java index 6d70004..c0edd80 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java @@ -21,11 +21,14 @@ import net.minecraft.world.World; public class VampireCostume extends ItemArmor { - private static IIcon chestIcon; - private static IIcon leggingsIcon; - private static IIcon bootsIcon; + @SideOnly(Side.CLIENT) + private IIcon chestIcon; + @SideOnly(Side.CLIENT) + private IIcon leggingsIcon; + @SideOnly(Side.CLIENT) + private IIcon bootsIcon; - private static final boolean tryComplexRendering = true; + private boolean tryComplexRendering = true; public VampireCostume(int armorType) { diff --git a/src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java b/src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java new file mode 100644 index 0000000..9f27e51 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java @@ -0,0 +1,30 @@ +package com.arc.bloodarsenal.common.items.book; + +import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; +import amerifrance.guideapi.api.GuideRegistry; +import amerifrance.guideapi.api.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.base.Book; +import amerifrance.guideapi.api.util.BookBuilder; +import com.arc.bloodarsenal.common.items.ModItems; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.ArrayList; +import java.util.List; + +public class BloodBurnedTome +{ + public static Book burnedTome; + public static List categories = new ArrayList(); + private final static String R_LOC = "BloodArsenal:book/images/"; + + public static void registerTome() + { + BookBuilder bookBuilder = new BookBuilder(); + bookBuilder.setCategories(categories).setUnlocBookTitle("guide.bloodArsenal.book.title").setUnlocWelcomeMessage("guide.bloodArsenal.book.welcomeMessage").setUnlocDisplayName("guide.bloodArsenal.book.name").setAuthor("An Arc Mage").setItemTexture("BloodArsenal:textures/items/burned_tome"); + burnedTome = bookBuilder.build(); + GuideRegistry.registerBook(burnedTome); + GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(GuideRegistry.getItemStackForBook(burnedTome), ModItems.glass_shard, new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, OreDictionary.WILDCARD_VALUE))); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java b/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java index 3814160..8a5bfa0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java @@ -44,11 +44,11 @@ public class TransparentOrb extends EnergyBattery return; } - int maxEssence = this.getMaxEssence(); - int section = maxEssence / 23; + int maxEssence = SoulNetworkHandler.getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(SoulNetworkHandler.getOwnerName(itemStack))); + int section = maxEssence / 44; int currentEssence = SoulNetworkHandler.getCurrentEssence(SoulNetworkHandler.getOwnerName(itemStack)); - if (currentEssence != 0) + if (currentEssence > 0) { int metaToBe = (currentEssence / section); itemStack.setItemDamage(metaToBe); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java index 9c7c14a..fad4d08 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java @@ -27,11 +27,16 @@ import java.util.List; public class BoundBow extends ItemBow implements IBindable { - private static IIcon active; - private static IIcon active_1; - private static IIcon active_2; - private static IIcon active_3; - private static IIcon passive; + @SideOnly(Side.CLIENT) + private IIcon active; + @SideOnly(Side.CLIENT) + private IIcon active_1; + @SideOnly(Side.CLIENT) + private IIcon active_2; + @SideOnly(Side.CLIENT) + private IIcon active_3; + @SideOnly(Side.CLIENT) + private IIcon passive; private int energyUsed; @@ -319,4 +324,10 @@ public class BoundBow extends ItemBow implements IBindable return passive; } } + + @Override + public boolean isItemTool(ItemStack stack) + { + return true; + } } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java index 4c6b622..a2d9208 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java @@ -22,9 +22,11 @@ import java.util.List; public class BoundIgniter extends Item implements IBindable { private int energyUsed; - - private static IIcon active; - private static IIcon passive; + + @SideOnly(Side.CLIENT) + private IIcon active; + @SideOnly(Side.CLIENT) + private IIcon passive; public BoundIgniter() { @@ -167,7 +169,6 @@ public class BoundIgniter extends Item implements IBindable } par1ItemStack.setItemDamage(0); - return; } public void setActivated(ItemStack par1ItemStack, boolean newActivated) diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java index c37ee6e..d55f7ec 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java @@ -33,8 +33,10 @@ public class BoundShears extends ItemShears implements IBindable { private int energyUsed; - private static IIcon active; - private static IIcon passive; + @SideOnly(Side.CLIENT) + private IIcon active; + @SideOnly(Side.CLIENT) + private IIcon passive; public BoundShears() { @@ -287,6 +289,5 @@ public class BoundShears extends ItemShears implements IBindable } par1ItemStack.setItemDamage(0); - return; } } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/EnergyGatling.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/EnergyGatling.java deleted file mode 100644 index 8682b3a..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/EnergyGatling.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.arc.bloodarsenal.common.items.tool; - -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - -import java.util.List; - -public class EnergyGatling extends EnergyItems implements IBindable -{ - private int energyUsed; - - private static IIcon activeIcon; - private static IIcon passiveIcon; - - private static int damage; - - public EnergyGatling() - { - super(); - setMaxStackSize(1); - setUnlocalizedName("energy_gatling"); - setCreativeTab(BloodArsenal.BA_TAB); - setEnergyUsed(200); - setFull3D(); - } - - public void setEnergyUsed(int i) - { - energyUsed = i; - } - - public int getEnergyUsed() - { - return energyUsed; - } - - @Override - public boolean isFull3D() - { - return true; - } - - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); - - if (par3EntityPlayer.isSneaking()) - { - setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.stackTagCompound.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100); - return par1ItemStack; - } - - if (!getActivated(par1ItemStack)) - { - return par1ItemStack; - } - - if (!par3EntityPlayer.capabilities.isCreativeMode) - { - syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()); - } - - if (!par2World.isRemote) - { - par2World.spawnEntityInWorld(new EntityGatlingProjectile(par2World, par3EntityPlayer, damage)); - } - - par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - - return par1ItemStack; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - itemIcon = iconRegister.registerIcon("BloodArsenal:energy_gatling"); - activeIcon = iconRegister.registerIcon("BloodArsenal:energy_gatling"); - passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { - if (stack.stackTagCompound == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.stackTagCompound; - - if (tag.getBoolean("isActive")) - { - return activeIcon; - } - else - { - return passiveIcon; - } - } - - public void setActivated(ItemStack par1ItemStack, boolean newActivated) - { - NBTTagCompound itemTag = par1ItemStack.stackTagCompound; - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); - } - - public boolean getActivated(ItemStack par1ItemStack) - { - NBTTagCompound itemTag = par1ItemStack.stackTagCompound; - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - return itemTag.getBoolean("isActive"); - } - - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) - { - par3List.add(StatCollector.translateToLocal("tooltip.tool.energy_gatling")); - - if (!(par1ItemStack.stackTagCompound == null)) - { - if (par1ItemStack.stackTagCompound.getBoolean("isActive")) - { - par3List.add("Activated"); - } else - { - par3List.add("Deactivated"); - } - - if (!par1ItemStack.stackTagCompound.getString("ownerName").equals("")) - { - par3List.add("Current owner: " + par1ItemStack.stackTagCompound.getString("ownerName")); - } - } - } - - @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) - { - if (!(par3Entity instanceof EntityPlayer)) - { - return; - } - - EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity; - - if (par1ItemStack.stackTagCompound == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - if (par2World.getWorldTime() % 100 == par1ItemStack.stackTagCompound.getInteger("worldTimeDelay") && par1ItemStack.stackTagCompound.getBoolean("isActive")) - { - if (!par3EntityPlayer.capabilities.isCreativeMode) - { - EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 500); - } - } - - if (par1ItemStack.stackTagCompound.getBoolean("isActive")) - { - if (par3EntityPlayer.getActivePotionEffect(Potion.moveSlowdown) != null) - { - par3EntityPlayer.removePotionEffect(Potion.moveSlowdown.id); - } - par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 1)); - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java index 9f91c2b..87da55c 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java @@ -17,8 +17,6 @@ import java.util.Arrays; public final class ToolCapabilities { - public int count; - public static Material[] materialsPick = new Material[]{ Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil }; public static Material[] materialsShovel = new Material[]{ Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; public static Material[] materialsAxe = new Material[]{ Material.coral, Material.leaves, Material.plants, Material.wood }; diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java index d49eb51..11ffb85 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java @@ -6,11 +6,6 @@ import tconstruct.library.crafting.ModifyBuilder; public class BloodArsenalModifiers { - public static void init() - { - initModifiers(); - } - public static void initModifiers() { ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, OreDictionary.WILDCARD_VALUE); diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java index aad079b..f06c131 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java @@ -1,11 +1,10 @@ package com.arc.bloodarsenal.common.tinkers; import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import com.arc.bloodarsenal.common.block.ModBlocks; import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; @@ -16,303 +15,125 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import tconstruct.library.TConstructRegistry; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.crafting.*; -import tconstruct.library.tools.ToolMaterial; +import tconstruct.library.crafting.FluidType; +import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.TinkerSmeltery; -import tconstruct.tools.TinkerTools; -import tconstruct.weaponry.TinkerWeaponry; - -import java.util.ListIterator; public class BloodArsenalTinkers { - public static PartHelper ARROWHEAD; - public static PartHelper AXE_HEAD; - public static PartHelper BATTLE_SIGN_HEAD; - public static PartHelper BINDING; - public static PartHelper BOLT; - public static PartHelper BOW_LIMB; - public static PartHelper CHISEL_HEAD; - public static PartHelper CHUNK; - public static PartHelper CROSSBAR; - public static PartHelper CROSSBOW_BODY; - public static PartHelper CROSSBOW_LIMB; - public static PartHelper EXCAVATOR_HEAD; - public static PartHelper FISHING_ROD; - public static PartHelper FRYPAN_HEAD; - public static PartHelper FULL_GUARD; - public static PartHelper HAMMER_HEAD; - public static PartHelper KNIFE_BLADE; - public static PartHelper LARGE_GUARD; - public static PartHelper LARGE_SWORD_BLADE; - public static PartHelper LARGEPLATE; - public static PartHelper LUMBERAXE_HEAD; - public static PartHelper MEDIUM_GUARD; - public static PartHelper PICKAXE_HEAD; - public static PartHelper SCYTHE_HEAD; - public static PartHelper SHOVEL_HEAD; - public static PartHelper SHURIKEN; - public static PartHelper SWORD_BLADE; - public static PartHelper TOOLROD; - public static PartHelper TOUGHBIND; - public static PartHelper TOUGHROD; + public final static BloodArsenalTinkers INSTANCE = new BloodArsenalTinkers(); - public static Fluid bloodInfusedIron = new Fluid("molten.bloodInfusedIron").setDensity(3000).setViscosity(6000).setTemperature(1300); + public static Fluid bloodInfusedIronFluid; - public static void init() + public BloodArsenalTinkers() {} + + public void init() { -// addMaterials(); - - addParts(); - addLifeInfusedIronMaterial(); - addLiquids(); - - MinecraftForge.EVENT_BUS.register(new TConEvents()); + addBloodInfusedWoodMaterial(); + addBloodInfusedIronMaterial(); + BloodArsenalModifiers.initModifiers(); } - public static void addLifeInfusedIronMaterial() + public void addBloodInfusedWoodMaterial() { - if (ModItems.itemsNotToBeRegistered.contains(ModItems.blood_infused_iron) && ModBlocks.blocksNotToBeRegistered.contains(ModBlocks.blood_infused_iron_block)) + if (ModBlocks.blood_infused_planks != null) { - return; + int id = BloodArsenalConfig.bloodInfusedWoodID; + + if (id > 0) + { + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("Id", id); + tag.setString("Name", "BloodInfusedWood"); + tag.setString("localizationString", "material.bloodarsenal.blood_infused_wood"); + tag.setInteger("Durability", 123); + tag.setInteger("MiningSpeed", 450); + tag.setInteger("HarvestLevel", 1); + tag.setInteger("Attack", 1); + tag.setFloat("HandleModifier", 1.25F); + tag.setInteger("Reinforced", 0); + tag.setFloat("Bow_ProjectileSpeed", 3.2F); + tag.setInteger("Bow_DrawSpeed", 15); + tag.setFloat("Projectile_Mass", 0.62F); + tag.setFloat("Projectile_Fragility", 0.5F); + tag.setString("Style", EnumChatFormatting.RED.toString()); + tag.setInteger("Color", 13178385); + FMLInterModComms.sendMessage("TConstruct", "addMaterial", tag); + ItemStack itemstack = new ItemStack(ModBlocks.blood_infused_planks); + tag = new NBTTagCompound(); + tag.setInteger("MaterialId", id); + NBTTagCompound item = new NBTTagCompound(); + itemstack.writeToNBT(item); + tag.setTag("Item", item); + tag.setInteger("Value", 2); + FMLInterModComms.sendMessage("TConstruct", "addPartBuilderMaterial", tag); + tag = new NBTTagCompound(); + tag.setInteger("MaterialId", id); + tag.setInteger("Value", 2); + item = new NBTTagCompound(); + itemstack.writeToNBT(item); + tag.setTag("Item", item); + FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); + } } - - final int id = 250; - - - - NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("Id", id); - - final ToolMaterial material = new ToolMaterial("blood_infused_iron", "material.blood_infused_iron", 550, 1800, 3, 3, 1.5F, 0, 0.0F, EnumChatFormatting.DARK_RED.toString(), 16777215); - -/* tag.setString("Name", "Blood Infused Iron"); - tag.setString("localizationString", "material.blood_infused_iron"); - tag.setInteger("Durability", 550); - tag.setInteger("MiningSpeed", 1800); - tag.setInteger("HarvestLevel", 3); - tag.setInteger("Attack", 3); - tag.setFloat("HandleModifier", 1.5F); - tag.setInteger("Reinforced", 0); - tag.setFloat("Bow_ProjectileSpeed", 3.0F); - tag.setInteger("Bow_DrawSpeed", 40); - tag.setFloat("Projectile_Mass", 4.7F); - tag.setFloat("Projectile_Fragility", 0.2F); - tag.setString("Style", EnumChatFormatting.BLACK.toString()); - tag.setInteger("Color", 16777215); - FMLInterModComms.sendMessage("TConstruct", "addMaterial", tag); - - FluidRegistry.registerFluid(bloodInfusedIron); - - FluidType.registerFluidType(bloodInfusedIron.getName(), ModBlocks.blood_infused_iron_block, 0, 850, bloodInfusedIron, true); - Smeltery.addMelting(new ItemStack(ModBlocks.blood_infused_iron_block, 1), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 1296)); - Smeltery.addMelting(new ItemStack(ModItems.blood_infused_iron, 1, 0), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 144)); - - ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); - TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ModBlocks.blood_infused_iron_block, 1), new FluidStack(bloodInfusedIron, 1296), null, true, 100); - TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(ModItems.blood_infused_iron, 1), new FluidStack(bloodInfusedIron, 144), ingotcast, false, 50); - - tag = new NBTTagCompound(); - tag.setString("FluidName", bloodInfusedIron.getName()); - tag.setInteger("MaterialId", id); - FMLInterModComms.sendMessage("TConstruct", "addPartCastingMaterial", tag); - - tag = new NBTTagCompound(); - tag.setInteger("MaterialId", id); - tag.setTag("Item", new ItemStack(ModItems.blood_infused_iron, 1, 0).writeToNBT(new NBTTagCompound())); - tag.setInteger("Value", 2); - FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); - */ - TConstructRegistry.addtoolMaterial(id, material); - TConstructRegistry.addDefaultToolPartMaterial(id); - TConstructRegistry.addBowMaterial(id, 40, 1.2F); - TConstructRegistry.addArrowMaterial(id, 4.7F, 0.2F); - - BloodArsenal.proxy.executeClientCode(new IClientCode() - { - @SideOnly(Side.CLIENT) - public void executeClientCode() - { - if (FMLCommonHandler.instance().getSide().isClient()) { - TConstructClientRegistry.addMaterialRenderMapping(id, "tinker", material.name().toLowerCase(), true); - } - } - }); - - FluidRegistry.registerFluid(bloodInfusedIron); - - FluidType.registerFluidType(bloodInfusedIron.getName(), ModBlocks.blood_infused_iron_block, 0, 850, bloodInfusedIron, true); - Smeltery.addMelting(new ItemStack(ModBlocks.blood_infused_iron_block, 1), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 1296)); - Smeltery.addMelting(new ItemStack(ModItems.blood_infused_iron, 1, 0), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 144)); - - ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); - TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ModBlocks.blood_infused_iron_block, 1), new FluidStack(bloodInfusedIron, 1296), null, true, 100); - TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(ModItems.blood_infused_iron, 1), new FluidStack(bloodInfusedIron, 144), ingotcast, false, 50); - - tag = new NBTTagCompound(); - tag.setString("FluidName", bloodInfusedIron.getName()); - tag.setInteger("MaterialId", id); - FMLInterModComms.sendMessage("TConstruct", "addPartCastingMaterial", tag); - - tag = new NBTTagCompound(); - tag.setInteger("MaterialId", id); - tag.setTag("Item", new ItemStack(ModItems.blood_infused_iron, 1, 0).writeToNBT(new NBTTagCompound())); - tag.setInteger("Value", 2); - FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); - - BloodArsenal.proxy.executeClientCode(new IClientCode() - { - @SideOnly(Side.CLIENT) - public void executeClientCode() - { - new TextureResourcePackBloodInfusedIron("blood_infused_iron").register(); - } - }); } - public static void addLiquids() + public void addBloodInfusedIronMaterial() { - LiquidCasting tb = TConstructRegistry.getTableCasting(); - for (ListIterator iterator = tb.getCastingRecipes().listIterator(); iterator.hasNext();) + if (ModBlocks.blood_infused_iron_block != null && ModItems.blood_infused_iron != null) { - CastingRecipe castingRecipe = iterator.next(); + int id = BloodArsenalConfig.bloodInfusedIronID; - if ((castingRecipe != null) && (castingRecipe.getClass() == CastingRecipe.class) && (castingRecipe.output != null) && (castingRecipe.output.getItem() == TinkerWeaponry.partBolt) && (castingRecipe.cast != null) && (castingRecipe.cast.getItem() == TinkerTools.toolRod)) + if (id > 0) { - int materialID = ToolBuilder.instance.getMaterialID(castingRecipe.cast); - - if (materialID > 0) + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("Id", id); + tag.setString("Name", "BloodInfusedIron"); + tag.setString("localizationString", "material.bloodarsenal.blood_infused_iron"); + tag.setInteger("Durability", 459); + tag.setInteger("MiningSpeed", 700); + tag.setInteger("HarvestLevel", 3); + tag.setInteger("Attack", 3); + tag.setFloat("HandleModifier", 1.4F); + tag.setInteger("Reinforced", 0); + tag.setFloat("Bow_ProjectileSpeed", 5.1F); + tag.setInteger("Bow_DrawSpeed", 52); + tag.setFloat("Projectile_Mass", 3.1F); + tag.setFloat("Projectile_Fragility", 0.7F); + tag.setString("Style", EnumChatFormatting.DARK_RED.toString()); + tag.setInteger("Color", 16777215); + FMLInterModComms.sendMessage("TConstruct", "addMaterial", tag); + FluidRegistry.registerFluid(bloodInfusedIronFluid); + FluidType.registerFluidType(bloodInfusedIronFluid.getName(), ModBlocks.blood_infused_iron_block, 0, 850, bloodInfusedIronFluid, true); + Smeltery.addMelting(new ItemStack(ModBlocks.blood_infused_iron_block, 1), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIronFluid, 1296)); + Smeltery.addMelting(new ItemStack(ModItems.blood_infused_iron, 1, 0), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIronFluid, 144)); + ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); + TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ModBlocks.blood_infused_iron_block, 1), new FluidStack(bloodInfusedIronFluid, 1296), null, true, 100); + TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(ModItems.blood_infused_iron, 1), new FluidStack(bloodInfusedIronFluid, 144), ingotcast, false, 50); + tag = new NBTTagCompound(); + tag.setString("FluidName", bloodInfusedIronFluid.getName()); + tag.setInteger("MaterialId", id); + FMLInterModComms.sendMessage("TConstruct", "addPartCastingMaterial", tag); + tag = new NBTTagCompound(); + tag.setInteger("MaterialId", id); + tag.setTag("Item", (new ItemStack(ModItems.blood_infused_iron, 1, 0)).writeToNBT(new NBTTagCompound())); + tag.setInteger("Value", 2); + FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); + BloodArsenal.proxy.executeClientCode(new IClientCode() { - if (materialID == 250) + @SideOnly(Side.CLIENT) + public void executeClientCode() { - iterator.set(new TConCastingRecipe(castingRecipe)); + (new TextureResourcePackBloodInfusedIron("BloodInfusedIron")).register(); } - } + }); } } } - public static void addMaterials() + static { - TConstructRegistry.addToolMaterial(250, "Blood Infused Iron", "blood_infused_iron", 3, 550, 1800, 3, 1.5F, 0, 0.0F, "Blood Infused Iron", 0xab0000); - - TConstructClientRegistry.addMaterialRenderMapping(250, "BloodArsenal", "Blood Infused Iron", true); - - TConstructRegistry.addBowMaterial(250, 40, 1.2F); - - TConstructRegistry.addArrowMaterial(250, 4.7F, 0.2F); - } - - public static void addParts() - { - initParts(); - -// addMaterialToToolParts(250, "blood.infused.iron", "blood_infused_iron"); - - registerParts(); - } - - private static void initParts() - { - ARROWHEAD = new PartHelper("arrowhead", 0, ""); - AXE_HEAD = new PartHelper("axe.head", 0, ""); - BATTLE_SIGN_HEAD = new PartHelper("battle.sign", 0, ""); - BINDING = new PartHelper("binding", 0, ""); - BOLT = new PartHelper("bolt", 0, ""); - BOW_LIMB = new PartHelper("bow.limb", 0, ""); - CHISEL_HEAD = new PartHelper("chisel.head", 0, ""); - CHUNK = new PartHelper("chunk", 0, ""); - CROSSBAR = new PartHelper("crossbar", 0, ""); - CROSSBOW_BODY = new PartHelper("crossbow.body", 0, ""); - CROSSBOW_LIMB = new PartHelper("crossbow.limb", 0, ""); - EXCAVATOR_HEAD = new PartHelper("excavator.head", 0, ""); - FISHING_ROD = new PartHelper("fishing.rod", 0, ""); - FRYPAN_HEAD = new PartHelper("frypan.head", 0, ""); - FULL_GUARD = new PartHelper("full.guard", 0, ""); - HAMMER_HEAD = new PartHelper("hammer.head", 0, ""); - KNIFE_BLADE = new PartHelper("knife.blade", 0, ""); - LARGE_GUARD = new PartHelper("large.guard", 0, ""); - LARGE_SWORD_BLADE = new PartHelper("large.sword.blade", 0, ""); - LARGEPLATE = new PartHelper("largeplate", 0, ""); - LUMBERAXE_HEAD = new PartHelper("lumberaxe.head", 0, ""); - MEDIUM_GUARD = new PartHelper("medium.guard", 0, ""); - PICKAXE_HEAD = new PartHelper("pickaxe.head", 0, ""); - SCYTHE_HEAD = new PartHelper("scythe.head", 0, ""); - SHOVEL_HEAD = new PartHelper("shovel.head", 0, ""); - SHURIKEN = new PartHelper("shuriken", 0, ""); - SWORD_BLADE = new PartHelper("sword.blade", 0, ""); - TOOLROD = new PartHelper("toolrod", 0, ""); - TOUGHBIND = new PartHelper("toughbind", 0, ""); - TOUGHROD = new PartHelper("toughrod", 0, ""); - } - - private static void addMaterialToToolParts(int materialID, String unlocalizedName, String texture) - { - ARROWHEAD.addMaterial(materialID, unlocalizedName, texture + "_arrowhead"); - AXE_HEAD.addMaterial(materialID, unlocalizedName, texture + "_axe_head"); - BATTLE_SIGN_HEAD.addMaterial(materialID, unlocalizedName, texture + "_battlesign_head"); - BINDING.addMaterial(materialID, unlocalizedName, texture + "_binding"); - BOLT.addMaterial(materialID, unlocalizedName, texture + "_bolt"); - BOW_LIMB.addMaterial(materialID, unlocalizedName, texture + "_bow_limb"); - CHISEL_HEAD.addMaterial(materialID, unlocalizedName, texture + "_chisel_head"); - CHUNK.addMaterial(materialID, unlocalizedName, texture + "_chunk"); - CROSSBAR.addMaterial(materialID, unlocalizedName, texture + "_crossbar"); - CROSSBOW_BODY.addMaterial(materialID, unlocalizedName, texture + "_crossbow_body"); - CROSSBOW_LIMB.addMaterial(materialID, unlocalizedName, texture + "_crossbow_limb"); - EXCAVATOR_HEAD.addMaterial(materialID, unlocalizedName, texture + "_excavator_head"); - FISHING_ROD.addMaterial(materialID, unlocalizedName, texture + "_fishingrod"); - FRYPAN_HEAD.addMaterial(materialID, unlocalizedName, texture + "_frypan_head"); - FULL_GUARD.addMaterial(materialID, unlocalizedName, texture + "_full_guard"); - HAMMER_HEAD.addMaterial(materialID, unlocalizedName, texture + "_hammer_head"); - KNIFE_BLADE.addMaterial(materialID, unlocalizedName, texture + "_knife_blade"); - LARGE_GUARD.addMaterial(materialID, unlocalizedName, texture + "_large_guard"); - LARGE_SWORD_BLADE.addMaterial(materialID, unlocalizedName, texture + "_large_sword_blade"); - LARGEPLATE.addMaterial(materialID, unlocalizedName, texture + "_largeplate"); - LUMBERAXE_HEAD.addMaterial(materialID, unlocalizedName, texture + "_lumberaxe_head"); - MEDIUM_GUARD.addMaterial(materialID, unlocalizedName, texture + "_medium_guard"); - PICKAXE_HEAD.addMaterial(materialID, unlocalizedName, texture + "_pickaxe_head"); - SCYTHE_HEAD.addMaterial(materialID, unlocalizedName, texture + "_scythe_head"); - SHOVEL_HEAD.addMaterial(materialID, unlocalizedName, texture + "_shovel_head"); - SHURIKEN.addMaterial(materialID, unlocalizedName, texture + "_shuriken"); - SWORD_BLADE.addMaterial(materialID, unlocalizedName, texture + "_sword_blade"); - TOOLROD.addMaterial(materialID, unlocalizedName, texture + "_rod"); - TOUGHBIND.addMaterial(materialID, unlocalizedName, texture + "_toughbind"); - TOUGHROD.addMaterial(materialID, unlocalizedName, texture + "_toughrod"); - } - - private static void registerParts() - { - GameRegistry.registerItem(ARROWHEAD, "arrowhead"); - GameRegistry.registerItem(AXE_HEAD, "axeHead"); - GameRegistry.registerItem(BATTLE_SIGN_HEAD, "battleSign"); - GameRegistry.registerItem(BINDING, "binding"); - GameRegistry.registerItem(BOLT, "bolt"); - GameRegistry.registerItem(BOW_LIMB, "bowLimb"); - GameRegistry.registerItem(CHISEL_HEAD, "chiselHead"); - GameRegistry.registerItem(CHUNK, "chunk"); - GameRegistry.registerItem(CROSSBAR, "crossbar"); - GameRegistry.registerItem(CROSSBOW_BODY, "crossbowBody"); - GameRegistry.registerItem(CROSSBOW_LIMB, "crossbowLimb"); - GameRegistry.registerItem(EXCAVATOR_HEAD, "excavatorHead"); -// GameRegistry.registerItem(FISHING_ROD, "fishingRod"); - GameRegistry.registerItem(FRYPAN_HEAD, "frypanHead"); - GameRegistry.registerItem(FULL_GUARD, "fullGuard"); - GameRegistry.registerItem(HAMMER_HEAD, "hammerHead"); - GameRegistry.registerItem(KNIFE_BLADE, "knifeBlade"); - GameRegistry.registerItem(LARGE_GUARD, "largeGuard"); - GameRegistry.registerItem(LARGE_SWORD_BLADE, "largeSwordBlade"); - GameRegistry.registerItem(LARGEPLATE, "largeplate"); - GameRegistry.registerItem(LUMBERAXE_HEAD, "lumberaxeHead"); - GameRegistry.registerItem(MEDIUM_GUARD, "mediumGuard"); - GameRegistry.registerItem(PICKAXE_HEAD, "pickaxeHead"); - GameRegistry.registerItem(SCYTHE_HEAD, "scytheHead"); - GameRegistry.registerItem(SHOVEL_HEAD, "shovelHead"); - GameRegistry.registerItem(SHURIKEN, "shuriken"); - GameRegistry.registerItem(SWORD_BLADE, "swordBlade"); - GameRegistry.registerItem(TOOLROD, "toolrod"); - GameRegistry.registerItem(TOUGHBIND, "toughbind"); - GameRegistry.registerItem(TOUGHROD, "toughrod"); - BloodArsenal.logger.info("SOMETHING WORKED NOW DIDN'T IT?"); + MinecraftForge.EVENT_BUS.register(new TConEvents()); + bloodInfusedIronFluid = new Fluid("molten.blood_infused_iron").setDensity(3000).setViscosity(6000).setTemperature(1400); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java index 950f894..d72985c 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java @@ -1,22 +1,30 @@ package com.arc.bloodarsenal.common.tinkers; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.oredict.OreDictionary; import tconstruct.library.modifier.IModifyable; +import tconstruct.library.tools.ToolCore; import tconstruct.modifiers.tools.ModBoolean; +import tconstruct.util.config.PHConstruct; + +import java.util.ArrayList; public class ModSoulbound extends ModBoolean { public int modifiersRequired = 1; + private String owner; public ModSoulbound(ItemStack[] items) { - super(items, 1, "Soulbound", "\u00a74", "Soulbound"); + super(items, 30, "Soulbound", EnumChatFormatting.DARK_RED.toString(), "Soulbound"); } @Override - public boolean matches (ItemStack[] input, ItemStack tool) + public boolean matches(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); @@ -26,24 +34,28 @@ public class ModSoulbound extends ModBoolean return false; ItemStack foundOrb = null; - ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, OreDictionary.WILDCARD_VALUE); for (ItemStack stack : input) - { - if (stack == null) - continue; - if (stack.getItem() != masterOrb.getItem()) - continue; - if (foundOrb != null) - return false; + { + if (stack == null) + continue; + if (!(stack.getItem() instanceof IBloodOrb)) + continue; + if (!(((IBloodOrb) stack.getItem()).getOrbLevel() >= 4)) + continue; + if (SoulNetworkHandler.getOwnerName(stack).equals("")) + continue; + if (foundOrb != null) + return false; - foundOrb = stack; - } + foundOrb = stack; + } if (foundOrb == null) return false; - - // otherwise check if we have enough modfiers + if (tags.getBoolean(key)) + return false; + // otherwise check if we have enough modfiers else if (tags.getInteger("Modifiers") < modifiersRequired) return false; @@ -52,7 +64,7 @@ public class ModSoulbound extends ModBoolean } @Override - public void modify (ItemStack[] input, ItemStack tool) + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound(); @@ -62,27 +74,33 @@ public class ModSoulbound extends ModBoolean int modifiers = tags.getCompoundTag("InfiTool").getInteger("Modifiers"); modifiers -= modifiersRequired; tags.getCompoundTag("InfiTool").setInteger("Modifiers", modifiers); - addModifierTip(tool, "\u00a74"); + addModifierTip(tool, EnumChatFormatting.DARK_RED + "Soulbound"); } tags.getCompoundTag("InfiTool").setBoolean(key, true); // find the battery in the input ItemStack inputBattery = null; - ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, OreDictionary.WILDCARD_VALUE); for (ItemStack stack : input) - { - if (stack == null) - continue; - if (stack.getItem() != masterOrb.getItem()) - continue; + { + if (stack == null) + continue; + if (!(stack.getItem() instanceof IBloodOrb)) + continue; + if (!(((IBloodOrb) stack.getItem()).getOrbLevel() >= 4)) + continue; + if (SoulNetworkHandler.getOwnerName(stack).equals("")) + continue; + if (inputBattery != null) + return; - // we're guaranteed to only find one battery because more are prevented above - inputBattery = stack; - } + this.owner = SoulNetworkHandler.getOwnerName(stack); + // we're guaranteed to only find one battery because more are prevented above + inputBattery = stack; + } - tags.setString("Owner", ""); + tags.setString("Owner", owner); tags.setInteger(key, 1); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/PartHelper.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/PartHelper.java deleted file mode 100644 index 0624243..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/PartHelper.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.arc.bloodarsenal.common.tinkers; - -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; -import tconstruct.library.util.IToolPart; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class PartHelper extends Item implements IToolPart -{ - protected String defaultTexture; - protected int defaultMaterialID; - protected String unlocalizedPartName; - protected HashMap unlocalizedMaterialNames = new HashMap(); - protected HashMap textures = new HashMap(); - protected HashMap icons = new HashMap(); - protected static final String texturePath = "BloodArsenal".toLowerCase() + ":" + "tinkers/parts/"; - - public PartHelper(String defaultUnlocalizedPartName, int defaultMaterialID, String defaultTexture) - { - setCreativeTab(BloodArsenal.BA_TAB); - setMaxStackSize(64); - setMaxDamage(0); - setHasSubtypes(true); - - setUnlocalizedName("default." + defaultUnlocalizedPartName); - this.unlocalizedPartName = defaultUnlocalizedPartName; - this.defaultMaterialID = defaultMaterialID; - this.defaultTexture = (texturePath + defaultTexture); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister icon) - { - this.itemIcon = icon.registerIcon(this.defaultTexture); - - for (Map.Entry texture : this.textures.entrySet()) - { - int materialID = texture.getKey().intValue(); - String textureName = texture.getValue(); - - IIcon _icon = icon.registerIcon(texturePath + textureName); - - this.icons.put(materialID, _icon); - } - } - - @Override - public int getMaterialID(ItemStack itemStack) - { - int damageValue = itemStack.getItemDamage(); - - if (damageValue >= 100) - { - return itemStack.getItemDamage(); - } - - return this.defaultMaterialID; - } - - public void addMaterial(int materialId, String unlocalizedName, String texture) - { - this.unlocalizedMaterialNames.put(materialId, unlocalizedName); - this.textures.put(materialId, texture); - } - - @Override - public IIcon getIconFromDamage(int damageValue) - { - if (this.icons.containsKey(damageValue)) - { - return this.icons.get(damageValue); - } - - return this.itemIcon; - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List itemStackList) - { - if (!this.unlocalizedMaterialNames.isEmpty()) - { - for (Map.Entry subItem : this.unlocalizedMaterialNames.entrySet()) - { - int materialId = subItem.getKey().intValue(); - itemStackList.add(new ItemStack(item, 1, materialId)); - } - } - else - { - itemStackList.add(new ItemStack(this, 1)); - } - } - - @Override - public String getUnlocalizedName(ItemStack itemStack) - { - int damageValue = itemStack.getItemDamage(); - - if (this.unlocalizedMaterialNames.containsKey(damageValue)) - { - return "item." + this.unlocalizedMaterialNames.get(damageValue) + "." + this.unlocalizedPartName; - } - - return getUnlocalizedName(); - } - - @Override - public String getItemStackDisplayName(ItemStack itemStack) - { - int damageValue = itemStack.getItemDamage(); - String displayName; -/* if (this.unlocalizedMaterialNames.containsKey(damageValue)) - { - String unlocalizedMaterialName = this.unlocalizedMaterialNames.get(damageValue); - if (StatCollector.canTranslate("part." + this.unlocalizedPartName) && StatCollector.canTranslate("material." + unlocalizedMaterialName)) - { - String localizedPartName = StatCollector.translateToLocal("part." + this.unlocalizedPartName); - String localizedMaterialName = StatCollector.translateToLocal("material." + unlocalizedMaterialName); - displayName = localizedPartName.replaceAll("@material@", localizedMaterialName); - } - else - { - displayName = getUnlocalizedName(itemStack) + ".name"; - } - } - else - { - displayName = getUnlocalizedName() + ".name"; - } -*/ - String unlocalizedMaterialName = this.unlocalizedMaterialNames.get(damageValue); - String localizedMaterialName = StatCollector.translateToLocal("material." + unlocalizedMaterialName); - String partName = StatCollector.translateToLocal("part." + this.unlocalizedPartName); - displayName = partName.replaceAll("@material@", localizedMaterialName); - - return displayName; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/RecipeHelper.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/RecipeHelper.java deleted file mode 100644 index 52e94bd..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/RecipeHelper.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.arc.bloodarsenal.common.tinkers; - -import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.OreDictionary; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.PatternBuilder; -import tconstruct.tools.TinkerTools; -import tconstruct.weaponry.TinkerWeaponry; - -import java.util.ArrayList; -import java.util.List; - -public class RecipeHelper -{ - private static Item pattern = TConstructRegistry.getItem("woodPattern"); - private static Item weaponPattern = TinkerWeaponry.woodPattern; - - private static final ItemStack toolRodPattern = TConstructRegistry.getItemStack("toolRodPattern"); - private static final ItemStack pickaxeHeadPattern = TConstructRegistry.getItemStack("pickaxeHeadPattern"); - private static final ItemStack shovelHeadPattern = TConstructRegistry.getItemStack("shovelHeadPattern"); - private static final ItemStack hatchetHeadPattern = TConstructRegistry.getItemStack("hatchetHeadPattern"); - private static final ItemStack swordBladePattern = TConstructRegistry.getItemStack("swordBladePattern"); - private static final ItemStack wideGuardPattern = TConstructRegistry.getItemStack("wideGuardPattern"); - private static final ItemStack handGuardPattern = TConstructRegistry.getItemStack("handGuardPattern"); - private static final ItemStack crossbarPattern = TConstructRegistry.getItemStack("crossbarPattern"); - private static final ItemStack bindingPattern = TConstructRegistry.getItemStack("bindingPattern"); - private static final ItemStack frypanHeadPattern = TConstructRegistry.getItemStack("frypanHeadPattern"); - private static final ItemStack signHeadPattern = TConstructRegistry.getItemStack("signHeadPattern"); - private static final ItemStack knifeBladePattern = TConstructRegistry.getItemStack("knifeBladePattern"); - private static final ItemStack chiselHeadPattern = TConstructRegistry.getItemStack("chiselHeadPattern"); - private static final ItemStack toughRodPattern = TConstructRegistry.getItemStack("toughRodPattern"); - private static final ItemStack toughBindingPattern = TConstructRegistry.getItemStack("toughBindingPattern"); - private static final ItemStack largePlatePattern = TConstructRegistry.getItemStack("largePlatePattern"); - private static final ItemStack broadAxeHeadPattern = TConstructRegistry.getItemStack("broadAxeHeadPattern"); - private static final ItemStack scytheHeadPattern = TConstructRegistry.getItemStack("scytheHeadPattern"); - private static final ItemStack excavatorHeadPattern = TConstructRegistry.getItemStack("excavatorHeadPattern"); - private static final ItemStack largeBladePattern = TConstructRegistry.getItemStack("largeBladePattern"); - private static final ItemStack hammerHeadPattern = TConstructRegistry.getItemStack("hammerHeadPattern"); - private static final ItemStack fullGuardPattern = TConstructRegistry.getItemStack("fullGuardPattern"); - private static final ItemStack arrowHeadPattern = new ItemStack(pattern, 1, 25); - private static final ItemStack crossbowBodyPattern = new ItemStack(weaponPattern, 1, 2); - private static final ItemStack crossbowLimbPattern = new ItemStack(weaponPattern, 1, 1); - private static final ItemStack shurikenPattern = new ItemStack(weaponPattern); - - private static PartHelper _ARROWHEAD = BloodArsenalTinkers.ARROWHEAD; - private static PartHelper _AXE_HEAD = BloodArsenalTinkers.AXE_HEAD; - private static PartHelper _BATTLE_SIGN_HEAD = BloodArsenalTinkers.BATTLE_SIGN_HEAD; - private static PartHelper _BINDING = BloodArsenalTinkers.BINDING; - private static PartHelper _BOLT = BloodArsenalTinkers.BOLT; - private static PartHelper _BOW_LIMB = BloodArsenalTinkers.BOW_LIMB; - private static PartHelper _CHISEL_HEAD = BloodArsenalTinkers.CHISEL_HEAD; - private static PartHelper _CHUNK = BloodArsenalTinkers.CHUNK; - private static PartHelper _CROSSBAR = BloodArsenalTinkers.CROSSBAR; - private static PartHelper _CROSSBOW_BODY = BloodArsenalTinkers.CROSSBOW_BODY; - private static PartHelper _CROSSBOW_LIMB = BloodArsenalTinkers.CROSSBOW_LIMB; - private static PartHelper _EXCAVATOR_HEAD = BloodArsenalTinkers.EXCAVATOR_HEAD; - private static PartHelper _FISHING_ROD = BloodArsenalTinkers.FISHING_ROD; - private static PartHelper _FRYPAN_HEAD = BloodArsenalTinkers.FRYPAN_HEAD; - private static PartHelper _FULL_GUARD = BloodArsenalTinkers.FULL_GUARD; - private static PartHelper _HAMMER_HEAD = BloodArsenalTinkers.HAMMER_HEAD; - private static PartHelper _KNIFE_BLADE = BloodArsenalTinkers.KNIFE_BLADE; - private static PartHelper _LARGE_GUARD = BloodArsenalTinkers.LARGE_GUARD; - private static PartHelper _LARGE_SWORD_BLADE = BloodArsenalTinkers.LARGE_SWORD_BLADE; - private static PartHelper _LARGEPLATE = BloodArsenalTinkers.LARGEPLATE; - private static PartHelper _LUMBERAXE_HEAD = BloodArsenalTinkers.LUMBERAXE_HEAD; - private static PartHelper _MEDIUM_GUARD = BloodArsenalTinkers.MEDIUM_GUARD; - private static PartHelper _PICKAXE_HEAD = BloodArsenalTinkers.PICKAXE_HEAD; - private static PartHelper _SCYTHE_HEAD = BloodArsenalTinkers.SCYTHE_HEAD; - private static PartHelper _SHOVEL_HEAD = BloodArsenalTinkers.SHOVEL_HEAD; - private static PartHelper _SHURIKEN = BloodArsenalTinkers.SHURIKEN; - private static PartHelper _SWORD_BLADE = BloodArsenalTinkers.SWORD_BLADE; - private static PartHelper _TOOLROD = BloodArsenalTinkers.TOOLROD; - private static PartHelper _TOUGHBIND = BloodArsenalTinkers.TOUGHBIND; - private static PartHelper _TOUGHROD = BloodArsenalTinkers.TOUGHROD; - - public static void addRecipes() - { - addPartRecipes(); - addToolRecipes(); - addCraftingRecipes(); - } - - public static void addCraftingRecipes() {} - - public static void addPartRecipes() - { - Item bloodIron = GameRegistry.findItem("BloodArsenal", "blood_infused_iron"); - - if (bloodIron != null) - { - ItemStack _bloodIron = new ItemStack(bloodIron); - - addPartBuilding(250); - unregisterMaterial(_bloodIron); - registerWithStation(new ItemStack(ModItems.blood_infused_iron, 1), "Blood Infused Iron", 250, new ItemStack(_CHUNK, 1, 250)); -// registerWithStation("Blood Infused Iron", "Blood Infused Iron", 250); - } - } - - private static void registerWithStation(String ingotName, String materialName, int materialID) - { - ArrayList ingots = OreDictionary.getOres(ingotName); - - if (!ingots.isEmpty()) - { - for (ItemStack ingot : ingots) - { - registerWithStation(ingot, materialName, materialID, new ItemStack(_CHUNK, 1, materialID)); - } - } - } - - private static void registerWithStation(ItemStack material, String materialName, int materialID, ItemStack chunk) - { - PatternBuilder.instance.registerFullMaterial(material, 2, materialName, chunk, new ItemStack(_TOOLROD, 1, materialID), materialID); - } - - private static void unregisterMaterial(ItemStack material) - { - List materials = PatternBuilder.instance.materials; - - for (int i = 0; i < materials.size(); i++) - { - PatternBuilder.ItemKey itemKey = materials.get(i); - if ((itemKey.item == material.getItem()) && (material.getItemDamage() == itemKey.damage)) - { - materials.remove(i); - } - } - } - - private static ItemStack getItemStackfromCraftingManager(String itemName) - { - List list = CraftingManager.getInstance().getRecipeList(); - - ItemStack itemStack = null; - - for (int i = 0; i < list.size(); i++) - { - IRecipe recipe = (IRecipe)list.get(i); - ItemStack currentItemStack = recipe.getRecipeOutput(); - if (currentItemStack != null) - { - Item item = currentItemStack.getItem(); - if (item != null) - { - String foundItemName = currentItemStack.getUnlocalizedName(); - if (foundItemName.equals(itemName)) - { - itemStack = currentItemStack; - break; - } - } - } - } - return itemStack; - } - - private static void addItemStackPartBuilding(ItemStack pattern, int materialID, ItemStack part) - { - TConstructRegistry.addPartMapping(pattern.getItem(), pattern.getItemDamage(), materialID, part); - } - - private static void addPartBuilding(int materialID) - { - addItemStackPartBuilding(toolRodPattern, materialID, new ItemStack(_TOOLROD, 1, materialID)); - addItemStackPartBuilding(pickaxeHeadPattern, materialID, new ItemStack(_PICKAXE_HEAD, 1, materialID)); - addItemStackPartBuilding(shovelHeadPattern, materialID, new ItemStack(_SHOVEL_HEAD, 1, materialID)); - addItemStackPartBuilding(hatchetHeadPattern, materialID, new ItemStack(_AXE_HEAD, 1, materialID)); - addItemStackPartBuilding(swordBladePattern, materialID, new ItemStack(_SWORD_BLADE, 1, materialID)); - addItemStackPartBuilding(wideGuardPattern, materialID, new ItemStack(_LARGE_GUARD, 1, materialID)); - addItemStackPartBuilding(handGuardPattern, materialID, new ItemStack(_MEDIUM_GUARD, 1, materialID)); - addItemStackPartBuilding(crossbarPattern, materialID, new ItemStack(_CROSSBAR, 1, materialID)); - addItemStackPartBuilding(bindingPattern, materialID, new ItemStack(_BINDING, 1, materialID)); - addItemStackPartBuilding(frypanHeadPattern, materialID, new ItemStack(_FRYPAN_HEAD, 1, materialID)); - addItemStackPartBuilding(signHeadPattern, materialID, new ItemStack(_BATTLE_SIGN_HEAD, 1, materialID)); - addItemStackPartBuilding(knifeBladePattern, materialID, new ItemStack(_KNIFE_BLADE, 1, materialID)); - addItemStackPartBuilding(chiselHeadPattern, materialID, new ItemStack(_CHISEL_HEAD, 1, materialID)); - addItemStackPartBuilding(toughRodPattern, materialID, new ItemStack(_TOUGHROD, 1, materialID)); - addItemStackPartBuilding(toughBindingPattern, materialID, new ItemStack(_TOUGHBIND, 1, materialID)); - addItemStackPartBuilding(largePlatePattern, materialID, new ItemStack(_LARGEPLATE, 1, materialID)); - addItemStackPartBuilding(broadAxeHeadPattern, materialID, new ItemStack(_LUMBERAXE_HEAD, 1, materialID)); - addItemStackPartBuilding(scytheHeadPattern, materialID, new ItemStack(_SCYTHE_HEAD, 1, materialID)); - addItemStackPartBuilding(excavatorHeadPattern, materialID, new ItemStack(_EXCAVATOR_HEAD, 1, materialID)); - addItemStackPartBuilding(largeBladePattern, materialID, new ItemStack(_LARGE_SWORD_BLADE, 1, materialID)); - addItemStackPartBuilding(hammerHeadPattern, materialID, new ItemStack(_HAMMER_HEAD, 1, materialID)); - addItemStackPartBuilding(fullGuardPattern, materialID, new ItemStack(_FULL_GUARD, 1, materialID)); - addItemStackPartBuilding(arrowHeadPattern, materialID, new ItemStack(_ARROWHEAD, 1, materialID)); - addItemStackPartBuilding(crossbowBodyPattern, materialID, new ItemStack(_CROSSBOW_BODY, 1, materialID)); - addItemStackPartBuilding(crossbowLimbPattern, materialID, new ItemStack(_CROSSBOW_LIMB, 1, materialID)); - addItemStackPartBuilding(shurikenPattern, materialID, new ItemStack(_SHURIKEN, 1, materialID)); - } - - public static void addToolRecipes() - { - TConstructRegistry.addToolRecipe(TinkerTools.battleaxe, _LUMBERAXE_HEAD, _TOUGHROD, _LUMBERAXE_HEAD, _TOUGHBIND); - TConstructRegistry.addToolRecipe(TinkerTools.battlesign, _BATTLE_SIGN_HEAD, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerTools.broadsword, _SWORD_BLADE, _TOOLROD, _LARGE_GUARD); - TConstructRegistry.addToolRecipe(TinkerTools.chisel, _CHISEL_HEAD, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerTools.cleaver, _LARGE_SWORD_BLADE, _TOUGHROD, _LARGEPLATE, _TOUGHROD); - TConstructRegistry.addToolRecipe(TinkerTools.cutlass, _SWORD_BLADE, _TOOLROD, _FULL_GUARD); - TConstructRegistry.addToolRecipe(TinkerTools.dagger, _KNIFE_BLADE, _TOOLROD, _CROSSBAR); - TConstructRegistry.addToolRecipe(TinkerTools.excavator, _EXCAVATOR_HEAD, _TOUGHROD, _LARGEPLATE, _TOUGHBIND); - TConstructRegistry.addToolRecipe(TinkerTools.frypan, _FRYPAN_HEAD, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerTools.hammer, _HAMMER_HEAD, _TOUGHROD, _LARGEPLATE, _LARGEPLATE); - TConstructRegistry.addToolRecipe(TinkerTools.hatchet, _AXE_HEAD, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerTools.longsword, _SWORD_BLADE, _TOOLROD, _MEDIUM_GUARD); - TConstructRegistry.addToolRecipe(TinkerTools.lumberaxe, _LUMBERAXE_HEAD, _TOUGHROD, _LARGEPLATE, _TOUGHBIND); - TConstructRegistry.addToolRecipe(TinkerTools.mattock, _AXE_HEAD, _TOOLROD, _SHOVEL_HEAD); - TConstructRegistry.addToolRecipe(TinkerTools.pickaxe, _PICKAXE_HEAD, _TOOLROD, _BINDING); - TConstructRegistry.addToolRecipe(TinkerTools.rapier, _SWORD_BLADE, _TOOLROD, _CROSSBAR); - TConstructRegistry.addToolRecipe(TinkerTools.scythe, _SCYTHE_HEAD, _TOUGHROD, _TOUGHBIND, _TOUGHROD); - TConstructRegistry.addToolRecipe(TinkerTools.shovel, _SHOVEL_HEAD, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerWeaponry.arrowAmmo, _ARROWHEAD, _TOOLROD, TinkerWeaponry.fletching); - TConstructRegistry.addToolRecipe(TinkerWeaponry.boltAmmo, _BOLT, TinkerWeaponry.fletching); - TConstructRegistry.addToolRecipe(TinkerWeaponry.crossbow, _TOUGHBIND, _CROSSBOW_LIMB, _CROSSBOW_BODY, TinkerWeaponry.bowstring); - TConstructRegistry.addToolRecipe(TinkerWeaponry.javelin, _ARROWHEAD, _TOUGHROD, _TOUGHROD); - TConstructRegistry.addToolRecipe(TinkerWeaponry.longbow, _BOW_LIMB, _LARGEPLATE, _BOW_LIMB, TinkerWeaponry.bowstring); - TConstructRegistry.addToolRecipe(TinkerWeaponry.shortbow, _TOOLROD, TinkerWeaponry.bowstring, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerWeaponry.shortbow, TinkerTools.toolRod, TinkerWeaponry.bowstring, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerWeaponry.shortbow, _TOOLROD, TinkerWeaponry.bowstring, TinkerTools.toolRod); - TConstructRegistry.addToolRecipe(TinkerWeaponry.shuriken, _SHURIKEN, _SHURIKEN, _SHURIKEN, _SHURIKEN); - TConstructRegistry.addToolRecipe(TinkerWeaponry.throwingknife, _KNIFE_BLADE, _TOOLROD); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java deleted file mode 100644 index bbe2a25..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.arc.bloodarsenal.common.tinkers; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import tconstruct.library.client.FluidRenderProperties; -import tconstruct.library.crafting.CastingRecipe; - -public class TConCastingRecipe extends CastingRecipe -{ - public TConCastingRecipe(ItemStack replacement, FluidStack metal, ItemStack cast, boolean consume, int delay, FluidRenderProperties props) - { - super(replacement, metal, cast, consume, delay, props); - } - - public TConCastingRecipe(CastingRecipe recipe) - { - super(recipe.output.copy(), recipe.castingMetal.copy(), recipe.cast.copy(), recipe.consumeCast, recipe.coolTime, recipe.fluidRenderProperties); - } - - @Override - public boolean matches(FluidStack metal, ItemStack inputCast) - { - return (this.castingMetal != null) && (this.castingMetal.isFluidEqual(metal)) && (inputCast != null) && (this.cast != null) && (inputCast.getItem() == this.cast.getItem()) && ((this.cast.getItemDamage() == Short.MAX_VALUE)); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java index 4141189..1a8458a 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java @@ -1,24 +1,22 @@ package com.arc.bloodarsenal.common.tinkers; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.client.event.TextureStitchEvent; + public class TConEvents { -/* @SideOnly(Side.CLIENT) + @SideOnly(Side.CLIENT) @SubscribeEvent - public void handleStich(TextureStitchEvent.Pre event) { - if (event.map.getTextureType() != 0) { - return; - } - BloodArsenalTinkers.bloodInfusedIron.setIcons(event.map.registerIcon("TConIntegration.bedrock")); - - TextureAtlasSprite sprite = new TextureBedrockLava("extrautils:bedrockFluid", "lava_still"); - event.map.setTextureEntry("extrautils:bedrockFluid", sprite); - if (BloodArsenalTinkers.bloodInfusedIron != null) { - BloodArsenalTinkers.bloodInfusedIron.setIcons(sprite); - } - sprite = new TextureBedrockLava("extrautils:bedrockFluid_flowing", "lava_flow"); - if ((event.map.setTextureEntry("extrautils:bedrockFluid_flowing", sprite)) && - (BloodArsenalTinkers.bloodInfusedIron != null)) { - BloodArsenalTinkers.bloodInfusedIron.setFlowingIcon(sprite); + public void handleStich(TextureStitchEvent.Pre event) + { + if (event.map.getTextureType() == 0) + { + if (BloodArsenalTinkers.bloodInfusedIronFluid != null) + { + BloodArsenalTinkers.bloodInfusedIronFluid.setIcons(event.map.registerIcon("BloodArsenal:molten_blood_infused_iron_still"), event.map.registerIcon("BloodArsenal:molten_blood_infused_iron_flow")); + } } } -*/} +} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java deleted file mode 100644 index fec6c90..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.arc.bloodarsenal.common.tinkers; - -import cpw.mods.fml.client.FMLClientHandler; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.IResource; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.data.AnimationMetadataSection; -import net.minecraft.util.ResourceLocation; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.awt.image.DirectColorModel; -import java.io.IOException; - -public abstract class TextureDerived extends TextureAtlasSprite -{ - private final String baseIcon; - private final String basePath; - private final TextureMapType type; - - public static enum TextureMapType - { - BLOCK(0, "textures/blocks"), ITEM(1, "textures/items"); - - public final int textureMapType; - public final String basePath; - - private TextureMapType(int textureMapType, String basePath) - { - this.textureMapType = textureMapType; - this.basePath = basePath; - } - } - - public TextureDerived(String p_i1282_1_, String baseIcon, TextureMapType type) - { - super(p_i1282_1_); - this.baseIcon = baseIcon; - this.type = type; - this.basePath = type.basePath; - } - - public static DirectColorModel rgbBase = new DirectColorModel(32, 16711680, 65280, 255, -16777216); - protected DirectColorModel rgb = rgbBase; - - public int getLuminosity(int col) - { - return getLuminosity(this.rgb.getRed(col), this.rgb.getGreen(col), this.rgb.getBlue(col)); - } - - public int getLuminosity(int r, int g, int b) - { - return (int)(r * 0.2126F + g * 0.7152F + b * 0.0722F); - } - - public boolean hasCustomLoader(IResourceManager manager, ResourceLocation location) - { - return true; - } - - public abstract BufferedImage processImage(BufferedImage paramBufferedImage, AnimationMetadataSection paramAnimationMetadataSection); - - public boolean load(IResourceManager manager, ResourceLocation oldlocation) - { - ResourceLocation location = new ResourceLocation(this.baseIcon); - location = completeResourceLocation(location); - try - { - int mipmapLevels = Minecraft.getMinecraft().gameSettings.mipmapLevels; - int anisotropicFiltering = Minecraft.getMinecraft().gameSettings.anisotropicFiltering; - IResource iresource = manager.getResource(location); - BufferedImage[] abufferedimage = new BufferedImage[1 + mipmapLevels]; - abufferedimage[0] = ImageIO.read(iresource.getInputStream()); - AnimationMetadataSection animationmetadatasection = (AnimationMetadataSection)iresource.getMetadata("animation"); - abufferedimage[0] = processImage(abufferedimage[0], animationmetadatasection); - loadSprite(abufferedimage, animationmetadatasection, anisotropicFiltering > 1.0F); - } - catch (RuntimeException runtimeexception) - { - FMLClientHandler.instance().trackBrokenTexture(location, runtimeexception.getMessage()); - return true; - } - catch (IOException ioexception1) - { - FMLClientHandler.instance().trackMissingTexture(location); - return true; - } - return false; - } - - private ResourceLocation completeResourceLocation(ResourceLocation p_147634_1_) - { - return new ResourceLocation(p_147634_1_.getResourceDomain(), String.format("%s/%s%s", new Object[] { this.basePath, p_147634_1_.getResourcePath(), ".png" })); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java deleted file mode 100644 index 27185b8..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.arc.bloodarsenal.common.tinkers; - -public abstract class TextureLiquidLava extends TextureDerived -{ - public TextureLiquidLava(String p_i1282_1_, String baseIcon) - { - super(p_i1282_1_, baseIcon, TextureDerived.TextureMapType.BLOCK); - } -/* - public BufferedImage processImage(BufferedImage image, AnimationMetadataSection animationmetadatasection) - { - int w = image.getWidth(); - int h = image.getHeight(); - - int[] pixels = new int[h * w]; - image.getRGB(0, 0, w, h, pixels, 0, w); - - double mean = 0.0D; - for (int i = 0; i < pixels.length; i++) - { - pixels[i] = getLuminosity(pixels[i]); - mean += pixels[i]; - } - mean /= pixels.length; - - BufferedImage bedrockImage = TextureResourcePackBloodInfusedIron.getBedrockImage(); - for (int i = 0; i < pixels.length; i++) - { - int x = i % w; - int y = (i - x) / w % w; - int sn = (i - x) / w / w; - - int dx = x * bedrockImage.getWidth() / w; - int dy = y * bedrockImage.getHeight() / w; - - int col = bedrockImage.getRGB(dx, dy); - - double f = pixels[i] / mean; - - int r = clamp(this.rgb.getRed(col) * f); - int g = clamp(this.rgb.getGreen(col) * f); - int b = clamp(this.rgb.getBlue(col) * f); - - pixels[i] = (0xFF000000 | r << 16 | g << 8 | b); - } - image.setRGB(0, 0, w, h, pixels, 0, w); - - return image; - } - - private int clamp(double v) - { - return MathHelper.func_76125_a((int) v, 0, 255); - } - */ -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java index 34016d9..3544316 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java @@ -1,6 +1,6 @@ package com.arc.bloodarsenal.common.tinkers; -import amerifrance.guideapi.util.LogHelper; +import com.arc.bloodarsenal.common.BloodArsenal; import com.google.common.base.Throwables; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.ObfuscationReflectionHelper; @@ -17,19 +17,16 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Set; +import java.util.*; public abstract class TextureResourcePackBase implements IResourcePack, IResourceManagerReloadListener { public static List packs; - protected static DirectColorModel rgb = new DirectColorModel(32, 16711680, 65280, 255, -16777216); + protected static DirectColorModel rgb = new DirectColorModel(32, 16711680, '\uff00', 255, -16777216); protected final String name; public HashMap cachedImages = new HashMap(); protected IResourcePack delegate; - protected List resourcePacks = null; + protected List resourcePackz = null; public TextureResourcePackBase(String name) { @@ -37,172 +34,168 @@ public abstract class TextureResourcePackBase implements IResourcePack, IResourc this.delegate = FMLClientHandler.instance().getResourcePackFor("TConstruct"); } - public int brightness(int col) - { - return brightness(rgb.getRed(col), rgb.getGreen(col), rgb.getBlue(col)); + public int brightness(int col) { + return this.brightness(rgb.getRed(col), rgb.getGreen(col), rgb.getBlue(col)); } public int brightness(int r, int g, int b) { - return (int)(r * 0.2126F + g * 0.7152F + b * 0.0722F); + return (int)((float)r * 0.2126F + (float)g * 0.7152F + (float)b * 0.0722F); } public void register() { - List packs = getResourcePacks(); + List packs = this.getiResourcePacks(); packs.add(this); - ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(this); - LogHelper.info("Registered TConstruct Resource Pack (" + this.name + ") - " + getClass().getSimpleName()); + ((IReloadableResourceManager)Minecraft.getMinecraft().getResourceManager()).registerReloadListener(this); + BloodArsenal.logger.info("Registered TCon Resource Pack (" + this.name + ") - " + this.getClass().getSimpleName()); } - public List getResourcePacks() + public List getiResourcePacks() { - List packs1 = packs; - if (packs1 == null) { - packs1 = ObfuscationReflectionHelper.getPrivateValue(FMLClientHandler.class, FMLClientHandler.instance(), new String[]{"resourcePackList"}); + List packs1 = packs; + if(packs1 == null) + { + packs1 = (List)ObfuscationReflectionHelper.getPrivateValue(FMLClientHandler.class, FMLClientHandler.instance(), new String[]{"resourcePackList"}); } + return packs1; } public InputStream getStream(ResourceLocation location) { InputStream stream = null; + Iterator i$ = this.getPacks().iterator(); - for (IResourcePack iResourcePack : getPacks()) + while(i$.hasNext()) { - if (iResourcePack.resourceExists(location)) + IResourcePack iResourcePack = (IResourcePack)i$.next(); + if(iResourcePack.resourceExists(location)) { try { stream = iResourcePack.getInputStream(location); } - catch (IOException ignore) {} + catch (IOException var6) {} } } + return stream; } public List getPacks() { - if (this.resourcePacks == null) + if(this.resourcePackz == null) { - this.resourcePacks = new ArrayList(); - this.resourcePacks.add(this.delegate); - List t = Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntriesAll(); - for (ResourcePackRepository.Entry entry : t) + this.resourcePackz = new ArrayList(); + this.resourcePackz.add(this.delegate); + List t = Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntries(); + Iterator i$ = t.iterator(); + + while(i$.hasNext()) { + ResourcePackRepository.Entry entry = (ResourcePackRepository.Entry)i$.next(); IResourcePack resourcePack = entry.getResourcePack(); - if (resourcePack.getPackName().contains("tinker")) + if(resourcePack.getResourceDomains().contains("tinker")) { - this.resourcePacks.add(resourcePack); + this.resourcePackz.add(resourcePack); } } } - return this.resourcePacks; + + return this.resourcePackz; } - @Override public InputStream getInputStream(ResourceLocation p_110590_1_) throws IOException { - byte[] bytes = this.cachedImages.get(p_110590_1_); - if (bytes == null) + byte[] bytes = (byte[])this.cachedImages.get(p_110590_1_); + if(bytes == null) { - ResourceLocation location = new ResourceLocation("tinker", p_110590_1_.getResourceDomain().replace(this.name, "")); - InputStream inputStream = getStream(location); - if (inputStream == null) + ResourceLocation location = new ResourceLocation("tinker", p_110590_1_.getResourcePath().replace(this.name, "")); + InputStream inputStream = this.getStream(location); + if(inputStream == null) { - location = new ResourceLocation("tinker", p_110590_1_.getResourceDomain().replace(this.name, "iron")); - inputStream = getStream(location); + location = new ResourceLocation("tinker", p_110590_1_.getResourcePath().replace(this.name, "iron")); + inputStream = this.getStream(location); } - if (inputStream == null) + + if(inputStream == null) { - location = new ResourceLocation("tinker", p_110590_1_.getResourceDomain().replace(this.name, "stone")); - inputStream = getStream(location); + location = new ResourceLocation("tinker", p_110590_1_.getResourcePath().replace(this.name, "stone")); + inputStream = this.getStream(location); } - if (inputStream == null) + + if(inputStream == null) { return this.delegate.getInputStream(p_110590_1_); } + BufferedImage bufferedimage; try { bufferedimage = ImageIO.read(inputStream); } - catch (IOException err) + catch (IOException var9) { - throw Throwables.propagate(err); + throw Throwables.propagate(var9); } + BufferedImage image; try { - image = modifyImage(bufferedimage); + image = this.modifyImage(bufferedimage); } - catch (Throwable t) + catch (Throwable var8) { - t.printStackTrace(); + var8.printStackTrace(); return this.delegate.getInputStream(location); } + ByteArrayOutputStream stream = new ByteArrayOutputStream(); ImageIO.write(image, "PNG", stream); bytes = stream.toByteArray(); this.cachedImages.put(location, bytes); } + return new ByteArrayInputStream(bytes); } - public abstract BufferedImage modifyImage(BufferedImage paramBufferedImage); + public abstract BufferedImage modifyImage(BufferedImage var1); - @Override public boolean resourceExists(ResourceLocation p_110589_1_) { - if (!"tinker".equals(p_110589_1_.getResourceDomain())) + if(!"tinker".equals(p_110589_1_.getResourceDomain())) { return false; } - String resourcePath = p_110589_1_.getResourcePath(); - if ((!resourcePath.startsWith("textures/items/")) || (!resourcePath.endsWith(".png"))) + else { - return false; + String resourcePath = p_110589_1_.getResourcePath(); + return resourcePath.startsWith("textures/items/") && resourcePath.endsWith(".png")?(this.delegate.resourceExists(p_110589_1_)?false:(!resourcePath.contains(this.name)?false:this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "stone"))) || this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "iron"))) || this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, ""))))):false; } - if (this.delegate.resourceExists(p_110589_1_)) - { - return false; - } - if (!resourcePath.contains(this.name)) - { - return false; - } - return (this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "stone")))) || (this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "iron")))) || (this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "")))); } - @Override - public Set getResourceDomains() - { + public Set getResourceDomains() { return this.delegate.getResourceDomains(); } - @Override public IMetadataSection getPackMetadata(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException { return null; } - @Override public BufferedImage getPackImage() throws IOException { return null; } - @Override - public String getPackName() - { + public String getPackName() { return "BA_Delegate_Pack"; } - @Override public void onResourceManagerReload(IResourceManager p_110549_1_) { this.cachedImages.clear(); - this.resourcePacks = null; + this.resourcePackz = null; } } diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java index d63ecd3..689659c 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java @@ -6,6 +6,8 @@ import java.awt.image.BufferedImage; public class TextureResourcePackBloodInfusedIron extends TextureResourcePackBase { + static int[][] offsets = new int[][]{{0, 1}, {1, 1}, {1, 0}, {1, -1}, {0, -1}, {-1, -1}, {-1, 0}, {-1, 1}}; + public TextureResourcePackBloodInfusedIron(String name) { super(name); @@ -15,344 +17,335 @@ public class TextureResourcePackBloodInfusedIron extends TextureResourcePackBase { int w = image.getWidth(); int h = image.getHeight(); - image.getType(); - int[][] pixels = new int[w][h]; - int[][] base = new int[w][h]; - + boolean[][] base = new boolean[w][h]; int mean = 0; int div = 0; - for (int x = 0; x < w; x++) + + for(int n = 0; n < w; ++n) { - for (int y = 0; y < h; y++) + for(int baseSilhouette = 0; baseSilhouette < h; ++baseSilhouette) { - int c = image.getRGB(x, y); - pixels[x][y] = brightness(c); - boolean nottrans = (c != 0) && (rgb.getAlpha(c) > 64); - if (nottrans) + int interior1 = image.getRGB(n, baseSilhouette); + pixels[n][baseSilhouette] = this.brightness(interior1); + boolean baseCorners = interior1 != 0 && rgb.getAlpha(interior1) > 64; + if(baseCorners) { - base[x][y] = 1; - mean += pixels[x][y]; - div++; + base[n][baseSilhouette] = true; + mean += pixels[n][baseSilhouette]; + ++div; } } } + mean = mean / div * 2 / 4; - int n; - if (w >= 256) + byte var26; + if(w >= 256) { - n = 5; + var26 = 5; + } + else if(w >= 128) + { + var26 = 4; + } + else if(w >= 64) + { + var26 = 3; + } + else if(w >= 32) + { + var26 = 2; } else { - if (w >= 128) - { - n = 4; - } - else - { - if (w >= 64) - { - n = 3; - } - else - { - if (w >= 32) - { - n = 2; - } else - { - n = 1; - } - } - } + var26 = 1; } - int[][] baseSilhouette = contract(base, n); - - int[][] interior1 = contract(baseSilhouette, n); - - int[][] baseCorners = multI(mult(expand(getCorners(baseSilhouette), n), baseSilhouette), interior1); - int[][] baseCornersShift = orwise(orwise(shift(baseCorners, 0, -1), shift(baseCorners, -1, 0)), shift(baseCorners, -1, -1)); - - int[][] interior2 = contract(interior1, 2 * n); - - int[][] interior3 = contract(interior2, n); - int[][] interior4 = contract(interior3, n); - - int[][] interiorCorners = multI(mult(expand(getCorners(interior2), n), interior2), interior3); - int[][] interiorCornersShift = orwise(orwise(shift(interiorCorners, -1, 0), shift(interiorCorners, 0, -1)), shift(interiorCorners, -1, -1)); - - int trans = 0; - int gold = -398001; - int gold_highlight = -117; - int wood = -6455217; - int darkwood = -10071758; + boolean[][] var27 = this.contract(base, var26); + boolean[][] var28 = this.contract(var27, var26); + boolean[][] interior2 = this.contract(var28, 2 * var26); + boolean[][] interior3 = this.contract(interior2, var26); + boolean[][] interior4 = this.contract(interior3, var26); + boolean[][] interiorCorners = this.multI(this.mult(this.expand(this.getCorners(interior2), var26), interior2), interior3); + boolean[][] interiorCornersShift = this.orwise(this.orwise(this.shift(interiorCorners, -1, 0), this.shift(interiorCorners, 0, -1)), this.shift(interiorCorners, -1, -1)); + byte trans = 0; + int red = 16752029; + int pink_highlight = 16752029; + int iron = 16752029; + int darkiron = 13592423; int[][] outpixels = new int[w][w]; - for (int x = 0; x < w; x++) + + for(int x = 0; x < w; ++x) { - for (int y = 0; y < h; y++) + for(int y = 0; y < h; ++y) { - if (baseSilhouette[x][y] == 0) + if(!var27[x][y]) { - if (base[x][y] != 0) + if(base[x][y]) { - outpixels[x][y] = multPixel(darkwood, pixels[x][y] / 2); + outpixels[x][y] = this.multPixel(darkiron, pixels[x][y] / 2); } else { outpixels[x][y] = trans; } } - else if (interior1[x][y] == 0) + else if(interior2[x][y] && !interior3[x][y]) { - if (baseCorners[x][y] != 0) + if(interiorCorners[x][y]) { - if (baseCornersShift[x][y] != 0) + if(interiorCornersShift[x][y]) { - outpixels[x][y] = multPixel(gold, Math.max(pixels[x][y], mean)); + outpixels[x][y] = this.multPixel(red, Math.max(pixels[x][y], mean)); } else { - outpixels[x][y] = multPixel(gold_highlight, Math.max(pixels[x][y], mean) + 5); + outpixels[x][y] = this.multPixel(pink_highlight, Math.max(pixels[x][y], mean) + 5); } } else { - outpixels[x][y] = multPixel(darkwood, pixels[x][y]); - } - } - else if ((interior2[x][y] == 0) || (interior3[x][y] != 0)) - { - if ((interior3[x][y] != 0) && (interior4[x][y] == 0)) - { - outpixels[x][y] = multPixel(wood, pixels[x][y] * 3 / 4); - } - else - { - outpixels[x][y] = multPixel(wood, pixels[x][y]); - } - } - else if (interiorCorners[x][y] != 0) - { - if (interiorCornersShift[x][y] != 0) - { - outpixels[x][y] = multPixel(gold, Math.max(pixels[x][y], mean)); - } - else - { - outpixels[x][y] = multPixel(gold_highlight, Math.max(pixels[x][y], mean) + 5); + outpixels[x][y] = this.multPixel(red, pixels[x][y]); } } else { - outpixels[x][y] = multPixel(darkwood, pixels[x][y]); + outpixels[x][y] = this.multPixel(iron, pixels[x][y]); } + image.setRGB(x, y, outpixels[x][y]); } } + return image; } - private int[][] orwise(int[][] a, int[][] b) + private boolean[][] orwise(boolean[][] a, boolean[][] b) { - for (int i = 0; i < a.length; i++) + for(int i = 0; i < a.length; ++i) { - for (int j = 0; j < a[i].length; j++) + for(int j = 0; j < a[i].length; ++j) { a[i][j] |= b[i][j]; } } + return a; } - private int[][] mult(int[][] a, int[][] b) + private boolean[][] mult(boolean[][] a, boolean[][] b) { - for (int i = 0; i < a.length; i++) + for(int i = 0; i < a.length; ++i) { - for (int j = 0; j < a[i].length; j++) + for(int j = 0; j < a[i].length; ++j) { a[i][j] &= b[i][j]; } } + return a; } - private int[][] multI(int[][] a, int[][] b) + private boolean[][] multI(boolean[][] a, boolean[][] b) { - for (int i = 0; i < a.length; i++) + for(int i = 0; i < a.length; ++i) { - for (int j = 0; j < a[i].length; j++) + for(int j = 0; j < a[i].length; ++j) { - a[i][j] &= (b[i][j] == 0 ? 1 : 0); + a[i][j] &= !b[i][j]; } } + return a; } - private int[][] expand(int[][] base, int n) + private boolean[][] expand(boolean[][] base, int n) { - int[][] output = expand(base); - for (int i = 0; i < n - 1; i++) + boolean[][] output = this.expand(base); + + for(int i = 0; i < n - 1; ++i) { - output = expand(output); + output = this.expand(output); } + return output; } - private int[][] contract(int[][] base, int n) + private boolean[][] contract(boolean[][] base, int n) { - int[][] output = contract(base); - for (int i = 0; i < n - 1; i++) + boolean[][] output = this.contract(base); + + for(int i = 0; i < n - 1; ++i) { - output = contract(output); + output = this.contract(output); } + return output; } public int multPixel(int col, int b) { - return 0xFF000000 | clamp(rgb.getRed(col) * b / 255) << 16 | clamp(rgb.getGreen(col) * b / 255) << 8 | clamp(rgb.getBlue(col) * b / 255); + return -16777216 | this.clamp(rgb.getRed(col) * b / 255) << 16 | this.clamp(rgb.getGreen(col) * b / 255) << 8 | this.clamp(rgb.getBlue(col) * b / 255); } - private int clamp(int i) - { + private int clamp(int i) { return MathHelper.clamp_int(i, 0, 255); } - public boolean get(int[][] img, int x, int y) + public boolean get(boolean[][] img, int x, int y) { - return (x >= 0) && (y >= 0) && (x < img.length) && (y < img[x].length) && (img[x][y] != 0); + return x >= 0 && y >= 0 && x < img.length && y < img[x].length && img[x][y]; } - static int[][] offsets = { { 0, 1 }, { 1, 1 }, { 1, 0 }, { 1, -1 }, { 0, -1 }, { -1, -1 }, { -1, 0 }, { -1, 1 } }; - - public int[][] shift(int[][] img, int dx, int dy) + public boolean[][] shift(boolean[][] img, int dx, int dy) { int w = img.length; - int[][] img2 = new int[w][w]; - for (int x = Math.max(-dx, 0); x < Math.min(w, w + dx); x++) + boolean[][] img2 = new boolean[w][w]; + + for(int x = Math.max(-dx, 0); x < Math.min(w, w + dx); ++x) { - System.arraycopy(img[(x + dx)], Math.max(-dy, 0) + dy, img2[x], Math.max(-dy, 0), Math.min(w, w + dy) - Math.max(-dy, 0)); + System.arraycopy(img[x + dx], Math.max(-dy, 0) + dy, img2[x], Math.max(-dy, 0), Math.min(w, w + dy) - Math.max(-dy, 0)); } + return img2; } - public int[][] getCorners(int[][] img) + public boolean[][] getCorners(boolean[][] img) { int w = img.length; - int[][] img2 = new int[w][w]; - for (int x = 0; x < w; x++) + boolean[][] img2 = new boolean[w][w]; + + for(int x = 0; x < w; ++x) { - for (int y = 0; y < w; y++) + for(int y = 0; y < w; ++y) { - if (img[x][y] != 0) - { + if(img[x][y]) { int an = -1; int n = 0; - for (int[] offset : offsets) + int[][] arr$ = offsets; + int len$ = arr$.length; + + for(int i$ = 0; i$ < len$; ++i$) { - if (get(img, x + offset[0], y + offset[1])) + int[] offset = arr$[i$]; + if(this.get(img, x + offset[0], y + offset[1])) { - if (an == -1) + if(an == -1) { an = n; } + n = 0; } else { - n++; - if (n == 5) + ++n; + if(n == 5) { break; } } } - if (an != -1) + + if(an != -1) { n += an; } - if (n >= 5) + + if(n >= 5) { - img2[x][y] = 1; + img2[x][y] = true; } } } } + return img2; } - public int[][] contract(int[][] img) + public boolean[][] contract(boolean[][] img) { int w = img.length; - int[][] img2 = new int[w][w]; - for (int x = 0; x < w; x++) + boolean[][] img2 = new boolean[w][w]; + + int x; + for(x = 0; x < w; ++x) { System.arraycopy(img[x], 0, img2[x], 0, w); } - for (int x = 0; x < w; x++) + + for(x = 0; x < w; ++x) { - for (int y = 0; y < w; y++) + for(int y = 0; y < w; ++y) { - if (img[x][y] != 0) + if(img[x][y]) { - if ((x == 0) || (y == 0) || (x == w - 1) || (y == w - 1)) - { - img2[x][y] = 0; + if(x == 0 || y == 0 || x == w - 1 || y == w - 1) { + img2[x][y] = false; } } else { - if (x > 0) + if(x > 0) { - img2[(x - 1)][y] = 0; + img2[x - 1][y] = false; } - if (y > 0) + + if(y > 0) { - img2[x][(y - 1)] = 0; + img2[x][y - 1] = false; } - if (x < w - 1) + + if(x < w - 1) { - img2[(x + 1)][y] = 0; + img2[x + 1][y] = false; } - if (y < w - 1) + + if(y < w - 1) { - img2[x][(y + 1)] = 0; + img2[x][y + 1] = false; } } } } + return img2; } - public int[][] expand(int[][] img) + public boolean[][] expand(boolean[][] img) { int w = img.length; - int[][] img2 = new int[w][w]; - for (int x = 0; x < w; x++) + boolean[][] img2 = new boolean[w][w]; + + int x; + for(x = 0; x < w; ++x) { System.arraycopy(img[x], 0, img2[x], 0, w); } - for (int x = 0; x < w; x++) + + for(x = 0; x < w; ++x) { - for (int y = 0; y < w; y++) + for(int y = 0; y < w; ++y) { - if (img[x][y] != 0) - { - for (int[] offset : offsets) + if(img[x][y]) { + int[][] arr$ = offsets; + int len$ = arr$.length; + + for(int i$ = 0; i$ < len$; ++i$) { + int[] offset = arr$[i$]; int dx = x + offset[0]; int dy = y + offset[1]; - if ((dx >= 0) && (dy >= 0) && (dx < w) && (dy < w)) + if(dx >= 0 && dy >= 0 && dx < w && dy < w) { - img2[dx][dy] = 1; + img2[dx][dy] = true; } } } } } + return img2; } } diff --git a/src/main/resources/assets/bloodarsenal/lang/en_US.lang b/src/main/resources/assets/bloodarsenal/lang/en_US.lang index f91921b..53e05bd 100644 --- a/src/main/resources/assets/bloodarsenal/lang/en_US.lang +++ b/src/main/resources/assets/bloodarsenal/lang/en_US.lang @@ -219,36 +219,9 @@ ba.versioning.disabled=This feature is disabled. owner=Owner: #TConstruct Stuffs -material.blood_infused_iron=Blood Infused Iron +material.bloodarsenal.blood_infused_wood=Blood Infused Wood +material.bloodarsenal.blood_infused_iron=Blood Infused Iron -part.arrowhead=@material@ Arrowhead -part.axe.head=@material@ Axe Head -part.battle.sign=@material@ Battle Sign -part.binding=@material@ Binding -part.bolt=@material@ Bolt -part.bow.limb=@material@ Bow Limb -part.chisel.head=@material@ Chisel Head -part.chunk=@material@ Chunk -part.crossbar=@material@ Crossbar -part.crossbow.body=@material@ Crossbow Body -part.crossbow.limb=@material@ Crossbow Limb -part.excavator.head=@material@ Excavator Head -part.frypan.head=@material@ Pan Head -part.full.guard=@material@ Full Guard -part.hammer.head=@material@ Hammer Head -part.knife.blade=@material@ Knife Blade -part.large.guard=@material@ Large Guard -part.large.sword.blade=@material@ Large Sword Blade -part.largeplate=@material@ Large Plate -part.lumberaxe.head=@material@ Broad Axe Head -part.medium.guard=@material@ Medium Guard -part.pickaxe.head=@material@ Pickaxe Head -part.scythe.head=@material@ Scythe Head -part.shovel.head=@material@ Shovel Head -part.shuriken=@material@ Shuriken -part.sword.blade=@material@ Sword Blade -part.toolrod=@material@ Tool Rod -part.toughbind=@material@ Tough Binding -part.toughrod=@material@ Tough Rod +fluid.molten.blood_infused_iron=Molten Blood Infused Iron modifier.toolstation.Soulbound=Soulbound diff --git a/src/main/resources/assets/bloodarsenal/models/EnergyGatling.png b/src/main/resources/assets/bloodarsenal/models/EnergyGatling.png deleted file mode 100644 index 0367cd5..0000000 Binary files a/src/main/resources/assets/bloodarsenal/models/EnergyGatling.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling.png b/src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling.png deleted file mode 100644 index 0367cd5..0000000 Binary files a/src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling2.png b/src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling2.png deleted file mode 100644 index 4015b08..0000000 Binary files a/src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/shaders/beam.frag b/src/main/resources/assets/bloodarsenal/shaders/beam.frag deleted file mode 100644 index 82fccbe..0000000 --- a/src/main/resources/assets/bloodarsenal/shaders/beam.frag +++ /dev/null @@ -1,12 +0,0 @@ - uniform sampler2D bgl_RenderedTexture; - uniform int time; - - void main() { - vec2 texcoord = vec2(gl_TexCoord[0]); - vec4 color = texture2D(bgl_RenderedTexture, texcoord); - - float gs = (color.r + color.g + color.b) / 3; - float r = sin(texcoord.x * 6 - 1.5 + sin(texcoord.y - time / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2; - - gl_FragColor = vec4(gs, gs, max(gs, r), gl_Color.a); - } diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png new file mode 100644 index 0000000..167634d Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png.mcmeta b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png.mcmeta new file mode 100644 index 0000000..8e55e43 --- /dev/null +++ b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png new file mode 100644 index 0000000..cd0c0b7 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png.mcmeta b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png.mcmeta new file mode 100644 index 0000000..7ceb363 --- /dev/null +++ b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodarsenal/textures/items/blood_ball.png b/src/main/resources/assets/bloodarsenal/textures/items/blood_ball.png deleted file mode 100644 index 2eb01b1..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/blood_ball.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/burned_tome.png b/src/main/resources/assets/bloodarsenal/textures/items/burned_tome.png new file mode 100644 index 0000000..feb9e91 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/burned_tome.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/energy_gatling.png b/src/main/resources/assets/bloodarsenal/textures/items/energy_gatling.png deleted file mode 100644 index e2f803f..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/energy_gatling.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_arrow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_arrow_effect.png new file mode 100644 index 0000000..cc0293e Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_arrow_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_axe_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_axe_effect.png new file mode 100644 index 0000000..0fe3454 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_axe_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_battleaxe_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_battleaxe_effect.png new file mode 100644 index 0000000..7fd383f Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_battleaxe_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_battlesign_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_battlesign_effect.png new file mode 100644 index 0000000..ce0b485 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_battlesign_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bolt_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bolt_effect.png new file mode 100644 index 0000000..9786cdc Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bolt_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect.png new file mode 100644 index 0000000..72f5f42 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_1.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_1.png new file mode 100644 index 0000000..b9e6f58 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_1.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_2.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_2.png new file mode 100644 index 0000000..b9e6f58 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_2.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_3.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_3.png new file mode 100644 index 0000000..b9e6f58 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_3.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_crossbow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_crossbow_effect.png new file mode 100644 index 0000000..0a3aecd Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_crossbow_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_cutlass_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_cutlass_effect.png new file mode 100644 index 0000000..bbc8273 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_cutlass_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_dagger_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_dagger_effect.png new file mode 100644 index 0000000..3d44555 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_dagger_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_excavator_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_excavator_effect.png new file mode 100644 index 0000000..d97711a Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_excavator_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect1.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect1.png new file mode 100644 index 0000000..6c521a6 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect1.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect2.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect2.png new file mode 100644 index 0000000..00e1051 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect2.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_frypan_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_frypan_effect.png new file mode 100644 index 0000000..0dc3e44 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_frypan_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_hammer_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_hammer_effect.png new file mode 100644 index 0000000..aba118c Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_hammer_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_javelin_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_javelin_effect.png new file mode 100644 index 0000000..36a0557 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_javelin_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_knife_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_knife_effect.png new file mode 100644 index 0000000..349b303 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_knife_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_lumberaxe_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_lumberaxe_effect.png new file mode 100644 index 0000000..dc9162f Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_lumberaxe_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_pickaxe_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_pickaxe_effect.png new file mode 100644 index 0000000..fcb3978 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_pickaxe_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_pickmattock_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_pickmattock_effect.png new file mode 100644 index 0000000..f8590c2 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_pickmattock_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_rapier_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_rapier_effect.png new file mode 100644 index 0000000..c05a98e Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_rapier_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_scythe_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_scythe_effect.png new file mode 100644 index 0000000..f0a46f7 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_scythe_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shovel_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shovel_effect.png new file mode 100644 index 0000000..00e5e3d Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shovel_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shuriken_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shuriken_effect.png new file mode 100644 index 0000000..a4b2405 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shuriken_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_sword_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_sword_effect.png new file mode 100644 index 0000000..d78e789 Binary files /dev/null and b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_sword_effect.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_head.png deleted file mode 100644 index 347831a..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_shaft.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_shaft.png deleted file mode 100644 index 4d6ee9d..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_shaft.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_handle.png deleted file mode 100644 index 4d2e594..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_head.png deleted file mode 100644 index 4e8cc05..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_head_broken.png deleted file mode 100644 index b47540e..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_back.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_back.png deleted file mode 100644 index 12b8ba9..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_back.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_backhead.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_backhead.png deleted file mode 100644 index f1964cc..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_backhead.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_binding.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_binding.png deleted file mode 100644 index 0c6175e..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_binding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_front.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_front.png deleted file mode 100644 index c0b3b50..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_front.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead.png deleted file mode 100644 index ee58b91..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead_broken.png deleted file mode 100644 index 5af2c26..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_handle.png deleted file mode 100644 index 19319b5..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head.png deleted file mode 100644 index 1dc08d1..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head_broken.png deleted file mode 100644 index 32c9bc6..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_handle.png deleted file mode 100644 index 9609cb5..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_head.png deleted file mode 100644 index 9300ae7..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_head_broken.png deleted file mode 100644 index 89c0197..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_accessory.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_accessory.png deleted file mode 100644 index b212ce3..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_accessory.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_blade.png deleted file mode 100644 index d47d7ce..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_blade.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_blade_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_blade_broken.png deleted file mode 100644 index dae2cb7..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_blade_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_handle.png deleted file mode 100644 index 3ea2ab0..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_handle.png deleted file mode 100644 index 7854de6..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_head.png deleted file mode 100644 index 1a62459..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_head_broken.png deleted file mode 100644 index d513703..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_guard.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_guard.png deleted file mode 100644 index 7aeee9f..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_guard.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_handle.png deleted file mode 100644 index 1ecb434..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_head.png deleted file mode 100644 index d9542ac..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_head_broken.png deleted file mode 100644 index 065bf24..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_shield.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_shield.png deleted file mode 100644 index 2bddda5..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_shield.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_blade.png deleted file mode 100644 index 00441de..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_blade.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_blade_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_blade_broken.png deleted file mode 100644 index 816cad0..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_blade_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_guard.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_guard.png deleted file mode 100644 index b7021c3..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_guard.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_handle.png deleted file mode 100644 index 2882d05..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_accessory.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_accessory.png deleted file mode 100644 index 92186aa..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_accessory.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_blade.png deleted file mode 100644 index faf7de0..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_blade.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_blade_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_blade_broken.png deleted file mode 100644 index cbf3101..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_blade_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_handle.png deleted file mode 100644 index 7f48cb6..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_binding.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_binding.png deleted file mode 100644 index fbed6d1..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_binding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_grip.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_grip.png deleted file mode 100644 index 1a481b7..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_grip.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_handle.png deleted file mode 100644 index 4488c75..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_head.png deleted file mode 100644 index a72050c..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_head_broken.png deleted file mode 100644 index efecddf..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_handle.png deleted file mode 100644 index 1d3222a..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_head.png deleted file mode 100644 index 7ee974b..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_head_broken.png deleted file mode 100644 index 6a80150..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_back.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_back.png deleted file mode 100644 index 36af317..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_back.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_front.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_front.png deleted file mode 100644 index f361b1e..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_front.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle.png deleted file mode 100644 index 49d813e..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle_broken.png deleted file mode 100644 index cea0a29..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_head.png deleted file mode 100644 index 6d288e0..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_accessory.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_accessory.png deleted file mode 100644 index 60366b4..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_accessory.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_blade.png deleted file mode 100644 index 0d8e3d0..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_blade.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_blade_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_blade_broken.png deleted file mode 100644 index 6a00b40..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_blade_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_handle.png deleted file mode 100644 index ad2c3d2..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_binding.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_binding.png deleted file mode 100644 index 501ca24..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_binding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_handle.png deleted file mode 100644 index d7fe792..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_head.png deleted file mode 100644 index fc9aff3..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_head_broken.png deleted file mode 100644 index 8de3bea..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_shield.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_shield.png deleted file mode 100644 index 1aa04f1..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_shield.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_back.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_back.png deleted file mode 100644 index 896b503..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_back.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_handle.png deleted file mode 100644 index b6f9343..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head.png deleted file mode 100644 index 4aff8ab..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head_broken.png deleted file mode 100644 index 22e5920..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_arrowhead.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_arrowhead.png deleted file mode 100644 index 0ebb07a..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_arrowhead.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_axe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_axe_head.png deleted file mode 100644 index 11b0d4a..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_axe_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_battlesign_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_battlesign_head.png deleted file mode 100644 index 7f65701..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_battlesign_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_binding.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_binding.png deleted file mode 100644 index 10adb6a..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_binding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bolt.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bolt.png deleted file mode 100644 index 982fbe4..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bolt.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bow_limb.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bow_limb.png deleted file mode 100644 index 6dd4369..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bow_limb.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chisel_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chisel_head.png deleted file mode 100644 index 82edc2c..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chisel_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chunk.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chunk.png deleted file mode 100644 index 7d09da4..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chunk.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbar.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbar.png deleted file mode 100644 index 60a3385..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbar.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbow_body.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbow_body.png deleted file mode 100644 index 7b1f83e..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbow_body.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbow_limb.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbow_limb.png deleted file mode 100644 index 46c1aba..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbow_limb.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_excavator_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_excavator_head.png deleted file mode 100644 index f29640c..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_excavator_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_frypan_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_frypan_head.png deleted file mode 100644 index e7e2c14..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_frypan_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_full_guard.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_full_guard.png deleted file mode 100644 index 7fa1efb..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_full_guard.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_hammer_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_hammer_head.png deleted file mode 100644 index 727a2fb..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_hammer_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_knife_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_knife_blade.png deleted file mode 100644 index 75a372c..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_knife_blade.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_guard.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_guard.png deleted file mode 100644 index c69da76..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_guard.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_sword_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_sword_blade.png deleted file mode 100644 index 98730a6..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_sword_blade.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_largeplate.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_largeplate.png deleted file mode 100644 index 40cbff2..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_largeplate.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_lumberaxe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_lumberaxe_head.png deleted file mode 100644 index 5cefe46..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_lumberaxe_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_medium_guard.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_medium_guard.png deleted file mode 100644 index 7d59ade..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_medium_guard.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_pickaxe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_pickaxe_head.png deleted file mode 100644 index f0bdd11..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_pickaxe_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_rod.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_rod.png deleted file mode 100644 index 274675d..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_rod.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_scythe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_scythe_head.png deleted file mode 100644 index 902f8d5..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_scythe_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shovel_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shovel_head.png deleted file mode 100644 index d206b4f..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shovel_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shuriken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shuriken.png deleted file mode 100644 index 7d99153..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shuriken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_sword_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_sword_blade.png deleted file mode 100644 index 097556d..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_sword_blade.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_toughbind.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_toughbind.png deleted file mode 100644 index 77674e9..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_toughbind.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_toughrod.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_toughrod.png deleted file mode 100644 index 7a2bcb5..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_toughrod.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_accessory.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_accessory.png deleted file mode 100644 index e0432fd..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_accessory.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_handle.png deleted file mode 100644 index 35dd0e6..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_head.png deleted file mode 100644 index c360510..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_head_broken.png deleted file mode 100644 index cd28c19..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_accessory.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_accessory.png deleted file mode 100644 index cd20e7c..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_accessory.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_back.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_back.png deleted file mode 100644 index 7273c1b..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_back.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_handle.png deleted file mode 100644 index 362cefb..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_head.png deleted file mode 100644 index 13da288..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_head_broken.png deleted file mode 100644 index 8b2ba94..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_accessory.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_accessory.png deleted file mode 100644 index c868485..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_accessory.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade.png deleted file mode 100644 index c8c45d1..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade_broken.png deleted file mode 100644 index a09554e..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_handle.png deleted file mode 100644 index fb98428..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_accessory.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_accessory.png deleted file mode 100644 index e9e3db1..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_accessory.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_binding.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_binding.png deleted file mode 100644 index e5f1775..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_binding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_handle.png deleted file mode 100644 index 6404a0d..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head.png deleted file mode 100644 index 57d4df9..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head_broken.png deleted file mode 100644 index d25f63d..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head_broken.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom.png deleted file mode 100644 index 65d008b..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_1.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_1.png deleted file mode 100644 index 8d7abc4..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_2.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_2.png deleted file mode 100644 index 0181d92..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_3.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_3.png deleted file mode 100644 index b64ef08..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_3.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top.png deleted file mode 100644 index 959c4e4..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_1.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_1.png deleted file mode 100644 index 0ea6e43..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_2.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_2.png deleted file mode 100644 index f784d53..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_3.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_3.png deleted file mode 100644 index 19129f6..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_3.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_handle.png deleted file mode 100644 index 000880e..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_handle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_head.png deleted file mode 100644 index 56348cc..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_head.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_head_broken.png deleted file mode 100644 index 87a1123..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_head_broken.png and /dev/null differ